[SCM] QtWebKit packaging branch, experimental, updated. debian/2.2.0-2-9-g0cde7de

Fathi Boudra fabo at alioth.debian.org
Thu Dec 29 15:29:25 UTC 2011


The following commit has been merged in the experimental branch:
commit cf09df07f2b0dff79faa1ee7f411c1747932964b
Author: Fathi Boudra <fabo at debian.org>
Date:   Thu Dec 29 17:17:43 2011 +0200

    Drop adjust_symbols_visibility_for_webcore.diff - stolen upstream.
---
 debian/changelog                                   |    1 +
 .../adjust_symbols_visibility_for_webcore.diff     |   30 --------------------
 debian/patches/series                              |    1 -
 3 files changed, 1 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 721144e..fdfb9c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qtwebkit (2.2.1-0multiarch1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Drop adjust_symbols_visibility_for_webcore.diff - stolen upstream.
 
  -- Fathi Boudra <fabo at debian.org>  Wed, 28 Dec 2011 10:10:59 +0200
 
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 b2d2bc4..6c06450 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 # upstream patches
-adjust_symbols_visibility_for_webcore.diff
 
 # debian patches
 01_lflags_as-needed.diff

-- 
QtWebKit packaging



More information about the pkg-kde-commits mailing list