Hello community, here is the log from the commit of package oce for openSUSE:Factory checked in at 2017-09-14 21:19:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oce (Old) and /work/SRC/openSUSE:Factory/.oce.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "oce" Thu Sep 14 21:19:33 2017 rev:4 rq:526104 version:0.18.1 Changes: -------- --- /work/SRC/openSUSE:Factory/oce/oce.changes 2017-08-16 16:12:13.477924493 +0200 +++ /work/SRC/openSUSE:Factory/.oce.new/oce.changes 2017-09-14 21:19:33.353922576 +0200 @@ -1,0 +2,10 @@ +Wed Sep 13 15:37:59 UTC 2017 - [email protected] + +- Add oce-check-for-xlocale.patch: Implement a check for xlocale.h + header in CMakeLists.txt to define HAVE_XLOCALE_H instead of + macro-level checks based on OS; fixes build failures with glibc + >= 2.26 where xlocale.h is no longer available. +- Set VERBOSE=1 during make to make it possible for brp to catch + compiler warnings, etc. + +------------------------------------------------------------------- New: ---- oce-check-for-xlocale.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oce.spec ++++++ --- /var/tmp/diff_new_pack.fxjlM0/_old 2017-09-14 21:19:36.937418225 +0200 +++ /var/tmp/diff_new_pack.fxjlM0/_new 2017-09-14 21:19:36.937418225 +0200 @@ -46,6 +46,8 @@ Url: https://github.com/tpaviot/oce Source0: oce-%{version}.tar.xz +# PATCH-FIX-UPSTREAM oce-check-for-xlocale.patch [email protected] -- Implement a check for xlocale.h header in CMakeLists.txt to define HAVE_XLOCALE_H instead of macro-level checks based on OS; fixes build failures with glibc >= 2.26 where xlocale.h is no longer available. +Patch0: oce-check-for-xlocale.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake @@ -133,6 +135,7 @@ %prep %setup -q +%patch0 -p1 %build mkdir build @@ -185,7 +188,7 @@ %if %{with scanbuild} /usr/share/clang/scan-build/scan-build --use-analyzer %_bindir/clang -analyze-headers \ %endif - make %{?_smp_mflags} + make %{?_smp_mflags} VERBOSE=1 cd .. %install ++++++ oce-check-for-xlocale.patch ++++++ Index: oce-0.18.1/CMakeLists.txt =================================================================== --- oce-0.18.1.orig/CMakeLists.txt +++ oce-0.18.1/CMakeLists.txt @@ -768,6 +768,9 @@ if (NOT CHECK_BODY_TEMPLATE) set (OCE_IS_DUPLICATE_UINT32_T TRUE) endif () +# Check for presence of xlocale.h and set HAVE_XLOCALE_H accordingly +check_include_file(xlocale.h HAVE_XLOCALE_H) + ################################################ # Define output path for generated libraries: # # platform/compiler-build_type-bits # Index: oce-0.18.1/src/Standard/Standard_CLocaleSentry.hxx =================================================================== --- oce-0.18.1.orig/src/Standard/Standard_CLocaleSentry.hxx +++ oce-0.18.1/src/Standard/Standard_CLocaleSentry.hxx @@ -20,21 +20,6 @@ #include <locale.h> -#ifndef HAVE_XLOCALE_H - //! "xlocale.h" available in Mac OS X and glibc (Linux) for a long time as an extension - //! and become part of POSIX since '2008. - //! Notice that this is impossible to test (_POSIX_C_SOURCE >= 200809L) - //! since POSIX didn't declared such identifier. - #if defined(__APPLE__) - #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 #include <xlocale.h> #endif
