[SCM] Qt 4 packaging branch, master, updated. debian/4.8.7+dfsg-6-7-gc633d0e

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=bd4c348

The following commit has been merged in the master branch:
commit bd4c348a090f2402855d18aa109500757c8c527b
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue May 3 17:54:06 2016 -0300

    Apply patch to fix FTBFS with GCC6.
---
 debian/changelog                                   |  4 ++
 .../qt-everywhere-opensource-src-4.8.7-gcc6.patch  | 48 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 53 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index da61531..f84bc64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ qt4-x11 (4:4.8.7+dfsg-7) UNRELEASED; urgency=medium
   * Drop menu files, since we ship already .desktop file for assistant,
     designer, linguist, and qtconfig.
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Apply Fedora's qt-everywhere-opensource-src-4.8.7-gcc6.patch to solve two
+    issues while building with GCC6.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 21 Mar 2016 21:26:26 +0100
 
 qt4-x11 (4:4.8.7+dfsg-6) unstable; urgency=medium
diff --git a/debian/patches/qt-everywhere-opensource-src-4.8.7-gcc6.patch b/debian/patches/qt-everywhere-opensource-src-4.8.7-gcc6.patch
new file mode 100644
index 0000000..3f5f8f9
--- /dev/null
+++ b/debian/patches/qt-everywhere-opensource-src-4.8.7-gcc6.patch
@@ -0,0 +1,48 @@
+Description: various fixes for gcc6
+ This patch solves two issues:
+ - Use the correct key for the compiler.
+ - Avoid a shift overflow.
+Origin: http://pkgs.fedoraproject.org/cgit/rpms/qt.git/tree/qt-everywhere-opensource-src-4.8.7-gcc6.patch
+Author: Rex Dieter <rdieter at math.unl.edu>
+Author: Than Ngo <than at redhat.com>
+Forwarded: not-needed
+Last-Update: 2016-05-03
+
+---
+ configure                            |    4 ++--
+ src/xmlpatterns/api/qcoloroutput_p.h |    4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+--- a/configure
++++ b/configure
+@@ -7797,7 +7797,7 @@ case "$XPLATFORM" in
+     *-g++*)
+ 	# Check gcc's version
+ 	case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
+-	    5*|4*|3.4*)
++	    8*|7*|6*|5*|4*|3.4*)
+ 		;;
+             3.3*)
+                 canBuildWebKit="no"
+@@ -8113,7 +8113,7 @@ g++*)
+     3.*)
+         COMPILER_VERSION="3.*"
+         ;;
+-    5*|4.*)
++    8*|7*|6*|5*|4.*)
+         COMPILER_VERSION="4"
+         ;;
+     *)
+--- a/src/xmlpatterns/api/qcoloroutput_p.h
++++ b/src/xmlpatterns/api/qcoloroutput_p.h
+@@ -70,8 +70,8 @@ namespace QPatternist
+             ForegroundShift = 10,
+             BackgroundShift = 20,
+             SpecialShift    = 20,
+-            ForegroundMask  = ((1 << ForegroundShift) - 1) << ForegroundShift,
+-            BackgroundMask  = ((1 << BackgroundShift) - 1) << BackgroundShift
++            ForegroundMask  = 0x1f << ForegroundShift,
++            BackgroundMask  = 0x7 << BackgroundShift
+         };
+ 
+     public:
diff --git a/debian/patches/series b/debian/patches/series
index 3093a6b..1c55e1f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -59,3 +59,4 @@ parisc-atomic.patch
 QtScript_x32_config.diff
 x32.diff
 no-ssl3.patch
+qt-everywhere-opensource-src-4.8.7-gcc6.patch

-- 
Qt 4 packaging