trac #17552: Introduced bliss patch and made the additional error che…

…ckings

build/pkgs/bliss/SPKG.txt

@@ -23,3 +23,10 @@ http://www.tcs.tkk.fi/Software/bliss/index.html
 == Dependencies ==
 
 None
+
+== Patches ==
+
+There is one patch to be applied that affects the code for computing
+automorphism groups of Digraphs. See http://trac.sagemath.org/ticket/17464#comment:33
+
+The patch will be removed once the author of bliss makes a new release.

build/pkgs/bliss/patches/digraph_heuristic.patch

@@ -0,0 +1,11 @@
+--- 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 @@
+   bool is_equitable() const;
+
+   /* Splitting heuristics, documented in more detail in the cc-file. */
+-  SplittingHeuristic sh;
++  SplittingHeuristic sh = shs_f;
+   Partition::Cell* find_next_cell_to_be_splitted(Partition::Cell *cell);
+   Partition::Cell* sh_first();
+   Partition::Cell* sh_first_smallest();

build/pkgs/bliss/spkg-install

@@ -6,11 +6,18 @@ if [ "$SAGE_LOCAL" = "" ]; then
    exit 1
 fi
 
-cd "src" &&
-$MAKE &&
-mv libbliss.a "$SAGE_LOCAL/lib"
-mv graph.hh "$SAGE_LOCAL/include"
-mv kqueue.hh "$SAGE_LOCAL/include"
+cd "src"
+
+for patch in patches/*.patch; do
+    [ -r "$patch" ] || continue  # Skip non-existing or non-readable patches
+    patch -p1 <"$patch"
+    if [ $? -ne 0 ]; then
+        echo >&2 "Error applying '$patch'"
+        exit 1
+    fi
+done
+
+$MAKE && mv libbliss.a "$SAGE_LOCAL/lib" && mv *.hh "$SAGE_LOCAL/include"
 
 if [ $? -ne 0 ]; then
     echo "An error occurred whilst building bliss"