[arch-commits] Commit in sympol/trunk (PKGBUILD sympol-lrs-071.patch)

[Antonio Rojas]

    Date: Tuesday, June 8, 2021 @ 20:54:40
  Author: arojas
Revision: 959897

Fix build with lrs 071

Added:
  sympol/trunk/sympol-lrs-071.patch
Modified:
  sympol/trunk/PKGBUILD

----------------------+
 PKGBUILD             |    9 +++++----
 sympol-lrs-071.patch |   29 +++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-08 20:50:11 UTC (rev 959896)
+++ PKGBUILD	2021-06-08 20:54:40 UTC (rev 959897)
@@ -9,21 +9,22 @@
 license=(GPL2)
 source=($pkgname-$pkgver::"https://github.com/tremlin/SymPol/archive/v$pkgver.tar.gz"
         cddlib-0.94k.patch
-        sympol-fix-headers.patch)
+        sympol-fix-headers.patch
+        sympol-lrs-071.patch)
 depends=(boost-libs lrs cddlib)
 makedepends=(cmake permlib eigen bliss)
 sha256sums=('6753b8fb30745b66a0886e125c18b539417afcf62b804799eb220bd5a59ccc37'
             '23f85255ad1acbaf9c63134c6d331e0f3b8d06230a05e3f63e57399863579649'
-            'f3ed90e6b9af5dae0728c52ce4bb9107f3040481cac6c08116dbf8c19bfe3971')
+            'f3ed90e6b9af5dae0728c52ce4bb9107f3040481cac6c08116dbf8c19bfe3971'
+            '0aa37a4b87021ed04e02fcdae525dc305a8b0490c98bfb82bba2d9af04ef1d35')
 
 prepare() {
   cd SymPol-$pkgver
   sed -e '/(external/d' -i CMakeLists.txt # Don't use bundled cddlib and lrslib
-  sed -e 's|lrsgmp|lrs|' -i sympol/CMakeLists.txt # Fix linking to system lrs
   rm -r external/{lrslib*,cddlib*}
-  sed -e '/lrs_mp_close/d' -i sympol/raycomputationlrs.cpp # Fix build with lrs 0.5 (Fedora)
   patch -p1 -i ../cddlib-0.94k.patch # Fix build with cddlib 0.94k
   patch -p1 -i ../sympol-fix-headers.patch # Keep headers directory structure
+  patch -p0 -i ../sympol-lrs-071.patch # Fix build with lrs 071 (Fedora)
 }
 
 build() {

Added: sympol-lrs-071.patch
===================================================================
--- sympol-lrs-071.patch	                        (rev 0)
+++ sympol-lrs-071.patch	2021-06-08 20:54:40 UTC (rev 959897)
@@ -0,0 +1,29 @@
+--- sympol/CMakeLists.txt.orig	2016-05-08 13:52:35.000000000 -0600
++++ sympol/CMakeLists.txt	2020-07-06 08:35:36.253421935 -0600
+@@ -73,7 +73,7 @@ set_target_properties(sympol PROPERTIES
+ add_executable(sympolbin sympol.cpp)
+ set_target_properties(sympolbin PROPERTIES OUTPUT_NAME sympol)
+ 
+-set(TARGET_LIBS ${TARGET_LIBS} lrsgmp cddgmp ${GMP_LIBRARIES} ${Boost_LIBRARIES})
++set(TARGET_LIBS ${TARGET_LIBS} lrs cddgmp ${GMP_LIBRARIES} ${Boost_LIBRARIES})
+ target_link_libraries(sympol ${TARGET_LIBS})
+ target_link_libraries(sympolbin sympol)
+ 
+--- sympol/raycomputationlrs.cpp.orig	2016-05-08 13:52:35.000000000 -0600
++++ sympol/raycomputationlrs.cpp	2020-07-06 08:37:15.240288168 -0600
+@@ -25,6 +25,7 @@
+ #include "polyhedron.h"
+ 
+ extern "C" {
++  #include <lrsrestart.h>
+   #include <lrslib.h>
+ }
+ 
+@@ -66,7 +67,6 @@ bool RayComputationLRS::finish() {
+         return true;
+     }
+ 
+-    lrs_mp_close();
+     
+     if (RayComputationLRS::ms_fIn != NULL) {
+         if (std::fclose(RayComputationLRS::ms_fIn)) {