aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--office/gnokii/gnokii-0.6.29-pcsc.patch14
-rw-r--r--office/gnokii/gnokii.SlackBuild5
-rw-r--r--office/gnokii/gnokii.info4
3 files changed, 20 insertions, 3 deletions
diff --git a/office/gnokii/gnokii-0.6.29-pcsc.patch b/office/gnokii/gnokii-0.6.29-pcsc.patch
new file mode 100644
index 0000000000000..539c208f5a9c8
--- /dev/null
+++ b/office/gnokii/gnokii-0.6.29-pcsc.patch
@@ -0,0 +1,14 @@
+diff -rupN gnokii-0.6.29.orig/common/phones/pcsc.c gnokii-0.6.29new/common/phones/pcsc.c
+--- gnokii-0.6.29.orig/common/phones/pcsc.c 2010-07-29 08:38:28.000000000 +1000
++++ gnokii-0.6.29/common/phones/pcsc.c 2010-07-29 08:51:29.000000000 +1000
+@@ -199,8 +199,8 @@ static gn_error get_gn_error(PCSC_IOSTRU
+ case SCARD_W_UNPOWERED_CARD:
+ case SCARD_W_RESET_CARD:
+ case SCARD_W_REMOVED_CARD:
+- case SCARD_W_INSERTED_CARD:
+- return GN_ERR_SIMPROBLEM;
++ /* removed in pscc case SCARD_W_INSERTED_CARD:
++ return GN_ERR_SIMPROBLEM; */
+ case SCARD_E_NO_MEMORY:
+ return GN_ERR_MEMORYFULL;
+ case SCARD_F_WAITED_TOO_LONG:
diff --git a/office/gnokii/gnokii.SlackBuild b/office/gnokii/gnokii.SlackBuild
index 6894d81cccf01..ad072832318d0 100644
--- a/office/gnokii/gnokii.SlackBuild
+++ b/office/gnokii/gnokii.SlackBuild
@@ -28,7 +28,7 @@
PRGNAM=gnokii
VERSION=${VERSION:-0.6.29}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
# Automatically determine the architecture we're building on:
@@ -75,6 +75,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=3dac96714fba1f06445c15e34af3a0c3ad7eb1ce
+patch -p1 < $CWD/gnokii-0.6.29-pcsc.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/office/gnokii/gnokii.info b/office/gnokii/gnokii.info
index 1b4fbd3b83aa3..43be9e2b6d501 100644
--- a/office/gnokii/gnokii.info
+++ b/office/gnokii/gnokii.info
@@ -1,10 +1,10 @@
PRGNAM="gnokii"
VERSION="0.6.29"
HOMEPAGE="http://www.gnokii.org/"
-DOWNLOAD="http://www.gnokii.org/download/gnokii/gnokii-0.6.29.tar.bz2"
+DOWNLOAD="http://www.gnokii.org/download/gnokii/0.6.x/gnokii-0.6.29.tar.bz2"
MD5SUM="6111e0158a1129062bda6420db67c313"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Andrzej Telszewski"
EMAIL="atelszewski@gmail.com"
-APPROVED="rworkman"
+APPROVED="dsomero"