[SCM] Qt 4 packaging branch, kubuntu_vivid_archive, updated. debian/4.8.6+git64-g5dc8b2b+dfsg-2-15-g6f49fee

[Dmitry Shachnev]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 6f49feeae8ed6480566b3d5bff48971caa8e3ffe
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Mar 9 19:59:18 2015 +0300

    Fix detection of GCC 5.
---
 debian/changelog          |  6 ++++++
 debian/patches/gcc-5.diff | 33 +++++++++++++++++++++++++++++++++
 debian/patches/series     |  2 ++
 3 files changed, 41 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 112c87e..9fb1457 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qt4-x11 (4:4.8.6+git64-g5dc8b2b+dfsg-3~ubuntu6) vivid; urgency=medium
+
+  * Fix detection of GCC 5.
+
+ -- Matthias Klose <doko at ubuntu.com>  Fri, 06 Mar 2015 12:10:22 +0100
+
 qt4-x11 (4:4.8.6+git64-g5dc8b2b+dfsg-3~ubuntu5) vivid; urgency=medium
 
   * Add kubuntu_qclipboard_delay.diff to fix KDE dialogs in LibreOffice
diff --git a/debian/patches/gcc-5.diff b/debian/patches/gcc-5.diff
new file mode 100644
index 0000000..44d9a83
--- /dev/null
+++ b/debian/patches/gcc-5.diff
@@ -0,0 +1,33 @@
+Index: b/configure
+===================================================================
+--- a/configure
++++ b/configure
+@@ -7801,7 +7801,7 @@ case "$XPLATFORM" in
+ 
+ 	# Check gcc's version
+ 	case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
+-	    4*)
++	    5*|4*)
+ 		;;
+ 	    3.4*)
+ 		canBuildQtXmlPatterns="no"
+@@ -8124,6 +8124,10 @@ g++*)
+         QT_GCC_MINOR_VERSION=`echo $COMPILER_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\).*,,'`
+         QT_GCC_PATCH_VERSION=0
+         ;;
++    *)
++        QT_GCC_MAJOR_VERSION=$COMPILER_VERSION
++        QT_GCC_MINOR_VERSION=0
++        QT_GCC_PATCH_VERSION=0
+     esac
+ 
+     case "$COMPILER_VERSION" in
+@@ -8133,7 +8137,7 @@ g++*)
+     3.*)
+         COMPILER_VERSION="3.*"
+         ;;
+-    4.*)
++    5.*|4.*)
+         COMPILER_VERSION="4"
+         ;;
+     *)
diff --git a/debian/patches/series b/debian/patches/series
index b7466aa..2efcacf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -71,3 +71,5 @@ kubuntu_98_a11y_fix_crash.diff
 kubuntu_glib-honor-ExcludeSocketNotifiers-flag.diff
 kubuntu_qclipboard_delay.diff
 kubuntu_qclipboard_fix_recursive.diff
+
+gcc-5.diff

-- 
Qt 4 packaging