diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-08-28 15:57:07 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-08-28 15:57:07 +0000 |
| commit | f39547272713578e2bfaae3ec47d073b48a31563 (patch) | |
| tree | 276cc974e6585639a82eddc45dc76ebb3c82fefa /packages/qt | |
| parent | 9a0bde6befaf560d1baf3adbf0488496daabd424 (diff) | |
| parent | edbeb005cd8711b6deef2c46d74b4057d2df0ed3 (diff) | |
merge of '266f6beb86630b70cfa55df7d2b557a677d187b0'
and '893542e48954804c96a716027237dc29c119d78b'
Diffstat (limited to 'packages/qt')
| -rw-r--r-- | packages/qt/qt4-x11-free_4.3.0.bb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/packages/qt/qt4-x11-free_4.3.0.bb b/packages/qt/qt4-x11-free_4.3.0.bb index 181fd5086f..8ad20178bb 100644 --- a/packages/qt/qt4-x11-free_4.3.0.bb +++ b/packages/qt/qt4-x11-free_4.3.0.bb @@ -1,12 +1,13 @@ +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 = "pkgconfig-native uicmoc4-native qmake2-native freetype jpeg virtual/libx11 \ + xft libxext libxrender libxrandr libxcursor dbus openssl" RDEPENDS_${PN} = "${NONDEV_PACKAGES}" PROVIDES = "qt4x11" - -PR = "r5" +PR = "r6" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ file://0001-cross-compile.patch;patch=1 \ @@ -76,11 +77,12 @@ do_stage() { install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${STAGING_QT_DIR}/bin/rcc install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${STAGING_QT_DIR}/bin/moc install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${STAGING_QT_DIR}/bin/uic - sed -i -e 's,^QMAKE_RPATHDIR.*,QMAKE_RPATHDIR=${STAGING_QT_DIR}/lib,g' ${STAGING_QT_DIR}/mkspecs/qconfig.pri + sed -i -e 's,^QMAKE_RPATHDIR.*,QMAKE_RPATHDIR=${STAGING_QT_DIR}/lib,g' ${STAGING_QT_DIR}/mkspecs/qconfig.pri for pcc in AssistantClient DBus Test UiTools ; do sed -i -e 's,${S}/lib,${STAGING_QT_DIR}/lib,g' ${STAGING_QT_DIR}/lib/pkgconfig/Qt${pcc}.pc done for pc in ${STAGING_QT_DIR}/lib/pkgconfig/*.pc ; do + sed -i -e 's,$(OE_QMAKE_LIBS_X11),-lX11 -lXext,g' $pc install -m 0644 $pc ${PKG_CONFIG_PATH}/ done } |