File avoid-rpath.diff of Package libQtWebKit4
Binärdateien a/QtWebKit-2.2.0/LayoutTests/platform/chromium-win/svg/dynamic-updates/SVGForeignObjectElement-svgdom-x-prop-expected.png and b/QtWebKit-2.2.0/LayoutTests/platform/chromium-win/svg/dynamic-updates/SVGForeignObjectElement-svgdom-x-prop-expected.png sind verschieden.
--- Source/WebKit/qt/declarative/declarative.pro
+++ Source/WebKit/qt/declarative/declarative.pro
@@ -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
--- Source/WebKit2/WebProcess.pro
+++ Source/WebKit2/WebProcess.pro
@@ -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
--- Tools/MiniBrowser/qt/MiniBrowser.pro
+++ Tools/MiniBrowser/qt/MiniBrowser.pro
@@ -33,19 +33,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}\'
- QMAKE_RPATHDIR =
-} else {
- QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
-}
-
symbian {
TARGET.UID3 = 0xA000E545
MMP_RULES += pageddata
--- Tools/QtTestBrowser/QtTestBrowser.pro
+++ Tools/QtTestBrowser/QtTestBrowser.pro
@@ -39,19 +39,6 @@
PKGCONFIG += fontconfig
}
-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}\'
- QMAKE_RPATHDIR =
-} else {
- QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
-}
-
symbian {
TARGET.UID3 = 0xA000E543
TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices Location
--- Tools/WebKitTestRunner/qt/WebKitTestRunner.pro
+++ Tools/WebKitTestRunner/qt/WebKitTestRunner.pro
@@ -50,18 +50,5 @@
PREFIX_HEADER = $$BASEDIR/WebKitTestRunnerPrefix.h
*-g++*:QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER"
-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
-}
-
include(../../../Source/JavaScriptCore/JavaScriptCore.pri)
prependJavaScriptCoreLib(../../JavaScriptCore)