[arch-commits] Commit in graphviz/trunk (PKGBUILD format-string.patch)

[Gaëtan Bisson]

    Date: Thursday, December 29, 2016 @ 08:40:54
  Author: bisson
Revision: 284960

upstream update

Modified:
  graphviz/trunk/PKGBUILD
Deleted:
  graphviz/trunk/format-string.patch

---------------------+
 PKGBUILD            |   10 +++-------
 format-string.patch |   21 ---------------------
 2 files changed, 3 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-12-29 06:25:08 UTC (rev 284959)
+++ PKGBUILD	2016-12-29 08:40:54 UTC (rev 284960)
@@ -4,8 +4,8 @@
 # Contributor: John Proctor <jproctor at prium.net>
 
 pkgname=graphviz
-pkgver=2.38.0
-pkgrel=16
+pkgver=2.40.1
+pkgrel=1
 pkgdesc='Graph visualization software'
 url='http://www.graphviz.org/'
 license=('CPL')
@@ -24,18 +24,14 @@
             'gtk2: gtk output plugin'
             'xterm: vimdot')
 source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz"
-        'format-string.patch'
         'ghostscript918.patch')
-sha1sums=('053c771278909160916ca5464a0a98ebf034c6ef'
-          '271d116bc022596a64b6ee061f3d2e50fa2e6025'
+sha1sums=('8a44d19bcdb50df1bd8e649de472ebf868468888'
           'bcce75a535c277556e196638e59ea019b0a63fa1')
 
-
 install=install
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../format-string.patch # FS#42983
 	patch -p1 -i ../ghostscript918.patch
 }
 

Deleted: format-string.patch
===================================================================
--- format-string.patch	2016-12-29 06:25:08 UTC (rev 284959)
+++ format-string.patch	2016-12-29 08:40:54 UTC (rev 284960)
@@ -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 */