[SCM] qtbase packaging branch, master, updated. debian/5.5.1+dfsg-15-3-g1034911

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit b67a42f5b845218031aa7d9e6a0b13e84ba767d9
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Mar 5 02:06:24 2016 -0300

    Add fix_alsa_detection.patch to workaround ALSA >= 1.1.0 detection.
    
    Cheery picked from experimental.
---
 debian/changelog                        |  5 +++++
 debian/patches/fix_alsa_detection.patch | 22 ++++++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 48ce829..41bf6d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 qtbase-opensource-src (5.5.1+dfsg-16) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Add fix_alsa_detection.patch to workaround ALSA >= 1.1.0 detection. The
+    patch is a simple workaround, a proper bug has been opened upstream as
+    stated in the patch's headers.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 05 Mar 2016 10:12:59 -0300
 
 qtbase-opensource-src (5.5.1+dfsg-15) unstable; urgency=medium
diff --git a/debian/patches/fix_alsa_detection.patch b/debian/patches/fix_alsa_detection.patch
new file mode 100644
index 0000000..20182f4
--- /dev/null
+++ b/debian/patches/fix_alsa_detection.patch
@@ -0,0 +1,22 @@
+Description: pseudo-fix for ALSA version detection
+ The current test fails for 1.1.x with x < 10, so just bump it
+ to 1.1.0.
+Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+Bug: https://bugreports.qt.io/browse/QTBUG-51681
+Last-Update: 2016-03-05
+
+---
+ config.tests/unix/alsa/alsatest.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/config.tests/unix/alsa/alsatest.cpp
++++ b/config.tests/unix/alsa/alsatest.cpp
+@@ -32,7 +32,7 @@
+ ****************************************************************************/
+ 
+ #include <alsa/asoundlib.h>
+-#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))
++#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR >= 1 && SND_LIB_SUBMINOR >= 0))
+ #error "Alsa version found too old, require >= 1.0.10"
+ #endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 1c71482..b2111e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,3 +26,4 @@ gnukfreebsd.diff
 no_htmlinfo_example.diff
 remove_privacy_breachs.diff
 link_fbclient.diff
+fix_alsa_detection.patch

-- 
qtbase packaging