diff options
| -rw-r--r-- | libraries/tkimg/tkimg-1.4-nojbig.patch | 22 | ||||
| -rw-r--r-- | libraries/tkimg/tkimg.SlackBuild | 25 | ||||
| -rw-r--r-- | libraries/tkimg/tkimg.info | 6 |
3 files changed, 14 insertions, 39 deletions
diff --git a/libraries/tkimg/tkimg-1.4-nojbig.patch b/libraries/tkimg/tkimg-1.4-nojbig.patch deleted file mode 100644 index 8ac8969cdc..0000000000 --- a/libraries/tkimg/tkimg-1.4-nojbig.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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 b121864c2b..1ed086839a 100644 --- a/libraries/tkimg/tkimg.SlackBuild +++ b/libraries/tkimg/tkimg.SlackBuild @@ -23,8 +23,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=tkimg -VERSION=${VERSION:-1.4} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.4.2} +MAJVER=1.4 +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -59,19 +60,17 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION +rm -rf $PRGNAM$MAJVER tar xvf $CWD/$PRGNAM$VERSION.tar.bz2 -cd $PRGNAM$VERSION +cd $PRGNAM$MAJVER chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -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 + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +make distclean CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -92,9 +91,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - license.terms README ANNOUNCE \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a license.terms README ANNOUNCE $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/libraries/tkimg/tkimg.info b/libraries/tkimg/tkimg.info index a6acf3dc09..7d7d383e6a 100644 --- a/libraries/tkimg/tkimg.info +++ b/libraries/tkimg/tkimg.info @@ -1,8 +1,8 @@ PRGNAM="tkimg" -VERSION="1.4" +VERSION="1.4.2" HOMEPAGE="http://wiki.tcl.tk/1404" -DOWNLOAD="http://download.sourceforge.net/tkimg/tkimg1.4.tar.bz2" -MD5SUM="7d7ce00b1ae08a78f06c1c2cc761a155" +DOWNLOAD="http://download.sourceforge.net/tkimg/tkimg1.4.2.tar.bz2" +MD5SUM="1ccae906cb1c235b114b9736dfb157d6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="tcllib" |