aboutsummaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2012-09-25 13:11:48 -0500
committerRobby Workman <rworkman@slackbuilds.org>2012-09-26 00:00:12 -0500
commit32f1e178d6c327765d2ddc956bff9d4a36c68729 (patch)
tree4f51696458a2abe779b9273b29f5495b0083875f /libraries
parentbdd42a4cce011979a4cf7c9dac8e2a24c5522e8c (diff)
libraries/tkimg: Fixed linking of the included libtiff
Thanks to Gentoo for the patch. Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'libraries')
-rw-r--r--libraries/tkimg/tkimg-1.4-nojbig.patch22
-rw-r--r--libraries/tkimg/tkimg.SlackBuild5
2 files changed, 26 insertions, 1 deletions
diff --git a/libraries/tkimg/tkimg-1.4-nojbig.patch b/libraries/tkimg/tkimg-1.4-nojbig.patch
new file mode 100644
index 000000000000..8ac8969cdcd0
--- /dev/null
+++ b/libraries/tkimg/tkimg-1.4-nojbig.patch
@@ -0,0 +1,22 @@
+--- tkimg1.4/libtiff/configure.in 2010-07-06 15:48:46.000000000 +0200
++++ tkimg1.4.new/libtiff/configure.in 2011-02-28 23:24:18.471259943 +0100
+@@ -67,7 +67,7 @@
+ else
+ TIFFHOST="$host"
+ fi
+-${srcdir}/../compat/libtiff/configure --disable-zlib --disable-pixarlog --disable-jpeg \
++${srcdir}/../compat/libtiff/configure --disable-zlib --disable-pixarlog --disable-jpeg --disable-jbig \
+ "--with-CC=$TIFFCC" $TIFFHOST
+ mv -f tifftcl_confdefs.h confdefs.h
+
+--- tkimg1.4/libtiff/configure 2010-07-07 10:09:46.000000000 +0200
++++ tkimg1.4.new/libtiff/configure 2011-02-28 23:25:53.529824614 +0100
+@@ -5133,7 +5133,7 @@
+ else
+ TIFFHOST="$host"
+ fi
+-${srcdir}/../compat/libtiff/configure --disable-zlib --disable-pixarlog --disable-jpeg \
++${srcdir}/../compat/libtiff/configure --disable-zlib --disable-pixarlog --disable-jpeg --disable-jbig \
+ "--with-CC=$TIFFCC" $TIFFHOST
+ mv -f tifftcl_confdefs.h confdefs.h
+
diff --git a/libraries/tkimg/tkimg.SlackBuild b/libraries/tkimg/tkimg.SlackBuild
index 58b635a67e36..85a93698f5fd 100644
--- a/libraries/tkimg/tkimg.SlackBuild
+++ b/libraries/tkimg/tkimg.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=tkimg
VERSION=${VERSION:-1.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -69,6 +69,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# https://bugs.gentoo.org/show_bug.cgi?id=356907
+patch -p1 < $CWD/tkimg-1.4-nojbig.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \