summaryrefslogtreecommitdiffstats
path: root/system/coolkey/coolkey.SlackBuild
diff options
context:
space:
mode:
author Andy Bailey2011-01-11 03:52:19 +0100
committer Robby Workman2011-01-11 03:52:19 +0100
commitaa4f6633373859b1693d1b982a25193268231c74 (patch)
tree070098fe58fc3b45ee989b55dc754020a29992fe /system/coolkey/coolkey.SlackBuild
parent4efe7dc1f10dcb908ad7345369628e7a9749be7e (diff)
downloadslackbuilds-aa4f6633373859b1693d1b982a25193268231c74.tar.gz
system/coolkey: Included several upstream patches
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'system/coolkey/coolkey.SlackBuild')
-rw-r--r--system/coolkey/coolkey.SlackBuild20
1 files changed, 16 insertions, 4 deletions
diff --git a/system/coolkey/coolkey.SlackBuild b/system/coolkey/coolkey.SlackBuild
index 443ea9f0cc..0ddbe2d2db 100644
--- a/system/coolkey/coolkey.SlackBuild
+++ b/system/coolkey/coolkey.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for coolkey
@@ -24,7 +24,7 @@
PRGNAM=coolkey
VERSION=${VERSION:-1.1.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
# Automatically determine the architecture we're building on:
@@ -67,8 +67,20 @@ cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
-# Fixup some build errors on gcc43
-patch -p1 < $CWD/gcc-4.3.patch
+# Redhat is dallying on a post 1.1.0 coolkey release
+# but the cac and pcsc-lite fixes are necessary. These
+# come directly from the rawhide srpm, currently -17
+
+PATCHES="cache-dir-move \
+ gcc43 \
+ latest
+ simple-bugs \
+ thread-fix \
+ cac \
+ cac-1 \
+ pcsc-lite-fix"
+
+for i in $PATCHES; do patch -p0 < $CWD/patches/coolkey-$i.patch; done
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \