[oe-commits] org.oe.dev qt4-x11 4.3.0 remove bogus OE_QMAKE_LIBS_X11 from pkgconfig file

[mickeyl commit]

qt4-x11 4.3.0 remove bogus OE_QMAKE_LIBS_X11 from pkgconfig file

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 0b24529a1967f8d2fe73fceb2341c5491a5d7bde
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0b24529a1967f8d2fe73fceb2341c5491a5d7bde
Files:
1
packages/qt/qt4-x11-free_4.3.0.bb
Diffs:

#
# mt diff -r6b34ae43bf4f59a33f79e42d0cc2ad1b0d5e0c6e -r0b24529a1967f8d2fe73fceb2341c5491a5d7bde
#
# 
# 
# patch "packages/qt/qt4-x11-free_4.3.0.bb"
#  from [b40fdda327f4da1d37441a34c084f97335ce58a5]
#    to [457aaaa25dd85451f4252d6535b8e314cce24ea4]
# 
============================================================
--- packages/qt/qt4-x11-free_4.3.0.bb	b40fdda327f4da1d37441a34c084f97335ce58a5
+++ packages/qt/qt4-x11-free_4.3.0.bb	457aaaa25dd85451f4252d6535b8e314cce24ea4
@@ -1,13 +1,14 @@
+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 = "r6"
 
-PR = "r5"
-
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
            file://0001-cross-compile.patch;patch=1 \
            file://0002-fix-resinit-declaration.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
 }