[oe-commits] org.oe.dev merge of '1f5a2c36e677453b7935b6a0f72bbb7b0563a1ed'

pfalcon commit openembedded-commits at lists.openembedded.org
Mon Nov 12 17:05:19 UTC 2007


merge of '1f5a2c36e677453b7935b6a0f72bbb7b0563a1ed'
     and '60eadea31c2dce277f39d64f53efc32a033d3035'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 66e879f16c75de049c696957989b40afb0ff56ef
ViewMTN: http://monotone.openembedded.org/revision/info/66e879f16c75de049c696957989b40afb0ff56ef
Files:
1
packages/python/python-formencode/setup.py.diff
packages/python/python-pygtk_2.10.3.bb
packages/pulseaudio/files/disable-using-glibc-tls.patch
packages/pulseaudio/pulseaudio_0.9.7.bb
packages/python/python-pygtk-1.2/acinclude.m4
conf/distro/include/sane-srcrevs.inc
packages/python/python-formencode_svn.bb
packages/python/python-gst_0.10.8.bb
packages/python/python-pycairo_1.4.0.bb
packages/python/python-pygobject_2.12.3.bb
packages/python/python-pygtk_2.10.4.bb
packages/python/python-pygtk_2.6.3.bb
packages/tasks/task-python-everything.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh12.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh13.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh14.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh15.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb
conf/distro/angstrom-2007.1.conf
packages/qte/qte-common_2.3.10.inc
packages/qte/qte-mt_2.3.10.bb
Diffs:

#
# mt diff -r1f5a2c36e677453b7935b6a0f72bbb7b0563a1ed -r66e879f16c75de049c696957989b40afb0ff56ef
#
# 
# 
# delete "packages/python/python-formencode/setup.py.diff"
# 
# delete "packages/python/python-pygtk_2.10.3.bb"
# 
# add_file "packages/pulseaudio/files/disable-using-glibc-tls.patch"
#  content [61e58204f3f2802f2a9eb79cfac98b3effe6f6ca]
# 
# add_file "packages/pulseaudio/pulseaudio_0.9.7.bb"
#  content [f4b9b15d934fa5ea5e9ca602bef6384729f9182a]
# 
# add_file "packages/python/python-pygtk-1.2/acinclude.m4"
#  content [a88d00bee840b475039af1207dad53ea6337f513]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [55bb345ba07c40cd4315595684f5d8a2e8da0bad]
#    to [a5c8530186b1620c562bb7e94df157e23c4b8928]
# 
# patch "packages/python/python-formencode_svn.bb"
#  from [ac2c7266591c960d97cbce6da4fe68f88febf4c7]
#    to [fade2e233328120a69f7b22dd50ef7e4e4cd24ef]
# 
# patch "packages/python/python-gst_0.10.8.bb"
#  from [c738ad94538f071894dcbaebf4a60e829de0e880]
#    to [bfb2e80bf7941825e00221fb6bec64e8791e4a26]
# 
# patch "packages/python/python-pycairo_1.4.0.bb"
#  from [b63b62282b435bd5e240949ab0cd8866219ad8da]
#    to [52c1c22bf531fe813bfaeeb5d2f01051a708e792]
# 
# patch "packages/python/python-pygobject_2.12.3.bb"
#  from [9117719b159b006a9b5f6038dead055ba4eade2b]
#    to [5c93a9f46668bceb4224865a79c52f44de81b1cd]
# 
# patch "packages/python/python-pygtk_2.10.4.bb"
#  from [eca669cd3b01f4aa31edda7ce12e801384f72f09]
#    to [cc6cb8b2119ee8dacad8781ada129bfea85d69e5]
# 
# patch "packages/python/python-pygtk_2.6.3.bb"
#  from [60dbe3dc9d9c5a4a0921cacfba072852e380826d]
#    to [8186a5065f2832dc797285fd18bedb7a93aa8ec8]
# 
# patch "packages/tasks/task-python-everything.bb"
#  from [2ed7ea503eb2b6bfa9fc97b2bf8ab07906845782]
#    to [8ac45927171c9bfd7e98506a31c29c28f1184299]
# 
============================================================
--- packages/pulseaudio/files/disable-using-glibc-tls.patch	61e58204f3f2802f2a9eb79cfac98b3effe6f6ca
+++ packages/pulseaudio/files/disable-using-glibc-tls.patch	61e58204f3f2802f2a9eb79cfac98b3effe6f6ca
@@ -0,0 +1,15 @@
+Index: pulseaudio-0.9.7/configure.ac
+===================================================================
+--- pulseaudio-0.9.7.orig/configure.ac
++++ pulseaudio-0.9.7/configure.ac
+@@ -124,8 +124,8 @@
+ ret=$?
+ rm -f conftest.o conftest
+ if test $ret -eq 0 ; then
+-    AC_DEFINE([HAVE_TLS_BUILTIN], 1, [Have __thread().])
+-    AC_MSG_RESULT([yes])
++dnl    AC_DEFINE([HAVE_TLS_BUILTIN], 1, [Have __thread().])
++    AC_MSG_RESULT([no])
+ else
+     AC_MSG_RESULT([no])
+ fi
============================================================
--- packages/pulseaudio/pulseaudio_0.9.7.bb	f4b9b15d934fa5ea5e9ca602bef6384729f9182a
+++ packages/pulseaudio/pulseaudio_0.9.7.bb	f4b9b15d934fa5ea5e9ca602bef6384729f9182a
@@ -0,0 +1,12 @@
+require pulse.inc
+
+# this is not correct (see below)
+SRC_URI += "file://disable-using-glibc-tls.patch;patch=1"
+
+PR = "r0"
+
+# problems w/ pulseaudio 0.9.7 atm:
+# 1.) needs libtool 1.2.24 (which miscompiles plugins in OE, hence we can't make it the default yet)
+# 2.) doesn't build w/ glibc TLS support (hence patched out)
+DEFAULT_PREFERENCE = "-1"
+
============================================================
--- packages/python/python-pygtk-1.2/acinclude.m4	a88d00bee840b475039af1207dad53ea6337f513
+++ packages/python/python-pygtk-1.2/acinclude.m4	a88d00bee840b475039af1207dad53ea6337f513
@@ -0,0 +1,90 @@
+## this one is commonly used with AM_PATH_PYTHONDIR ...
+dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
+dnl Check if a module containing a given symbol is visible to python.
+AC_DEFUN(AM_CHECK_PYMOD,
+[AC_REQUIRE([AM_PATH_PYTHON])
+py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
+AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
+AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
+ifelse([$2],[], [prog="
+import sys
+try:
+        import $1
+except ImportError:
+        sys.exit(1)
+except:
+        sys.exit(0)
+sys.exit(0)"], [prog="
+import $1
+$1.$2"])
+if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
+  then
+    eval "py_cv_mod_$py_mod_var=yes"
+  else
+    eval "py_cv_mod_$py_mod_var=no"
+  fi
+])
+py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
+if test "x$py_val" != xno; then
+  AC_MSG_RESULT(yes)
+  ifelse([$3], [],, [$3
+])dnl
+else
+  AC_MSG_RESULT(no)
+  ifelse([$4], [],, [$4
+])dnl
+fi
+])
+
+dnl a macro to check for ability to create python extensions
+dnl  AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
+dnl function also defines PYTHON_INCLUDES
+AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
+[AC_REQUIRE([AM_PATH_PYTHON])
+AC_MSG_CHECKING(for headers required to compile python extensions)
+dnl deduce PYTHON_INCLUDES
+AC_ARG_WITH(python-includes,
+	[  --with-python-includes=DIR  path to Python includes], py_exec_prefix=$withval)
+if test x$py_exec_prefix != x; then
+PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+else
+py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+if test "$py_prefix" != "$py_exec_prefix"; then
+  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+fi
+fi
+AC_SUBST(PYTHON_INCLUDES)
+dnl check if the headers exist:
+save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+AC_TRY_CPP([#include <Python.h>],dnl
+[AC_MSG_RESULT(found)
+$1],dnl
+[AC_MSG_RESULT(not found)
+$2])
+CPPFLAGS="$save_CPPFLAGS"
+])
+
+dnl
+dnl JH_ADD_CFLAG(FLAG)
+dnl checks whether the C compiler supports the given flag, and if so, adds
+dnl it to $CFLAGS.  If the flag is already present in the list, then the
+dnl check is not performed.
+AC_DEFUN([JH_ADD_CFLAG],
+[
+case " $CFLAGS " in
+*@<:@\	\ @:>@$1@<:@\	\ @:>@*)
+  ;;
+*)
+  save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS $1"
+  AC_MSG_CHECKING([whether [$]CC understands $1])
+  AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no])
+  AC_MSG_RESULT($jh_has_option)
+  if test $jh_has_option = no; then
+    CFLAGS="$save_CFLAGS"
+  fi
+  ;;
+esac])
============================================================
--- conf/distro/include/sane-srcrevs.inc	55bb345ba07c40cd4315595684f5d8a2e8da0bad
+++ conf/distro/include/sane-srcrevs.inc	a5c8530186b1620c562bb7e94df157e23c4b8928
@@ -111,6 +111,7 @@ SRCREV_pn-psplash ?= "249"
 SRCREV_pn-openocd-native ?= "206"
 SRCREV_pn-oprofileui ?= "160"
 SRCREV_pn-psplash ?= "249"
+SRCREV_pn-python-formencode = "3148"
 SRCREV_pn-settings-daemon ?= "1755"
 SRCREV_pn-sjf2410-linux-native ?= "933"
 SRCREV_pn-sphyrna ?= "45"
============================================================
--- packages/python/python-formencode_svn.bb	ac2c7266591c960d97cbce6da4fe68f88febf4c7
+++ packages/python/python-formencode_svn.bb	fade2e233328120a69f7b22dd50ef7e4e4cd24ef
@@ -1,15 +1,14 @@ SRCNAME = "FormEncode"
 DESCRIPTION = "HTML form validation, generation, and conversion package"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "sqlite3"
 SRCNAME = "FormEncode"
-PV = "0.4+svn${SRCDATE}"
+PV = "0.4+svnr${SRCREV}"
 PR = "ml0"
 
 inherit distutils
 
-SRC_URI = "svn://svn.colorstudy.com/FormEncode;module=trunk;proto=http \
-           file://setup.py.diff;patch=1"
+SRC_URI = "svn://svn.colorstudy.com/FormEncode;module=trunk;proto=http"
 
 S = "${WORKDIR}/trunk"
============================================================
--- packages/python/python-gst_0.10.8.bb	c738ad94538f071894dcbaebf4a60e829de0e880
+++ packages/python/python-gst_0.10.8.bb	bfb2e80bf7941825e00221fb6bec64e8791e4a26
@@ -21,4 +21,6 @@ do_stage() {
 	autotools_stage_all
 }
 
+FILES_${PN} += "${datadir}/gst-python"
+FILES_${PN}-dev += "${datadir}/gst-python/0.10/defs"
+FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/.debug/"
-FILES_${PN}-dbg = "${libdir}/python2.5/site-packages/gst-0.10/gst/.debug/"
============================================================
--- packages/python/python-pycairo_1.4.0.bb	b63b62282b435bd5e240949ab0cd8866219ad8da
+++ packages/python/python-pycairo_1.4.0.bb	52c1c22bf531fe813bfaeeb5d2f01051a708e792
@@ -14,6 +14,3 @@ do_stage() {
 	install -d ${STAGING_INCDIR}
 	install -m 0644 cairo/pycairo.h ${STAGING_INCDIR}
 }
-
-
-FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/cairo/.debug"
============================================================
--- packages/python/python-pygobject_2.12.3.bb	9117719b159b006a9b5f6038dead055ba4eade2b
+++ packages/python/python-pygobject_2.12.3.bb	5c93a9f46668bceb4224865a79c52f44de81b1cd
@@ -6,7 +6,6 @@ SRC_URI = "ftp://ftp.gnome.org/pub/GNOME
 
 SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.12/pygobject-${PV}.tar.bz2 \
            file://python-path.patch;patch=1"
-
 S = "${WORKDIR}/pygobject-${PV}"
 
 inherit autotools distutils-base pkgconfig
@@ -22,5 +21,4 @@ FILES_${PN} = "${libdir}/python*"
 }
 
 FILES_${PN} = "${libdir}/python*"
-FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/gobject/.debug"
 FILES_${PN}-dev += "${datadir}/pygobject/xsl"
============================================================
--- packages/python/python-pygtk_2.10.4.bb	eca669cd3b01f4aa31edda7ce12e801384f72f09
+++ packages/python/python-pygtk_2.10.4.bb	cc6cb8b2119ee8dacad8781ada129bfea85d69e5
@@ -21,18 +21,13 @@ do_configure_prepend() {
     install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
 }
 
-
-FILES_${PN}-dev += "${libdir}/pygtk/2.0 ${bindir}/pygtk-*"
-FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/.debug"
-
 do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
 }
 
 require fix-path.inc
+
 FILES_${PN}-dev += "${libdir}/pygtk/2.0 ${bindir}/pygtk-*"
-FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/*/.debug"
-FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/.debug"
 
 do_stage() {
 	autotools_stage_includes
============================================================
--- packages/python/python-pygtk_2.6.3.bb	60dbe3dc9d9c5a4a0921cacfba072852e380826d
+++ packages/python/python-pygtk_2.6.3.bb	8186a5065f2832dc797285fd18bedb7a93aa8ec8
@@ -15,8 +15,6 @@ PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-do
 EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
 
 PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-doc ${PN}"
-FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/gtk/.debug \
-		    ${libdir}/python2.4/site-packages/gtk-2.0/.debug"
 FILES_${PN}-dev += "${bindir} ${datadir}/pygtk ${libdir}/pygtk"
 
 do_configure_prepend() {
@@ -25,7 +23,7 @@ do_stage() {
 
 do_stage() {
 	autotools_stage_includes
-        sed -i s:/usr/share:${STAGING_DATADIR}: codegen/pygtk-codegen-2.0
+	sed -i s:/usr/share:${STAGING_DATADIR}: codegen/pygtk-codegen-2.0
 	install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR_NATIVE}/
 	install -d ${STAGING_DATADIR}/pygtk/2.0/codegen
 	install -d ${STAGING_DATADIR}/pygtk/2.0/defs/
============================================================
--- packages/tasks/task-python-everything.bb	2ed7ea503eb2b6bfa9fc97b2bf8ab07906845782
+++ packages/tasks/task-python-everything.bb	8ac45927171c9bfd7e98506a31c29c28f1184299
@@ -11,8 +11,8 @@ RDEPENDS = "\
 		python-dialog		\
 		python-evas			\
 		python-ecore		\
-		python-emotion		\
-		python-edje			\
+#		python-emotion		\
+#		python-edje			\
 		python-pycurl		\
 		python-fam			\
 		python-fnorb		\


#
# mt diff -r60eadea31c2dce277f39d64f53efc32a033d3035 -r66e879f16c75de049c696957989b40afb0ff56ef
#
# 
# 
# delete "packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb"
# 
# delete "packages/linux/linux-handhelds-2.6_2.6.21-hh12.bb"
# 
# delete "packages/linux/linux-handhelds-2.6_2.6.21-hh13.bb"
# 
# delete "packages/linux/linux-handhelds-2.6_2.6.21-hh14.bb"
# 
# delete "packages/linux/linux-handhelds-2.6_2.6.21-hh15.bb"
# 
# add_file "packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb"
#  content [252b9c26ddd2fda4271f4352999ce0facbfece99]
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [ce1515082c94b93eb7dfc1b9710f5e30900a6917]
#    to [5b667fd5f1683e4c70d3e952694733bb718cd6d8]
# 
# patch "packages/qte/qte-common_2.3.10.inc"
#  from [cc38296766bb33c89f2ab3aeb86d1cbb3d253a82]
#    to [1c5fce4a8c48597719722a7cb916d317300a473f]
# 
# patch "packages/qte/qte-mt_2.3.10.bb"
#  from [08b4e783e898ada4ad7ac97ffe6972dfdb3cce94]
#    to [4241677b274551c8db9002c2c4aebecaf5272154]
# 
============================================================
--- packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb	252b9c26ddd2fda4271f4352999ce0facbfece99
+++ packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb	252b9c26ddd2fda4271f4352999ce0facbfece99
@@ -0,0 +1,11 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
+LICENSE = "GPL"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+           file://defconfig"
+
+require linux-handhelds-2.6.inc
============================================================
--- conf/distro/angstrom-2007.1.conf	ce1515082c94b93eb7dfc1b9710f5e30900a6917
+++ conf/distro/angstrom-2007.1.conf	5b667fd5f1683e4c70d3e952694733bb718cd6d8
@@ -54,7 +54,7 @@ PCMCIA_MANAGER = "pcmciautils"
 PCMCIA_MANAGER = "pcmciautils"
 
 #Preferred version for the kernel on various machines
-PREFERRED_VERSION_linux-handhelds-2.6               ?= "2.6.21-hh17"
+PREFERRED_VERSION_linux-handhelds-2.6               ?= "2.6.21-hh18"
 RDEPENDS_kernel-base_hx4700 = ""
 RDEPENDS_kernel-base_htcuniversal = ""
 
============================================================
--- packages/qte/qte-common_2.3.10.inc	cc38296766bb33c89f2ab3aeb86d1cbb3d253a82
+++ packages/qte/qte-common_2.3.10.inc	1c5fce4a8c48597719722a7cb916d317300a473f
@@ -1,10 +1,10 @@ DEPENDS = "zlib libpng jpeg tslib uicmoc
 DESCRIPTION = "Qt/Embedded Version ${PV}"
 SECTION = "libs"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 LICENSE = "GPL"
 DEPENDS = "zlib libpng jpeg tslib uicmoc-native"
-DEPENDS_append_c7x0 = " sharp-aticore-oss"
+#DEPENDS_append_c7x0 = " sharp-aticore-oss"
 PROVIDES = "virtual/libqte2"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qte-${PV}"
@@ -58,9 +58,9 @@ W100_ACCEL_PATCHES = "file://c7x0-w100-a
                       file://c7x0-w100-gcc4.patch;patch=1 \
 		      file://suspend-resume-hooks.patch;patch=1"
 
-SRC_URI_append_c7x0         = "${W100_ACCEL_PATCHES} "
-SRC_URI_append_spitz        = "file://spitz-adhoc-keypad-rotate.patch;patch=1 "
-SRC_URI_append_akita        = "file://spitz-adhoc-keypad-rotate.patch;patch=1 "
+#SRC_URI_append_c7x0         = "${W100_ACCEL_PATCHES} "
+#SRC_URI_append_spitz        = "file://spitz-adhoc-keypad-rotate.patch;patch=1 "
+#SRC_URI_append_akita        = "file://spitz-adhoc-keypad-rotate.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
@@ -78,8 +78,9 @@ EXTRA_OECONF_CONFIG = "-qconfig qpe"
 # add device configuration here
 #
 EXTRA_OECONF_CONFIG = "-qconfig qpe"
-EXTRA_OECONF_CONFIG_c7x0 = "-qconfig qpe -accel-w100"
+#EXTRA_OECONF_CONFIG_c7x0 = "-qconfig qpe -accel-w100"
 EXTRA_OECONF_CONFIG_native = "-qconfig qpe -qvfb"
+
 EXTRA_OECONF = "-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif \
 		-xplatform ${TARGET_OS}-${QTE_ARCH}-g++ ${EXTRA_OECONF_CONFIG} -depths 8,16,32"
 EXTRA_OEMAKE = "-e"
@@ -88,8 +89,8 @@ EXTRA_DEFINES 			= "-DQT_QWS_TSLIB -DQT_
 # add device flags here
 #
 EXTRA_DEFINES 			= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
-EXTRA_DEFINES_spitz		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_SLCXK"
-EXTRA_DEFINES_akita             = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_SLCXK"
+#EXTRA_DEFINES_spitz		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_SLCXK"
+#EXTRA_DEFINES_akita             = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_SLCXK"
 
 #
 # don't touch anything below here
============================================================
--- packages/qte/qte-mt_2.3.10.bb	08b4e783e898ada4ad7ac97ffe6972dfdb3cce94
+++ packages/qte/qte-mt_2.3.10.bb	4241677b274551c8db9002c2c4aebecaf5272154
@@ -1,8 +1,6 @@ require qte-common_${PV}.inc
 require qte-common_${PV}.inc
-PR = "r24"
+PR = "r25"
 
 EXTRA_OECONF += "-thread"
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
 DEFAULT_PREFERENCE = "1"






More information about the Openembedded-commits mailing list