File webkit-rpath.diff of Package libqt4-opensource-4.8.7

Overview Repositories Revisions Requests Users Attributes Meta

File webkit-rpath.diff of Package libqt4-opensource-4.8.7

diff -urN qt-everywhere-opensource-src-4.8.7.orig/src/3rdparty/webkit/Source/WebKit/qt/declarative/declarative.pro qt-everywhere-opensource-src-4.8.7/src/3rdparty/webkit/Source/WebKit/qt/declarative/declarative.pro
--- qt-everywhere-opensource-src-4.8.7.orig/src/3rdparty/webkit/Source/WebKit/qt/declarative/declarative.pro	2012-11-23 11:10:05.000000000 +0100
+++ qt-everywhere-opensource-src-4.8.7/src/3rdparty/webkit/Source/WebKit/qt/declarative/declarative.pro	2013-04-08 09:40:04.085968045 +0200
@@ -41,21 +41,6 @@
 
 QT += declarative
 
-!CONFIG(standalone_package) {
-    linux-* {
-        # From Creator's src/rpath.pri:
-        # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
-        # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var.
-        QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
-        MY_RPATH = $$join(QMAKE_RPATHDIR, ":")
-
-        QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${MY_RPATH}\'
-        QMAKE_RPATHDIR =
-    } else {
-        QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
-    }
-}
-
 SOURCES += qdeclarativewebview.cpp plugin.cpp
 HEADERS += qdeclarativewebview_p.h
 
diff -urN qt-everywhere-opensource-src-4.8.7.orig/src/3rdparty/webkit/Source/WebKit/qt/docs/webkitsnippets/webelement/webelement.pro qt-everywhere-opensource-src-4.8.7/src/3rdparty/webkit/Source/WebKit/qt/docs/webkitsnippets/webelement/webelement.pro
--- qt-everywhere-opensource-src-4.8.7.orig/src/3rdparty/webkit/Source/WebKit/qt/docs/webkitsnippets/webelement/webelement.pro	2012-11-23 11:10:05.000000000 +0100
+++ qt-everywhere-opensource-src-4.8.7/src/3rdparty/webkit/Source/WebKit/qt/docs/webkitsnippets/webelement/webelement.pro	2013-04-08 16:55:07.302875155 +0200
@@ -5,4 +5,4 @@
 }
 SOURCES   = main.cpp
 include(../../../../../WebKit.pri)
-QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
+#QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
diff -urN qt-everywhere-opensource-src-4.8.7.orig/src/3rdparty/webkit/Source/WebKit/qt/tests/tests.pri qt-everywhere-opensource-src-4.8.7/src/3rdparty/webkit/Source/WebKit/qt/tests/tests.pri
--- qt-everywhere-opensource-src-4.8.7.orig/src/3rdparty/webkit/Source/WebKit/qt/tests/tests.pri	2012-11-23 11:10:05.000000000 +0100
+++ qt-everywhere-opensource-src-4.8.7/src/3rdparty/webkit/Source/WebKit/qt/tests/tests.pri	2013-04-08 16:53:54.080667340 +0200
@@ -23,7 +23,7 @@
 QT += testlib network
 contains(QT_CONFIG, declarative): QT += declarative
 
-QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
+#QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
 
 symbian {
     TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices WriteDeviceData
diff -urN qt-everywhere-opensource-src-4.8.7.orig/src/3rdparty/webkit/Source/WebKit2/WebProcess.pro qt-everywhere-opensource-src-4.8.7/src/3rdparty/webkit/Source/WebKit2/WebProcess.pro
--- qt-everywhere-opensource-src-4.8.7.orig/src/3rdparty/webkit/Source/WebKit2/WebProcess.pro	2012-11-23 11:09:56.000000000 +0100
+++ qt-everywhere-opensource-src-4.8.7/src/3rdparty/webkit/Source/WebKit2/WebProcess.pro	2013-04-08 09:40:04.086968025 +0200
@@ -20,19 +20,6 @@
 QT += network
 macx:QT+=xml
 
-linux-* {
-    # From Creator's src/rpath.pri:
-    # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
-    # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var.
-    QMAKE_RPATHDIR = \$\$ORIGIN/../lib $$QMAKE_RPATHDIR
-    MY_RPATH = $$join(QMAKE_RPATHDIR, ":")
-
-    QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${MY_RPATH}\' -Wl,--no-undefined
-    QMAKE_RPATHDIR =
-} else {
-    QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
-}
-
 symbian {
     TARGET.UID3 = 0xA000E544
     MMP_RULES += pageddata

Places

File webkit-rpath.diff of Package libqt4-opensource-4.8.7

Places