Make GTK3 the default. Fix missing wx/unix/glegl.h

https://archlinux.org/todo/gtk-2-eol/

1 files changed, 11 insertions, 10 deletions

diff --git a/PKGBUILD b/PKGBUILD
index f83502507f1a..fd56270f3127 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=wxgtk-dev-opt
 pkgname=(wxgtk2-dev-opt wxgtk3-dev-opt wxgtk-common-dev-opt)
 pkgver=3.1.5
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="https://wxwidgets.org"
 license=('custom:wxWindows')
@@ -15,21 +15,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=/opt/wxgtk-dev --libdir=/opt/wxgtk-dev/lib --with-gtk=2 --with-opengl --enable-unicode \
-    --enable-graphics_ctx --enable-mediactrl --with-regex=builtin \
+  ./configure --prefix=/opt/wxgtk-dev --libdir=/opt/wxgtk-dev/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=/opt/wxgtk-dev --libdir=/opt/wxgtk-dev/lib --with-gtk=3 --with-opengl --enable-unicode \
-    --enable-graphics_ctx --enable-mediactrl --enable-webview --with-regex=builtin \
+  cd ../wxWidgets-${pkgver}-gtk2
+  ./configure --prefix=/opt/wxgtk-dev --libdir=/opt/wxgtk-dev/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
@@ -50,9 +50,10 @@ package_wxgtk2-dev-opt() {
   pkgdesc='GTK+2 implementation of wxWidgets API for GUI (/opt)'
   depends=('gtk2' 'libgl' 'gst-plugins-base-libs' 'libsm' 'libxxf86vm' 'wxgtk-common-dev-opt' 'libnotify')
 
-  cd wxWidgets-${pkgver}
+  cd wxWidgets-${pkgver}-gtk2
   make DESTDIR="${pkgdir}" install
   rm -r "$pkgdir"/opt/wxgtk-dev/{include,share,lib/libwx_base*,bin/wxrc*}
+  mv "$pkgdir"/opt/wxgtk-dev/bin/wx-config{,-gtk2}
 
   install -D -m644 docs/licence.txt "${pkgdir}/opt/wxgtk-dev/share/licenses/${pkgname}/LICENSE"
 }
@@ -62,10 +63,10 @@ package_wxgtk3-dev-opt() {
   depends=('gtk3' 'gst-plugins-base-libs' 'libsm' 'libxxf86vm' 'wxgtk-common-dev-opt' 'libnotify')
   optdepends=('webkit2gtk: for webview support')
 
-  cd wxWidgets-${pkgver}-gtk3
+  cd wxWidgets-${pkgver}
   make DESTDIR="${pkgdir}" install  
   rm -r "$pkgdir"/opt/wxgtk-dev/{include,share,lib/libwx_base*,bin/wxrc*}
-  mv "$pkgdir"/opt/wxgtk-dev/bin/wx-config{,-gtk3}
+  ln -s wx-config "$pkgdir"/opt/wxgtk-dev/bin/wx-config-gtk3
 
   install -D -m644 docs/licence.txt "${pkgdir}/opt/wxgtk-dev/share/licenses/${pkgname}/LICENSE"
 }