Accepting request 1315762 from graphics

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1315762
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/graphviz?expand=0&rev=108

graphviz-14.0.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:78d06cf3db0cc2298199d9ca0a9dd4be7f623f90f70ca72f60f1880d848a4f3d
+size 33868656

graphviz-2.20.2-interpreter_names.patch

@@ -1,10 +0,0 @@
-Index: tclpkg/gv/demo/modgraph.lua
-===================================================================
---- tclpkg/gv/demo/modgraph.lua.orig
-+++ tclpkg/gv/demo/modgraph.lua
-@@ -1,4 +1,4 @@
--#!/usr/bin/lua
-+#!/usr/bin/lua5.1
- 
- -- display the kernel module dependencies
- 

graphviz-array_overflow.patch

@@ -1,19 +0,0 @@
----
- lib/common/htmltable.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: lib/common/htmltable.c
-===================================================================
---- lib/common/htmltable.c.orig	2014-04-13 22:40:25.000000000 +0200
-+++ lib/common/htmltable.c	2014-05-23 00:01:41.203062717 +0200
-@@ -300,8 +300,8 @@ static void doBorder(GVJ_t * job, htmlda
- 	    gvrender_polyline(job, AF+2, 4);
- 	    break;
- 	case BORDER_TOP|BORDER_LEFT|BORDER_BOTTOM :
--	    AF[5] = AF[1];
--	    AF[6] = AF[2];
-+	    AF[4] = AF[1];
-+	    AF[5] = AF[2];
- 	    gvrender_polyline(job, AF+3, 4);
- 	    break;
- 	case BORDER_LEFT|BORDER_BOTTOM|BORDER_RIGHT :

graphviz-fix-pkgIndex.patch

@@ -6,9 +6,13 @@
 # esac
 #-echo "	load [file join \$dir $lib] $2\"" >>pkgIndex.tcl
 #+echo "	load $lib $2\"" >>pkgIndex.tcl
---- tclpkg/mkpkgindex.py
-+++ tclpkg/mkpkgindex.py
-@@ -39,7 +39,7 @@
+---
+# tclpkg/mkpkgindex.py |    2 +-
+# 1 file changed, 1 insertion(+), 1 deletion(-)
+#
+--- a/tclpkg/mkpkgindex.py
++++ b/tclpkg/mkpkgindex.py
+@@ -41,7 +41,7 @@
          f.write(f'package ifneeded {options.name} {version} "\n')
          if "tk" in str(options.file):
              f.write("\tpackage require Tk 8.3\n")
@@ -17,4 +21,3 @@
  
  
  if __name__ == "__main__":
-

graphviz-no_php_extra_libs.patch

@@ -1,19 +0,0 @@
---- configure.ac	2019-07-13 05:14:04.000000000 +0200
-+++ configure.ac	2020-12-31 13:46:52.374560516 +0100
-@@ -1116,7 +1116,7 @@ else
-#           PHP_INCLUDES="`$PHPCONFIG --includes`"
-#           PHP_INSTALL_DIR="`$PHPCONFIG --extension-dir`"
-#           PHP_INSTALL_DATADIR="/usr/share/php"
-#-          PHP_LIBS="`$PHPCONFIG --ldflags` `$PHPCONFIG --libs`"
-#+          PHP_LIBS="`$PHPCONFIG --ldflags`"
-#           save_CPPFLAGS=$CPPFLAGS
-#           CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
-#           AC_CHECK_HEADER(php.h,,[
-           PHP_INCLUDES="`$PHPCONFIG --includes`"
-           PHP_INSTALL_DIR="`$PHPCONFIG --extension-dir`"
-           PHP_INSTALL_DATADIR="/usr/share/php"
--          PHP_LIBS="`$PHPCONFIG --ldflags` `$PHPCONFIG --libs`"
-+          PHP_LIBS="`$PHPCONFIG --ldflags`"
-         fi
-       fi
-       if test "$PHP" != ""; then

graphviz-rpmlintrc

@@ -1,4 +1 @@
-# This line is mandatory to access the configuration functions
-from Config import *
 
-addFilter("lib.* obsolete-not-provided libgraphviz6")

graphviz-smyrna-link_against_glu.patch

@@ -1,8 +1,10 @@
-Index: configure.ac
-===================================================================
---- configure.ac.orig
-+++ configure.ac
-@@ -2395,7 +2395,7 @@ else
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1897,7 +1897,7 @@
  
    AC_CHECK_HEADER(GL/glut.h,
      AC_CHECK_LIB(glut,main,

graphviz-useless_warnings.patch

@@ -1,17 +0,0 @@
----
- tclpkg/gv/Makefile.am |    2 ++
- 1 file changed, 2 insertions(+)
-
-Index: tclpkg/gv/Makefile.am
-===================================================================
---- tclpkg/gv/Makefile.am.orig
-+++ tclpkg/gv/Makefile.am
-@@ -12,6 +12,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 gv_channel.h

graphviz.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Wed Oct 29 08:03:39 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Drop graphviz-2.20.2-interpreter_names.patch: do not set the
+  executable to /usr/bin/lua5.1; the script in question used
+  would not even work with lua 5.1 anymore, as it uses API
+  introduced with lua 5.2 anyway. The patch originally dates back
+  to 2008 and was barely touched since then.
+
+-------------------------------------------------------------------
+Mon Sep 22 12:40:04 UTC 2025 - Thomas Renninger <trenn@suse.de>
+
+- Update to 14.0.0
+  * Changes see ChangeLog.md
+- Remove unneeded patches (fixed mainline):
+D graphviz-array_overflow.patch
+D graphviz-no_php_extra_libs.patch
+D    graphviz-useless_warnings.patch
+D    swig-4.1.0.patch
+- Remove old, unneeded condition: if 0%{?suse_version} == 1315
+
+
 -------------------------------------------------------------------
 Fri May 30 10:49:41 UTC 2025 - Antonio Larrosa <alarrosa@suse.com>
 

graphviz.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package graphviz
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -37,15 +37,9 @@
 %define php_version 7
 %endif
 %endif
-# No pkgconfig(gts) in sle12 GA or SPx, but in sle15
-%if 0%{?suse_version} == 1315 && !0%{?is_opensuse}
-%bcond_with    gts
-%else
-%bcond_without gts
-%endif
-%define cdt_soversion 5
-%define cgraph_soversion 6
-%define gvc_soversion 6
+%define cdt_soversion 6
+%define cgraph_soversion 8
+%define gvc_soversion 7
 %define gvpr_soversion 2
 %define lab_gamut_soversion 1
 %define pathplan_soversion 4
@@ -56,7 +50,7 @@
 %bcond_with    java
 %bcond_with    ocaml
 Name:           graphviz%{psuffix}
-Version:        12.2.1
+Version:        14.0.0
 Release:        0
 Summary:        Graph Visualization Tools
 License:        EPL-1.0
@@ -67,14 +61,6 @@ Source1:        graphviz-rpmlintrc
 #PATCH-FIX-UPSTREAM add flags to also link against libGLU and libGL
 Patch0:         graphviz-smyrna-link_against_glu.patch
 Patch1:         graphviz-fix-pkgIndex.patch
-#PATCH-FIX-UPSTREAM Off-by-one bug
-Patch2:         graphviz-array_overflow.patch
-Patch3:         graphviz-2.20.2-interpreter_names.patch
-#PATCH-FIX-UPSTREAM Don't warn about harmless issues with swig generated code
-Patch4:         graphviz-useless_warnings.patch
-Patch6:         graphviz-no_php_extra_libs.patch
-# https://gitlab.com/graphviz/graphviz/-/issues/2303
-Patch7:         swig-4.1.0.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bison
@@ -86,14 +72,13 @@ BuildRequires:  guile-devel
 BuildRequires:  libstdc++-devel
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
+BuildRequires:  python3-base >= 3.9
 BuildRequires:  pkgconfig(expat)
+BuildRequires:  pkgconfig(gts)
 BuildRequires:  pkgconfig(zlib)
 Requires:       bitstream-vera-fonts
 Requires:       graphviz-plugins-core = %{version}
 Recommends:     graphviz-gd = %{version}
-%if %{with gts}
-BuildRequires:  pkgconfig(gts)
-%endif
 %if "%{flavor}" == "addons"
 BuildRequires:  freeglut-devel
 BuildRequires:  ghostscript
@@ -112,6 +97,7 @@ BuildRequires:  pkgconfig(glu)
 BuildRequires:  pkgconfig(gtkglext-1.0)
 BuildRequires:  pkgconfig(ice)
 BuildRequires:  pkgconfig(ijs)
+BuildRequires:  pkgconfig(libargon2)
 BuildRequires:  pkgconfig(libglade-2.0)
 BuildRequires:  pkgconfig(librsvg-2.0)
 BuildRequires:  pkgconfig(lua)
@@ -232,6 +218,9 @@ Requires:       perl = %{perl_version}
 The graphviz-perl package contains the Perl extension for the graphviz
 tools.
 
+%if "%{flavor}" == "addons"
+# flavor condition here only to calm down:
+# Possible unexpanded macro in: Requires:       php(api) =
 %package -n graphviz-php
 Summary:        PHP Extension for Graphviz
 Group:          Productivity/Graphics/Visualization/Graph
@@ -243,6 +232,7 @@ Requires:       php(zend-abi) = %{php_zend_api}
 %description -n graphviz-php
 The graphviz-php package contains the PHP extension for the graphviz
 tools.
+%endif
 
 %package -n python3-gv
 Summary:        Python 3 Extension for Graphviz
@@ -380,13 +370,8 @@ programs that use the graphviz libraries including man3 pages.
 %prep
 #autosetup breaks graphviz-addons
 %setup -q -n %{mname}-%{version}
-%patch -P 0
-%patch -P 1
-%patch -P 2
-%patch -P 3
-%patch -P 4
-%patch -P 6
-%patch -P 7 -p1
+%patch -P 0 -p1
+%patch -P 1 -p1
 
 # pkg-config returns 0 (TRUE) when guile-2.2 is present
 if pkg-config --atleast-version=2.2 guile-2.2; then
@@ -674,7 +659,7 @@ if test -x %{_bindir}/dot; then %{_bindir}/dot -c ; fi
 
 %if "%{flavor}" == ""
 %files
-%doc doc/FAQ.html AUTHORS README NEWS ChangeLog
+%doc doc/FAQ.html AUTHORS README NEWS CHANGELOG.md
 %license epl-v10.txt
 %{_bindir}/acyclic
 %{_bindir}/bcomps
@@ -754,7 +739,6 @@ if test -x %{_bindir}/dot; then %{_bindir}/dot -c ; fi
 %{_datadir}/%{mname}/gvpr/histogram
 %{_mandir}/man1/*.1%{ext_man}
 %{_mandir}/man7/*.7%{ext_man}
-%exclude %{_mandir}/man1/smyrna.1%{ext_man}
 
 %files -n libcdt%{cdt_soversion}
 %{_libdir}/libcdt.so.%{cdt_soversion}*

swig-4.1.0.patch

@@ -1,18 +0,0 @@
-diff --git a/tclpkg/gv/gv.i b/tclpkg/gv/gv.i
-index ea65ada2f..0bab8817f 100644
---- a/tclpkg/gv/gv.i
-+++ b/tclpkg/gv/gv.i
-@@ -10,6 +10,13 @@
- 
- %module gv
- 
-+#ifdef SWIGPHP
-+%pragma(php) code="/*
-+This is a deprecated interface.
-+Load graphviz via PHP's C API in php.ini instead.
-+*/"
-+#endif
-+
- #ifdef SWIGTCL
- // A typemap telling SWIG to ignore an argument for input
- // However, we still need to pass a pointer to the C function