[SCM] QtWebKit packaging branch, master, updated. debian/2.3.2.dfsg-4-11-g84d83af

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit.git;a=commitdiff;h=84d83af

The following commit has been merged in the master branch:
commit 84d83af0410686dbe4efd97d054fc1d9a4363f15
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Sep 29 17:08:10 2014 -0300

    Update glibc_hurd_mkspecs.diff.
---
 debian/changelog                       |  3 +++
 debian/patches/glibc_hurd_mkspecs.diff | 26 +++++---------------------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 37b9669..72dd123 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ qtwebkit (2.3.4.dfsg-1) UNRELEASED; urgency=medium
     - double_conversion_correct_double_operations.patch
     - ppc64el.patch
   * Refresh patches.
+  * Update glibc_hurd_mkspecs.diff. I removed the first part of the patch
+    because now the source uses unix* which should work. The rest was just a
+    refresh.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 28 Sep 2014 11:20:39 -0300
 
diff --git a/debian/patches/glibc_hurd_mkspecs.diff b/debian/patches/glibc_hurd_mkspecs.diff
index 9c9aab4..bf866e1 100644
--- a/debian/patches/glibc_hurd_mkspecs.diff
+++ b/debian/patches/glibc_hurd_mkspecs.diff
@@ -1,34 +1,18 @@
 Author: Pino Toscano <pino at debian.org>
 Description: Use the glibc and hurd mkspecs 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
- The glibc part is Debian-specific, as upstream does not have the glibc-g++
- mkspec, while the hurd part could be upstreamed.
-Last-Update: 2012-05-01
+Last-Update: 2014-09-29
 Origin: vendor
 Forwarded: not-needed
+Reviewed-By: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
 
 ---
- Source/JavaScriptCore/wtf/wtf.pri |    2 +-
- Source/WebKit.pri                 |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ Tools/qmake/mkspecs/features/unix/default_post.prf |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
---- a/Tools/qmake/mkspecs/features/features.prf
-+++ b/Tools/qmake/mkspecs/features/features.prf
-@@ -185,7 +185,7 @@
-             DEFINES += ENABLE_VIDEO=1
-             DEFINES += WTF_USE_QTKIT=1
-         }
--    } else: linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
-+    } else: linux-*|glibc-*|hurd-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
-         !contains(QT_CONFIG, no-pkg-config):system(pkg-config --exists glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'): {
-             DEFINES += ENABLE_VIDEO=1
-             DEFINES += WTF_USE_GSTREAMER=1
 --- a/Tools/qmake/mkspecs/features/unix/default_post.prf
 +++ b/Tools/qmake/mkspecs/features/unix/default_post.prf
 @@ -16,7 +16,7 @@
-     QMAKE_CXXFLAGS += -march=pentium4 -msse2 -mfpmath=sse -mtune=generic
+     QMAKE_CXXFLAGS += -msse2 -mfpmath=sse
  }
  
 -linux-*g++* {

-- 
QtWebKit packaging