patch for SoQt mismatch

3 files changed, 31 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 483fd5b81cc2..1765394cb509 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = geant4-full
 	pkgdesc = A simulation toolkit for particle physics interactions - includes all the optional libraries
-	pkgver = 11.1.3
+	pkgver = 11.2.0
 	pkgrel = 1
 	url = http://geant4.cern.ch/
 	install = geant4-full.install
@@ -38,9 +38,11 @@ pkgbase = geant4-full
 	conflicts = geant4-realsurfacedata
 	conflicts = geant4-saiddata
 	options = !emptydirs
-	source = http://geant4-data.web.cern.ch/releases/geant4-v11.1.3.tar.gz
+	source = http://geant4-data.web.cern.ch/releases/geant4-v11.2.0.tar.gz
 	source = geant4-full.install
-	sha256sums = 4c5fbea6789d8d619edacca0631d6b5211a60e1bf9974c3d3fab9ef9e22692f5
-	sha256sums = b03e886435addd44eea965c7a4a59deddc34c55381af2584042b2737c89b698e
+	source = SoQt.patch
+	sha256sums = 46ad7fab3c5cb4bd0bdd77dd6d3e2283184819235bcbc01b2d117d81b35596a6
+	sha256sums = d61d5e2d6699e7b189ba8e6a80e27e357a9231d8690a56b3cae3e23b29beddf6
+	sha256sums = 3b5a899436e0f0a614a17604166a0946bf2e206ef66e1161522337a5be7a8d08
 
 pkgname = geant4-full
diff --git a/PKGBUILD b/PKGBUILD
index 300269ccdaa4..f79caceb94a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Filippo Falezza <filippo dot falezza at outlook dot it>
 
 pkgname='geant4-full'
-pkgver=11.1.3
+pkgver=11.2.0
 pkgrel=1
 pkgdesc="A simulation toolkit for particle physics interactions - includes all the optional libraries"
 depends=(
@@ -48,13 +48,22 @@ options=('!emptydirs')
 source=(
   "http://geant4-data.web.cern.ch/releases/geant4-v${pkgver}.tar.gz"
   'geant4-full.install'
+  'SoQt.patch'
 )
 sha256sums=(
-  "4c5fbea6789d8d619edacca0631d6b5211a60e1bf9974c3d3fab9ef9e22692f5"
-  "b03e886435addd44eea965c7a4a59deddc34c55381af2584042b2737c89b698e"
+  "46ad7fab3c5cb4bd0bdd77dd6d3e2283184819235bcbc01b2d117d81b35596a6"
+  "d61d5e2d6699e7b189ba8e6a80e27e357a9231d8690a56b3cae3e23b29beddf6"
+  "3b5a899436e0f0a614a17604166a0946bf2e206ef66e1161522337a5be7a8d08"
 )
 install="geant4-full.install"
 
+prepare()
+{
+  cd ${srcdir}
+  patch -Np0 -i ${srcdir}/SoQt.patch
+
+}
+
 build() {
 
   cd $srcdir
@@ -101,7 +110,6 @@ setenv G4PARTICLEHPDATA /opt/Geant4/Libraries/G4TENDL1.4" > Geant4.csh
     -DGEANT4_INSTALL_DATASETS_TENDL=ON \
     -DGEANT4_USE_G3TOG4=ON \
     -DGEANT4_USE_GDML=ON \
-    -DGEANT4_USE_INVENTOR_QT=ON \
     -DGEANT4_USE_FREETYPE=ON \
     -DGEANT4_USE_OPENGL_X11=ON \
     -DGEANT4_USE_QT=ON \
@@ -115,6 +123,8 @@ setenv G4PARTICLEHPDATA /opt/Geant4/Libraries/G4TENDL1.4" > Geant4.csh
     -DGEANT4_INSTALL_DATADIR=/opt/Geant4/Libraries \
     ../geant4-v${pkgver}
 
+#    -DGEANT4_USE_INVENTOR_QT=ON \
+
   #set GEANT4_BUILD_TLS_MODEL=global-dynamic and GEANT4_USE_PYTHON=ON for compatibility with g4python
   make #VERBOSE=1
 }
diff --git a/SoQt.patch b/SoQt.patch
new file mode 100644
index 000000000000..6073d1a58c01
--- /dev/null
+++ b/SoQt.patch
@@ -0,0 +1,11 @@
+--- geant4-v11.2.0/cmake/Modules/G4InterfaceOptions.cmake 2023-12-07 10:59:24.000000000 +0100
++++ G4InterfaceOptions.cmake  2024-01-23 15:14:30.753062336 +0100
+@@ -139,7 +139,7 @@
+   geant4_save_package_variables(Inventor Coin_DIR)
+ 
+   if(GEANT4_USE_INVENTOR_QT)
+-    find_package(SoQt 1.6.0 REQUIRED)
++    find_package(SoQt 1.6.1 REQUIRED)
+     geant4_save_package_variables(Inventor SoQt_DIR)
+   else()
+     if(UNIX)