Update version to 10.0.1

This commit is contained in:
Aleksandr Proklov 2024-04-25 11:52:49 +09:00
parent 47554f533a
commit e8b371ddcf
3 changed files with 12 additions and 67 deletions

View file

@ -1,2 +1,2 @@
sources: sources:
graphviz-7.0.3.tar.gz: 15bcdb577da7c25e94b1e6b490bd116e5c78cc66 graphviz-10.0.1.tar.gz: a6d8e9a3f98867b250d3f20c4bbc19cd1cd42ec2

View file

@ -1,24 +0,0 @@
--- 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
@@ -30,7 +30,7 @@ libgvplugin_gtk_C_la_SOURCES = \
libgvplugin_gtk_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO)
libgvplugin_gtk_la_SOURCES = $(libgvplugin_gtk_C_la_SOURCES)
-libgvplugin_gtk_la_LIBADD = $(GTK_LIBS)
+libgvplugin_gtk_la_LIBADD = $(GTK_LIBS) -lX11
if WITH_WIN32
libgvplugin_gtk_la_LDFLAGS += -no-undefined
diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am
index 58c88f4..e636cdc 100644
--- a/tclpkg/tcldot/Makefile.am
+++ b/tclpkg/tcldot/Makefile.am
@@ -96,7 +96,7 @@ endif
if WITH_LIBGD
libtcldot_builtin_la_LIBADD += $(top_builddir)/plugin/gd/libgvplugin_gd_C.la
-libtcldot_builtin_la_LIBADD += $(GDLIB_LIBS)
+libtcldot_builtin_la_LIBADD += $(GDTCLFT_LIBS) $(GDLIB_LIBS)
endif
libtcldot_builtin_la_LIBADD += $(EXPAT_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)

View file

@ -10,20 +10,18 @@
# temorary section ro e2k # temorary section ro e2k
%ifarch %{x86_64} %{ix86} aarch64 %ifarch %{x86_64} %{ix86} aarch64
%bcond_without ruby %bcond_without ruby
%bcond_without php # rosa2023.1 enable php option if php8 in repo, also rebuild swig with php8 support
%bcond_without ocaml %bcond_with php
%bcond_without tcl %bcond_without tcl
%endif %endif
%ifarch %{e2k} %{riscv} %ifarch %{e2k} %{riscv}
%bcond_with ruby %bcond_with ruby
%bcond_with php %bcond_with php
%bcond_without tcl %bcond_without tcl
%bcond_with ocaml
%endif %endif
%define cdt_major 5 %define cdt_major 5
%define cgraph_major 6 %define cgraph_major 6
%define gamut_major 1
%define gvc_major 6 %define gvc_major 6
%define gvpr_major 2 %define gvpr_major 2
%define pathplan_major 4 %define pathplan_major 4
@ -31,7 +29,6 @@
%define lib_cdt %mklibname cdt %{cdt_major} %define lib_cdt %mklibname cdt %{cdt_major}
%define lib_cgraph %mklibname cgraph %{cgraph_major} %define lib_cgraph %mklibname cgraph %{cgraph_major}
%define lib_gamut %mklibname lab_gamut %{gamut_major}
%define lib_gvc %mklibname gvc %{gvc_major} %define lib_gvc %mklibname gvc %{gvc_major}
%define lib_gvpr %mklibname gvpr %{gvpr_major} %define lib_gvpr %mklibname gvpr %{gvpr_major}
%define lib_pathplan %mklibname pathplan %{pathplan_major} %define lib_pathplan %mklibname pathplan %{pathplan_major}
@ -45,13 +42,12 @@
Summary: Graph visualization tools Summary: Graph visualization tools
Name: graphviz Name: graphviz
Version: 7.0.3 Version: 10.0.1
Release: 4 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://gitlab.com/graphviz/graphviz/-/archive/%{version}/graphviz-%{version}.tar.gz
Patch0: graphviz-link.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: flex BuildRequires: flex
BuildRequires: libtool BuildRequires: libtool
@ -142,18 +138,6 @@ This package provides the cgraph shared library for %{name}.
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
%package -n %{lib_gamut}
Group: System/Libraries
Summary: Shared library for %{name}
%description -n %{lib_gamut}
This package provides the lib_gamut shared library for %{name}.
%files -n %{lib_gamut}
%{_libdir}/liblab_gamut.so.%{gamut_major}*
#-------------------------------------------------------------------------
%package -n %{lib_gvc} %package -n %{lib_gvc}
Summary: Shared library for %{name} Summary: Shared library for %{name}
Group: System/Libraries Group: System/Libraries
@ -334,20 +318,6 @@ This package provides the R extension for %{name}.
%{_libdir}/graphviz/R %{_libdir}/graphviz/R
%endif %endif
#-------------------------------------------------------------------------
%if %{with ocaml}
%package -n ocaml-graphviz
Summary: Graphviz bindings for OCaml
Group: Development/OCaml
BuildRequires: ocaml
Obsoletes: %{mklibname graphvizocaml 0} < 2.28.0-4
%description -n ocaml-graphviz
This package provides the OCaml extension for %{name}.
%files -n ocaml-graphviz
%{_libdir}/graphviz/ocaml
%endif
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
%package -n %{devname} %package -n %{devname}
@ -404,12 +374,11 @@ rm -rf libltdl
# fix e2k detection # fix e2k detection
sed -i 's!e2k!e2k*!g' configure.ac sed -i 's!e2k!e2k*!g' configure.ac
touch debian/libgvphp7.install.in
%build %build
./autogen.sh ./autogen.sh
#autoreconf -fi #autoreconf -fi
%if %{with php}
sed -i -e "s,-php5,php$(rpm -q --qf '%{Version}' php-cli | cut -d'.' -f1),g" configure
%endif
%ifarch %{e2k} %ifarch %{e2k}
LUA_INSTALL_DIR=%{_libdir}/lua LUA_INSTALL_DIR=%{_libdir}/lua
@ -427,7 +396,6 @@ LUA_INSTALL_DIR=%{_libdir}/lua
%else %else
--disable-r \ --disable-r \
%endif %endif
--enable-ocaml \
--enable-perl \ --enable-perl \
%if %{with php} %if %{with php}
--enable-php \ --enable-php \
@ -439,6 +407,7 @@ LUA_INSTALL_DIR=%{_libdir}/lua
--disable-python \ --disable-python \
--disable-python2 \ --disable-python2 \
--enable-python3 \ --enable-python3 \
--disable-man-pdfs \
--disable-sharp \ --disable-sharp \
--with-pangocairo \ --with-pangocairo \
--with-gtk \ --with-gtk \
@ -463,9 +432,9 @@ popd
%install %install
%makeinstall_std %makeinstall_std
%ifarch %e2k [ -d %{buildroot}/lua ] && mkdir -p %{buildroot}%{_libdir}/lua/%{lua_version} \
[ -d %{buildroot}%{_prefix}/lib/lua ] && mv %{buildroot}%{_prefix}/lib/lua %{buildroot}%{_libdir}/ && mv %{buildroot}/lua/gv.so %{buildroot}%{_libdir}/lua/%{lua_version}/
%endif rm -rf %{buildroot}/lua
# fix documentation # fix documentation
install -d -m 755 %{buildroot}%{_docdir} install -d -m 755 %{buildroot}%{_docdir}