[SCM] QtWebKit packaging branch, master, updated. debian/2.1.0-2011week13-2-15-g0d70e92

Fathi Boudra fabo at alioth.debian.org
Tue Sep 20 07:58:16 UTC 2011


The following commit has been merged in the master branch:
commit 0d70e9231f4c6a660489fda3497019b5e25d6ba5
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue Sep 20 10:57:21 2011 +0300

    drop patch 0001_fix_symbols_visibility_for_webcore.diff - stolen upstream.
---
 debian/changelog                                   |    3 ++-
 .../0001_fix_symbols_visibility_for_webcore.diff   |   19 -------------------
 debian/patches/series                              |    1 -
 3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 63732d7..1193106 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qtwebkit (2.2.0~rc1-1) UNRELEASED; urgency=low
 
-  * New upstream release.
+  * New upstream release:
+    - include 0001_fix_symbols_visibility_for_webcore.diff - stolen upstream.
 
   [ Pino Toscano ]
   * Use wildcard architectures: (Closes: #634388)
diff --git a/debian/patches/0001_fix_symbols_visibility_for_webcore.diff b/debian/patches/0001_fix_symbols_visibility_for_webcore.diff
deleted file mode 100644
index 2631da5..0000000
--- a/debian/patches/0001_fix_symbols_visibility_for_webcore.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Corrects symbols visibility for WebCore.
-Author: Jocelyn Turcotte < jocelyn.turcotte at nokia.com>
-Bug: https://bugs.webkit.org/show_bug.cgi?id=40237
-
----
- WebCore/WebCore.pro |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/Source/WebCore/WebCore.pro
-+++ b/Source/WebCore/WebCore.pro
-@@ -94,7 +94,7 @@ unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffun
- unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
- linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
- 
--CONFIG(release):!CONFIG(standalone_package) {
-+CONFIG(release) {
-     contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
-     unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
- }
diff --git a/debian/patches/series b/debian/patches/series
index 5700219..afbdf4c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 # upstream patches
-#0001_fix_symbols_visibility_for_webcore.diff
 
 # debian patches
 01_lflags_as-needed.diff

-- 
QtWebKit packaging



More information about the pkg-kde-commits mailing list