[packages/graphviz] - up to 12.2.1
baggins
baggins at pld-linux.org
Mon Mar 10 11:23:54 CET 2025
commit 7043bc5d08eea5444c001e3f06afcebf58da1448
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Mar 10 11:20:33 2025 +0100
- up to 12.2.1
cppflags.patch | 11 ----
doc-install.patch | 10 ++++
gcc14.patch | 11 ----
graphviz-fontpath.patch | 11 ----
graphviz-link.patch | 11 ----
graphviz-ming.patch | 39 -------------
graphviz-ruby.patch | 24 --------
graphviz.spec | 152 ++++++++----------------------------------------
gtk-no-xlib.patch | 60 -------------------
java.patch | 8 +--
10 files changed, 39 insertions(+), 298 deletions(-)
---
diff --git a/graphviz.spec b/graphviz.spec
index a479416..b6bdb7c 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -9,19 +9,16 @@
%bcond_without golang # Go bindings
%bcond_without guile # guile bindings
%bcond_without java # Java bindings
-%bcond_without ocaml # OCaml bindings
%bcond_with php # PHP bindings
%bcond_without perl # Perl bindings
%bcond_without ruby # Ruby bindings
%bcond_without tcl # Tcl bindings
%bcond_without lua # Lua bindings
%bcond_without r # R bindings
-%bcond_without python # Python bindings
%bcond_without python3 # Python 3 bindings
%bcond_with io # io language bindings (needs swig support)
# - plugins, features
%bcond_without gd # gd plugin and gd support in tcl package
-%bcond_without ming # ming support
%bcond_without devil # DevIL plugin
%bcond_without qt # Qt features (gvedit utility)
%bcond_without smyrna # SMYRNA utility (large graph viewer)
@@ -45,33 +42,24 @@
%ifnarch %go_arches
%undefine with_golang
%endif
-%if %{without python}
-%undefine with_python3
-%endif
%{?with_java:%{?use_default_jdk}}
Summary: Graph Visualization Tools
Summary(pl.UTF-8): Narzędzie do wizualizacji w postaci grafów
Name: graphviz
-Version: 2.50.0
-Release: 2
+Version: 12.2.1
+Release: 1
License: EPL v1.0
Group: X11/Applications/Graphics
#Source0Download: https://graphviz.org/download/source/
Source0: https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: ccc1c011d79fcdfccc1cb4be8a81edef
-Patch0: %{name}-fontpath.patch
-Patch1: %{name}-link.patch
+# Source0-md5: fbd836eec5edce3596b4b4a65716dcaf
+Patch0: doc-install.patch
Patch2: %{name}-bad-header.patch
Patch3: %{name}-php.patch
-Patch4: gcc14.patch
-Patch5: gtk-no-xlib.patch
-Patch7: %{name}-ruby.patch
-Patch10: %{name}-ming.patch
Patch15: ghostscript918.patch
Patch16: java.patch
-Patch17: cppflags.patch
URL: http://www.graphviz.org/
%{?with_devil:BuildRequires: DevIL-devel}
%{?with_r:BuildRequires: R}
@@ -93,9 +81,7 @@ BuildRequires: gdk-pixbuf2-devel >= 2.0
BuildRequires: gettext-tools
BuildRequires: ghostscript-devel
%{?with_golang:BuildRequires: golang}
-BuildRequires: gtk+2-devel >= 2:2.8.0
-# only tested, actually not used
-#BuildRequires: gtkglarea-devel >= 2.0
+BuildRequires: gtk+3-devel
BuildRequires: gts-devel
%{?with_guile:BuildRequires: guile-devel >= 2.0}
#BuildRequires: io
@@ -118,9 +104,7 @@ BuildRequires: libwebp-devel
BuildRequires: lua51
BuildRequires: lua51-devel >= 5.1
%endif
-%{?with_ming:BuildRequires: ming-devel >= 0.4}
%{?with_dotnet:BuildRequires: mono-csharp}
-%{?with_ocaml:BuildRequires: ocaml}
BuildRequires: pango-devel >= 1:1.14.9
BuildRequires: perl-devel
%if %{with php}
@@ -131,24 +115,23 @@ BuildRequires: swig-php >= 3.0.11
%endif
BuildRequires: pkgconfig
BuildRequires: poppler-glib-devel
-%{?with_python:BuildRequires: python3-devel >= 1:3.6}
%{?with_python3:BuildRequires: python3-devel >= 1:3.6}
%{?with_perl:BuildRequires: rpm-perlprov}
-%{?with_python:BuildRequires: rpm-pythonprov}
+%{?with_python3:BuildRequires: rpm-pythonprov}
BuildRequires: rpmbuild(macros) >= 2.021
%{?with_ruby:BuildRequires: ruby-devel >= 1.9}
BuildRequires: sed >= 4.0
-# swig-csharp,swig-go,swig-java,swig-lua,swig-ocaml in main swig
+# swig-csharp,swig-go,swig-java,swig-lua in main swig
# swig-io ???
BuildRequires: swig >= 1.3
%{?with_guile:BuildRequires: swig-guile >= 2.0.3}
%{?with_perl:BuildRequires: swig-perl >= 1.3}
-%{?with_python:BuildRequires: swig-python >= 1.3}
+%{?with_python3:BuildRequires: swig-python >= 1.3}
%{?with_ruby:BuildRequires: swig-ruby >= 1.3}
BuildRequires: tar >= 1:1.22
%if %{with tcl}
BuildRequires: swig-tcl >= 1.3
-BuildRequires: tcl-devel >= %{tcl_ver}
+BuildRequires: tcl-devel >= 8.6.0
BuildRequires: tk-devel >= 8.6.0
%endif
BuildRequires: xorg-lib-libX11-devel
@@ -160,7 +143,6 @@ BuildRequires: xz
BuildRequires: zlib-devel
%if %{with smyrna}
BuildRequires: OpenGL-glut-devel
-BuildRequires: gtkglext-devel >= 1.0
BuildRequires: libglade2-devel >= 2.0
%endif
%if %{with qt}
@@ -177,11 +159,14 @@ Requires(post,postun): /sbin/ldconfig
Requires: %{name}-libs = %{version}-%{release}
Requires: cairo >= 1.0.0
Requires: fonts-Type1-urw
-Requires: gtk+2 >= 2:2.8.0
+Requires: gtk+3
Requires: libltdl >= 2:2.2
Requires: librsvg >= 2.36.0
Requires: pango >= 1:1.14.9
-%{!?with_golang:Obsoletes: golang-graphviz < %{version}}
+%{!?with_golang:Obsoletes: golang-graphviz < 12.2.1}
+Obsoletes: graphviz-doc-html < 12.2.1
+Obsoletes: graphviz-ming < 12.2.1
+Obsoletes: ocaml-graphviz < 12.2.1
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -241,19 +226,6 @@ nie ma absolutnej konieczności używania formatu GIF, zalecane jest
używanie format PNG bezpośrednio z renderera cairo+pango obecnego w
podstawowym pakiecie graphviz.
-%package ming
-Summary: Graphviz plugin for flash renderer based on ming
-Summary(pl.UTF-8): Wtyczka Graphviza do renderowania w oparciu o bibliotekę ming
-Group: Applications/Multimedia
-Requires: %{name}-libs = %{version}-%{release}
-
-%description ming
-Graphviz plugin for -Tswf (flash) renderer based on ming.
-
-%description ming -l pl.UTF-8
-Wtyczka Graphviza do renderowania z opcją -Tswf (flash) w oparciu o
-bibliotekę ming.
-
%package devel
Summary: Header files for graphviz libraries
Summary(pl.UTF-8): Pliki nagłówkowe do bibliotek graphviz
@@ -296,18 +268,6 @@ SMYRNA to interaktywna przeglądarka grafów w formacie DOT. Jest
przeznaczona szczególnie do obsługi dużych grafów, udostępnia widok
płaski oraz topologiczny typu "rybie oko".
-%package doc-html
-Summary: HTML documentation for graphviz
-Summary(pl.UTF-8): Dokumentacja do graphviza w formacie HTML
-Group: Documentation
-BuildArch: noarch
-
-%description doc-html
-HTML documentation for graphviz.
-
-%description doc-html -l pl.UTF-8
-Dokumentacja do graphviza w formacie HTML.
-
%package doc-pdf
Summary: PDF documentation for graphviz
Summary(pl.UTF-8): Dokumentacja do graphviza w formacie PDF
@@ -398,19 +358,6 @@ LUA binding for graphviz.
%description -n lua-%{name} -l pl.UTF-8
Wiązania LUA dla graphviza.
-%package -n ocaml-%{name}
-Summary: OCaml binding for graphviz
-Summary(pl.UTF-8): Wiązania OCamla dla graphviza
-Group: Libraries
-Requires: %{name} = %{version}-%{release}
-Obsoletes: graphviz-ocaml < 2.26.3-1
-
-%description -n ocaml-%{name}
-OCaml binding for graphviz.
-
-%description -n ocaml-%{name} -l pl.UTF-8
-Wiązania OCamla dla graphviza.
-
%package -n perl-%{name}
Summary: Perl binding for graphviz
Summary(pl.UTF-8): Wiązania Perla dla graphviza
@@ -510,20 +457,15 @@ Wiązania graphviza dla języka R.
%prep
%setup -q
%patch -P 0 -p1
-%patch -P 1 -p1
%patch -P 3 -p1
-%patch -P 4 -p1
-%patch -P 5 -p1
-%patch -P 7 -p1
-%patch -P 10 -p1
%patch -P 15 -p1
%patch -P 16 -p1
-%patch -P 17 -p1
%{__sed} '1s@/usr/bin/lua$@/usr/bin/lua5.1@' -i tclpkg/gv/demo/modgraph.lua
%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' \
- tclpkg/gv/demo/modgraph.py
+ tclpkg/gv/demo/modgraph.py \
+ cmd/dot/dot_sandbox
%build
touch config/config.rpath
@@ -562,12 +504,9 @@ export CPPFLAGS
%{?with_io:--enable-io} \
%{!?with_java:--disable-java} \
--disable-ltdl-install \
- --enable-lefty \
%{!?with_lua:--disable-lua} \
- %{!?with_ocaml:--disable-ocaml} \
%{!?with_perl:--disable-perl} \
%{!?with_php:--disable-php} \
- %{!?with_python:--disable-python} \
%{!?with_python3:--disable-python3} \
%{!?with_r:--disable-r} \
%{!?with_ruby:--disable-ruby} \
@@ -578,7 +517,6 @@ export CPPFLAGS
%{!?with_devil:--without-devil} \
%{!?with_ipsepcola:--without-ipsepcola} \
%{!?with_gd:--without-libgd} \
- %{?with_ming:--with-ming} \
%{!?with_qt:--without-qt} \
%{!?with_smyrna:--without-smyrna} \
--with-visio \
@@ -625,10 +563,9 @@ touch $RPM_BUILD_ROOT%{_libdir}/graphviz/config
%{__rm} $RPM_BUILD_ROOT%{_libdir}/graphviz/java/org/graphviz/lib*.la
%endif
-rm -rf doc-html doc-pdf
-%{__mv} $RPM_BUILD_ROOT%{_datadir}/%{name}/doc/html doc-html
+rm -rf doc-pdf
%{__mv} $RPM_BUILD_ROOT%{_datadir}/%{name}/doc/pdf doc-pdf
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{name}/doc $RPM_BUILD_ROOT%{_docdir}
%{?with_smyrna:%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{name}/examples}
cd $RPM_BUILD_ROOT
@@ -666,7 +603,7 @@ fi
%attr(755,root,root) %{_bindir}/dot
%attr(755,root,root) %{_bindir}/dot2gxl
%attr(755,root,root) %{_bindir}/dot_builtins
-%attr(755,root,root) %{_bindir}/dotty
+%attr(755,root,root) %{_bindir}/dot_sandbox
%attr(755,root,root) %{_bindir}/edgepaint
%attr(755,root,root) %{_bindir}/fdp
%attr(755,root,root) %{_bindir}/gc
@@ -682,8 +619,6 @@ fi
%attr(755,root,root) %{_bindir}/gvpr
%attr(755,root,root) %{_bindir}/gxl2dot
%attr(755,root,root) %{_bindir}/gxl2gv
-%attr(755,root,root) %{_bindir}/lefty
-%attr(755,root,root) %{_bindir}/lneato
%attr(755,root,root) %{_bindir}/mingle
%attr(755,root,root) %{_bindir}/mm2gv
%attr(755,root,root) %{_bindir}/neato
@@ -702,19 +637,18 @@ fi
%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_dot_layout.so*
%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_gdk.so*
%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_gs.so*
-%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_gtk.so*
%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_lasi.so*
%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_neato_layout.so*
%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_pango.so*
%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_poppler.so*
%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_rsvg.so*
-%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_visio.so*
%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_webp.so*
%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_xlib.so*
+%{_libdir}/graphviz/libgvplugin_kitty.so*
+%{_libdir}/graphviz/libgvplugin_vt.so*
%dir %{_datadir}/graphviz
%dir %{_datadir}/graphviz/demo
%{_datadir}/graphviz/gvpr
-%{_datadir}/graphviz/lefty
%{_mandir}/man1/acyclic.1*
%{_mandir}/man1/bcomps.1*
%{_mandir}/man1/ccomps.1*
@@ -722,8 +656,8 @@ fi
%{_mandir}/man1/cluster.1*
%{_mandir}/man1/dijkstra.1*
%{_mandir}/man1/dot.1*
+%{_mandir}/man1/dot_sandbox.1*
%{_mandir}/man1/dot2gxl.1*
-%{_mandir}/man1/dotty.1*
%{_mandir}/man1/edgepaint.1*
%{_mandir}/man1/fdp.1*
%{_mandir}/man1/gc.1*
@@ -739,8 +673,6 @@ fi
%{_mandir}/man1/gvpr.1*
%{_mandir}/man1/gxl2dot.1*
%{_mandir}/man1/gxl2gv.1*
-%{_mandir}/man1/lefty.1*
-%{_mandir}/man1/lneato.1*
%{_mandir}/man1/mingle.1*
%{_mandir}/man1/mm2gv.1*
%{_mandir}/man1/neato.1*
@@ -766,8 +698,6 @@ fi
%attr(755,root,root) %ghost %{_libdir}/libgvc.so.6
%attr(755,root,root) %{_libdir}/libgvpr.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libgvpr.so.2
-%attr(755,root,root) %{_libdir}/liblab_gamut.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblab_gamut.so.1
%attr(755,root,root) %{_libdir}/libpathplan.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libpathplan.so.4
%attr(755,root,root) %{_libdir}/libxdot.so.*.*.*
@@ -788,27 +718,18 @@ fi
%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_gd.so*
%endif
-%if %{with ming}
-%files ming
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_ming.so*
-%{_datadir}/graphviz/font
-%endif
-
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libcdt.so
%attr(755,root,root) %{_libdir}/libcgraph.so
%attr(755,root,root) %{_libdir}/libgvc.so
%attr(755,root,root) %{_libdir}/libgvpr.so
-%attr(755,root,root) %{_libdir}/liblab_gamut.so
%attr(755,root,root) %{_libdir}/libpathplan.so
%attr(755,root,root) %{_libdir}/libxdot.so
%{_pkgconfigdir}/libcdt.pc
%{_pkgconfigdir}/libcgraph.pc
%{_pkgconfigdir}/libgvc.pc
%{_pkgconfigdir}/libgvpr.pc
-%{_pkgconfigdir}/liblab_gamut.pc
%{_pkgconfigdir}/libpathplan.pc
%{_pkgconfigdir}/libxdot.pc
%{_includedir}/graphviz
@@ -836,10 +757,6 @@ fi
%{_mandir}/man1/smyrna.1*
%endif
-%files doc-html
-%defattr(644,root,root,755)
-%doc doc-html/*
-
%files doc-pdf
%defattr(644,root,root,755)
%doc doc-pdf/*
@@ -898,19 +815,6 @@ fi
%{_mandir}/man3/gv_lua.3*
%endif
-%if %{with ocaml}
-%files -n ocaml-%{name}
-%defattr(644,root,root,755)
-%dir %{_libdir}/graphviz/ocaml
-%attr(755,root,root) %{_libdir}/graphviz/ocaml/libgv_ocaml.so
-%{_libdir}/graphviz/ocaml/META.gv
-# ocamlopt temporarily disabled
-#%{_libdir}/graphviz/ocaml/gv.a
-%{_libdir}/graphviz/ocaml/gv.cm*
-#%{_libdir}/graphviz/ocaml/gv.ml*
-%{_mandir}/man3/gv_ocaml.3*
-%endif
-
%if %{with perl}
%files -n perl-%{name}
%defattr(644,root,root,755)
@@ -934,23 +838,17 @@ fi
%{_examplesdir}/%{php_name}-%{name}-%{version}
%endif
-%if %{with python}
+%if %{with python3}
%files -n python3-libgraphviz
%defattr(644,root,root,755)
-%dir %{_libdir}/graphviz/python
-%attr(755,root,root) %{_libdir}/graphviz/python/libgv_python.so
-%attr(755,root,root) %{_libdir}/graphviz/python/_gv.so
-%{_libdir}/graphviz/python/gv.py
-%attr(755,root,root) %{_datadir}/graphviz/demo/modgraph.py
-%{_mandir}/man3/gv_python.3*
-%if %{with python3}
%dir %{_libdir}/graphviz/python3
%attr(755,root,root) %{_libdir}/graphviz/python3/libgv_python3.so
%attr(755,root,root) %{_libdir}/graphviz/python3/_gv.so
%{_libdir}/graphviz/python3/gv.py
%attr(755,root,root) %{py3_sitedir}/_gv.so
%{py3_sitedir}/gv.py
-%endif
+%attr(755,root,root) %{_datadir}/graphviz/demo/modgraph.py
+%{_mandir}/man3/gv_python.3*
%endif
%if %{with ruby}
diff --git a/cppflags.patch b/cppflags.patch
deleted file mode 100644
index 3c456e8..0000000
--- a/cppflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- graphviz-2.47.2/configure.ac.orig 2023-07-07 01:21:15.427742856 +0200
-+++ graphviz-2.47.2/configure.ac 2023-07-07 01:49:04.518671957 +0200
-@@ -739,7 +739,7 @@
- false)
- ])
- ac_save_CFLAGS="$CFLAGS"
-- ac_save_CPPFLAGS="$save_CPPFLAGS"
-+ ac_save_CPPFLAGS="$CPPFLAGS"
- CFLAGS="$CFLAGS $GUILE_INCLUDES"
- CPPFLAGS="$CPPFLAGS $GUILE_INCLUDES"
- AC_CHECK_HEADER(libguile.h,,[
diff --git a/doc-install.patch b/doc-install.patch
new file mode 100644
index 0000000..6e7cb72
--- /dev/null
+++ b/doc-install.patch
@@ -0,0 +1,10 @@
+--- graphviz-12.2.1/doc/Makefile.am.orig 2024-12-07 00:55:56.000000000 +0100
++++ graphviz-12.2.1/doc/Makefile.am 2025-03-10 10:33:55.819987878 +0100
+@@ -11,4 +11,7 @@
+ dist_html_DATA = build.html FAQ.html index.html winbuild.html pspdf.png char.html gdtclft.entities.example.png todo.html internal_todo.html
+ dist_doc_DATA = Dot.ref latex_suggestions.txt
+
++pdfdir = $(pkgdatadir)/doc/pdf
++htmldir = $(pkgdatadir)/doc/html
++
+ EXTRA_DIST = schema/*.xml schema/*.xslt infosrc/*
diff --git a/gcc14.patch b/gcc14.patch
deleted file mode 100644
index 8b26ca2..0000000
--- a/gcc14.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- graphviz-2.50.0/cmd/lefty/tbl.c.orig 2021-12-04 21:10:28.000000000 +0100
-+++ graphviz-2.50.0/cmd/lefty/tbl.c 2024-07-27 15:26:26.654224436 +0200
-@@ -170,7 +170,7 @@
- cp2[i] = cp[i];
- if (cp2[i].next != C_NULL)
- cp2[i].next -= ci;
-- s = &cp[i].u.s;
-+ s = cp[i].u.s;
- while (*s)
- s++;
- cn = (long) (s - (char *) &cp[i]) / sizeof (Code_t);
diff --git a/graphviz-fontpath.patch b/graphviz-fontpath.patch
deleted file mode 100644
index 6f1ee9b..0000000
--- a/graphviz-fontpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- graphviz-2.28.0/configure.ac.orig 2011-05-07 05:25:24.000000000 +0200
-+++ graphviz-2.28.0/configure.ac 2011-05-17 20:24:39.344723227 +0200
-@@ -161,7 +161,7 @@
- esac
- ;;
- * ) # This sucks! Whatever happened to standards for file system layout? (Good job its no longer used unless fontconfig is unavailable.)
-- DEFAULT_FONTPATH="/usr/share/fonts/sun/TrueType:/usr/share/fonts/TrueType:/usr/X11/lib/X11/fonts/TrueType:/usr/share/fonts/sun/Type1:/usr/openwin/lib/X11/fonts/Type1:/usr/share/fonts/X11/Type1:/usr/share/fonts/default/Type1:/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/common/share/fonts/ttf";
-+ DEFAULT_FONTPATH="/usr/share/fonts/TTF:/usr/share/fonts/Type1";
- PATHSEPARATOR=":"
- BROWSER="xdg-open"
- JSHEXT=so
diff --git a/graphviz-link.patch b/graphviz-link.patch
deleted file mode 100644
index 933d7bf..0000000
--- a/graphviz-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- graphviz-2.40.1/tclpkg/tcldot/Makefile.am.orig 2016-08-09 23:02:10.000000000 +0200
-+++ graphviz-2.40.1/tclpkg/tcldot/Makefile.am 2017-06-01 21:51:19.953228362 +0200
-@@ -80,7 +80,7 @@
- libtcldot_builtin_la_CPPFLAGS = $(AM_CPPFLAGS) -DDEMAND_LOADING=1
- libtcldot_builtin_la_LDFLAGS =
-
--libtcldot_builtin_la_LIBADD = $(TCLHANDLE_LIBS) \
-+libtcldot_builtin_la_LIBADD = $(TCLHANDLE_LIBS) $(GDTCLFT_LIBS) \
- $(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout_C.la \
- $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout_C.la \
- $(top_builddir)/plugin/core/libgvplugin_core_C.la \
diff --git a/graphviz-ming.patch b/graphviz-ming.patch
deleted file mode 100644
index efc8949..0000000
--- a/graphviz-ming.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- graphviz-2.38.0/plugin/ming/Makefile.am.orig 2014-04-13 22:40:25.000000000 +0200
-+++ graphviz-2.38.0/plugin/ming/Makefile.am 2014-04-21 09:11:51.695995652 +0200
-@@ -28,7 +28,7 @@
-
- libgvplugin_ming_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
- libgvplugin_ming_la_SOURCES = $(libgvplugin_ming_C_la_SOURCES)
--libgvplugin_ming_la_LIBADD = @MING_LIBS@ @MATH_LIBS@
-+libgvplugin_ming_la_LIBADD = $(top_builddir)/lib/gvc/libgvc.la @MING_LIBS@ @MATH_LIBS@
-
- if WITH_WIN32
- libgvplugin_ming_la_LDFLAGS += -no-undefined
---- graphviz-2.47.2/plugin/ming/gvrender_ming.c.orig 2021-05-27 02:56:39.000000000 +0200
-+++ graphviz-2.47.2/plugin/ming/gvrender_ming.c 2022-03-24 16:55:38.941518316 +0100
-@@ -13,6 +13,8 @@
- #include <stdlib.h>
- #include <string.h>
- #include <gvc/gvplugin_render.h>
-+#include "gvcint.h"
-+#include "gvcproc.h"
-
- /* from config.h - would conflict with ming.h definitions */
- #undef PACKAGE
-@@ -83,7 +85,6 @@ static void ming_end_page(GVJ_t * job)
- SWFMovie_nextFrame(movie);
- }
-
--extern char* gvconfig_libdir(void);
- #define FONT "Bitstream_Vera_Serif.fdb"
-
- static void ming_textspan(GVJ_t * job, pointf p, textspan_t * span)
-@@ -100,7 +101,7 @@ static void ming_textspan(GVJ_t * job, p
-
- /* FIXME - hardcoded to a Times-like font */
- if (font == NULL) {
-- libdir=gvconfig_libdir();
-+ libdir=gvconfig_libdir(job->gvc);
- font_file_name = malloc(strlen(libdir)+strlen(FONT)+2);
- strcpy(font_file_name, libdir);
- strcat(font_file_name, "/");
diff --git a/graphviz-ruby.patch b/graphviz-ruby.patch
deleted file mode 100644
index 3a6058c..0000000
--- a/graphviz-ruby.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- graphviz-2.40.1/configure.ac.orig 2017-06-01 17:38:47.623401374 +0200
-+++ graphviz-2.40.1/configure.ac 2017-06-01 20:10:12.199964310 +0200
-@@ -1642,7 +1642,7 @@
- if test "x$DARWIN" = "xyes"; then
- RUBY_CFLAGS=`echo $RUBY_CFLAGS | sed 's/powerpc/universal/'`
- fi
-- RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY -rrbconfig -e \"puts RbConfig::CONFIG[['LIBRUBYARG_SHARED']]\"`"
-+ RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` $($RUBY -rrbconfig -e "puts RbConfig::CONFIG[['LIBRUBYARG_SHARED']]")"
- RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb vendorarchdir`"
- if test "x$RUBY_INSTALL_DIR" = "x"; then
- RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb sitearchdir`"
---- graphviz-2.34.0/config/config_ruby.rb.orig 2013-11-10 15:08:02.653585861 +0100
-+++ graphviz-2.34.0/config/config_ruby.rb 2013-11-10 15:08:47.280250638 +0100
-@@ -8,6 +8,10 @@
- puts RbConfig::expand(CONFIG["archdir"])
- when "lib"
- puts RbConfig::expand(CONFIG["libdir"])
-+when "includes"
-+ puts Config::expand(CONFIG["rubyhdrdir"])
-+when "archincludes"
-+ puts Config::expand(CONFIG["rubyhdrdir"]+"/"+CONFIG["arch"])
- when "vendorarchdir"
- puts RbConfig::expand(CONFIG["vendorarchdir"])
- when "sitearchdir"
diff --git a/gtk-no-xlib.patch b/gtk-no-xlib.patch
deleted file mode 100644
index 215f886..0000000
--- a/gtk-no-xlib.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- graphviz-2.50.0/plugin/gtk/gvdevice_gtk.c.orig 2021-12-04 21:10:28.000000000 +0100
-+++ graphviz-2.50.0/plugin/gtk/gvdevice_gtk.c 2024-07-27 14:58:45.147397887 +0200
-@@ -18,13 +18,9 @@
- #include <gvc/gvplugin_device.h>
-
- #ifdef HAVE_GTK
-+#include <gdk/gdk.h>
- #include <gtk/gtk.h>
-
--#include <cairo.h>
--#ifdef CAIRO_HAS_XLIB_SURFACE
--#include <X11/Xlib.h>
--#include <X11/Xutil.h>
--
- #include "interface.h"
- #include "support.h"
-
-@@ -54,22 +50,25 @@
-
- static void gtk_initialize(GVJ_t *firstjob)
- {
-- Display *dpy;
-- const char *display_name = NULL;
-- int scr;
-+ GdkDisplay *dpy;
-+ GdkScreen *scr;
-
- gtk_set_locale ();
- gtk_init (NULL, NULL);
-
-- dpy = XOpenDisplay(display_name);
-+ dpy = gdk_display_get_default();
- if (dpy == NULL) {
-- fprintf(stderr, "Failed to open XLIB display: %s\n",
-- XDisplayName(NULL));
-+ fprintf(stderr, "Failed to open default display\n");
-+ return;
-+ }
-+ scr = gdk_display_get_default_screen(dpy);
-+ if (scr == NULL) {
-+ fprintf(stderr, "Failed to open default screen for display: %s\n",
-+ gdk_display_get_name(dpy));
- return;
- }
-- scr = DefaultScreen(dpy);
-- firstjob->device_dpi.x = DisplayWidth(dpy, scr) * 25.4 / DisplayWidthMM(dpy, scr);
-- firstjob->device_dpi.y = DisplayHeight(dpy, scr) * 25.4 / DisplayHeightMM(dpy, scr);
-+ firstjob->device_dpi.x = gdk_screen_get_width(scr) * 25.4 / gdk_screen_get_width_mm(scr);
-+ firstjob->device_dpi.y = gdk_screen_get_height(scr) * 25.4 / gdk_screen_get_height_mm(scr);
- firstjob->device_sets_dpi = TRUE;
- }
-
-@@ -129,7 +128,6 @@
- gtk_finalize,
- };
- #endif
--#endif
-
- gvplugin_installed_t gvdevice_types_gtk[] = {
- #ifdef HAVE_GTK
diff --git a/java.patch b/java.patch
index afea261..f2a352f 100644
--- a/java.patch
+++ b/java.patch
@@ -5,23 +5,23 @@
else
AC_CHECK_PROG(JAVA,java,java)
+ AC_CHECK_PROG(JAVAC,javac,javac)
- if test "x$JAVA" = "x"; then
+ if test "$JAVA" = ""; then
use_java="No (java not available)"
else
--- graphviz-2.47.2/tclpkg/gv/Makefile.am.orig 2021-05-27 02:56:40.000000000 +0200
+++ graphviz-2.47.2/tclpkg/gv/Makefile.am 2023-07-07 01:10:42.433234989 +0200
@@ -535,7 +535,7 @@
- endif
+
install-data-hook:
if WITH_JAVA
- (cd $(DESTDIR)$(pkgjavadir); $(LN_S) -f org/graphviz/libgv_java.$(JSHEXT) ../../libgv.$(JSHEXT); javac -classpath $(DESTDIR)$(libjavadir) gv.java;)
+ (cd $(DESTDIR)$(pkgjavadir); $(LN_S) -f org/graphviz/libgv_java.$(JSHEXT) ../../libgv.$(JSHEXT); $(JAVAC) -classpath $(DESTDIR)$(libjavadir) gv.java;)
endif
if WITH_LUA
- (cd $(DESTDIR)$(pkgluadir); rm -f gv.so; $(LN_S) libgv_lua.so gv.so;)
+ (cd $(DESTDIR)$(pkgluadir); rm -f gv.so; $(LN_S) libgv_lua.so gv.so;)
@@ -603,8 +603,8 @@
ln -f ../$(srcdir)/test.java .; \
- ln -f ../$(srcdir)/hello.gv .; \
+ ln -f ../$(srcdir)/hello.gv .; \
ln -f ../$(srcdir)/test.java .; \
- CLASSPATH=. javac *.java; \
- LD_LIBRARY_PATH=. CLASSPATH=. java test)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/graphviz.git/commitdiff/7043bc5d08eea5444c001e3f06afcebf58da1448
More information about the pld-cvs-commit
mailing list