diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-02-25 19:34:21 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-02-25 19:34:21 +0000 |
| commit | a646bf53e371ab9b4e0b8c16b62f240925663063 (patch) | |
| tree | a2f20685acd30f644d8714dd1cd2efc701cad8a9 | |
| parent | c6cc5ddde484009c21a5124d09fcbfcfba632d54 (diff) | |
| download | packages-a646bf53e371ab9b4e0b8c16b62f240925663063.tar.gz packages-a646bf53e371ab9b4e0b8c16b62f240925663063.tar.bz2 packages-a646bf53e371ab9b4e0b8c16b62f240925663063.tar.xz packages-a646bf53e371ab9b4e0b8c16b62f240925663063.zip | |
user/wxwidgets: use configure option instead of patch
| -rw-r--r-- | user/wxwidgets/APKBUILD | 10 | ||||
| -rw-r--r-- | user/wxwidgets/disable-xlocale.patch | 13 |
2 files changed, 4 insertions, 19 deletions
diff --git a/user/wxwidgets/APKBUILD b/user/wxwidgets/APKBUILD index 4ad5c7920..51b93f709 100644 --- a/user/wxwidgets/APKBUILD +++ b/user/wxwidgets/APKBUILD @@ -14,9 +14,7 @@ makedepends="glu-dev gstreamer-dev gst-plugins-base-dev gtk+3.0-dev libexecinfo-dev libjpeg-turbo-dev libnotify-dev libsecret-dev libsm-dev mesa-dev tiff-dev zlib-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2 - disable-xlocale.patch - " +source="https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2" builddir="$srcdir/wxWidgets-$pkgver" build() { @@ -27,7 +25,8 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --localstatedir=/var + --localstatedir=/var \ + --disable-xlocale make } @@ -41,5 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e0c6cc58f87c7534be100b098b6db4c5a7a6b7972a8ccc0573dc38cda1b098e1d9f3ea541771173889806f093b4fb5bc0f2b57952eedf907fe7e5d7c01840cf6 wxWidgets-3.1.2.tar.bz2 -46e72528d6b7d248abf11925db51110d9b3be0c0ad89acc611a0e10ca9b63e26eb4ec48da9118db4d3f6a2b9bb3a2ba8946d44ac9aede47b5f4deba3226424f2 disable-xlocale.patch" +sha512sums="e0c6cc58f87c7534be100b098b6db4c5a7a6b7972a8ccc0573dc38cda1b098e1d9f3ea541771173889806f093b4fb5bc0f2b57952eedf907fe7e5d7c01840cf6 wxWidgets-3.1.2.tar.bz2" diff --git a/user/wxwidgets/disable-xlocale.patch b/user/wxwidgets/disable-xlocale.patch deleted file mode 100644 index 0b8aa47f9..000000000 --- a/user/wxwidgets/disable-xlocale.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- wxWidgets-3.1.2/include/wx/features.h.old 2018-12-09 15:40:08.000000000 +0000 -+++ wxWidgets-3.1.2/include/wx/features.h 2019-02-24 21:33:30.250000000 +0000 -@@ -76,8 +76,8 @@ - /* This is defined when the compiler provides some type of extended locale - functions. Otherwise, we implement them ourselves to only support the - 'C' locale */ --#if defined(HAVE_LOCALE_T) || \ -- (wxCHECK_VISUALC_VERSION(8)) -+#if (!defined(__linux__) || defined(__GLIBC__)) && (defined(HAVE_LOCALE_T) || \ -+ (wxCHECK_VISUALC_VERSION(8))) - #define wxHAS_XLOCALE_SUPPORT - #else - #undef wxHAS_XLOCALE_SUPPORT |