testing yaml patch, and not using geant4.pc

Author: maureeungaro

ci/build.sh

@@ -3,15 +3,15 @@
 # Purpose: compiles gemc with optional sanitizers or debugging options.
 
 # Container run:
-# docker run -it --rm --platform linux/amd64 jeffersonlab/geant4:g4v11.3.2-almalinux94 sh
+# docker run -it --rm --platform linux/amd64 ghcr.io/gemc/g4install:11.3.2-archlinux-latest bash -il
 # git clone http://github.com/gemc/src /root/src && cd /root/src
 # ./ci/build.sh
 
 source ci/env.sh
 
 # module gemc gives $GEMC (used in meson prefix) and PKG_CONFIG_PATH
 # not strickly necessary, one could set those manually
-module load gemc/dev3
+module load gemc/dev
 echo GEMC for prefix set to: $GEMC
 echo
 
@@ -48,8 +48,11 @@ else
   echo ; echo
 fi
 
-cd build  || exit 1
+echo " > Applying patch to version 0.8.0"  >> $setup_log
+meson subprojects update yaml-cpp --reset
+meson setup --reconfigure build
 
+cd build  || exit 1
 echo " > Running meson compile -v  -j $max_threads"  > $compile_log
 meson compile -v  -j $max_threads >> $compile_log
 if [ $? -ne 0 ]; then

meson/install_geant4_root_pkgconfig.py

@@ -98,8 +98,8 @@ def check_root_config() -> bool:
 		install_dir.mkdir(parents=True, exist_ok=True)
 
 	# --- 2. generate .pc files -----------------------------------------------
-	generate_pkgconfig(install_dir, "geant4-config",
-					   "geant4.pc", "Geant4", "Geant4 Simulation Toolkit")
+	#generate_pkgconfig(install_dir, "geant4-config",
+	#				   "geant4.pc", "Geant4", "Geant4 Simulation Toolkit")
 
 	if check_root_config():
 		generate_pkgconfig(install_dir, "root-config",

meson/meson.build

@@ -48,12 +48,62 @@ endif
 #root_deps = dependency('root', method: 'cmake')
 
 # geant4: pkg-config created manually by ./meson/install_geant4_root_pkgconfig.py
-geant4_deps = dependency('geant4',
-                         version : '>=11.3.0',
-)
+#geant4_deps = dependency('geant4',
+#                         version : '>=11.3.0',
+#)
 # this also works,but ONLY if the dynamic libraries are present
 # geant4_deps = dependency('Geant4', method : 'cmake', static : true)
 
+g4_all_modules = [
+    # Shared-only in your install:
+    'Geant4::G4tools',
+
+    # Static variants available (from your valid target list):
+    'Geant4::G4ptl-static',
+    'Geant4::G4analysis-static',
+    'Geant4::G4digits_hits-static',
+    'Geant4::G4error_propagation-static',
+    'Geant4::G4event-static',
+    'Geant4::G4geometry-static',
+    'Geant4::G4global-static',
+    'Geant4::G4graphics_reps-static',
+    'Geant4::G4intercoms-static',
+    'Geant4::G4interfaces-static',
+    'Geant4::G4materials-static',
+    'Geant4::G4parmodels-static',
+    'Geant4::G4particles-static',
+    'Geant4::G4geomtext-static',
+    'Geant4::G4mctruth-static',
+    'Geant4::G4gdml-static',
+    'Geant4::G4physicslists-static',
+    'Geant4::G4processes-static',
+    'Geant4::G4readout-static',
+    'Geant4::G4run-static',
+    'Geant4::G4track-static',
+    'Geant4::G4tracking-static',
+    'Geant4::G4FR-static',
+    'Geant4::G4visHepRep-static',
+    'Geant4::G4RayTracer-static',
+    'Geant4::G4Tree-static',
+    'Geant4::G4VRML-static',
+    'Geant4::G4GMocren-static',
+    'Geant4::G4vis_management-static',
+    'Geant4::G4modeling-static',
+    'Geant4::G4ToolsSG-static',
+    'Geant4::G4OpenGL-static',
+    'Geant4::G4visQt3D-static',
+]
+
+geant4_deps = dependency(
+    'Geant4',
+    method: 'cmake',
+    version: '>=11.3.0',
+   # modules: g4_all_modules,
+    static: true,      # prefer static libraries when available
+    required: true,
+)
+
+
 
 cmake = import('cmake')
 

subprojects/packagefiles/yaml-cpp/0001-include-cstdint-emitterutils.patch

@@ -0,0 +1,17 @@
+From abcdef1234567890 Mon Sep 17 00:00:00 2001
+Subject: [PATCH] emitterutils: include <cstdint> (and <utility>) for uint16_t/uint32_t
+
+diff --git a/src/emitterutils.cpp b/src/emitterutils.cpp
+index 0000000..1111111 100644
+--- a/src/emitterutils.cpp
++++ b/src/emitterutils.cpp
+@@ -9,6 +9,8 @@
+ #include "yaml-cpp/mark.h"
+ #include "yaml-cpp/null.h"
+ #include "yaml-cpp/ostream_wrapper.h"
++#include <cstdint>
++#include <utility>
+ 
+ namespace YAML {
+ namespace Utils {
+

subprojects/yaml-cpp.wrap

@@ -3,6 +3,8 @@ url = https://github.com/jbeder/yaml-cpp
 revision = 0.8.0
 depth = 1
 method = cmake
+diff_files = yaml-cpp/0001-include-cstdint-emitterutils.patch
 
 [provide]
 yaml_cpp=yaml_cpp_dep
+