Djam/graphviz
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/graphviz.git synced 2025-02-23 15:52:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated to 7.0.3

Browse source
This commit is contained in:
VictorR2007 2022-12-01 13:52:28 +03:00
parent cacdb2711e
commit 95415470b0
2 changed files with 7 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
graphviz-2.40.1-link.patch → graphviz-link.patch
View file

@ -1,25 +1,14 @@
--- a/plugin/gtk/Makefile.am~ 2013-02-14 21:27:39.000000000 +0800 --- a/plugin/gtk/Makefile.am~ 2013-02-14 21:27:39.000000000 +0800
+++ b/plugin/gtk/Makefile.am 2013-05-27 11:22:45.127287033 +0800 +++ b/plugin/gtk/Makefile.am 2013-05-27 11:22:45.127287033 +0800
@@ -37,7 +37,7 @@ @@ -30,7 +30,7 @@ libgvplugin_gtk_C_la_SOURCES = \
libgvplugin_gtk_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ libgvplugin_gtk_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO)
libgvplugin_gtk_la_SOURCES = $(libgvplugin_gtk_C_la_SOURCES) libgvplugin_gtk_la_SOURCES = $(libgvplugin_gtk_C_la_SOURCES)
-libgvplugin_gtk_la_LIBADD = $(GTK_LIBS) -libgvplugin_gtk_la_LIBADD = $(GTK_LIBS)
+libgvplugin_gtk_la_LIBADD = $(GTK_LIBS) -lX11 +libgvplugin_gtk_la_LIBADD = $(GTK_LIBS) -lX11
if WITH_WIN32 if WITH_WIN32
libgvplugin_gtk_la_LDFLAGS += -no-undefined libgvplugin_gtk_la_LDFLAGS += -no-undefined
--- ./configure.ac.orig 2017-10-08 11:55:15.622878825 +0300
+++ ./configure.ac 2017-10-08 11:56:08.642875683 +0300
@@ -2775,7 +2775,7 @@ if test "x$use_gd" = "x"; then
AC_MSG_WARN(Optional GD library not available)
use_gd="No (library not found)"
with_libgd="no"
- ], $GD_LIBS)
+ ], $GDLIB_LIBS)
fi
LDFLAGS=$save_LDFLAGS
CPPFLAGS=$save_CPPFLAGS
diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am
index 58c88f4..e636cdc 100644 index 58c88f4..e636cdc 100644
--- a/tclpkg/tcldot/Makefile.am --- a/tclpkg/tcldot/Makefile.am
@ -28,7 +17,7 @@ index 58c88f4..e636cdc 100644
if WITH_LIBGD if WITH_LIBGD
libtcldot_builtin_la_LIBADD += $(top_builddir)/plugin/gd/libgvplugin_gd_C.la libtcldot_builtin_la_LIBADD += $(top_builddir)/plugin/gd/libgvplugin_gd_C.la
-libtcldot_builtin_la_LIBADD += $(GD_LIBS) -libtcldot_builtin_la_LIBADD += $(GDLIB_LIBS)
+libtcldot_builtin_la_LIBADD += $(GDTCLFT_LIBS) $(GDLIB_LIBS) +libtcldot_builtin_la_LIBADD += $(GDTCLFT_LIBS) $(GDLIB_LIBS)
endif endif

24
graphviz.spec
View file

@ -44,13 +44,13 @@
Summary: Graph visualization tools Summary: Graph visualization tools
Name: graphviz Name: graphviz
Version: 2.44.1 Version: 7.0.3
Release: 3 Release: 1
License: Common Public License License: Common Public License
Group: Graphics Group: Graphics
Url: http://www.graphviz.org Url: http://www.graphviz.org
Source0: https://www2.graphviz.org/Packages/stable/portable_source/%{name}-%{version}.tar.gz Source0: https://www2.graphviz.org/Packages/stable/portable_source/%{name}-%{version}.tar.gz
Patch0: graphviz-2.40.1-link.patch Patch0: graphviz-link.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: flex BuildRequires: flex
BuildRequires: libtool BuildRequires: libtool
@ -250,21 +250,6 @@ This package provides the Python extension for %{name}.
%files -n python3-graphviz %files -n python3-graphviz
%{_libdir}/graphviz/python3 %{_libdir}/graphviz/python3
%{py3_platsitedir}/* %{py3_platsitedir}/*
#-------------------------------------------------------------------------
%package -n %python2-graphviz
%py2_migration_meta %python2-graphviz
Summary: Graphviz bindings for python2
Group: System/Libraries
Obsoletes: %{mklibname graphvizpython 0} < 2.28.0-4
BuildRequires: pkgconfig(python2)
%description -n %python2-graphviz
This package provides the Python extension for %{name}.
%files -n %python2-graphviz
%{_libdir}/graphviz/python2
%{py2_platsitedir}/*
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -446,7 +431,7 @@ LUA_INSTALL_DIR=%{_libdir}/lua
%endif %endif
--disable-guile \ --disable-guile \
--disable-python \ --disable-python \
--enable-python2 \ --disable-python2 \
--enable-python3 \ --enable-python3 \
--disable-sharp \ --disable-sharp \
--with-pangocairo \ --with-pangocairo \
@ -478,5 +463,4 @@ popd
# fix documentation # fix documentation
install -d -m 755 %{buildroot}%{_docdir} install -d -m 755 %{buildroot}%{_docdir}
mv %{buildroot}%{_datadir}/%{name}/doc %{buildroot}%{_docdir}/%{name}
mv %{buildroot}%{_datadir}/%{name}/demo %{buildroot}%{_docdir}/%{name} mv %{buildroot}%{_datadir}/%{name}/demo %{buildroot}%{_docdir}/%{name}