Date: Tuesday, November 19, 2019 @ 19:16:19 Author: arojas Revision: 530501
Fix headers, take 2 Added: sympol/trunk/sympol-fix-headers.patch Modified: sympol/trunk/PKGBUILD --------------------------+ PKGBUILD | 11 +++++----- sympol-fix-headers.patch | 47 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-11-19 19:15:41 UTC (rev 530500) +++ PKGBUILD 2019-11-19 19:16:19 UTC (rev 530501) @@ -2,15 +2,17 @@ pkgname=sympol pkgver=0.1.9 -pkgrel=3 +pkgrel=4 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";) +source=($pkgname-$pkgver::"https://github.com/tremlin/SymPol/archive/v$pkgver.tar.gz"; + sympol-fix-headers.patch) depends=(boost-libs lrs cddlib) makedepends=(cmake permlib eigen bliss) -sha256sums=('6753b8fb30745b66a0886e125c18b539417afcf62b804799eb220bd5a59ccc37') +sha256sums=('6753b8fb30745b66a0886e125c18b539417afcf62b804799eb220bd5a59ccc37' + 'f3ed90e6b9af5dae0728c52ce4bb9107f3040481cac6c08116dbf8c19bfe3971') prepare() { mkdir -p build @@ -20,6 +22,7 @@ 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 ../sympol-fix-headers.patch # Keep headers directory structure } build() { @@ -34,6 +37,4 @@ package() { cd build make DESTDIR="$pkgdir" install - - sed -r -e 's|(#include ").*/(.*")|\1\2|' -i "$pkgdir"/usr/include/sympol/*.h } Added: sympol-fix-headers.patch =================================================================== --- sympol-fix-headers.patch (rev 0) +++ sympol-fix-headers.patch 2019-11-19 19:16:19 UTC (rev 530501) @@ -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")
