[oe-commits] org.oe.dev packages/qt4/qtopia-core, qt4-x11-free: Make it share the DEPENDS and inherits

[freyther commit]

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

Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: db92c83dc2c0021ebc1ec1e9bc8a21580d7644ec
ViewMTN: http://monotone.openembedded.org/revision/info/db92c83dc2c0021ebc1ec1e9bc8a21580d7644ec
Files:
1
packages/qt4/qt_depends.inc
packages/qt4/qt4-x11-free.inc
packages/qt4/qtopia-core.inc
Diffs:

#
# mt diff -rca108ea11c09bb004df93c69ed0092f66cafac87 -rdb92c83dc2c0021ebc1ec1e9bc8a21580d7644ec
#
# 
# 
# add_file "packages/qt4/qt_depends.inc"
#  content [69c5d5bf5ded1a90dcdffee3945ef05d9ec091d3]
# 
# patch "packages/qt4/qt4-x11-free.inc"
#  from [e556e28503734006548dcdd8fe48621e5e727082]
#    to [d061ee4924dec8a374a58096f368c1e22518520c]
# 
# patch "packages/qt4/qtopia-core.inc"
#  from [691a7242f9708191f4b0e19105a1bf90c9dd1728]
#    to [c0e79050b94daa220ff3f331e140dff5028037af]
# 
============================================================
--- packages/qt4/qt_depends.inc	69c5d5bf5ded1a90dcdffee3945ef05d9ec091d3
+++ packages/qt4/qt_depends.inc	69c5d5bf5ded1a90dcdffee3945ef05d9ec091d3
@@ -0,0 +1,3 @@
+inherit pkgconfig qmake_base
+
+DEPENDS += " uicmoc4-native qmake2-native freetype jpeg dbus openssl"
============================================================
--- packages/qt4/qt4-x11-free.inc	e556e28503734006548dcdd8fe48621e5e727082
+++ packages/qt4/qt4-x11-free.inc	d061ee4924dec8a374a58096f368c1e22518520c
@@ -1,10 +1,9 @@ LICENSE = "GPL QPL"
 DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version."
 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 @@ S = "${WORKDIR}/qt-x11-opensource-src-${
            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
============================================================
--- packages/qt4/qtopia-core.inc	691a7242f9708191f4b0e19105a1bf90c9dd1728
+++ packages/qt4/qtopia-core.inc	c0e79050b94daa220ff3f331e140dff5028037af
@@ -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