From 74132c02303eebe81f306b023c9ec71e701b4290 Mon Sep 17 00:00:00 2001 From: Audrius Kažukauskas Date: Wed, 4 Jan 2017 19:09:11 +0200 Subject: graphics/graphviz: Updated for version 2.40.1. Signed-off-by: Audrius Kažukauskas --- graphics/graphviz/format-string.patch | 21 --------------------- graphics/graphviz/graphviz.SlackBuild | 19 +++++++++---------- graphics/graphviz/graphviz.info | 6 +++--- 3 files changed, 12 insertions(+), 34 deletions(-) delete mode 100644 graphics/graphviz/format-string.patch (limited to 'graphics/graphviz') diff --git a/graphics/graphviz/format-string.patch b/graphics/graphviz/format-string.patch deleted file mode 100644 index 1cc586739c..0000000000 --- a/graphics/graphviz/format-string.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur old/lib/cgraph/scan.l new/lib/cgraph/scan.l ---- old/lib/cgraph/scan.l 2014-04-13 10:40:25.000000000 -1000 -+++ new/lib/cgraph/scan.l 2014-12-02 08:54:21.285050735 -1000 -@@ -149,7 +149,7 @@ - agxbput(&xb,buf); - agxbput(&xb,fname); - agxbput(&xb, " splits into two tokens\n"); -- agerr(AGWARN,agxbuse(&xb)); -+ agerr(AGWARN, "%s", agxbuse(&xb)); - - agxbfree(&xb); - return 1; -@@ -225,7 +225,7 @@ - agxbput (&xb, buf); - agxbput (&xb, yytext); - agxbput (&xb,"'\n"); -- agerr(AGERR,agxbuse(&xb)); -+ agerr(AGERR, "%s", agxbuse(&xb)); - agxbfree(&xb); - } - /* must be here to see flex's macro defns */ diff --git a/graphics/graphviz/graphviz.SlackBuild b/graphics/graphviz/graphviz.SlackBuild index c156107652..2386a2cbfe 100644 --- a/graphics/graphviz/graphviz.SlackBuild +++ b/graphics/graphviz/graphviz.SlackBuild @@ -4,7 +4,7 @@ # Copyright 2007 Robby Workman # Copyright 2011 Heinz Wiesinger -# Copyright 2013-2015 Audrius Kažukauskas +# Copyright 2013-2017 Audrius Kažukauskas # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,13 +25,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=graphviz -VERSION=${VERSION:-2.38.0} +VERSION=${VERSION:-2.40.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -66,10 +66,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION 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 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 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # Install PHP bindings to proper location. sed -i 's|/php/modules|/php/extensions|' configure @@ -77,8 +77,7 @@ sed -i 's|/php/modules|/php/extensions|' configure # Fix for php-5.4 patch -p1 -i $CWD/php_5.4_compat.patch -# Patches from Arch (thanks!) -patch -p1 -i $CWD/format-string.patch +# Patch from Arch (thanks!) patch -p1 -i $CWD/ghostscript918.patch CFLAGS="$SLKCFLAGS" \ diff --git a/graphics/graphviz/graphviz.info b/graphics/graphviz/graphviz.info index 0a9b4b2ace..0d75146a43 100644 --- a/graphics/graphviz/graphviz.info +++ b/graphics/graphviz/graphviz.info @@ -1,8 +1,8 @@ PRGNAM="graphviz" -VERSION="2.38.0" +VERSION="2.40.1" HOMEPAGE="http://graphviz.org/" -DOWNLOAD="http://pkgs.fedoraproject.org/repo/pkgs/graphviz/graphviz-2.38.0.tar.gz/5b6a829b2ac94efcd5fa3c223ed6d3ae/graphviz-2.38.0.tar.gz" -MD5SUM="5b6a829b2ac94efcd5fa3c223ed6d3ae" +DOWNLOAD="http://graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.40.1.tar.gz" +MD5SUM="4ea6fd64603536406166600bcc296fc8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -- cgit v1.2.3