[SCM] liblivemedia/master: Fix FTBFS with glibc 2.26

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Fri Nov 17 18:41:25 UTC 2017


The following commit has been merged in the master branch:
commit cf79488ad740dab672a593f288d23ff07b3a01cb
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Fri Nov 17 19:35:11 2017 +0100

    Fix FTBFS with glibc 2.26

diff --git a/debian/patches/0005-Don-t-include-xlocale.h.patch b/debian/patches/0005-Don-t-include-xlocale.h.patch
new file mode 100644
index 0000000..9547097
--- /dev/null
+++ b/debian/patches/0005-Don-t-include-xlocale.h.patch
@@ -0,0 +1,22 @@
+From: Matthias Klose <doko at ubuntu.com>
+Date: Fri, 17 Nov 2017 19:34:38 +0100
+Subject: Don't include xlocale.h
+
+---
+ liveMedia/include/Locale.hh | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/liveMedia/include/Locale.hh b/liveMedia/include/Locale.hh
+index c6cd745..e7b22ce 100644
+--- a/liveMedia/include/Locale.hh
++++ b/liveMedia/include/Locale.hh
+@@ -43,9 +43,6 @@ along with this library; if not, write to the Free Software Foundation, Inc.,
+ 
+ #ifndef LOCALE_NOT_USED
+ #include <locale.h>
+-#ifndef XLOCALE_NOT_USED
+-#include <xlocale.h> // because, on some systems, <locale.h> doesn't include <xlocale.h>; this makes sure that we get both
+-#endif
+ #endif
+ 
+ 

-- 
liblivemedia packaging



More information about the pkg-multimedia-commits mailing list