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

Pino Toscano pino at alioth.debian.org
Tue Sep 20 18:50:04 UTC 2011


The following commit has been merged in the master branch:
commit f8f40d4361071dd6312d3955410e879c4a2f5367
Author: Pino Toscano <pino at debian.org>
Date:   Tue Sep 20 20:49:36 2011 +0200

    refresh patches adding/updating diffstat
---
 debian/patches/05_sparc_unaligned_access.diff |    6 ++----
 debian/patches/glibc_mkspec.diff              |    9 +++++++--
 debian/patches/no_gc_sections.diff            |    2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/debian/patches/05_sparc_unaligned_access.diff b/debian/patches/05_sparc_unaligned_access.diff
index 2418c5a..152aede 100644
--- a/debian/patches/05_sparc_unaligned_access.diff
+++ b/debian/patches/05_sparc_unaligned_access.diff
@@ -2,10 +2,8 @@ Description: fix some alignment problems on sparc.
 Author: Mike Hommey <glandium at debian.org>
 
 ---
- JavaScriptCore/wtf/ListHashSet.h         |    9 +++------
- JavaScriptCore/wtf/text/AtomicString.cpp |    2 +-
- JavaScriptCore/wtf/text/StringHash.h     |    6 +++---
- 3 files changed, 7 insertions(+), 10 deletions(-)
+ Source/JavaScriptCore/wtf/ListHashSet.h |    9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
 
 --- a/Source/JavaScriptCore/wtf/ListHashSet.h
 +++ b/Source/JavaScriptCore/wtf/ListHashSet.h
diff --git a/debian/patches/glibc_mkspec.diff b/debian/patches/glibc_mkspec.diff
index 9bc65ed..99697e0 100644
--- a/debian/patches/glibc_mkspec.diff
+++ b/debian/patches/glibc_mkspec.diff
@@ -8,9 +8,14 @@ Last-Update: 2011-09-20
 Origin: vendor
 Forwarded: not-needed
 
+---
+ Source/JavaScriptCore/wtf/wtf.pri |    2 +-
+ Source/WebKit.pri                 |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
 --- a/Source/JavaScriptCore/wtf/wtf.pri
 +++ b/Source/JavaScriptCore/wtf/wtf.pri
-@@ -41,7 +41,7 @@
+@@ -41,7 +41,7 @@ SOURCES += \
      wtf/unicode/icu/CollatorICU.cpp \
      wtf/unicode/UTF8.cpp
  
@@ -21,7 +26,7 @@ Forwarded: not-needed
          PKGCONFIG += glib-2.0 gio-2.0
 --- a/Source/WebKit.pri
 +++ b/Source/WebKit.pri
-@@ -104,7 +104,7 @@
+@@ -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/no_gc_sections.diff b/debian/patches/no_gc_sections.diff
index ecda3d0..2490224 100644
--- a/debian/patches/no_gc_sections.diff
+++ b/debian/patches/no_gc_sections.diff
@@ -8,7 +8,7 @@ Forwarded: no
 Last-Update: 2011-03-28 (mips* and arm* added)
 
 ---
- WebCore/WebCore.pri |    2 +-
+ Source/WebCore/WebCore.pri |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 --- a/Source/WebCore/WebCore.pri

-- 
QtWebKit packaging



More information about the pkg-kde-commits mailing list