* [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant/files/
@ 2017-02-02 20:00 Guilherme Amadio
0 siblings, 0 replies; 3+ messages in thread
From: Guilherme Amadio @ 2017-02-02 20:00 UTC (permalink / raw
To: gentoo-commits
commit: 16397a3864ea2b2957856638981996a4546d1bd3
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Feb 2 18:07:55 2017 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Thu Feb 2 19:58:47 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16397a38
sci-physics/geant: remove unused patches
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
sci-physics/geant/files/geant-4.9.4-no-benchmarks.patch | 10 ----------
sci-physics/geant/files/geant-4.9.4-no-examples.patch | 15 ---------------
2 files changed, 25 deletions(-)
diff --git a/sci-physics/geant/files/geant-4.9.4-no-benchmarks.patch b/sci-physics/geant/files/geant-4.9.4-no-benchmarks.patch
deleted file mode 100644
index 8c9d477..00000000
--- a/sci-physics/geant/files/geant-4.9.4-no-benchmarks.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- source/geometry/CMakeLists.txt.orig 2011-01-17 05:09:38.046080303 +0000
-+++ source/geometry/CMakeLists.txt 2011-01-17 05:09:59.636215548 +0000
-@@ -12,7 +12,6 @@
- #
- #------------------------------------------------------------------------------
-
--add_subdirectory(benchmarks)
- add_subdirectory(biasing)
- add_subdirectory(divisions)
- add_subdirectory(magneticfield)
diff --git a/sci-physics/geant/files/geant-4.9.4-no-examples.patch b/sci-physics/geant/files/geant-4.9.4-no-examples.patch
deleted file mode 100644
index 6db7b3f..00000000
--- a/sci-physics/geant/files/geant-4.9.4-no-examples.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- CMakeLists.txt.orig 2011-01-22 01:47:07.000000000 +0000
-+++ CMakeLists.txt 2011-01-22 02:00:58.676084146 +0000
-@@ -209,9 +209,9 @@
- # Install any extra files needed such as documentation and legacy Makefiles
- #
- # User example code
--install(DIRECTORY examples
-- DESTINATION ${GEANT4_DATAROOTDIR}/geant4-${geant4_VERSION}
-- PATTERN "CVS" EXCLUDE)
-+#install(DIRECTORY examples
-+# DESTINATION ${GEANT4_DATAROOTDIR}/geant4-${geant4_VERSION}
-+# PATTERN "CVS" EXCLUDE)
-
-
- #
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant/files/
@ 2017-09-02 14:35 Michael Palimaka
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2017-09-02 14:35 UTC (permalink / raw
To: gentoo-commits
commit: 22ba0cc48b625e4b886f73d784e582653a687e9d
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Aug 20 12:59:10 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Sep 2 14:35:44 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22ba0cc4
sci-physics/geant: remove unused patches
sci-physics/geant/files/geant-4.9.4-datadir.patch | 43 ----------------------
sci-physics/geant/files/geant-4.9.4-libdir.patch | 35 ------------------
.../geant/files/geant-4.9.4-trajectory.patch | 11 ------
3 files changed, 89 deletions(-)
diff --git a/sci-physics/geant/files/geant-4.9.4-datadir.patch b/sci-physics/geant/files/geant-4.9.4-datadir.patch
deleted file mode 100644
index c691d90e8ce..00000000000
--- a/sci-physics/geant/files/geant-4.9.4-datadir.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake.orig 2011-01-22 00:49:11.096082056 +0000
-+++ cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake 2011-01-22 00:53:04.746078920 +0000
-@@ -74,9 +74,9 @@
- # Construct backward compatible variables
- #
- set(G4SYSTEM "${GEANT4_SYSTEM}-${GEANT4_COMPILER}")
--set(G4INSTALL ${GEANT4_DATADIR}/geant4-${geant4_VERSION})
-+set(G4INSTALL ${GEANT4_DATADIR}/geant4)
- set(G4INCLUDE ${GEANT4_INCLUDEDIR}/geant4)
--set(G4LIB ${GEANT4_LIBDIR}/geant4-${geant4_VERSION})
-+set(G4LIB ${GEANT4_LIBDIR}/geant4)
-
- message(STATUS "Geant4 backwards compatible variable G4SYSTEM : ${G4SYSTEM}")
- message(STATUS "Geant4 backwards compatible variable G4INSTALL: ${G4INSTALL}")
-@@ -125,7 +125,7 @@
- # Install targets
- # toolchain
- install(DIRECTORY config
-- DESTINATION ${GEANT4_DATAROOTDIR}/geant4-${geant4_VERSION}
-+ DESTINATION ${GEANT4_DATAROOTDIR}/geant4
- FILES_MATCHING PATTERN "*.gmk"
- PATTERN "CVS" EXCLUDE
- PATTERN "scripts/" EXCLUDE)
-@@ -134,16 +134,16 @@
- install(FILES
- ${CMAKE_BINARY_DIR}/outputs/runtime/geant4-${geant4_VERSION}.sh
- ${CMAKE_BINARY_DIR}/outputs/runtime/geant4-${geant4_VERSION}.csh
-- DESTINATION ${GEANT4_DATAROOTDIR}/geant4-${geant4_VERSION}/config
-+ DESTINATION ${GEANT4_DATAROOTDIR}/geant4/config
- PERMISSIONS
- OWNER_READ OWNER_WRITE OWNER_EXECUTE
- GROUP_READ GROUP_EXECUTE
- WORLD_READ WORLD_EXECUTE)
-
- # compatibility softlink to library directory
-- install(CODE "execute_process(COMMAND \${CMAKE_COMMAND} -E make_directory \$ENV{DESTDIR}${GEANT4_LIBDIR}/geant4-${geant4_VERSION})")
-+ install(CODE "execute_process(COMMAND \${CMAKE_COMMAND} -E make_directory \$ENV{DESTDIR}${GEANT4_LIBDIR}/geant4)")
-
-- install(CODE "execute_process(COMMAND \${CMAKE_COMMAND} -E create_symlink .. ${GEANT4_SYSTEM}-${GEANT4_COMPILER} WORKING_DIRECTORY \$ENV{DESTDIR}${GEANT4_LIBDIR}/geant4-${geant4_VERSION})")
-+ install(CODE "execute_process(COMMAND \${CMAKE_COMMAND} -E create_symlink .. ${GEANT4_SYSTEM}-${GEANT4_COMPILER} WORKING_DIRECTORY \$ENV{DESTDIR}${GEANT4_LIBDIR}/geant4)")
-
- endif()
-
diff --git a/sci-physics/geant/files/geant-4.9.4-libdir.patch b/sci-physics/geant/files/geant-4.9.4-libdir.patch
deleted file mode 100644
index 8934f73acfe..00000000000
--- a/sci-physics/geant/files/geant-4.9.4-libdir.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- CMakeLists.txt.orig 2011-01-17 06:25:14.536078940 +0000
-+++ CMakeLists.txt 2011-01-21 23:50:53.406082074 +0000
-@@ -195,7 +195,7 @@
- set(GEANT4_PREFIX ${CMAKE_INSTALL_PREFIX})
- set(GEANT4_EXEC_PREFIX ${GEANT4_PREFIX})
- set(GEANT4_BINDIR ${GEANT4_EXEC_PREFIX}/bin)
--set(GEANT4_LIBDIR ${GEANT4_PREFIX}/lib)
-+set(GEANT4_LIBDIR ${GEANT4_PREFIX}/lib${LIB_SUFFIX})
- set(GEANT4_DATAROOTDIR ${GEANT4_PREFIX}/share)
- set(GEANT4_DATADIR ${GEANT4_DATAROOTDIR})
- set(GEANT4_INCLUDEDIR ${GEANT4_PREFIX}/include)
---- cmake/Modules/Geant4MacroLibraryTargets.cmake.orig 2011-01-21 23:36:09.356079013 +0000
-+++ cmake/Modules/Geant4MacroLibraryTargets.cmake 2011-01-21 23:49:49.826082339 +0000
-@@ -35,8 +35,8 @@
- # NEEDS WORK TO REMOVE HARDCODED LIB/BIN DIR
- install(TARGETS ${G4LIBTARGET_NAME}
- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-- ARCHIVE DESTINATION lib)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX}
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX})
- endif()
-
- #
-@@ -59,8 +59,8 @@
-
- install(TARGETS ${G4LIBTARGET_NAME}-static
- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-- ARCHIVE DESTINATION lib)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX}
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX})
- endif()
- ENDMACRO()
-
diff --git a/sci-physics/geant/files/geant-4.9.4-trajectory.patch b/sci-physics/geant/files/geant-4.9.4-trajectory.patch
deleted file mode 100644
index df45ae234e5..00000000000
--- a/sci-physics/geant/files/geant-4.9.4-trajectory.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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.
- #
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant/files/
@ 2021-12-14 15:14 Guilherme Amadio
0 siblings, 0 replies; 3+ messages in thread
From: Guilherme Amadio @ 2021-12-14 15:14 UTC (permalink / raw
To: gentoo-commits
commit: bf7a3c800bfc18f9b3d9eadd388a42040918eed6
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 14 15:13:55 2021 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Tue Dec 14 15:13:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf7a3c80
sci-physics/geant: drop unused patch
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
sci-physics/geant/files/geant4.10.7-hdf5.patch | 70 --------------------------
1 file changed, 70 deletions(-)
diff --git a/sci-physics/geant/files/geant4.10.7-hdf5.patch b/sci-physics/geant/files/geant4.10.7-hdf5.patch
deleted file mode 100644
index 679cdfbed9d6..000000000000
--- a/sci-physics/geant/files/geant4.10.7-hdf5.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 4e86e523e7f0e419b990520a15ef7d524102cd06 Mon Sep 17 00:00:00 2001
-From: Guilherme Amadio <amadio@gentoo.org>
-Date: Mon, 23 Aug 2021 13:18:25 +0200
-Subject: [PATCH] Rename Geant4::HDF5 to hdf5::hdf5
-
-Needed to be compatible with CMake 3.20, which now provides imported
-targets for HDF5 (https://cmake.org/cmake/help/v3.20/module/FindHDF5.html).
----
- cmake/Modules/G4HDF5Shim.cmake | 16 ++++++++--------
- cmake/Modules/G4OptionalComponents.cmake | 2 +-
-
-diff --git a/cmake/Modules/G4HDF5Shim.cmake b/cmake/Modules/G4HDF5Shim.cmake
-index 963a7bb5be..97d97248d8 100644
---- a/cmake/Modules/G4HDF5Shim.cmake
-+++ b/cmake/Modules/G4HDF5Shim.cmake
-@@ -1,10 +1,10 @@
-- # - G4HDF5Shim
-+# - G4HDF5Shim
- #
- # Geant4's Geant4Config.cmake file aims to support CMake 3.8 and newer
- # The HDF5 dependency is located through CMake's builtin FindHDF5
--# module, but this does not supply imported targets as of CMake 3.16.
-+# module, but this does not supply imported targets until CMake 3.20.
- # It may use HDF5's hdf5-config.cmake file if available, so create
--# custom imported target Geant4::HDF5 to allow both cases to be handled
-+# custom imported target hdf5::hdf5 to allow both cases to be handled
- # without interference with either.
-
- if(HDF5_FOUND)
-@@ -24,18 +24,18 @@ if(HDF5_FOUND)
- endif()
- endif()
-
-- # As FindHDF5 does not yet supply imported targets, we
-+ # If FindHDF5 does not yet supply imported targets, we
- # create an internal INTERFACE target to wrap these.
- # This still hard-codes include/library paths, but limits it
- # to one place. Later, we'll create proper imported targets
- # with re-finds but for now this is the best minimally invasive proceedure
-- if(NOT TARGET Geant4::HDF5)
-- add_library(Geant4::HDF5 IMPORTED UNKNOWN)
-- set_target_properties(Geant4::HDF5 PROPERTIES
-+ if(NOT TARGET hdf5::hdf5)
-+ add_library(hdf5::hdf5 IMPORTED UNKNOWN)
-+ set_target_properties(hdf5::hdf5 PROPERTIES
- IMPORTED_LINK_INTERFACE_LANGUAGES "C"
- IMPORTED_LOCATION "${HDF5_C_LIBRARY_hdf5}"
- INTERFACE_INCLUDE_DIRECTORIES "${HDF5_C_INCLUDE_DIRS}"
- INTERFACE_LINK_LIBRARIES "${HDF5_C_LIBRARIES}"
- )
- endif()
--endif()
-\ No newline at end of file
-+endif()
-diff --git a/cmake/Modules/G4OptionalComponents.cmake b/cmake/Modules/G4OptionalComponents.cmake
-index c0639a538b..77b3c91241 100644
---- a/cmake/Modules/G4OptionalComponents.cmake
-+++ b/cmake/Modules/G4OptionalComponents.cmake
-@@ -369,7 +369,7 @@ if(GEANT4_USE_HDF5)
- find_package(HDF5 1.8 REQUIRED)
- include("${CMAKE_CURRENT_LIST_DIR}/G4HDF5Shim.cmake")
- # Backward compatibility
-- set(HDF5_LIBRARIES Geant4::HDF5)
-+ set(HDF5_LIBRARIES hdf5::hdf5)
-
- # May have found via config mode...
- if(HDF5_DIR)
---
-2.33.0
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-12-14 15:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-14 15:14 [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant/files/ Guilherme Amadio
-- strict thread matches above, loose matches on Subject: below --
2017-09-02 14:35 Michael Palimaka
2017-02-02 20:00 Guilherme Amadio
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox