commit: 36450a88d1529f5ee657e7dc328c9a98a7367706 Author: Sven Eden <yamakuzure <AT> gmx <DOT> net> AuthorDate: Sun Dec 24 14:31:32 2017 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Wed Dec 27 11:56:04 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36450a88
sci-misc/boinc: Remove xlocale.h usage, fixes bug 639108 >=sys-libs/glibc-2.26 dropped xlocale.h support. >From https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27 > The nonstandard header xlocale.h has been removed in this release. It was > never intended to be included directly by programs other than glibc itself, > and it was a strict subset of the standard header locale.h. This commit removes the inclusion of xlocale.h, and substitutes it with locale.h where necessary. Tested-by: Sven Eden <yamakuzure <AT> gmx.net> Bug: https://bugs.gentoo.org/639108 Closes: https://bugs.gentoo.org/639108 Package-Manager: Portage-2.3.19, Repoman-2.3.6 sci-misc/boinc/boinc-7.8.4.ebuild | 2 ++ sci-misc/boinc/files/fix_xlocale.patch | 42 ++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/sci-misc/boinc/boinc-7.8.4.ebuild b/sci-misc/boinc/boinc-7.8.4.ebuild index b4628e19804..3c1024ee2da 100644 --- a/sci-misc/boinc/boinc-7.8.4.ebuild +++ b/sci-misc/boinc/boinc-7.8.4.ebuild @@ -55,6 +55,8 @@ DEPEND="${RDEPEND} PATCHES=( # >=x11-libs/wxGTK-3.0.2.0-r3 has webview removed, bug 587462 "${FILESDIR}"/fix_webview.patch + # xlocale.h was removed in modern glibc, bug 639108 + "${FILESDIR}"/fix_xlocale.patch ) S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}" diff --git a/sci-misc/boinc/files/fix_xlocale.patch b/sci-misc/boinc/files/fix_xlocale.patch new file mode 100644 index 00000000000..8b80258cf6c --- /dev/null +++ b/sci-misc/boinc/files/fix_xlocale.patch @@ -0,0 +1,42 @@ +--- a/configure.ac 2017-12-18 17:45:19.829854890 +0100 ++++ b/configure.ac 2017-12-18 17:46:13.845853923 +0100 +@@ -602,7 +602,7 @@ + echo "DEBUG: GLUT_CFLAGS = $GLUT_CFLAGS" >&5 + echo "DEBUG: GLUT_LIBS = $GLUT_LIBS" >&5 + +- AC_CHECK_HEADERS([gl.h glu.h glut.h glaux.h GL/gl.h GL/glu.h GL/glut.h GL/glaux.h OpenGL/gl.h OpenGL/glu.h OpenGL/glut.h OpenGL/glaux.h GLUT/glut.h MesaGL/gl.h MesaGL/glu.h MesaGL/glut.h MesaGL/glaux.h libnotify/notify.h gtk/gtk.h locale.h xlocale.h]) ++ AC_CHECK_HEADERS([gl.h glu.h glut.h glaux.h GL/gl.h GL/glu.h GL/glut.h GL/glaux.h OpenGL/gl.h OpenGL/glu.h OpenGL/glut.h OpenGL/glaux.h GLUT/glut.h MesaGL/gl.h MesaGL/glu.h MesaGL/glut.h MesaGL/glaux.h libnotify/notify.h gtk/gtk.h locale.h]) + + AC_CHECK_LIB([jpeg], [jpeg_start_compress],[have_jpeg=1],[have_jpeg=0]) + AC_CHECK_HEADER([jpeglib.h],[have_jpeg=1],[have_jpeg=0]) +@@ -986,9 +986,6 @@ + #ifdef HAVE_LOCALE_H + #include <locale.h> + #endif +-#ifdef HAVE_XLOCALE_H +-#include <xlocale.h> +-#endif + ]]) + + dnl Checks for typedefs, structures, and compiler characteristics. +--- a/lib/gui_rpc_client.h 2017-12-18 17:47:22.826852688 +0100 ++++ b/lib/gui_rpc_client.h 2017-12-18 17:48:42.384851263 +0100 +@@ -807,7 +807,6 @@ + + #elif defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4) + // uselocale() is not available in OS 10.3.9 so use weak linking +-#include <xlocale.h> + extern int freelocale(locale_t) __attribute__((weak_import)); + extern locale_t newlocale(int, __const char *, locale_t) __attribute__((weak_import)); + extern locale_t uselocale(locale_t) __attribute__((weak_import)); +--- a/clientgui/AsyncRPC.cpp 2017-12-18 17:47:30.727852546 +0100 ++++ b/clientgui/AsyncRPC.cpp 2017-12-18 17:48:56.785851005 +0100 +@@ -20,7 +20,7 @@ + #endif + + #if !(defined(_WIN32) || (defined(__WXMAC__) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4))) +-#include <xlocale.h> ++#include <locale.h> + #endif + + #include "stdwx.h"
