From 754e54a4f43c272f5e9b4a41c1dd3ac6b50a3f4c Mon Sep 17 00:00:00 2001
From: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
Date: Thu, 10 Oct 2019 22:17:03 +0200
Subject: [PATCH] comunity/wxgtk: Update to 3.1.2
---
community/wxgtk/APKBUILD | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/community/wxgtk/APKBUILD b/community/wxgtk/APKBUILD
index dbf1d923ed92..247c7a8ac0bf 100644
--- a/community/wxgtk/APKBUILD
+++ b/community/wxgtk/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Pavel Kalian <pavel@kalian.cz>
# Maintainer: ScrumpyJack <scrumpyjack@st.ilet.to>
pkgname=wxgtk
-pkgver=3.0.4
-pkgrel=4
+pkgver=3.1.2
+pkgrel=0
pkgdesc="GTK2 port of wxWidgets GUI library"
url="https://www.wxwidgets.org/"
arch="all"
@@ -26,11 +26,6 @@ subpackages="
source="https://github.com/wxWidgets/wxWidgets/releases/download/v${pkgver}/wxWidgets-${pkgver}.tar.bz2"
builddir="$srcdir/wxWidgets-$pkgver"
-prepare() {
- default_prepare
- update_config_sub
-}
-
build() {
for gtk_version in 2 3; do
cd "$builddir"
@@ -44,11 +39,11 @@ build() {
--with-opengl \
--enable-unicode \
--enable-aui \
- --enable-no_deps \
--enable-shared \
--enable-sound \
--enable-mediactrl \
--disable-rpath \
+ --disable-xlocale \
--disable-optimise \
--with-gtk=${gtk_version}
@@ -69,21 +64,22 @@ dev() {
default_dev
mkdir -p "$subpkgdir"/usr/lib/wx/config
- mv "$pkgdir"/usr/lib/wx/config/gtk2-unicode-3.0 "$subpkgdir"/usr/lib/wx/config
+ mv "$pkgdir"/usr/lib/wx/config/gtk2-unicode-${pkgver:0:3} "$subpkgdir"/usr/lib/wx/config
mkdir -p "$subpkgdir"/usr/bin
cd "$subpkgdir"/usr/bin/
- ln -s /usr/lib/wx/config/gtk2-unicode-3.0 wx-config-gtk2
+ ln -s /usr/lib/wx/config/gtk2-unicode-${pkgver:0:3} wx-config-gtk2
ln -sf /usr/bin/wx-config-gtk2 wx-config
# Move stuff back into the wild for the other -dev packages
- mv "$subpkgdir"/usr/include/wx-3.0 "$pkgdir"/usr/include
+ mkdir -p "$pkgdir"/usr/include
+ mv "$subpkgdir"/usr/include/wx-${pkgver:0:3} "$pkgdir"/usr/include
mv "$subpkgdir"/usr/lib/libwx_baseu*.so "$pkgdir"/usr/lib
mv "$subpkgdir"/usr/share/aclocal "$pkgdir"/usr/share
mv "$subpkgdir"/usr/lib/libwx_gtk3u*.so "$pkgdir"/usr/lib
mkdir -p "$pkgdir"/usr/lib/wx/include
- mv "$subpkgdir"/usr/lib/wx/include/gtk3-unicode-3.0 "$pkgdir"/usr/lib/wx/include
+ mv "$subpkgdir"/usr/lib/wx/include/gtk3-unicode-${pkgver:0:3} "$pkgdir"/usr/lib/wx/include
}
_base_dev() {
@@ -106,11 +102,11 @@ _dev3() {
default_dev
mkdir -p "$subpkgdir"/usr/lib/wx/config
- mv "$pkgdir"/usr/lib/wx/config/gtk3-unicode-3.0 "$subpkgdir"/usr/lib/wx/config
+ mv "$pkgdir"/usr/lib/wx/config/gtk3-unicode-${pkgver:0:3} "$subpkgdir"/usr/lib/wx/config
mkdir -p "$subpkgdir"/usr/bin
cd "$subpkgdir"/usr/bin/
- ln -s /usr/lib/wx/config/gtk3-unicode-3.0 wx-config-gtk3
+ ln -s /usr/lib/wx/config/gtk3-unicode-${pkgver:0:3} wx-config-gtk3
}
_media2() {
@@ -142,4 +138,4 @@ _gtk3() {
mv "$pkgdir"/usr/lib/libwx_gtk3* "$subpkgdir"/usr/lib/
}
-sha512sums="c9e6b35d541a99921c54cfdac260843f574f146b27f924a7a0fca5007344fa99865a96ded95e6802329ad9221b4880d62b92277a1b4c1ce71420acb672ad9158 wxWidgets-3.0.4.tar.bz2"
+sha512sums="e0c6cc58f87c7534be100b098b6db4c5a7a6b7972a8ccc0573dc38cda1b098e1d9f3ea541771173889806f093b4fb5bc0f2b57952eedf907fe7e5d7c01840cf6 wxWidgets-3.1.2.tar.bz2"
--
GitLab