[SCM] vlc/master: Apply patches merged upstream to fix hurd build

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a55588e051e6ae0c4cc25b2194150152888f18eb
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun May 1 11:42:28 2016 +0200

    Apply patches merged upstream to fix hurd build
    
    Closes: #765578
    Thanks: Samuel Thibault

diff --git a/debian/patches/Fix-Hurd-build.patch b/debian/patches/Fix-Hurd-build.patch
new file mode 100644
index 0000000..42bfd1c
--- /dev/null
+++ b/debian/patches/Fix-Hurd-build.patch
@@ -0,0 +1,46 @@
+From 425f4e12ca869d58e74d3edca4ff400b45167b73 Mon Sep 17 00:00:00 2001
+From: Samuel Thibault <samuel.thibault at ens-lyon.org>
+Date: Wed, 27 Apr 2016 13:47:13 +0200
+Subject: [PATCH 2/2] Fix Hurd build
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+theme_loader.cpp contains an unconditional use of PATH_MAX,
+which is not defined on GNU/Hurd to avoid imposing build-time
+limits. This change replaces its use with dynamic allocation of the
+required size.
+
+Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>
+(cherry picked from commit daa50fbf8e7d009ff1b224bdc06c7f68dfd61eaf)
+---
+ modules/gui/skins2/src/theme_loader.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/modules/gui/skins2/src/theme_loader.cpp b/modules/gui/skins2/src/theme_loader.cpp
+index 6766be5..5100249 100644
+--- a/modules/gui/skins2/src/theme_loader.cpp
++++ b/modules/gui/skins2/src/theme_loader.cpp
+@@ -549,7 +549,9 @@ int tar_extract_all( TAR *t, char *prefix )
+     union tar_buffer buffer;
+     int   len, err, getheader = 1, remaining = 0;
+     FILE  *outfile = NULL;
+-    char  fname[BLOCKSIZE + PATH_MAX];
++    long  path_max = pathconf (".", _PC_PATH_MAX);
++    size_t maxsize = (path_max == -1 || path_max > 4096) ? 4096 : path_max;
++    char  fname[BLOCKSIZE + maxsize];
+ 
+     while( 1 )
+     {
+@@ -583,7 +585,7 @@ int tar_extract_all( TAR *t, char *prefix )
+                 break;
+             }
+ 
+-            sprintf( fname, "%s/%s", prefix, buffer.header.name );
++            snprintf( fname, sizeof(fname), "%s/%s", prefix, buffer.header.name );
+ 
+             /* Check magic value in header */
+             if( strncmp( buffer.header.magic, "GNUtar", 6 ) &&
+-- 
+2.8.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 07a578e..a579a2f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@ frenchtv-links.patch
 zsh-completion.patch
 fix-translation.patch
 drop-check-qt-check.patch
+the-Hurd-also-uses-the-.so-extension-for-libraries.patch
+Fix-Hurd-build.patch
diff --git a/debian/patches/the-Hurd-also-uses-the-.so-extension-for-libraries.patch b/debian/patches/the-Hurd-also-uses-the-.so-extension-for-libraries.patch
new file mode 100644
index 0000000..fd27425
--- /dev/null
+++ b/debian/patches/the-Hurd-also-uses-the-.so-extension-for-libraries.patch
@@ -0,0 +1,30 @@
+From a6f3a6832f953951e7f6ed39aa11963c1ccdacf8 Mon Sep 17 00:00:00 2001
+From: Samuel Thibault <samuel.thibault at ens-lyon.org>
+Date: Tue, 26 Apr 2016 20:18:37 +0200
+Subject: [PATCH 1/2] the Hurd also uses the .so extension for libraries
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>
+(cherry picked from commit 8d99c0fe7d38297aedd336d8712380e8311ba554)
+---
+ extras/analyser/zsh_completion.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/extras/analyser/zsh_completion.sh b/extras/analyser/zsh_completion.sh
+index a380a90..156b4d9 100755
+--- a/extras/analyser/zsh_completion.sh
++++ b/extras/analyser/zsh_completion.sh
+@@ -11,7 +11,7 @@ case $HOST in
+     *cygwin*|*mingw*)
+         SUFFIX=dll
+     ;;
+-    *linux*|*bsd*)
++    *linux*|*bsd*|*gnu*)
+         SUFFIX=so
+     ;;
+     *)
+-- 
+2.8.1
+

-- 
VLC media player packaging