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

Pino Toscano pino at alioth.debian.org
Tue Sep 20 18:17:24 UTC 2011


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

    add patch glibc_mkspec.diff
    
    ... to enable/fix compile options for platforms using our custom glibc-g++ mkspec
---
 debian/changelog                 |    2 ++
 debian/patches/glibc_mkspec.diff |   32 ++++++++++++++++++++++++++++++++
 debian/patches/series            |    1 +
 3 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bc694d4..78b0966 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ qtwebkit (2.2.0~rc1-1) UNRELEASED; urgency=low
   [ Pino Toscano ]
   * Add -gstabs to the C(XX)FLAGS also for s390x. (see #637004)
   * Enable the video support for all the OSes, not just on Linux.
+  * Add patch glibc_mkspec.diff, to enable/fix compile options for platforms
+    using our custom glibc-g++ mkspec.
 
   [ Fathi Boudra ]
   * Update debian/control:
diff --git a/debian/patches/glibc_mkspec.diff b/debian/patches/glibc_mkspec.diff
new file mode 100644
index 0000000..9bc65ed
--- /dev/null
+++ b/debian/patches/glibc_mkspec.diff
@@ -0,0 +1,32 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Use the glibc mkspec when necessary.
+ - wtf.pri: enable the glib support (needed to compile the GStreamer support)
+ - WebKit.pri: add -Werror on non-Linux i386/amd64 archs, and -Wno-c++0x-compat
+   for all the non-Linux ones
+ This is Debian-specific, as upstream does not have the glibc-g++ mkspec.
+Last-Update: 2011-09-20
+Origin: vendor
+Forwarded: not-needed
+
+--- a/Source/JavaScriptCore/wtf/wtf.pri
++++ b/Source/JavaScriptCore/wtf/wtf.pri
+@@ -41,7 +41,7 @@
+     wtf/unicode/icu/CollatorICU.cpp \
+     wtf/unicode/UTF8.cpp
+ 
+-linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
++linux-*|glibc-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
+     !contains(QT_CONFIG, no-pkg-config):system(pkg-config --exists glib-2.0 gio-2.0 gstreamer-0.10): {
+         DEFINES += ENABLE_GLIB_SUPPORT=1
+         PKGCONFIG += glib-2.0 gio-2.0
+--- a/Source/WebKit.pri
++++ b/Source/WebKit.pri
+@@ -104,7 +104,7 @@
+ *-g++*:QMAKE_LFLAGS += -Wl,--version-script,$$PWD/symbols.filter
+ 
+ # Treat warnings as errors on x86/Linux/GCC
+-linux-g++* {
++linux-g++*|glibc-* {
+     isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
+ 
+     greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) {
diff --git a/debian/patches/series b/debian/patches/series
index 97c8e15..6c06450 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ stabs_format_debug_info.diff
 no_gc_sections.diff
 #linux_amd64_no_overcommit.diff
 defines_qt_webkit.diff
+glibc_mkspec.diff

-- 
QtWebKit packaging



More information about the pkg-kde-commits mailing list