[arch-commits] Commit in graphviz/repos (10 files)

Gaetan Bisson bisson at archlinux.org
Tue Dec 2 20:42:16 UTC 2014


    Date: Tuesday, December 2, 2014 @ 21:42:16
  Author: bisson
Revision: 227260

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  graphviz/repos/extra-i686/PKGBUILD
    (from rev 227259, graphviz/trunk/PKGBUILD)
  graphviz/repos/extra-i686/format-string.patch
    (from rev 227259, graphviz/trunk/format-string.patch)
  graphviz/repos/extra-i686/install
    (from rev 227259, graphviz/trunk/install)
  graphviz/repos/extra-x86_64/PKGBUILD
    (from rev 227259, graphviz/trunk/PKGBUILD)
  graphviz/repos/extra-x86_64/format-string.patch
    (from rev 227259, graphviz/trunk/format-string.patch)
  graphviz/repos/extra-x86_64/install
    (from rev 227259, graphviz/trunk/install)
Deleted:
  graphviz/repos/extra-i686/PKGBUILD
  graphviz/repos/extra-i686/install
  graphviz/repos/extra-x86_64/PKGBUILD
  graphviz/repos/extra-x86_64/install

----------------------------------+
 /PKGBUILD                        |  114 +++++++++++++++++++++++++++++++++++++
 /install                         |   24 +++++++
 extra-i686/PKGBUILD              |   50 ----------------
 extra-i686/format-string.patch   |   21 ++++++
 extra-i686/install               |   12 ---
 extra-x86_64/PKGBUILD            |   50 ----------------
 extra-x86_64/format-string.patch |   21 ++++++
 extra-x86_64/install             |   12 ---
 8 files changed, 180 insertions(+), 124 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2014-12-02 20:41:38 UTC (rev 227259)
+++ extra-i686/PKGBUILD	2014-12-02 20:42:16 UTC (rev 227260)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: kevin <kevin at archlinux.org>
-# Contributor: John Proctor <jproctor at prium.net>
-
-pkgname=graphviz
-pkgver=2.38.0
-pkgrel=2
-pkgdesc='Graph visualization software'
-url='http://www.graphviz.org/'
-license=('CPL')
-arch=('i686' 'x86_64')
-depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts')
-makedepends=('swig' 'mono' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'r' 'tk' 'qt4' 'gtk2')
-optdepends=('mono: sharp bindings'
-            'guile: guile bindings'
-            'lua51: lua bindings'
-            'ocaml: ocaml bindings'
-            'perl: perl bindings'
-            'php: php bindings'
-            'python2: python bindings'
-            'r: r bindings'
-            'tcl: tcl bindings'
-            'qt4: gvedit'
-            'gtk2: gtk output plugin')
-source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('053c771278909160916ca5464a0a98ebf034c6ef')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	export LIBPOSTFIX=/
-	export PYTHON=python2
-	export LUA=lua5.1
-
-	./configure --prefix=/usr
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-
-	# Workaround symlink upgrade bug (fixed in pacman trunk)
-	# Also deduplicates the tcl libraries (upstream bug?)
-	# Might have been this commit: https://github.com/ellson/graphviz/commit/f11aead
-	rm -r "${pkgdir}/usr/lib/tcl8.6/graphviz"
-	ln -s ../graphviz/tcl "$pkgdir/usr/lib/tcl8.6/graphviz"
-}

Copied: graphviz/repos/extra-i686/PKGBUILD (from rev 227259, graphviz/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2014-12-02 20:42:16 UTC (rev 227260)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: kevin <kevin at archlinux.org>
+# Contributor: John Proctor <jproctor at prium.net>
+
+pkgname=graphviz
+pkgver=2.38.0
+pkgrel=3
+pkgdesc='Graph visualization software'
+url='http://www.graphviz.org/'
+license=('CPL')
+arch=('i686' 'x86_64')
+depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts')
+makedepends=('swig' 'mono' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'r' 'tk' 'qt4' 'gtk2')
+optdepends=('mono: sharp bindings'
+            'guile: guile bindings'
+            'lua51: lua bindings'
+            'ocaml: ocaml bindings'
+            'perl: perl bindings'
+            'php: php bindings'
+            'python2: python bindings'
+            'r: r bindings'
+            'tcl: tcl bindings'
+            'qt4: gvedit'
+            'gtk2: gtk output plugin')
+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=/
+	export PYTHON=python2
+	export LUA=lua5.1
+
+	./configure --prefix=/usr
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+
+	# Workaround symlink upgrade bug (fixed in pacman trunk)
+	# Also deduplicates the tcl libraries (upstream bug?)
+	# Might have been this commit: https://github.com/ellson/graphviz/commit/f11aead
+	rm -r "${pkgdir}/usr/lib/tcl8.6/graphviz"
+	ln -s ../graphviz/tcl "$pkgdir/usr/lib/tcl8.6/graphviz"
+}

Copied: graphviz/repos/extra-i686/format-string.patch (from rev 227259, graphviz/trunk/format-string.patch)
===================================================================
--- extra-i686/format-string.patch	                        (rev 0)
+++ extra-i686/format-string.patch	2014-12-02 20:42:16 UTC (rev 227260)
@@ -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.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 */

Deleted: extra-i686/install
===================================================================
--- extra-i686/install	2014-12-02 20:41:38 UTC (rev 227259)
+++ extra-i686/install	2014-12-02 20:42:16 UTC (rev 227260)
@@ -1,12 +0,0 @@
-post_install() {
-	rm -f usr/lib/graphviz/config{,6}
-	usr/bin/dot -c
-}
-
-post_upgrade() {
-	post_install
-}
-
-pre_remove() {
-	rm -f usr/lib/graphviz/config{,6}
-}

Copied: graphviz/repos/extra-i686/install (from rev 227259, graphviz/trunk/install)
===================================================================
--- extra-i686/install	                        (rev 0)
+++ extra-i686/install	2014-12-02 20:42:16 UTC (rev 227260)
@@ -0,0 +1,12 @@
+post_install() {
+	rm -f usr/lib/graphviz/config{,6}
+	usr/bin/dot -c
+}
+
+post_upgrade() {
+	post_install
+}
+
+pre_remove() {
+	rm -f usr/lib/graphviz/config{,6}
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2014-12-02 20:41:38 UTC (rev 227259)
+++ extra-x86_64/PKGBUILD	2014-12-02 20:42:16 UTC (rev 227260)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: kevin <kevin at archlinux.org>
-# Contributor: John Proctor <jproctor at prium.net>
-
-pkgname=graphviz
-pkgver=2.38.0
-pkgrel=2
-pkgdesc='Graph visualization software'
-url='http://www.graphviz.org/'
-license=('CPL')
-arch=('i686' 'x86_64')
-depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts')
-makedepends=('swig' 'mono' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'r' 'tk' 'qt4' 'gtk2')
-optdepends=('mono: sharp bindings'
-            'guile: guile bindings'
-            'lua51: lua bindings'
-            'ocaml: ocaml bindings'
-            'perl: perl bindings'
-            'php: php bindings'
-            'python2: python bindings'
-            'r: r bindings'
-            'tcl: tcl bindings'
-            'qt4: gvedit'
-            'gtk2: gtk output plugin')
-source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('053c771278909160916ca5464a0a98ebf034c6ef')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	export LIBPOSTFIX=/
-	export PYTHON=python2
-	export LUA=lua5.1
-
-	./configure --prefix=/usr
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-
-	# Workaround symlink upgrade bug (fixed in pacman trunk)
-	# Also deduplicates the tcl libraries (upstream bug?)
-	# Might have been this commit: https://github.com/ellson/graphviz/commit/f11aead
-	rm -r "${pkgdir}/usr/lib/tcl8.6/graphviz"
-	ln -s ../graphviz/tcl "$pkgdir/usr/lib/tcl8.6/graphviz"
-}

Copied: graphviz/repos/extra-x86_64/PKGBUILD (from rev 227259, graphviz/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2014-12-02 20:42:16 UTC (rev 227260)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: kevin <kevin at archlinux.org>
+# Contributor: John Proctor <jproctor at prium.net>
+
+pkgname=graphviz
+pkgver=2.38.0
+pkgrel=3
+pkgdesc='Graph visualization software'
+url='http://www.graphviz.org/'
+license=('CPL')
+arch=('i686' 'x86_64')
+depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts')
+makedepends=('swig' 'mono' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'r' 'tk' 'qt4' 'gtk2')
+optdepends=('mono: sharp bindings'
+            'guile: guile bindings'
+            'lua51: lua bindings'
+            'ocaml: ocaml bindings'
+            'perl: perl bindings'
+            'php: php bindings'
+            'python2: python bindings'
+            'r: r bindings'
+            'tcl: tcl bindings'
+            'qt4: gvedit'
+            'gtk2: gtk output plugin')
+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=/
+	export PYTHON=python2
+	export LUA=lua5.1
+
+	./configure --prefix=/usr
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+
+	# Workaround symlink upgrade bug (fixed in pacman trunk)
+	# Also deduplicates the tcl libraries (upstream bug?)
+	# Might have been this commit: https://github.com/ellson/graphviz/commit/f11aead
+	rm -r "${pkgdir}/usr/lib/tcl8.6/graphviz"
+	ln -s ../graphviz/tcl "$pkgdir/usr/lib/tcl8.6/graphviz"
+}

Copied: graphviz/repos/extra-x86_64/format-string.patch (from rev 227259, graphviz/trunk/format-string.patch)
===================================================================
--- extra-x86_64/format-string.patch	                        (rev 0)
+++ extra-x86_64/format-string.patch	2014-12-02 20:42:16 UTC (rev 227260)
@@ -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.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 */

Deleted: extra-x86_64/install
===================================================================
--- extra-x86_64/install	2014-12-02 20:41:38 UTC (rev 227259)
+++ extra-x86_64/install	2014-12-02 20:42:16 UTC (rev 227260)
@@ -1,12 +0,0 @@
-post_install() {
-	rm -f usr/lib/graphviz/config{,6}
-	usr/bin/dot -c
-}
-
-post_upgrade() {
-	post_install
-}
-
-pre_remove() {
-	rm -f usr/lib/graphviz/config{,6}
-}

Copied: graphviz/repos/extra-x86_64/install (from rev 227259, graphviz/trunk/install)
===================================================================
--- extra-x86_64/install	                        (rev 0)
+++ extra-x86_64/install	2014-12-02 20:42:16 UTC (rev 227260)
@@ -0,0 +1,12 @@
+post_install() {
+	rm -f usr/lib/graphviz/config{,6}
+	usr/bin/dot -c
+}
+
+post_upgrade() {
+	post_install
+}
+
+pre_remove() {
+	rm -f usr/lib/graphviz/config{,6}
+}



More information about the arch-commits mailing list