Merge pull request #215 from markito3/g4_10.04_fixes

G4 10.04 fixes

Makefile_hdgeant4

@@ -31,7 +31,10 @@ PYTHON_CONFIG = $(shell $(BUILD_SCRIPTS)/python_chooser.sh config)
 PYTHON_BOOST = $(shell $(BUILD_SCRIPTS)/python_chooser.sh boost)
 PYTHON_LIB_OPTION = $(shell $(BUILD_SCRIPTS)/python_chooser.sh lib)
 
-include $(BUILD_SCRIPTS)/qt_version.mk # defines QT_VERSION
+QTHOME_LOCATION := $(shell if [ -d  "/usr/lib64/qt5" ]; then echo /usr/lib64/qt5; elif [ -d  "/usr/lib64/qt4" ]; then echo /usr/lib64/qt4; else echo not_found; fi)
+ifneq ($(QTHOME_LOCATION), not_found)
+  QTHOME_DEF = QTHOME=$(QTHOME_LOCATION)
+endif
 
 all: force_rebuild_action $(HDGEANT4_HOME)/hdgeant4_prereqs_version.xml
 
@@ -70,7 +73,7 @@ $(HDGEANT4_HOME)/.make_done: $(HDGEANT4_HOME)/.link_to_fixes_done
 	    then echo Geant4 setup not complete, sourcing geant4make.sh ; \
 	    . `find $(G4ROOT)/share/ -name geant4make.sh` ; \
 	fi ; \
-	make PYTHON_CONFIG=$(PYTHON_CONFIG) BOOST_PYTHON_LIB=$(PYTHON_BOOST) PYTHON_LIB_OPTION=$(PYTHON_LIB_OPTION) $(HDGEANT4_MAKE_OPTIONS) QT_VERSION=$(QT_VERSION)
+	make PYTHON_CONFIG=$(PYTHON_CONFIG) BOOST_PYTHON_LIB=$(PYTHON_BOOST) PYTHON_LIB_OPTION=$(PYTHON_LIB_OPTION) $(QTHOME_DEF) $(HDGEANT4_MAKE_OPTIONS)
 	date > $@
 
 $(HDGEANT4_HOME)/hdgeant4_prereqs_version.xml: $(HDGEANT4_HOME)/.make_done

patches/geant4/Linux-g++.gmk.patch

@@ -1,12 +1,7 @@
---- Linux-g++.gmk.original	2021-09-22 14:45:22.608148649 -0400
-+++ Linux-g++.gmk.patched	2021-09-22 16:22:16.414406962 -0400
-@@ -92,19 +92,15 @@
-     QTHOME     := /usr
-   endif
-   ifndef QTMOC
--    QTMOC      := $(QTHOME)/bin/moc
-+#    QTMOC      := $(shell if [ -f  "$(QTHOME)/bin/moc-qt5" ]; then echo $(QTHOME)/bin/moc-qt5; elif [ -f  "$(QTHOME)/bin/moc-qt4" ]; then echo $(QTHOME)/bin/moc-qt4; else echo $(QTHOME)/bin/moc; fi)
-+    QTMOC      := dummy_value
+--- Linux-g++.gmk.original	2021-10-05 14:44:07.583934347 -0400
++++ Linux-g++.gmk.patched	2021-10-05 15:55:50.134129734 -0400
+@@ -95,16 +95,11 @@
+     QTMOC      := $(QTHOME)/bin/moc
    endif
 
 -  QT_VERSION := $(shell $(QTMOC) 2>&1 -v | sed 's/.* .Qt \([0-9]\)\..*/\1/' )
@@ -24,7 +19,7 @@
      endif
    else                          # Qt4
      ifndef QTFLAGS
-@@ -115,18 +111,18 @@
+@@ -115,18 +110,18 @@
      endif
    endif
    ifndef QTLIBPATH