Merge branch 'scip_9' into 10.4.beta3+upgrades

build/pkgs/onetbb/checksums.ini

@@ -1,5 +1,5 @@
 tarball=onetbb-VERSION.tar.gz
-sha1=b991f5d882aba2182871cfe011614cc43b92aa3c
-md5=ba4ecedc4949f673a34b35de738a72fc
-cksum=211900655
+sha1=740e86b703f42446ddde392b73a9db3dc0f5f4cd
+md5=b301151120b08a17e98dcdda6e4f6011
+cksum=3287903962
 upstream_url=https://github.com/oneapi-src/oneTBB/archive/refs/tags/vVERSION.tar.gz

build/pkgs/onetbb/package-version.txt

@@ -1 +1 @@
-2021.9.0
+2021.11.0

build/pkgs/papilo/checksums.ini

@@ -1,5 +1,5 @@
 tarball=papilo-VERSION.tar.gz
-sha1=85d599ac9936aa1ddf687e04273b995522909de5
-md5=c41f5aa615ffc9914f8ca924947aa8cb
-cksum=1535425476
+sha1=069f64ff25cfb08c9b2a416d1d215bd5b907c877
+md5=d58b7c991ac1c4a863de92a404409ca8
+cksum=1552180280
 upstream_url=https://github.com/scipopt/papilo/archive/refs/tags/vVERSION.tar.gz

build/pkgs/papilo/package-version.txt

@@ -1 +1 @@
-2.1.1
+2.2.0

build/pkgs/pyscipopt/checksums.ini

@@ -1,5 +1,5 @@
 tarball=PySCIPOpt-VERSION.tar.gz
-sha1=5ae7f3d7e9d8b344ee9a4413154ae80a5ee137de
-md5=32a4dced7e74a1c290b32ef0da751129
-cksum=2258510906
+sha1=713e32cc0ff112500c4f43487614094ece4a8bbf
+md5=ee425a362744a4475228510b48781be9
+cksum=1541742154
 upstream_url=https://pypi.io/packages/source/p/pyscipopt/PySCIPOpt-VERSION.tar.gz

build/pkgs/pyscipopt/package-version.txt

@@ -1 +1 @@
-4.4.0
+5.0.0

build/pkgs/scip/checksums.ini

@@ -1,5 +1,5 @@
-tarball=scip-VERSION.tar.gz
-sha1=2637767428e285b6ddda8c462f1cc31d66833d80
-md5=b657369986ecd9b2944206d11ecce2e4
-cksum=967379932
-upstream_url=https://github.com/scipopt/scip/archive/refs/tags/vVERSION.tar.gz
+tarball=scip-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.tar.gz
+sha1=bb28aef4bad00a1ff2c7f4ee982961709d15b9f8
+md5=2fdbc40c98d380b12586bcef6819b9d7
+cksum=1262698285
+upstream_url=https://github.com/scipopt/scip/archive/refs/tags/v${VERSION_MAJOR}${VERSION_MINOR}${VERSION_MICRO}.tar.gz

build/pkgs/scip/dependencies

@@ -1,4 +1,4 @@
-$(MP_LIBRARY) readline soplex papilo zlib | cmake
+$(MP_LIBRARY) readline soplex papilo zlib bliss | cmake
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/scip/package-version.txt

@@ -1 +1 @@
-802
+9.0.0.p0

build/pkgs/scip/patches/no_rpath.patch → build/pkgs/scip/patches/0001-CMakeLists.txt-Remove-hardcoded-RPATH-settings.patch

@@ -1,40 +1,46 @@
-commit eaff18abb55c86e90d44583731550c874dc3c3e0
-Author: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
-Date:   Sun Nov 27 14:12:32 2022 -0800
+From 5a05bcd05b75ca8f6b2228b08f57ff71ba46329b Mon Sep 17 00:00:00 2001
+From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
+Date: Sun, 3 Mar 2024 18:15:12 -0800
+Subject: [PATCH] CMakeLists.txt: Remove hardcoded RPATH settings
 
-    CMakeLists.txt: Remove hardcoded RPATH settings
+---
+ src/CMakeLists.txt | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
 
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 8629ace18b..db2505d74b 100644
+index 5392127c5d..995d194aee 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -3,8 +3,7 @@
- #
+@@ -5,8 +5,7 @@ include(GNUInstallDirs)
+
  function(setLibProperties targetname outputname)
      set_target_properties(${targetname} PROPERTIES
 -        OUTPUT_NAME ${outputname}
--        MACOSX_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+-        MACOSX_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
 +        OUTPUT_NAME ${outputname})
  endfunction(setLibProperties)
 
  set(CMAKE_C_STANDARD 99)
-@@ -1092,7 +1091,6 @@ add_dependencies(scip scip_update_githash)
+@@ -1118,7 +1117,6 @@ add_dependencies(scip scip_update_githash)
  set_target_properties(libscip PROPERTIES
      VERSION ${SCIP_VERSION_MAJOR}.${SCIP_VERSION_MINOR}.${SCIP_VERSION_PATCH}.${SCIP_VERSION_SUB}
      SOVERSION ${SCIP_VERSION_MAJOR}.${SCIP_VERSION_MINOR}
 -    INSTALL_RPATH_USE_LINK_PATH TRUE
      CXX_VISIBILITY_PRESET hidden
      C_VISIBILITY_PRESET hidden
      VISIBILITY_INLINES_HIDDEN 1)
-@@ -1102,11 +1100,6 @@ target_include_directories(scip PUBLIC
+@@ -1128,11 +1126,6 @@ target_include_directories(scip BEFORE PUBLIC
      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
      $<INSTALL_INTERFACE:include>)
 
 -# set the install rpath to the installed destination
 -set_target_properties(scip PROPERTIES
--    INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"
+-    INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}"
 -    INSTALL_RPATH_USE_LINK_PATH TRUE)
 -
  # install the header files of scip
- install(FILES ${lpiheaders} DESTINATION include/lpi)
- install(FILES ${dijkstraheaders} DESTINATION include/dijkstra)
+ install(FILES ${lpiheaders} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lpi)
+ install(FILES ${dijkstraheaders} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dijkstra)
+-- 
+2.42.0
+

build/pkgs/scip/patches/struct_symmetry_header.patch

@@ -0,0 +1,14 @@
+From https://github.com/scipopt/SCIP-SDP/issues/12#issuecomment-1969453709
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5392127c5d..b66e86dec5 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -991,6 +991,7 @@ set(scipheaders
+ set(symheaders
+   symmetry/build_sassy_graph.h
+   symmetry/compute_symmetry.h
++  symmetry/struct_symmetry.h
+   symmetry/type_symmetry.h
+ )
+

build/pkgs/scip_sdp/checksums.ini

@@ -1,5 +1,5 @@
 tarball=scipsdp-VERSION.tgz
-sha1=dcfb090a95f79df8524bcc63d34d7ddc6692924e
-md5=4f900c60456b3f08160ca494bec8e9f4
-cksum=2622380399
+sha1=d5482fd414fdcaa38d6d80111bbe8931aeef63ea
+md5=0de7752ba6602e3432940eaaf79dfa9d
+cksum=162799809
 upstream_url=http://www.opt.tu-darmstadt.de/scipsdp/downloads/scipsdp-VERSION.tgz

build/pkgs/scip_sdp/package-version.txt

@@ -1 +1 @@
-4.1.0
+4.3.0