From da0ecc79a37da9715f8ba74f5a916068f3943bf18a2de31ab9065dcb7eccd8a9 Mon Sep 17 00:00:00 2001
From: Philipp Thomas <pth@suse.com>
Date: Thu, 5 Sep 2013 17:54:08 +0000
Subject: [PATCH] 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 <pth@suse.de>
-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	<ast.h>
++#else
++#include	<ast_common.h>
+ #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	<cdt.h>
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