commit c55e082b0afe7a51578276ac89255a240cfd5a1e
Author: Jakub Bogusz <[email protected]>
Date: Fri Jul 26 21:16:08 2024 +0200
- updated to 2.50.0
graphviz-link.patch | 9 ---------
graphviz-ltdl.patch | 12 ------------
graphviz-php.patch | 9 +++++----
graphviz-webp.patch | 11 -----------
graphviz.spec | 17 ++++++-----------
python-paths.patch | 17 -----------------
6 files changed, 11 insertions(+), 64 deletions(-)
---
diff --git a/graphviz.spec b/graphviz.spec
index d38b896..fa0bda3 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -54,22 +54,19 @@
Summary: Graph Visualization Tools
Summary(pl.UTF-8): Narzędzie do wizualizacji w postaci grafów
Name: graphviz
-Version: 2.47.3
+Version: 2.50.0
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: 9633762c17754c7612171cd05500a2fb
+# Source0-md5: ccc1c011d79fcdfccc1cb4be8a81edef
Patch0: %{name}-fontpath.patch
Patch1: %{name}-link.patch
Patch2: %{name}-bad-header.patch
Patch3: %{name}-php.patch
-Patch4: %{name}-ltdl.patch
Patch7: %{name}-ruby.patch
Patch10: %{name}-ming.patch
-Patch12: %{name}-webp.patch
-Patch14: python-paths.patch
Patch15: ghostscript918.patch
Patch16: java.patch
Patch17: cppflags.patch
@@ -125,8 +122,8 @@ BuildRequires: lua51-devel >= 5.1
BuildRequires: pango-devel >= 1:1.14.9
BuildRequires: perl-devel
%if %{with php}
-BuildRequires: %{php_name}-devel
-BuildRequires: %{php_name}-program
+BuildRequires: %{php_name}-devel >= 4:7
+BuildRequires: %{php_name}-program >= 4:7
BuildRequires: rpm-build >= 4.6
BuildRequires: swig-php >= 3.0.11
%endif
@@ -513,18 +510,15 @@ Wiązania graphviza dla języka R.
%patch0 -p1
%patch1 -p1
%patch3 -p1
-%patch4 -p1
%patch7 -p1
%patch10 -p1
-%patch12 -p1
-%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1
%{__sed} '1s@/usr/bin/lua$@/usr/bin/lua5.1@' -i tclpkg/gv/demo/modgraph.lua
-%{__sed} -E -i -e '1s,#!\s*/usr/bin/python(\s|$),#!%{__python}\1,' \
+%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' \
tclpkg/gv/demo/modgraph.py
%build
@@ -564,6 +558,7 @@ 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} \
diff --git a/graphviz-link.patch b/graphviz-link.patch
index 06255e5..933d7bf 100644
--- a/graphviz-link.patch
+++ b/graphviz-link.patch
@@ -9,12 +9,3 @@
$(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 \
-@@ -97,7 +97,7 @@
-
- if WITH_LIBGD
- libtcldot_builtin_la_LIBADD += $(top_builddir)/plugin/gd/libgvplugin_gd_C.la
--libtcldot_builtin_la_LIBADD += $(GD_LIBS)
-+libtcldot_builtin_la_LIBADD += $(GDLIB_LIBS)
- endif
-
- libtcldot_builtin_la_LIBADD += $(EXPAT_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS)
$(MATH_LIBS)
diff --git a/graphviz-ltdl.patch b/graphviz-ltdl.patch
deleted file mode 100644
index c7598a7..0000000
--- a/graphviz-ltdl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- graphviz-2.26.3/lib/gvc/gvcext.h.orig 2009-07-08 17:14:20.000000000
+0200
-+++ graphviz-2.26.3/lib/gvc/gvcext.h 2010-10-22 08:38:51.271743558 +0200
-@@ -65,6 +65,9 @@
-
- typedef struct gvplugin_available_s gvplugin_available_t;
-
-+#undef lt_preloaded_symbols
-+#define lt_preloaded_symbols lt_GRAPHVIZ_LTX_preloaded_symbols
-+
- /*visual studio*/
- #ifdef _WIN32
- #ifndef GVC_EXPORTS
diff --git a/graphviz-php.patch b/graphviz-php.patch
index c1500e8..037216c 100644
--- a/graphviz-php.patch
+++ b/graphviz-php.patch
@@ -1,15 +1,16 @@
---- graphviz-2.18/tclpkg/gv/gv_php_init.c.orig 2007-11-16 21:20:49.000000000
+0100
-+++ graphviz-2.18/tclpkg/gv/gv_php_init.c 2008-05-31 21:48:43.663241115
+0200
-@@ -22,11 +22,13 @@
-
+--- graphviz-2.50.0/tclpkg/gv/gv_php_init.c.orig 2022-09-11
19:23:28.076467439 +0200
++++ graphviz-2.50.0/tclpkg/gv/gv_php_init.c 2022-09-11 19:32:35.430168837
+0200
+@@ -24,12 +24,14 @@
static size_t gv_string_writer (GVJ_t *job, const char *s, size_t len)
{
+ (void)job;
+ TSRMLS_FETCH();
return PHPWRITE(s, len);
}
static size_t gv_channel_writer (GVJ_t *job, const char *s, size_t len)
{
+ (void)job;
+ TSRMLS_FETCH();
return PHPWRITE(s, len);
}
diff --git a/graphviz-webp.patch b/graphviz-webp.patch
deleted file mode 100644
index b549cda..0000000
--- a/graphviz-webp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- graphviz-2.30.0/plugin/webp/Makefile.am.orig 2013-01-14
04:11:21.000000000 +0100
-+++ graphviz-2.30.0/plugin/webp/Makefile.am 2013-01-20 18:35:17.195806496
+0100
-@@ -32,7 +32,7 @@
-
- libgvplugin_webp_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
- libgvplugin_webp_la_SOURCES = $(libgvplugin_webp_C_la_SOURCES)
--libgvplugin_webp_la_LIBADD = @WEBP_LIBS@ @PANGOCAIRO_LIBS@
-+libgvplugin_webp_la_LIBADD = $(top_builddir)/lib/gvc/libgvc.la @WEBP_LIBS@
@PANGOCAIRO_LIBS@
-
- if WITH_WIN32
- libgvplugin_webp_la_LDFLAGS += -no-undefined
diff --git a/python-paths.patch b/python-paths.patch
deleted file mode 100644
index 7faf48c..0000000
--- a/python-paths.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- graphviz-2.47.2/config/config_python.py~ 2014-04-13 22:40:25.000000000
+0200
-+++ graphviz-2.47.2/config/config_python.py 2015-12-27 14:46:09.464163577
+0100
-@@ -2,10 +2,10 @@
- from distutils import sysconfig
-
- if sys.argv[1] == "archlib":
-- print(sysconfig.get_python_lib(1,1))
-+ print(sysconfig.get_python_lib(plat_specific=True, standard_lib=True,
prefix='/usr'))
- elif sys.argv[1] == "lib":
-- print(sysconfig.get_python_lib(0,1))
-+ print(sysconfig.get_python_lib(plat_specific=False, standard_lib=True,
prefix='/usr'))
- elif sys.argv[1] == "archsitelib":
-- print(sysconfig.get_python_lib(1,0))
-+ print(sysconfig.get_python_lib(plat_specific=True, standard_lib=False,
prefix='/usr'))
- elif sys.argv[1] == "sitelib":
-- print(sysconfig.get_python_lib(0,0))
-+ print(sysconfig.get_python_lib(plat_specific=False, standard_lib=False,
prefix='/usr'))
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/graphviz.git/commitdiff/c55e082b0afe7a51578276ac89255a240cfd5a1e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
