summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--academic/perlprimer/01_sytaxerrors.patch (renamed from academic/perlprimer/sytaxerrors.patch)0
-rw-r--r--academic/perlprimer/02_fix-defined-slist.patch11
-rw-r--r--academic/perlprimer/perlprimer.SlackBuild8
3 files changed, 17 insertions, 2 deletions
diff --git a/academic/perlprimer/sytaxerrors.patch b/academic/perlprimer/01_sytaxerrors.patch
index 45b9cd570d..45b9cd570d 100644
--- a/academic/perlprimer/sytaxerrors.patch
+++ b/academic/perlprimer/01_sytaxerrors.patch
diff --git a/academic/perlprimer/02_fix-defined-slist.patch b/academic/perlprimer/02_fix-defined-slist.patch
new file mode 100644
index 0000000000..38b375c844
--- /dev/null
+++ b/academic/perlprimer/02_fix-defined-slist.patch
@@ -0,0 +1,11 @@
+--- orig/perlprimer.pl 2016-11-22 21:06:25.135978000 +0200
++++ new/perlprimer.pl 2016-11-22 21:08:09.001971413 +0200
+@@ -5226,7 +5226,7 @@ sub generate_report {
+ }
+
+ my ($hlist_sel) = $$hlist_ref->selectionGet;
+- unless (defined(@$slist) && defined($hlist_sel)) {
++ unless (@$slist && defined($hlist_sel)) {
+ dialogue("The Generate Report function saves the statistics and alignment of a particular primer pair - please select a primer pair first");
+ return;
+ }
diff --git a/academic/perlprimer/perlprimer.SlackBuild b/academic/perlprimer/perlprimer.SlackBuild
index 182c189b73..8e681db655 100644
--- a/academic/perlprimer/perlprimer.SlackBuild
+++ b/academic/perlprimer/perlprimer.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=perlprimer
VERSION=${VERSION:-1.1.21}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
ARCH=noarch
@@ -50,7 +50,11 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Thanks to Debian for the patch!
-patch -p1 -i $CWD/sytaxerrors.patch
+patch -p1 -i $CWD/01_sytaxerrors.patch
+
+# A quick fix to this issue:
+# https://bugs.launchpad.net/ubuntu/+source/perlprimer/+bug/1575074
+patch -p1 -i $CWD/02_fix-defined-slist.patch
install -D -m755 perlprimer.pl $PKG/usr/bin/perlprimer.pl
install -D -m644 gcg.603 $PKG/usr/share/$PRGNAM/gcg.603