From 62a4b969150097bbe02a28b3258319bc4f4435c63673a3f51f22e4d960acb6b7 Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Tue, 3 Sep 2013 14:40:43 +0000 Subject: [PATCH 01/19] - Update to 2.32.0. Changes since 2.28.0: 2.32.0: - New version of xdot format, annotating gradient color schemes - Support for reading pdf images using poppler - Lefty/dotty/lneato now accept anonymous graphs - Add star node shape - Add two-tone (non-gradient) fill 2.30.1: - various build fixes 2.30.0: - Replaced libgraph with libcgraph; use of libgraph is now deprecated - New ranking algorithm that allows multiple subgraph constraints - Support edges using curved arcs. - Added new shapes used by the synthetic biology community. - For HTML-like labels, provide rounded cells, and dashed or dotted borders. - Add lcurve and rcurve arrowheads. - Add prototype pie chart and striped fills. - Support insets in treemaps to make containment clear - Add random rooted tree generation to gvgen - Allow GVPRPATH to specify that the default path be prepended or appended to it. - Support arbitrary lists of layers; allow the user to specify arbitrary layers for output. - A collection of gvpr scripts, which were part of the source package, are now installed in /share/graphviz/gvpr, and the that path is used as part of th default built-in path for gvpr. - Update libexpr to reflect Glenn Fowler's changes including scopes for variables. - Add next graph variable to gvpr - Modify dot and fdp so that a cluster's margin attribute will affect OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=59 --- graphviz-2.28.0.tar.gz | 3 - graphviz-2.32.0.tar.gz | 3 + graphviz-buffer_overflow.patch | 25 +++ graphviz-gd_png_check_sig.patch | 11 -- graphviz-plugins.changes | 56 ++++++ graphviz-plugins.spec | 13 +- graphviz-proper_prototypes.patch | 310 +++++++++++++++++++++++++++++++ graphviz.changes | 56 ++++++ graphviz.spec | 49 ++++- 9 files changed, 505 insertions(+), 21 deletions(-) delete mode 100644 graphviz-2.28.0.tar.gz create mode 100644 graphviz-2.32.0.tar.gz create mode 100644 graphviz-buffer_overflow.patch delete mode 100644 graphviz-gd_png_check_sig.patch create mode 100644 graphviz-proper_prototypes.patch diff --git a/graphviz-2.28.0.tar.gz b/graphviz-2.28.0.tar.gz deleted file mode 100644 index bd70733..0000000 --- a/graphviz-2.28.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d3aa7973c578cae4cc26d9d6498c57ed06680cab9a4e940d0357a3c6527afc76 -size 19620087 diff --git a/graphviz-2.32.0.tar.gz b/graphviz-2.32.0.tar.gz new file mode 100644 index 0000000..89efa65 --- /dev/null +++ b/graphviz-2.32.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d853b2313e08a1dd0cce20d9ff8051acfa9ec418b5ba2dc65c8f4ddb07a7a77a +size 23756717 diff --git a/graphviz-buffer_overflow.patch b/graphviz-buffer_overflow.patch new file mode 100644 index 0000000..88d07a2 --- /dev/null +++ b/graphviz-buffer_overflow.patch @@ -0,0 +1,25 @@ +From: Philipp Thomas +Date: 2013-09-02 18:18:46+02:00 +Subject: Fix the buffer overflow + +C is defined as +pointf C[4] +so C[4] is a clear off-by-one. + +--- + lib/common/shapes.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: lib/common/shapes.c +=================================================================== +--- lib/common/shapes.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/common/shapes.c 2013-09-02 18:15:48.640408565 +0200 +@@ -1364,7 +1364,7 @@ void round_corners(GVJ_t * job, pointf * + C[2].y = C[1].y; + C[3].x = C[2].x; + C[3].y = C[0].y; +- C[4] = C[0]; ++// C[4] = C[0]; + gvrender_polyline(job, C, 5); + + /*dsDNA line right half*/ diff --git a/graphviz-gd_png_check_sig.patch b/graphviz-gd_png_check_sig.patch deleted file mode 100644 index a5973c9..0000000 --- a/graphviz-gd_png_check_sig.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/gd/gd_png.c -+++ lib/gd/gd_png.c -@@ -150,7 +150,7 @@ - return NULL; - } - -- if (!png_check_sig (sig, 8)) { /* bad signature */ -+ if (png_sig_cmp (sig, 0, 8)) { /* bad signature */ - return NULL; /* bad signature */ - } - diff --git a/graphviz-plugins.changes b/graphviz-plugins.changes index 6b89d7d..e5597a1 100644 --- a/graphviz-plugins.changes +++ b/graphviz-plugins.changes @@ -1,3 +1,59 @@ +------------------------------------------------------------------- +Tue Sep 3 13:55:25 CEST 2013 - pth@suse.de + +- Update to 2.32.0. Changes since 2.28.0: + 2.32.0: + - New version of xdot format, annotating gradient color schemes + - Support for reading pdf images using poppler + - Lefty/dotty/lneato now accept anonymous graphs + - Add star node shape + - Add two-tone (non-gradient) fill + 2.30.1: + - various build fixes + 2.30.0: + - Replaced libgraph with libcgraph; use of libgraph is now deprecated + - New ranking algorithm that allows multiple subgraph constraints + - Support edges using curved arcs. + - Added new shapes used by the synthetic biology community. + - For HTML-like labels, provide rounded cells, and dashed or dotted borders. + - Add lcurve and rcurve arrowheads. + - Add prototype pie chart and striped fills. + - Support insets in treemaps to make containment clear + - Add random rooted tree generation to gvgen + - Allow GVPRPATH to specify that the default path be prepended or + appended to it. + - Support arbitrary lists of layers; allow the user to specify arbitrary + layers for output. + - A collection of gvpr scripts, which were part of the source package, + are now installed in /share/graphviz/gvpr, and the that path + is used as part of th default built-in path for gvpr. + - Update libexpr to reflect Glenn Fowler's changes including scopes for + variables. + - Add next graph variable to gvpr + - Modify dot and fdp so that a cluster's margin attribute will affect + the space between the bounding box and nodes + - Modify the dijkstra tool to use only directed edges + - Output numbers without quotes if quotes are not needed on input + - Support gradient fill + - Provide support for webp images + - Fix tapered edges to use the dir attribute and arrowhead + - Add imagepath attribute + - Add help functionality to Graphviz.app + - Add ,, to html strings via svg + - Add tapered edges + - Add support for external labels + - Add initial implementation of graphml2gv + - Add basic horizontal and vertical rules to html tables + +- Remove graphviz-gd_png_check_sig.patch as the file to patch doesn't + exist anymore. +- Add graphviz-buffer_overflow.patch to fix a buffer ovderflow in + lib/common/shapes.c(round_corners). +- Add graphviz-proper_prototypes.patch that changes the conditional + from __STD_C to the standard conforming __STDC__ to get proper + prototypes. +- Run autoreconf to use -fno-strict-aliasing for libvmalloc sources + ------------------------------------------------------------------- Fri May 31 08:08:44 UTC 2013 - mhrusecky@suse.com diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec index ac93f16..7e344d2 100644 --- a/graphviz-plugins.spec +++ b/graphviz-plugins.spec @@ -28,8 +28,11 @@ %bcond_without mono Name: graphviz-plugins +BuildRequires: autoconf +BuildRequires: automake BuildRequires: bison BuildRequires: flex +BuildRequires: freeglut-devel BuildRequires: freetype2-devel >= 2 BuildRequires: gcc-c++ BuildRequires: gd-devel @@ -42,6 +45,7 @@ BuildRequires: libexpat-devel BuildRequires: libgnomeui-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel +BuildRequires: libqt4-devel BuildRequires: libstdc++-devel BuildRequires: m4 %ifnarch aarch64 @@ -83,16 +87,17 @@ BuildRequires: pkgconfig(pango) %if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif -Version: 2.28.0 +Version: 2.32.0 Release: 0 Summary: Graph Visualization Tools License: IPL-1.0 Group: Productivity/Graphics/Visualization/Graph Url: http://www.graphviz.org/ Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version}.tar.gz -Patch1: graphviz-gd_png_check_sig.patch Patch4: graphviz-aarch64_lib64_support.patch Patch5: graphviz-type_punning.patch +Patch6: graphviz-buffer_overflow.patch +Patch7: graphviz-proper_prototypes.patch Patch100: graphviz-plugins-fix_install_dirs.patch Patch101: graphviz-python_version.patch Patch102: graphviz-plugins-tcl_install_dir.patch @@ -262,9 +267,10 @@ Provides some additional PDF and HTML documentation for graphviz. %prep %setup -q -n %{mname}-%{version} -%patch1 %patch4 %patch5 +%patch6 +%patch7 %patch100 %patch101 %patch102 @@ -277,6 +283,7 @@ Provides some additional PDF and HTML documentation for graphviz. sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl %build +autoreconf -fi WARN_FLAGS="-W -Wall -Wno-unused-parameter -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith" CFLAGS="%{optflags} $WARN_FLAGS" %ifarch %ix86 x86_64 diff --git a/graphviz-proper_prototypes.patch b/graphviz-proper_prototypes.patch new file mode 100644 index 0000000..bf4c082 --- /dev/null +++ b/graphviz-proper_prototypes.patch @@ -0,0 +1,310 @@ +From: Philipp Thomas +Date: 2013-09-03 12:15:17+02:00 +Subject: Fix ifdef to get proper prototypes +References: +Upstream: + +--- + lib/cdt/dtclose.c | 2 +- + lib/cdt/dtdisc.c | 4 ++-- + lib/cdt/dtextract.c | 2 +- + lib/cdt/dtflatten.c | 2 +- + lib/cdt/dthash.c | 4 ++-- + lib/cdt/dtlist.c | 2 +- + lib/cdt/dtmethod.c | 2 +- + lib/cdt/dtopen.c | 2 +- + lib/cdt/dtrenew.c | 2 +- + lib/cdt/dtrestore.c | 2 +- + lib/cdt/dtsize.c | 4 ++-- + lib/cdt/dtstat.c | 6 +++--- + lib/cdt/dtstrhash.c | 2 +- + lib/cdt/dttree.c | 2 +- + lib/cdt/dttreeset.c | 4 ++-- + lib/cdt/dtview.c | 4 ++-- + lib/cdt/dtwalk.c | 2 +- + 17 files changed, 24 insertions(+), 24 deletions(-) + +Index: lib/cdt/dtclose.c +=================================================================== +--- lib/cdt/dtclose.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dtclose.c 2013-09-03 12:13:04.701648435 +0200 +@@ -4,7 +4,7 @@ + ** + ** Written by Kiem-Phong Vo (05/25/96) + */ +-#if __STD_C ++#if __STDC__ + int dtclose(reg Dt_t* dt) + #else + int dtclose(dt) +Index: lib/cdt/dtdisc.c +=================================================================== +--- lib/cdt/dtdisc.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dtdisc.c 2013-09-03 12:11:34.206821178 +0200 +@@ -7,7 +7,7 @@ + ** Written by Kiem-Phong Vo (5/26/96) + */ + +-#if __STD_C ++#if __STDC__ + static Void_t* dtmemory(Dt_t* dt,Void_t* addr,size_t size,Dtdisc_t* disc) + #else + static Void_t* dtmemory(dt, addr, size, disc) +@@ -27,7 +27,7 @@ Dtdisc_t* disc; /* discipline */ + else return size > 0 ? malloc(size) : NIL(Void_t*); + } + +-#if __STD_C ++#if __STDC__ + Dtdisc_t* dtdisc(Dt_t* dt, Dtdisc_t* disc, int type) + #else + Dtdisc_t* dtdisc(dt,disc,type) +Index: lib/cdt/dtextract.c +=================================================================== +--- lib/cdt/dtextract.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dtextract.c 2013-09-03 12:13:07.405583542 +0200 +@@ -5,7 +5,7 @@ + ** Written by Kiem-Phong Vo (5/25/96). + */ + +-#if __STD_C ++#if __STDC__ + Dtlink_t* dtextract(reg Dt_t* dt) + #else + Dtlink_t* dtextract(dt) +Index: lib/cdt/dtflatten.c +=================================================================== +--- lib/cdt/dtflatten.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dtflatten.c 2013-09-03 12:13:11.838477158 +0200 +@@ -6,7 +6,7 @@ + ** Written by Kiem-Phong Vo (5/25/96). + */ + +-#if __STD_C ++#if __STDC__ + Dtlink_t* dtflatten(Dt_t* dt) + #else + Dtlink_t* dtflatten(dt) +Index: lib/cdt/dthash.c +=================================================================== +--- lib/cdt/dthash.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dthash.c 2013-09-03 12:12:01.702160840 +0200 +@@ -9,7 +9,7 @@ + */ + + /* resize the hash table */ +-#if __STD_C ++#if __STDC__ + static void dthtab(Dt_t* dt) + #else + static void dthtab(dt) +@@ -75,7 +75,7 @@ Dt_t* dt; + } + } + +-#if __STD_C ++#if __STDC__ + static Void_t* dthash(Dt_t* dt, reg Void_t* obj, int type) + #else + static Void_t* dthash(dt,obj,type) +Index: lib/cdt/dtlist.c +=================================================================== +--- lib/cdt/dtlist.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dtlist.c 2013-09-03 12:11:48.959466853 +0200 +@@ -5,7 +5,7 @@ + ** Written by Kiem-Phong Vo (05/25/96) + */ + +-#if __STD_C ++#if __STDC__ + static Void_t* dtlist(reg Dt_t* dt, reg Void_t* obj, reg int type) + #else + static Void_t* dtlist(dt, obj, type) +Index: lib/cdt/dtmethod.c +=================================================================== +--- lib/cdt/dtmethod.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dtmethod.c 2013-09-03 12:13:14.998401326 +0200 +@@ -5,7 +5,7 @@ + ** Written by Kiem-Phong Vo (05/25/96) + */ + +-#if __STD_C ++#if __STDC__ + Dtmethod_t* dtmethod(Dt_t* dt, Dtmethod_t* meth) + #else + Dtmethod_t* dtmethod(dt, meth) +Index: lib/cdt/dtopen.c +=================================================================== +--- lib/cdt/dtopen.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dtopen.c 2013-09-03 12:13:17.886332023 +0200 +@@ -6,7 +6,7 @@ static char* Version = "\n@(#)$Id$\0 + ** Written by Kiem-Phong Vo (5/25/96) + */ + +-#if __STD_C ++#if __STDC__ + Dt_t* dtopen(Dtdisc_t* disc, Dtmethod_t* meth) + #else + Dt_t* dtopen(disc, meth) +Index: lib/cdt/dtrenew.c +=================================================================== +--- lib/cdt/dtrenew.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dtrenew.c 2013-09-03 12:13:23.117206500 +0200 +@@ -6,7 +6,7 @@ + ** Written by Kiem-Phong Vo (5/25/96) + */ + +-#if __STD_C ++#if __STDC__ + Void_t* dtrenew(Dt_t* dt, reg Void_t* obj) + #else + Void_t* dtrenew(dt, obj) +Index: lib/cdt/dtrestore.c +=================================================================== +--- lib/cdt/dtrestore.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dtrestore.c 2013-09-03 12:13:25.885140082 +0200 +@@ -7,7 +7,7 @@ + ** Written by Kiem-Phong Vo (5/25/96) + */ + +-#if __STD_C ++#if __STDC__ + int dtrestore(reg Dt_t* dt, reg Dtlink_t* list) + #else + int dtrestore(dt, list) +Index: lib/cdt/dtsize.c +=================================================================== +--- lib/cdt/dtsize.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dtsize.c 2013-09-03 12:11:57.558260351 +0200 +@@ -5,7 +5,7 @@ + ** Written by Kiem-Phong Vo (5/25/96) + */ + +-#if __STD_C ++#if __STDC__ + static int treecount(reg Dtlink_t* e) + #else + static int treecount(e) +@@ -14,7 +14,7 @@ reg Dtlink_t* e; + { return e ? treecount(e->left) + treecount(e->right) + 1 : 0; + } + +-#if __STD_C ++#if __STDC__ + int dtsize(Dt_t* dt) + #else + int dtsize(dt) +Index: lib/cdt/dtstat.c +=================================================================== +--- lib/cdt/dtstat.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dtstat.c 2013-09-03 12:11:54.262339501 +0200 +@@ -5,7 +5,7 @@ + ** Written by Kiem-Phong Vo (5/25/96) + */ + +-#if __STD_C ++#if __STDC__ + static void dttstat(Dtstat_t* ds, Dtlink_t* root, int depth, int* level) + #else + static void dttstat(ds,root,depth,level) +@@ -25,7 +25,7 @@ int* level; + level[depth] += 1; + } + +-#if __STD_C ++#if __STDC__ + static void dthstat(reg Dtdata_t* data, Dtstat_t* ds, reg int* count) + #else + static void dthstat(data, ds, count) +@@ -51,7 +51,7 @@ reg int* count; + } + } + +-#if __STD_C ++#if __STDC__ + int dtstat(reg Dt_t* dt, Dtstat_t* ds, int all) + #else + int dtstat(dt, ds, all) +Index: lib/cdt/dtstrhash.c +=================================================================== +--- lib/cdt/dtstrhash.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dtstrhash.c 2013-09-03 12:13:28.373080384 +0200 +@@ -13,7 +13,7 @@ + ** Written by Kiem-Phong Vo (02/28/03) + */ + +-#if __STD_C ++#if __STDC__ + uint dtstrhash(reg uint h, Void_t* args, reg int n) + #else + uint dtstrhash(h,args,n) +Index: lib/cdt/dttree.c +=================================================================== +--- lib/cdt/dttree.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dttree.c 2013-09-03 12:13:31.517004947 +0200 +@@ -8,7 +8,7 @@ + ** Written by Kiem-Phong Vo (5/25/96) + */ + +-#if __STD_C ++#if __STDC__ + static Void_t* dttree(Dt_t* dt, Void_t* obj, int type) + #else + static Void_t* dttree(dt,obj,type) +Index: lib/cdt/dttreeset.c +=================================================================== +--- lib/cdt/dttreeset.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dttreeset.c 2013-09-03 12:13:36.956874425 +0200 +@@ -5,7 +5,7 @@ + ** Written by Kiem-Phong Vo (09/17/2001) + */ + +-#if __STD_C ++#if __STDC__ + static Dtlink_t* treebalance(Dtlink_t* list, int size) + #else + static Dtlink_t* treebalance(list, size) +@@ -28,7 +28,7 @@ int size; + return mid; + } + +-#if __STD_C ++#if __STDC__ + int dttreeset(Dt_t* dt, int minp, int balance) + #else + int dttreeset(dt, minp, balance) +Index: lib/cdt/dtview.c +=================================================================== +--- lib/cdt/dtview.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dtview.c 2013-09-03 12:13:40.132798226 +0200 +@@ -6,7 +6,7 @@ + */ + + +-#if __STD_C ++#if __STDC__ + static Void_t* dtvsearch(Dt_t* dt, reg Void_t* obj, reg int type) + #else + static Void_t* dtvsearch(dt,obj,type) +@@ -93,7 +93,7 @@ reg int type; + } + } + +-#if __STD_C ++#if __STDC__ + Dt_t* dtview(reg Dt_t* dt, reg Dt_t* view) + #else + Dt_t* dtview(dt,view) +Index: lib/cdt/dtwalk.c +=================================================================== +--- lib/cdt/dtwalk.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dtwalk.c 2013-09-03 12:13:42.964730282 +0200 +@@ -6,7 +6,7 @@ + ** Written by Kiem-Phong Vo (5/25/96) + */ + +-#if __STD_C ++#if __STDC__ + int dtwalk(reg Dt_t* dt, int (*userf)(Dt_t*, Void_t*, Void_t*), Void_t* data) + #else + int dtwalk(dt,userf,data) diff --git a/graphviz.changes b/graphviz.changes index 431101e..cf3dd72 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,3 +1,59 @@ +------------------------------------------------------------------- +Tue Sep 3 13:55:25 CEST 2013 - pth@suse.de + +- Update to 2.32.0. Changes since 2.28.0: + 2.32.0: + - New version of xdot format, annotating gradient color schemes + - Support for reading pdf images using poppler + - Lefty/dotty/lneato now accept anonymous graphs + - Add star node shape + - Add two-tone (non-gradient) fill + 2.30.1: + - various build fixes + 2.30.0: + - Replaced libgraph with libcgraph; use of libgraph is now deprecated + - New ranking algorithm that allows multiple subgraph constraints + - Support edges using curved arcs. + - Added new shapes used by the synthetic biology community. + - For HTML-like labels, provide rounded cells, and dashed or dotted borders. + - Add lcurve and rcurve arrowheads. + - Add prototype pie chart and striped fills. + - Support insets in treemaps to make containment clear + - Add random rooted tree generation to gvgen + - Allow GVPRPATH to specify that the default path be prepended or + appended to it. + - Support arbitrary lists of layers; allow the user to specify arbitrary + layers for output. + - A collection of gvpr scripts, which were part of the source package, + are now installed in /share/graphviz/gvpr, and the that path + is used as part of th default built-in path for gvpr. + - Update libexpr to reflect Glenn Fowler's changes including scopes for + variables. + - Add next graph variable to gvpr + - Modify dot and fdp so that a cluster's margin attribute will affect + the space between the bounding box and nodes + - Modify the dijkstra tool to use only directed edges + - Output numbers without quotes if quotes are not needed on input + - Support gradient fill + - Provide support for webp images + - Fix tapered edges to use the dir attribute and arrowhead + - Add imagepath attribute + - Add help functionality to Graphviz.app + - Add ,, to html strings via svg + - Add tapered edges + - Add support for external labels + - Add initial implementation of graphml2gv + - Add basic horizontal and vertical rules to html tables + +- Remove graphviz-gd_png_check_sig.patch as the file to patch doesn't + exist anymore. +- Add graphviz-buffer_overflow.patch to fix a buffer ovderflow in + lib/common/shapes.c(round_corners). +- Add graphviz-proper_prototypes.patch that changes the conditional + from __STD_C to the standard conforming __STDC__ to get proper + prototypes. +- Run autoreconf to use -fno-strict-aliasing for libvmalloc sources + ------------------------------------------------------------------- Thu Mar 28 11:51:09 CET 2013 - pth@suse.de diff --git a/graphviz.spec b/graphviz.spec index 6646e82..3375056 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -20,7 +20,7 @@ %define config_file config6 Name: graphviz -Version: 2.28.0 +Version: 2.32.0 Release: 0 Summary: Graph Visualization Tools License: IPL-1.0 @@ -28,20 +28,25 @@ Group: Productivity/Graphics/Visualization/Graph Url: http://www.graphviz.org/ Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz Source2: graphviz-rpmlintrc -Patch1: graphviz-gd_png_check_sig.patch Patch2: graphviz-fix-pkgIndex.patch Patch3: graphviz-missing_headers.patch Patch4: graphviz-aarch64_lib64_support.patch Patch5: graphviz-type_punning.patch +Patch6: graphviz-buffer_overflow.patch +Patch7: graphviz-proper_prototypes.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: bison BuildRequires: fdupes BuildRequires: flex +BuildRequires: freeglut-devel BuildRequires: freetype2-devel >= 2 BuildRequires: gcc-c++ BuildRequires: libXaw-devel BuildRequires: libexpat-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel +BuildRequires: libqt4-devel BuildRequires: libstdc++-devel BuildRequires: libtool BuildRequires: zlib-devel @@ -87,16 +92,18 @@ Note: If you need output in png format you also need to install %prep %setup -q -%patch1 %patch2 %patch3 -p1 %patch4 %patch5 +%patch6 +%patch7 # Fix path in generated man pages sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl %build +autoreconf -fi WARN_FLAGS="-W -Wall -Wno-unused-parameter -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith" CFLAGS="%{optflags} $WARN_FLAGS" %ifarch %ix86 x86_64 @@ -164,7 +171,7 @@ rm -f %{_libdir}/graphviz/libgvplugin_gtk* %post /sbin/ldconfig -# run "dot -c" to generate plugin config %{_libdir}/graphviz/config +# run "dot -c" to generate plugin config %%{_libdir}/graphviz/config dot -c test -s %{_libdir}/graphviz/%{config_file} || echo "%{_libdir}/graphviz/%{config_file} doesn't exist! Check installation." @@ -179,6 +186,40 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li %dir %{_datadir}/%{name} %{_datadir}/%{name}/lefty %{_datadir}/%{name}/graphs +%dir %{_datadir}/%{name}/gvpr +%{_datadir}/%{name}/gvpr/addranks +%{_datadir}/%{name}/gvpr/addrings +%{_datadir}/%{name}/gvpr/anon +%{_datadir}/%{name}/gvpr/attr +%{_datadir}/%{name}/gvpr/bb +%{_datadir}/%{name}/gvpr/bbox +%{_datadir}/%{name}/gvpr/cliptree +%{_datadir}/%{name}/gvpr/col +%{_datadir}/%{name}/gvpr/collapse +%{_datadir}/%{name}/gvpr/color +%{_datadir}/%{name}/gvpr/dechain +%{_datadir}/%{name}/gvpr/deghist +%{_datadir}/%{name}/gvpr/deledges +%{_datadir}/%{name}/gvpr/delmulti +%{_datadir}/%{name}/gvpr/delnodes +%{_datadir}/%{name}/gvpr/depath +%{_datadir}/%{name}/gvpr/dijkstra +%{_datadir}/%{name}/gvpr/flatten +%{_datadir}/%{name}/gvpr/get-layers-list +%{_datadir}/%{name}/gvpr/group +%{_datadir}/%{name}/gvpr/indent +%{_datadir}/%{name}/gvpr/knbhd +%{_datadir}/%{name}/gvpr/maxdeg +%{_datadir}/%{name}/gvpr/path +%{_datadir}/%{name}/gvpr/rotate +%{_datadir}/%{name}/gvpr/scale +%{_datadir}/%{name}/gvpr/scalexy +%{_datadir}/%{name}/gvpr/span +%{_datadir}/%{name}/gvpr/topon +%{_datadir}/%{name}/gvpr/treetoclust +%dir %{_datadir}/%{name}/gvedit +%{_datadir}/%{name}/gvedit/attrs.txt + %doc %{_mandir}/man1/*.1* %doc %{_mandir}/man7/*.7* %dir %{_libdir}/%{name} From da0ecc79a37da9715f8ba74f5a916068f3943bf18a2de31ab9065dcb7eccd8a9 Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Thu, 5 Sep 2013 17:54:08 +0000 Subject: [PATCH 02/19] lib/common/shapes.c(round_corners) by increasing the number of elements in the array. - Add graphviz-proper_prototypes.patch that changes dthdr.h to include ast_common.h to get __STD_C defined, which in turn enables proper prototypes. - Remove graphviz-2.18-do_not_use_ocamlopt.patch as it's not needed anymore. - Adapt graphviz-guile.patch, graphviz-plugins-fix_install_dirs.patch and graphviz-python_version.patch to the new sources. - Add graphviz-java_in_lib64.patch to search in /usr/lib64/jvm for the java headers on platforms using lib64. - Add graphviz-proper_use_of_qw.patch to put the use of qw in config/config_perl.pl in brackets. - Add graphviz-useless_warnings.patch to make gcc not warn about harmless issues that arise from code generated by swig. - Add patch tags in the spec files - Upstreamed all patches that aren't SUSE specific. lib/common/shapes.c(round_corners) by increasing the number of elements in the array. - Add graphviz-proper_prototypes.patch that changes dthdr.h to include ast_common.h to get __STD_C defined, which in turn enables proper prototypes. - Add patch tags in the spec files - Upstreamed all patches that aren't SUSE specific. OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=60 --- graphviz-2.18-do_not_use_ocamlopt.patch | 29 --- graphviz-buffer_overflow.patch | 20 +- graphviz-guile.patch | 77 ++---- graphviz-java_in_lib64.patch | 23 ++ graphviz-plugins-fix_install_dirs.patch | 54 ++-- graphviz-plugins.changes | 23 +- graphviz-plugins.spec | 45 +++- graphviz-proper_prototypes.patch | 317 +----------------------- graphviz-proper_use_of_qw.patch | 17 ++ graphviz-python_version.patch | 32 +-- graphviz-type_punning.patch | 19 +- graphviz-useless_warnings.patch | 17 ++ graphviz.changes | 11 +- graphviz.spec | 10 + 14 files changed, 226 insertions(+), 468 deletions(-) delete mode 100644 graphviz-2.18-do_not_use_ocamlopt.patch create mode 100644 graphviz-java_in_lib64.patch create mode 100644 graphviz-proper_use_of_qw.patch create mode 100644 graphviz-useless_warnings.patch diff --git a/graphviz-2.18-do_not_use_ocamlopt.patch b/graphviz-2.18-do_not_use_ocamlopt.patch deleted file mode 100644 index 76f96c2..0000000 --- a/graphviz-2.18-do_not_use_ocamlopt.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: tclpkg/gv/Makefile.am -=================================================================== ---- tclpkg/gv/Makefile.am.orig 2012-06-11 16:26:00.110677422 +0200 -+++ tclpkg/gv/Makefile.am 2012-06-11 16:29:39.727382908 +0200 -@@ -100,9 +100,9 @@ gv_lua.cpp: gv.i - - pkgocamldir = $(pkglibdir)/ocaml - OCAML_data = gv.cmo gv.cma gv.cmi gv.mli META.gv --if WITH_OCAMLOPT --OCAML_data += gv.a gv.cmx gv.cmxa --endif -+#if WITH_OCAMLOPT -+#OCAML_data += gv.a gv.cmx gv.cmxa -+#endif - nodist_libgv_ocaml_la_SOURCES = gv_ocaml.cpp $(OCAML_data) - libgv_ocaml_la_SOURCES = $(BASESOURCES) gv_dummy_init.c - libgv_ocaml_la_LIBADD = $(BASELIBS) $(OCAML_LIBS) -Index: tclpkg/gv/Makefile.in -=================================================================== ---- tclpkg/gv/Makefile.in.orig 2012-06-11 16:26:00.000000000 +0200 -+++ tclpkg/gv/Makefile.in 2012-06-11 16:30:07.711071262 +0200 -@@ -38,7 +38,6 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - @WITH_CGRAPH_TRUE@am__append_1 = -DWITH_CGRAPH --@WITH_OCAMLOPT_TRUE@am__append_2 = gv.a gv.cmx gv.cmxa - @WITH_SHARP_TRUE@@WITH_SWIG_TRUE@am__append_3 = gv.3sharp - @WITH_SHARP_TRUE@@WITH_SWIG_TRUE@am__append_4 = gv.3sharp.pdf - @WITH_SHARP_TRUE@@WITH_SWIG_TRUE@am__append_5 = test_sharp diff --git a/graphviz-buffer_overflow.patch b/graphviz-buffer_overflow.patch index 88d07a2..4364a7f 100644 --- a/graphviz-buffer_overflow.patch +++ b/graphviz-buffer_overflow.patch @@ -13,13 +13,13 @@ so C[4] is a clear off-by-one. Index: lib/common/shapes.c =================================================================== --- lib/common/shapes.c.orig 2013-08-01 19:35:15.000000000 +0200 -+++ lib/common/shapes.c 2013-09-02 18:15:48.640408565 +0200 -@@ -1364,7 +1364,7 @@ void round_corners(GVJ_t * job, pointf * - C[2].y = C[1].y; - C[3].x = C[2].x; - C[3].y = C[0].y; -- C[4] = C[0]; -+// C[4] = C[0]; - gvrender_polyline(job, C, 5); - - /*dsDNA line right half*/ ++++ lib/common/shapes.c 2013-09-04 14:12:21.899122174 +0200 +@@ -495,7 +495,7 @@ static void Mcircle_hack(GVJ_t * job, no + */ + void round_corners(GVJ_t * job, pointf * AF, int sides, int style, int filled) + { +- pointf *B, C[4], *D, p0, p1; ++ pointf *B, C[5], *D, p0, p1; + double rbconst, d, dx, dy, t; + int i, seg, mode, shape; + pointf* pts; diff --git a/graphviz-guile.patch b/graphviz-guile.patch index 7c6893c..94fc1f4 100644 --- a/graphviz-guile.patch +++ b/graphviz-guile.patch @@ -1,65 +1,28 @@ -Index: graphviz-2.28.0/configure.ac +--- + configure.ac | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +Index: configure.ac =================================================================== ---- graphviz-2.28.0.orig/configure.ac 2012-06-11 16:27:06.331573194 +0200 -+++ graphviz-2.28.0/configure.ac 2012-06-11 16:28:11.651511310 +0200 -@@ -676,7 +676,7 @@ else - if test "x$GUILE" = "x"; then - use_guile="No (guile not available)" - else -- GUILE_VERSION=`$GUILE --version | head -1 | cut -d ' ' -f 2` -+ GUILE_VERSION=$($GUILE --version | head -1 | sed -e 's/.* \([[0-9.]*]\)$/\1/') - GUILE_VERSION_MAJOR=`echo $GUILE_VERSION | cut -d '.' -f 1` - GUILE_VERSION_MINOR=`echo $GUILE_VERSION | cut -d '.' -f 2` - if test $GUILE_VERSION_MAJOR -lt 2; then -@@ -691,12 +691,15 @@ else - if test "x$GUILE" = "x"; then +--- configure.ac.orig 2013-09-05 18:53:19.358820405 +0200 ++++ configure.ac 2013-09-05 18:55:36.109623495 +0200 +@@ -706,8 +706,8 @@ else + if test "x$GUILE" == "x"; then use_guile="No (guile is too old)" else - GUILE_INCLUDES= - GUILE_LIBS= + GUILE_INCLUDES=$(guile-config compile) + GUILE_LIBS=$(guile-config link) -+ save_CPPFLAGS="$CPPFLAGS"; -+ CPPFLAGS="$CPPFLAGS $GUILE_INCLUDES"; + # don't die if PKG_CHECK_MODULES not available - el4, el5 + PKG_CHECK_MODULES([GUILE], + [guile-2.0 >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"], +@@ -718,8 +718,6 @@ else + GUILE_INCLUDES="$GUILE_CFLAGS", + false) + ]) +- ac_save_CFLAGS="$CFLAGS" +- ac_save_CPPFLAGS="$CPPFLAGS" + CFLAGS="$CFLAGS $GUILE_INCLUDES" + CPPFLAGS="$CPPFLAGS $GUILE_INCLUDES" AC_CHECK_HEADER(libguile.h,,[ - use_guile="No (guile header missing)" - GUILE= - ]) -+ CPPFLAGS="$save_CPPFLAGS"; - if test "x$GUILE" != "x"; then - use_guile="Yes" - AC_SUBST(GUILE_INCLUDES) -Index: graphviz-2.28.0/configure -=================================================================== ---- graphviz-2.28.0.orig/configure 2012-06-11 16:27:26.000000000 +0200 -+++ graphviz-2.28.0/configure 2012-06-11 16:29:17.500424846 +0200 -@@ -20066,7 +20066,7 @@ fi - if test "x$GUILE" = "x"; then - use_guile="No (guile not available)" - else -- GUILE_VERSION=`$GUILE --version | head -1 | cut -d ' ' -f 2` -+ GUILE_VERSION=$($GUILE --version | head -1 | sed -e 's/.* \([[0-9.]*]\)$/\1/') - GUILE_VERSION_MAJOR=`echo $GUILE_VERSION | cut -d '.' -f 1` - GUILE_VERSION_MINOR=`echo $GUILE_VERSION | cut -d '.' -f 2` - if test $GUILE_VERSION_MAJOR -lt 2; then -@@ -20081,8 +20081,10 @@ fi - if test "x$GUILE" = "x"; then - use_guile="No (guile is too old)" - else -- GUILE_INCLUDES= -- GUILE_LIBS= -+ GUILE_INCLUDES=$(guile-config compile) -+ GUILE_LIBS=$(guile-config link) -+ save_CPPFLAGS="$CPPFLAGS"; -+ CPPFLAGS="$CPPFLAGS $GUILE_INCLUDES"; - ac_fn_c_check_header_mongrel "$LINENO" "libguile.h" "ac_cv_header_libguile_h" "$ac_includes_default" - if test "x$ac_cv_header_libguile_h" = x""yes; then : - -@@ -20092,6 +20094,7 @@ else - GUILE= - - fi -+ CPPFLAGS="$save_CPPFLAGS"; - - - if test "x$GUILE" != "x"; then diff --git a/graphviz-java_in_lib64.patch b/graphviz-java_in_lib64.patch new file mode 100644 index 0000000..cdfec6a --- /dev/null +++ b/graphviz-java_in_lib64.patch @@ -0,0 +1,23 @@ +--- + configure.ac | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +Index: configure.ac +=================================================================== +--- configure.ac.orig 2013-09-03 18:32:36.438493137 +0200 ++++ configure.ac 2013-09-04 12:24:08.990497310 +0200 +@@ -795,10 +795,10 @@ else + else + for try_java_include in \ + /System/Library/Frameworks/JavaVM.framework/Headers \ +- /usr/lib/jvm/java/include \ +- /usr/lib/jvm/java/include/linux \ +- /usr/lib/jvm/default-java/include \ +- /usr/lib/jvm/default-java/include/linux \ ++ /usr/lib${LIBPOSTFIX}/jvm/java/include \ ++ /usr/lib${LIBPOSTFIX}/jvm/java/include/linux \ ++ /usr/lib${LIBPOSTFIX}/jvm/default-java/include \ ++ /usr/lib${LIBPOSTFIX}/jvm/default-java/include/linux \ + /etc/java-config-2/current-system-vm/include \ + /etc/java-config-2/current-system-vm/include/linux \ + /etc/java-config-2/current-system-vm/include/freebsd diff --git a/graphviz-plugins-fix_install_dirs.patch b/graphviz-plugins-fix_install_dirs.patch index bf0cfdd..7102035 100644 --- a/graphviz-plugins-fix_install_dirs.patch +++ b/graphviz-plugins-fix_install_dirs.patch @@ -1,32 +1,13 @@ -Index: configure.ac -=================================================================== ---- configure.ac.orig 2012-06-11 16:25:59.960684453 +0200 -+++ configure.ac 2012-06-11 16:26:07.060351640 +0200 -@@ -1055,8 +1055,8 @@ else - else - PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM" - fi -- PHP_INSTALL_DIR="/usr/lib${LIBPOSTFIX}/php/modules" -- PHP_INSTALL_DATADIR="/usr/share/php" -+ PHP_INSTALL_DIR="/usr/lib${LIBPOSTFIX}/php5/extensions" -+ PHP_INSTALL_DATADIR="/usr/share/php5" - PHP_LIBS= - save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $PHP_INCLUDES" -@@ -1597,7 +1597,7 @@ if test "x$use_tcl" = "x"; then - AC_MSG_WARN([Unable to find tclConfig.sh. The Tcl packages will not be built]) - use_tcl="No (missing tclConfig.sh)" - fi -- TCL_INSTALL_DIR="${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tcl${TCL_VERSION_FOUND}" -+ TCL_INSTALL_DIR="${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}" - fi - - if test "x$use_tcl" = "x"; then +--- + configure | 6 +++--- + configure.ac | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + Index: configure =================================================================== ---- configure.orig 2012-06-11 16:25:59.000000000 +0200 -+++ configure 2012-06-11 16:27:00.874828987 +0200 -@@ -21022,8 +21022,8 @@ fi +--- configure.orig 2013-08-01 19:39:03.000000000 +0200 ++++ configure 2013-09-03 18:16:16.259887587 +0200 +@@ -22152,8 +22152,8 @@ done else PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM" fi @@ -37,7 +18,7 @@ Index: configure PHP_LIBS= save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $PHP_INCLUDES" -@@ -22032,7 +22032,7 @@ $as_echo "using $TCLCONFIG" >&6; } +@@ -23704,7 +23704,7 @@ $as_echo "using $TCLCONFIG" >&6; } $as_echo "$as_me: WARNING: Unable to find tclConfig.sh. The Tcl packages will not be built" >&2;} use_tcl="No (missing tclConfig.sh)" fi @@ -45,4 +26,19 @@ Index: configure + TCL_INSTALL_DIR="${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}" fi - if test "x$use_tcl" = "x"; then + if test "x$use_tcl" == "x"; then +Index: configure.ac +=================================================================== +--- configure.ac.orig 2013-09-03 18:11:59.386022594 +0200 ++++ configure.ac 2013-09-03 18:11:59.427021615 +0200 +@@ -1091,8 +1091,8 @@ else + else + PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM" + fi +- PHP_INSTALL_DIR="/usr/lib${LIBPOSTFIX}/php/modules" +- PHP_INSTALL_DATADIR="/usr/share/php" ++ PHP_INSTALL_DIR="/usr/lib${LIBPOSTFIX}/php5/extensions" ++ PHP_INSTALL_DATADIR="/usr/share/php5" + PHP_LIBS= + save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $PHP_INCLUDES" diff --git a/graphviz-plugins.changes b/graphviz-plugins.changes index e5597a1..48079d6 100644 --- a/graphviz-plugins.changes +++ b/graphviz-plugins.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Tue Sep 3 13:55:25 CEST 2013 - pth@suse.de +Thu Sep 5 15:46:47 CEST 2013 - pth@suse.de - Update to 2.32.0. Changes since 2.28.0: 2.32.0: @@ -48,11 +48,24 @@ Tue Sep 3 13:55:25 CEST 2013 - pth@suse.de - Remove graphviz-gd_png_check_sig.patch as the file to patch doesn't exist anymore. - Add graphviz-buffer_overflow.patch to fix a buffer ovderflow in - lib/common/shapes.c(round_corners). -- Add graphviz-proper_prototypes.patch that changes the conditional - from __STD_C to the standard conforming __STDC__ to get proper - prototypes. + lib/common/shapes.c(round_corners) by increasing the number of + elements in the array. +- Add graphviz-proper_prototypes.patch that changes dthdr.h to + include ast_common.h to get __STD_C defined, which in turn + enables proper prototypes. - Run autoreconf to use -fno-strict-aliasing for libvmalloc sources +- Remove graphviz-2.18-do_not_use_ocamlopt.patch as it's not needed + anymore. +- Adapt graphviz-guile.patch, graphviz-plugins-fix_install_dirs.patch + and graphviz-python_version.patch to the new sources. +- Add graphviz-java_in_lib64.patch to search in /usr/lib64/jvm for + the java headers on platforms using lib64. +- Add graphviz-proper_use_of_qw.patch to put the use of qw in + config/config_perl.pl in brackets. +- Add graphviz-useless_warnings.patch to make gcc not warn about + harmless issues that arise from code generated by swig. +- Add patch tags in the spec files +- Upstreamed all patches that aren't SUSE specific. ------------------------------------------------------------------- Fri May 31 08:08:44 UTC 2013 - mhrusecky@suse.com diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec index 7e344d2..027b062 100644 --- a/graphviz-plugins.spec +++ b/graphviz-plugins.spec @@ -54,8 +54,9 @@ BuildRequires: gtkglext-devel %endif %endif %if %{with graphviz_java} -BuildRequires: gcc-java -BuildRequires: libgcj-devel +#BuildRequires: gcc-java +#BuildRequires: libgcj-devel +BuildRequires: java-1_7_0-openjdk-devel %endif %if %{with mono} BuildRequires: mono-core @@ -94,17 +95,39 @@ License: IPL-1.0 Group: Productivity/Graphics/Visualization/Graph Url: http://www.graphviz.org/ Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version}.tar.gz +#Patches up to 99 are for graphviz and graphviz-plugins +#PATCH-FIX-UPSTREAM Get the right header included to get proper prototypes +# Accepted upstream -> remove for next update +Patch3: graphviz-missing_headers.patch +#PATCH-FIX-UPSTREAM Add aarch64 to the archs that use lib64 +# Accepted upstream -> remove for next update Patch4: graphviz-aarch64_lib64_support.patch +#PATCH-FIX-UPSTREAM Add aarch64 to the archs that use lib64 Patch5: graphviz-type_punning.patch +#PATCH-FIX-UPSTREAM Increase array to the need size. +# Accepted upstream -> remove for next update Patch6: graphviz-buffer_overflow.patch +#PATCH-FIX-UPSTREAM Include ast_common.h to get __STD_C defined +# This is the patch as used upstream -> remove for next update Patch7: graphviz-proper_prototypes.patch +#Patches from 100 up are for graphviz-plugin only Patch100: graphviz-plugins-fix_install_dirs.patch +#PATCH-FIX-UPSTREAM Use python to get the version. +# Accepted upstream -> remove for next update Patch101: graphviz-python_version.patch Patch102: graphviz-plugins-tcl_install_dir.patch Patch103: graphviz-2.20.2-interpreter_names.patch +#PATCH-FIX-UPSTREAM Use guile-config to get libs and includes +# Accepted upstream -> remove for next update Patch104: graphviz-guile.patch -Patch105: graphviz-2.18-do_not_use_ocamlopt.patch Patch106: graphviz-fix-pkgIndex.patch +#PATCH-FIX-UPSTREAM also search in /usr/lib64 for Java headers +Patch107: graphviz-java_in_lib64.patch +#PATCH-FIX-UPSTREAM Don't warn about harmless issues with swig generated code +Patch108: graphviz-useless_warnings.patch +#PATCH-FIX-UPSTREAM qw must be put in brackets in recent perl versions +# Upstream also did this change -> remove for next update +Patch109: graphviz-proper_use_of_qw.patch Requires(pre): coreutils BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -196,6 +219,8 @@ Requires: graphviz = %{version} Requires: perl = %{perl_version} Provides: graphviz_plugin = %{version} +%perl_requires + %description -n graphviz-perl The graphviz-perl package contains the Perl extension for the graphviz tools. @@ -267,17 +292,21 @@ Provides some additional PDF and HTML documentation for graphviz. %prep %setup -q -n %{mname}-%{version} +%patch3 -p1 %patch4 %patch5 %patch6 %patch7 +# %patch100 %patch101 %patch102 %patch103 -%patch104 -p1 -%patch105 +%patch104 %patch106 +%patch107 +%patch108 +%patch109 # Fix path in generated man pages sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl @@ -341,6 +370,8 @@ rm -f %{buildroot}%{_mandir}/man3/*.3.gz rm -f %{buildroot}%{_mandir}/man3/*.3 rm -f %{buildroot}%{_mandir}/man7/*.7 rm -f %{buildroot}%{_mandir}/man7/*.7.gz +rm -rf %{buildroot}%{_datadir}/%{mname}/gvpr +rm -rf %{buildroot}%{_datadir}/%{mname}/gvedit for lib in libgdtclft* libgv_tcl.so libtcldot* libtclplan* libtkspline*; do mv %{buildroot}%{_libdir}/%{mname}/tcl/${lib} %{buildroot}%{_libdir} done @@ -385,6 +416,7 @@ rm -rf %{buildroot}/%{_libdir}/%{mname}/%{_lib} %files -n graphviz-java %defattr(-,root,root,-) %{_libdir}/graphviz/java +%{_mandir}/man3/gv.3java.gz %endif %if %{with mono} @@ -440,13 +472,14 @@ rm -rf %{buildroot}/%{_libdir}/%{mname}/%{_lib} %files -n graphviz-ruby %defattr(-,root,root,-) %{_libdir}/graphviz/ruby -%{rb_sitedir}/*-%{_os}/gv.so +%{rb_vendordir}/*-%{_os}/gv.so %doc %{_mandir}/man3/gv.3ruby.gz %{_datadir}/%{mname}/demo/modgraph.rb %files -n graphviz-tcl %defattr(-,root,root) %dir %{_datadir}/tcl/%{mname} +%{_libdir}/tcl8.6 %{_libdir}/libgdtclft* %{_libdir}/libgv_tcl.so %{_libdir}/libtcldot* diff --git a/graphviz-proper_prototypes.patch b/graphviz-proper_prototypes.patch index bf4c082..a2a8fc9 100644 --- a/graphviz-proper_prototypes.patch +++ b/graphviz-proper_prototypes.patch @@ -1,310 +1,17 @@ -From: Philipp Thomas -Date: 2013-09-03 12:15:17+02:00 -Subject: Fix ifdef to get proper prototypes -References: -Upstream: - --- - lib/cdt/dtclose.c | 2 +- - lib/cdt/dtdisc.c | 4 ++-- - lib/cdt/dtextract.c | 2 +- - lib/cdt/dtflatten.c | 2 +- - lib/cdt/dthash.c | 4 ++-- - lib/cdt/dtlist.c | 2 +- - lib/cdt/dtmethod.c | 2 +- - lib/cdt/dtopen.c | 2 +- - lib/cdt/dtrenew.c | 2 +- - lib/cdt/dtrestore.c | 2 +- - lib/cdt/dtsize.c | 4 ++-- - lib/cdt/dtstat.c | 6 +++--- - lib/cdt/dtstrhash.c | 2 +- - lib/cdt/dttree.c | 2 +- - lib/cdt/dttreeset.c | 4 ++-- - lib/cdt/dtview.c | 4 ++-- - lib/cdt/dtwalk.c | 2 +- - 17 files changed, 24 insertions(+), 24 deletions(-) + lib/cdt/dthdr.h | 2 ++ + 1 file changed, 2 insertions(+) -Index: lib/cdt/dtclose.c +Index: lib/cdt/dthdr.h =================================================================== ---- lib/cdt/dtclose.c.orig 2013-08-01 19:35:15.000000000 +0200 -+++ lib/cdt/dtclose.c 2013-09-03 12:13:04.701648435 +0200 -@@ -4,7 +4,7 @@ - ** - ** Written by Kiem-Phong Vo (05/25/96) - */ --#if __STD_C -+#if __STDC__ - int dtclose(reg Dt_t* dt) - #else - int dtclose(dt) -Index: lib/cdt/dtdisc.c -=================================================================== ---- lib/cdt/dtdisc.c.orig 2013-08-01 19:35:15.000000000 +0200 -+++ lib/cdt/dtdisc.c 2013-09-03 12:11:34.206821178 +0200 -@@ -7,7 +7,7 @@ - ** Written by Kiem-Phong Vo (5/26/96) - */ +--- lib/cdt/dthdr.h.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dthdr.h 2013-09-05 17:48:19.736968083 +0200 +@@ -10,6 +10,8 @@ --#if __STD_C -+#if __STDC__ - static Void_t* dtmemory(Dt_t* dt,Void_t* addr,size_t size,Dtdisc_t* disc) - #else - static Void_t* dtmemory(dt, addr, size, disc) -@@ -27,7 +27,7 @@ Dtdisc_t* disc; /* discipline */ - else return size > 0 ? malloc(size) : NIL(Void_t*); - } + #if _PACKAGE_ast + #include ++#else ++#include + #endif --#if __STD_C -+#if __STDC__ - Dtdisc_t* dtdisc(Dt_t* dt, Dtdisc_t* disc, int type) - #else - Dtdisc_t* dtdisc(dt,disc,type) -Index: lib/cdt/dtextract.c -=================================================================== ---- lib/cdt/dtextract.c.orig 2013-08-01 19:35:15.000000000 +0200 -+++ lib/cdt/dtextract.c 2013-09-03 12:13:07.405583542 +0200 -@@ -5,7 +5,7 @@ - ** Written by Kiem-Phong Vo (5/25/96). - */ - --#if __STD_C -+#if __STDC__ - Dtlink_t* dtextract(reg Dt_t* dt) - #else - Dtlink_t* dtextract(dt) -Index: lib/cdt/dtflatten.c -=================================================================== ---- lib/cdt/dtflatten.c.orig 2013-08-01 19:35:15.000000000 +0200 -+++ lib/cdt/dtflatten.c 2013-09-03 12:13:11.838477158 +0200 -@@ -6,7 +6,7 @@ - ** Written by Kiem-Phong Vo (5/25/96). - */ - --#if __STD_C -+#if __STDC__ - Dtlink_t* dtflatten(Dt_t* dt) - #else - Dtlink_t* dtflatten(dt) -Index: lib/cdt/dthash.c -=================================================================== ---- lib/cdt/dthash.c.orig 2013-08-01 19:35:15.000000000 +0200 -+++ lib/cdt/dthash.c 2013-09-03 12:12:01.702160840 +0200 -@@ -9,7 +9,7 @@ - */ - - /* resize the hash table */ --#if __STD_C -+#if __STDC__ - static void dthtab(Dt_t* dt) - #else - static void dthtab(dt) -@@ -75,7 +75,7 @@ Dt_t* dt; - } - } - --#if __STD_C -+#if __STDC__ - static Void_t* dthash(Dt_t* dt, reg Void_t* obj, int type) - #else - static Void_t* dthash(dt,obj,type) -Index: lib/cdt/dtlist.c -=================================================================== ---- lib/cdt/dtlist.c.orig 2013-08-01 19:35:15.000000000 +0200 -+++ lib/cdt/dtlist.c 2013-09-03 12:11:48.959466853 +0200 -@@ -5,7 +5,7 @@ - ** Written by Kiem-Phong Vo (05/25/96) - */ - --#if __STD_C -+#if __STDC__ - static Void_t* dtlist(reg Dt_t* dt, reg Void_t* obj, reg int type) - #else - static Void_t* dtlist(dt, obj, type) -Index: lib/cdt/dtmethod.c -=================================================================== ---- lib/cdt/dtmethod.c.orig 2013-08-01 19:35:15.000000000 +0200 -+++ lib/cdt/dtmethod.c 2013-09-03 12:13:14.998401326 +0200 -@@ -5,7 +5,7 @@ - ** Written by Kiem-Phong Vo (05/25/96) - */ - --#if __STD_C -+#if __STDC__ - Dtmethod_t* dtmethod(Dt_t* dt, Dtmethod_t* meth) - #else - Dtmethod_t* dtmethod(dt, meth) -Index: lib/cdt/dtopen.c -=================================================================== ---- lib/cdt/dtopen.c.orig 2013-08-01 19:35:15.000000000 +0200 -+++ lib/cdt/dtopen.c 2013-09-03 12:13:17.886332023 +0200 -@@ -6,7 +6,7 @@ static char* Version = "\n@(#)$Id$\0 - ** Written by Kiem-Phong Vo (5/25/96) - */ - --#if __STD_C -+#if __STDC__ - Dt_t* dtopen(Dtdisc_t* disc, Dtmethod_t* meth) - #else - Dt_t* dtopen(disc, meth) -Index: lib/cdt/dtrenew.c -=================================================================== ---- lib/cdt/dtrenew.c.orig 2013-08-01 19:35:15.000000000 +0200 -+++ lib/cdt/dtrenew.c 2013-09-03 12:13:23.117206500 +0200 -@@ -6,7 +6,7 @@ - ** Written by Kiem-Phong Vo (5/25/96) - */ - --#if __STD_C -+#if __STDC__ - Void_t* dtrenew(Dt_t* dt, reg Void_t* obj) - #else - Void_t* dtrenew(dt, obj) -Index: lib/cdt/dtrestore.c -=================================================================== ---- lib/cdt/dtrestore.c.orig 2013-08-01 19:35:15.000000000 +0200 -+++ lib/cdt/dtrestore.c 2013-09-03 12:13:25.885140082 +0200 -@@ -7,7 +7,7 @@ - ** Written by Kiem-Phong Vo (5/25/96) - */ - --#if __STD_C -+#if __STDC__ - int dtrestore(reg Dt_t* dt, reg Dtlink_t* list) - #else - int dtrestore(dt, list) -Index: lib/cdt/dtsize.c -=================================================================== ---- lib/cdt/dtsize.c.orig 2013-08-01 19:35:15.000000000 +0200 -+++ lib/cdt/dtsize.c 2013-09-03 12:11:57.558260351 +0200 -@@ -5,7 +5,7 @@ - ** Written by Kiem-Phong Vo (5/25/96) - */ - --#if __STD_C -+#if __STDC__ - static int treecount(reg Dtlink_t* e) - #else - static int treecount(e) -@@ -14,7 +14,7 @@ reg Dtlink_t* e; - { return e ? treecount(e->left) + treecount(e->right) + 1 : 0; - } - --#if __STD_C -+#if __STDC__ - int dtsize(Dt_t* dt) - #else - int dtsize(dt) -Index: lib/cdt/dtstat.c -=================================================================== ---- lib/cdt/dtstat.c.orig 2013-08-01 19:35:15.000000000 +0200 -+++ lib/cdt/dtstat.c 2013-09-03 12:11:54.262339501 +0200 -@@ -5,7 +5,7 @@ - ** Written by Kiem-Phong Vo (5/25/96) - */ - --#if __STD_C -+#if __STDC__ - static void dttstat(Dtstat_t* ds, Dtlink_t* root, int depth, int* level) - #else - static void dttstat(ds,root,depth,level) -@@ -25,7 +25,7 @@ int* level; - level[depth] += 1; - } - --#if __STD_C -+#if __STDC__ - static void dthstat(reg Dtdata_t* data, Dtstat_t* ds, reg int* count) - #else - static void dthstat(data, ds, count) -@@ -51,7 +51,7 @@ reg int* count; - } - } - --#if __STD_C -+#if __STDC__ - int dtstat(reg Dt_t* dt, Dtstat_t* ds, int all) - #else - int dtstat(dt, ds, all) -Index: lib/cdt/dtstrhash.c -=================================================================== ---- lib/cdt/dtstrhash.c.orig 2013-08-01 19:35:15.000000000 +0200 -+++ lib/cdt/dtstrhash.c 2013-09-03 12:13:28.373080384 +0200 -@@ -13,7 +13,7 @@ - ** Written by Kiem-Phong Vo (02/28/03) - */ - --#if __STD_C -+#if __STDC__ - uint dtstrhash(reg uint h, Void_t* args, reg int n) - #else - uint dtstrhash(h,args,n) -Index: lib/cdt/dttree.c -=================================================================== ---- lib/cdt/dttree.c.orig 2013-08-01 19:35:15.000000000 +0200 -+++ lib/cdt/dttree.c 2013-09-03 12:13:31.517004947 +0200 -@@ -8,7 +8,7 @@ - ** Written by Kiem-Phong Vo (5/25/96) - */ - --#if __STD_C -+#if __STDC__ - static Void_t* dttree(Dt_t* dt, Void_t* obj, int type) - #else - static Void_t* dttree(dt,obj,type) -Index: lib/cdt/dttreeset.c -=================================================================== ---- lib/cdt/dttreeset.c.orig 2013-08-01 19:35:15.000000000 +0200 -+++ lib/cdt/dttreeset.c 2013-09-03 12:13:36.956874425 +0200 -@@ -5,7 +5,7 @@ - ** Written by Kiem-Phong Vo (09/17/2001) - */ - --#if __STD_C -+#if __STDC__ - static Dtlink_t* treebalance(Dtlink_t* list, int size) - #else - static Dtlink_t* treebalance(list, size) -@@ -28,7 +28,7 @@ int size; - return mid; - } - --#if __STD_C -+#if __STDC__ - int dttreeset(Dt_t* dt, int minp, int balance) - #else - int dttreeset(dt, minp, balance) -Index: lib/cdt/dtview.c -=================================================================== ---- lib/cdt/dtview.c.orig 2013-08-01 19:35:15.000000000 +0200 -+++ lib/cdt/dtview.c 2013-09-03 12:13:40.132798226 +0200 -@@ -6,7 +6,7 @@ - */ - - --#if __STD_C -+#if __STDC__ - static Void_t* dtvsearch(Dt_t* dt, reg Void_t* obj, reg int type) - #else - static Void_t* dtvsearch(dt,obj,type) -@@ -93,7 +93,7 @@ reg int type; - } - } - --#if __STD_C -+#if __STDC__ - Dt_t* dtview(reg Dt_t* dt, reg Dt_t* view) - #else - Dt_t* dtview(dt,view) -Index: lib/cdt/dtwalk.c -=================================================================== ---- lib/cdt/dtwalk.c.orig 2013-08-01 19:35:15.000000000 +0200 -+++ lib/cdt/dtwalk.c 2013-09-03 12:13:42.964730282 +0200 -@@ -6,7 +6,7 @@ - ** Written by Kiem-Phong Vo (5/25/96) - */ - --#if __STD_C -+#if __STDC__ - int dtwalk(reg Dt_t* dt, int (*userf)(Dt_t*, Void_t*, Void_t*), Void_t* data) - #else - int dtwalk(dt,userf,data) + #include diff --git a/graphviz-proper_use_of_qw.patch b/graphviz-proper_use_of_qw.patch new file mode 100644 index 0000000..c16fe65 --- /dev/null +++ b/graphviz-proper_use_of_qw.patch @@ -0,0 +1,17 @@ +--- + config/config_perl.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: config/config_perl.pl +=================================================================== +--- config/config_perl.pl.orig 2013-08-01 19:35:15.000000000 +0200 ++++ config/config_perl.pl 2013-09-04 13:14:18.900954100 +0200 +@@ -14,7 +14,7 @@ if ($ARGV[0] eq "PERL_INSTALL_DIR") { + + my $d; + +- foreach $d qw(installvendorarch vendorarch installsitearch sitearch) { ++ foreach $d (qw(installvendorarch vendorarch installsitearch sitearch)) { + if (exists($Config{$d}) and defined($Config{$d}) and + ($Config{$d} ne '') ) { + print "$Config{$d}"; diff --git a/graphviz-python_version.patch b/graphviz-python_version.patch index 875afe0..6444952 100644 --- a/graphviz-python_version.patch +++ b/graphviz-python_version.patch @@ -1,26 +1,18 @@ +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + Index: configure.ac =================================================================== ---- configure.ac.orig 2012-06-11 16:26:07.060351640 +0200 -+++ configure.ac 2012-06-11 16:27:06.331573194 +0200 -@@ -1098,7 +1098,7 @@ else - if test "x$PYTHON" = "x"; then +--- configure.ac.orig 2013-09-03 18:17:24.215264529 +0200 ++++ configure.ac 2013-09-03 18:18:10.984147480 +0200 +@@ -1134,7 +1134,7 @@ else + if test "x$PYTHON" == "x"; then use_python="No (python not available)" else -- PYTHON_VERSION=`$PYTHON -V 2>&1 | $GREP Python | cut -d ' ' -f 2` -+ PYTHON_VERSION=`python -c "import sys; print '%d.%d' % (sys.version_info[[0:2]])"` - if test "x$PYTHON_VERSION" = "x"; then - PYTHON= - else -Index: configure -=================================================================== ---- configure.orig 2012-06-11 16:27:00.000000000 +0200 -+++ configure 2012-06-11 16:27:26.152644075 +0200 -@@ -21117,7 +21117,7 @@ fi - if test "x$PYTHON" = "x"; then - use_python="No (python not available)" - else -- PYTHON_VERSION=`$PYTHON -V 2>&1 | $GREP Python | cut -d ' ' -f 2` -+ PYTHON_VERSION=`python -c "import sys; print '%d.%d' % (sys.version_info[[0:2]])"` - if test "x$PYTHON_VERSION" = "x"; then +- PYTHON_VERSION=`$PYTHON -V 2>&1 | $EGREP Python | cut -d ' ' -f 2` ++ PYTHON_VERSION=`$PYTHON -c "import sys; print '%d.%d' % (sys.version_info[[0:2]])"` + if test "x$PYTHON_VERSION" == "x"; then PYTHON= else diff --git a/graphviz-type_punning.patch b/graphviz-type_punning.patch index 6270f2a..b666ff8 100644 --- a/graphviz-type_punning.patch +++ b/graphviz-type_punning.patch @@ -7,12 +7,13 @@ for this code. --- lib/vmalloc/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) + tclpkg/gv/Makefile.am | 1 + + 2 files changed, 3 insertions(+) Index: lib/vmalloc/Makefile.am =================================================================== ---- lib/vmalloc/Makefile.am.orig 2009-09-16 20:49:46.000000000 +0200 -+++ lib/vmalloc/Makefile.am 2013-03-28 11:42:12.948760295 +0100 +--- lib/vmalloc/Makefile.am.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/vmalloc/Makefile.am 2013-09-04 13:53:20.113966325 +0200 @@ -9,6 +9,8 @@ libvmalloc_C_la_SOURCES = malloc.c vmbes vmprofile.c vmregion.c vmsegment.c vmset.c vmstat.c vmstrdup.c \ vmtrace.c vmwalk.c @@ -22,3 +23,15 @@ Index: lib/vmalloc/Makefile.am ${top_builddir}/FEATURE/vmalloc: ${top_srcdir}/lib/vmalloc/features/vmalloc mkdir -p ${top_builddir}/FEATURE ${top_srcdir}/iffe - set cc $(CC) $(CCMODE) $(CXFLAGS) : run ${top_srcdir}/lib/vmalloc/features/vmalloc > $@ +Index: tclpkg/gv/Makefile.am +=================================================================== +--- tclpkg/gv/Makefile.am.orig 2013-08-01 19:35:15.000000000 +0200 ++++ tclpkg/gv/Makefile.am 2013-09-05 14:21:57.670757739 +0200 +@@ -80,6 +80,7 @@ nodist_libgv_java_la_SOURCES = gv_java.c + libgv_java_la_SOURCES = $(BASESOURCES) gv_dummy_init.c + libgv_java_la_LIBADD = $(BASELIBS) $(JAVA_LIBS) + libgv_java_la_LDFLAGS = -module -avoid-version ++libgv_java_la_CXXFLAGS = -fno-strict-aliasing + libgv_java_la_CPPFLAGS = $(BASECPPFLAGS) $(JAVA_INCLUDES) + $(JAVA_data): gv_java.cpp + gv_java.cpp: gv.i diff --git a/graphviz-useless_warnings.patch b/graphviz-useless_warnings.patch new file mode 100644 index 0000000..cdc93ee --- /dev/null +++ b/graphviz-useless_warnings.patch @@ -0,0 +1,17 @@ +--- + tclpkg/gv/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +Index: tclpkg/gv/Makefile.am +=================================================================== +--- tclpkg/gv/Makefile.am.orig 2013-09-05 17:59:52.837755940 +0200 ++++ tclpkg/gv/Makefile.am 2013-09-05 18:00:53.696332434 +0200 +@@ -20,6 +20,8 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/lib/cdt \ + -I$(top_srcdir)/lib/pathplan + ++AM_CXXFLAGS = -Wno-unused-label -Wno-unused-function \ ++ -Wno-unused-but-set-variable + LIBS = -lc + + BASESOURCES = gv.cpp gv.i gv_builtins.c diff --git a/graphviz.changes b/graphviz.changes index cf3dd72..320ebd0 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -48,11 +48,14 @@ Tue Sep 3 13:55:25 CEST 2013 - pth@suse.de - Remove graphviz-gd_png_check_sig.patch as the file to patch doesn't exist anymore. - Add graphviz-buffer_overflow.patch to fix a buffer ovderflow in - lib/common/shapes.c(round_corners). -- Add graphviz-proper_prototypes.patch that changes the conditional - from __STD_C to the standard conforming __STDC__ to get proper - prototypes. + lib/common/shapes.c(round_corners) by increasing the number of + elements in the array. +- Add graphviz-proper_prototypes.patch that changes dthdr.h to + include ast_common.h to get __STD_C defined, which in turn + enables proper prototypes. - Run autoreconf to use -fno-strict-aliasing for libvmalloc sources +- Add patch tags in the spec files +- Upstreamed all patches that aren't SUSE specific. ------------------------------------------------------------------- Thu Mar 28 11:51:09 CET 2013 - pth@suse.de diff --git a/graphviz.spec b/graphviz.spec index 3375056..c41f452 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -29,10 +29,20 @@ Url: http://www.graphviz.org/ Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz Source2: graphviz-rpmlintrc Patch2: graphviz-fix-pkgIndex.patch +#PATCH-FIX-UPSTREAM Get the right header included to get proper prototypes +# Accepted upstream -> remove for next update Patch3: graphviz-missing_headers.patch +#PATCH-FIX-UPSTREAM Add aarch64 to the archs that use lib64 +# Accepted upstream -> remove for next update Patch4: graphviz-aarch64_lib64_support.patch +#PATCH-FIX-UPSTREAM Increase array to the need size. +# Accepted upstream -> remove for next update Patch5: graphviz-type_punning.patch +#PATCH-FIX-UPSTREAM Increase array to the need size. +# Accepted upstream -> remove for next update Patch6: graphviz-buffer_overflow.patch +#PATCH-FIX-UPSTREAM Include ast_common.h to get __STD_C defined +# This is the patch as used upstream -> remove for next update Patch7: graphviz-proper_prototypes.patch BuildRequires: autoconf BuildRequires: automake From d4c84f6c61808528d85033cf4340cacc854ac201ac9d90ee3cafe8495c744e67 Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Mon, 9 Sep 2013 13:44:08 +0000 Subject: [PATCH 03/19] - Update to 2.34.0 (see changes for graphviz), - Remove patches accepted upstream: graphviz-missing_headers.patch, graphviz-aarch64_lib64_support.patch, graphviz-type_punning.patch, graphviz-buffer_overflow.patch, graphviz-proper_prototypes.patch, graphviz-python_version.patch, graphviz-guile.patch, graphviz-java_in_lib64.patch - Update to 2.34.0: - Resolved bugs: * graphviz will hangs if only one point and attribute given (gvz#2326) * Inconsistent text position in xdot with HTML-like label (gvz#2333) * Graphviz createsedges not asked for, with rank=same (gvz#2334) * Graph padding rectangle too big (gvz#2337) * labelloc has no effect for HTML-like labels with formatting (gvz#2338) * Global search and replace operation in the documentation seems to have gone awry (gvz#2340) * Rotated graph not quite centered (gvz#2343) * When arrowType is list and contains none all subsequent arrowTypes are dropped (gvz#2345) * arrowType none when included as a multiple arrowtype fails to render empty space (gvz#2346) * Buffer overflow in lib/common/shapes.c(round_corners) (gvz#2349). * Add aarch64 to the architectures using lib64 (gvz#2350) * Ask guile-config for includes and libraries (gvz#2351). * If string.h present, don't declare memcmp and strcmp (gvz#2352). * Include ast_common.h in cdt sources (gvz#2353) * Alternative way to get python's version (gvz#2354) * Unportable test(1) construct in configure script (gvz#2357) * Use parantheses around qw() call in loop (gvz#2359) * Saving in Vimdot can crash the graphical window (rh#847458). OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=61 --- graphviz-2.32.0.tar.gz | 3 -- graphviz-2.34.0.tar.gz | 3 ++ graphviz-aarch64_lib64_support.patch | 11 ------- graphviz-buffer_overflow.patch | 25 ---------------- graphviz-guile.patch | 28 ------------------ graphviz-java_in_lib64.patch | 23 --------------- graphviz-missing_headers.patch | 24 ---------------- graphviz-plugins-fix_install_dirs.patch | 18 ++++++------ graphviz-plugins-tcl_install_dir.patch | 15 ++++++---- graphviz-plugins.changes | 10 +++++++ graphviz-plugins.spec | 38 +------------------------ graphviz-python_version.patch | 18 ------------ graphviz-type_punning.patch | 37 ------------------------ graphviz.changes | 34 ++++++++++++++++++++++ graphviz.spec | 22 +------------- 15 files changed, 68 insertions(+), 241 deletions(-) delete mode 100644 graphviz-2.32.0.tar.gz create mode 100644 graphviz-2.34.0.tar.gz delete mode 100644 graphviz-aarch64_lib64_support.patch delete mode 100644 graphviz-buffer_overflow.patch delete mode 100644 graphviz-guile.patch delete mode 100644 graphviz-java_in_lib64.patch delete mode 100644 graphviz-missing_headers.patch delete mode 100644 graphviz-python_version.patch delete mode 100644 graphviz-type_punning.patch diff --git a/graphviz-2.32.0.tar.gz b/graphviz-2.32.0.tar.gz deleted file mode 100644 index 89efa65..0000000 --- a/graphviz-2.32.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d853b2313e08a1dd0cce20d9ff8051acfa9ec418b5ba2dc65c8f4ddb07a7a77a -size 23756717 diff --git a/graphviz-2.34.0.tar.gz b/graphviz-2.34.0.tar.gz new file mode 100644 index 0000000..e82040b --- /dev/null +++ b/graphviz-2.34.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d94abca5745aa4c5808ab56cd3d0ec9ed14fb76a5a88d39e1f234fa84d22d764 +size 23921350 diff --git a/graphviz-aarch64_lib64_support.patch b/graphviz-aarch64_lib64_support.patch deleted file mode 100644 index 2b0621d..0000000 --- a/graphviz-aarch64_lib64_support.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -100,7 +100,7 @@ - case "${host_os}" in - *linux* ) - case "${host_cpu}" in -- powerpc64 | s390x | x86_64 | sparc64 ) -+ aarch64 | powerpc64 | s390x | x86_64 | sparc64 ) - LIBPOSTFIX="64" - ;; - esac diff --git a/graphviz-buffer_overflow.patch b/graphviz-buffer_overflow.patch deleted file mode 100644 index 4364a7f..0000000 --- a/graphviz-buffer_overflow.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Philipp Thomas -Date: 2013-09-02 18:18:46+02:00 -Subject: Fix the buffer overflow - -C is defined as -pointf C[4] -so C[4] is a clear off-by-one. - ---- - lib/common/shapes.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: lib/common/shapes.c -=================================================================== ---- lib/common/shapes.c.orig 2013-08-01 19:35:15.000000000 +0200 -+++ lib/common/shapes.c 2013-09-04 14:12:21.899122174 +0200 -@@ -495,7 +495,7 @@ static void Mcircle_hack(GVJ_t * job, no - */ - void round_corners(GVJ_t * job, pointf * AF, int sides, int style, int filled) - { -- pointf *B, C[4], *D, p0, p1; -+ pointf *B, C[5], *D, p0, p1; - double rbconst, d, dx, dy, t; - int i, seg, mode, shape; - pointf* pts; diff --git a/graphviz-guile.patch b/graphviz-guile.patch deleted file mode 100644 index 94fc1f4..0000000 --- a/graphviz-guile.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- - configure.ac | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -Index: configure.ac -=================================================================== ---- configure.ac.orig 2013-09-05 18:53:19.358820405 +0200 -+++ configure.ac 2013-09-05 18:55:36.109623495 +0200 -@@ -706,8 +706,8 @@ else - if test "x$GUILE" == "x"; then - use_guile="No (guile is too old)" - else -- GUILE_INCLUDES= -- GUILE_LIBS= -+ GUILE_INCLUDES=$(guile-config compile) -+ GUILE_LIBS=$(guile-config link) - # don't die if PKG_CHECK_MODULES not available - el4, el5 - PKG_CHECK_MODULES([GUILE], - [guile-2.0 >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"], -@@ -718,8 +718,6 @@ else - GUILE_INCLUDES="$GUILE_CFLAGS", - false) - ]) -- ac_save_CFLAGS="$CFLAGS" -- ac_save_CPPFLAGS="$CPPFLAGS" - CFLAGS="$CFLAGS $GUILE_INCLUDES" - CPPFLAGS="$CPPFLAGS $GUILE_INCLUDES" - AC_CHECK_HEADER(libguile.h,,[ diff --git a/graphviz-java_in_lib64.patch b/graphviz-java_in_lib64.patch deleted file mode 100644 index cdfec6a..0000000 --- a/graphviz-java_in_lib64.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- - configure.ac | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -Index: configure.ac -=================================================================== ---- configure.ac.orig 2013-09-03 18:32:36.438493137 +0200 -+++ configure.ac 2013-09-04 12:24:08.990497310 +0200 -@@ -795,10 +795,10 @@ else - else - for try_java_include in \ - /System/Library/Frameworks/JavaVM.framework/Headers \ -- /usr/lib/jvm/java/include \ -- /usr/lib/jvm/java/include/linux \ -- /usr/lib/jvm/default-java/include \ -- /usr/lib/jvm/default-java/include/linux \ -+ /usr/lib${LIBPOSTFIX}/jvm/java/include \ -+ /usr/lib${LIBPOSTFIX}/jvm/java/include/linux \ -+ /usr/lib${LIBPOSTFIX}/jvm/default-java/include \ -+ /usr/lib${LIBPOSTFIX}/jvm/default-java/include/linux \ - /etc/java-config-2/current-system-vm/include \ - /etc/java-config-2/current-system-vm/include/linux \ - /etc/java-config-2/current-system-vm/include/freebsd diff --git a/graphviz-missing_headers.patch b/graphviz-missing_headers.patch deleted file mode 100644 index 0c1b9b3..0000000 --- a/graphviz-missing_headers.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: graphviz-2.28.0/lib/cdt/cdt.h -=================================================================== ---- graphviz-2.28.0.orig/lib/cdt/cdt.h 2010-04-26 20:35:08.000000000 +0200 -+++ graphviz-2.28.0/lib/cdt/cdt.h 2011-10-03 15:47:24.632084472 +0200 -@@ -17,6 +17,7 @@ - #endif - - #include /* size_t */ -+#include - - #ifndef _BEGIN_EXTERNS_ - #define _BEGIN_EXTERNS_ -@@ -238,11 +239,6 @@ extern int dtsize _ARG_((Dt_t*)); - extern int dtstat _ARG_((Dt_t*, Dtstat_t*, int)); - extern unsigned int dtstrhash _ARG_((unsigned int, Void_t*, int)); - --#if !_PACKAGE_ast --extern int memcmp _ARG_((const Void_t*, const Void_t*, size_t)); --extern int strcmp _ARG_((const char*, const char*)); --#endif -- - #undef extern - _END_EXTERNS_ - diff --git a/graphviz-plugins-fix_install_dirs.patch b/graphviz-plugins-fix_install_dirs.patch index 7102035..e87f04d 100644 --- a/graphviz-plugins-fix_install_dirs.patch +++ b/graphviz-plugins-fix_install_dirs.patch @@ -5,9 +5,9 @@ Index: configure =================================================================== ---- configure.orig 2013-08-01 19:39:03.000000000 +0200 -+++ configure 2013-09-03 18:16:16.259887587 +0200 -@@ -22152,8 +22152,8 @@ done +--- configure.orig 2013-09-07 03:11:08.000000000 +0200 ++++ configure 2013-09-09 13:52:31.087729979 +0200 +@@ -22284,8 +22284,8 @@ done else PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM" fi @@ -18,20 +18,20 @@ Index: configure PHP_LIBS= save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $PHP_INCLUDES" -@@ -23704,7 +23704,7 @@ $as_echo "using $TCLCONFIG" >&6; } +@@ -23844,7 +23844,7 @@ $as_echo "using $TCLCONFIG" >&6; } $as_echo "$as_me: WARNING: Unable to find tclConfig.sh. The Tcl packages will not be built" >&2;} use_tcl="No (missing tclConfig.sh)" fi - TCL_INSTALL_DIR="${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tcl${TCL_VERSION_FOUND}" -+ TCL_INSTALL_DIR="${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}" ++ TCL_INSTALL_DIR="${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX} fi - if test "x$use_tcl" == "x"; then + if test "x$use_tcl" = "x"; then Index: configure.ac =================================================================== ---- configure.ac.orig 2013-09-03 18:11:59.386022594 +0200 -+++ configure.ac 2013-09-03 18:11:59.427021615 +0200 -@@ -1091,8 +1091,8 @@ else +--- configure.ac.orig 2013-09-07 03:07:52.000000000 +0200 ++++ configure.ac 2013-09-09 13:51:37.757974780 +0200 +@@ -1100,8 +1100,8 @@ else else PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM" fi diff --git a/graphviz-plugins-tcl_install_dir.patch b/graphviz-plugins-tcl_install_dir.patch index 7bd704b..a8d0c3e 100644 --- a/graphviz-plugins-tcl_install_dir.patch +++ b/graphviz-plugins-tcl_install_dir.patch @@ -1,7 +1,12 @@ +--- + tclpkg/Makefile.am | 4 ++-- + tclpkg/Makefile.in | 5 +++-- + 2 files changed, 5 insertions(+), 4 deletions(-) + Index: tclpkg/Makefile.am =================================================================== ---- tclpkg/Makefile.am.orig 2012-06-11 16:26:00.106677610 +0200 -+++ tclpkg/Makefile.am 2012-06-11 16:27:30.595435808 +0200 +--- tclpkg/Makefile.am.orig 2013-09-07 03:07:52.000000000 +0200 ++++ tclpkg/Makefile.am 2013-09-09 13:52:50.830269146 +0200 @@ -18,9 +18,9 @@ pkgpython26dir = $(pkglibdir)/python26 pkgpython27dir = $(pkglibdir)/python27 pkgRdir = $(pkglibdir)/R @@ -16,9 +21,9 @@ Index: tclpkg/Makefile.am endif Index: tclpkg/Makefile.in =================================================================== ---- tclpkg/Makefile.in.orig 2012-06-11 16:26:00.000000000 +0200 -+++ tclpkg/Makefile.in 2012-06-11 16:28:03.111911549 +0200 -@@ -487,8 +487,9 @@ pkgpython26dir = $(pkglibdir)/python26 +--- tclpkg/Makefile.in.orig 2013-09-07 03:11:21.000000000 +0200 ++++ tclpkg/Makefile.in 2013-09-09 13:52:50.830269146 +0200 +@@ -522,8 +522,9 @@ pkgpython26dir = $(pkglibdir)/python26 pkgpython27dir = $(pkglibdir)/python27 pkgRdir = $(pkglibdir)/R pkgrubydir = $(pkglibdir)/ruby diff --git a/graphviz-plugins.changes b/graphviz-plugins.changes index 48079d6..aab6121 100644 --- a/graphviz-plugins.changes +++ b/graphviz-plugins.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Sep 9 13:45:47 CEST 2013 - pth@suse.de + +- Update to 2.34.0 (see changes for graphviz), +- Remove patches accepted upstream: + graphviz-missing_headers.patch, graphviz-aarch64_lib64_support.patch, + graphviz-type_punning.patch, graphviz-buffer_overflow.patch, + graphviz-proper_prototypes.patch, graphviz-python_version.patch, + graphviz-guile.patch, graphviz-java_in_lib64.patch + ------------------------------------------------------------------- Thu Sep 5 15:46:47 CEST 2013 - pth@suse.de diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec index 027b062..e2eb3e0 100644 --- a/graphviz-plugins.spec +++ b/graphviz-plugins.spec @@ -88,46 +88,20 @@ BuildRequires: pkgconfig(pango) %if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif -Version: 2.32.0 +Version: 2.34.0 Release: 0 Summary: Graph Visualization Tools License: IPL-1.0 Group: Productivity/Graphics/Visualization/Graph Url: http://www.graphviz.org/ Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version}.tar.gz -#Patches up to 99 are for graphviz and graphviz-plugins -#PATCH-FIX-UPSTREAM Get the right header included to get proper prototypes -# Accepted upstream -> remove for next update -Patch3: graphviz-missing_headers.patch -#PATCH-FIX-UPSTREAM Add aarch64 to the archs that use lib64 -# Accepted upstream -> remove for next update -Patch4: graphviz-aarch64_lib64_support.patch -#PATCH-FIX-UPSTREAM Add aarch64 to the archs that use lib64 -Patch5: graphviz-type_punning.patch -#PATCH-FIX-UPSTREAM Increase array to the need size. -# Accepted upstream -> remove for next update -Patch6: graphviz-buffer_overflow.patch -#PATCH-FIX-UPSTREAM Include ast_common.h to get __STD_C defined -# This is the patch as used upstream -> remove for next update -Patch7: graphviz-proper_prototypes.patch #Patches from 100 up are for graphviz-plugin only Patch100: graphviz-plugins-fix_install_dirs.patch -#PATCH-FIX-UPSTREAM Use python to get the version. -# Accepted upstream -> remove for next update -Patch101: graphviz-python_version.patch Patch102: graphviz-plugins-tcl_install_dir.patch Patch103: graphviz-2.20.2-interpreter_names.patch -#PATCH-FIX-UPSTREAM Use guile-config to get libs and includes -# Accepted upstream -> remove for next update -Patch104: graphviz-guile.patch Patch106: graphviz-fix-pkgIndex.patch -#PATCH-FIX-UPSTREAM also search in /usr/lib64 for Java headers -Patch107: graphviz-java_in_lib64.patch #PATCH-FIX-UPSTREAM Don't warn about harmless issues with swig generated code Patch108: graphviz-useless_warnings.patch -#PATCH-FIX-UPSTREAM qw must be put in brackets in recent perl versions -# Upstream also did this change -> remove for next update -Patch109: graphviz-proper_use_of_qw.patch Requires(pre): coreutils BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -292,21 +266,11 @@ Provides some additional PDF and HTML documentation for graphviz. %prep %setup -q -n %{mname}-%{version} -%patch3 -p1 -%patch4 -%patch5 -%patch6 -%patch7 -# %patch100 -%patch101 %patch102 %patch103 -%patch104 %patch106 -%patch107 %patch108 -%patch109 # Fix path in generated man pages sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl diff --git a/graphviz-python_version.patch b/graphviz-python_version.patch deleted file mode 100644 index 6444952..0000000 --- a/graphviz-python_version.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- - configure | 2 +- - configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -Index: configure.ac -=================================================================== ---- configure.ac.orig 2013-09-03 18:17:24.215264529 +0200 -+++ configure.ac 2013-09-03 18:18:10.984147480 +0200 -@@ -1134,7 +1134,7 @@ else - if test "x$PYTHON" == "x"; then - use_python="No (python not available)" - else -- PYTHON_VERSION=`$PYTHON -V 2>&1 | $EGREP Python | cut -d ' ' -f 2` -+ PYTHON_VERSION=`$PYTHON -c "import sys; print '%d.%d' % (sys.version_info[[0:2]])"` - if test "x$PYTHON_VERSION" == "x"; then - PYTHON= - else diff --git a/graphviz-type_punning.patch b/graphviz-type_punning.patch deleted file mode 100644 index b666ff8..0000000 --- a/graphviz-type_punning.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Philipp Thomas -Date: 2013-03-28 11:43:28+01:00 -Subject: Switch of strict aliasing - -The vmalloc code uses type-punning in a macro so switch off strict aliasing -for this code. - ---- - lib/vmalloc/Makefile.am | 2 ++ - tclpkg/gv/Makefile.am | 1 + - 2 files changed, 3 insertions(+) - -Index: lib/vmalloc/Makefile.am -=================================================================== ---- lib/vmalloc/Makefile.am.orig 2013-08-01 19:35:15.000000000 +0200 -+++ lib/vmalloc/Makefile.am 2013-09-04 13:53:20.113966325 +0200 -@@ -9,6 +9,8 @@ libvmalloc_C_la_SOURCES = malloc.c vmbes - vmprofile.c vmregion.c vmsegment.c vmset.c vmstat.c vmstrdup.c \ - vmtrace.c vmwalk.c - -+AM_CFLAGS = -fno-strict-aliasing -+ - ${top_builddir}/FEATURE/vmalloc: ${top_srcdir}/lib/vmalloc/features/vmalloc - mkdir -p ${top_builddir}/FEATURE - ${top_srcdir}/iffe - set cc $(CC) $(CCMODE) $(CXFLAGS) : run ${top_srcdir}/lib/vmalloc/features/vmalloc > $@ -Index: tclpkg/gv/Makefile.am -=================================================================== ---- tclpkg/gv/Makefile.am.orig 2013-08-01 19:35:15.000000000 +0200 -+++ tclpkg/gv/Makefile.am 2013-09-05 14:21:57.670757739 +0200 -@@ -80,6 +80,7 @@ nodist_libgv_java_la_SOURCES = gv_java.c - libgv_java_la_SOURCES = $(BASESOURCES) gv_dummy_init.c - libgv_java_la_LIBADD = $(BASELIBS) $(JAVA_LIBS) - libgv_java_la_LDFLAGS = -module -avoid-version -+libgv_java_la_CXXFLAGS = -fno-strict-aliasing - libgv_java_la_CPPFLAGS = $(BASECPPFLAGS) $(JAVA_INCLUDES) - $(JAVA_data): gv_java.cpp - gv_java.cpp: gv.i diff --git a/graphviz.changes b/graphviz.changes index 320ebd0..77f55e4 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Mon Sep 9 13:27:19 CEST 2013 - pth@suse.de + +- Update to 2.34.0: + - Resolved bugs: + * graphviz will hangs if only one point and attribute given (gvz#2326) + * Inconsistent text position in xdot with HTML-like label (gvz#2333) + * Graphviz createsedges not asked for, with rank=same (gvz#2334) + * Graph padding rectangle too big (gvz#2337) + * labelloc has no effect for HTML-like labels with formatting (gvz#2338) + * Global search and replace operation in the documentation seems to + have gone awry (gvz#2340) + * Rotated graph not quite centered (gvz#2343) + * When arrowType is list and contains none all subsequent + arrowTypes are dropped (gvz#2345) + * arrowType none when included as a multiple arrowtype fails to + render empty space (gvz#2346) + * Buffer overflow in lib/common/shapes.c(round_corners) (gvz#2349). + * Add aarch64 to the architectures using lib64 (gvz#2350) + * Ask guile-config for includes and libraries (gvz#2351). + * If string.h present, don't declare memcmp and strcmp (gvz#2352). + * Include ast_common.h in cdt sources (gvz#2353) + * Alternative way to get python's version (gvz#2354) + * Unportable test(1) construct in configure script (gvz#2357) + * Use parantheses around qw() call in loop (gvz#2359) + * Saving in Vimdot can crash the graphical window (rh#847458). + - Added mingle command and library for edge bundling +- Removed Patches that where accepted upstream: + graphviz-missing_headers.patch + graphviz-aarch64_lib64_support.patch + graphviz-type_punning.patch + graphviz-buffer_overflow.patch + graphviz-proper_prototypes.patch + ------------------------------------------------------------------- Tue Sep 3 13:55:25 CEST 2013 - pth@suse.de diff --git a/graphviz.spec b/graphviz.spec index c41f452..8a02e1b 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -20,7 +20,7 @@ %define config_file config6 Name: graphviz -Version: 2.32.0 +Version: 2.34.0 Release: 0 Summary: Graph Visualization Tools License: IPL-1.0 @@ -29,21 +29,6 @@ Url: http://www.graphviz.org/ Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz Source2: graphviz-rpmlintrc Patch2: graphviz-fix-pkgIndex.patch -#PATCH-FIX-UPSTREAM Get the right header included to get proper prototypes -# Accepted upstream -> remove for next update -Patch3: graphviz-missing_headers.patch -#PATCH-FIX-UPSTREAM Add aarch64 to the archs that use lib64 -# Accepted upstream -> remove for next update -Patch4: graphviz-aarch64_lib64_support.patch -#PATCH-FIX-UPSTREAM Increase array to the need size. -# Accepted upstream -> remove for next update -Patch5: graphviz-type_punning.patch -#PATCH-FIX-UPSTREAM Increase array to the need size. -# Accepted upstream -> remove for next update -Patch6: graphviz-buffer_overflow.patch -#PATCH-FIX-UPSTREAM Include ast_common.h to get __STD_C defined -# This is the patch as used upstream -> remove for next update -Patch7: graphviz-proper_prototypes.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -103,11 +88,6 @@ Note: If you need output in png format you also need to install %prep %setup -q %patch2 -%patch3 -p1 -%patch4 -%patch5 -%patch6 -%patch7 # Fix path in generated man pages sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl From 9775d599df1973141594519f995fc0f2ddd888625bd4d97d1e22e56f8184e22d Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Wed, 11 Sep 2013 17:23:36 +0000 Subject: [PATCH 04/19] - Add graphviz-type_punning.patch which compiles the vmalloc sources with -fno-strict-aliasing. - Split off gvedit to it's own spec to avoid circular dependency for graphviz and its sup packages. - Initial package graphviz-gvedit which splits off gvedit. OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=62 --- graphviz-gvedit.changes | 7 ++ graphviz-gvedit.spec | 137 ++++++++++++++++++++++++++++++ graphviz-no_strict_aliasing.patch | 17 ++++ graphviz-plugins.changes | 2 + graphviz-plugins.spec | 5 ++ graphviz-proper_prototypes.patch | 17 ---- graphviz-proper_use_of_qw.patch | 17 ---- graphviz.changes | 8 ++ graphviz.spec | 3 + 9 files changed, 179 insertions(+), 34 deletions(-) create mode 100644 graphviz-gvedit.changes create mode 100644 graphviz-gvedit.spec create mode 100644 graphviz-no_strict_aliasing.patch delete mode 100644 graphviz-proper_prototypes.patch delete mode 100644 graphviz-proper_use_of_qw.patch diff --git a/graphviz-gvedit.changes b/graphviz-gvedit.changes new file mode 100644 index 0000000..7d29a9b --- /dev/null +++ b/graphviz-gvedit.changes @@ -0,0 +1,7 @@ +------------------------------------------------------------------- +Wed Sep 11 13:42:43 CEST 2013 - pth@suse.de + +- Initial package split off from graphviz. +- Add graphviz-type_punning.patch which compiles the vmalloc sources + with -fno-strict-aliasing. + diff --git a/graphviz-gvedit.spec b/graphviz-gvedit.spec new file mode 100644 index 0000000..1c1a219 --- /dev/null +++ b/graphviz-gvedit.spec @@ -0,0 +1,137 @@ +# +# spec file for package graphviz-gvedit +# +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%define mname graphviz + +Name: graphviz-gvedit +Version: 2.34.0 +Release: 0 +Summary: Graph editor based on Qt +License: IPL-1.0 +Group: Productivity/Graphics/Visualization/Graph +Url: http://www.graphviz.org/ +Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version}.tar.gz +Source2: graphviz-rpmlintrc +Patch2: graphviz-fix-pkgIndex.patch +#PATCH-FIX-UPSTREAM There are too many type-punnings in the vmalloc sources +Patch3: graphviz-no_strict_aliasing.patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: bison +BuildRequires: fdupes +BuildRequires: flex +BuildRequires: freeglut-devel +BuildRequires: freetype2-devel >= 2 +BuildRequires: gcc-c++ +BuildRequires: libXaw-devel +BuildRequires: libexpat-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libqt4-devel +BuildRequires: libstdc++-devel +BuildRequires: libtool +BuildRequires: zlib-devel +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xext) +Requires(pre): /bin/cat +Requires(pre): /bin/rm +Recommends: graphviz = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +This is the graph editor included with graphviz, packaged +separately to avoid cycles in the build of the graphviz +package. + +%prep +%setup -q -n %{mname}-%{version} +%patch2 +%patch3 + +# Fix path in generated man pages +sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl + +%build +autoreconf -fi +WARN_FLAGS="-W -Wall -Wno-unused-parameter -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith" +CFLAGS="%{optflags} $WARN_FLAGS" +%ifarch %ix86 x86_64 +CFLAGS="$CFLAGS -ffast-math" +%endif + +export CFLAGS="$CFLAGS" +export CPPFLAGS="%{optflags}" +%configure \ + --with-x \ + --with-mylibgd \ + --disable-static \ + --enable-ltdl-install=no \ + --with-ipsepcola \ + --without-ming \ + --disable-io \ + --disable-silent-rules \ + --with-mylibgd=no \ + --with-libgd=no +make %{?_smp_mflags} DESTDIR=%{buildroot} + +%install +make install \ + DESTDIR=%{buildroot} \ + docdir=%{buildroot}%{_docdir}/%{mname} \ + pkgconfigdir=%{_libdir}/pkgconfig + +find %{buildroot} -type f -name "*.la" -print0 | xargs -0 rm -f + +mkdir -p %{buildroot}/%{_docdir} +mkdir -p %{buildroot}%{_datadir}/%{mname} + +rm -f %{buildroot}/%{_libdir}/%{mname}/pkgIndex.tcl + +cp -a %{buildroot}%{_datadir}/%{mname}/doc __doc +rm -rf %{buildroot}%{_datadir}/%{mname}/doc + +rm -rf %{buildroot}%{_libdir} + +mv %{buildroot}/%{_mandir}/man1/gvedit.1 /tmp/gvedit.1 +rm -f %{buildroot}/%{_mandir}/man1/* +rm -rf %{buildroot}/%{_mandir}/man[37] +mv /tmp/gvedit.1 %{buildroot}/%{_mandir}/man1/gvedit.1 + +mv %{buildroot}/%{_bindir}/gvedit /tmp/gvedit +rm -f %{buildroot}/%{_bindir}/* +mv /tmp/gvedit %{buildroot}/%{_bindir}/gvedit + +rm -rf %{buildroot}%{_datadir}/%{mname}/graphs +rm -rf %{buildroot}%{_datadir}/%{mname}/gvpr +rm -rf %{buildroot}%{_datadir}/%{mname}/lefty +rm -rf %{buildroot}%{_includedir}/%{mname} + +%files +%defattr(-,root,root) +%doc COPYING +%attr(755,root,root) %{_bindir}/gvedit +%dir %{_datadir}/%{mname} +%dir %{_datadir}/%{mname}/gvedit +%{_datadir}/%{mname}/gvedit/attrs.txt +%doc %{_mandir}/man1/*.1* + +%changelog diff --git a/graphviz-no_strict_aliasing.patch b/graphviz-no_strict_aliasing.patch new file mode 100644 index 0000000..67e1d72 --- /dev/null +++ b/graphviz-no_strict_aliasing.patch @@ -0,0 +1,17 @@ +--- + lib/vmalloc/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +Index: lib/vmalloc/Makefile.am +=================================================================== +--- lib/vmalloc/Makefile.am.orig 2013-09-07 03:07:52.000000000 +0200 ++++ lib/vmalloc/Makefile.am 2013-09-11 18:51:30.719515603 +0200 +@@ -9,6 +9,8 @@ libvmalloc_C_la_SOURCES = malloc.c vmbes + vmprofile.c vmregion.c vmsegment.c vmset.c vmstat.c vmstrdup.c \ + vmtrace.c vmwalk.c + ++libvmalloc_C_la_CFLAGS = -fno-strict-aliasing ++ + ${top_builddir}/FEATURE/vmalloc: ${top_srcdir}/lib/vmalloc/features/vmalloc + mkdir -p ${top_builddir}/FEATURE + ${top_srcdir}/iffe - set cc $(CC) $(CCMODE) $(CXFLAGS) : run ${top_srcdir}/lib/vmalloc/features/vmalloc > $@ diff --git a/graphviz-plugins.changes b/graphviz-plugins.changes index aab6121..0fbd1ca 100644 --- a/graphviz-plugins.changes +++ b/graphviz-plugins.changes @@ -7,6 +7,8 @@ Mon Sep 9 13:45:47 CEST 2013 - pth@suse.de graphviz-type_punning.patch, graphviz-buffer_overflow.patch, graphviz-proper_prototypes.patch, graphviz-python_version.patch, graphviz-guile.patch, graphviz-java_in_lib64.patch +- Add graphviz-type_punning.patch which compiles the vmalloc sources + with -fno-strict-aliasing. ------------------------------------------------------------------- Thu Sep 5 15:46:47 CEST 2013 - pth@suse.de diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec index e2eb3e0..313080e 100644 --- a/graphviz-plugins.spec +++ b/graphviz-plugins.spec @@ -95,6 +95,9 @@ License: IPL-1.0 Group: Productivity/Graphics/Visualization/Graph Url: http://www.graphviz.org/ Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version}.tar.gz +Patch2: graphviz-fix-pkgIndex.patch +#PATCH-FIX-UPSTREAM There are too many type-punnings in the vmalloc sources +Patch3: graphviz-no_strict_aliasing.patch #Patches from 100 up are for graphviz-plugin only Patch100: graphviz-plugins-fix_install_dirs.patch Patch102: graphviz-plugins-tcl_install_dir.patch @@ -266,6 +269,8 @@ Provides some additional PDF and HTML documentation for graphviz. %prep %setup -q -n %{mname}-%{version} +%patch2 +%patch3 %patch100 %patch102 %patch103 diff --git a/graphviz-proper_prototypes.patch b/graphviz-proper_prototypes.patch deleted file mode 100644 index a2a8fc9..0000000 --- a/graphviz-proper_prototypes.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- - lib/cdt/dthdr.h | 2 ++ - 1 file changed, 2 insertions(+) - -Index: lib/cdt/dthdr.h -=================================================================== ---- lib/cdt/dthdr.h.orig 2013-08-01 19:35:15.000000000 +0200 -+++ lib/cdt/dthdr.h 2013-09-05 17:48:19.736968083 +0200 -@@ -10,6 +10,8 @@ - - #if _PACKAGE_ast - #include -+#else -+#include - #endif - - #include diff --git a/graphviz-proper_use_of_qw.patch b/graphviz-proper_use_of_qw.patch deleted file mode 100644 index c16fe65..0000000 --- a/graphviz-proper_use_of_qw.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- - config/config_perl.pl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: config/config_perl.pl -=================================================================== ---- config/config_perl.pl.orig 2013-08-01 19:35:15.000000000 +0200 -+++ config/config_perl.pl 2013-09-04 13:14:18.900954100 +0200 -@@ -14,7 +14,7 @@ if ($ARGV[0] eq "PERL_INSTALL_DIR") { - - my $d; - -- foreach $d qw(installvendorarch vendorarch installsitearch sitearch) { -+ foreach $d (qw(installvendorarch vendorarch installsitearch sitearch)) { - if (exists($Config{$d}) and defined($Config{$d}) and - ($Config{$d} ne '') ) { - print "$Config{$d}"; diff --git a/graphviz.changes b/graphviz.changes index 77f55e4..3033a63 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Sep 11 18:55:22 CEST 2013 - pth@suse.de + +- Split off gvedit to it's own spec to avoid circular dependency + for graphviz and its sup packages. +- Add graphviz-type_punning.patch which compiles the vmalloc sources + with -fno-strict-aliasing. + ------------------------------------------------------------------- Mon Sep 9 13:27:19 CEST 2013 - pth@suse.de diff --git a/graphviz.spec b/graphviz.spec index 8a02e1b..0f580bb 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -29,6 +29,8 @@ Url: http://www.graphviz.org/ Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz Source2: graphviz-rpmlintrc Patch2: graphviz-fix-pkgIndex.patch +#PATCH-FIX-UPSTREAM There are too many type-punnings in the vmalloc sources +Patch3: graphviz-no_strict_aliasing.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -88,6 +90,7 @@ Note: If you need output in png format you also need to install %prep %setup -q %patch2 +%patch3 # Fix path in generated man pages sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl From a76781bdf62d48d1d311308aa69ada64b1430886eecde6736c92a6e2d73fd2b5 Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Thu, 12 Sep 2013 17:34:53 +0000 Subject: [PATCH 05/19] - Add graphviz-python3_version.patch that put the call to print in Parentheses. OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=63 --- graphviz-gvedit.changes | 6 +++++ graphviz-gvedit.spec | 2 ++ graphviz-plugins.changes | 6 +++++ graphviz-plugins.spec | 3 +++ graphviz-python3_version.patch | 19 ++++++++++++++ graphviz.changes | 6 +++++ graphviz.spec | 45 ++++++++++++++++++++++++++++++++-- 7 files changed, 85 insertions(+), 2 deletions(-) create mode 100644 graphviz-python3_version.patch diff --git a/graphviz-gvedit.changes b/graphviz-gvedit.changes index 7d29a9b..5dda77b 100644 --- a/graphviz-gvedit.changes +++ b/graphviz-gvedit.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 12 17:56:06 CEST 2013 - pth@suse.de + +- Add graphviz-python3_version.patch that put the call to print in + Parentheses. + ------------------------------------------------------------------- Wed Sep 11 13:42:43 CEST 2013 - pth@suse.de diff --git a/graphviz-gvedit.spec b/graphviz-gvedit.spec index 1c1a219..036f128 100644 --- a/graphviz-gvedit.spec +++ b/graphviz-gvedit.spec @@ -30,6 +30,7 @@ Source2: graphviz-rpmlintrc Patch2: graphviz-fix-pkgIndex.patch #PATCH-FIX-UPSTREAM There are too many type-punnings in the vmalloc sources Patch3: graphviz-no_strict_aliasing.patch +Patch4: graphviz-python3_version.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -66,6 +67,7 @@ package. %setup -q -n %{mname}-%{version} %patch2 %patch3 +%patch4 -p1 # Fix path in generated man pages sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl diff --git a/graphviz-plugins.changes b/graphviz-plugins.changes index 0fbd1ca..7d7c544 100644 --- a/graphviz-plugins.changes +++ b/graphviz-plugins.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 12 17:56:06 CEST 2013 - pth@suse.de + +- Add graphviz-python3_version.patch that put the call to print in + Parentheses. + ------------------------------------------------------------------- Mon Sep 9 13:45:47 CEST 2013 - pth@suse.de diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec index 313080e..31cc9ee 100644 --- a/graphviz-plugins.spec +++ b/graphviz-plugins.spec @@ -98,6 +98,8 @@ Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version} Patch2: graphviz-fix-pkgIndex.patch #PATCH-FIX-UPSTREAM There are too many type-punnings in the vmalloc sources Patch3: graphviz-no_strict_aliasing.patch +#PATCH-FIX-UPSTREAM print can only be called as function in python3 +Patch4: graphviz-python3_version.patch #Patches from 100 up are for graphviz-plugin only Patch100: graphviz-plugins-fix_install_dirs.patch Patch102: graphviz-plugins-tcl_install_dir.patch @@ -271,6 +273,7 @@ Provides some additional PDF and HTML documentation for graphviz. %setup -q -n %{mname}-%{version} %patch2 %patch3 +%patch4 -p1 %patch100 %patch102 %patch103 diff --git a/graphviz-python3_version.patch b/graphviz-python3_version.patch new file mode 100644 index 0000000..d398459 --- /dev/null +++ b/graphviz-python3_version.patch @@ -0,0 +1,19 @@ +Bracketing sys.version_info is wrong and print is only a function im python 3. + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: graphviz-2.34.0/configure.ac +=================================================================== +--- graphviz-2.34.0.orig/configure.ac 2013-09-07 03:07:52.000000000 +0200 ++++ graphviz-2.34.0/configure.ac 2013-09-12 16:25:48.006562980 +0200 +@@ -1143,7 +1143,7 @@ else + if test "x$PYTHON" = "x"; then + use_python="No (python not available)" + else +- PYTHON_VERSION=`$PYTHON -c "import sys; print '%d.%d' % (sys.version_info[[0:2]])"` ++ PYTHON_VERSION=`$PYTHON -c "import sys; print('%d.%d' % sys.version_info[[0:2]])"` + if test "x$PYTHON_VERSION" = "x"; then + PYTHON= + else diff --git a/graphviz.changes b/graphviz.changes index 3033a63..07cf824 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 12 17:56:06 CEST 2013 - pth@suse.de + +- Add graphviz-python3_version.patch that put the call to print in + Parentheses. + ------------------------------------------------------------------- Wed Sep 11 18:55:22 CEST 2013 - pth@suse.de diff --git a/graphviz.spec b/graphviz.spec index 0f580bb..1c7b4f7 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -31,6 +31,8 @@ Source2: graphviz-rpmlintrc Patch2: graphviz-fix-pkgIndex.patch #PATCH-FIX-UPSTREAM There are too many type-punnings in the vmalloc sources Patch3: graphviz-no_strict_aliasing.patch +#PATCH-FIX-UPSTREAM print can only be called as function in python3 +Patch4: graphviz-python3_version.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -91,6 +93,7 @@ Note: If you need output in png format you also need to install %setup -q %patch2 %patch3 +%patch4 -p1 # Fix path in generated man pages sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl @@ -175,7 +178,45 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li %files %defattr(-,root,root) %doc doc/FAQ.html AUTHORS COPYING README NEWS ChangeLog -%attr(755,root,root) %{_bindir}/* +#%%attr(755,root,root) %{_bindir}/* +%{_bindir}/acyclic +%{_bindir}/bcomps +%{_bindir}/ccomps +%{_bindir}/circo +%{_bindir}/cluster +%{_bindir}/dijkstra +%{_bindir}/dot +%{_bindir}/dot2gxl +%{_bindir}/dot_builtins +%{_bindir}/dotty +%{_bindir}/fdp +%{_bindir}/gc +%{_bindir}/gml2gv +%{_bindir}/graphml2gv +%{_bindir}/gv2gml +%{_bindir}/gv2gxl +%{_bindir}/gvcolor +%{_bindir}/gvedit +%{_bindir}/gvgen +%{_bindir}/gvmap +%{_bindir}/gvmap.sh +%{_bindir}/gvpack +%{_bindir}/gvpr +%{_bindir}/gxl2dot +%{_bindir}/gxl2gv +%{_bindir}/lefty +%{_bindir}/lneato +%{_bindir}/mm2gv +%{_bindir}/neato +%{_bindir}/nop +%{_bindir}/osage +%{_bindir}/patchwork +%{_bindir}/prune +%{_bindir}/sccmap +%{_bindir}/sfdp +%{_bindir}/tred +%{_bindir}/twopi +%{_bindir}/unflatten %dir %{_datadir}/%{name} %{_datadir}/%{name}/lefty %{_datadir}/%{name}/graphs @@ -218,7 +259,7 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li %dir %{_libdir}/%{name} %{_libdir}/*.so.* %{_libdir}/graphviz/*.so* -%{_sysconfdir}/ld.so.conf.d/graphviz.conf +%config %{_sysconfdir}/ld.so.conf.d/graphviz.conf %ghost %{_libdir}/graphviz/config %files devel From 0561c1c91c26bdb06bddcc17edffc4712852cdbe746f10909f16e307a9b5e4ae Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Tue, 8 Oct 2013 13:58:03 +0000 Subject: [PATCH 06/19] - Don't apply graphviz-fix-pkgIndex.patch twice. OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=64 --- graphviz-plugins.changes | 5 +++++ graphviz-plugins.spec | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/graphviz-plugins.changes b/graphviz-plugins.changes index 7d7c544..86593af 100644 --- a/graphviz-plugins.changes +++ b/graphviz-plugins.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 8 15:12:51 CEST 2013 - pth@suse.de + +- Don't apply graphviz-fix-pkgIndex.patch twice. + ------------------------------------------------------------------- Thu Sep 12 17:56:06 CEST 2013 - pth@suse.de diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec index 31cc9ee..1b71ecb 100644 --- a/graphviz-plugins.spec +++ b/graphviz-plugins.spec @@ -95,7 +95,6 @@ License: IPL-1.0 Group: Productivity/Graphics/Visualization/Graph Url: http://www.graphviz.org/ Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version}.tar.gz -Patch2: graphviz-fix-pkgIndex.patch #PATCH-FIX-UPSTREAM There are too many type-punnings in the vmalloc sources Patch3: graphviz-no_strict_aliasing.patch #PATCH-FIX-UPSTREAM print can only be called as function in python3 @@ -271,7 +270,6 @@ Provides some additional PDF and HTML documentation for graphviz. %prep %setup -q -n %{mname}-%{version} -%patch2 %patch3 %patch4 -p1 %patch100 From 0c0b8d8d935ced209bbdcb95f2c574d8c82dc67b828b07495f49344c11458d02 Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Tue, 8 Oct 2013 18:02:23 +0000 Subject: [PATCH 07/19] - Remove Buildrequires for libqt4-devel. OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=65 --- graphviz-plugins.changes | 3 ++- graphviz-plugins.spec | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/graphviz-plugins.changes b/graphviz-plugins.changes index 86593af..c5ad12b 100644 --- a/graphviz-plugins.changes +++ b/graphviz-plugins.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- -Tue Oct 8 15:12:51 CEST 2013 - pth@suse.de +Tue Oct 8 20:01:18 CEST 2013 - pth@suse.de - Don't apply graphviz-fix-pkgIndex.patch twice. +- Remove Buildrequires for libqt4-devel. ------------------------------------------------------------------- Thu Sep 12 17:56:06 CEST 2013 - pth@suse.de diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec index 1b71ecb..bde14db 100644 --- a/graphviz-plugins.spec +++ b/graphviz-plugins.spec @@ -45,7 +45,6 @@ BuildRequires: libexpat-devel BuildRequires: libgnomeui-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel -BuildRequires: libqt4-devel BuildRequires: libstdc++-devel BuildRequires: m4 %ifnarch aarch64 From eb21a8763ef07ac0da1efb8d300e7a9c398a3d873c9f24387c33092fa80845bf Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Thu, 10 Oct 2013 17:39:21 +0000 Subject: [PATCH 08/19] - Change BuildRequires for Java so that the spec doesn't need to be modified for newer jdk versions. OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=66 --- graphviz-plugins.changes | 6 ++++++ graphviz-plugins.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/graphviz-plugins.changes b/graphviz-plugins.changes index c5ad12b..cc82bec 100644 --- a/graphviz-plugins.changes +++ b/graphviz-plugins.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Oct 10 19:37:47 CEST 2013 - pth@suse.de + +- Change BuildRequires for Java so that the spec doesn't need + to be modified for newer jdk versions. + ------------------------------------------------------------------- Tue Oct 8 20:01:18 CEST 2013 - pth@suse.de diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec index bde14db..2b4b794 100644 --- a/graphviz-plugins.spec +++ b/graphviz-plugins.spec @@ -55,7 +55,7 @@ BuildRequires: gtkglext-devel %if %{with graphviz_java} #BuildRequires: gcc-java #BuildRequires: libgcj-devel -BuildRequires: java-1_7_0-openjdk-devel +BuildRequires: java-devel >= 1.6.0 %endif %if %{with mono} BuildRequires: mono-core From 5701d7483496a4505a2f2fe5327ae9276d80e060933e82d7eb82ca7c38e7bc69 Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Mon, 14 Oct 2013 11:58:21 +0000 Subject: [PATCH 09/19] - Remove gvedit files from filelist in grapfviz.spec. OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=67 --- graphviz.changes | 5 +++++ graphviz.spec | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/graphviz.changes b/graphviz.changes index 07cf824..b0ebb4b 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 14 13:57:31 CEST 2013 - pth@suse.de + +- Remove gvedit files from filelist in grapfviz.spec. + ------------------------------------------------------------------- Thu Sep 12 17:56:06 CEST 2013 - pth@suse.de diff --git a/graphviz.spec b/graphviz.spec index 1c7b4f7..f6ae2f8 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -196,7 +196,6 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li %{_bindir}/gv2gml %{_bindir}/gv2gxl %{_bindir}/gvcolor -%{_bindir}/gvedit %{_bindir}/gvgen %{_bindir}/gvmap %{_bindir}/gvmap.sh @@ -251,8 +250,6 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li %{_datadir}/%{name}/gvpr/span %{_datadir}/%{name}/gvpr/topon %{_datadir}/%{name}/gvpr/treetoclust -%dir %{_datadir}/%{name}/gvedit -%{_datadir}/%{name}/gvedit/attrs.txt %doc %{_mandir}/man1/*.1* %doc %{_mandir}/man7/*.7* From ec6290451c7500081e615de684dc82a183f8196249c21c62b0ddb5f76a33e334 Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Mon, 14 Oct 2013 12:08:05 +0000 Subject: [PATCH 10/19] - Remove build requirement for libqt4. OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=68 --- graphviz.changes | 3 ++- graphviz.spec | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/graphviz.changes b/graphviz.changes index b0ebb4b..902e448 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- -Mon Oct 14 13:57:31 CEST 2013 - pth@suse.de +Mon Oct 14 14:06:03 CEST 2013 - pth@suse.de - Remove gvedit files from filelist in grapfviz.spec. +- Remove build requirement for libqt4. ------------------------------------------------------------------- Thu Sep 12 17:56:06 CEST 2013 - pth@suse.de diff --git a/graphviz.spec b/graphviz.spec index f6ae2f8..6f4012e 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -45,7 +45,6 @@ BuildRequires: libXaw-devel BuildRequires: libexpat-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel -BuildRequires: libqt4-devel BuildRequires: libstdc++-devel BuildRequires: libtool BuildRequires: zlib-devel From a650d5f30063a1032030c5e6305c036cb98aeb0309a4fdca50cb5ad1d5532792 Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Mon, 14 Oct 2013 13:29:51 +0000 Subject: [PATCH 11/19] - Use wildcards for specifying tcl directory. OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=69 --- graphviz-plugins.changes | 5 +++++ graphviz-plugins.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/graphviz-plugins.changes b/graphviz-plugins.changes index cc82bec..f04c871 100644 --- a/graphviz-plugins.changes +++ b/graphviz-plugins.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 14 15:28:40 CEST 2013 - pth@suse.de + +- Use wildcards for specifying tcl directory. + ------------------------------------------------------------------- Thu Oct 10 19:37:47 CEST 2013 - pth@suse.de diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec index 2b4b794..593a0ec 100644 --- a/graphviz-plugins.spec +++ b/graphviz-plugins.spec @@ -448,7 +448,7 @@ rm -rf %{buildroot}/%{_libdir}/%{mname}/%{_lib} %files -n graphviz-tcl %defattr(-,root,root) %dir %{_datadir}/tcl/%{mname} -%{_libdir}/tcl8.6 +%{_libdir}/tcl[0-9].[0-9] %{_libdir}/libgdtclft* %{_libdir}/libgv_tcl.so %{_libdir}/libtcldot* From c0eac2ac7c220abd5e2a888d4b974a5cb938533e9523888638d5bfe4ecfb665a Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Thu, 24 Oct 2013 09:38:23 +0000 Subject: [PATCH 12/19] - Split off smyrna into its own package and spec file to eliminate the dependency cycle for the graphviz package. - Add libGLU and libGL as libraries to link to which was missing. OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=70 --- graphviz-gvedit.spec | 1 - graphviz-plugins.spec | 1 - graphviz-smyrna-link_against_glu.patch | 17 +++ graphviz-smyrna.changes | 8 ++ graphviz-smyrna.spec | 154 +++++++++++++++++++++++++ graphviz.changes | 6 + graphviz.spec | 1 - 7 files changed, 185 insertions(+), 3 deletions(-) create mode 100644 graphviz-smyrna-link_against_glu.patch create mode 100644 graphviz-smyrna.changes create mode 100644 graphviz-smyrna.spec diff --git a/graphviz-gvedit.spec b/graphviz-gvedit.spec index 036f128..e1c1de1 100644 --- a/graphviz-gvedit.spec +++ b/graphviz-gvedit.spec @@ -36,7 +36,6 @@ BuildRequires: automake BuildRequires: bison BuildRequires: fdupes BuildRequires: flex -BuildRequires: freeglut-devel BuildRequires: freetype2-devel >= 2 BuildRequires: gcc-c++ BuildRequires: libXaw-devel diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec index 593a0ec..2dfedda 100644 --- a/graphviz-plugins.spec +++ b/graphviz-plugins.spec @@ -32,7 +32,6 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: bison BuildRequires: flex -BuildRequires: freeglut-devel BuildRequires: freetype2-devel >= 2 BuildRequires: gcc-c++ BuildRequires: gd-devel diff --git a/graphviz-smyrna-link_against_glu.patch b/graphviz-smyrna-link_against_glu.patch new file mode 100644 index 0000000..37cffcc --- /dev/null +++ b/graphviz-smyrna-link_against_glu.patch @@ -0,0 +1,17 @@ +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: configure.ac +=================================================================== +--- configure.ac.orig 2013-10-23 17:25:44.020188917 +0200 ++++ configure.ac 2013-10-23 17:26:17.637411247 +0200 +@@ -2811,7 +2811,7 @@ else + + AC_CHECK_HEADER(GL/glut.h, + AC_CHECK_LIB(glut,main, +- [GLUT_LIBS="$GLUT_LIBS -lglut" ++ [GLUT_LIBS="$GLUT_LIBS -lglut $(pkg-config --libs glu)" + use_glut="Yes" + AC_DEFINE_UNQUOTED(HAVE_GLUT,1,[Define if you have the GLUT library])], + use_glut="No (missing libglut)" diff --git a/graphviz-smyrna.changes b/graphviz-smyrna.changes new file mode 100644 index 0000000..52d8a98 --- /dev/null +++ b/graphviz-smyrna.changes @@ -0,0 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 24 11:16:01 CEST 2013 - pth@suse.de + +- Split off smyrna into its own package and spec file to eliminate + the dependency cycle for the graphviz package. + +- Add libGLU and libGL as libraries to link to which was missing. + diff --git a/graphviz-smyrna.spec b/graphviz-smyrna.spec new file mode 100644 index 0000000..486ca24 --- /dev/null +++ b/graphviz-smyrna.spec @@ -0,0 +1,154 @@ +# +# spec file for package graphviz-smyrna +# +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%define mname graphviz + +Name: graphviz-smyrna +Version: 2.34.0 +Release: 0 +Summary: Glut based graph viewer +License: IPL-1.0 +Group: Productivity/Graphics/Visualization/Graph +Url: http://www.graphviz.org/ +Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version}.tar.gz +Source2: graphviz-rpmlintrc +Patch2: graphviz-fix-pkgIndex.patch +#PATCH-FIX-UPSTREAM There are too many type-punnings in the vmalloc sources +Patch3: graphviz-no_strict_aliasing.patch +Patch4: graphviz-python3_version.patch +#PATCH-FIX-UPSTREAM add flags to also link against libGLU and libGL +Patch10: graphviz-smyrna-link_against_glu.patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: bison +BuildRequires: fdupes +BuildRequires: flex +BuildRequires: freeglut-devel +BuildRequires: freetype2-devel >= 2 +BuildRequires: gcc-c++ +BuildRequires: libXaw-devel +BuildRequires: libexpat-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libqt4-devel +BuildRequires: libstdc++-devel +BuildRequires: libtool +BuildRequires: zlib-devel +%ifnarch aarch64 +%if 0%suse_version > 1220 +BuildRequires: freeglut-devel +BuildRequires: glu-devel +BuildRequires: gtkglarea2-devel +BuildRequires: gtkglext-devel +BuildRequires: gts-devel +BuildRequires: libglade2-devel +%endif +%endif +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xext) +Requires(pre): /bin/cat +Requires(pre): /bin/rm +Recommends: graphviz = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +This is the graph editor included with graphviz, packaged +separately to avoid cycles in the build of the graphviz +package. + +%prep +%setup -q -n %{mname}-%{version} +%patch2 +%patch3 +%patch4 -p1 +%patch10 + +# Fix path in generated man pages +sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl + +%build +autoreconf -fi +WARN_FLAGS="-W -Wall -Wno-unused-parameter -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith" +CFLAGS="%{optflags} $WARN_FLAGS" +%ifarch %ix86 x86_64 +CFLAGS="$CFLAGS -ffast-math" +%endif + +export CFLAGS="$CFLAGS" +export CPPFLAGS="%{optflags}" +%configure \ + --with-x \ + --with-mylibgd \ + --disable-static \ + --enable-ltdl-install=no \ + --with-ipsepcola \ + --without-ming \ + --disable-io \ + --disable-silent-rules \ + --with-mylibgd=no \ + --with-libgd=no \ + --with-smyrna=yes +make %{?_smp_mflags} DESTDIR=%{buildroot} + +%install +make install \ + DESTDIR=%{buildroot} \ + docdir=%{buildroot}%{_docdir}/%{mname} \ + pkgconfigdir=%{_libdir}/pkgconfig + +find %{buildroot} -type f -name "*.la" -print0 | xargs -0 rm -f + +mkdir -p %{buildroot}/%{_docdir} +mkdir -p %{buildroot}%{_datadir}/%{mname} + +rm -f %{buildroot}/%{_libdir}/%{mname}/pkgIndex.tcl + +cp -a %{buildroot}%{_datadir}/%{mname}/doc __doc +rm -rf %{buildroot}%{_datadir}/%{mname}/doc + +rm -rf %{buildroot}%{_libdir} + +mv %{buildroot}/%{_mandir}/man1/smyrna.1 /tmp/smyrna.1 +rm -f %{buildroot}/%{_mandir}/man1/* +rm -rf %{buildroot}/%{_mandir}/man[37] +mv /tmp/smyrna.1 %{buildroot}/%{_mandir}/man1/smyrna.1 + +mv %{buildroot}/%{_bindir}/smyrna /tmp/smyrna +rm -f %{buildroot}/%{_bindir}/* +mv /tmp/smyrna %{buildroot}/%{_bindir}/smyrna + +rm -rf %{buildroot}%{_datadir}/%{mname}/graphs +rm -rf %{buildroot}%{_datadir}/%{mname}/examples +rm -rf %{buildroot}%{_datadir}/%{mname}/gvedit +rm -rf %{buildroot}%{_datadir}/%{mname}/gvpr +rm -rf %{buildroot}%{_datadir}/%{mname}/lefty +rm -rf %{buildroot}%{_includedir}/%{mname} + +%files +%defattr(-,root,root) +%doc COPYING +%attr(755,root,root) %{_bindir}/smyrna +%dir %{_datadir}/%{mname} +%{_datadir}/%{mname}/smyrna +%doc %{_mandir}/man1/*.1* + +%changelog diff --git a/graphviz.changes b/graphviz.changes index 902e448..39f67fd 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 23 12:30:42 CEST 2013 - pth@suse.de + +- Split off smyrna into its own package and spec to eliminate the + dependency cycle for graphiz. + ------------------------------------------------------------------- Mon Oct 14 14:06:03 CEST 2013 - pth@suse.de diff --git a/graphviz.spec b/graphviz.spec index 6f4012e..1900922 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -38,7 +38,6 @@ BuildRequires: automake BuildRequires: bison BuildRequires: fdupes BuildRequires: flex -BuildRequires: freeglut-devel BuildRequires: freetype2-devel >= 2 BuildRequires: gcc-c++ BuildRequires: libXaw-devel From 920870374d209c832cbecfa4662f451151326190f91b0ae7f3f0ca43f36811ea Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Wed, 30 Oct 2013 12:23:06 +0000 Subject: [PATCH 13/19] - Add graphviz-getaddrinfo.patch to use getaddrinfo instead of gethostbyname. OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=71 --- graphviz-getaddrinfo.patch | 67 ++++++++++++++++++++++++++++++++++++++ graphviz.changes | 6 ++++ graphviz.spec | 5 +++ 3 files changed, 78 insertions(+) create mode 100644 graphviz-getaddrinfo.patch diff --git a/graphviz-getaddrinfo.patch b/graphviz-getaddrinfo.patch new file mode 100644 index 0000000..17a68fd --- /dev/null +++ b/graphviz-getaddrinfo.patch @@ -0,0 +1,67 @@ +--- + cmd/lefty/os/unix/io.c | 43 +++++++++++++++++++++++++++++++------------ + 1 file changed, 31 insertions(+), 12 deletions(-) + +Index: cmd/lefty/os/unix/io.c +=================================================================== +--- cmd/lefty/os/unix/io.c.orig 2013-09-07 03:07:52.000000000 +0200 ++++ cmd/lefty/os/unix/io.c 2013-10-29 18:18:55.989590810 +0100 +@@ -285,27 +285,46 @@ int IOwriteline (int ioi, char *bufp) { + + static FILE *serverconnect (char *name) { + char *host, *portp, buf[1024]; +- int port; +- struct hostent *hp; +- struct sockaddr_in sin; + int cfd; ++ struct addrinfo hints; ++ struct addrinfo *result, *rp; ++ ++ memset(&hints, 0, sizeof(struct addrinfo)); ++ ++ hints.ai_family = AF_UNSPEC; /* Allow IPv4 or IPv6 */ ++ hints.ai_socktype = SOCK_STREAM;/* Stream socket */ ++ hints.ai_flags = AI_PASSIVE; /* For wildcard IP address */ ++ hints.ai_protocol = 0; /* Any protocol */ ++ hints.ai_canonname = NULL; ++ hints.ai_addr = NULL; ++ hints.ai_next = NULL; + + strcpy (buf, name); + host = buf + 9; + portp = strchr (host, '/'); ++ + if (*host == 0 || !portp) + return NULL; +- *portp++ = 0, port = atoi (portp); +- if (!(hp = gethostbyname (host))) +- return NULL; +- memset ((char *) &sin, 1, sizeof (sin)); +- memcpy ((char *) &sin.sin_addr, hp->h_addr, hp->h_length); +- sin.sin_family = hp->h_addrtype; +- sin.sin_port = htons (port); +- if ((cfd = socket (hp->h_addrtype, SOCK_STREAM, 0)) < 0) ++ ++ *portp++ = 0; ++ ++ if (!(cfd = getaddrinfo(host, portp, &hints, &result))) + return NULL; +- if (connect (cfd, (struct sockaddr *) &sin, sizeof (sin)) < 0) ++ ++ for (rp = result; rp != NULL; rp = rp->ai_next) { ++ cfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); ++ ++ if (cfd == -1) ++ continue; ++ if (connect(cfd, rp->ai_addr, rp->ai_addrlen) != -1) ++ break; /* Success */ ++ } ++ ++ freeaddrinfo(result); ++ ++ if (cfd < 0 || rp == NULL) + return NULL; ++ + return fdopen (cfd, "w+"); + } + diff --git a/graphviz.changes b/graphviz.changes index 39f67fd..3fa5eda 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 29 12:22:26 CET 2013 - pth@suse.de + +- Add graphviz-getaddrinfo.patch to use getaddrinfo instead of + gethostbyname. + ------------------------------------------------------------------- Wed Oct 23 12:30:42 CEST 2013 - pth@suse.de diff --git a/graphviz.spec b/graphviz.spec index 1900922..b414834 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -33,6 +33,10 @@ Patch2: graphviz-fix-pkgIndex.patch Patch3: graphviz-no_strict_aliasing.patch #PATCH-FIX-UPSTREAM print can only be called as function in python3 Patch4: graphviz-python3_version.patch +#PATCH-FIX-UPSTREAM Use getaddrinfo instead of gethostbyname +# This got accepted upstream so it can be removed on the next +# release. +Patch5: graphviz-getaddrinfo.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -92,6 +96,7 @@ Note: If you need output in png format you also need to install %patch2 %patch3 %patch4 -p1 +%patch5 # Fix path in generated man pages sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl From 41d1343d4f848bca978dfab3c1d20b0acbcdeadaeb8a7e2b84d965cac9be52d1 Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Mon, 9 Dec 2013 05:52:57 +0000 Subject: [PATCH 14/19] Accepting request 209774 from openSUSE:Factory:PowerLE Please submit to factory. - Add powerpc64le to list of lib64 platforms (graphviz-ppc64le_lib64_support.patch). OBS-URL: https://build.opensuse.org/request/show/209774 OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=72 --- graphviz-plugins.changes | 6 ++++++ graphviz-plugins.spec | 2 ++ graphviz-ppc64le_lib64_support.patch | 11 +++++++++++ 3 files changed, 19 insertions(+) create mode 100644 graphviz-ppc64le_lib64_support.patch diff --git a/graphviz-plugins.changes b/graphviz-plugins.changes index f04c871..6ffad38 100644 --- a/graphviz-plugins.changes +++ b/graphviz-plugins.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Dec 6 22:26:21 UTC 2013 - matz@suse.de + +- Add powerpc64le to list of lib64 platforms + (graphviz-ppc64le_lib64_support.patch). + ------------------------------------------------------------------- Mon Oct 14 15:28:40 CEST 2013 - pth@suse.de diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec index 2dfedda..a800c06 100644 --- a/graphviz-plugins.spec +++ b/graphviz-plugins.spec @@ -104,6 +104,7 @@ Patch103: graphviz-2.20.2-interpreter_names.patch Patch106: graphviz-fix-pkgIndex.patch #PATCH-FIX-UPSTREAM Don't warn about harmless issues with swig generated code Patch108: graphviz-useless_warnings.patch +Patch109: graphviz-ppc64le_lib64_support.patch Requires(pre): coreutils BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -275,6 +276,7 @@ Provides some additional PDF and HTML documentation for graphviz. %patch103 %patch106 %patch108 +%patch109 # Fix path in generated man pages sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl diff --git a/graphviz-ppc64le_lib64_support.patch b/graphviz-ppc64le_lib64_support.patch new file mode 100644 index 0000000..93d4dc0 --- /dev/null +++ b/graphviz-ppc64le_lib64_support.patch @@ -0,0 +1,11 @@ +--- configure.ac ++++ configure.ac +@@ -102,7 +102,7 @@ if test -z "$LIBPOSTFIX"; then + case "${host_os}" in + *linux* ) + case "${host_cpu}" in +- aarch64 | powerpc64 | s390x | x86_64 | sparc64 ) ++ aarch64 | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 ) + LIBPOSTFIX="64" + ;; + esac From 2f76a6f0dbf69a7eb297b879e0e3337446a261b886df5055dfd98c12a25d8266 Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Thu, 2 Jan 2014 08:55:15 +0000 Subject: [PATCH 15/19] Accepting request 212597 from home:mrdocs:branches:graphics OBS-URL: https://build.opensuse.org/request/show/212597 OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=73 --- graphviz-smyrna.changes | 5 +++++ graphviz-smyrna.spec | 1 - graphviz.spec | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/graphviz-smyrna.changes b/graphviz-smyrna.changes index 52d8a98..ab3eca1 100644 --- a/graphviz-smyrna.changes +++ b/graphviz-smyrna.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 2 02:21:22 UTC 2014 - mrdocs@opensuse.org + +- drop BuildRequires:gtkglarea2-devel its not in Factory + ------------------------------------------------------------------- Thu Oct 24 11:16:01 CEST 2013 - pth@suse.de diff --git a/graphviz-smyrna.spec b/graphviz-smyrna.spec index 486ca24..a4dccb6 100644 --- a/graphviz-smyrna.spec +++ b/graphviz-smyrna.spec @@ -53,7 +53,6 @@ BuildRequires: zlib-devel %if 0%suse_version > 1220 BuildRequires: freeglut-devel BuildRequires: glu-devel -BuildRequires: gtkglarea2-devel BuildRequires: gtkglext-devel BuildRequires: gts-devel BuildRequires: libglade2-devel diff --git a/graphviz.spec b/graphviz.spec index b414834..e1e0a82 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -24,7 +24,7 @@ Version: 2.34.0 Release: 0 Summary: Graph Visualization Tools License: IPL-1.0 -Group: Productivity/Graphics/Visualization/Graph +Group: Applications/Productivity Url: http://www.graphviz.org/ Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz Source2: graphviz-rpmlintrc From 863eea735efb5ac558db6c592d25b9b3514569e3caea3ac69c2636d279f47ad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sat, 11 Jan 2014 12:05:02 +0000 Subject: [PATCH 16/19] Accepting request 213565 from home:coolo:branches:openSUSE:Factory - remove unneeded ksh dependency OBS-URL: https://build.opensuse.org/request/show/213565 OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=74 --- graphviz-gvedit.spec | 2 +- graphviz-plugins.changes | 5 +++++ graphviz-plugins.spec | 3 +-- graphviz-smyrna.spec | 2 +- graphviz.spec | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/graphviz-gvedit.spec b/graphviz-gvedit.spec index e1c1de1..1a58d05 100644 --- a/graphviz-gvedit.spec +++ b/graphviz-gvedit.spec @@ -1,7 +1,7 @@ # # spec file for package graphviz-gvedit # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/graphviz-plugins.changes b/graphviz-plugins.changes index 6ffad38..a532a74 100644 --- a/graphviz-plugins.changes +++ b/graphviz-plugins.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jan 11 07:27:19 UTC 2014 - coolo@suse.com + +- remove unneeded ksh dependency + ------------------------------------------------------------------- Fri Dec 6 22:26:21 UTC 2013 - matz@suse.de diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec index a800c06..28e0a7b 100644 --- a/graphviz-plugins.spec +++ b/graphviz-plugins.spec @@ -1,7 +1,7 @@ # # spec file for package graphviz-plugins # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -39,7 +39,6 @@ BuildRequires: ghostscript BuildRequires: gmp-devel BuildRequires: graphviz BuildRequires: guile-devel -BuildRequires: ksh BuildRequires: libexpat-devel BuildRequires: libgnomeui-devel BuildRequires: libjpeg-devel diff --git a/graphviz-smyrna.spec b/graphviz-smyrna.spec index a4dccb6..8e53403 100644 --- a/graphviz-smyrna.spec +++ b/graphviz-smyrna.spec @@ -1,7 +1,7 @@ # # spec file for package graphviz-smyrna # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/graphviz.spec b/graphviz.spec index e1e0a82..615a4d0 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -1,7 +1,7 @@ # # spec file for package graphviz # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From d8cc6f818a4134f64d42f1a6de5816fdbc619ffbd88905a5ab7397a289fb6b89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sat, 11 Jan 2014 12:05:32 +0000 Subject: [PATCH 17/19] Accepting request 213573 from openSUSE:Factory:PowerLE - graphviz-fix-includes.patch: Use #include "cgraph.h", not in graphviz/types.h. OBS-URL: https://build.opensuse.org/request/show/213573 OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=75 --- graphviz-fix-includes.patch | 13 +++++++++++++ graphviz.changes | 6 ++++++ graphviz.spec | 4 ++++ 3 files changed, 23 insertions(+) create mode 100644 graphviz-fix-includes.patch diff --git a/graphviz-fix-includes.patch b/graphviz-fix-includes.patch new file mode 100644 index 0000000..c70af68 --- /dev/null +++ b/graphviz-fix-includes.patch @@ -0,0 +1,13 @@ +Index: lib/common/types.h.in +=================================================================== +--- lib/common/types.h.in.orig 2013-09-07 03:11:41.000000000 +0200 ++++ lib/common/types.h.in 2013-12-11 17:12:07.000000000 +0100 +@@ -46,7 +46,7 @@ extern "C" { + typedef int (*bsearch_cmpf) (const void *, const void *); + + #ifdef WITH_CGRAPH +-#include ++#include "cgraph.h" + typedef struct Agraph_s graph_t; + typedef struct Agnode_s node_t; + typedef struct Agedge_s edge_t; diff --git a/graphviz.changes b/graphviz.changes index 3fa5eda..a009cf8 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Dec 11 16:17:50 UTC 2013 - matz@suse.de + +- graphviz-fix-includes.patch: Use #include "cgraph.h", not + in graphviz/types.h. + ------------------------------------------------------------------- Tue Oct 29 12:22:26 CET 2013 - pth@suse.de diff --git a/graphviz.spec b/graphviz.spec index 615a4d0..a5d5e8a 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -37,6 +37,9 @@ Patch4: graphviz-python3_version.patch # This got accepted upstream so it can be removed on the next # release. Patch5: graphviz-getaddrinfo.patch +#PATCH-FIX-UPSTREAM This is fixed upstream in a similar way, can be +# removed update to next release +Patch6: graphviz-fix-includes.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -97,6 +100,7 @@ Note: If you need output in png format you also need to install %patch3 %patch4 -p1 %patch5 +%patch6 # Fix path in generated man pages sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl From 95d2e7b0914bd09a2b6f419150823478a8f3d0879eb1acaf8eedf5dab91fdd75 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 16 Jan 2014 16:06:54 +0000 Subject: [PATCH 18/19] Accepting request 214074 from home:k0da:branches:graphics - Don't build C# binding without mono. Otherwise we get unpackaged files. OBS-URL: https://build.opensuse.org/request/show/214074 OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=76 --- graphviz-plugins.changes | 6 ++++++ graphviz-plugins.spec | 3 +++ 2 files changed, 9 insertions(+) diff --git a/graphviz-plugins.changes b/graphviz-plugins.changes index a532a74..b0e5069 100644 --- a/graphviz-plugins.changes +++ b/graphviz-plugins.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 14 11:54:17 UTC 2014 - dvlaeev@suse.com + +- Don't build C# binding without mono. Otherwise we get unpackaged + files. + ------------------------------------------------------------------- Sat Jan 11 07:27:19 UTC 2014 - coolo@suse.com diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec index 28e0a7b..4a11992 100644 --- a/graphviz-plugins.spec +++ b/graphviz-plugins.spec @@ -304,6 +304,9 @@ export CPPFLAGS="%{optflags}" --without-ming \ --disable-silent-rules \ --enable-ltdl-install=no \ +%if %{!with mono} + --enable-sharp=no \ +%endif --disable-io make DESTDIR=%{buildroot} %{?_smp_mflags} From d25c0fe84b6692bf2bc9f2b5dd2ba1df50b515998900d60b639f6215c5f7771c Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 18 Jan 2014 20:50:38 +0000 Subject: [PATCH 19/19] Accepting request 214364 from home:coolo:branches:openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/214364 OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=77 --- graphviz-plugins.changes | 11 +++++++++++ graphviz-plugins.spec | 12 ++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/graphviz-plugins.changes b/graphviz-plugins.changes index b0e5069..449bd49 100644 --- a/graphviz-plugins.changes +++ b/graphviz-plugins.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Jan 18 17:06:59 UTC 2014 - coolo@suse.com + +- fix mono bcond. It's without, not !with + +------------------------------------------------------------------- +Sat Jan 18 16:47:55 UTC 2014 - coolo@suse.com + +- use global java bcond instead of an own now that it buildrequires + jdk and no longer gcc + ------------------------------------------------------------------- Tue Jan 14 11:54:17 UTC 2014 - dvlaeev@suse.com diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec index 4a11992..fc3d309 100644 --- a/graphviz-plugins.spec +++ b/graphviz-plugins.spec @@ -19,10 +19,10 @@ %define mname graphviz %ifarch aarch64 -%bcond_with graphviz_java +%bcond_with java %bcond_with graphviz_ocaml %else -%bcond_without graphviz_java +%bcond_without java %bcond_without graphviz_ocaml %endif %bcond_without mono @@ -50,7 +50,7 @@ BuildRequires: m4 BuildRequires: gtkglext-devel %endif %endif -%if %{with graphviz_java} +%if %{with java} #BuildRequires: gcc-java #BuildRequires: libgcj-devel BuildRequires: java-devel >= 1.6.0 @@ -151,7 +151,7 @@ Provides: graphviz_plugin = %{version} A collection of tools and tcl packages for the manipulation and layout of graphs (as in nodes and edges, not as in bar charts). -%if %{with graphviz_java} +%if %{with java} %package -n graphviz-java Summary: Graph Visualization Tools Group: Productivity/Graphics/Visualization/Graph @@ -304,7 +304,7 @@ export CPPFLAGS="%{optflags}" --without-ming \ --disable-silent-rules \ --enable-ltdl-install=no \ -%if %{!with mono} +%if %{without mono} --enable-sharp=no \ %endif --disable-io @@ -384,7 +384,7 @@ rm -rf %{buildroot}/%{_libdir}/%{mname}/%{_lib} %{_libdir}/graphviz/guile %doc %{_mandir}/man3/gv.3guile.gz -%if %{with graphviz_java} +%if %{with java} %files -n graphviz-java %defattr(-,root,root,-) %{_libdir}/graphviz/java