[oce] 01/04: Omit xlocale.h. (Closes: #875085)

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch debian
in repository oce.

commit 1f5732d791397e92a211c9c113f86f55ede3140e
Author: Steve Langasek <steve.langasek at ubuntu.com>
Date:   Sat Sep 23 18:36:43 2017 +0200

    Omit xlocale.h. (Closes: #875085)
---
 debian/patches/no-xlocale.h-for-glibc-2.26.patch | 24 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 2 files changed, 25 insertions(+)

diff --git a/debian/patches/no-xlocale.h-for-glibc-2.26.patch b/debian/patches/no-xlocale.h-for-glibc-2.26.patch
new file mode 100644
index 0000000..e53a2a8
--- /dev/null
+++ b/debian/patches/no-xlocale.h-for-glibc-2.26.patch
@@ -0,0 +1,24 @@
+Description: Omit xlocale.h, not needed and not available in glibc 2.26
+ glibc 2.26 has dropped the non-standard xlocale.h header, which was only
+ used to get a definition of locale_t which should be treated opaquely by
+ oce anyway.  Drop the HAVE_LOCALE_H declaration and let locale_t fall back
+ to void *.
+Author: Steve Langasek <steve.langasek at ubuntu.com>
+Forwarded: no
+Last-Update: 2017-09-09
+
+Index: oce/src/Standard/Standard_CLocaleSentry.hxx
+===================================================================
+--- oce.orig/src/Standard/Standard_CLocaleSentry.hxx
++++ oce/src/Standard/Standard_CLocaleSentry.hxx
+@@ -29,10 +29,6 @@
+     #define HAVE_XLOCALE_H
+   #endif
+ 
+-  //! We check _GNU_SOURCE for glibc extensions here and it is always defined by g++ compiler.
+-  #if defined(_GNU_SOURCE) && !defined(__ANDROID__)
+-    #define HAVE_XLOCALE_H
+-  #endif
+ #endif // ifndef HAVE_LOCALE_H
+ 
+ #ifdef HAVE_XLOCALE_H
diff --git a/debian/patches/series b/debian/patches/series
index 4e488a9..0fde8f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 split-export.patch
 speedup-BRepMesh_test.patch
 fix_FTBFS_gcc72.patch
+no-xlocale.h-for-glibc-2.26.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/oce.git