diff options
| -rw-r--r-- | classes/qt3x11.bbclass | 1 | ||||
| -rw-r--r-- | classes/qt4x11.bbclass | 1 | ||||
| -rw-r--r-- | packages/libqanava/libqanava_0.0.3.bb | 2 | ||||
| -rw-r--r-- | packages/lyx/lyx_1.3.6.bb | 3 | ||||
| -rw-r--r-- | packages/qt/qt-x11-free_3.3.5.bb | 3 | ||||
| -rw-r--r-- | packages/qt/qt-x11-free_4.0.1.bb | 3 |
6 files changed, 9 insertions, 4 deletions
diff --git a/classes/qt3x11.bbclass b/classes/qt3x11.bbclass index 09b9cbac96..1023a1f800 100644 --- a/classes/qt3x11.bbclass +++ b/classes/qt3x11.bbclass @@ -1,3 +1,4 @@ +DEPENDS += "qt3-x11" # # override variables set by qmake-base to compile Qt/X11 apps # diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass index d4ca0073df..92885aa7ee 100644 --- a/classes/qt4x11.bbclass +++ b/classes/qt4x11.bbclass @@ -1,3 +1,4 @@ +DEPENDS += "qt4-x11" # # override variables set by qmake-base to compile Qt/X11 apps # diff --git a/packages/libqanava/libqanava_0.0.3.bb b/packages/libqanava/libqanava_0.0.3.bb index 31d731b81f..968c88745d 100644 --- a/packages/libqanava/libqanava_0.0.3.bb +++ b/packages/libqanava/libqanava_0.0.3.bb @@ -4,7 +4,7 @@ SECTION = "x11/libs" HOMEPAGE = "http://www.libqanava.org/" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" -DEPENDS = "qt-x11-free-3.3.3" +PR = "r1" SRC_URI = "http://www.libqanava.org/dl/qanava-${PV}.tar.gz" S = "${WORKDIR}/qanava-${PV}" diff --git a/packages/lyx/lyx_1.3.6.bb b/packages/lyx/lyx_1.3.6.bb index 6e2309623a..4c9576f935 100644 --- a/packages/lyx/lyx_1.3.6.bb +++ b/packages/lyx/lyx_1.3.6.bb @@ -3,8 +3,9 @@ SECTION = "x11/office" LICENSE = "GPL" HOMEPAGE = "http://www.lyx.org" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -DEPENDS = "boost qt-x11-free" +DEPENDS = "boost" RRECOMMENDS = "tetex" +PR = "r1" SRC_URI = "ftp://ftp.lyx.org/pub/lyx/stable/lyx-${PV}.tar.bz2" diff --git a/packages/qt/qt-x11-free_3.3.5.bb b/packages/qt/qt-x11-free_3.3.5.bb index e56e0aec31..1ce8234be8 100644 --- a/packages/qt/qt-x11-free_3.3.5.bb +++ b/packages/qt/qt-x11-free_3.3.5.bb @@ -5,7 +5,8 @@ LICENSE = "GPL QPL" HOMEPAGE = "http://www.trolltech.com" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" DEPENDS = "uicmoc3-native freetype x11 xft xext libxrender libxrandr libxcursor mysql" -PR = "r9" +PROVIDES = "qt3-x11" +PR = "r10" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ diff --git a/packages/qt/qt-x11-free_4.0.1.bb b/packages/qt/qt-x11-free_4.0.1.bb index 301d58a54b..49c7506c9f 100644 --- a/packages/qt/qt-x11-free_4.0.1.bb +++ b/packages/qt/qt-x11-free_4.0.1.bb @@ -5,9 +5,10 @@ HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL QPL" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" DEPENDS = "uicmoc4-native freetype jpeg x11 xft xext libxrender libxrandr libxcursor mysql" +PROVIDES = "qt4-x11" # FIXME: Make it use 'our' qmake # DEPENDS += "qmake-native-2.00a" -PR = "r0" +PR = "r1" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ file://cross-compile.patch;patch=1 \ |