summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD21
2 files changed, 12 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fbc7f9b0516..47c06e8b456 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = wxgtk-dev
pkgver = 3.1.5
- pkgrel = 1
+ pkgrel = 2
url = https://wxwidgets.org
arch = x86_64
license = custom:wxWindows
diff --git a/PKGBUILD b/PKGBUILD
index c8b186aea81..b6d08d40cc8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgbase=wxgtk-dev
pkgname=(wxgtk2-dev wxgtk3-dev wxgtk-common-dev)
pkgver=3.1.5
-pkgrel=1
+pkgrel=2
arch=('x86_64')
url="https://wxwidgets.org"
license=('custom:wxWindows')
@@ -14,21 +14,21 @@ sha1sums=('725455d6324baa808259b56a42199237327e0638')
sha256sums=('d7b3666de33aa5c10ea41bb9405c40326e1aeb74ee725bb88f90f1d50270a224')
prepare() {
- cp -a wxWidgets-${pkgver} wxWidgets-${pkgver}-gtk3
+ cp -a wxWidgets-${pkgver} wxWidgets-${pkgver}-gtk2
}
build() {
cd wxWidgets-${pkgver}
- ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
- --enable-graphics_ctx --enable-mediactrl --with-regex=builtin \
+ ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=3 --with-opengl --enable-unicode \
+ --enable-graphics_ctx --enable-mediactrl --enable-webview --with-regex=builtin \
--with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
--disable-precomp-headers
make
make -C locale allmo
- cd ../wxWidgets-${pkgver}-gtk3
- ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=3 --with-opengl --enable-unicode \
- --enable-graphics_ctx --enable-mediactrl --enable-webview --with-regex=builtin \
+ cd ../wxWidgets-${pkgver}-gtk2
+ ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
+ --enable-graphics_ctx --enable-mediactrl --with-regex=builtin \
--with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
--disable-precomp-headers
make
@@ -54,9 +54,10 @@ package_wxgtk2-dev() {
provides=('wxgtk' 'wxgtk2')
replaces=('wxgtk')
- cd wxWidgets-${pkgver}
+ cd wxWidgets-${pkgver}-gtk2
make DESTDIR="${pkgdir}" install
rm -r "$pkgdir"/usr/{include,share,lib/libwx_base*,bin/wxrc*}
+ mv "$pkgdir"/usr/bin/wx-config{,-gtk2}
install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
@@ -68,10 +69,10 @@ package_wxgtk3-dev() {
conflicts=('wxgtk<3.0.3.1-2' 'wxgtk3')
provides=('wxgtk3')
- cd wxWidgets-${pkgver}-gtk3
+ cd wxWidgets-${pkgver}
make DESTDIR="${pkgdir}" install
rm -r "$pkgdir"/usr/{include,share,lib/libwx_base*,bin/wxrc*}
- mv "$pkgdir"/usr/bin/wx-config{,-gtk3}
+ ln -s wx-config "$pkgdir"/usr/bin/wx-config-gtk3
install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}