[SCM] QtWebKit packaging branch, master, updated. debian/2.2.0-5-22-g2c3006e

[Fathi Boudra]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit.git;a=commitdiff;h=ba30213

The following commit has been merged in the master branch:
commit ba3021366da2cb145badd9ee082807502427f0d3
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue May 1 15:51:15 2012 +0300

    Re-add adjust_symbols_visibility_for_webcore.diff.
---
 debian/changelog                                   |    1 +
 .../adjust_symbols_visibility_for_webcore.diff     |   30 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6e56517..310a01c 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.
 
  -- Fathi Boudra <fabo at debian.org>  Tue, 01 May 2012 15:07:39 +0300
 
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 at 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 at 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 d3feb9b..85afe41 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

-- 
QtWebKit packaging