diff --git a/desktop/toolkit/qt5/qt5-webkit/files/qtwebkit-opensource-src-5.0.1-debuginfo.patch b/desktop/toolkit/qt5/qt5-webkit/files/qtwebkit-opensource-src-5.0.1-debuginfo.patch new file mode 100644 index 0000000000..5ebca4c927 --- /dev/null +++ b/desktop/toolkit/qt5/qt5-webkit/files/qtwebkit-opensource-src-5.0.1-debuginfo.patch @@ -0,0 +1,80 @@ +diff -up qtwebkit-opensource-src-5.0.1/Source/JavaScriptCore/JavaScriptCore.pri.debuginfo qtwebkit-opensource-src-5.0.1/Source/JavaScriptCore/JavaScriptCore.pri +--- qtwebkit-opensource-src-5.0.1/Source/JavaScriptCore/JavaScriptCore.pri.debuginfo 2013-01-29 13:03:49.000000000 -0600 ++++ qtwebkit-opensource-src-5.0.1/Source/JavaScriptCore/JavaScriptCore.pri 2013-02-23 13:54:22.578460045 -0600 +@@ -7,6 +7,12 @@ + + SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/JavaScriptCore + ++#equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) { ++# message("JavaScriptCore workaround for QtWebkit: do not build with -g, but with -g1") ++# QMAKE_CXXFLAGS_RELEASE -= -g ++# QMAKE_CXXFLAGS_RELEASE += -g1 ++#} ++ + JAVASCRIPTCORE_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/JavaScriptCore/$${GENERATED_SOURCES_DESTDIR} + + INCLUDEPATH += \ +diff -up qtwebkit-opensource-src-5.0.1/Source/WebCore/WebCore.pri.debuginfo qtwebkit-opensource-src-5.0.1/Source/WebCore/WebCore.pri +--- qtwebkit-opensource-src-5.0.1/Source/WebCore/WebCore.pri.debuginfo 2013-01-29 13:03:41.000000000 -0600 ++++ qtwebkit-opensource-src-5.0.1/Source/WebCore/WebCore.pri 2013-02-23 13:57:16.984279672 -0600 +@@ -7,6 +7,12 @@ + + SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebCore + ++equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) { ++ message("WebCore workaround for QtWebkit: do not build with -g, but with -g1") ++ QMAKE_CXXFLAGS_RELEASE -= -g ++ QMAKE_CXXFLAGS_RELEASE += -g1 ++} ++ + QT *= network sql core-private gui-private + + WEBCORE_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/WebCore/$${GENERATED_SOURCES_DESTDIR} +diff -up qtwebkit-opensource-src-5.0.1/Source/WebKit2/WebKit2.pri.debuginfo qtwebkit-opensource-src-5.0.1/Source/WebKit2/WebKit2.pri +--- qtwebkit-opensource-src-5.0.1/Source/WebKit2/WebKit2.pri.debuginfo 2013-01-29 13:03:39.000000000 -0600 ++++ qtwebkit-opensource-src-5.0.1/Source/WebKit2/WebKit2.pri 2013-02-23 13:54:22.579460033 -0600 +@@ -9,6 +9,12 @@ SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/ + + WEBKIT2_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/WebKit2/$${GENERATED_SOURCES_DESTDIR} + ++#equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) { ++# message("WebKit2 workaround for QtWebkit: do not build with -g, but with -g1") ++# QMAKE_CXXFLAGS_RELEASE -= -g ++# QMAKE_CXXFLAGS_RELEASE += -g1 ++#} ++ + INCLUDEPATH += \ + $$SOURCE_DIR \ + $$SOURCE_DIR/Platform \ +diff -up qtwebkit-opensource-src-5.0.1/Source/WebKit/WebKit1.pri.debuginfo qtwebkit-opensource-src-5.0.1/Source/WebKit/WebKit1.pri +--- qtwebkit-opensource-src-5.0.1/Source/WebKit/WebKit1.pri.debuginfo 2013-01-29 13:03:54.000000000 -0600 ++++ qtwebkit-opensource-src-5.0.1/Source/WebKit/WebKit1.pri 2013-02-23 13:54:22.579460033 -0600 +@@ -7,6 +7,12 @@ + + SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebKit + ++#equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) { ++# message("WebKit workaround for QtWebkit: do not build with -g, but with -g1") ++# QMAKE_CXXFLAGS_RELEASE -= -g ++# QMAKE_CXXFLAGS_RELEASE += -g1 ++#} ++ + INCLUDEPATH += \ + $$SOURCE_DIR/qt/Api \ + $$SOURCE_DIR/qt/WebCoreSupport \ +diff -up qtwebkit-opensource-src-5.0.1/Source/WTF/WTF.pri.debuginfo qtwebkit-opensource-src-5.0.1/Source/WTF/WTF.pri +--- qtwebkit-opensource-src-5.0.1/Source/WTF/WTF.pri.debuginfo 2013-01-29 13:03:38.000000000 -0600 ++++ qtwebkit-opensource-src-5.0.1/Source/WTF/WTF.pri 2013-02-23 13:56:23.584947256 -0600 +@@ -8,6 +8,12 @@ + # All external modules should include WTF headers by prefixing with "wtf" (#include ). + INCLUDEPATH += $$PWD + ++#equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) { ++# message("WTF workaround for QtWebkit: do not build with -g, but with -g1") ++# QMAKE_CXXFLAGS_RELEASE -= -g ++# QMAKE_CXXFLAGS_RELEASE += -g1 ++#} ++ + mac { + # Mac OS does ship libicu but not the associated header files. + # Therefore WebKit provides adequate header files. diff --git a/desktop/toolkit/qt5/qt5-webkit/files/qtwebkit-opensource-src-5.2.0-pluginpath.patch b/desktop/toolkit/qt5/qt5-webkit/files/qtwebkit-opensource-src-5.2.0-pluginpath.patch new file mode 100644 index 0000000000..cf92323236 --- /dev/null +++ b/desktop/toolkit/qt5/qt5-webkit/files/qtwebkit-opensource-src-5.2.0-pluginpath.patch @@ -0,0 +1,19 @@ +diff -up qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/plugins/PluginDatabase.cpp.pluginpath qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/plugins/PluginDatabase.cpp +--- qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/plugins/PluginDatabase.cpp.pluginpath 2013-11-26 19:01:47.000000000 -0600 ++++ qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/plugins/PluginDatabase.cpp 2013-12-02 11:14:43.306114402 -0600 +@@ -407,6 +407,7 @@ Vector PluginDatabase::defaultPl + paths.append("/usr/lib/firefox/plugins"); + paths.append("/usr/lib64/browser-plugins"); + paths.append("/usr/lib/browser-plugins"); ++ paths.append("/usr/lib/mozilla/plugins-wrapped"); + paths.append("/usr/lib/mozilla/plugins"); + paths.append("/usr/local/netscape/plugins"); + paths.append("/opt/mozilla/plugins"); +@@ -416,6 +417,7 @@ Vector PluginDatabase::defaultPl + paths.append("/usr/lib/netscape/plugins"); + paths.append("/usr/lib/netscape/plugins-libc5"); + paths.append("/usr/lib/netscape/plugins-libc6"); ++ paths.append("/usr/lib64/mozilla/plugins-wrapped"); + paths.append("/usr/lib64/netscape/plugins"); + paths.append("/usr/lib64/mozilla/plugins"); + paths.append("/usr/lib/nsbrowser/plugins"); diff --git a/desktop/toolkit/qt5/qt5-webkit/files/qtwebkit-opensource-src-5.2.0-save_memory.patch b/desktop/toolkit/qt5/qt5-webkit/files/qtwebkit-opensource-src-5.2.0-save_memory.patch new file mode 100644 index 0000000000..9dc6a0917c --- /dev/null +++ b/desktop/toolkit/qt5/qt5-webkit/files/qtwebkit-opensource-src-5.2.0-save_memory.patch @@ -0,0 +1,12 @@ +diff -up qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/WebCore.pri.save_memory qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/WebCore.pri +--- qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/WebCore.pri.save_memory 2013-12-02 11:15:56.417351604 -0600 ++++ qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/WebCore.pri 2013-12-02 11:15:56.421351563 -0600 +@@ -306,6 +306,8 @@ mac { + } + unix:!mac:*-g++*:QMAKE_CXXFLAGS += -fdata-sections + unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections ++unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):QMAKE_LFLAGS += -Wl,--no-keep-memory ++#unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):QMAKE_LFLAGS += -Wl,--reduce-memory-overheads + linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF + + enable_fast_mobile_scrolling: DEFINES += ENABLE_FAST_MOBILE_SCROLLING=1 diff --git a/desktop/toolkit/qt5/qt5-webkit/files/qtwebkit-opensource-src-5.2.1-no_rpath.patch b/desktop/toolkit/qt5/qt5-webkit/files/qtwebkit-opensource-src-5.2.1-no_rpath.patch new file mode 100644 index 0000000000..93026081b1 --- /dev/null +++ b/desktop/toolkit/qt5/qt5-webkit/files/qtwebkit-opensource-src-5.2.1-no_rpath.patch @@ -0,0 +1,12 @@ +diff -up qtwebkit-opensource-src-5.2.1/Tools/qmake/mkspecs/features/rpath.prf.no_rpath qtwebkit-opensource-src-5.2.1/Tools/qmake/mkspecs/features/rpath.prf +--- qtwebkit-opensource-src-5.2.1/Tools/qmake/mkspecs/features/rpath.prf.no_rpath 2014-02-01 14:37:41.000000000 -0600 ++++ qtwebkit-opensource-src-5.2.1/Tools/qmake/mkspecs/features/rpath.prf 2014-05-02 18:47:26.789051711 -0500 +@@ -6,7 +6,7 @@ + + equals(ROOT_BUILD_DIR, $$dirname(DESTDIR)): RPATHDIR_RELATIVE_TO_DESTDIR = ../lib + +-linux-*:!isEmpty(RPATHDIR_RELATIVE_TO_DESTDIR) { ++linux-rpath_me_harder_no_no_no:!isEmpty(RPATHDIR_RELATIVE_TO_DESTDIR) { + # 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/$${RPATHDIR_RELATIVE_TO_DESTDIR} $${QMAKE_RPATHDIR} diff --git a/desktop/toolkit/qt5/qt5-webkit/files/webkit_qt_hide_symbols.diff b/desktop/toolkit/qt5/qt5-webkit/files/webkit_qt_hide_symbols.diff new file mode 100644 index 0000000000..e5f3d56035 --- /dev/null +++ b/desktop/toolkit/qt5/qt5-webkit/files/webkit_qt_hide_symbols.diff @@ -0,0 +1,28 @@ +From: Modestas Vainius +SUbject: Make hide_symbols to cover all QtWebKit portions +Origin: vendor +Author: Timo Jyrinki +Last-Update: 2013-01-28 (use a similar patch on Qt 5) +Forwarded: no + +Almost everything in Source/WebCore/generated was not build with +-fvisibility=hidden resulting into redundantly polluted and huge dynamic symbol +list in libQtWebKit.so. + +Therefore, move +hide_symbols configuration parameter upwards in order for it +to cover everything including the offending Source/WebCore/CodeGenerators.pri + +--- a/Source/QtWebKit.pro 2012-12-18 19:04:43.000000000 +0000 ++++ b/Source/QtWebKit.pro 2013-01-28 08:25:56.342911517 +0000 +@@ -7,6 +7,11 @@ + TEMPLATE = subdirs + CONFIG += ordered + ++CONFIG(release):!CONFIG(standalone_package) { ++ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols ++ unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions ++} ++ + api.file = api.pri + SUBDIRS += api + diff --git a/desktop/toolkit/qt5/qt5-webkit/pspec.xml b/desktop/toolkit/qt5/qt5-webkit/pspec.xml index ca93fc7694..5e7b076c73 100644 --- a/desktop/toolkit/qt5/qt5-webkit/pspec.xml +++ b/desktop/toolkit/qt5/qt5-webkit/pspec.xml @@ -18,11 +18,16 @@ qt5-location-devel qt5-declarative-devel qt5-webchannel-devel + qt5-designer-devel + qt5-linguist + qt5-qdbusviewer qt5-multimedia-devel qt5-assistant-devel qt5-sql-sqlite + qt5-doc mesa-devel libXtst-devel + leveldb-devel icu4c-devel libjpeg-turbo-devel fontconfig-devel @@ -46,19 +51,24 @@ perl-Digest-MD5 perl-Text-ParseWords gperf - bison - flex + bison + flex qt5-phonon-devel gst-plugins-base-devel gst-plugins-base-next-devel + + qtwebkit-opensource-src-5.0.1-debuginfo.patch + qtwebkit-opensource-src-5.2.0-save_memory.patch + qtwebkit-opensource-src-5.2.1-no_rpath.patch + webkit_qt_hide_symbols.diff + qt5-webkit /usr/lib - /usr/lib/qt5/ /usr/lib/qt5/bin/ /usr/bin @@ -132,7 +142,7 @@ - 2017-02-20 + 2017-02-25 5.7.1 Release Bump. Stefan Gronewold