[gentoo-commits] gentoo-x86 commit in sci-physics/geant/files: geant-4.9.4-zlib.patch geant-4.9.4-trajectory.patch

[gentoo-commits] gentoo-x86 commit in sci-physics/geant/files: geant-4.9.4-zlib.patch geant-4.9.4-trajectory.patch

[Sebastien Fabbro (bicatali)]

bicatali    11/12/18 07:13:05

  Modified:             geant-4.9.4-zlib.patch
  Added:                geant-4.9.4-trajectory.patch
  Log:
  Version bumps. Re-introduced some older flags and fixed linking of zlib. Added patch for source trajectory example (bug #365171), thanks Matthias Nagl.
  
  (Portage version: 2.1.10.41/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  sci-physics/geant/files/geant-4.9.4-zlib.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/files/geant-4.9.4-zlib.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/files/geant-4.9.4-zlib.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/files/geant-4.9.4-zlib.patch?r1=1.1&r2=1.2

Index: geant-4.9.4-zlib.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/geant/files/geant-4.9.4-zlib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geant-4.9.4-zlib.patch	22 Jan 2011 02:28:42 -0000	1.1
+++ geant-4.9.4-zlib.patch	18 Dec 2011 07:13:05 -0000	1.2
@@ -1,11 +1,20 @@
---- CMakeLists.txt.orig	2011-01-17 06:25:14.536078940 +0000
-+++ CMakeLists.txt	2011-01-17 06:25:26.166078780 +0000
-@@ -154,7 +154,7 @@
- #------------------------------------------------------------------------------
- # Optional use of system zlib library
- #
--#option(GEANT4_USE_SYSTEM_ZLIB "Use the system's zlib library" OFF)
-+option(GEANT4_USE_SYSTEM_ZLIB "Use the system's zlib library" OFF)
- if(GEANT4_USE_SYSTEM_ZLIB)
-     # This needs more work - use ITK's way of doing it as an example.
-     find_package(ZLIB)
+--- source/visualization/HepRep/sources.cmake.orig	2011-12-02 15:07:49.000000000 +0000
++++ source/visualization/HepRep/sources.cmake	2011-12-18 06:21:22.000000000 +0000
+@@ -91,7 +91,7 @@
+         G4specsolids
+         G4tracking
+         G4vis_management
+-        G4zlib
++        ${ZLIB_LIBRARIES}
+     GLOBAL_DEPENDENCIES
+         G4digits_hits
+         G4geometry
+@@ -102,7 +102,7 @@
+         G4modeling
+         G4tracking
+         G4vis_management
+-        G4zlib
++        ${ZLIB_LIBRARIES}
+     LINK_LIBRARIES
+ )
+ 



1.1                  sci-physics/geant/files/geant-4.9.4-trajectory.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/files/geant-4.9.4-trajectory.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/files/geant-4.9.4-trajectory.patch?rev=1.1&content-type=text/plain

Index: geant-4.9.4-trajectory.patch
===================================================================
--- CMakeLists.txt.orig	2011-04-28 01:19:54.232041312 +0200
+++ CMakeLists.txt	2011-04-28 01:15:11.434101391 +0200
@@ -43,6 +43,8 @@
 set(${PROJECT_NAME}_VERSION_MINOR "4")
 set(${PROJECT_NAME}_VERSION_PATCH "1")
 
+add_definitions(-DG4_STORE_TRAJECTORY)
+
 #------------------------------------------------------------------------------
 # Set up path to internal set of CMake modules.
 #