[SCM] QtWebKit packaging branch, master, updated. debian/2.0-week26-2-17-g818ef60

Fathi Boudra fabo at alioth.debian.org
Sat Jan 29 16:31:42 UTC 2011


The following commit has been merged in the master branch:
commit a90f1f6c1fbb02f0b733f5b3c3ac30a445f426ec
Author: Fathi Boudra <fabo at debian.org>
Date:   Sat Jan 29 18:28:13 2011 +0200

    Refresh the patches
---
 debian/patches/01_lflags_as-needed.diff            |    2 +-
 debian/patches/03_hide_std_symbols.diff            |    2 +-
 debian/patches/04_enable_debug_information.diff    |    4 ++--
 ...07_s390_stabs_format_debugging_information.diff |    2 +-
 debian/patches/09_hurd.diff                        |    2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/patches/01_lflags_as-needed.diff b/debian/patches/01_lflags_as-needed.diff
index 987b4a8..f1167e1 100644
--- a/debian/patches/01_lflags_as-needed.diff
+++ b/debian/patches/01_lflags_as-needed.diff
@@ -3,7 +3,7 @@ Author: Fathi Boudra <fabo at debian.org>
 
 --- a/WebKit.pri
 +++ b/WebKit.pri
-@@ -60,6 +60,8 @@ symbian {
+@@ -68,6 +68,8 @@ symbian {
  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/03_hide_std_symbols.diff b/debian/patches/03_hide_std_symbols.diff
index 019a7b2..6b2c8e5 100644
--- a/debian/patches/03_hide_std_symbols.diff
+++ b/debian/patches/03_hide_std_symbols.diff
@@ -4,7 +4,7 @@ Author: Sune Vuorela <sune at debian.org>
 
 --- a/WebKit.pri
 +++ b/WebKit.pri
-@@ -63,6 +63,7 @@ CONFIG -= warn_on
+@@ -71,6 +71,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/04_enable_debug_information.diff b/debian/patches/04_enable_debug_information.diff
index fcdda11..b36f16a 100644
--- a/debian/patches/04_enable_debug_information.diff
+++ b/debian/patches/04_enable_debug_information.diff
@@ -4,9 +4,9 @@ author: Fathi Boudra <fabo at debian.org>
 
 --- a/WebCore/WebCore.pro
 +++ b/WebCore/WebCore.pro
-@@ -3158,8 +3158,6 @@ HEADERS += $$WEBKIT_API_HEADERS
+@@ -3160,8 +3160,6 @@ HEADERS += $$WEBKIT_API_HEADERS
  
- CONFIG(QTDIR_build) {
+ !CONFIG(webkit-debug):CONFIG(QTDIR_build) {
      # Remove the following 2 lines if you want debug information in WebCore
 -    CONFIG -= separate_debug_info
 -    CONFIG += no_debug_info
diff --git a/debian/patches/07_s390_stabs_format_debugging_information.diff b/debian/patches/07_s390_stabs_format_debugging_information.diff
index d2f4703..019d9eb 100644
--- a/debian/patches/07_s390_stabs_format_debugging_information.diff
+++ b/debian/patches/07_s390_stabs_format_debugging_information.diff
@@ -6,7 +6,7 @@ Bug-Debian: http://bugs.debian.org/528485
 
 --- a/WebKit.pri
 +++ b/WebKit.pri
-@@ -51,6 +51,13 @@ CONFIG(release, debug|release) {
+@@ -59,6 +59,13 @@ CONFIG(release, debug|release) {
      DEFINES += NDEBUG
  }
  
diff --git a/debian/patches/09_hurd.diff b/debian/patches/09_hurd.diff
index 23a6dca..d4fe40f 100644
--- a/debian/patches/09_hurd.diff
+++ b/debian/patches/09_hurd.diff
@@ -10,7 +10,7 @@ Last-Update: 2011-01-04
 
 --- a/JavaScriptCore/wtf/Platform.h
 +++ b/JavaScriptCore/wtf/Platform.h
-@@ -27,6 +27,11 @@
+@@ -28,6 +28,11 @@
  #ifndef WTF_Platform_h
  #define WTF_Platform_h
  

-- 
QtWebKit packaging



More information about the pkg-kde-commits mailing list