Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

3 files changed, 47 insertions, 109 deletions

diff --git a/packages/qt4/qt-embedded-4.4.3/allow-configure-plugins.patch b/packages/qt4/qt-embedded-4.4.3/allow-configure-plugins.patch
deleted file mode 100644
index 601f2fc369..0000000000
--- a/packages/qt4/qt-embedded-4.4.3/allow-configure-plugins.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Index: qtopia-core-opensource-src-4.3.3/configure
-===================================================================
---- qtopia-core-opensource-src-4.3.3.orig/configure	2008-01-20 11:42:07.000000000 +0100
-+++ qtopia-core-opensource-src-4.3.3/configure	2008-01-20 22:31:37.000000000 +0100
-@@ -639,10 +639,10 @@
- 
- CFG_SQL_AVAILABLE=
- if [ -d "$relpath/src/plugins/sqldrivers" ]; then
--  for a in "$relpath/src/plugins/sqldrivers/"*; do
--     if [ -d "$a" ]; then
--	 base_a=`basename $a`
--  	 CFG_SQL_AVAILABLE="${CFG_SQL_AVAILABLE} ${base_a}"
-+  for a in `ls $relpath/src/plugins/sqldrivers/`; do
-+     dir="$relpath/src/plugins/sqldrivers/$a"
-+     if [ -d "$dir" ]; then
-+  	 CFG_SQL_AVAILABLE="${CFG_SQL_AVAILABLE} ${a}"
- 	 eval "CFG_SQL_${base_a}=auto"
-      fi
-   done
-@@ -650,30 +650,30 @@
- 
- CFG_DECORATION_PLUGIN_AVAILABLE=
- if [ -d "$relpath/src/plugins/decorations" ]; then
--  for a in "$relpath/src/plugins/decorations/"*; do
--     if [ -d "$a" ]; then
--	 base_a=`basename $a`
--  	 CFG_DECORATION_PLUGIN_AVAILABLE="${CFG_DECORATION_PLUGIN_AVAILABLE} ${base_a}"
-+  for a in `ls $relpath/src/plugins/decorations/`; do
-+     dir="$relpath/src/plugins/decorations/$a"
-+     if [ -d "$dir" ]; then
-+  	 CFG_DECORATION_PLUGIN_AVAILABLE="${CFG_DECORATION_PLUGIN_AVAILABLE} ${a}"
-      fi
-   done
- fi
- 
- CFG_MOUSE_PLUGIN_AVAILABLE=
- if [ -d "$relpath/src/plugins/mousedrivers" ]; then
--  for a in "$relpath/src/plugins/mousedrivers/"*; do
--     if [ -d "$a" ]; then
--	 base_a=`basename $a`
--  	 CFG_MOUSE_PLUGIN_AVAILABLE="${CFG_MOUSE_PLUGIN_AVAILABLE} ${base_a}"
-+  for a in `ls $relpath/src/plugins/mousedrivers/`; do
-+     dir="$relpath/src/plugins/mousedrivers/$a"
-+     if [ -d "$dir" ]; then
-+  	 CFG_MOUSE_PLUGIN_AVAILABLE="${CFG_MOUSE_PLUGIN_AVAILABLE} ${a}"
-      fi
-   done
- fi
- 
- CFG_GFX_PLUGIN_AVAILABLE=
- if [ -d "$relpath/src/plugins/gfxdrivers" ]; then
--  for a in "$relpath/src/plugins/gfxdrivers/"*; do
--     if [ -d "$a" ]; then
--	 base_a=`basename $a`
--  	 CFG_GFX_PLUGIN_AVAILABLE="${CFG_GFX_PLUGIN_AVAILABLE} ${base_a}"
-+  for a in `ls $relpath/src/plugins/gfxdrivers/`; do
-+     dir="$relpath/src/plugins/gfxdrivers/$a"
-+     if [ -d "$dir" ]; then
-+  	 CFG_GFX_PLUGIN_AVAILABLE="${CFG_GFX_PLUGIN_AVAILABLE} ${a}"
-      fi
-   done
-   CFG_GFX_OFF="$CFG_GFX_AVAILABLE" # assume all off
diff --git a/packages/qt4/qt-embedded.inc b/packages/qt4/qt-embedded.inc
new file mode 100644
index 0000000000..7de7a80a47
--- /dev/null
+++ b/packages/qt4/qt-embedded.inc
@@ -0,0 +1,46 @@
+SUMMARY = "Qt is a versatile cross-platform application framework -- this is the embedded version."
+SECTION = "libs"
+LICENSE = "GPL"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.trolltech.com"
+DEPENDS += "tslib"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
+           file://qconfig-oe.h \
+           file://0001-cross-compile.patch;patch=1 \
+           file://0003-no-tools.patch;patch=1 \
+           file://0004-no-qmake.patch;patch=1 \
+           file://0005-fix-mkspecs.patch;patch=1 \
+           file://0006-freetype-host-includes.patch;patch=1 \
+           file://0007-openssl-host-includes.patch;patch=1 \
+           file://qt-lib-infix.patch;patch=1 \
+           file://build-tools.patch;patch=1 \
+           file://support-2bpp.patch;patch=1 \
+           "
+S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}"
+
+QT_CONFIG_FLAGS += " \
+    -nomake demos -nomake examples -nomake tools -qtlibinfix E\
+    -embedded ${QT_ARCH} \
+    -qt-decoration-styled -plugin-decoration-default -plugin-decoration-windows \
+    -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc\
+    -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb\
+    -qt-kbd-tty -qt-kbd-usb -qt-kbd-qvfb\
+    -webkit \
+    -DQT_KEYPAD_NAVIGATION \
+    "
+
+do_configure_prepend() {
+    cp ${WORKDIR}/qconfig-oe.h ${S}/src/corelib/global
+}
+
+QT_BASE_NAME = "qt-embedded"
+QT_BASE_LIB  = "libqt-embedded"
+QT_DIR_NAME = "qtopia"
+QT_LIBINFIX="E"
+require qt_depends.inc
+require qt_configuration.inc
+require qt_packaging.inc
+require qt_staging.inc
+
+inherit qt4e
diff --git a/packages/qt4/qt-embedded_4.4.3.bb b/packages/qt4/qt-embedded_4.4.3.bb
index 24f45a11eb..22715cc382 100644
--- a/packages/qt4/qt-embedded_4.4.3.bb
+++ b/packages/qt4/qt-embedded_4.4.3.bb
@@ -1,48 +1,2 @@
-SUMMARY = "Qt is a versatile cross-platform application framework -- this is the embedded version."
-SECTION = "libs"
-LICENSE = "GPL"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.trolltech.com"
-DEPENDS += "tslib"
+require qt-embedded.inc
 PR = "r6"
-
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
-           file://qconfig-oe.h \
-           file://0001-cross-compile.patch;patch=1 \
-           file://0003-no-tools.patch;patch=1 \
-           file://0004-no-qmake.patch;patch=1 \
-           file://0005-fix-mkspecs.patch;patch=1 \
-           file://0006-freetype-host-includes.patch;patch=1 \
-           file://0007-openssl-host-includes.patch;patch=1 \
-           file://qt-lib-infix.patch;patch=1 \
-           file://build-tools.patch;patch=1 \
-           file://support-2bpp.patch;patch=1 \
-#           file://allow-configure-plugins.patch;patch=1 \
-           "
-S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}"
-
-QT_CONFIG_FLAGS += " \
-    -nomake demos -nomake examples -nomake tools -qtlibinfix E\
-    -embedded ${QT_ARCH} \
-    -qt-decoration-styled -plugin-decoration-default -plugin-decoration-windows \
-    -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc\
-    -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb\
-    -qt-kbd-tty -qt-kbd-usb -qt-kbd-qvfb\
-    -webkit \
-    -DQT_KEYPAD_NAVIGATION \
-    "
-
-do_configure_prepend() {
-    cp ${WORKDIR}/qconfig-oe.h ${S}/src/corelib/global
-}
-
-QT_BASE_NAME = "qt-embedded"
-QT_BASE_LIB  = "libqt-embedded"
-QT_DIR_NAME = "qtopia"
-QT_LIBINFIX="E"
-require qt_depends.inc
-require qt_configuration.inc
-require qt_packaging.inc
-require qt_staging.inc
-
-inherit qt4e