Received: from mail.ovgu.de (mail.ovgu.de [141.44.1.66]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id 0256E7819D3 for ; Thu, 10 Oct 2019 20:17:05 +0000 (UTC) Received: from mail.ovgu.de (localhost [127.0.0.1]) by localhost (Postfix) with SMTP id BDD3240064 for ; Thu, 10 Oct 2019 22:17:05 +0200 (CEST) Received: from localhost.localdomain (x590c369b.dyn.telefonica.de [89.12.54.155]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.ovgu.de (Postfix) with ESMTPSA id 4E7584005F; Thu, 10 Oct 2019 22:17:05 +0200 (CEST) From: Marian Buschsieweke To: alpine-aports@lists.alpinelinux.org Cc: Marian Buschsieweke Subject: [PATCH] comunity/wxgtk: Update to 3.1.2 Date: Thu, 10 Oct 2019 22:17:03 +0200 Message-Id: <20191010201703.18100-1-marian.buschsieweke@ovgu.de> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-PMX-Version: 6.4.6.2792898, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2019.10.10.200917, AntiVirus-Engine: 5.65.0, AntiVirus-Data: 2019.10.10.5650002 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, BODY_SIZE_3000_3999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, HELLO_LOCALHOST_LOCALDOMAIN 0, LEGITIMATE_SIGNS 0, MULTIPLE_REAL_RCPTS 0, RCVD_LOCALHOST_LOCALDOMAIN 0, __ANY_URI 0, __BODY_NO_MAILTO 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __COURIER_PHRASE 0, __CP_URI_IN_BODY 0, __CTE 0, __FRAUD_MONEY_CURRENCY 0, __FRAUD_MONEY_CURRENCY_DOLLAR 0, __FROM_DOMAIN_IN_ANY_CC1 0, __FROM_DOMAIN_IN_RCPT 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HTTPS_URI 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MIME_VERSION 0, __MULTIPLE_URI_TEXT 0, __NO_HTML_TAG_RAW 0, __PHISH_SPEAR_SUBJ_PREDICATE 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_IN_BODY 0, __URI_NOT_IMG 0, __URI_NS , __URI_WITHOUT_PATH 0, __URI_WITH_PATH 0' X-Spam-Score: Gauge= X-PMX-consideredAsSpam: no --- community/wxgtk/APKBUILD | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/community/wxgtk/APKBUILD b/community/wxgtk/APKBUILD index dbf1d923ed..247c7a8ac0 100644 --- a/community/wxgtk/APKBUILD +++ b/community/wxgtk/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Pavel Kalian # Maintainer: ScrumpyJack 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" -- 2.23.0