From 9ea1de0d609e9fa7b1962e658368e4d4ed4b7c7a Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 23:27:16 +0100 Subject: [PATCH] rebuilt by autoport with build requirements: libunistring-devel>=0.9.6-1mamba [release 2.38.0-2mamba;Sun May 15 2016] --- graphviz-2.38.0-ghostscript-9.19.patch | 18 ++++++ graphviz-2.38.0-lua-5.3.patch | 11 ++++ graphviz.spec | 87 +++++++++++++++++--------- 3 files changed, 88 insertions(+), 28 deletions(-) create mode 100644 graphviz-2.38.0-ghostscript-9.19.patch create mode 100644 graphviz-2.38.0-lua-5.3.patch diff --git a/graphviz-2.38.0-ghostscript-9.19.patch b/graphviz-2.38.0-ghostscript-9.19.patch new file mode 100644 index 0000000..189c513 --- /dev/null +++ b/graphviz-2.38.0-ghostscript-9.19.patch @@ -0,0 +1,18 @@ +diff -uprb graphviz-2.38.0.orig/plugin/gs/gvloadimage_gs.c graphviz-2.38.0/plugin/gs/gvloadimage_gs.c +--- graphviz-2.38.0.orig/plugin/gs/gvloadimage_gs.c 2014-04-13 23:40:25.000000000 +0300 ++++ graphviz-2.38.0/plugin/gs/gvloadimage_gs.c 2015-11-11 00:08:32.916123704 +0200 +@@ -72,11 +72,11 @@ static void gs_error(GVJ_t * job, const + + assert (err < 0); + +- if (err >= e_VMerror) ++ if (err >= gs_error_VMerror) + errsrc = "PostScript Level 1"; +- else if (err >= e_unregistered) ++ else if (err >= gs_error_unregistered) + errsrc = "PostScript Level 2"; +- else if (err >= e_invalidid) ++ else if (err >= gs_error_invalidid) + errsrc = "DPS error"; + else + errsrc = "Ghostscript internal error"; diff --git a/graphviz-2.38.0-lua-5.3.patch b/graphviz-2.38.0-lua-5.3.patch new file mode 100644 index 0000000..a17f9c1 --- /dev/null +++ b/graphviz-2.38.0-lua-5.3.patch @@ -0,0 +1,11 @@ +--- graphviz-2.38.0/configure.ac.orig 2016-05-15 19:27:52.204176821 +0200 ++++ graphviz-2.38.0/configure.ac 2016-05-15 19:28:14.198171673 +0200 +@@ -928,7 +928,7 @@ + if test "x$ac_found_lua_header" = "xyes" -a "x$ac_found_liblua_header" = "xyes"; then + LUA_INCLUDES="$CFLAGS" + fi +- for l in "$lua_suffix" "" "52" "5.2" "51" "5.1" "50" "5.0" ; do ++ for l in "$lua_suffix" "" "53" "5.3" "52" "5.2" "51" "5.1" "50" "5.0" ; do + AC_CHECK_LIB(lua$l,lua_call,ac_found_lua_lib="yes",ac_found_lua_lib="no") + if test "x$ac_found_lua_lib" = "xyes" ; then + LUA_VERSION=">=5.1.0" diff --git a/graphviz.spec b/graphviz.spec index 4e008eb..8dd8503 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -2,7 +2,7 @@ Name: graphviz Version: 2.38.0 -Release: 1mamba +Release: 2mamba Summary: Graph Visualization Tools Group: Applications/Graphics Vendor: openmamba @@ -15,14 +15,31 @@ Patch1: graphviz-2.30.1-lua-5.2.patch Patch2: graphviz-2.30.1-gvc.pc-no-libgraph.patch Patch3: graphviz-2.30.1-guile-2.patch Patch4: graphviz-2.30.1-ruby-2.patch +Patch5: graphviz-2.38.0-ghostscript-9.19.patch +Patch6: graphviz-2.38.0-lua-5.3.patch License: Common Public Attribution License 1.0 ## AUTOBUILDREQ-BEGIN +BuildRequires: R BuildRequires: ghostscript-devel BuildRequires: glibc-devel +BuildRequires: libICE-devel +BuildRequires: libSM-devel +BuildRequires: libX11-devel +BuildRequires: libXau-devel +BuildRequires: libXaw-devel +BuildRequires: libXdmcp-devel +BuildRequires: libXext-devel +BuildRequires: libXmu-devel +BuildRequires: libXpm-devel +BuildRequires: libXrender-devel +BuildRequires: libXt-devel BuildRequires: libatk-devel +BuildRequires: libbsd-devel BuildRequires: libbzip2-devel BuildRequires: libcairo-devel +BuildRequires: libcares-devel BuildRequires: libcroco-devel +BuildRequires: libcurl-devel %if "%{stage1}" != "1" BuildRequires: libdevil-devel %endif @@ -30,61 +47,65 @@ BuildRequires: libexpat-devel BuildRequires: libffi-devel BuildRequires: libfontconfig-devel BuildRequires: libfreetype-devel -BuildRequires: libgcc BuildRequires: libgc-devel +BuildRequires: libgcc BuildRequires: libgd-devel BuildRequires: libgdk-pixbuf-devel BuildRequires: libglib-devel BuildRequires: libgmp-devel +BuildRequires: libgomp-devel BuildRequires: libgraphite2-devel +BuildRequires: libgss-devel BuildRequires: libgtk2-devel BuildRequires: libgts-devel BuildRequires: libguile-devel BuildRequires: libharfbuzz-devel -BuildRequires: libICE-devel -BuildRequires: libicu-devel +BuildRequires: libidn-devel BuildRequires: libilmbase-devel BuildRequires: libjasper-devel BuildRequires: libjbig-devel BuildRequires: libjpeg-devel BuildRequires: liblcms-devel +BuildRequires: liblcms2-devel BuildRequires: libltdl-devel BuildRequires: liblua-devel BuildRequires: liblzma-devel BuildRequires: libmng-devel +BuildRequires: libopenexr-devel +BuildRequires: libopenjpeg1-devel +BuildRequires: libopenldap-devel +BuildRequires: libopenssl-devel BuildRequires: libpango-devel -BuildRequires: libpng12-devel -BuildRequires: libpng15-devel +BuildRequires: libpcre-devel +BuildRequires: libperl BuildRequires: libpng-devel -BuildRequires: libpthread-stubs-devel +BuildRequires: libpng12-devel +BuildRequires: libpoppler-devel +BuildRequires: libpoppler-glib-devel +BuildRequires: libpython-devel BuildRequires: libpython27-devel BuildRequires: libqt4-devel BuildRequires: libreadline-devel BuildRequires: librsvg-devel +BuildRequires: librtmp-devel +BuildRequires: libsasl2-devel BuildRequires: libselinux-devel -BuildRequires: libSM-devel +BuildRequires: libssh2-devel BuildRequires: libstdc++6-devel +BuildRequires: libtermcap-devel +BuildRequires: libthai-devel BuildRequires: libtiff-devel -BuildRequires: libtk85 BuildRequires: libtk-devel BuildRequires: libunistring-devel BuildRequires: libuuid-devel -BuildRequires: libX11-devel -BuildRequires: libXau-devel -BuildRequires: libXaw-devel +BuildRequires: libvpx-devel BuildRequires: libxcb-devel -BuildRequires: libXdmcp-devel -BuildRequires: libXext-devel BuildRequires: libxml2-devel -BuildRequires: libXmu-devel -BuildRequires: libXpm-devel -BuildRequires: libXrender-devel -BuildRequires: libXt-devel BuildRequires: libz-devel BuildRequires: perl-devel -BuildRequires: R BuildRequires: ruby-devel ## AUTOBUILDREQ-END +BuildRequires: libunistring-devel >= 0.9.6-1mamba BuildRequires: pkgconfig BuildRequires: ocaml BuildRequires: lua @@ -224,11 +245,15 @@ This package contains the documentation of %{name} in HTML and pdf formats. %prep %setup -q +#-D -T +#:<< _EOF %patch0 -p1 #%patch2 -p1 #%patch3 -p1 %patch4 -p1 #%patch1 -p1 +%patch5 -p1 +%patch6 -p1 %build ./autogen.sh @@ -236,6 +261,8 @@ This package contains the documentation of %{name} in HTML and pdf formats. --with-x \ --enable-lua \ --enable-ruby \ + --disable-php \ + LDFLAGS="-ltermcap" \ PYTHON=%{__python} %make @@ -326,16 +353,17 @@ exit 0 %{_libdir}/graphviz/ruby/libgv_ruby.so %{_libdir}/ruby/vendor_ruby/*/*-linux*/gv.so -%if "%{stage1}" != "1" -%files -n %{libname}-php -%defattr(-,root,root) -%{_libdir}/graphviz/php/gv.php -%{_libdir}/graphviz/php/gv.so -%{_libdir}/php/modules/gv.so -%{_datadir}/php/gv.php -%{_libdir}/graphviz/php/libgv_php.la -%{_libdir}/graphviz/php/libgv_php.so +#% if "%{stage1}" != "1" +#%files -n %{libname}-php +#%defattr(-,root,root) +#%{_libdir}/graphviz/php/gv.php +#%{_libdir}/graphviz/php/gv.so +#%{_libdir}/php/modules/gv.so +#%{_datadir}/php/gv.php +#%{_libdir}/graphviz/php/libgv_php.la +#%{_libdir}/graphviz/php/libgv_php.so +%if "%{stage1}" != "1" %files -n %{libname}-sharp %defattr(-,root,root) %{_libdir}/graphviz/sharp/SWIGTYPE_p_*.cs @@ -421,6 +449,9 @@ exit 0 %{_datadir}/%{name}/doc/pdf/* %changelog +* Sun May 15 2016 Silvan Calarco 2.38.0-2mamba +- rebuilt by autoport with build requirements: libunistring-devel>=0.9.6-1mamba + * Mon Aug 18 2014 Automatic Build System 2.38.0-1mamba - automatic version update by autodist