oce: update to 0.18.3

Closes: #11695 [via git-merge-pr]
This commit is contained in:
yopito 2018-02-15 22:13:23 +01:00 committed by Jürgen Buchmüller
parent bec83591d3
commit d27b2e65e0
2 changed files with 3 additions and 16 deletions

View File

@ -1,13 +0,0 @@
--- 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,8 +1,8 @@
# Template file for 'oce' # Template file for 'oce'
pkgname=oce pkgname=oce
_majorver=0.18 _majorver=0.18
version=${_majorver}.2 version=${_majorver}.3
revision=2 revision=1
wrksrc="${pkgname}-OCE-${version}" wrksrc="${pkgname}-OCE-${version}"
build_style=cmake build_style=cmake
configure_args="-DOCE_INSTALL_PREFIX=/usr -DOCE_WITH_FREEIMAGE=ON configure_args="-DOCE_INSTALL_PREFIX=/usr -DOCE_WITH_FREEIMAGE=ON
@ -13,7 +13,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
license="LGPL-2.1, OCCT" license="LGPL-2.1, OCCT"
homepage="https://github.com/tpaviot/oce" homepage="https://github.com/tpaviot/oce"
distfiles="https://github.com/tpaviot/oce/archive/OCE-${version}.tar.gz" distfiles="https://github.com/tpaviot/oce/archive/OCE-${version}.tar.gz"
checksum=dc21ddea678a500ad87c773e9a502ed7a71768cf83d9af0bd4c43294186a7fef checksum=c553d6a7bf52f790abc3b6bb7a1e91a65947e92a426bb1a88a11960c31f0966c
post_install() { post_install() {
vlicense OCCT_LGPL_EXCEPTION.txt vlicense OCCT_LGPL_EXCEPTION.txt