From: tornaria <tornaria@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] graphviz: separate x11 binaries and gtk plugin to reduce deps
Date: Sun, 12 Sep 2021 15:39:13 +0200 [thread overview]
Message-ID: <20210912133913.25kzPNPzKu5B07Tc4p2wShfSz9DT4UeLXHvEB4trOO0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32939@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 969 bytes --]
There is an updated pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages graphviz
https://github.com/void-linux/void-packages/pull/32939
graphviz: separate x11 binaries and gtk plugin to reduce deps
See #32826.
Arguably, the split of x11 is less important. It saves from `libXaw`, `libXmu` and `libXt`, but `libX11` and `libXrender` are deps via `cairo` anyway.
The split of `gtk` saves a lot of deps which are not usually installed on a server or chroot.
It is possible to make a smaller pkg without `gd`, `rsvg` and `webp` which seems good enough (renders svg and ps via core plugin, images and pdf via cairo), but probably not worth it.
Can't remove `pango` without disabling `cairo` as well; in this case one would want to keep `gd` for images. I wouldn't do this since the gd plugin is deprecated.
A patch file from https://github.com/void-linux/void-packages/pull/32939.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-graphviz-32939.patch --]
[-- Type: text/x-diff, Size: 4209 bytes --]
From 46b30d4422c51bbb74b04473a43277049260ada6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
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/magjac/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..47e216853ee1 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"
@@ -25,10 +25,23 @@ pre_configure() {
./autogen.sh NOCONFIG
}
+do_check() {
+ # `make check` is broken:
+ # https://gitlab.com/graphviz/graphviz/-/issues/2112
+ #
+ # Testing is via pytest:
+ # https://gitlab.com/magjac/graphviz/-/blob/main/DEVELOPERS.md#testing
+ #
+ # They expect graphviz already installed before testing, disable
+ :
+}
+
post_install() {
vlicense epl-v10.txt LICENSE
rm -rf ${DESTDIR}/usr/share/graphviz/doc
+ rm -f ${DESTDIR}/usr/share/man/man1/mingle.1
+ 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
+ }
+}
next prev parent reply other threads:[~2021-09-12 13:39 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-11 23:59 [PR PATCH] " tornaria
2021-09-12 13:39 ` tornaria [this message]
2021-09-12 13:42 ` [PR PATCH] [Updated] " tornaria
2021-09-12 13:43 ` tornaria
2021-09-20 16:37 ` [PR PATCH] [Updated] " tornaria
2021-09-20 16:49 ` tornaria
2021-09-20 17:52 ` [PR PATCH] [Merged]: " leahneukirchen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210912133913.25kzPNPzKu5B07Tc4p2wShfSz9DT4UeLXHvEB4trOO0@z \
--to=tornaria@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).