[oe-commits] org.oe.dev merge of '57f94c184ca1457e6b7683e84bcdf4863b46cd03'

freyther commit openembedded-commits at lists.openembedded.org
Tue Oct 23 16:39:59 UTC 2007 

merge of '57f94c184ca1457e6b7683e84bcdf4863b46cd03'
     and '730545b38a3f93aa84767feb0e823edcd31ab0b5'

Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: c207a18b9097f3cc1d6bd284be6cf4bfdef01484
ViewMTN: http://monotone.openembedded.org/revision/info/c207a18b9097f3cc1d6bd284be6cf4bfdef01484
Files:
1
packages/qt/qt4-x11-free-4.3.0
packages/qt/qt4-x11-free-4.3.2
packages/qt/qt4-x11-free_4.3.0.bb
packages/qt/qt4-x11-free_4.3.2.bb
packages/qte/qtopia-core_4.3.1.bb
packages/qte/qtopia-core_4.3.2.bb
packages/uicmoc/uicmoc4-native_4.3.2.bb
conf/checksums.ini
conf/distro/include/angstrom-2007-preferred-versions.inc
packages/qmake/qmake2-native_2.10a.bb
packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch
packages/webkit/webkit-qt.inc
packages/webkit/webkit-qt_svn.bb
packages/webkit/webkit-qtopia_svn.bb
packages/gstreamer/gst-plugins-ugly_0.10.5.bb
packages/mkfontscale-native_1.0.3.bb
packages/xorg-app/mkfontscale-native_1.0.3.bb
packages/mkfontscale_1.0.3.bb
packages/xorg-app/mkfontscale_1.0.3.bb
packages/fbset/fbset-modes
packages/fbset/fbset-modes/fic-gta01
packages/grdesktop
packages/grdesktop/grdesktop-0.23
packages/linux/linux-rp-2.6.23
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git
packages/binutils/binutils-2.18/binutils-2.16.1-e300c2c3.patch
packages/busybox/busybox-1.7.2/run_parts.c
packages/fbset/fbset-modes/fb.modes
packages/fbset/fbset-modes/fic-gta01/fb.modes
packages/fbset/fbset-modes.bb
packages/grdesktop/grdesktop-0.23/fr.po.patch
packages/grdesktop/grdesktop-0.23/install-help.patch
packages/grdesktop/grdesktop_0.23.bb
packages/gstreamer/gst-plugins-ugly/gstsid_autofoo_HACK.patch
packages/linux/linux-rp-2.6.23/arm_pxa_20070923.patch
packages/linux/linux-rp-2.6.23/binutils-buildid-arm.patch
packages/linux/linux-rp-2.6.23/connectplus-remove-ide-HACK.patch
packages/linux/linux-rp-2.6.23/defconfig-akita
packages/linux/linux-rp-2.6.23/defconfig-bootcdx86
packages/linux/linux-rp-2.6.23/defconfig-c7x0
packages/linux/linux-rp-2.6.23/defconfig-collie
packages/linux/linux-rp-2.6.23/defconfig-htcuniversal
packages/linux/linux-rp-2.6.23/defconfig-hx2000
packages/linux/linux-rp-2.6.23/defconfig-poodle
packages/linux/linux-rp-2.6.23/defconfig-qemuarm
packages/linux/linux-rp-2.6.23/defconfig-qemux86
packages/linux/linux-rp-2.6.23/defconfig-spitz
packages/linux/linux-rp-2.6.23/defconfig-tosa
packages/linux/linux-rp-2.6.23/defconfig-zylonite
packages/linux/linux-rp-2.6.23/hostap-monitor-mode.patch
packages/linux/linux-rp-2.6.23/htcuni-acx.patch
packages/linux/linux-rp-2.6.23/htcuni.patch
packages/linux/linux-rp-2.6.23/mmcsd_no_scr_check-r2.patch
packages/linux/linux-rp-2.6.23/pda-power.patch
packages/linux/linux-rp-2.6.23/pxa-serial-hack.patch
packages/linux/linux-rp-2.6.23/pxa_fb_overlay.patch
packages/linux/linux-rp-2.6.23/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
packages/linux/linux-rp-2.6.23/squashfs3.0-2.6.15.patch
packages/linux/linux-rp-2.6.23/uvesafb-0.1-rc3-2.6.22.patch
packages/linux/linux-rp-2.6.23/vt_ioctl_race.patch
packages/linux/linux-rp-2.6.23/w100fb-unused-var.patch
packages/linux/linux-rp-2.6.23/wm97xx-lcdnoise-r0.patch
packages/linux/linux-rp-2.6.23/zylonite-boot.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/arm_pxa_20070923.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/binutils-buildid-arm.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/connectplus-remove-ide-HACK.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-akita
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-bootcdx86
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-c7x0
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-collie
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-htcuniversal
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-hx2000
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-poodle
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-qemuarm
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-qemux86
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-spitz
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-tosa
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-zylonite
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/hostap-monitor-mode.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/htcuni-acx.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/htcuni.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/mmcsd_no_scr_check-r2.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/pda-power.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/pxa-serial-hack.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/pxa_fb_overlay.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/squashfs3.0-2.6.15.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/uvesafb-0.1-rc3-2.6.22.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/vt_ioctl_race.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/w100fb-unused-var.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/wm97xx-lcdnoise-r0.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/zylonite-boot.patch
packages/linux/linux-rp_2.6.23+2.6.24-rc0+git.bb
packages/linux/linux-rp_2.6.23.bb
packages/openmoko2/libjana_svn.bb
packages/openmoko2/openmoko-worldclock2_svn.bb
conf/bitbake.conf
conf/distro/angstrom-2007.1.conf
conf/distro/include/insane-srcrevs.inc
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcrevs.inc
conf/machine/i586-generic.conf
conf/machine/i686-generic.conf
packages/alsa/alsa-state.bb
packages/binutils/binutils_2.18.bb
packages/busybox/busybox_1.7.2.bb
packages/fbset/fbset_2.1.bb
packages/gstreamer/gst-meta-base_0.10.bb
packages/gstreamer/gst-plugins-ugly_0.10.6.bb
packages/linux/linux/x86/defconfig
packages/linux/linux-ezx_2.6.21.bb
packages/linux/linux-rp_2.6.21.bb
packages/mpeg2dec/mpeg2dec_0.4.0b.bb
packages/openmoko2/libmokogsmd2_svn.bb
packages/openmoko2/libmokojournal2_svn.bb
packages/openmoko2/libmokopanelui2_svn.bb
packages/openmoko2/libmokoui2_svn.bb
packages/openmoko2/moko-gtk-engine_svn.bb
packages/openmoko2/neod_svn.bb
packages/openmoko2/openmoko-appearance_svn.bb
packages/openmoko2/openmoko-appmanager2_svn.bb
packages/openmoko2/openmoko-browser2_svn.bb
packages/openmoko2/openmoko-calculator2_svn.bb
packages/openmoko2/openmoko-contacts2_svn.bb
packages/openmoko2/openmoko-dates2_svn.bb
packages/openmoko2/openmoko-dialer2_svn.bb
packages/openmoko2/openmoko-feedreader2_svn.bb
packages/openmoko2/openmoko-firststart2_svn.bb
packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
packages/openmoko2/openmoko-icon-theme-standard2_svn.bb
packages/openmoko2/openmoko-mediaplayer2_svn.bb
packages/openmoko2/openmoko-session2/etc/matchbox/session
packages/openmoko2/openmoko-session2.bb
packages/openmoko2/openmoko-tasks2_svn.bb
packages/openmoko2/openmoko-terminal2_svn.bb
packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb
packages/openmoko2/openmoko-theme-standard2_svn.bb
packages/openmoko2/openmoko-today2-folders_svn.bb
packages/openmoko2/openmoko-today2_svn.bb
packages/tasks/task-openmoko.bb
packages/webkit/webkit.inc
Diffs:

#
# mt diff -r57f94c184ca1457e6b7683e84bcdf4863b46cd03 -rc207a18b9097f3cc1d6bd284be6cf4bfdef01484
#
# 
# 
# rename "packages/qt/qt4-x11-free-4.3.0"
#     to "packages/qt/qt4-x11-free-4.3.2"
# 
# rename "packages/qt/qt4-x11-free_4.3.0.bb"
#     to "packages/qt/qt4-x11-free_4.3.2.bb"
# 
# rename "packages/qte/qtopia-core_4.3.1.bb"
#     to "packages/qte/qtopia-core_4.3.2.bb"
# 
# add_file "packages/uicmoc/uicmoc4-native_4.3.2.bb"
#  content [83b84a6976c32c4c094913143c9ed28a2b37c610]
# 
# patch "conf/checksums.ini"
#  from [75d2658af051ce6ee032da90880a92b443c0b2cf]
#    to [78e9ab72ee5a554ef253871c127648c291eb7aca]
# 
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
#  from [4d5a7f08cdd84d2ab2ab7515d0b01729d2b6a2ed]
#    to [0c1a451d57ee0e65eab2d12437ba3a1aa062c4f7]
# 
# patch "packages/qmake/qmake2-native_2.10a.bb"
#  from [ee62f0cd510bf9374ee05aecd30c84f2f88ce94d]
#    to [4e99113b60782b4965c8f34d69ca62a338f36078]
# 
# patch "packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch"
#  from [c3afeaba18e291233ac487a7a527fffb07d2af3d]
#    to [df1a4142fcb80ad473de37338a9f39993018ce92]
# 
# patch "packages/qte/qtopia-core_4.3.2.bb"
#  from [318931809588acb33cdc77b0acb027a9d326485c]
#    to [132f2ff144e5483dcf628cf56459ce7b81f52b0f]
# 
# patch "packages/webkit/webkit-qt.inc"
#  from [0d47aaa6f3b4850c8e35d881a2a71b271b6b589a]
#    to [1e75c2b1f67c6626edb8f9754c73d92cd0152d1a]
# 
# patch "packages/webkit/webkit-qt_svn.bb"
#  from [8a7e0008b0321d228d80e15a433d3a8b60cd718c]
#    to [cf3e31f4d11e142196490cbd0faf5942d102bc94]
# 
# patch "packages/webkit/webkit-qtopia_svn.bb"
#  from [fd38f04ea3408debdff8222ee61518c57420e507]
#    to [03fe45bc1271170d30d12a7d3a2b54d0955974f3]
# 
============================================================
--- packages/uicmoc/uicmoc4-native_4.3.2.bb	83b84a6976c32c4c094913143c9ed28a2b37c610
+++ packages/uicmoc/uicmoc4-native_4.3.2.bb	83b84a6976c32c4c094913143c9ed28a2b37c610
@@ -0,0 +1,60 @@
+DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
+SECTION = "libs"
+HOMEPAGE = "http://www.trolltech.com"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz"
+S = "${WORKDIR}/qtopia-core-opensource-src-${PV}"
+
+inherit native
+
+EXTRA_OECONF = "-prefix ${STAGING_DIR}/${BUILD_SYS}/qt4 \
+                -qt-libjpeg -qt-gif -system-zlib \
+                -no-nis -no-cups -no-exceptions  \
+                -no-accessibility -no-libjpeg    \
+                -no-nas-sound -no-sm             \
+                -no-xshape    -no-xinerama       \
+                -no-xcursor   -no-xrandr         \
+                -no-xrender   -no-fontconfig     \
+                -no-tablet    -no-xkb            \
+                -no-libpng                       \
+                -verbose -release  -fast -static \
+                -qt3support "
+# yank default -e
+EXTRA_OEMAKE = " "
+
+do_configure() {
+	sed -i 's:^QT += xml qt3support$:QT += xml qt3support network:' "${S}"/src/tools/uic3/uic3.pro
+	echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+}
+
+TOBUILD = "\
+  src/tools/moc \
+  src/corelib \
+  src/sql \
+  src/qt3support \
+  src/xml \
+  src/tools/uic \
+  src/tools/rcc \
+  src/network \
+  src/gui \
+  src/tools/uic3 \
+"
+
+do_compile() {
+	unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS
+	for i in ${TOBUILD}; do
+		cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
+	done
+}
+
+do_stage() {
+        install -m 0755 bin/moc ${STAGING_BINDIR}/moc4
+        install -m 0755 bin/uic ${STAGING_BINDIR}/uic4
+        install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34
+        install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4
+        install -d ${STAGING_DIR}/${BUILD_SYS}/qt4/
+        install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR}/${BUILD_SYS}/qt4/
+}
============================================================
--- conf/checksums.ini	75d2658af051ce6ee032da90880a92b443c0b2cf
+++ conf/checksums.ini	78e9ab72ee5a554ef253871c127648c291eb7aca
@@ -1286,6 +1286,10 @@ sha256=8fdbc7da376b22796879d6e3b756f71a8
 md5=9519eccf0638c9962f73a7b20da77e0e
 sha256=8fdbc7da376b22796879d6e3b756f71a8800ed1b35fc88aa76cddffd6f1fd883
 
+[ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.3.2.tar.gz]
+md5=70b729dd5dd8b2b432d685918e1971f1
+sha256=38af7b39e7805d8e3ba81091aa29af8bd38ce7cbbf8e721c8bb7ab810c38d963
+
 [ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-base-0.17.tar.gz]
 md5=1f0193358e92559ec0f598b09ccbc0ec
 sha256=16dd81625ebfc8f5dcb0dfd2e6bac223aad325a9405d66a556fe349446b3c332
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc	4d5a7f08cdd84d2ab2ab7515d0b01729d2b6a2ed
+++ conf/distro/include/angstrom-2007-preferred-versions.inc	0c1a451d57ee0e65eab2d12437ba3a1aa062c4f7
@@ -326,6 +326,7 @@ PREFERRED_VERSION_exiv2 ?= "0.15"
 PREFERRED_VERSION_evieext ?= "1.0.2"
 PREFERRED_VERSION_evince ?= "2.20.0"
 PREFERRED_VERSION_exiv2 ?= "0.15"
+PREFERRED_VERSION_exmap-console ?= "0.4.1"
 PREFERRED_VERSION_exml ?= "cvs"
 PREFERRED_VERSION_exo ?= "0.3.2"
 PREFERRED_VERSION_expat ?= "2.0.0"
@@ -1616,7 +1617,7 @@ PREFERRED_VERSION_qt-x11-free-native ?= 
 PREFERRED_VERSION_qsvn ?= "0.3.0"
 PREFERRED_VERSION_qt-x11-free ?= "3.3.7"
 PREFERRED_VERSION_qt-x11-free-native ?= "3.3.5"
-PREFERRED_VERSION_qt4-x11-free ?= "4.3.0"
+PREFERRED_VERSION_qt4-x11-free ?= "4.3.2"
 PREFERRED_VERSION_qtplot ?= "0.2"
 PREFERRED_VERSION_quagga ?= "0.99.8"
 PREFERRED_VERSION_quake1 ?= "0.0.1"
@@ -1892,7 +1893,7 @@ PREFERRED_VERSION_uicmoc3-native ?= "3.3
 PREFERRED_VERSION_ufraw ?= "0.12"
 PREFERRED_VERSION_uicmoc-native ?= "2.3.10"
 PREFERRED_VERSION_uicmoc3-native ?= "3.3.5"
-PREFERRED_VERSION_uicmoc4-native ?= "4.3.1"
+PREFERRED_VERSION_uicmoc4-native ?= "4.3.2"
 PREFERRED_VERSION_uim ?= "1.3.1"
 PREFERRED_VERSION_uim-native ?= "1.3.1"
 PREFERRED_VERSION_uim-tomoe-gtk ?= "0.2.0"
============================================================
--- packages/qmake/qmake2-native_2.10a.bb	ee62f0cd510bf9374ee05aecd30c84f2f88ce94d
+++ packages/qmake/qmake2-native_2.10a.bb	4e99113b60782b4965c8f34d69ca62a338f36078
@@ -1,11 +1,11 @@ LICENSE = "GPL"
 DESCRIPTION = "TrollTech Makefile Generator"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 SECTION = "devel"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
-QTVER = "qtopia-core-opensource-src-4.3.1"
+QTVER = "qtopia-core-opensource-src-4.3.2"
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \
            file://0001-fix-mkspecs.patch;patch=1 \
============================================================
--- packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch	c3afeaba18e291233ac487a7a527fffb07d2af3d
+++ packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch	df1a4142fcb80ad473de37338a9f39993018ce92
@@ -7,11 +7,11 @@ Subject: [PATCH] cross compile
  configure |  137 ++----------------------------------------------------------
  1 files changed, 5 insertions(+), 132 deletions(-)
 
-diff --git a/configure b/configure
-index 6b3ccd2..b3c2a52 100755
---- a/configure
-+++ b/configure
-@@ -733,7 +733,7 @@ while [ "$#" -gt 0 ]; do
+Index: qt-x11-opensource-src-4.3.2/configure
+===================================================================
+--- qt-x11-opensource-src-4.3.2.orig/configure	2007-10-01 15:06:03.000000000 +0200
++++ qt-x11-opensource-src-4.3.2/configure	2007-10-23 09:32:25.000000000 +0200
+@@ -735,7 +735,7 @@
              UNKNOWN_ARG=yes
          fi
          ;;
@@ -20,7 +20,7 @@ index 6b3ccd2..b3c2a52 100755
          VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
          shift
          VAL="$1"
-@@ -1109,6 +1109,9 @@ while [ "$#" -gt 0 ]; do
+@@ -1124,6 +1124,9 @@
      xplatform)
          XPLATFORM="$VAL"
          ;;
@@ -30,7 +30,7 @@ index 6b3ccd2..b3c2a52 100755
      debug-and-release)
          if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
              CFG_DEBUG_RELEASE="$VAL"
-@@ -2092,137 +2095,7 @@ if [ "$OPT_VERBOSE" = "yes" ]; then
+@@ -2119,149 +2122,7 @@
      echo "Determining system architecture... ($UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE)"
  fi
  
@@ -116,7 +116,7 @@ index 6b3ccd2..b3c2a52 100755
 -        ARCH=i386
 -        ;;
 -    *:*:x86_64|*:*:amd64)
--        if [ "$PLATFORM" = "linux-g++-32" ]; then
+-        if [ "$PLATFORM" = "linux-g++-32" -o "$PLATFORM" = "linux-icc-32" ]; then
 -            if [ "$OPT_VERBOSE" = "yes" ]; then
 -                echo "    32 bit on 64-bit AMD 80x86 (i386)"
 -            fi
@@ -146,6 +146,18 @@ index 6b3ccd2..b3c2a52 100755
 -    	fi
 -    	ARCH=s390
 -    	;;
+-    *:*:arm*)
+-        if [ "$OPT_VERBOSE" = "yes" ]; then
+-            echo "    ARM (arm)"
+-        fi
+-        ARCH=arm
+-        ;;
+-    Linux:*:sparc*) 
+-        if [ "$OPT_VERBOSE" = "yes" ]; then 
+-            echo "    Linux on SPARC" 
+-        fi 
+-        ARCH=sparc 
+-        ;; 
 -    *:*:*)
 -        if [ "$OPT_VERBOSE" = "yes" ]; then
 -            echo "    Trying '$UNAME_MACHINE'..."
@@ -169,6 +181,3 @@ index 6b3ccd2..b3c2a52 100755
  
  if [ "$OPT_VERBOSE" = "yes" ]; then
          echo "System architecture: '$ARCH'"
--- 
-1.5.0.7
-
============================================================
--- packages/qte/qtopia-core_4.3.1.bb	318931809588acb33cdc77b0acb027a9d326485c
+++ packages/qte/qtopia-core_4.3.2.bb	132f2ff144e5483dcf628cf56459ce7b81f52b0f
@@ -5,7 +5,7 @@ DEPENDS = "freetype tslib"
 HOMEPAGE = "http://www.trolltech.com"
 DEPENDS = "freetype tslib"
 
-PR = "r1"
+PR = "r0"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \
            file://linux-oe-qmake.conf"
============================================================
--- packages/webkit/webkit-qt.inc	0d47aaa6f3b4850c8e35d881a2a71b271b6b589a
+++ packages/webkit/webkit-qt.inc	1e75c2b1f67c6626edb8f9754c73d92cd0152d1a
@@ -1,9 +1,9 @@ WEBKIT_EXTRA_OPTIONS = ""
 WEBKIT_PORT = "qt"
 WEBKIT_EXTRA_OPTIONS = ""
-PACKAGES =+ "webkit-qtlauncher-dbg webkit-qtlauncher"
+PACKAGES =+ "${PN}launcher-dbg ${PN}launcher"
 
-FILES_webkit-qtlauncher = "${bindir}/QtLauncher"
-FILES_webkit-qtlauncher-dbg = "${bindir}/.debug/*"
+FILES_${PN}launcher = "${bindir}/QtLauncher"
+FILES_${PN}launcher-dbg = "${bindir}/.debug/*"
 
 require webkit.inc
 
============================================================
--- packages/webkit/webkit-qt_svn.bb	8a7e0008b0321d228d80e15a433d3a8b60cd718c
+++ packages/webkit/webkit-qt_svn.bb	cf3e31f4d11e142196490cbd0faf5942d102bc94
@@ -1,2 +1,4 @@ inherit qt4x11
 require webkit-qt.inc
 inherit qt4x11
+
+PR = "r1"
============================================================
--- packages/webkit/webkit-qtopia_svn.bb	fd38f04ea3408debdff8222ee61518c57420e507
+++ packages/webkit/webkit-qtopia_svn.bb	03fe45bc1271170d30d12a7d3a2b54d0955974f3
@@ -1,3 +1,4 @@
-BROKEN="1"
 require webkit-qt.inc
 inherit qtopia4core
+
+PR = "r1"


#
# mt diff -r730545b38a3f93aa84767feb0e823edcd31ab0b5 -rc207a18b9097f3cc1d6bd284be6cf4bfdef01484
#
# 
# 
# delete "packages/gstreamer/gst-plugins-ugly_0.10.5.bb"
# 
# rename "packages/mkfontscale-native_1.0.3.bb"
#     to "packages/xorg-app/mkfontscale-native_1.0.3.bb"
# 
# rename "packages/mkfontscale_1.0.3.bb"
#     to "packages/xorg-app/mkfontscale_1.0.3.bb"
# 
# add_dir "packages/fbset/fbset-modes"
# 
# add_dir "packages/fbset/fbset-modes/fic-gta01"
# 
# add_dir "packages/grdesktop"
# 
# add_dir "packages/grdesktop/grdesktop-0.23"
# 
# add_dir "packages/linux/linux-rp-2.6.23"
# 
# add_dir "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git"
# 
# add_file "packages/binutils/binutils-2.18/binutils-2.16.1-e300c2c3.patch"
#  content [d2a4596119c2ee2138efb5e83e697add3dc7e0ca]
# 
# add_file "packages/busybox/busybox-1.7.2/run_parts.c"
#  content [a89fb7b0e9220d4ab2c61e07fa2886e228697c0a]
# 
# add_file "packages/fbset/fbset-modes/fb.modes"
#  content [b683332efaea30cfa5e2e75466586535274e3fa9]
# 
# add_file "packages/fbset/fbset-modes/fic-gta01/fb.modes"
#  content [69c95216456c7e600b70f0abf276b88b6dabc0fc]
# 
# add_file "packages/fbset/fbset-modes.bb"
#  content [414d4cdbb4ad78dce7653a1ff5b6825200370c26]
# 
# add_file "packages/grdesktop/grdesktop-0.23/fr.po.patch"
#  content [5c4dc9a83fbb35a2dce0ee2f9fa1c7af925dc960]
# 
# add_file "packages/grdesktop/grdesktop-0.23/install-help.patch"
#  content [334ad5006db33fcb62a7da3bdf40bb4a242a5385]
# 
# add_file "packages/grdesktop/grdesktop_0.23.bb"
#  content [fe223775e1264037b8ea322322934800c3985844]
# 
# add_file "packages/gstreamer/gst-plugins-ugly/gstsid_autofoo_HACK.patch"
#  content [bbdf150742e8abb6487527ca9112227eb51cd398]
# 
# add_file "packages/linux/linux-rp-2.6.23/arm_pxa_20070923.patch"
#  content [d5c13c6c476adc5621bfc664bbbe45b584895919]
# 
# add_file "packages/linux/linux-rp-2.6.23/binutils-buildid-arm.patch"
#  content [0a9c96315b18cb403f1014aec2038e9477c2db07]
# 
# add_file "packages/linux/linux-rp-2.6.23/connectplus-remove-ide-HACK.patch"
#  content [8ffef06194b29e2b22abed7edb6044a5ad4316d7]
# 
# add_file "packages/linux/linux-rp-2.6.23/defconfig-akita"
#  content [4560f10f9dd70ee7bc009c083ad859551b0c517a]
# 
# add_file "packages/linux/linux-rp-2.6.23/defconfig-bootcdx86"
#  content [5558cdd18f447599d6ba549819dae3d99d919cbb]
# 
# add_file "packages/linux/linux-rp-2.6.23/defconfig-c7x0"
#  content [94163c88c3af2445025f92864e982346295b7374]
# 
# add_file "packages/linux/linux-rp-2.6.23/defconfig-collie"
#  content [1ded8b2f91fa52cff90e08f938c3860fc94907a2]
# 
# add_file "packages/linux/linux-rp-2.6.23/defconfig-htcuniversal"
#  content [c15ceaf3e170f40ee7b76bf8bd498450551060ad]
# 
# add_file "packages/linux/linux-rp-2.6.23/defconfig-hx2000"
#  content [ca400be76cfeca2feb187a33538407a633e15bc5]
# 
# add_file "packages/linux/linux-rp-2.6.23/defconfig-poodle"
#  content [48b1f25f947c9d614a87810486a63edbaaeec93b]
# 
# add_file "packages/linux/linux-rp-2.6.23/defconfig-qemuarm"
#  content [677d6694b1fa93712c468b324b1cda3ba60d1787]
# 
# add_file "packages/linux/linux-rp-2.6.23/defconfig-qemux86"
#  content [13ba6932d390681dfa74465511435d21ed675514]
# 
# add_file "packages/linux/linux-rp-2.6.23/defconfig-spitz"
#  content [60f2f3675a8045720aebad8b900d6c464040e0e3]
# 
# add_file "packages/linux/linux-rp-2.6.23/defconfig-tosa"
#  content [db15e2aa6464fd82b3b9a756eff0884b88791d0d]
# 
# add_file "packages/linux/linux-rp-2.6.23/defconfig-zylonite"
#  content [3a9d67a339675e9dee9874ffed84dc3ba368eb0a]
# 
# add_file "packages/linux/linux-rp-2.6.23/hostap-monitor-mode.patch"
#  content [7b6d1b43c24eb7c1135e018aa8ef42f28f5ded00]
# 
# add_file "packages/linux/linux-rp-2.6.23/htcuni-acx.patch"
#  content [7c721d8962ce5c8541249861ae9ebb9fe132077c]
# 
# add_file "packages/linux/linux-rp-2.6.23/htcuni.patch"
#  content [b8eed485715621374cc2d1bada1c3ccf60e9ec7e]
# 
# add_file "packages/linux/linux-rp-2.6.23/mmcsd_no_scr_check-r2.patch"
#  content [04424637fc1353704e1d7f6c7f550489e17db6ad]
# 
# add_file "packages/linux/linux-rp-2.6.23/pda-power.patch"
#  content [728868cdaa492d47a4ebe6c2120aadb4bc586dba]
# 
# add_file "packages/linux/linux-rp-2.6.23/pxa-serial-hack.patch"
#  content [af916d2b2561b14a1e40383de584a3a60110b5e4]
# 
# add_file "packages/linux/linux-rp-2.6.23/pxa_fb_overlay.patch"
#  content [585b5ef26c37766ec384c810ab5bd055e44d1e8a]
# 
# add_file "packages/linux/linux-rp-2.6.23/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch"
#  content [dd09cc9eb4d3abd338470eb2a61db0e8faf293cb]
# 
# add_file "packages/linux/linux-rp-2.6.23/squashfs3.0-2.6.15.patch"
#  content [44e21319aaf4a52245d2cc3a878f9a0b07a31c83]
# 
# add_file "packages/linux/linux-rp-2.6.23/uvesafb-0.1-rc3-2.6.22.patch"
#  content [621147f5d79fefe06bacaaa858549e7911104261]
# 
# add_file "packages/linux/linux-rp-2.6.23/vt_ioctl_race.patch"
#  content [270b98853ba26c5a19dc7cf2545f5d393f484195]
# 
# add_file "packages/linux/linux-rp-2.6.23/w100fb-unused-var.patch"
#  content [2fdd970e6eb43c26e98e0ae4dc495b273ab2160e]
# 
# add_file "packages/linux/linux-rp-2.6.23/wm97xx-lcdnoise-r0.patch"
#  content [f3d77590d33c723c46416833e88f28293f41626b]
# 
# add_file "packages/linux/linux-rp-2.6.23/zylonite-boot.patch"
#  content [e47e2f442bc69d9679debc127d56ce0ad366ed6b]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/arm_pxa_20070923.patch"
#  content [d5c13c6c476adc5621bfc664bbbe45b584895919]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/binutils-buildid-arm.patch"
#  content [0a9c96315b18cb403f1014aec2038e9477c2db07]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/connectplus-remove-ide-HACK.patch"
#  content [8ffef06194b29e2b22abed7edb6044a5ad4316d7]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-akita"
#  content [4560f10f9dd70ee7bc009c083ad859551b0c517a]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-bootcdx86"
#  content [5558cdd18f447599d6ba549819dae3d99d919cbb]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-c7x0"
#  content [94163c88c3af2445025f92864e982346295b7374]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-collie"
#  content [1ded8b2f91fa52cff90e08f938c3860fc94907a2]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-htcuniversal"
#  content [c15ceaf3e170f40ee7b76bf8bd498450551060ad]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-hx2000"
#  content [ca400be76cfeca2feb187a33538407a633e15bc5]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-poodle"
#  content [48b1f25f947c9d614a87810486a63edbaaeec93b]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-qemuarm"
#  content [677d6694b1fa93712c468b324b1cda3ba60d1787]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-qemux86"
#  content [13ba6932d390681dfa74465511435d21ed675514]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-spitz"
#  content [60f2f3675a8045720aebad8b900d6c464040e0e3]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-tosa"
#  content [db15e2aa6464fd82b3b9a756eff0884b88791d0d]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-zylonite"
#  content [3a9d67a339675e9dee9874ffed84dc3ba368eb0a]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/hostap-monitor-mode.patch"
#  content [7b6d1b43c24eb7c1135e018aa8ef42f28f5ded00]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/htcuni-acx.patch"
#  content [7c721d8962ce5c8541249861ae9ebb9fe132077c]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/htcuni.patch"
#  content [b8eed485715621374cc2d1bada1c3ccf60e9ec7e]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/mmcsd_no_scr_check-r2.patch"
#  content [04424637fc1353704e1d7f6c7f550489e17db6ad]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/pda-power.patch"
#  content [728868cdaa492d47a4ebe6c2120aadb4bc586dba]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/pxa-serial-hack.patch"
#  content [af916d2b2561b14a1e40383de584a3a60110b5e4]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/pxa_fb_overlay.patch"
#  content [585b5ef26c37766ec384c810ab5bd055e44d1e8a]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch"
#  content [dd09cc9eb4d3abd338470eb2a61db0e8faf293cb]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/squashfs3.0-2.6.15.patch"
#  content [44e21319aaf4a52245d2cc3a878f9a0b07a31c83]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/uvesafb-0.1-rc3-2.6.22.patch"
#  content [621147f5d79fefe06bacaaa858549e7911104261]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/vt_ioctl_race.patch"
#  content [270b98853ba26c5a19dc7cf2545f5d393f484195]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/w100fb-unused-var.patch"
#  content [2fdd970e6eb43c26e98e0ae4dc495b273ab2160e]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/wm97xx-lcdnoise-r0.patch"
#  content [f3d77590d33c723c46416833e88f28293f41626b]
# 
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/zylonite-boot.patch"
#  content [e47e2f442bc69d9679debc127d56ce0ad366ed6b]
# 
# add_file "packages/linux/linux-rp_2.6.23+2.6.24-rc0+git.bb"
#  content [d5e81e383b5b22fe28113f00aed76b14cdbccb3d]
# 
# add_file "packages/linux/linux-rp_2.6.23.bb"
#  content [971e3b36b376d27df92753bfa76309b739039d94]
# 
# add_file "packages/openmoko2/libjana_svn.bb"
#  content [b12471bf13475d2be894d51e78d8c5c82369ba08]
# 
# add_file "packages/openmoko2/openmoko-worldclock2_svn.bb"
#  content [7f86ee9c3bfabf8d397a2efbfb85f67fd61066a7]
# 
# patch "conf/bitbake.conf"
#  from [f410a6b3af115612f2bd104814d1035583d3518a]
#    to [7223700020e755692ec209b6de23efdf0d5960cd]
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [99f9b8aefa171947ca0486164ce4bbc39d40e700]
#    to [65949b96ffda674365178112dee75bfe8cf276c9]
# 
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
#  from [fc4044ff28a727b46e467b4d2e6ce4223496be10]
#    to [0c1a451d57ee0e65eab2d12437ba3a1aa062c4f7]
# 
# patch "conf/distro/include/insane-srcrevs.inc"
#  from [b1efedd3d4ef2ad3d5f782c992e368ed4dd7e664]
#    to [97d6d52aabb308a34d404adda19b2ebaa26e3d4e]
# 
# patch "conf/distro/include/moko-autorev.inc"
#  from [377acba46a95e8d0301744e9742074791d93ed2e]
#    to [16c0fc923805c466619f4643b791f2d9181ad7f6]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [b8dab282216e8b7461ee4d70151f83523286afa4]
#    to [d1c99e49aecd40e73ada74fe140a4a975279dbef]
# 
# patch "conf/machine/i586-generic.conf"
#  from [4a887ba9af2a184e828b7bc68cf9011f3824cb2e]
#    to [c61d01d967be68b39d6557988891bcf643a627d4]
# 
# patch "conf/machine/i686-generic.conf"
#  from [1b113798190f2b0c8fa137d2590ac3184044f3fd]
#    to [5a12326f2dba2449f2f055cb75623cb21bb5efc6]
# 
# patch "packages/alsa/alsa-state.bb"
#  from [1e1db07daa4ed18374bac118212fb191e3bcd625]
#    to [a7771dd3c4e224c5afba49e2e2a5792232f72121]
# 
# patch "packages/binutils/binutils_2.18.bb"
#  from [b46a0a4a1bd2041ecada2e2cebdd7415790ad44d]
#    to [e80beedb4b56489dd310354858c96616cd0c167c]
# 
# patch "packages/busybox/busybox_1.7.2.bb"
#  from [e0995507653a71bc95bf32102ed875598938514d]
#    to [07cb779f36d353735584d53006f3eede1ea7fd89]
# 
# patch "packages/fbset/fbset_2.1.bb"
#  from [40a6c728d0367db58266310f67a8cd583691333e]
#    to [e076fdda9b2d137ffe3b0f7e1919558a79759bda]
# 
# patch "packages/gstreamer/gst-meta-base_0.10.bb"
#  from [f7556e526303b21566c49eb45960b865ca58944b]
#    to [997c6ca039a778157fe99f9a3ec60d498181ec59]
# 
# patch "packages/gstreamer/gst-plugins-ugly_0.10.6.bb"
#  from [a797c052361775643172a8cb270f3ea30d3da281]
#    to [0ae18af7d536bef9d7e0e9378b0f134ee108a0cd]
# 
# patch "packages/linux/linux/x86/defconfig"
#  from [0bc90afc51dce1e7536c70ef6a6fb37e5e486451]
#    to [18d877a9d6bedb7fc9cd2a93dc861b26396409b4]
# 
# patch "packages/linux/linux-ezx_2.6.21.bb"
#  from [eb31269e5b23d7d27da1cca934cbec96a1ca3234]
#    to [8b5016d2776b0d38d689c421d789e102336bc6ff]
# 
# patch "packages/linux/linux-rp_2.6.21.bb"
#  from [d80feb79f4ed86271008fb110587f45d2a76a4a8]
#    to [48c008dba96498446b62a8e5235f31358a38d26e]
# 
# patch "packages/mpeg2dec/mpeg2dec_0.4.0b.bb"
#  from [b83c88f1275d81e0d84602ec21961f086ef8f3da]
#    to [3e5344f42783243aa599a5b4311baf304d2ace25]
# 
# patch "packages/openmoko2/libmokogsmd2_svn.bb"
#  from [eb73cf058314e4d807a50487b82920d220899da2]
#    to [37257745643dc337dbe76f5c6b0c8c55883fa32b]
# 
# patch "packages/openmoko2/libmokojournal2_svn.bb"
#  from [2771924ff02a687386dd05a09a18eee904337bcb]
#    to [94f2beaaf616e2f092f6e6aecf2c5cdcbd8e710c]
# 
# patch "packages/openmoko2/libmokopanelui2_svn.bb"
#  from [c9762444d49713478ec6edd44de2f2dfb9462033]
#    to [f5a9df4f87fe3fecdb54d05747dfd2f40fd8090d]
# 
# patch "packages/openmoko2/libmokoui2_svn.bb"
#  from [fc7b7b01cd80ded36029ab7f5bcebade47a07051]
#    to [ed3e343039544fc258ad9a80206409c08efa24cd]
# 
# patch "packages/openmoko2/moko-gtk-engine_svn.bb"
#  from [07a7a3d2f336737f5cdd0625996442c5b9687030]
#    to [ca9c7fe17582c9d97b265717dfaff45bbeaac902]
# 
# patch "packages/openmoko2/neod_svn.bb"
#  from [792fa46ae7f89eb467882d8d21f6a2a955a879fc]
#    to [9fe208ae909e4990711d07c520b3b90425e0df3e]
# 
# patch "packages/openmoko2/openmoko-appearance_svn.bb"
#  from [9c16ee551c7973be9ff5495835872d63bf640a06]
#    to [8b1efa0b5e57253e338f09541218e0c809d5b767]
# 
# patch "packages/openmoko2/openmoko-appmanager2_svn.bb"
#  from [837c358cc89b12e63159a52ca86687d38513192c]
#    to [6ce9bfcad3513c573e233c70330d580b79147efa]
# 
# patch "packages/openmoko2/openmoko-browser2_svn.bb"
#  from [c515dc949cdc66a24a754064948a0a2af35ddea4]
#    to [839b63f7e98d45b834b3b9079b9cfaeabd2d80e0]
# 
# patch "packages/openmoko2/openmoko-calculator2_svn.bb"
#  from [4610c3326b233e74ce632e599e0c2108271baaef]
#    to [64eba89e85f82eb9dfff97ba06635e4346bedd50]
# 
# patch "packages/openmoko2/openmoko-contacts2_svn.bb"
#  from [4137abbdd1ecfbb908d43bd9f8c45eca419ea0b8]
#    to [b4359d0f497d377add5ac897d4c0db85a458976e]
# 
# patch "packages/openmoko2/openmoko-dates2_svn.bb"
#  from [c0b82b2d1232131cff214e735e422d252a154e6d]
#    to [18fafcae0dcb95007e9d74161b8dff2714dd0a60]
# 
# patch "packages/openmoko2/openmoko-dialer2_svn.bb"
#  from [25771c80cdee9255a27706a601a2f88cc0e901ad]
#    to [31e4e965b0782f418f64556c10bf5a9e45fbff7c]
# 
# patch "packages/openmoko2/openmoko-feedreader2_svn.bb"
#  from [71cac52424b6f0ef7fa1c1eb6c0c68596c0ee092]
#    to [fd676189ac8d7f2371659d8a4e339a9de2088e17]
# 
# patch "packages/openmoko2/openmoko-firststart2_svn.bb"
#  from [27beb8f34a18a7dd7801124efa91a5379e4c6e31]
#    to [20d5d6ae1dd491a78d2d2ac58788d5b45093a373]
# 
# patch "packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb"
#  from [020e97d17fb83d30c85ffcaf93260d69d977124a]
#    to [e535990ce95016240514734db80ff7cbe5fd747e]
# 
# patch "packages/openmoko2/openmoko-icon-theme-standard2_svn.bb"
#  from [46950cd4b5599e731eb1ade602e59b3baad6c99e]
#    to [8dd971e19b08f7d7e2ef548a7914ded94e9e7f43]
# 
# patch "packages/openmoko2/openmoko-mediaplayer2_svn.bb"
#  from [f1a317c77ce26420320e222ad2769fba13caf7e4]
#    to [6a4efc7c1b7c62b4e173c9f708c8d74d95d76102]
# 
# patch "packages/openmoko2/openmoko-session2/etc/matchbox/session"
#  from [8bf49f597b50d24a957ebe9e6f05404637ab6560]
#    to [0d9b673125099a19dc66faba6b28c9b8b9d3b631]
# 
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [1c897158060ef7883a4ea320c60d6475025ff4ef]
#    to [3142d9c5ee2a406f3f61b199443a3828c7acc136]
# 
# patch "packages/openmoko2/openmoko-tasks2_svn.bb"
#  from [450e5e7f51113ebcee7b13cd3dca55240602492b]
#    to [073ff06008149dc89ef3cdff2c63a306ba506b58]
# 
# patch "packages/openmoko2/openmoko-terminal2_svn.bb"
#  from [efe846ff78659e363249638207d820fc5161383b]
#    to [b2c47944ba3c9a3b6d9e1869372029f3314a0a23]
# 
# patch "packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb"
#  from [933a582f6f614cf6cd4713f1159e6a95bcc7da6e]
#    to [eaba0b2c7aadac03bd1b7eb3705a36a3a332e13d]
# 
# patch "packages/openmoko2/openmoko-theme-standard2_svn.bb"
#  from [4810d44dd9c496af1fd9ba86bef5008f51785f0b]
#    to [984030fd8b331e1c81aa3190c73d476454b0a0cd]
# 
# patch "packages/openmoko2/openmoko-today2-folders_svn.bb"
#  from [0006363c7115bfb714551d3d98576cd6dc8f5b63]
#    to [21d248e9792e2604795f7bbd7c3ad69ced87301f]
# 
# patch "packages/openmoko2/%s
>>> DIFF TRUNCATED @ 16K

More information about the Openembedded-commits mailing list