[arch-commits] Commit in sympol/repos (5 files)

Fri Dec 17 06:27:09 UTC 2021

Date: Friday, December 17, 2021 @ 06:27:09
  Author: felixonmars
Revision: 1075832

archrelease: copy trunk to community-staging-x86_64

Added:
  sympol/repos/community-staging-x86_64/
  sympol/repos/community-staging-x86_64/PKGBUILD
    (from rev 1075831, sympol/trunk/PKGBUILD)
  sympol/repos/community-staging-x86_64/cddlib-0.94k.patch
    (from rev 1075831, sympol/trunk/cddlib-0.94k.patch)
  sympol/repos/community-staging-x86_64/sympol-fix-headers.patch
    (from rev 1075831, sympol/trunk/sympol-fix-headers.patch)
  sympol/repos/community-staging-x86_64/sympol-lrs-071.patch
    (from rev 1075831, sympol/trunk/sympol-lrs-071.patch)

--------------------------+
 PKGBUILD                 |   40 ++++++++++++++++++++++++++++++++++++++
 cddlib-0.94k.patch       |   14 +++++++++++++
 sympol-fix-headers.patch |   47 +++++++++++++++++++++++++++++++++++++++++++++
 sympol-lrs-071.patch     |   29 +++++++++++++++++++++++++++
 4 files changed, 130 insertions(+)

Copied: sympol/repos/community-staging-x86_64/PKGBUILD (from rev 1075831, sympol/trunk/PKGBUILD)
===================================================================

--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2021-12-17 06:27:09 UTC (rev 1075832)
@@ -0,0 +1,40 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgname=sympol
+pkgver=0.1.9
+pkgrel=10
+pkgdesc="A C++ tool to work with symmetric polyhedra"
+arch=(x86_64)
+url="http://www.math.uni-rostock.de/~rehn/software/sympol.html"
+license=(GPL2)
+source=($pkgname-$pkgver::"https://github.com/tremlin/SymPol/archive/v$pkgver.tar.gz"
+        cddlib-0.94k.patch
+        sympol-fix-headers.patch
+        sympol-lrs-071.patch)
+depends=(boost-libs lrs cddlib)
+makedepends=(cmake permlib eigen bliss)
+sha256sums=('6753b8fb30745b66a0886e125c18b539417afcf62b804799eb220bd5a59ccc37'
+            '23f85255ad1acbaf9c63134c6d331e0f3b8d06230a05e3f63e57399863579649'
+            'f3ed90e6b9af5dae0728c52ce4bb9107f3040481cac6c08116dbf8c19bfe3971'
+            '0aa37a4b87021ed04e02fcdae525dc305a8b0490c98bfb82bba2d9af04ef1d35')
+
+prepare() {
+  cd SymPol-$pkgver
+  sed -e '/(external/d' -i CMakeLists.txt # Don't use bundled cddlib and lrslib
+  rm -r external/{lrslib*,cddlib*}
+  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() {
+  cmake -B build -S SymPol-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I/usr/include/lrslib -DMA -DGMP -DBLISS_USE_GMP"
+  cmake --build build
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build
+}

Copied: sympol/repos/community-staging-x86_64/cddlib-0.94k.patch (from rev 1075831, sympol/trunk/cddlib-0.94k.patch)
===================================================================
--- community-staging-x86_64/cddlib-0.94k.patch	                        (rev 0)
+++ community-staging-x86_64/cddlib-0.94k.patch	2021-12-17 06:27:09 UTC (rev 1075832)
@@ -0,0 +1,14 @@
+diff -upr SymPol-0.1.9.orig/sympol/raycomputationcdd.cpp SymPol-0.1.9/sympol/raycomputationcdd.cpp
+--- SymPol-0.1.9.orig/sympol/raycomputationcdd.cpp	2016-05-08 22:52:35.000000000 +0300
++++ SymPol-0.1.9/sympol/raycomputationcdd.cpp	2020-12-07 01:19:11.840719385 +0200
+@@ -25,8 +25,8 @@
+ #include "polyhedron.h"
+ 
+ extern "C" {
+-	#include <setoper.h>
+-	#include <cdd.h>
++	#include <cddlib/setoper.h>
++	#include <cddlib/cdd.h>
+ }
+ 
+ #include <ctime>

Copied: sympol/repos/community-staging-x86_64/sympol-fix-headers.patch (from rev 1075831, sympol/trunk/sympol-fix-headers.patch)
===================================================================
--- community-staging-x86_64/sympol-fix-headers.patch	                        (rev 0)
+++ community-staging-x86_64/sympol-fix-headers.patch	2021-12-17 06:27:09 UTC (rev 1075832)
@@ -0,0 +1,47 @@
+diff --git a/sympol/CMakeLists.txt b/sympol/CMakeLists.txt
+index de9b4a8..da759d6 100644
+--- a/sympol/CMakeLists.txt
++++ b/sympol/CMakeLists.txt
+@@ -99,11 +99,6 @@ install(FILES
+   configuration.h
+   facesuptosymmetrylist.h
+   facewithdata.h
+-  matrix/algorithm.h
+-  matrix/invert.h
+-  matrix/matrix.h
+-  matrix/rank.h
+-  matrix/zmatrix.h
+   polyhedrondatastorage.h
+   polyhedron.h
+   polyhedronio.h
+@@ -122,6 +117,16 @@ install(FILES
+   symmetrycomputationidm.h
+   symmetrycomputationidmmemento.h
+   symmetrycomputationmemento.h
++  types.h
++  DESTINATION ${INCLUDE_INSTALL_DIR}/sympol)
++install(FILES
++  matrix/algorithm.h
++  matrix/invert.h
++  matrix/matrix.h
++  matrix/rank.h
++  matrix/zmatrix.h
++  DESTINATION ${INCLUDE_INSTALL_DIR}/sympol/matrix)
++install(FILES
+   symmetrygroupconstruction/computesymmetries.h
+   symmetrygroupconstruction/graphconstructionbliss.h
+   symmetrygroupconstruction/graphconstructiondefault.h
+@@ -129,10 +134,11 @@ install(FILES
+   symmetrygroupconstruction/matrixconstructiondefault.h
+   symmetrygroupconstruction/matrixconstructioneigen.h
+   symmetrygroupconstruction/matrixconstruction.h
+-  types.h
++  DESTINATION ${INCLUDE_INSTALL_DIR}/sympol/symmetrygroupconstruction)
++install(FILES
+   yal/logger.h
+   yal/reportlevel.h
+   yal/usagestats.h
+-  DESTINATION ${INCLUDE_INSTALL_DIR}/sympol)
++  DESTINATION ${INCLUDE_INSTALL_DIR}/sympol/yal)
+ install(FILES ../man/sympol.1
+         DESTINATION "share/man/man1")

Copied: sympol/repos/community-staging-x86_64/sympol-lrs-071.patch (from rev 1075831, sympol/trunk/sympol-lrs-071.patch)
===================================================================
--- community-staging-x86_64/sympol-lrs-071.patch	                        (rev 0)
+++ community-staging-x86_64/sympol-lrs-071.patch	2021-12-17 06:27:09 UTC (rev 1075832)
@@ -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)) {

