From 1bb13b83a2b420b3e94141520800543bfcd0d837bf2925c3cfe58b63ccceb3cf Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Sun, 4 Apr 2010 17:38:55 +0000 Subject: [PATCH 1/3] Accepting request 36887 from home:oertel:branches:openSUSE:Factory Copy from home:oertel:branches:openSUSE:Factory/graphviz via accept of submit request 36887 revision 2. Request was accepted with message: forward OBS-URL: https://build.opensuse.org/request/show/36887 OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=10 --- graphviz-gd_png_check_sig.patch | 11 +++++++++++ graphviz.changes | 6 ++++++ graphviz.spec | 2 ++ 3 files changed, 19 insertions(+) create mode 100644 graphviz-gd_png_check_sig.patch diff --git a/graphviz-gd_png_check_sig.patch b/graphviz-gd_png_check_sig.patch new file mode 100644 index 0000000..a5973c9 --- /dev/null +++ b/graphviz-gd_png_check_sig.patch @@ -0,0 +1,11 @@ +--- 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.changes b/graphviz.changes index 6cc356a..7ddd22c 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Apr 4 18:47:39 CEST 2010 - ro@suse.de + +- fix build of gd library with new libpng14 + (should use system gd lib ?) + ------------------------------------------------------------------- Tue Mar 16 18:52:54 CET 2010 - ro@suse.de diff --git a/graphviz.spec b/graphviz.spec index 6e36909..cd2030c 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -35,6 +35,7 @@ Patch0: graphviz-fix-pkgIndex.patch Patch3: graphviz-neato_splines.patch Patch11: graphviz-2.20.2-interpreter_names.patch Patch13: graphviz-stddefs.patch +Patch14: graphviz-gd_png_check_sig.patch Url: http://www.graphviz.org/ License: IBM Public License .. Prefix: /usr @@ -90,6 +91,7 @@ Authors: %patch3 %patch11 %patch13 +%patch14 # 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 # remove broken macros From d37d676473e148f68cdaf5dbbb1c0fe6a6aba705f11076516247135b5671ab77 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Sun, 4 Apr 2010 18:07:36 +0000 Subject: [PATCH 2/3] Accepting request 36898 from graphics checked in (request 36898) OBS-URL: https://build.opensuse.org/request/show/36898 OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=11 --- graphviz-gd_png_check_sig.patch | 11 ----------- graphviz.changes | 6 ------ graphviz.spec | 2 -- 3 files changed, 19 deletions(-) delete mode 100644 graphviz-gd_png_check_sig.patch 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.changes b/graphviz.changes index 7ddd22c..6cc356a 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Sun Apr 4 18:47:39 CEST 2010 - ro@suse.de - -- fix build of gd library with new libpng14 - (should use system gd lib ?) - ------------------------------------------------------------------- Tue Mar 16 18:52:54 CET 2010 - ro@suse.de diff --git a/graphviz.spec b/graphviz.spec index cd2030c..6e36909 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -35,7 +35,6 @@ Patch0: graphviz-fix-pkgIndex.patch Patch3: graphviz-neato_splines.patch Patch11: graphviz-2.20.2-interpreter_names.patch Patch13: graphviz-stddefs.patch -Patch14: graphviz-gd_png_check_sig.patch Url: http://www.graphviz.org/ License: IBM Public License .. Prefix: /usr @@ -91,7 +90,6 @@ Authors: %patch3 %patch11 %patch13 -%patch14 # 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 # remove broken macros From e3bd3a15ef3ff7f9d705980c0f2ed0a764324458f66429951c0cbb99885398a0 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Sun, 4 Apr 2010 18:07:37 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/graphviz revision 34.0 OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=4ee06cfea2811d7c7292207f31bf942f --- graphviz-gd_png_check_sig.patch | 11 +++++++++++ graphviz-plugins.spec | 2 +- graphviz.changes | 6 ++++++ graphviz.spec | 4 +++- 4 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 graphviz-gd_png_check_sig.patch diff --git a/graphviz-gd_png_check_sig.patch b/graphviz-gd_png_check_sig.patch new file mode 100644 index 0000000..a5973c9 --- /dev/null +++ b/graphviz-gd_png_check_sig.patch @@ -0,0 +1,11 @@ +--- 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.spec b/graphviz-plugins.spec index 15dfe50..ab36405 100644 --- a/graphviz-plugins.spec +++ b/graphviz-plugins.spec @@ -30,7 +30,7 @@ BuildRequires: graphviz gtkglext-devel libglade2-devel libgnomeui-devel BuildRequires: fdupes %endif Version: 2.26.3 -Release: 1 +Release: 2 AutoReqProv: on Summary: Graph Visualization Tools Group: Productivity/Graphics/Visualization/Graph diff --git a/graphviz.changes b/graphviz.changes index 6cc356a..7ddd22c 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Apr 4 18:47:39 CEST 2010 - ro@suse.de + +- fix build of gd library with new libpng14 + (should use system gd lib ?) + ------------------------------------------------------------------- Tue Mar 16 18:52:54 CET 2010 - ro@suse.de diff --git a/graphviz.spec b/graphviz.spec index 6e36909..3069169 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -25,7 +25,7 @@ BuildRequires: xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libXpm-devel BuildRequires: xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXmu-devel xorg-x11-libXt-devel PreReq: /bin/rm Version: 2.26.3 -Release: 1 +Release: 2 AutoReqProv: on Summary: Graph Visualization Tools Group: Productivity/Graphics/Visualization/Graph @@ -35,6 +35,7 @@ Patch0: graphviz-fix-pkgIndex.patch Patch3: graphviz-neato_splines.patch Patch11: graphviz-2.20.2-interpreter_names.patch Patch13: graphviz-stddefs.patch +Patch14: graphviz-gd_png_check_sig.patch Url: http://www.graphviz.org/ License: IBM Public License .. Prefix: /usr @@ -90,6 +91,7 @@ Authors: %patch3 %patch11 %patch13 +%patch14 # 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 # remove broken macros