system/par2cmdline: Updated for version 0.4

5 files changed, 74 insertions, 5 deletions

diff --git a/system/par2cmdline/README b/system/par2cmdline/README
index 93dc8abce1..6dc06df56c 100644
--- a/system/par2cmdline/README
+++ b/system/par2cmdline/README
@@ -26,3 +26,4 @@ SlackBuilds.org) can be used by the python program hellanzb to make getting,
 verifying and unraring files with a nzb file almost totally hands-free. 
 For more information see: http://www.hellanzb.com/trac/.
 
+This includes a patch to make par2cmdline work with GCC 4.x.x
diff --git a/system/par2cmdline/par2cmdline-0.4-gcc4.patch b/system/par2cmdline/par2cmdline-0.4-gcc4.patch
new file mode 100644
index 0000000000..a0bfbd2796
--- /dev/null
+++ b/system/par2cmdline/par2cmdline-0.4-gcc4.patch
@@ -0,0 +1,56 @@
+--- reedsolomon.cpp.orig	2007-07-06 00:50:38.000000000 +0100
++++ reedsolomon.cpp	2007-07-06 00:58:05.000000000 +0100
+@@ -51,7 +51,7 @@
+   }
+ }
+ 
+-bool ReedSolomon<Galois8>::SetInput(const vector<bool> &present)
++template <> bool ReedSolomon<Galois8>::SetInput(const vector<bool> &present)
+ {
+   inputcount = (u32)present.size();
+ 
+@@ -80,7 +80,7 @@
+   return true;
+ }
+ 
+-bool ReedSolomon<Galois8>::SetInput(u32 count)
++template <> bool ReedSolomon<Galois8>::SetInput(u32 count)
+ {
+   inputcount = count;
+ 
+@@ -101,7 +101,7 @@
+   return true;
+ }
+ 
+-bool ReedSolomon<Galois8>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
++template <> bool ReedSolomon<Galois8>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
+ {
+   // Look up the appropriate element in the RS matrix
+   Galois8 factor = leftmatrix[outputindex * (datapresent + datamissing) + inputindex];
+@@ -189,7 +189,7 @@
+ 
+ // Set which of the source files are present and which are missing
+ // and compute the base values to use for the vandermonde matrix.
+-bool ReedSolomon<Galois16>::SetInput(const vector<bool> &present)
++template <> bool ReedSolomon<Galois16>::SetInput(const vector<bool> &present)
+ {
+   inputcount = (u32)present.size();
+ 
+@@ -233,7 +233,7 @@
+ 
+ // Record that the specified number of source files are all present
+ // and compute the base values to use for the vandermonde matrix.
+-bool ReedSolomon<Galois16>::SetInput(u32 count)
++template <> bool ReedSolomon<Galois16>::SetInput(u32 count)
+ {
+   inputcount = count;
+ 
+@@ -267,7 +267,7 @@
+   return true;
+ }
+ 
+-bool ReedSolomon<Galois16>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
++template <> bool ReedSolomon<Galois16>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
+ {
+   // Look up the appropriate element in the RS matrix
+ 
diff --git a/system/par2cmdline/par2cmdline.SlackBuild b/system/par2cmdline/par2cmdline.SlackBuild
index 9029aa0418..5cf9b2cb5d 100644
--- a/system/par2cmdline/par2cmdline.SlackBuild
+++ b/system/par2cmdline/par2cmdline.SlackBuild
@@ -15,7 +15,7 @@ VERSION=0.4
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -35,6 +35,10 @@ cd $PRGNAM-$VERSION || exit 1
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+# Apply the patch for gcc-4.x.x (Thanks to Neil Ord for pointing
+# this one out in ##Slackware)
+cat $CWD/$PRGNAM-$VERSION-gcc4.patch | patch -p0 || exit 1
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/system/par2cmdline/par2cmdline.info b/system/par2cmdline/par2cmdline.info
index 3f9ec35b48..f2fb20f17e 100644
--- a/system/par2cmdline/par2cmdline.info
+++ b/system/par2cmdline/par2cmdline.info
@@ -1,8 +1,8 @@
 PRGNAM="par2cmdline"
 VERSION="0.4"
 HOMEPAGE="http://parchive.sourceforge.net"
-DOWNLOAD="http://dl.sourceforge.net/parchive/par2cmdline-0.4.tar.gz"
+DOWNLOAD="http://downloads.sourceforge.net/parchive/par2cmdline-0.4.tar.gz"
 MD5SUM="1551b63e57e3c232254dc62073b723a9"
 MAINTAINER="maldoror"
 EMAIL="mujyo@comcast.net"
-APPROVED="robw810"
+APPROVED="rworkman"
diff --git a/system/par2cmdline/slack-desc b/system/par2cmdline/slack-desc
index fe463762a9..4d7f560581 100644
--- a/system/par2cmdline/slack-desc
+++ b/system/par2cmdline/slack-desc
@@ -1,9 +1,17 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
 par2cmdline: par2cmdline (Commandline implementation of PARv2.0 specification)
 par2cmdline: 
 par2cmdline: par2cmdline is a GPL-licensed commandline tool for creating and
 par2cmdline: using PAR2 parity sets to detect damage in files and repair them
-par2cmdline: if necessary. The program uses Reed Solomon Coding to perform its
-par2cmdline: error correction. A useful program for checking and ensuring
+par2cmdline: if necessary. The program uses Reed Solomon Coding to perform 
+par2cmdline: its error correction. A useful program for checking and ensuring
 par2cmdline: the integrity of binaries retrieved from usenet for instance.
 par2cmdline: 
 par2cmdline: http://parchive.sourceforge.net/