diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/adjust_symbols_visibility_for_webcore.diff | 30 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 32 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 456f76e..525b2f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ qtwebkit (2.2.1-2) UNRELEASED; urgency=low * Upload to Sid. * Build with -gstabs on armhf instead of -g, like armel. + * Re-add adjust_symbols_visibility_for_webcore.diff. [ Pino Toscano ] * glibc_mkspec.diff: rename to glibc_hurd_mkspecs.diff, and extend to diff --git a/debian/patches/adjust_symbols_visibility_for_webcore.diff b/debian/patches/adjust_symbols_visibility_for_webcore.diff new file mode 100644 index 0000000..0ee08a9 --- /dev/null +++ b/debian/patches/adjust_symbols_visibility_for_webcore.diff @@ -0,0 +1,30 @@ +From 14b2ab0ee15794cc32b198860e2978c8f51e18c7 Mon Sep 17 00:00:00 2001 +From: commit-queue <commit-queue@webkit.org> +Date: Tue, 1 Nov 2011 10:17:06 +0000 +Subject: [PATCH] bad codegen, pointer diff in + JSC::JSCallbackConstructor::JSCallbackConstructor + https://bugs.webkit.org/show_bug.cgi?id=60951 + +Adjust symbols visibility for WebCore. + +Patch by Zeno Albisser <zeno.albisser@nokia.com> on 2011-11-01 +Reviewed by Simon Hausmann. + +* WebCore.pro: + +git-svn-id: http://svn.webkit.org/repository/webkit/trunk@98947 268f45cc-cd09-0410-ab3c-d52691b4dbfc +--- + Source/WebCore/WebCore.pro | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/Source/WebCore/WebCore.pro ++++ b/Source/WebCore/WebCore.pro +@@ -7,6 +7,8 @@ include($$PWD/../WebKit.pri) + include($$PWD/WebCore.pri) + include($$PWD/../JavaScriptCore/JavaScriptCore.pri) + ++contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols ++ + TEMPLATE = lib + TARGET = $$WEBCORE_TARGET + CONFIG += staticlib diff --git a/debian/patches/series b/debian/patches/series index c4442fc..90cfd6b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,5 @@ # upstream patches +adjust_symbols_visibility_for_webcore.diff Fix_build_with_GLib_2.31_changeset_r97269.patch upstream_changeset_r93631.diff upstream_changeset_r113848.diff |