summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/libkate/libkate.SlackBuild12
-rw-r--r--libraries/libkate/libkate.info8
-rw-r--r--libraries/libkate/patches/doc-thanks.patch10
-rw-r--r--libraries/libkate/patches/libpng-1.4.patch36
4 files changed, 6 insertions, 60 deletions
diff --git a/libraries/libkate/libkate.SlackBuild b/libraries/libkate/libkate.SlackBuild
index ff2817c999..8561911e5c 100644
--- a/libraries/libkate/libkate.SlackBuild
+++ b/libraries/libkate/libkate.SlackBuild
@@ -25,15 +25,14 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=libkate
-VERSION=0.3.7
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-0.3.8}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
arm*) ARCH=arm ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
*) ARCH=$( uname -m ) ;;
esac
fi
@@ -72,12 +71,6 @@ find . \
\( -perm 777 -o -perm 755 -o -perm 711 -o -perm 700 -o -perm 555 -o -perm 511 -o -perm 500 \) \
-exec chmod 755 {} \;
-### apply patches picked from git
-### apply doc patch
-patch -p1 < $CWD/patches/doc-thanks.patch
-### apply patch to build against libpng-1.4
-patch -p1 < $CWD/patches/libpng-1.4.patch
-
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
@@ -107,6 +100,5 @@ for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
-
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libkate/libkate.info b/libraries/libkate/libkate.info
index 15f99c2945..68629bb20f 100644
--- a/libraries/libkate/libkate.info
+++ b/libraries/libkate/libkate.info
@@ -1,10 +1,10 @@
PRGNAM="libkate"
-VERSION="0.3.7"
+VERSION="0.3.8"
HOMEPAGE="http://code.google.com/p/libkate/"
-DOWNLOAD="http://libkate.googlecode.com/files/libkate-0.3.7.tar.gz"
-MD5SUM="e5c287b4f40498e5bde48c0a52225292"
+DOWNLOAD="http://libkate.googlecode.com/files/libkate-0.3.8.tar.gz"
+MD5SUM="7489ddebedf8d9888a05496dedf83c71"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Nishant Limbachia"
EMAIL="nishant@mnspace.net"
-APPROVED="dsomero"
+APPROVED="Erik Hanson"
diff --git a/libraries/libkate/patches/doc-thanks.patch b/libraries/libkate/patches/doc-thanks.patch
deleted file mode 100644
index b3c77e2264..0000000000
--- a/libraries/libkate/patches/doc-thanks.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/THANKS
-+++ b/THANKS
-@@ -27,3 +27,7 @@ Christian Morales Vega
-
- Gregory Maxwell
- testing with Clang
-+
-+Denis Falqueto
-+ build fix needed for libpng 1.4
-+
diff --git a/libraries/libkate/patches/libpng-1.4.patch b/libraries/libkate/patches/libpng-1.4.patch
deleted file mode 100644
index d624bcc5fb..0000000000
--- a/libraries/libkate/patches/libpng-1.4.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/tools/kpng.c
-+++ b/tools/kpng.c
-@@ -179,13 +179,13 @@ int kd_read_png8(const char *filename,int *w,int *h,int *bpp,kate_color **palett
- }
- }
-
-- png_destroy_read_struct(&png_ptr,&info_ptr,png_infopp_NULL);
-+ png_destroy_read_struct(&png_ptr,&info_ptr,NULL);
- fclose(f);
-
- return 0;
-
- error:
-- if (png_ptr) png_destroy_read_struct(&png_ptr,info_ptr?&info_ptr:png_infopp_NULL,png_infopp_NULL);
-+ if (png_ptr) png_destroy_read_struct(&png_ptr,info_ptr?&info_ptr:NULL,NULL);
- if (f) fclose(f);
- return -1;
- }
-@@ -224,7 +224,7 @@ int kd_read_png(const char *filename,int *w,int *h,unsigned char **pixels,size_t
- if (w) *w=png_get_image_width(png_ptr,info_ptr);
- if (h) *h=png_get_image_height(png_ptr,info_ptr);
-
-- png_destroy_read_struct(&png_ptr,&info_ptr,png_infopp_NULL);
-+ png_destroy_read_struct(&png_ptr,&info_ptr,NULL);
-
- /* now read the whole file as a binary blob */
- fseek(f,0,SEEK_END);
-@@ -246,7 +246,7 @@ int kd_read_png(const char *filename,int *w,int *h,unsigned char **pixels,size_t
- return 0;
-
- error:
-- if (png_ptr) png_destroy_read_struct(&png_ptr,info_ptr?&info_ptr:png_infopp_NULL,png_infopp_NULL);
-+ if (png_ptr) png_destroy_read_struct(&png_ptr,info_ptr?&info_ptr:NULL,NULL);
- if (f) fclose(f);
- return -1;
- }