Changed dependency wxgtk2 to wxgtk3 (as stated in CMakeFiles.txt, too).

4 files changed, 18 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d6b85ece4386..cdbe3a678136 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gnudatalanguage
 	pkgdesc = An IDL (Interactive Data Language) compatible incremental compiler (ie. runs IDL programs)
 	pkgver = 1.0.1
-	pkgrel = 4
+	pkgrel = 5
 	url = https://gnudatalanguage.github.io/
 	arch = i686
 	arch = x86_64
@@ -20,7 +20,7 @@ pkgbase = gnudatalanguage
 	depends = python-numpy
 	depends = shapelib
 	depends = udunits
-	depends = wxgtk2
+	depends = wxgtk3
 	optdepends = cuda
 	source = gnudatalanguage-1.0.1.tar.gz::https://github.com/gnudatalanguage/gdl/archive/v1.0.1.tar.gz
 	source = gdl.profile
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index acf545460c8e..5c82c98a91c7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,7 @@ variables:
 
 stages:
   - containerize
+  - extract
   - build
   - test
   - deploy
@@ -18,16 +19,22 @@ container-build-and-test:
   extends: .arch-containerize
   needs: []
 
+extract-gnudatalanguage:
+  extends: .arch-extract-only
+  needs:
+    - job: "container-build-and-test"
+      artifacts: no
+    
 build-gnudatalanguage:
   artifacts:
     paths:
       - $PKG_NAME*.pkg.tar.zst
       - src/gdl-*/build/Testing/Temporary/LastTest.log
     when: always
-  extends: .arch-buildx
-  needs:
-    - job: "container-build-and-test"
-      artifacts: no
+  before_script:
+    - sed -i "s/^tolerance=0.01/tolerance=${TOLERANCE:-0.01}/" src/gdl-*/testsuite/test_tic_toc.pro
+  extends: .arch-buildx-only
+  needs: ["extract-gnudatalanguage"]
   
 test-gnudatalanguage:
   extends: .arch-test
diff --git a/Dockerfile.build_and_test b/Dockerfile.build_and_test
index b8e07bb28b08..f49a6900a5f4 100644
--- a/Dockerfile.build_and_test
+++ b/Dockerfile.build_and_test
@@ -3,7 +3,7 @@ ARG REGISTRY
 FROM "$REGISTRY/common/gitlab-helper/archlinux-yay:master"
 
 RUN (\
-    yay -Syuq --noconfirm --needed python-numpy eigen plplot gsl hdf4 wxgtk2 fftw pslib eccodes udunits graphicsmagick libgeotiff glpk shapelib openssh xorg-server-xvfb \
+    yay -Syuq --noconfirm --needed python-numpy eigen plplot gsl hdf4 wxgtk3 fftw pslib eccodes udunits graphicsmagick libgeotiff glpk shapelib openssh xorg-server-xvfb \
     && yes | yay -Scc --noconfirm \
     && rm -rf ~/.cache/yay \
     && sudo rm -rf /var/cache/pacman/pkg/* \
diff --git a/PKGBUILD b/PKGBUILD
index 0bde7652fe14..4a8dea846c1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,13 +5,13 @@
 
 pkgname=gnudatalanguage
 pkgver=1.0.1
-pkgrel=4
+pkgrel=5
 pkgdesc="An IDL (Interactive Data Language) compatible incremental compiler (ie. runs IDL programs)"
 arch=("i686" "x86_64")
 url="https://gnudatalanguage.github.io/"
 license=("GPL")
 depends=("eccodes" "eigen" "fftw" "glpk" "graphicsmagick" "gsl" "hdf4"
-         "libgeotiff" "plplot" "python-numpy" "shapelib" "udunits" "wxgtk2")
+         "libgeotiff" "plplot" "python-numpy" "shapelib" "udunits" "wxgtk3")
 makedepends=("cmake")
 checkdepends=("openssh")
 optdepends=("cuda")
@@ -36,9 +36,8 @@ build() {
     cd build
     cmake -Wno-dev -DCMAKE_INSTALL_PREFIX=/usr -DEIGEN3=ON -DFFTW=ON -DGLPK=ON \
         -DGRAPHICSMAGICK=ON -DGRIB=ON -DHDF5=ON -DHDF=ON -DHDFDIR=/opt/hdf4 \
-        -DLIBPROJ=ON -DMAGICK=OFF -DMAGICK=OFF -DMPI=ON -DNETCDF=ON \
-        -DPYTHON_MODULE=OFF -DREADLINE=ON -DSHAPELIB=ON -DUDUNITS2=ON \
-        -DPYTHON=ON -DPYTHONVERSION=3 ..
+        -DLIBPROJ=ON -DMAGICK=OFF -DMPI=ON -DNETCDF=ON -DPYTHON_MODULE=OFF \
+        -DREADLINE=ON -DSHAPELIB=ON -DUDUNITS2=ON -DPYTHON=ON -DPYTHONVERSION=3 ..
 
     make
 }