From f4fd2986593e021e29e38ae7f2f732371dfa752b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sat, 11 Sep 2021 20:37:44 -0300 Subject: [PATCH] graphviz: separate x11 binaries and gtk plugin to reduce deps (#32826) Also disable `make check` since it is broken: https://gitlab.com/graphviz/graphviz/-/issues/2112 Testing is via pytest: https://gitlab.com/graphviz/graphviz/-/blob/main/DEVELOPERS.md#testing but they expect graphviz already installed before testing. --- srcpkgs/graphviz-gtk | 1 + srcpkgs/graphviz-x11 | 1 + srcpkgs/graphviz/graphviz-gtk.INSTALL | 1 + srcpkgs/graphviz/graphviz-gtk.REMOVE | 1 + srcpkgs/graphviz/graphviz-x11.INSTALL | 1 + srcpkgs/graphviz/graphviz-x11.REMOVE | 1 + srcpkgs/graphviz/template | 36 ++++++++++++++++++++++++++- 7 files changed, 41 insertions(+), 1 deletion(-) create mode 120000 srcpkgs/graphviz-gtk create mode 120000 srcpkgs/graphviz-x11 create mode 120000 srcpkgs/graphviz/graphviz-gtk.INSTALL create mode 120000 srcpkgs/graphviz/graphviz-gtk.REMOVE create mode 120000 srcpkgs/graphviz/graphviz-x11.INSTALL create mode 120000 srcpkgs/graphviz/graphviz-x11.REMOVE diff --git a/srcpkgs/graphviz-gtk b/srcpkgs/graphviz-gtk new file mode 120000 index 000000000000..abecf5d9457d --- /dev/null +++ b/srcpkgs/graphviz-gtk @@ -0,0 +1 @@ +graphviz \ No newline at end of file diff --git a/srcpkgs/graphviz-x11 b/srcpkgs/graphviz-x11 new file mode 120000 index 000000000000..abecf5d9457d --- /dev/null +++ b/srcpkgs/graphviz-x11 @@ -0,0 +1 @@ +graphviz \ No newline at end of file diff --git a/srcpkgs/graphviz/graphviz-gtk.INSTALL b/srcpkgs/graphviz/graphviz-gtk.INSTALL new file mode 120000 index 000000000000..842bf0e100c8 --- /dev/null +++ b/srcpkgs/graphviz/graphviz-gtk.INSTALL @@ -0,0 +1 @@ +INSTALL \ No newline at end of file diff --git a/srcpkgs/graphviz/graphviz-gtk.REMOVE b/srcpkgs/graphviz/graphviz-gtk.REMOVE new file mode 120000 index 000000000000..842bf0e100c8 --- /dev/null +++ b/srcpkgs/graphviz/graphviz-gtk.REMOVE @@ -0,0 +1 @@ +INSTALL \ No newline at end of file diff --git a/srcpkgs/graphviz/graphviz-x11.INSTALL b/srcpkgs/graphviz/graphviz-x11.INSTALL new file mode 120000 index 000000000000..842bf0e100c8 --- /dev/null +++ b/srcpkgs/graphviz/graphviz-x11.INSTALL @@ -0,0 +1 @@ +INSTALL \ No newline at end of file diff --git a/srcpkgs/graphviz/graphviz-x11.REMOVE b/srcpkgs/graphviz/graphviz-x11.REMOVE new file mode 120000 index 000000000000..842bf0e100c8 --- /dev/null +++ b/srcpkgs/graphviz/graphviz-x11.REMOVE @@ -0,0 +1 @@ +INSTALL \ No newline at end of file diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template index 515f517be515..a81e29e9c926 100644 --- a/srcpkgs/graphviz/template +++ b/srcpkgs/graphviz/template @@ -1,7 +1,7 @@ # Template file for 'graphviz' pkgname=graphviz version=2.49.0 -revision=1 +revision=2 build_style=gnu-configure make_build_args="HOSTCC=$BUILD_CC" hostmakedepends="automake flex libltdl-devel libtool perl pkg-config python3" @@ -16,6 +16,15 @@ homepage="http://www.graphviz.org" distfiles="https://gitlab.com/graphviz/graphviz/-/archive/${version}/graphviz-${version}.tar.gz" checksum=a062ccd940abbde6e3c45462323b2ede54b9374fed86f464c11bc4c0bd57fd04 +# `make check` is broken: +# https://gitlab.com/graphviz/graphviz/-/issues/2112 +# +# Testing is via pytest: +# https://gitlab.com/graphviz/graphviz/-/blob/main/DEVELOPERS.md#testing +# +# They expect graphviz already installed before testing, disable +make_check=no + if [ -z "$CROSS_BUILD" ]; then configure_args+=" --with-gts" makedepends+=" gts-devel" @@ -29,6 +38,10 @@ post_install() { vlicense epl-v10.txt LICENSE rm -rf ${DESTDIR}/usr/share/graphviz/doc + # mingle is not compiled so do not install manpage + rm -f ${DESTDIR}/usr/share/man/man1/mingle.1 + # dot_builtins is just dot with preloaded plugins (for testing?) + rm -f ${DESTDIR}/usr/bin/dot_builtins } graphviz-libs_package() { @@ -48,3 +61,24 @@ graphviz-devel_package() { vmove usr/share/man/man3 } } + +graphviz-gtk_package() { + depends="graphviz>=${version}_${revision}" + short_desc+=" - gtk plugin" + pkg_install() { + vmove "usr/lib/graphviz/libgvplugin_gdk.*" + vmove "usr/lib/graphviz/libgvplugin_gtk.*" + } +} + +graphviz-x11_package() { + depends="graphviz>=${version}_${revision}" + short_desc+=" - x11 binaries (lefty)" + pkg_install() { + for p in lefty lneato dotty ; do + vmove usr/bin/$p + vmove usr/share/man/man1/$p.1 + done + vmove usr/share/graphviz/lefty + } +}