working toward fixing build

2 files changed, 14 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4faec3195e9d..28b4c627ae04 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,16 @@
 pkgbase = perl-wx
 	pkgdesc = Interface to the wxWidgets cross-platform GUI toolkit
 	pkgver = 0.9932
-	pkgrel = 3
+	pkgrel = 4
 	url = https://metacpan.org/dist/Wx
 	arch = x86_64
 	license = GPL
 	license = PerlArtistic
 	checkdepends = xorg-server-xvfb
+	makedepends = perl-module-build
 	depends = perl-alien-wxwidgets
 	depends = perl-extutils-xspp
-	depends = wxgtk2
+	depends = wxgtk3
 	options = !emptydirs
 	source = https://cpan.metacpan.org/authors/id/M/MD/MDOOTSON/Wx-0.9932.tar.gz
 	sha256sums = 1cfdb6535a0f4676e6f1aab2c9d8e16d577be3eb3b7cc04c8074d685e6651b70
diff --git a/PKGBUILD b/PKGBUILD
index 59816479aa96..0fd5e7058c74 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,32 +2,32 @@
 # Contributor: dracorp aka Piotr Rogoza <piotr.r.public at gmail.com>
 pkgname=perl-wx
 pkgver=0.9932
-pkgrel=3
+pkgrel=4
 pkgdesc="Interface to the wxWidgets cross-platform GUI toolkit"
 arch=('x86_64')
 url="https://metacpan.org/dist/Wx"
 license=('GPL' 'PerlArtistic')
-depends=('perl-alien-wxwidgets' 'perl-extutils-xspp' 'wxgtk2')
+depends=('perl-alien-wxwidgets' 'perl-extutils-xspp' 'wxgtk3')
+makedepends=('perl-module-build')
 checkdepends=('xorg-server-xvfb')
 options=('!emptydirs')
 source=("https://cpan.metacpan.org/authors/id/M/MD/MDOOTSON/Wx-$pkgver.tar.gz")
 sha256sums=('1cfdb6535a0f4676e6f1aab2c9d8e16d577be3eb3b7cc04c8074d685e6651b70')
 
 build(){
+  # Setting these env variables overwrites any command-line-options we don't want...
+  export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps \
+    PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \
+    PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
+    WX_CONFIG=/usr/bin/wx-config-gtk3 \
+    MODULEBUILDRC=/dev/null
+
   cd "Wx-$pkgver"
-  unset PERL5LIB PERL_MM_OPT PERL_LOCAL_LIB_ROOT
-  export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps
-  perl Makefile.PL \
-    --wx-unicode \
-    --wx-version=$(wx-config --version | cut -d . -f 1-2) \
-    --wx-toolkit=gtk2 \
-    INSTALLDIRS=vendor
+  perl Makefile.PL
   make
 }
 check(){
   cd "Wx-$pkgver"
-  unset PERL5LIB PERL_MM_OPT PERL_LOCAL_LIB_ROOT
-  export PERL_MM_USE_DEFAULT=1
   if [[ -z "$DISPLAY" || -x /usr/bin/xvfb-run ]]; then
 #     warning 'Empty $DISPLAY - falling back to xvfb-run (xorg-server-xvfb)'
     xvfb-run -a -s "+extension GLX -screen 0 1280x1024x24" make test
@@ -37,6 +37,5 @@ check(){
 }
 package(){
   cd "Wx-$pkgver"
-  unset PERL5LIB PERL_MM_OPT PERL_LOCAL_LIB_ROOT
   make DESTDIR="$pkgdir" install
 }