packages/qt4/qtopia-core,qt4-x11-free: Make it share the DEPENDS and inherits

diff --git a/packages/qt4/qt4-x11-free.inc b/packages/qt4/qt4-x11-free.inc
index 3dedb4f..1ea8930 100644 (file)
--- a/packages/qt4/qt4-x11-free.inc
+++ b/packages/qt4/qt4-x11-free.inc
@@ -3,8 +3,7 @@ SECTION = "x11/libs"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 LICENSE = "GPL QPL"
-DEPENDS = "pkgconfig-native uicmoc4-native qmake2-native freetype jpeg virtual/libx11 \
-           xft libxext libxrender libxrandr libxcursor dbus openssl"
+DEPENDS += "virtual/libx11 xft libxext libxrender libxrandr libxcursor"
 PROVIDES = "qt4x11"
 PR = "r6"
 
@@ -15,9 +14,11 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz
            file://0005-fix-mkspecs.patch;patch=1"
 S = "${WORKDIR}/qt-x11-opensource-src-${PV}"
 
-inherit qmake_base qt4x11
 
 QT_BASE_NAME = "qt4"
 QT_BASE_LIB  = "libqt"
 QT_LIBRARY_NAME = "libQt"
 require qt_packaging.inc
+require qt_depends.inc
+
+inherit qt4x11

diff --git a/packages/qt4/qt_depends.inc b/packages/qt4/qt_depends.inc
new file mode 100644 (file)
index 0000000..daafa21
--- /dev/null
+++ b/packages/qt4/qt_depends.inc
@@ -0,0 +1,3 @@
+inherit pkgconfig qmake_base
+
+DEPENDS += " uicmoc4-native qmake2-native freetype jpeg dbus openssl"

diff --git a/packages/qt4/qtopia-core.inc b/packages/qt4/qtopia-core.inc
index cf8c0cc..dad062c 100644 (file)
--- a/packages/qt4/qtopia-core.inc
+++ b/packages/qt4/qtopia-core.inc
@@ -1,17 +1,19 @@
-SUMMARY = "QtopiaCore"
+SUMMARY = "Qt is a versatile cross-platform application framework -- this is the QtopiaCore/Embedded version."
 SECTION = "libs"
 LICENSE = "GPL"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
-DEPENDS = "freetype tslib"
+DEPENDS += "tslib"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \
            file://linux-oe-qmake.conf"
 S = "${WORKDIR}/qtopia-core-opensource-src-${PV}"
-inherit pkgconfig
 
 
 QT_BASE_NAME = "qtopiacore"
 QT_BASE_LIB  = "libqtopiacore"
 QT_LIBRARY_NAME = "libQt"
 require qt_packaging.inc
+require qt_depends.inc
+
+inherit qtopia4core