[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
===
--- PKGBUILD2016-12-29 06:25:08 UTC (rev 284959)
+++ PKGBUILD2016-12-29 08:40:54 UTC (rev 284960)
@@ -4,8 +4,8 @@
 # Contributor: John Proctor 
 
 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=('8a44d19bcdb50df1bd8e649de472ebf86846'
   '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.0 -1000
-+++ new/lib/cgraph/scan.l  2014-12-02 08:54:21.285050735 -1000
-@@ -149,7 +149,7 @@
-   agxbput(,buf);
-   agxbput(,fname);
-   agxbput(, " splits into two tokens\n");
--  agerr(AGWARN,agxbuse());
-+  agerr(AGWARN, "%s", agxbuse());
- 
-   agxbfree();
-   return 1;
-@@ -225,7 +225,7 @@
-   agxbput (, buf);
-   agxbput (, yytext);
-   agxbput (,"'\n");
--  agerr(AGERR,agxbuse());
-+  agerr(AGERR, "%s", agxbuse());
-   agxbfree();
- }
- /* must be here to see flex's macro defns */

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

[Gaetan Bisson]

Date: Tuesday, December 2, 2014 @ 21:41:38
  Author: bisson
Revision: 227259

fix FS#42983

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

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

Modified: PKGBUILD
===
--- PKGBUILD2014-12-02 20:23:49 UTC (rev 227258)
+++ PKGBUILD2014-12-02 20:41:38 UTC (rev 227259)
@@ -5,7 +5,7 @@
 
 pkgname=graphviz
 pkgver=2.38.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Graph visualization software'
 url='http://www.graphviz.org/'
 license=('CPL')
@@ -23,11 +23,18 @@
 'tcl: tcl bindings'
 'qt4: gvedit'
 'gtk2: gtk output plugin')
-source=(${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('053c771278909160916ca5464a0a98ebf034c6ef')
+source=(${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz
+'format-string.patch')
+sha1sums=('053c771278909160916ca5464a0a98ebf034c6ef'
+  '271d116bc022596a64b6ee061f3d2e50fa2e6025')
 
 install=install
 
+prepare() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   patch -p1 -i ../format-string.patch # FS#42983
+}
+
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
export LIBPOSTFIX=/

Added: format-string.patch
===
--- format-string.patch (rev 0)
+++ format-string.patch 2014-12-02 20:41:38 UTC (rev 227259)
@@ -0,0 +1,21 @@
+diff -Naur old/lib/cgraph/scan.l new/lib/cgraph/scan.l
+--- old/lib/cgraph/scan.l  2014-04-13 10:40:25.0 -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 */