summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorPicca Frédéric-Emmanuel <picca@debian.org>2018-01-21 09:32:28 +0100
committerPicca Frédéric-Emmanuel <picca@debian.org>2018-01-21 09:32:28 +0100
commitf5c10aa09fdeb83c5253a24c5be33f500e651079 (patch)
treeb6ed2fbb2b748326bb937b4fa4e6da8a527f11d5 /debian
parent8889f8646bb9b77705dd71e7e7a0afd120d2336c (diff)
* fixed FTBFS with glib2.26 (Closes: #882881)
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/0005-slocale.h-is-removed-in-GLIBC-2.26.patch44
-rw-r--r--debian/patches/series1
2 files changed, 45 insertions, 0 deletions
diff --git a/debian/patches/0005-slocale.h-is-removed-in-GLIBC-2.26.patch b/debian/patches/0005-slocale.h-is-removed-in-GLIBC-2.26.patch
new file mode 100644
index 0000000..fb081bb
--- /dev/null
+++ b/debian/patches/0005-slocale.h-is-removed-in-GLIBC-2.26.patch
@@ -0,0 +1,44 @@
+From: Vicente Armando Sole <sole@titan.esrf.fr>
+Date: Mon, 27 Nov 2017 10:46:30 +0100
+Subject: slocale.h is removed in GLIBC 2.26
+
+---
+ silx/io/specfile/src/locale_management.c | 24 ++++++++++++++++--------
+ 1 file changed, 16 insertions(+), 8 deletions(-)
+
+diff --git a/silx/io/specfile/src/locale_management.c b/silx/io/specfile/src/locale_management.c
+index 163ed75..62111cc 100644
+--- a/silx/io/specfile/src/locale_management.c
++++ b/silx/io/specfile/src/locale_management.c
+@@ -24,15 +24,23 @@
+ #include <stdlib.h>
+
+ #ifdef _GNU_SOURCE
+-#include <xlocale.h>
+-#include <locale.h>
++# include <locale.h>
++# ifdef __GLIBC__
++# include <features.h>
++# if !((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ > 25)))
++# /* strtod_l has been moved to stdlib.h since glibc 2.26 */
++# include <xlocale.h>
++# endif
++# else
++# include <xlocale.h>
++# endif
+ #else
+-#ifdef PYMCA_POSIX
+-#else
+-#ifdef SPECFILE_POSIX
+-#include <locale.h>
+-#endif
+-#endif
++# ifdef PYMCA_POSIX
++# else
++# ifdef SPECFILE_POSIX
++# include <locale.h>
++# endif
++# endif
+ #endif
+
+ #include <string.h>
diff --git a/debian/patches/series b/debian/patches/series
index b1878a6..820176e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
0003-fix-unit-test.patch
0006-prefer-pyqt5-over-pyside.patch
0007-add-install_requires-dependencies.patch
+0005-slocale.h-is-removed-in-GLIBC-2.26.patch