diff options
author | Igor Pashev <pashev.igor@gmail.com> | 2015-03-01 20:30:52 +0300 |
---|---|---|
committer | Igor Pashev <pashev.igor@gmail.com> | 2015-03-01 20:30:52 +0300 |
commit | 47d1c751de0b16e9ff36212840157a1a118a2b06 (patch) | |
tree | 735e94ed057fecdd9b983f2be63d380d06982569 | |
parent | 1fa090d3ea8672b020c5e43c99648efbe6842c43 (diff) | |
parent | 76163b9cd5e297a5354ed8b02901f81d1d7c73d6 (diff) | |
download | qt5webkit-47d1c751de0b16e9ff36212840157a1a118a2b06.tar.gz |
Merge git://anonscm.debian.org/pkg-kde/qt/qt5webkit
Conflicts:
debian/changelog
debian/libqt5webkit5.symbols
debian/patches/series
-rw-r--r-- | debian/changelog | 125 | ||||
-rw-r--r-- | debian/control | 35 | ||||
-rw-r--r-- | debian/libqt5webkit5-dev.install | 92 | ||||
-rw-r--r-- | debian/libqt5webkit5.symbols | 68 | ||||
-rw-r--r-- | debian/patches/blacklist_libkpartsplugin.patch | 30 | ||||
-rw-r--r-- | debian/patches/do_not_use_jit_on_big_endian_machines.patch | 41 | ||||
-rw-r--r-- | debian/patches/dont_pollute_pri_and_pc_with_private_deps.patch | 47 | ||||
-rw-r--r-- | debian/patches/fix_cloop_on_big_endian_machines.patch | 142 | ||||
-rw-r--r-- | debian/patches/fix_crash_when_a_network_request_is_aborted_while_forwarding_data.patch | 38 | ||||
-rw-r--r-- | debian/patches/fix_ftbfs_in_archs_without_jit_support.patch | 44 | ||||
-rw-r--r-- | debian/patches/fix_nonlinux_glibc_linkage.diff | 16 | ||||
-rw-r--r-- | debian/patches/no_gc_sections.diff | 2 | ||||
-rw-r--r-- | debian/patches/reduce_memory_usage.patch | 6 | ||||
-rw-r--r-- | debian/patches/series | 9 | ||||
-rw-r--r-- | debian/qml-module-qtwebkit.install | 1 | ||||
-rwxr-xr-x | debian/rules | 26 |
16 files changed, 488 insertions, 234 deletions
diff --git a/debian/changelog b/debian/changelog index da27b61..4a3fee7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,113 @@ +qtwebkit-opensource-src (5.3.2+dfsg-3) unstable; urgency=medium + + * Backport three patches to fix crashes: + - do_not_use_jit_on_big_endian_machines.patch + - fix_cloop_on_big_endian_machines.patch + - fix_crash_when_a_network_request_is_aborted_while_forwarding_data.patch + * Backport blacklist_libkpartsplugin.patch to prevent a crash due to a plugin + built against Qt4 (Closes: #744006). + + -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Fri, 17 Oct 2014 02:04:39 -0300 + +qtwebkit-opensource-src (5.3.2+dfsg-2) unstable; urgency=medium + + * Upload to unstable. + * Update symbols files with buildds' logs. + + -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Mon, 22 Sep 2014 00:21:56 -0300 + +qtwebkit-opensource-src (5.3.2+dfsg-1) experimental; urgency=medium + + [ Dmitry Shachnev ] + * Remove unused code from debian/rules. + * Update Vcs-Browser field to point to cgit interface. + + [ Lisandro Damián Nicanor Pérez Meyer ] + * New upstream release. + * Bump Qt build dependencies. + * Refresh patches. + * Remove hppa_wtf-dtoa-utils.diff, applied upstream. + + -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Wed, 17 Sep 2014 00:23:05 -0300 + +qtwebkit-opensource-src (5.3.1+dfsg-3) unstable; urgency=medium + + [ Julián Moreno Patiño ] + * Team upload. + + [ Sune Vuorela ] + * Link with -rt on hurd and kfreebsd (Closes: #757161). + + -- Julián Moreno Patiño <julian@debian.org> Mon, 11 Aug 2014 16:01:41 -0500 + +qtwebkit-opensource-src (5.3.1+dfsg-2) unstable; urgency=medium + + * Add hppa_wtf-dtoa-utils.diff to solve a FTBFS in HPPA (Closes: #753409). + * Update symbols files with buildds' logs. + + -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Wed, 02 Jul 2014 17:36:35 -0300 + +qtwebkit-opensource-src (5.3.1+dfsg-1) unstable; urgency=medium + + [ Lisandro Damián Nicanor Pérez Meyer ] + * New upstream release. + * Bump Qt build dependencies, using qtbase-private-dev >= 5.3.1 to get + qtbase-abi-5-3-1. + * Update symbols files with buildds' logs. + * Switch amd64's debugging symbols to stabs again. I can't build dwarf + symbols anymore due to lack of RAM, and I doubt our buildds could too. + + [ Alf Gaida ] + * Fix QML module's install file. + + -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Sun, 29 Jun 2014 15:59:39 -0300 + +qtwebkit-opensource-src (5.3.0+dfsg-2) unstable; urgency=medium + + * Upload to unstable. + * Update symbols files with buildds' logs. + * Switch back to build full debugging symbols on amd64. + + -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Fri, 06 Jun 2014 00:31:56 -0300 + +qtwebkit-opensource-src (5.3.0+dfsg-1) experimental; urgency=medium + + * New upstream release. + * Do not build qtwebkit5-doc from this source anymore. It will now be built + from qttools. In this way we allow qttools to build depend upon + libqt5webkit5-dev without creating a circular dependency. + * Do not force dh_builddeb to use xz compression: it's now the default. + * Bump Qt build dependencies. + * Remove fix_ftbfs_in_archs_without_jit_support.patch and + dont_pollute_pri_and_pc_with_private_deps.patch, applied upstream. + * Refresh no_gc_sections.diff. + * Install headers in their new multi-arch qualified path. Mark the + development package as Multi-Arch: same. + * Take into account the new multi-arch path for removing the private + headers. + * Update symbols files with current log. The missing symbols are private + stuff not present in any static method. + * Remove the transitional package libqt5webkit5-qmlwebkitplugin. + * Switch debugging symbols for amd64 to gstabs until we are able to build + normal symbols again. + + -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Fri, 23 May 2014 21:53:24 -0300 + +qtwebkit-opensource-src (5.2.1+dfsg1-1) unstable; urgency=medium + + * Rename libqt5webkit5-qmlwebkitplugin to qml-module-qtwebkit, adding proper + Break and Replaces. + * Add qtdeclarative5-dev as a dependency of libqt5webkit5-dev as it seems + to be a requirement for stuff building with webkit. + * Update symbols files with buildd's logs. + * Remove prune-nonfree from debian/rules and instead use Files-Excluded in + debian/copyright. + * Remove dygraph-combined.js from the original tarball: minified javascript + without source. + * Increase dfsg revision to 1 due to the new source tarball. + + -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Sun, 27 Apr 2014 22:23:04 -0300 + qtwebkit-opensource-src (5.2.1+dfsg-6~dyson2) unstable; urgency=medium * Use system malloc on Dyson (dyson-use-system-malloc.patch) @@ -19,21 +129,6 @@ qtwebkit-opensource-src (5.2.1+dfsg-6~dyson1) unstable; urgency=medium -- Igor Pashev <pashev.igor@gmail.com> Tue, 29 Apr 2014 11:10:51 +0400 -qtwebkit-opensource-src (5.2.1+dfsg-6) UNRELEASED; urgency=medium - - [ Lisandro Damián Nicanor Pérez Meyer ] - * Rename libqt5webkit5-qmlwebkitplugin to qml-module-qtwebkit, adding proper - Break and Replaces. - * Add qtdeclarative5-dev as a dependency of libqt5webkit5-dev as it seems - to be a requirement for stuff building with webkit. - * Update symbols files with buildd's logs. - * Remove prune-nonfree from debian/rules and instead use Files-Excluded in - debian/copyright. - * Remove dygraph-combined.js from the original tarball: minified javascript - without source. - - -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 06 Apr 2014 10:04:08 -0300 - qtwebkit-opensource-src (5.2.1+dfsg-5) unstable; urgency=medium * Upload to unstable. diff --git a/debian/control b/debian/control index a2f086c..0470a9a 100644 --- a/debian/control +++ b/debian/control @@ -19,8 +19,8 @@ Build-Depends: bison, libicu-dev, libjpeg-dev, libpng-dev, - libqt5opengl5-dev (>= 5.2.1+dfsg~), - libqt5xmlpatterns5-private-dev (>= 5.2.1~), + libqt5opengl5-dev (>= 5.3.2+dfsg~), + libqt5xmlpatterns5-private-dev (>= 5.3.2~), libsqlite3-dev, libwebp-dev, libxcomposite-dev, @@ -32,20 +32,20 @@ Build-Depends: bison, pkg-kde-tools (>= 0.6.4), python-minimal, python2.7, - qtbase5-private-dev (>= 5.2.1+dfsg~), - qtdeclarative5-private-dev (>= 5.2.1~), - qtscript5-private-dev (>= 5.2.1~), + qtbase5-private-dev (>= 5.3.2+dfsg~), + qtdeclarative5-private-dev (>= 5.3.2~), + qtscript5-private-dev (>= 5.3.2~), ruby -Build-Depends-Indep: libqt5sql5-sqlite, qttools5-dev-tools (>= 5.2.1~) Standards-Version: 3.9.5 Section: libs Homepage: http://trac.webkit.org/wiki/QtWebKit Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qt5webkit.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qt5webkit.git;a=summary +Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/qt/qt5webkit.git Package: libqt5webkit5-dev Section: libdevel Architecture: any +Multi-Arch: same Pre-Depends: dpkg (>= 1.15.6~) Depends: libqt5webkit5 (= ${binary:Version}), qtbase5-dev, @@ -69,16 +69,6 @@ Description: Web content engine library for Qt . This package contains the QtWebKit libraries. -Package: libqt5webkit5-qmlwebkitplugin -Architecture: all -Section: oldlibs -Depends: qml-module-qtwebkit, ${misc:Depends} -Description: transitional dummy package for Qt WebKit QML module - QtWebKit provides a Web browser engine that makes it easy to embed content - from the World Wide Web into your Qt application. - . - This is a transitional dummy package which can be safely removed. - Package: qml-module-qtwebkit Architecture: any Multi-Arch: same @@ -104,17 +94,6 @@ Description: Web content engine library for Qt - debugging symbols . This package contains the debugging symbols for the Qt WebKit library. -Package: qtwebkit5-doc -Priority: extra -Architecture: all -Section: doc -Depends: ${misc:Depends} -Description: Qt 5 webkit documentation - Qt is a cross-platform C++ application framework. Qt's primary feature - is its rich set of widgets that provide standard GUI functionality. - . - This package contains the documentation for the Qt 5 webkit libraries. - Package: qtwebkit5-doc-html Priority: extra Architecture: all diff --git a/debian/libqt5webkit5-dev.install b/debian/libqt5webkit5-dev.install index ce23ae7..38caf83 100644 --- a/debian/libqt5webkit5-dev.install +++ b/debian/libqt5webkit5-dev.install @@ -1,49 +1,49 @@ -usr/include/qt5/QtWebKit/QWebDatabase -usr/include/qt5/QtWebKit/QWebElement -usr/include/qt5/QtWebKit/QWebElementCollection -usr/include/qt5/QtWebKit/QWebFullScreenVideoHandler -usr/include/qt5/QtWebKit/QWebHapticFeedbackPlayer -usr/include/qt5/QtWebKit/QWebHistory -usr/include/qt5/QtWebKit/QWebHistoryInterface -usr/include/qt5/QtWebKit/QWebHistoryItem -usr/include/qt5/QtWebKit/QWebKitPlatformPlugin -usr/include/qt5/QtWebKit/QWebNotificationData -usr/include/qt5/QtWebKit/QWebNotificationPresenter -usr/include/qt5/QtWebKit/QWebPluginFactory -usr/include/qt5/QtWebKit/QWebSecurityOrigin -usr/include/qt5/QtWebKit/QWebSelectData -usr/include/qt5/QtWebKit/QWebSelectMethod -usr/include/qt5/QtWebKit/QWebSettings -usr/include/qt5/QtWebKit/QWebSpellChecker -usr/include/qt5/QtWebKit/QWebTouchModifier -usr/include/qt5/QtWebKit/QtWebKit -usr/include/qt5/QtWebKit/QtWebKitDepends -usr/include/qt5/QtWebKit/QtWebKitVersion -usr/include/qt5/QtWebKit/qtwebkitversion.h -usr/include/qt5/QtWebKit/qwebdatabase.h -usr/include/qt5/QtWebKit/qwebelement.h -usr/include/qt5/QtWebKit/qwebhistory.h -usr/include/qt5/QtWebKit/qwebhistoryinterface.h -usr/include/qt5/QtWebKit/qwebkitglobal.h -usr/include/qt5/QtWebKit/qwebkitplatformplugin.h -usr/include/qt5/QtWebKit/qwebpluginfactory.h -usr/include/qt5/QtWebKit/qwebsecurityorigin.h -usr/include/qt5/QtWebKit/qwebsettings.h -usr/include/qt5/QtWebKitWidgets/QGraphicsWebView -usr/include/qt5/QtWebKitWidgets/QWebFrame -usr/include/qt5/QtWebKitWidgets/QWebHitTestResult -usr/include/qt5/QtWebKitWidgets/QWebInspector -usr/include/qt5/QtWebKitWidgets/QWebPage -usr/include/qt5/QtWebKitWidgets/QWebView -usr/include/qt5/QtWebKitWidgets/QtWebKitWidgets -usr/include/qt5/QtWebKitWidgets/QtWebKitWidgetsDepends -usr/include/qt5/QtWebKitWidgets/QtWebKitWidgetsVersion -usr/include/qt5/QtWebKitWidgets/qgraphicswebview.h -usr/include/qt5/QtWebKitWidgets/qtwebkitwidgetsversion.h -usr/include/qt5/QtWebKitWidgets/qwebframe.h -usr/include/qt5/QtWebKitWidgets/qwebinspector.h -usr/include/qt5/QtWebKitWidgets/qwebpage.h -usr/include/qt5/QtWebKitWidgets/qwebview.h +usr/include/*/qt5/QtWebKit/QWebDatabase +usr/include/*/qt5/QtWebKit/QWebElement +usr/include/*/qt5/QtWebKit/QWebElementCollection +usr/include/*/qt5/QtWebKit/QWebFullScreenVideoHandler +usr/include/*/qt5/QtWebKit/QWebHapticFeedbackPlayer +usr/include/*/qt5/QtWebKit/QWebHistory +usr/include/*/qt5/QtWebKit/QWebHistoryInterface +usr/include/*/qt5/QtWebKit/QWebHistoryItem +usr/include/*/qt5/QtWebKit/QWebKitPlatformPlugin +usr/include/*/qt5/QtWebKit/QWebNotificationData +usr/include/*/qt5/QtWebKit/QWebNotificationPresenter +usr/include/*/qt5/QtWebKit/QWebPluginFactory +usr/include/*/qt5/QtWebKit/QWebSecurityOrigin +usr/include/*/qt5/QtWebKit/QWebSelectData +usr/include/*/qt5/QtWebKit/QWebSelectMethod +usr/include/*/qt5/QtWebKit/QWebSettings +usr/include/*/qt5/QtWebKit/QWebSpellChecker +usr/include/*/qt5/QtWebKit/QWebTouchModifier +usr/include/*/qt5/QtWebKit/QtWebKit +usr/include/*/qt5/QtWebKit/QtWebKitDepends +usr/include/*/qt5/QtWebKit/QtWebKitVersion +usr/include/*/qt5/QtWebKit/qtwebkitversion.h +usr/include/*/qt5/QtWebKit/qwebdatabase.h +usr/include/*/qt5/QtWebKit/qwebelement.h +usr/include/*/qt5/QtWebKit/qwebhistory.h +usr/include/*/qt5/QtWebKit/qwebhistoryinterface.h +usr/include/*/qt5/QtWebKit/qwebkitglobal.h +usr/include/*/qt5/QtWebKit/qwebkitplatformplugin.h +usr/include/*/qt5/QtWebKit/qwebpluginfactory.h +usr/include/*/qt5/QtWebKit/qwebsecurityorigin.h +usr/include/*/qt5/QtWebKit/qwebsettings.h +usr/include/*/qt5/QtWebKitWidgets/QGraphicsWebView +usr/include/*/qt5/QtWebKitWidgets/QWebFrame +usr/include/*/qt5/QtWebKitWidgets/QWebHitTestResult +usr/include/*/qt5/QtWebKitWidgets/QWebInspector +usr/include/*/qt5/QtWebKitWidgets/QWebPage +usr/include/*/qt5/QtWebKitWidgets/QWebView +usr/include/*/qt5/QtWebKitWidgets/QtWebKitWidgets +usr/include/*/qt5/QtWebKitWidgets/QtWebKitWidgetsDepends +usr/include/*/qt5/QtWebKitWidgets/QtWebKitWidgetsVersion +usr/include/*/qt5/QtWebKitWidgets/qgraphicswebview.h +usr/include/*/qt5/QtWebKitWidgets/qtwebkitwidgetsversion.h +usr/include/*/qt5/QtWebKitWidgets/qwebframe.h +usr/include/*/qt5/QtWebKitWidgets/qwebinspector.h +usr/include/*/qt5/QtWebKitWidgets/qwebpage.h +usr/include/*/qt5/QtWebKitWidgets/qwebview.h usr/lib/*/cmake/Qt5WebKit/Qt5WebKitConfig.cmake usr/lib/*/cmake/Qt5WebKit/Qt5WebKitConfigVersion.cmake usr/lib/*/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsConfig.cmake diff --git a/debian/libqt5webkit5.symbols b/debian/libqt5webkit5.symbols index e72b513..b7d0227 100644 --- a/debian/libqt5webkit5.symbols +++ b/debian/libqt5webkit5.symbols @@ -1,4 +1,4 @@ -# SymbolsHelper-Confirmed: 5.2.1 amd64 armel armhf hurd-i386 i386 illumos-amd64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 s390x sparc +# SymbolsHelper-Confirmed: 5.3.2 ppc64el libQt5WebKit.so.5 libqt5webkit5 #MINVER# JSCheckScriptSyntax@Base 5.0.2 JSClassCreate@Base 5.0.2 @@ -1294,9 +1294,9 @@ libQt5WebKit.so.5 libqt5webkit5 #MINVER# _ZN12QWebSettings31offlineWebApplicationCacheQuotaEv@Base 5.0.2 _ZN12QWebSettings33setOfflineWebApplicationCachePathERK7QString@Base 5.0.2 _ZN12QWebSettings34setOfflineWebApplicationCacheQuotaEx@Base 5.0.2 - _ZN12QWebSettingsC1EPN7WebCore8SettingsE@Base 5.0.2 + _ZN12QWebSettingsC1EPN7WebCore8SettingsEPNS0_13GroupSettingsE@Base 5.3.0 _ZN12QWebSettingsC1Ev@Base 5.0.2 - _ZN12QWebSettingsC2EPN7WebCore8SettingsE@Base 5.0.2 + _ZN12QWebSettingsC2EPN7WebCore8SettingsEPNS0_13GroupSettingsE@Base 5.3.0 _ZN12QWebSettingsC2Ev@Base 5.0.2 _ZN12QWebSettingsD1Ev@Base 5.0.2 _ZN12QWebSettingsD2Ev@Base 5.0.2 @@ -1370,9 +1370,6 @@ libQt5WebKit.so.5 libqt5webkit5 #MINVER# _ZN13QQuickWebViewD0Ev@Base 5.0.2 _ZN13QQuickWebViewD1Ev@Base 5.0.2 _ZN13QQuickWebViewD2Ev@Base 5.0.2 - _ZN13QSGRenderNodeD0Ev@Base 5.0.2 - _ZN13QSGRenderNodeD1Ev@Base 5.0.2 - _ZN13QSGRenderNodeD2Ev@Base 5.0.2 _ZN14OpaqueJSString6createERKN3WTF6StringE@Base 5.0.2 _ZN14QWebPluginInfo10setEnabledEb@Base 5.0.2 _ZN14QWebPluginInfoC1EPN7WebCore13PluginPackageE@Base 5.0.2 @@ -1428,6 +1425,7 @@ libQt5WebKit.so.5 libqt5webkit5 #MINVER# _ZN15QWebPageAdapter18setContentEditableEb@Base 5.0.2 _ZN15QWebPageAdapter18setVisibilityStateENS_15VisibilityStateE@Base 5.2.0 _ZN15QWebPageAdapter18treatSchemeAsLocalERK7QString@Base 5.0.2 + _ZN15QWebPageAdapter19setDevicePixelRatioEf@Base 5.3.0 _ZN15QWebPageAdapter20networkAccessManagerEv@Base 5.0.2 _ZN15QWebPageAdapter20updateActionInternalENS_10MenuActionEPKcPbS3_@Base 5.0.2 _ZN15QWebPageAdapter21initializeWebCorePageEv@Base 5.0.2 @@ -1717,9 +1715,6 @@ libQt5WebKit.so.5 libqt5webkit5 #MINVER# _ZN21QtPluginWidgetAdapter16staticMetaObjectE@Base 5.0.2 _ZN21QtPluginWidgetAdapterC1Ev@Base 5.0.2 _ZN21QtPluginWidgetAdapterC2Ev@Base 5.0.2 - _ZN21QtPluginWidgetAdapterD0Ev@Base 5.0.2 - _ZN21QtPluginWidgetAdapterD1Ev@Base 5.0.2 - _ZN21QtPluginWidgetAdapterD2Ev@Base 5.0.2 _ZN22QWebHistoryItemPrivate4coreEPK15QWebHistoryItem@Base 5.0.2 _ZN23DumpRenderTreeSupportQt10initializeEv@Base 5.0.2 _ZN23DumpRenderTreeSupportQt11clearOpenerEP16QWebFrameAdapter@Base 5.0.2 @@ -2182,8 +2177,7 @@ libQt5WebKit.so.5 libqt5webkit5 #MINVER# _ZN3JSC7JSProxy9setTargetERNS_2VMEPNS_14JSGlobalObjectE@Base 5.2.0 _ZN3JSC7JSScope13objectAtScopeEPS0_@Base 5.0.2 _ZN3JSC7JSValue13isValidCalleeEv@Base 5.0.2 - (arch=!illumos-amd64)_ZN3JSC7Options14dumpAllOptionsEP8_IO_FILE@Base 5.0.2 - (arch=illumos-amd64)_ZN3JSC7Options14dumpAllOptionsEP6__FILE@Base 5.2.1+dfsg-6~dyson1 + _ZN3JSC7Options14dumpAllOptionsEP8_IO_FILE@Base 5.0.2 _ZN3JSC7Options9s_optionsE@Base 5.0.2 _ZN3JSC7Options9setOptionEPKc@Base 5.0.2 _ZN3JSC7Profile10restoreAllEv@Base 5.0.2 @@ -2598,9 +2592,9 @@ libQt5WebKit.so.5 libqt5webkit5 #MINVER# _ZN3WTF9MediaTimeD2Ev@Base 5.0.2 _ZN3WTF9MediaTimeaSERKS0_@Base 5.0.2 (arch=amd64 illumos-amd64 kfreebsd-amd64 powerpc s390x)_ZN3WTF9dataLogFVEPKcP13__va_list_tag@Base 5.2.1 - (arch=hurd-i386 i386 kfreebsd-i386 ppc64)_ZN3WTF9dataLogFVEPKcPc@Base 5.2.1 - (arch=mips mipsel sparc)_ZN3WTF9dataLogFVEPKcPv@Base 5.2.1 - (arch=armel armhf)_ZN3WTF9dataLogFVEPKcSt9__va_list@Base 5.2.1 + (arch=hurd-i386 i386 kfreebsd-i386 ppc64 ppc64el)_ZN3WTF9dataLogFVEPKcPc@Base 5.3.2 + (arch=mips mips64el mipsel sparc sparc64)_ZN3WTF9dataLogFVEPKcPv@Base 5.3.1 + (arch=arm64 armel armhf)_ZN3WTF9dataLogFVEPKcSt9__va_list@Base 5.3.1 _ZN3WTF9dayInYearEdi@Base 5.0.2 _ZN3WTF9dayInYearEiii@Base 5.2.0 _ZN3WTF9emptyAtomE@Base 5.0.2 @@ -2894,8 +2888,7 @@ libQt5WebKit.so.5 libqt5webkit5 #MINVER# _ZNK25QQuickWebViewExperimental9userAgentEv@Base 5.0.2 _ZNK3JSC10JSFunction10sourceCodeEv@Base 5.0.2 _ZNK3JSC10JSFunction23isHostFunctionNonInlineEv@Base 5.0.2 - (arch=amd64 illumos-amd64 kfreebsd-amd64 ppc64 s390x)_ZNK3JSC11Interpreter18retrieveLastCallerEPNS_9ExecStateERiRlRN3WTF6StringERNS_7JSValueE@Base 5.2.1 - (arch=!amd64 !illumos-amd64 !kfreebsd-amd64 !ppc64 !s390x)_ZNK3JSC11Interpreter18retrieveLastCallerEPNS_9ExecStateERiS3_RN3WTF6StringERNS_7JSValueE@Base 5.0.2 + (optional=gccinternal)_ZNK3JSC11Interpreter18retrieveLastCallerEPNS_9ExecStateERiRlRN3WTF6StringERNS_7JSValueE@Base 5.3.1 _ZNK3JSC12JSRopeString11resolveRopeEPNS_9ExecStateE@Base 5.0.2 _ZNK3JSC12PropertySlot14functionGetterEPNS_9ExecStateE@Base 5.0.2 _ZNK3JSC17DebuggerCallFrame10thisObjectEv@Base 5.0.2 @@ -3079,11 +3072,19 @@ libQt5WebKit.so.5 libqt5webkit5 #MINVER# (optional=templinst|arch=sparc)_ZNSt6vectorIP6TField14pool_allocatorIS1_EE13_M_insert_auxIIRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S4_EEDpOT_@Base 5.2.1 (optional=templinst|arch=sparc)_ZNSt6vectorIPN15DetectCallDepth12FunctionNodeE14pool_allocatorIS2_EE13_M_insert_auxIIRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S5_EEDpOT_@Base 5.2.1 (optional=templinst|arch=sparc)_ZNSt6vectorIPN2pp13MacroExpander12MacroContextESaIS3_EE13_M_insert_auxIIRKS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 5.2.1 + (optional=templinst)_ZNSt6vectorIPcSaIS0_EE19_M_emplace_back_auxIIRKS0_EEEvDpOT_@Base 5.3.0 + (optional=templinst)_ZNSt6vectorIPcSaIS0_EE19_M_emplace_back_auxIIS0_EEEvDpOT_@Base 5.3.0 + (optional=templinst)_ZNSt6vectorIPcSaIS0_EE19_M_emplace_back_auxIJRKS0_EEEvDpOT_@Base 5.3.0 + (optional=templinst)_ZNSt6vectorIPcSaIS0_EE19_M_emplace_back_auxIJS0_EEEvDpOT_@Base 5.3.0 (optional=templinst|arch=sparc)_ZNSt6vectorIS_IN2pp5TokenESaIS1_EESaIS3_EE13_M_insert_auxIIS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 5.2.1 (optional=templinst|arch=sparc)_ZNSt6vectorIS_IN2pp5TokenESaIS1_EESaIS3_EE7reserveEj@Base 5.2.1 (optional=templinst|arch=sparc)_ZNSt6vectorISsSaISsEE13_M_insert_auxIIRKSsEEEvN9__gnu_cxx17__normal_iteratorIPSsS1_EEDpOT_@Base 5.2.1 (optional=templinst|arch=!sparc)_ZNSt6vectorISsSaISsEE19_M_emplace_back_auxIIRKSsEEEvDpOT_@Base 5.2.0 + (optional=templinst)_ZNSt6vectorISsSaISsEE19_M_emplace_back_auxIISsEEEvDpOT_@Base 5.3.0 (optional=templinst|arch=!sparc)_ZNSt6vectorISsSaISsEE19_M_emplace_back_auxIJRKSsEEEvDpOT_@Base 5.2.0 + (optional=templinst)_ZNSt6vectorISsSaISsEE19_M_emplace_back_auxIJSsEEEvDpOT_@Base 5.3.0 + (optional=templinst)_ZNSt6vectorISsSaISsEED1Ev@Base 5.3.0 + (optional=templinst)_ZNSt6vectorISsSaISsEED2Ev@Base 5.3.0 (optional=templinst)_ZNSt6vectorISsSaISsEEaSERKS1_@Base 5.0.2 (optional=templinst|arch=sparc)_ZNSt6vectorISt3mapI10TBasicType10TPrecisionSt4lessIS1_ESaISt4pairIKS1_S2_EEESaIS9_EE13_M_insert_auxIIS9_EEEvN9__gnu_cxx17__normal_iteratorIPS9_SB_EEDpOT_@Base 5.2.1 (optional=templinst|arch=!sparc)_ZNSt6vectorISt3mapI10TBasicType10TPrecisionSt4lessIS1_ESaISt4pairIKS1_S2_EEESaIS9_EE19_M_emplace_back_auxIIS9_EEEvDpOT_@Base 5.2.0 @@ -3091,25 +3092,28 @@ libQt5WebKit.so.5 libqt5webkit5 #MINVER# (optional=templinst|arch=sparc)_ZNSt6vectorIiSaIiEE13_M_insert_auxIIiEEEvN9__gnu_cxx17__normal_iteratorIPiS1_EEDpOT_@Base 5.2.1 (optional=templinst|arch=!sparc)_ZNSt6vectorIiSaIiEE19_M_emplace_back_auxIIiEEEvDpOT_@Base 5.2.0 (optional=templinst|arch=!sparc)_ZNSt6vectorIiSaIiEE19_M_emplace_back_auxIJiEEEvDpOT_@Base 5.2.0 + (optional=templinst)_ZNSt6vectorIjSaIjEE12emplace_backIIjEEEvDpOT_@Base 5.3.0 + (optional=templinst)_ZNSt6vectorIjSaIjEE12emplace_backIJjEEEvDpOT_@Base 5.3.0 (optional=templinst|arch=sparc)_ZNSt6vectorIjSaIjEE13_M_insert_auxIIRKjEEEvN9__gnu_cxx17__normal_iteratorIPjS1_EEDpOT_@Base 5.2.1 (optional=templinst|arch=sparc)_ZNSt6vectorIjSaIjEE13_M_insert_auxIIjEEEvN9__gnu_cxx17__normal_iteratorIPjS1_EEDpOT_@Base 5.2.1 (optional=templinst|subst)_ZNSt6vectorIjSaIjEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPjS1_EE{size_t}RKj@Base 5.2.0 + (optional=templinst)_ZNSt6vectorIjSaIjEE19_M_emplace_back_auxIIjEEEvDpOT_@Base 5.3.0 + (optional=templinst)_ZNSt6vectorIjSaIjEE19_M_emplace_back_auxIJjEEEvDpOT_@Base 5.3.0 + (optional=templinst)_ZNSt6vectorImSaImEE12emplace_backIImEEEvDpOT_@Base 5.3.0 + (optional=templinst)_ZNSt6vectorImSaImEE12emplace_backIJmEEEvDpOT_@Base 5.3.0 (optional=templinst|subst|arch=!sparc)_ZNSt6vectorI{size_t}SaI{size_t}EE19_M_emplace_back_auxIIRK{size_t}EEEvDpOT_@Base 5.2.0 (optional=templinst|subst|arch=!sparc)_ZNSt6vectorI{size_t}SaI{size_t}EE19_M_emplace_back_auxII{size_t}EEEvDpOT_@Base 5.2.0 (optional=templinst|subst|arch=!sparc)_ZNSt6vectorI{size_t}SaI{size_t}EE19_M_emplace_back_auxIJRK{size_t}EEEvDpOT_@Base 5.2.0 (optional=templinst|subst|arch=!sparc)_ZNSt6vectorI{size_t}SaI{size_t}EE19_M_emplace_back_auxIJ{size_t}EEEvDpOT_@Base 5.2.0 - (optional=templinst|subst)_ZNSt6vectorI{size_t}SaI{size_t}EE7reserveE{size_t}@Base 5.2.0 (optional=templinst|arch=sparc)_ZNSt8_Rb_treeI10TBasicTypeSt4pairIKS0_10TPrecisionESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE10_M_insert_IS4_EESt17_Rb_tree_iteratorIS4_EPKSt18_Rb_tree_node_baseSG_OT_@Base 5.2.1 (optional=templinst|arch=sparc)_ZNSt8_Rb_treeI10TBasicTypeSt4pairIKS0_10TPrecisionESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE16_M_insert_uniqueIS4_EES1_ISt17_Rb_tree_iteratorIS4_EbEOT_@Base 5.2.1 (optional=templinst|arch=sparc)_ZNSt8_Rb_treeI10TBasicTypeSt4pairIKS0_10TPrecisionESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE17_M_insert_unique_IS4_EESt17_Rb_tree_iteratorIS4_ESt23_Rb_tree_const_iteratorIS4_EOT_@Base 5.2.1 (optional=templinst|arch=armel armhf hurd-i386 i386 kfreebsd-i386 mips mipsel powerpc ppc64 s390x)_ZNSt8_Rb_treeI10TBasicTypeSt4pairIKS0_10TPrecisionESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE22_M_emplace_hint_uniqueIIRKSt21piecewise_construct_tSt5tupleIIRS2_EESF_IIEEEEESt17_Rb_tree_iteratorIS4_ESt23_Rb_tree_const_iteratorIS4_EDpOT_@Base 5.2.0 (optional=templinst|arch=armel armhf hurd-i386 i386 kfreebsd-i386 mips mipsel powerpc ppc64 s390x)_ZNSt8_Rb_treeI10TBasicTypeSt4pairIKS0_10TPrecisionESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS2_EESF_IJEEEEESt17_Rb_tree_iteratorIS4_ESt23_Rb_tree_const_iteratorIS4_EDpOT_@Base 5.2.0 (optional=templinst|arch=!sparc)_ZNSt8_Rb_treeI10TBasicTypeSt4pairIKS0_10TPrecisionESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE24_M_get_insert_unique_posERS2_@Base 5.0.2 - (optional=templinst|arch=amd64 illumos-amd64 kfreebsd-amd64)_ZNSt8_Rb_treeI10TBasicTypeSt4pairIKS0_10TPrecisionESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS4_ERS2_@Base 5.2.0 + (optional=templinst|arch=amd64 arm64 illumos-amd64 kfreebsd-amd64 mips64el ppc64el sparc64)_ZNSt8_Rb_treeI10TBasicTypeSt4pairIKS0_10TPrecisionESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS4_ERS2_@Base 5.2.0 (optional=templinst|arch=sparc)_ZNSt8_Rb_treeI10TBasicTypeSt4pairIKS0_10TPrecisionESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE4swapERSA_@Base 5.2.1 (optional=templinst)_ZNSt8_Rb_treeI10TBasicTypeSt4pairIKS0_10TPrecisionESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE8_M_eraseEPSt13_Rb_tree_nodeIS4_E@Base 5.0.2 - (optional=templinst|arch=!amd64 !armel !armhf !hurd-i386 !i386 !illumos-amd64 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !sparc)_ZNSt8_Rb_treeI10TBasicTypeSt4pairIKS0_10TPrecisionESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EEC1EOSA_@Base 5.2.1 - (optional=templinst|arch=!amd64 !armel !armhf !hurd-i386 !i386 !illumos-amd64 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !sparc)_ZNSt8_Rb_treeI10TBasicTypeSt4pairIKS0_10TPrecisionESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EEC2EOSA_@Base 5.2.1 (optional=templinst|arch=sparc)_ZNSt8_Rb_treeIP10TGraphNodeS1_St9_IdentityIS1_ESt4lessIS1_ESaIS1_EE10_M_insert_IRKS1_EESt17_Rb_tree_iteratorIS1_EPKSt18_Rb_tree_node_baseSF_OT_@Base 5.2.1 (optional=templinst|arch=sparc)_ZNSt8_Rb_treeIP10TGraphNodeS1_St9_IdentityIS1_ESt4lessIS1_ESaIS1_EE16_M_insert_uniqueIRKS1_EESt4pairISt17_Rb_tree_iteratorIS1_EbEOT_@Base 5.2.1 (optional=templinst|arch=sparc)_ZNSt8_Rb_treeIP10TGraphNodeS1_St9_IdentityIS1_ESt4lessIS1_ESaIS1_EE8_M_eraseEPSt13_Rb_tree_nodeIS1_E@Base 5.2.1 @@ -3135,8 +3139,8 @@ libQt5WebKit.so.5 libqt5webkit5 #MINVER# (optional=templinst|arch=armel armhf hurd-i386 i386 kfreebsd-i386 mips mipsel powerpc ppc64 s390x)_ZNSt8_Rb_treeISsSt4pairIKSs9TBehaviorESt10_Select1stIS3_ESt4lessISsESaIS3_EE22_M_emplace_hint_uniqueIIRKSt21piecewise_construct_tSt5tupleIIOSsEESE_IIEEEEESt17_Rb_tree_iteratorIS3_ESt23_Rb_tree_const_iteratorIS3_EDpOT_@Base 5.2.0 (optional=templinst|arch=armel armhf hurd-i386 i386 kfreebsd-i386 mips mipsel powerpc ppc64 s390x)_ZNSt8_Rb_treeISsSt4pairIKSs9TBehaviorESt10_Select1stIS3_ESt4lessISsESaIS3_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJOSsEESE_IJEEEEESt17_Rb_tree_iteratorIS3_ESt23_Rb_tree_const_iteratorIS3_EDpOT_@Base 5.2.0 (optional=templinst|arch=!sparc)_ZNSt8_Rb_treeISsSt4pairIKSs9TBehaviorESt10_Select1stIS3_ESt4lessISsESaIS3_EE24_M_get_insert_unique_posERS1_@Base 5.0.2 - (optional=templinst|arch=amd64 illumos-amd64 kfreebsd-amd64)_ZNSt8_Rb_treeISsSt4pairIKSs9TBehaviorESt10_Select1stIS3_ESt4lessISsESaIS3_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS3_ERS1_@Base 5.2.0 - (optional=templinst|arch=amd64 armel armhf illumos-amd64 kfreebsd-amd64)_ZNSt8_Rb_treeISsSt4pairIKSs9TBehaviorESt10_Select1stIS3_ESt4lessISsESaIS3_EE4findERS1_@Base 5.2.0 + (optional=templinst|arch=amd64 arm64 illumos-amd64 kfreebsd-amd64 mips64el ppc64el sparc64)_ZNSt8_Rb_treeISsSt4pairIKSs9TBehaviorESt10_Select1stIS3_ESt4lessISsESaIS3_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS3_ERS1_@Base 5.2.0 + (optional=templinst|arch=amd64 arm64 armel armhf illumos-amd64 kfreebsd-amd64 mips64el ppc64el sparc64)_ZNSt8_Rb_treeISsSt4pairIKSs9TBehaviorESt10_Select1stIS3_ESt4lessISsESaIS3_EE4findERS1_@Base 5.2.0 (optional=templinst)_ZNSt8_Rb_treeISsSt4pairIKSs9TBehaviorESt10_Select1stIS3_ESt4lessISsESaIS3_EE8_M_eraseEPSt13_Rb_tree_nodeIS3_E@Base 5.0.2 (optional=templinst|arch=sparc)_ZNSt8_Rb_treeISsSt4pairIKSsN2pp5MacroEESt10_Select1stIS4_ESt4lessISsESaIS4_EE10_M_insert_IS0_ISsS3_EEESt17_Rb_tree_iteratorIS4_EPKSt18_Rb_tree_node_baseSH_OT_@Base 5.2.1 (optional=templinst|arch=sparc)_ZNSt8_Rb_treeISsSt4pairIKSsN2pp5MacroEESt10_Select1stIS4_ESt4lessISsESaIS4_EE16_M_insert_uniqueIS0_ISsS3_EEES0_ISt17_Rb_tree_iteratorIS4_EbEOT_@Base 5.2.1 @@ -3150,11 +3154,18 @@ libQt5WebKit.so.5 libqt5webkit5 #MINVER# (optional=templinst|arch=!sparc)_ZNSt8_Rb_treeISsSt4pairIKSsSsESt10_Select1stIS2_ESt4lessISsESaIS2_EE22_M_emplace_hint_uniqueIIRKSt21piecewise_construct_tSt5tupleIIOSsEESD_IIEEEEESt17_Rb_tree_iteratorIS2_ESt23_Rb_tree_const_iteratorIS2_EDpOT_@Base 5.2.0 (optional=templinst|arch=!sparc)_ZNSt8_Rb_treeISsSt4pairIKSsSsESt10_Select1stIS2_ESt4lessISsESaIS2_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJOSsEESD_IJEEEEESt17_Rb_tree_iteratorIS2_ESt23_Rb_tree_const_iteratorIS2_EDpOT_@Base 5.2.0 (optional=templinst|arch=!sparc)_ZNSt8_Rb_treeISsSt4pairIKSsSsESt10_Select1stIS2_ESt4lessISsESaIS2_EE24_M_get_insert_unique_posERS1_@Base 5.2.0 - (optional=templinst|arch=amd64 illumos-amd64 kfreebsd-amd64)_ZNSt8_Rb_treeISsSt4pairIKSsSsESt10_Select1stIS2_ESt4lessISsESaIS2_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS2_ERS1_@Base 5.2.0 + (optional=templinst|arch=amd64 arm64 illumos-amd64 kfreebsd-amd64 mips64el ppc64el sparc64)_ZNSt8_Rb_treeISsSt4pairIKSsSsESt10_Select1stIS2_ESt4lessISsESaIS2_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS2_ERS1_@Base 5.2.0 (optional=templinst)_ZNSt8_Rb_treeISsSt4pairIKSsSsESt10_Select1stIS2_ESt4lessISsESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 5.0.2 + (optional=templinst)_ZNSt8_Rb_treeISt4pairIimES1_St9_IdentityIS1_ESt4lessIS1_ESaIS1_EE16_M_insert_uniqueIS1_EES0_ISt17_Rb_tree_iteratorIS1_EbEOT_@Base 5.3.0 + (optional=templinst)_ZNSt8_Rb_treeISt4pairIimES1_St9_IdentityIS1_ESt4lessIS1_ESaIS1_EE8_M_eraseEPSt13_Rb_tree_nodeIS1_E@Base 5.3.0 (optional=templinst|arch=sparc)_ZNSt8_Rb_treeIiSt4pairIKiP12TGraphSymbolESt10_Select1stIS4_ESt4lessIiE14pool_allocatorIS4_EE10_M_insert_IRS0_IiS3_EEESt17_Rb_tree_iteratorIS4_EPKSt18_Rb_tree_node_baseSJ_OT_@Base 5.2.1 (optional=templinst|arch=sparc)_ZNSt8_Rb_treeIiSt4pairIKiP12TGraphSymbolESt10_Select1stIS4_ESt4lessIiE14pool_allocatorIS4_EE16_M_insert_uniqueIRS0_IiS3_EEES0_ISt17_Rb_tree_iteratorIS4_EbEOT_@Base 5.2.1 (optional=templinst|arch=sparc)_ZNSt8_Rb_treeIiSt4pairIKiP12TGraphSymbolESt10_Select1stIS4_ESt4lessIiE14pool_allocatorIS4_EE8_M_eraseEPSt13_Rb_tree_nodeIS4_E@Base 5.2.1 + (optional=templinst)_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImESaImEE16_M_insert_uniqueIRKmEESt4pairISt17_Rb_tree_iteratorImEbEOT_@Base 5.3.0 + (optional=templinst|arch=amd64 arm64 illumos-amd64 kfreebsd-amd64 mips64el ppc64el sparc64)_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImESaImEE4findERKm@Base 5.3.0 + (optional=templinst)_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImESaImEE5eraseERKm@Base 5.3.0 + (optional=templinst)_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImESaImEE7_M_copyEPKSt13_Rb_tree_nodeImEPS7_@Base 5.3.0 + (optional=templinst)_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImESaImEE8_M_eraseEPSt13_Rb_tree_nodeImE@Base 5.3.0 (optional=templinst|arch=sparc)_ZSt10__pop_heapIPN3WTF6RefPtrIN7WebCore21CustomFilterParameterEEEPFbRKS4_S7_EEvT_SA_SA_T0_@Base 5.2.1 (optional=templinst|arch=sparc)_ZSt10__pop_heapIPN3WTF6StringEPFbRKS1_S4_EEvT_S7_S7_T0_@Base 5.2.1 (optional=templinst|arch=sparc)_ZSt11__push_heapIN7WebCore17TimerHeapIteratorEiPNS0_9TimerBaseENS0_25TimerHeapLessThanFunctionEEvT_T0_S6_T1_T2_@Base 5.2.1 @@ -3185,8 +3196,6 @@ libQt5WebKit.so.5 libqt5webkit5 #MINVER# (optional=templinst|arch=sparc)_ZSt13__adjust_heapIPPN7WebCore15RenderTableCellEiS2_PFbS2_S2_EEvT_T0_S7_T1_T2_@Base 5.2.1 (optional=templinst|arch=sparc)_ZSt13__adjust_heapIPPN7WebCore9GridTrackEiS2_PFbPKS1_S5_EEvT_T0_S9_T1_T2_@Base 5.2.1 (optional=templinst|arch=sparc)_ZSt13__adjust_heapIPSt4pairIPN3WTF16AtomicStringImplENS1_12AtomicStringEEiS5_PFbRKS5_S8_EEvT_T0_SC_T1_T2_@Base 5.2.1 - (optional=templinst|subst)_ZSt13__adjust_heapIPi{ssize_t}iEvT_T0_S2_T1_@Base 5.2.0 - (optional=templinst|subst)_ZSt13__adjust_heapIPj{ssize_t}jEvT_T0_S2_T1_@Base 5.2.0 (optional=templinst|arch=sparc)_ZSt13__heap_selectIPN3WTF8SpectrumIPvE11KeyAndCountEEvT_S6_S6_@Base 5.2.1 (optional=templinst|arch=sparc)_ZSt13__heap_selectIPN7WebCore13ShapeIntervalENS0_20IntervalX1ComparatorEEvT_S4_S4_T0_@Base 5.2.1 (optional=templinst|arch=sparc)_ZSt13__heap_selectIPN7WebCore15ICOImageDecoder18IconDirectoryEntryEPFbRKS2_S5_EEvT_S8_S8_T0_@Base 5.2.1 @@ -3224,8 +3233,6 @@ libQt5WebKit.so.5 libqt5webkit5 #MINVER# (optional=templinst|arch=sparc)_ZSt16__insertion_sortIPPN7WebCore9GridTrackEPFbPKS1_S5_EEvT_S8_T0_@Base 5.2.1 (optional=templinst|arch=sparc)_ZSt16__insertion_sortIPSt4pairIN7WebCore4KURLES2_EPFbRKS3_S6_EEvT_S9_T0_@Base 5.2.1 (optional=templinst|arch=sparc)_ZSt16__insertion_sortIPSt4pairIPN3WTF16AtomicStringImplENS1_12AtomicStringEEPFbRKS5_S8_EEvT_SB_T0_@Base 5.2.1 - (optional=templinst)_ZSt16__insertion_sortIPiEvT_S1_@Base 5.0.2 - (optional=templinst)_ZSt16__insertion_sortIPjEvT_S1_@Base 5.0.2 (optional=templinst|arch=sparc)_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIP13TVariableInfoSt6vectorIS2_SaIS2_EEEEi21TVariableInfoComparerEvT_S9_T0_T1_@Base 5.2.1 (optional=templinst|arch=sparc)_ZSt16__introsort_loopIPN3WTF6RefPtrIN7WebCore16MutationObserverEEEiNS3_16ObserverLessThanEEvT_S7_T0_T1_@Base 5.2.1 (optional=templinst|arch=sparc)_ZSt16__introsort_loopIPN3WTF6RefPtrIN7WebCore21CustomFilterParameterEEEiPFbRKS4_S7_EEvT_SA_T0_T1_@Base 5.2.1 @@ -3243,8 +3250,6 @@ libQt5WebKit.so.5 libqt5webkit5 #MINVER# (optional=templinst|arch=sparc)_ZSt16__introsort_loopIPPN7WebCore15RenderTableCellEiPFbS2_S2_EEvT_S6_T0_T1_@Base 5.2.1 (optional=templinst|arch=sparc)_ZSt16__introsort_loopIPPN7WebCore9GridTrackEiPFbPKS1_S5_EEvT_S8_T0_T1_@Base 5.2.1 (optional=templinst|arch=sparc)_ZSt16__introsort_loopIPSt4pairIPN3WTF16AtomicStringImplENS1_12AtomicStringEEiPFbRKS5_S8_EEvT_SB_T0_T1_@Base 5.2.1 - (optional=templinst|subst)_ZSt16__introsort_loopIPi{ssize_t}EvT_S1_T0_@Base 5.2.0 - (optional=templinst|subst)_ZSt16__introsort_loopIPj{ssize_t}EvT_S1_T0_@Base 5.2.0 (optional=templinst|arch=sparc)_ZSt16__merge_adaptiveIPN7WebCore20CSSGradientColorStopEiS2_PFbRKS1_S4_EEvT_S7_S7_T0_S8_T1_S8_T2_@Base 5.2.1 (optional=templinst|arch=sparc)_ZSt16__merge_adaptiveIPN7WebCore8Gradient9ColorStopEiS3_PFbRKS2_S5_EEvT_S8_S8_T0_S9_T1_S9_T2_@Base 5.2.1 (optional=templinst|arch=sparc)_ZSt16__merge_adaptiveIPPN7WebCore11CSSFontFaceEiS3_PFbS2_S2_EEvT_S6_S6_T0_S7_T1_S7_T2_@Base 5.2.1 @@ -3330,15 +3335,12 @@ libQt5WebKit.so.5 libqt5webkit5 #MINVER# (optional=templinst|arch=sparc)_ZSt30__move_merge_adaptive_backwardIPPN7WebCore13StyleRulePageES3_S3_PFbPKS1_S5_EEvT_S8_T0_S9_T1_T2_@Base 5.2.1 (optional=templinst|arch=sparc)_ZSt30__move_merge_adaptive_backwardIPPN7WebCore15RenderTableCellES3_S3_PFbS2_S2_EEvT_S6_T0_S7_T1_T2_@Base 5.2.1 (optional=templinst|arch=sparc)_ZSt30__move_merge_adaptive_backwardIPSt4pairIN7WebCore4KURLES2_ES4_S4_PFbRKS3_S6_EEvT_S9_T0_SA_T1_T2_@Base 5.2.1 - (optional=templinst)_ZSt3maxIfERKT_S2_S2_@Base 5.0.2 - (optional=templinst)_ZSt3minIfERKT_S2_S2_@Base 5.0.2 (optional=templinst|arch=sparc)_ZSt4moveIPSt4pairIN7WebCore4KURLES2_ES4_ET0_T_S6_S5_@Base 5.2.1 (optional=templinst|arch=sparc)_ZSt4sortIPPKN7WebCore8RuleDataEPFbS3_S3_EEvT_S7_T0_@Base 5.2.1 (optional=templinst|arch=sparc)_ZSt4sortIPPN7WebCore15RenderTableCellEPFbS2_S2_EEvT_S6_T0_@Base 5.2.1 (optional=templinst|arch=sparc)_ZSt4sortIPjEvT_S1_@Base 5.2.1 (optional=templinst|arch=sparc)_ZSt4swapIN3WTF12AtomicStringEEvRT_S3_@Base 5.2.1 (optional=templinst|arch=armel armhf hurd-i386 i386 kfreebsd-i386 mips mipsel powerpc)_ZSt4swapIN8QVariant7PrivateEEvRT_S3_@Base 5.2.0 - (optional=templinst)_ZSt6__findIN9__gnu_cxx17__normal_iteratorIPKSsSt6vectorISsSaISsEEEESsET_S8_S8_RKT0_St26random_access_iterator_tag@Base 5.0.2 (optional=templinst|arch=sparc)_ZSt6__findIPKN3WTF6StringES1_ET_S4_S4_RKT0_St26random_access_iterator_tag@Base 5.2.1 (optional=templinst|arch=sparc)_ZSt8__rotateIPN7WebCore20CSSGradientColorStopEEvT_S3_S3_St26random_access_iterator_tag@Base 5.2.1 (optional=templinst|arch=sparc)_ZSt8__rotateIPN7WebCore8Gradient9ColorStopEEvT_S4_S4_St26random_access_iterator_tag@Base 5.2.1 @@ -3386,6 +3388,8 @@ libQt5WebKit.so.5 libqt5webkit5 #MINVER# _ZTIN3JSC8DebuggerE@Base 5.0.2 (arch=sparc)_ZTISt15basic_stringbufIcSt11char_traitsIcE14pool_allocatorIcEE@Base 5.2.1 (arch=sparc)_ZTISt19basic_ostringstreamIcSt11char_traitsIcE14pool_allocatorIcEE@Base 5.2.1 + _ZTIZ26leveldb_writebatch_iterateE1H@Base 5.3.0 + _ZTIZ33leveldb_filterpolicy_create_bloomE7Wrapper@Base 5.3.0 _ZTS11QWebKitTest@Base 5.0.2 _ZTS13QQuickWebPage@Base 5.0.2 _ZTS13QQuickWebView@Base 5.0.2 diff --git a/debian/patches/blacklist_libkpartsplugin.patch b/debian/patches/blacklist_libkpartsplugin.patch new file mode 100644 index 0000000..1508042 --- /dev/null +++ b/debian/patches/blacklist_libkpartsplugin.patch @@ -0,0 +1,30 @@ +From a322d1b1ba39bb83a2ffd41c4dc0c00de5bd77e0 Mon Sep 17 00:00:00 2001 +From: Sune Vuorela <sune@vuorela.dk> +Date: Mon, 13 Oct 2014 20:39:26 +0200 +Subject: [PATCH] Blacklist libkpartsplugin + +KPartsPlugin is built using qt4, and loading that into a Qt5 QtWebkit +makes stuff crash. + +Change-Id: I47d01dfe3b215192b012911013b352ea5b5b1530 +--- + Source/WebCore/plugins/qt/PluginPackageQt.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp +index 679480b..a674ad3 100644 +--- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp ++++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp +@@ -146,7 +146,8 @@ bool PluginPackage::isPluginBlacklisted() + { + // TODO: enumerate all plugins that are incompatible with Qt5. + const QLatin1String pluginBlacklist[] = { +- QLatin1String("skypebuttons") ++ QLatin1String("skypebuttons"), ++ QLatin1String("libkpartsplugin") + }; + + QString baseName = QFileInfo(static_cast<QString>(m_path)).baseName(); +-- +2.1.1 + diff --git a/debian/patches/do_not_use_jit_on_big_endian_machines.patch b/debian/patches/do_not_use_jit_on_big_endian_machines.patch new file mode 100644 index 0000000..b50fdd7 --- /dev/null +++ b/debian/patches/do_not_use_jit_on_big_endian_machines.patch @@ -0,0 +1,41 @@ +From 0b6f959022700ecf9374bdbb13772242d3f7e617 Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen <allan.jensen@digia.com> +Date: Fri, 10 Oct 2014 14:50:18 +0200 +Subject: [PATCH] Do not use JIT on big endian architectures + +All the JIT implementations targets the little-endian versions of ARM, +MIPS and SH4 respectively. So in case anyone builds on those platforms +we should not enable JIT. + +Task-number: QTBUG-41896 +Change-Id: I5be167511e2c3eac6c63e603b82da84fb6b29eaa +Reviewed-by: Julien Brianceau <jbriance@cisco.com> +Reviewed-by: Michael Bruning <michael.bruning@digia.com> +--- + Source/WTF/wtf/Platform.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -128,6 +128,9 @@ + /* CPU(SH4) - SuperH SH-4 */ + #if defined(__SH4__) + #define WTF_CPU_SH4 1 ++#ifdef __BIG_ENDIAN__ ++#define WTF_CPU_BIG_ENDIAN 1 ++#endif + #endif + + /* CPU(SPARC32) - SPARC 32-bit */ +@@ -759,6 +762,11 @@ + #define ENABLE_JIT 0 + #endif + ++/* All the current JIT implementations target little-endian */ ++#if CPU(BIG_ENDIAN) ++#define ENABLE_JIT 0 ++#endif ++ + /* Disable JIT on x32 */ + #if CPU(X32) + #define ENABLE_JIT 0 diff --git a/debian/patches/dont_pollute_pri_and_pc_with_private_deps.patch b/debian/patches/dont_pollute_pri_and_pc_with_private_deps.patch deleted file mode 100644 index fb24c70..0000000 --- a/debian/patches/dont_pollute_pri_and_pc_with_private_deps.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 31a1ec780aaba33c1008b8dc7bca7da88bd297ff Mon Sep 17 00:00:00 2001 -From: Jocelyn Turcotte <jocelyn.turcotte@digia.com> -Date: Tue, 28 Jan 2014 13:07:59 +0100 -Subject: [PATCH] Don't pollute .prl & .pc files with private dependencies - -Also change the creating_module check in needToLink to make sure that -only the main module will try to link directly with the WebCore and -JavaScriptCore static libraries. - -Task-number: QTBUG-35774 -Initial-patch-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> -Change-Id: Ib5992e112803679837249400e98cb8c22636096d ---- - Source/widgetsapi.pri | 1 + - Tools/qmake/mkspecs/features/default_post.prf | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Source/widgetsapi.pri b/Source/widgetsapi.pri -index 7bdc0e1..335e371 100644 ---- a/Source/widgetsapi.pri -+++ b/Source/widgetsapi.pri -@@ -49,6 +49,7 @@ use?(3D_GRAPHICS): WEBKIT += ANGLE - WEBKIT += javascriptcore wtf webcore - - MODULE = webkitwidgets -+CONFIG += creating_module - - # We want the QtWebKit API forwarding includes to live in the root build dir. - MODULE_BASE_DIR = $$_PRO_FILE_PWD_ -diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf -index 6fae22f..548005d 100644 ---- a/Tools/qmake/mkspecs/features/default_post.prf -+++ b/Tools/qmake/mkspecs/features/default_post.prf -@@ -171,8 +171,8 @@ contains(QT, webkit)|contains(QT, webkitwidgets) { - } - - defineTest(needToLink) { -- # The main dynamic library always needs to link in the intermediate libraries -- creating_module: return(true) -+ # The main module dynamic library always needs to link in the intermediate libraries -+ isEqual(MODULE, webkit): return(true) - - force_static_libs_as_shared { - # So do the individual libraries if they are dynamic --- -1.9.0 - diff --git a/debian/patches/fix_cloop_on_big_endian_machines.patch b/debian/patches/fix_cloop_on_big_endian_machines.patch new file mode 100644 index 0000000..45006d7 --- /dev/null +++ b/debian/patches/fix_cloop_on_big_endian_machines.patch @@ -0,0 +1,142 @@ +From 0c58a486f551e7e7b63d438e3d32f21f876327d1 Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen <allan.jensen@digia.com> +Date: Thu, 9 Oct 2014 17:40:37 +0200 +Subject: [PATCH] Fix CLoop on big-endian machines + +Callee and ScopeChain are JSObject pointers and saved in the 64bit +structure for JS registers. On a 32bit big-endian machine the actual +pointer is offset by the PayloadOffset of 4 bytes, but on little-endian +and 64bit architectures there is no offset. + +This patch fixes four places the payloadOffset was not correctly added +on 32bit big-endian, and six places it was added on 64big big-endian +when it shouldn't. + +Task-number: QTBUG-41896 +Change-Id: I46b474bee9822b8040d1b7b2e8f31ce42e0adefe +Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> +--- + .../JavaScriptCore/llint/LowLevelInterpreter.asm | 25 +++++++++++++--------- + .../llint/LowLevelInterpreter32_64.asm | 2 +- + 2 files changed, 16 insertions(+), 11 deletions(-) + +diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter.asm +index 2b5a23c..c4d86ee 100644 +--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.asm ++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.asm +@@ -87,6 +87,12 @@ else + const PayloadOffset = 0 + end + ++if JSVALUE64 ++ const JSCellPayloadOffset = 0 ++else ++ const JSCellPayloadOffset = PayloadOffset ++end ++ + # Constant for reasoning about butterflies. + const IsArray = 1 + const IndexingShapeMask = 30 +@@ -161,7 +167,6 @@ else + const VectorSizeOffset = 8 + end + +- + # Some common utilities. + macro crash() + if C_LOOP +@@ -267,13 +272,13 @@ macro assertNotConstant(index) + end + + macro functionForCallCodeBlockGetter(targetRegister) +- loadp Callee[cfr], targetRegister ++ loadp Callee + JSCellPayloadOffset[cfr], targetRegister + loadp JSFunction::m_executable[targetRegister], targetRegister + loadp FunctionExecutable::m_codeBlockForCall[targetRegister], targetRegister + end + + macro functionForConstructCodeBlockGetter(targetRegister) +- loadp Callee[cfr], targetRegister ++ loadp Callee + JSCellPayloadOffset[cfr], targetRegister + loadp JSFunction::m_executable[targetRegister], targetRegister + loadp FunctionExecutable::m_codeBlockForConstruct[targetRegister], targetRegister + end +@@ -671,7 +676,7 @@ _llint_op_resolve_global_var: + macro resolveScopedVarBody(resolveOperations) + # First ResolveOperation is to skip scope chain nodes + getScope(macro(dest) +- loadp ScopeChain + PayloadOffset[cfr], dest ++ loadp ScopeChain + JSCellPayloadOffset[cfr], dest + end, + ResolveOperation::m_scopesToSkip[resolveOperations], t1, t2) + loadp JSVariableObject::m_registers[t1], t1 # t1 now contains the activation registers +@@ -696,7 +701,7 @@ _llint_op_resolve_scoped_var_on_top_scope: + loadisFromInstruction(1, t3) + + # We know we want the top scope chain entry +- loadp ScopeChain + PayloadOffset[cfr], t1 ++ loadp ScopeChain + JSCellPayloadOffset[cfr], t1 + loadp JSVariableObject::m_registers[t1], t1 # t1 now contains the activation registers + + # Second ResolveOperation tells us what offset to use +@@ -718,7 +723,7 @@ _llint_op_resolve_scoped_var_with_top_scope_check: + loadp JSScope::m_next[t1], dest + jmp .done + .scopeChainNotCreated: +- loadp ScopeChain + PayloadOffset[cfr], dest ++ loadp ScopeChain + JSCellPayloadOffset[cfr], dest + .done: + end, + # Second ResolveOperation tells us how many more nodes to skip +@@ -773,7 +778,7 @@ _llint_op_resolve_base_to_scope: + getResolveOperation(4, t0) + # First ResolveOperation is to skip scope chain nodes + getScope(macro(dest) +- loadp ScopeChain + PayloadOffset[cfr], dest ++ loadp ScopeChain + JSCellPayloadOffset[cfr], dest + end, + ResolveOperation::m_scopesToSkip[t0], t1, t2) + loadisFromInstruction(1, t3) +@@ -798,7 +803,7 @@ _llint_op_resolve_base_to_scope_with_top_scope_check: + loadp JSScope::m_next[t1], dest + jmp .done + .scopeChainNotCreated: +- loadp ScopeChain + PayloadOffset[cfr], dest ++ loadp ScopeChain + JSCellPayloadOffset[cfr], dest + .done: + end, + # Second ResolveOperation tells us how many more nodes to skip +@@ -823,7 +828,7 @@ macro interpretResolveWithBase(opcodeLength, slowPath) + getResolveOperation(4, t0) + btpz t0, .slowPath + +- loadp ScopeChain[cfr], t3 ++ loadp ScopeChain + JSCellPayloadOffset[cfr], t3 + # Get the base + loadis ResolveOperation::m_operation[t0], t2 + +@@ -845,7 +850,7 @@ macro interpretResolveWithBase(opcodeLength, slowPath) + loadp JSScope::m_next[t1], dest + jmp .done + .scopeChainNotCreated: +- loadp ScopeChain + PayloadOffset[cfr], dest ++ loadp ScopeChain + JSCellPayloadOffset[cfr], dest + .done: + end, + sizeof ResolveOperation + ResolveOperation::m_scopesToSkip[t0], t1, t2) +diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm +index 89e40c7..87aa09e 100644 +--- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm ++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm +@@ -1692,7 +1692,7 @@ _llint_op_next_pname: + loadi 20[PC], t2 + loadi PayloadOffset[cfr, t2, 8], t2 + loadp JSPropertyNameIterator::m_jsStrings[t2], t3 +- loadi [t3, t0, 8], t3 ++ loadi PayloadOffset[t3, t0, 8], t3 + addi 1, t0 + storei t0, PayloadOffset[cfr, t1, 8] + loadi 4[PC], t1 +-- +2.1.1 + diff --git a/debian/patches/fix_crash_when_a_network_request_is_aborted_while_forwarding_data.patch b/debian/patches/fix_crash_when_a_network_request_is_aborted_while_forwarding_data.patch new file mode 100644 index 0000000..19ac009 --- /dev/null +++ b/debian/patches/fix_crash_when_a_network_request_is_aborted_while_forwarding_data.patch @@ -0,0 +1,38 @@ +From 13ebee35e169a8b1210851ec494951815c70620c Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen <allan.jensen@digia.com> +Date: Mon, 13 Oct 2014 15:32:14 +0200 +Subject: [PATCH] Fix crash when a network-request is aborted while forwarding + data + +Since we forward data block-wise a network request may be aborted while +we are still forwarding received data. In that case we should stop the +forwarding. + +Task-number: QTBUG-41877 +Change-Id: Ia34bbdcacdc4eb70a2e814d3b4bada9844abbb83 +Reviewed-by: Michael Bruning <michael.bruning@digia.com> +--- + Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp b/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp +index 5990a40..fc69546 100644 +--- a/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp ++++ b/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp +@@ -687,9 +687,12 @@ void QNetworkReplyHandler::forwardData() + // -1 means we do not provide any data about transfer size to inspector so it would use + // Content-Length headers or content size to show transfer size. + client->didReceiveData(m_resourceHandle, buffer, readSize, -1); ++ // Check if the request has been aborted or this reply-handler was otherwise released. ++ if (wasAborted() || !m_replyWrapper) ++ break; + } + delete[] buffer; +- if (bytesAvailable > 0) ++ if (bytesAvailable > 0 && m_replyWrapper) + m_queue.requeue(&QNetworkReplyHandler::forwardData); + } + +-- +2.1.1 + diff --git a/debian/patches/fix_ftbfs_in_archs_without_jit_support.patch b/debian/patches/fix_ftbfs_in_archs_without_jit_support.patch deleted file mode 100644 index 27965ed..0000000 --- a/debian/patches/fix_ftbfs_in_archs_without_jit_support.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 433796d860326e4ffa344fd2b361f332470ad357 Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen <allan.jensen@digia.com> -Date: Fri, 21 Feb 2014 15:12:45 +0100 -Subject: [PATCH] Fix Qt WebKit build on architectures without JIT support - -The fallback LLINT interpreter was triggering YARR JIT which would -fail to compile and also trigger ENABLE_ASSEMBLER which would trigger -even more not to compile. YARR JIT is only supported on platforms with -valid JIT or native LLINT support. So we must avoid it when the fallback -is used - -Task-number: QTBUG-36969 -Change-Id: Ie94bcb316e192feb33ab528ddc3a328af154cebf ---- - Source/JavaScriptCore/bytecode/CodeBlock.cpp | 4 ++++ - Source/WTF/wtf/Platform.h | 2 +- - 2 files changed, 5 insertions(+), 1 deletion(-) - ---- a/Source/JavaScriptCore/bytecode/CodeBlock.cpp -+++ b/Source/JavaScriptCore/bytecode/CodeBlock.cpp -@@ -2947,8 +2947,12 @@ void CodeBlock::countReoptimization() - - unsigned CodeBlock::numberOfDFGCompiles() - { -+#if ENABLE(JIT) - ASSERT(JITCode::isBaselineCode(getJITType())); - return (JITCode::isOptimizingJIT(replacement()->getJITType()) ? 1 : 0) + m_reoptimizationRetryCounter; -+#else -+ return 0; -+#endif - } - - int32_t CodeBlock::codeTypeThresholdMultiplier() const ---- a/Source/WTF/wtf/Platform.h -+++ b/Source/WTF/wtf/Platform.h -@@ -872,7 +872,7 @@ - #define ENABLE_REGEXP_TRACING 0 - - /* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */ --#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !(OS(QNX) && PLATFORM(QT)) -+#if !defined(ENABLE_YARR_JIT) && !ENABLE(LLINT_C_LOOP) && !(OS(QNX) && PLATFORM(QT)) - #define ENABLE_YARR_JIT 1 - - /* Setting this flag compares JIT results with interpreter results. */ diff --git a/debian/patches/fix_nonlinux_glibc_linkage.diff b/debian/patches/fix_nonlinux_glibc_linkage.diff new file mode 100644 index 0000000..566389a --- /dev/null +++ b/debian/patches/fix_nonlinux_glibc_linkage.diff @@ -0,0 +1,16 @@ +Author: Sune Vuorela +Description: Ensures we link with rt on all the platforms where we +have glibc. Not yet upstreamed. Requires a upstreamming of the gnukfreebsd patch +Index: b/Source/WebKit2/WebKit2.pri +=================================================================== +--- a/Source/WebKit2/WebKit2.pri ++++ b/Source/WebKit2/WebKit2.pri +@@ -75,7 +75,7 @@ + + INCLUDEPATH += $$WEBKIT2_GENERATED_SOURCES_DIR + +-linux-*:!android { ++linux-*:!android|hurd-*|gnukfreebsd-* { + # -lrt is required for shm_open and shm_unlink. + LIBS += -lrt + } diff --git a/debian/patches/no_gc_sections.diff b/debian/patches/no_gc_sections.diff index 4785e58..ffe5ec1 100644 --- a/debian/patches/no_gc_sections.diff +++ b/debian/patches/no_gc_sections.diff @@ -14,7 +14,7 @@ Last-Update: 2013-02-07 (add i686) --- a/Source/WebCore/WebCore.pri +++ b/Source/WebCore/WebCore.pri -@@ -299,7 +299,7 @@ mac { +@@ -301,7 +301,7 @@ mac { unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections } unix:!mac:*-g++*:QMAKE_CXXFLAGS += -fdata-sections diff --git a/debian/patches/reduce_memory_usage.patch b/debian/patches/reduce_memory_usage.patch index 3c59ad8..fe1ebb6 100644 --- a/debian/patches/reduce_memory_usage.patch +++ b/debian/patches/reduce_memory_usage.patch @@ -8,9 +8,13 @@ Author: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Forwarded: not-needed Last-Update: 2014-03-05 +--- + Tools/qmake/mkspecs/features/unix/default_post.prf | 3 +++ + 1 file changed, 3 insertions(+) + --- a/Tools/qmake/mkspecs/features/unix/default_post.prf +++ b/Tools/qmake/mkspecs/features/unix/default_post.prf -@@ -66,3 +66,6 @@ CONFIG(debug, debug|release)|force_debug +@@ -68,3 +68,6 @@ CONFIG(debug, debug|release)|force_debug } load(default_post) diff --git a/debian/patches/series b/debian/patches/series index 4642ac8..4953626 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,8 @@ # Upstream patches -fix_ftbfs_in_archs_without_jit_support.patch -dont_pollute_pri_and_pc_with_private_deps.patch +do_not_use_jit_on_big_endian_machines.patch +fix_cloop_on_big_endian_machines.patch +fix_crash_when_a_network_request_is_aborted_while_forwarding_data.patch +blacklist_libkpartsplugin.patch # debian patches reduce_memory_usage.patch @@ -8,6 +10,9 @@ reduce_memory_usage.patch no_gc_sections.diff hurd.diff webkit_qt_hide_symbols.diff +fix_nonlinux_glibc_linkage.diff + +# Dyson patches dyson-MathExtras.patch dyson-yield.patch dyson-MachineStackMarker-stackPointer.patch diff --git a/debian/qml-module-qtwebkit.install b/debian/qml-module-qtwebkit.install index ab85d9d..de613e0 100644 --- a/debian/qml-module-qtwebkit.install +++ b/debian/qml-module-qtwebkit.install @@ -2,3 +2,4 @@ usr/lib/*/qt5/qml/QtWebKit/experimental/libqmlwebkitexperimentalplugin.so usr/lib/*/qt5/qml/QtWebKit/experimental/qmldir usr/lib/*/qt5/qml/QtWebKit/libqmlwebkitplugin.so usr/lib/*/qt5/qml/QtWebKit/qmldir +usr/lib/*/qt5/qml/QtWebKit/plugins.qmltypes diff --git a/debian/rules b/debian/rules index 09ba1ee..48b4de9 100755 --- a/debian/rules +++ b/debian/rules @@ -10,10 +10,9 @@ export QT_SELECT := qt5 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) -gstab_architectures := i386 powerpc s390x -fulldebug_architectures := amd64 +gstab_architectures := amd64 i386 powerpc s390x +fulldebug_architectures := none disabled_jit_architectures := armel mips mipsel %: @@ -49,14 +48,8 @@ endif # Run qmake again now with the proper values. qmake -override_dh_auto_build-arch: - # This override may seem futile, but it helps us make sure that the tools - # needed for building the docs are built before calling them. - # If there's a better way, do not heasitate to tell us. - dh_auto_build - override_dh_auto_build-indep: - dh_auto_build -Smakefile -- docs + dh_auto_build -Smakefile -- html_docs override_dh_auto_install-arch: make install INSTALL_ROOT=$(CURDIR)/debian/tmp @@ -70,20 +63,17 @@ override_dh_auto_install-arch: -exec sed -i -e 's/$(DEB_HOST_MULTIARCH)\/$(DEB_HOST_MULTIARCH)/$(DEB_HOST_MULTIARCH)/g' {} \; # Remove private headers - rm -rf debian/tmp/usr/include/qt5/QtWebKit/*/QtWebKit - rm -rf debian/tmp/usr/include/qt5/QtWebKitWidgets/*/QtWebKitWidgets + rm -rf debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtWebKit/*/QtWebKit + rm -rf debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtWebKitWidgets/*/QtWebKitWidgets # And associated files - rm -fv debian/tmp/usr/lib/*/qt5/mkspecs/modules/qt_lib_webkit_private.pri - rm -fv debian/tmp/usr/lib/*/qt5/mkspecs/modules/qt_lib_webkitwidgets_private.pri + rm -fv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/modules/qt_lib_webkit_private.pri + rm -fv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/modules/qt_lib_webkitwidgets_private.pri # Remove libtool-like files rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la override_dh_auto_install-indep: - make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs + make INSTALL_ROOT=$(CURDIR)/debian/tmp install_html_docs override_dh_install: dh_install --fail-missing - -override_dh_builddeb: - dh_builddeb -- -Zxz |