Merge pull request #7423 from yopito/oce-0.18.2

oce: update to 0.18.2.
This commit is contained in:
Toyam Cox 2017-09-04 20:50:21 -04:00 committed by GitHub
commit 1808910113
3 changed files with 15 additions and 13 deletions

View file

@ -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

View file

@ -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

View file

@ -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 <pierre.bourgin@free.fr>"
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*)