[SCM] QtWebKit packaging branch, master, updated. debian/2.2.0-5-25-gb51e9dd

[Fathi Boudra]

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

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

    Revert visibility patch: it's accepted upstream.
---
 debian/changelog                                   |    1 -
 .../adjust_symbols_visibility_for_webcore.diff     |   30 --------------------
 debian/patches/series                              |    1 -
 3 files changed, 0 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d80fb78..4c2611a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,6 @@ 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
deleted file mode 100644
index 0ee08a9..0000000
--- a/debian/patches/adjust_symbols_visibility_for_webcore.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-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 90cfd6b..c4442fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 # 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