[oe-commits] org.oe.dev merge of '9f7e70ecb0865dfc3910ad4c1df4bd4dba8045be'

[slapin commit]

merge of '9f7e70ecb0865dfc3910ad4c1df4bd4dba8045be'
     and 'dc7a1478132ea78d3fa01747098955c76cdf9249'

Author: slapin at openembedded.org
Branch: org.openembedded.dev
Revision: df688aa66e8dd2c9f76bf0b2551461346a1d5981
ViewMTN: http://monotone.openembedded.org/revision.psp?id=df688aa66e8dd2c9f76bf0b2551461346a1d5981
Files:
1
packages/qte/qte-2.3.10/devfs.patch
packages/qte/qte-2.3.10/deprecated/devfs.patch
packages/qte/qte-2.3.10/ipaq-keyboard.patch
packages/qte/qte-2.3.10/deprecated/ipaq-keyboard.patch
packages/qte/qte-common_2.3.10.inc
packages/qte/qte-mt-static_2.3.10.bb
packages/qte/qte-mt_2.3.10.bb
packages/qte/qte_2.3.10.bb
conf/machine/palmld.conf
Diffs:

#
# mt diff -r9f7e70ecb0865dfc3910ad4c1df4bd4dba8045be -rdf688aa66e8dd2c9f76bf0b2551461346a1d5981
#
# 
# 
# rename "packages/qte/qte-2.3.10/devfs.patch"
#     to "packages/qte/qte-2.3.10/deprecated/devfs.patch"
# 
# rename "packages/qte/qte-2.3.10/ipaq-keyboard.patch"
#     to "packages/qte/qte-2.3.10/deprecated/ipaq-keyboard.patch"
# 
# patch "packages/qte/qte-common_2.3.10.inc"
#  from [081ccc3634df29189d8c002cc7183777bdafc4a9]
#    to [a48e62e21b1cc3068ee5963762c16ee388f3b3b9]
# 
# patch "packages/qte/qte-mt-static_2.3.10.bb"
#  from [32b5ae85f4bf2da0c3d5c54c6cd46449a07d89d4]
#    to [cba36c3850ac2b08dab6647b33bf4f0538bf1ba5]
# 
# patch "packages/qte/qte-mt_2.3.10.bb"
#  from [ea3847c6b0e7010eb2a471918cdea3a7aa68f032]
#    to [b12df9e6a73c7f287970ed781c24947bf8685426]
# 
# patch "packages/qte/qte_2.3.10.bb"
#  from [9602630cbdecdf5d5484aba24642f44a3340e0d1]
#    to [08c1403421a8911e25ed338585d50422dd3f8fab]
# 
============================================================
--- packages/qte/qte-common_2.3.10.inc	081ccc3634df29189d8c002cc7183777bdafc4a9
+++ packages/qte/qte-common_2.3.10.inc	a48e62e21b1cc3068ee5963762c16ee388f3b3b9
@@ -54,7 +54,6 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/q
 #
 # add device specific patches here
 #
-SRC_URI_append_simpad       = "file://devfs.patch;patch=1 "
 SRC_URI_append_c7x0         = "file://kernel-keymap-corgi.patch;patch=1 \
                                file://c7x0-w100-accel.patch;patch=1 file://suspend-resume-hooks.patch;patch=1 \
                                file://c7x0-w100-gcc4.patch;patch=1 "
@@ -63,20 +62,13 @@ SRC_URI_append_tosa         = "file://ke
 SRC_URI_append_akita        = "file://kernel-keymap-corgi.patch;patch=1 \
                                file://kernel-keymap-CXK.patch;patch=1 "
 SRC_URI_append_tosa         = "file://kernel-keymap-tosa.patch;patch=1 "
-SRC_URI_append_jornada7xx   = "file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_jornada56x   = "file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_h1910        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_h1940        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_h2200        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_h3600        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_h3900        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_h4000        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_h5000        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_h6300        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_hx2000       = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_hx4700       = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
 
+# "ipaqs" used to have this, but later were proven to at least work
+# without it. Review again and see if has interesting bits to be applied
+# universally.
+#SRC_URI_append   = "file://ipaq_sound_fix.patch;patch=1 "
 
+
 S = "${WORKDIR}/qt-${PV}"
 export QTDIR = "${S}"
 
============================================================
--- packages/qte/qte-mt-static_2.3.10.bb	32b5ae85f4bf2da0c3d5c54c6cd46449a07d89d4
+++ packages/qte/qte-mt-static_2.3.10.bb	cba36c3850ac2b08dab6647b33bf4f0538bf1ba5
@@ -1,5 +1,5 @@ require qte-common_${PV}.inc
 require qte-common_${PV}.inc
-PR = "r7"
+PR = "r8"
 
 EXTRA_OECONF += "-static -thread"
 
@@ -18,4 +18,3 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 }
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-FILES_${PN} = "${palmqtdir}"
============================================================
--- packages/qte/qte-mt_2.3.10.bb	ea3847c6b0e7010eb2a471918cdea3a7aa68f032
+++ packages/qte/qte-mt_2.3.10.bb	b12df9e6a73c7f287970ed781c24947bf8685426
@@ -1,5 +1,5 @@ require qte-common_${PV}.inc
 require qte-common_${PV}.inc
-PR = "r15"
+PR = "r16"
 
 EXTRA_OECONF += "-thread"
 
============================================================
--- packages/qte/qte_2.3.10.bb	9602630cbdecdf5d5484aba24642f44a3340e0d1
+++ packages/qte/qte_2.3.10.bb	08c1403421a8911e25ed338585d50422dd3f8fab
@@ -1,3 +1,3 @@ require qte-common_${PV}.inc
 require qte-common_${PV}.inc
-PR = "r51"
+PR = "r52"
 


#
# mt diff -rdc7a1478132ea78d3fa01747098955c76cdf9249 -rdf688aa66e8dd2c9f76bf0b2551461346a1d5981
#
# 
# 
# patch "conf/machine/palmld.conf"
#  from [5733d4803a281832c68a5a1ff2eb4ead15b8fbba]
#    to [36ef525ef87ccfbc617c0404c26bd3a750a58c1b]
# 
============================================================
--- conf/machine/palmld.conf	5733d4803a281832c68a5a1ff2eb4ead15b8fbba
+++ conf/machine/palmld.conf	36ef525ef87ccfbc617c0404c26bd3a750a58c1b
@@ -24,7 +24,6 @@ MACHINE_EXTRA_RRECOMMENDS += "\
 	kernel-module-pxapwm-bl \
 	kernel-module-snd-pxa2xx-ac97 \
 	kernel-module-snd-pxa2xx-pcm \
-	kernel-module-wm97xx-ts \		
 	"
 
 #