geogram: 1.8.3 -> 1.8.6

Diff: https://github.com/BrunoLevy/geogram/compare/v1.8.3...v1.8.6

2 files changed, 7 insertions, 99 deletions

diff --git a/pkgs/development/libraries/geogram/default.nix b/pkgs/development/libraries/geogram/default.nix
index 1079f89d9328..619b5dfcdf57 100644
--- a/pkgs/development/libraries/geogram/default.nix
+++ b/pkgs/development/libraries/geogram/default.nix
@@ -13,17 +13,17 @@ let
   testdata = fetchFromGitHub {
     owner = "BrunoLevy";
     repo = "geogram.data";
-    rev = "8fd071a560bd6859508f1710981386d0b2ba01b1";
-    hash = "sha256-jMUGX6/uYIZMVwXxTAAGUaOXqF+NrFQqgmIPCD58cwM=";
+    rev = "43dd49054a78d9b3fb8ef729f48ab47a272c718c";
+    hash = "sha256-F2Lyt4nEOczVYLz6WLny+YrsxNwREBGPkProN8NHFN4=";
   };
 in
 stdenv.mkDerivation rec {
   pname = "geogram";
-  version = "1.8.3";
+  version = "1.8.6";
 
   src = fetchurl {
     url = "https://github.com/BrunoLevy/geogram/releases/download/v${version}/geogram_${version}.tar.gz";
-    hash = "sha256-91q0M/4kAr0UoWXOQIEYS1VbgEQ/F4EBOfJE9Vr1bnw=";
+    hash = "sha256-Xqha5HVqD2Ao0z++RKcQdMZUmtMb5eZ1DMJEVrfNUzE=";
   };
 
   outputs = [ "bin" "lib" "dev" "doc" "out" ];
@@ -59,9 +59,6 @@ stdenv.mkDerivation rec {
   ];
 
   patches = [
-    # See https://github.com/BrunoLevy/geogram/pull/76
-    ./fix-cmake-install-destination.patch
-
     # This patch replaces the bundled (outdated) zlib with our zlib
     # Should be harmless, but if there are issues this patch can also be removed
     # Also check https://github.com/BrunoLevy/geogram/issues/49 for progress
@@ -93,6 +90,9 @@ stdenv.mkDerivation rec {
 
         # Skip slow RVD test
         "RVD"
+
+        # Flaky as of 1.8.5 (SIGSEGV, possibly a use-after-free)
+        "Delaunay"
       ];
     in
     ''
diff --git a/pkgs/development/libraries/geogram/fix-cmake-install-destination.patch b/pkgs/development/libraries/geogram/fix-cmake-install-destination.patch
deleted file mode 100644
index 1dba488e8de3..000000000000
--- a/pkgs/development/libraries/geogram/fix-cmake-install-destination.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- a/cmake/utilities.cmake	1970-01-01 01:00:01.000000000 +0100
-+++ b/cmake/utilities.cmake	2023-03-09 19:28:16.556251981 +0100
-@@ -241,9 +241,9 @@
-     install(
-         TARGETS ${ARGN}
-         COMPONENT runtime
--        RUNTIME DESTINATION bin
--        LIBRARY DESTINATION lib
--        ARCHIVE DESTINATION lib
-+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     )
- endfunction()
- 
-@@ -270,9 +270,9 @@
-         install(
-             TARGETS ${ARGN}
-             COMPONENT ${component}
--            RUNTIME DESTINATION bin
--            LIBRARY DESTINATION lib
--            ARCHIVE DESTINATION lib
-+            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-         )
-     endforeach()
- endfunction()
---- a/src/lib/geogram/CMakeLists.txt	1970-01-01 01:00:01.000000000 +0100
-+++ b/src/lib/geogram/CMakeLists.txt	2023-03-09 20:29:12.346780432 +0100
-@@ -76,7 +76,7 @@
- # Install include files for the standard devkit
- install(
-     DIRECTORY api
--    DESTINATION include/${VORPALINE_INCLUDE_SUBPATH}/geogram
-+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${VORPALINE_INCLUDE_SUBPATH}/geogram
-     COMPONENT devkit
-     FILES_MATCHING PATTERN *.h
- )
-@@ -84,7 +84,7 @@
- # Install include files for the full devkit
- install(
-     DIRECTORY .
--    DESTINATION include/${VORPALINE_INCLUDE_SUBPATH}/geogram
-+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${VORPALINE_INCLUDE_SUBPATH}/geogram
-     COMPONENT devkit-full
-     FILES_MATCHING PATTERN *.h
-     # Exclude all files related to licensing
-@@ -93,7 +93,7 @@
- 
- install(
-         FILES "${PROJECT_BINARY_DIR}/geogram${VORPALINE_VERSION_MAJOR}.pc"
--        DESTINATION lib${LIB_SUFFIX}/pkgconfig
-+        DESTINATION ${GEOGRAM_INSTALL_PKGCONFIG_DIR}
- )
- 
- 
---- a/CMakeLists.txt	1970-01-01 01:00:01.000000000 +0100
-+++ b/CMakeLists.txt	2023-03-09 20:40:20.075218356 +0100
-@@ -158,7 +158,7 @@
- 
- # FindGeogram.cmake
- 
--install(FILES cmake/FindGeogram.cmake DESTINATION lib/cmake/modules COMPONENT devkit)
-+install(FILES cmake/FindGeogram.cmake DESTINATION ${GEOGRAM_INSTALL_CMAKE_DIR} COMPONENT devkit)
- 
- # Configure CPack
- 
---- a/doc/CMakeLists.txt	1970-01-01 01:00:01.000000000 +0100
-+++ b/doc/CMakeLists.txt	2023-03-09 21:12:04.386327003 +0100
-@@ -25,14 +25,14 @@
- 
-   # Install documentation
-   if(GEOGRAM_WITH_VORPALINE)
--      install(FILES README.txt DESTINATION doc COMPONENT runtime)
--      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt DESTINATION doc COMPONENT runtime OPTIONAL)
-+      install(FILES README.txt DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT runtime)
-+      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT runtime OPTIONAL)
-   endif()
- 
--  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION.txt DESTINATION doc/geogram COMPONENT runtime OPTIONAL)
--  
--  install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/devkit/html DESTINATION doc/devkit COMPONENT doc-devkit OPTIONAL)
--  install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/devkit-full/html DESTINATION doc/devkit COMPONENT doc-devkit-full OPTIONAL)
--  install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/devkit-internal/html DESTINATION doc/devkit COMPONENT doc-devkit-internal OPTIONAL)
-+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION.txt DESTINATION ${CMAKE_INSTALL_DOCDIR}/geogram COMPONENT runtime OPTIONAL)
-+
-+  install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/devkit/html DESTINATION ${CMAKE_INSTALL_DOCDIR}/devkit COMPONENT doc-devkit OPTIONAL)
-+  install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/devkit-full/html DESTINATION ${CMAKE_INSTALL_DOCDIR}/devkit COMPONENT doc-devkit-full OPTIONAL)
-+  install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/devkit-internal/html DESTINATION ${CMAKE_INSTALL_DOCDIR}/devkit COMPONENT doc-devkit-internal OPTIONAL)
- 
- endif()