[SCM] QtWebKit packaging branch, master, updated. debian/2.2.0-1-4-g972339c

Pino Toscano pino at alioth.debian.org
Sun Dec 25 20:52:06 UTC 2011 

The following commit has been merged in the master branch:
commit b91d1993aec6aef780a5100d2c4661ef211f2ba9
Author: Pino Toscano <pino at debian.org>
Date:   Sun Dec 25 21:44:27 2011 +0100

    Revert "* New upstream release."
    
    As also agreed with Fathi, we'll concentrate on 2.2.0 for now, until it builds everywhere.
    
    This reverts commit 4c2df0583cc94d24746bc0957473f010a0cd3679.
---
 debian/changelog                                   |    9 ------
 debian/control                                     |    6 ++--
 debian/patches/01_lflags_as-needed.diff            |    2 +-
 .../patches/02_add_nostrip_for_debug_packages.diff |    2 +-
 debian/patches/03_hide_std_symbols.diff            |    2 +-
 .../adjust_symbols_visibility_for_webcore.diff     |   30 ++++++++++++++++++++
 debian/patches/glibc_mkspec.diff                   |    2 +-
 debian/patches/series                              |    1 +
 debian/patches/stabs_format_debug_info.diff        |    2 +-
 9 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3118714..6107811 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,3 @@
-qtwebkit (2.2.1-1) unstable; urgency=low
-
-  * New upstream release.
-  * Drop adjust_symbols_visibility_for_webcore.diff - stolen upstream.
-  * Update debian/control:
-    - bump build dependency on Qt 4.8.
-
- -- Fathi Boudra <fabo at debian.org>  Fri, 23 Dec 2011 20:32:21 +0200
-
 qtwebkit (2.2.0-1) unstable; urgency=low
 
   * New upstream release:
diff --git a/debian/control b/debian/control
index af6d509..2943475 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Build-Depends: debhelper (>= 8.1.3~),
                libgstreamer-plugins-base0.10-dev,
                libgstreamer0.10-dev,
                libicu-dev,
-               libqt4-dev (>= 4:4.8.0),
-               libqt4-opengl-dev (>= 4:4.8.0),
+               libqt4-dev (>= 4:4.7.3),
+               libqt4-opengl-dev (>= 4:4.7.3),
                libsqlite3-dev,
                libxext-dev,
                libxrender-dev,
@@ -23,7 +23,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-kde/qt/qtwebkit.git;a=summary
 Package: libqtwebkit-dev
 Section: libdevel
 Architecture: any
-Depends: libqt4-dev (>= 4:4.8.0),
+Depends: libqt4-dev (>= 4:4.7.3),
          libqtwebkit4 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
diff --git a/debian/patches/01_lflags_as-needed.diff b/debian/patches/01_lflags_as-needed.diff
index 48efeda..4fb615d 100644
--- a/debian/patches/01_lflags_as-needed.diff
+++ b/debian/patches/01_lflags_as-needed.diff
@@ -7,7 +7,7 @@ Author: Fathi Boudra <fabo at debian.org>
 
 --- a/Source/WebKit.pri
 +++ b/Source/WebKit.pri
-@@ -100,6 +100,8 @@ win32-g++* {
+@@ -91,6 +91,8 @@ win32-g++* {
  CONFIG -= warn_on
  *-g++*:QMAKE_CXXFLAGS += -Wall -Wextra -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self
  
diff --git a/debian/patches/02_add_nostrip_for_debug_packages.diff b/debian/patches/02_add_nostrip_for_debug_packages.diff
index 5a619f8..87ad141 100644
--- a/debian/patches/02_add_nostrip_for_debug_packages.diff
+++ b/debian/patches/02_add_nostrip_for_debug_packages.diff
@@ -8,7 +8,7 @@ Author: Fathi Boudra <fabo at debian.org>
 
 --- a/Source/WebKit.pri
 +++ b/Source/WebKit.pri
-@@ -36,6 +36,8 @@ CONFIG(standalone_package): DEFINES *= N
+@@ -27,6 +27,8 @@ CONFIG(standalone_package): DEFINES *= N
  CONFIG += depend_includepath
  DEPENDPATH += $$OUT_PWD
  
diff --git a/debian/patches/03_hide_std_symbols.diff b/debian/patches/03_hide_std_symbols.diff
index e5c3d31..402598a 100644
--- a/debian/patches/03_hide_std_symbols.diff
+++ b/debian/patches/03_hide_std_symbols.diff
@@ -9,7 +9,7 @@ Author: Sune Vuorela <sune at debian.org>
 
 --- a/Source/WebKit.pri
 +++ b/Source/WebKit.pri
-@@ -103,6 +103,7 @@ CONFIG -= warn_on
+@@ -94,6 +94,7 @@ CONFIG -= warn_on
  *-g++*:QMAKE_CXXFLAGS += -Wall -Wextra -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self
  
  *-g++*:QMAKE_LFLAGS += -Wl,--as-needed
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/glibc_mkspec.diff b/debian/patches/glibc_mkspec.diff
index f75b02c..99697e0 100644
--- a/debian/patches/glibc_mkspec.diff
+++ b/debian/patches/glibc_mkspec.diff
@@ -26,7 +26,7 @@ Forwarded: not-needed
          PKGCONFIG += glib-2.0 gio-2.0
 --- a/Source/WebKit.pri
 +++ b/Source/WebKit.pri
-@@ -113,7 +113,7 @@ CONFIG -= warn_on
+@@ -104,7 +104,7 @@ CONFIG -= warn_on
  *-g++*:QMAKE_LFLAGS += -Wl,--version-script,$$PWD/symbols.filter
  
  # Treat warnings as errors on x86/Linux/GCC
diff --git a/debian/patches/series b/debian/patches/series
index 6c06450..b2d2bc4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 # upstream patches
+adjust_symbols_visibility_for_webcore.diff
 
 # debian patches
 01_lflags_as-needed.diff
diff --git a/debian/patches/stabs_format_debug_info.diff b/debian/patches/stabs_format_debug_info.diff
index ea15ad0..aa87b74 100644
--- a/debian/patches/stabs_format_debug_info.diff
+++ b/debian/patches/stabs_format_debug_info.diff
@@ -11,7 +11,7 @@ Bug-Debian: http://bugs.debian.org/618325
 
 --- a/Source/WebKit.pri
 +++ b/Source/WebKit.pri
-@@ -80,6 +80,13 @@ CONFIG(release, debug|release) {
+@@ -71,6 +71,13 @@ CONFIG(release, debug|release) {
      DEFINES += NDEBUG
  }
  

-- 
QtWebKit packaging

More information about the pkg-kde-commits mailing list