From 1f623ddeb053964be641d68dbe85bfeb64511eae Mon Sep 17 00:00:00 2001 From: yopito Date: Thu, 17 Aug 2017 08:44:04 +0200 Subject: [PATCH] oce: update to 0.18.2. --- srcpkgs/oce/patches/musl-xlocate.patch | 11 ----------- srcpkgs/oce/patches/xlocate.patch | 13 +++++++++++++ srcpkgs/oce/template | 4 ++-- 3 files changed, 15 insertions(+), 13 deletions(-) delete mode 100644 srcpkgs/oce/patches/musl-xlocate.patch create mode 100644 srcpkgs/oce/patches/xlocate.patch diff --git a/srcpkgs/oce/patches/musl-xlocate.patch b/srcpkgs/oce/patches/musl-xlocate.patch deleted file mode 100644 index 994b34052e3..00000000000 --- a/srcpkgs/oce/patches/musl-xlocate.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Standard/Standard_CLocaleSentry.hxx.orig 2016-01-02 06:11:52.000000000 +0100 -+++ src/Standard/Standard_CLocaleSentry.hxx 2016-06-03 14:12:17.399501218 +0200 -@@ -30,7 +30,7 @@ - #endif - - //! We check _GNU_SOURCE for glibc extensions here and it is always defined by g++ compiler. -- #if defined(_GNU_SOURCE) && !defined(__ANDROID__) -+ #if defined(_GNU_SOURCE) && defined(__GLIBC__) && !defined(__ANDROID__) - #define HAVE_XLOCALE_H - #endif - #endif // ifndef HAVE_LOCALE_H diff --git a/srcpkgs/oce/patches/xlocate.patch b/srcpkgs/oce/patches/xlocate.patch new file mode 100644 index 00000000000..2c4ba599583 --- /dev/null +++ b/srcpkgs/oce/patches/xlocate.patch @@ -0,0 +1,13 @@ +--- src/Standard/Standard_CLocaleSentry.hxx.ORIG 2017-08-11 07:51:11.000000000 +0200 ++++ src/Standard/Standard_CLocaleSentry.hxx 2017-08-18 01:07:11.639206272 +0200 +@@ -30,7 +30,9 @@ + #endif + + //! We check _GNU_SOURCE for glibc extensions here and it is always defined by g++ compiler. +- #if defined(_GNU_SOURCE) && !defined(__ANDROID__) ++ //! Musl libc does not provide xlocale.h ++ //! glibc 2.26+ does not provide xlocale.h (anymore) ++ #if defined(_GNU_SOURCE) && defined(__GLIBC__) && __GLIBC__ <= 2 && __GLIBC_MINOR__ < 26 && !defined(__ANDROID__) + #define HAVE_XLOCALE_H + #endif + #endif // ifndef HAVE_LOCALE_H diff --git a/srcpkgs/oce/template b/srcpkgs/oce/template index 4e10e5670c4..a051ad098ca 100644 --- a/srcpkgs/oce/template +++ b/srcpkgs/oce/template @@ -1,7 +1,7 @@ # Template file for 'oce' pkgname=oce _majorver=0.18 -version=${_majorver}.1 +version=${_majorver}.2 revision=1 wrksrc="${pkgname}-OCE-${version}" build_style=cmake @@ -13,7 +13,7 @@ maintainer="yopito " license="LGPL-2.1, OCCT" homepage="https://github.com/tpaviot/oce" distfiles="https://github.com/tpaviot/oce/archive/OCE-${version}.tar.gz" -checksum=1acf5da4bffa3592ca9f3535af9b927b79fcfeadcb81e9963e89aec192929a6c +checksum=dc21ddea678a500ad87c773e9a502ed7a71768cf83d9af0bd4c43294186a7fef case "${XBPS_TARGET_MACHINE}" in arm*)