qt4: fix deps in libQtWebkit.la and QtWebKit.pc

* Both files contain -L../../WebCore/release -L../../JavaScriptCore/release -lwebcore -ljscore
* These paths and libs don't get installed.
* When building a shared lib with libtool, that links
  with libQtWebKit, libtool adds these unneeded parameters
  to the linker command-line, thus linking fails.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>

diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index 80948f36980101333416db02d7cbaca6fcbc3e75..0e57e5ad9f1075c784fc5466cf1cf392de8378eb 100644 (file)
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is
 SECTION = "libs"
 HOMEPAGE = "http://qt.nokia.com"
 DEPENDS += "directfb tslib"
-INC_PR = "r41"
+INC_PR = "r42"
 
 QT_BASE_LIB  ?= "libqt-embedded"
 

diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 75487f756b6e460f2ffaae7d013c23f8026673bd..56f349a31b5e77e5987b35aa30472f2fbeaf4b09 100644 (file)
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
 SECTION = "x11/libs"
 DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
 
-INC_PR = "r38"
+INC_PR = "r39"
 
 QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
 QT_GLFLAGS_qemux86 = "-opengl"

diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 2e70bd91e2576f4c2ca9141b731bca756131f2fa..77fb06fecd3028f1c5bc7cdd3703749a35c75955 100644 (file)
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -328,6 +328,7 @@ do_install() {
                        -e 's#" -Wl,-rpath-link,${S}/lib/\?"##g' \
                        -e 's#" -Wl,-rpath-link,${libdir}/\?"##g' \
                        -e 's#Iin#I${in#g' \
+                       -e 's#-L\.\./\.\./WebCore/release\s\+-L\.\./\.\./JavaScriptCore/release\s\+-lwebcore\s\+-ljscore##g' \
                        ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc
 
        sed -i -e s#" -Wl,-rpath-link,${S}/lib"##g \