[arch-commits] Commit in bliss/trunk (PKGBUILD digraph_heuristic.patch)

[Antonio Rojas]

    Date: Monday, July 5, 2021 @ 16:05:49
  Author: arojas
Revision: 972390

Update to 0.77

Modified:
  bliss/trunk/PKGBUILD
  bliss/trunk/digraph_heuristic.patch

-------------------------+
 PKGBUILD                |   42 +++++++++++++++++++-----------------------
 digraph_heuristic.patch |    8 ++++----
 2 files changed, 23 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-05 16:04:13 UTC (rev 972389)
+++ PKGBUILD	2021-07-05 16:05:49 UTC (rev 972390)
@@ -1,38 +1,34 @@
 # Maintainer: Antonio Rojas <arojas at archlinux.org>
 
 pkgname=bliss
-pkgver=0.73
-pkgrel=2
-pkgdesc="A library for computing automorphism groups and canonical forms of graphs"
+pkgver=0.77
+pkgrel=1
+pkgdesc='A library for computing automorphism groups and canonical forms of graphs'
 arch=(x86_64)
-url="http://www.tcs.tkk.fi/Software/bliss/index.html"
+url='https://users.aalto.fi/~tjunttil/bliss/'
 license=(GPL3)
-depends=(gcc-libs)
-conflicts=(bliss-graphs)
-provides=(bliss-graphs)
-replaces=(bliss-graphs)
-source=("http://www.tcs.hut.fi/Software/bliss/bliss-$pkgver.zip" 'digraph_heuristic.patch')
-sha256sums=('f57bf32804140cad58b1240b804e0dbd68f7e6bf67eba8e0c0fa3a62fd7f0f84'
-            '2f7a238347aa977b1ce1c0e9e1e955b8c213cc3a89522b586a1b8c596c88c7a5')
+depends=(gmp)
+makedepends=(cmake)
+source=(https://users.aalto.fi/~tjunttil/bliss/downloads/$pkgname-$pkgver.zip
+        digraph_heuristic.patch)
+sha256sums=('acc8b98034f30fad24c897f365abd866c13d9f1bb207e398d0caf136875972a4'
+            '584dbb948c5ad39c32373a3736d457ef5ecf0c23b552d9e925fa0ace61652461')
 
 prepare() {
-  cd bliss-$pkgver
-# Fix splitting heuristics for digraphs
-  patch -p1 -i ../digraph_heuristic.patch
+  patch -d $pkgname-$pkgver -p1 < digraph_heuristic.patch # Fix splitting heuristics for digraphs
 }
 
 build() {
-  cd bliss-$pkgver
-
-  make
+  cmake -B build -S bliss-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DUSE_GMP=ON
+  cmake --build build
 }
 
 package() {
-  cd bliss-$pkgver
+   install -Dm644 $pkgname-$pkgver/src/*.hh -t "$pkgdir"/usr/include/bliss/
+   install -Dm755 build/libbliss.so -t "$pkgdir"/usr/lib/
+   install -Dm755 build/bliss -t "$pkgdir"/usr/bin/
 
-  mkdir -p "$pkgdir"/usr/{include/bliss,lib,bin}
-  cp *.hh "$pkgdir"/usr/include/bliss/
-  cp libbliss.a "$pkgdir"/usr/lib/
-  cp bliss "$pkgdir"/usr/bin/
+#  DESTDIR="$pkgdir" cmake --install build
 }
-

Modified: digraph_heuristic.patch
===================================================================
--- digraph_heuristic.patch	2021-07-05 16:04:13 UTC (rev 972389)
+++ digraph_heuristic.patch	2021-07-05 16:05:49 UTC (rev 972390)
@@ -1,9 +1,9 @@
---- bliss-0.72/graph.hh	2011-05-12 15:29:46.000000000 +0200
-+++ /home/azi/bliss-0.72/graph.hh	2014-12-30 11:14:20.917059666 +0100
-@@ -843,7 +843,7 @@
+--- bliss-0.77/src/graph.hh	2011-05-12 15:29:46.000000000 +0200
++++ bliss-0.77/src/graph.hh	2014-12-30 11:14:20.917059666 +0100
+@@ -122,7 +122,7 @@
    bool is_equitable() const;
  
-   /* Splitting heuristics, documented in more detail in the cc-file. */
+   /* Splitting heuristics, documented in more detail in graph.cc */
 -  SplittingHeuristic sh;
 +  SplittingHeuristic sh = shs_f;
    Partition::Cell* find_next_cell_to_be_splitted(Partition::Cell *cell);