Re: [PR PATCH] [Updated] Add xvfb-run package, update gtkmm and glib, fix glibmm tests

[ericonr <ericonr@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 348 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages glib
https://github.com/void-linux/void-packages/pull/25420

Add xvfb-run package, update gtkmm and glib, fix glibmm tests


A patch file from https://github.com/void-linux/void-packages/pull/25420.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glib-25420.patch --]
[-- Type: text/x-diff, Size: 5818 bytes --]

From a772b0e6c49f8195a6339d8d3b62d98a6bd7d161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 7 Oct 2020 18:00:34 -0300
Subject: [PATCH 1/5] New package: xvfb-run-1.20.9.2.

---
 srcpkgs/xvfb-run/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/xvfb-run/template

diff --git a/srcpkgs/xvfb-run/template b/srcpkgs/xvfb-run/template
new file mode 100644
index 00000000000..994031975f3
--- /dev/null
+++ b/srcpkgs/xvfb-run/template
@@ -0,0 +1,25 @@
+# Template file for 'xvfb-run'
+pkgname=xvfb-run
+version=1.20.9.2
+revision=1
+_ver=${version%.*}-${version##*.}
+create_wrksrc=yes
+depends="xorg-server-xvfb xauth"
+short_desc="Xvfb wrapper"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-2.0-or-later"
+homepage="https://salsa.debian.org/xorg-team/xserver/xorg-server"
+distfiles="${homepage}/-/raw/xorg-server-2_${_ver}/debian/local/xvfb-run
+ ${homepage}/-/raw/xorg-server-2_${_ver}/debian/local/xvfb-run.1"
+checksum="fd05e0f8e6207c3984b980a0f037381c9c4a6f22a6dd94fdcfa995318db2a0a4
+ 08f14f55e14e52e5d98713c4d8f25ae68d67e2ee188dc0247770c6ada6e27c05"
+skip_extraction="xvfb-run xvfb-run.1"
+
+do_extract() {
+	cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}{,.1} ${wrksrc}
+}
+
+do_install() {
+	vbin xvfb-run
+	vman xvfb-run.1
+}

From cb6d068463ea787e82bdb7751206d2614654f754 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 7 Oct 2020 18:01:17 -0300
Subject: [PATCH 2/5] gtkmm: update to 3.24.2, add checkdeps, changelog.

---
 srcpkgs/gtkmm/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtkmm/template b/srcpkgs/gtkmm/template
index e253218c972..a4e24bcbf3b 100644
--- a/srcpkgs/gtkmm/template
+++ b/srcpkgs/gtkmm/template
@@ -1,17 +1,23 @@
 # Template file for 'gtkmm'
 pkgname=gtkmm
-version=3.24.1
-revision=2
+version=3.24.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-documentation"
 hostmakedepends="automake libtool pkg-config mm-common"
 makedepends="gtk+3-devel glibmm-devel atkmm-devel pangomm-devel"
+checkdepends="xvfb-run"
 short_desc="C++ bindings for The GTK+ toolkit (v3)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gtkmm.org"
+changelog="https://gitlab.gnome.org/GNOME/gtkmm/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ddfe42ed2458a20a34de252854bcf4b52d3f0c671c045f56b42aa27c7542d2fd
+checksum=6d71091bcd1863133460d4188d04102810e9123de19706fb656b7bb915b4adc3
+
+do_check() {
+	xvfb-run make check
+}
 
 gtkmm-devel_package() {
 	depends="${makedepends} gtkmm>=${version}_${revision}"

From 4dfe57bc81c2a36c0617de59fad29b3a925135fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 7 Oct 2020 18:01:48 -0300
Subject: [PATCH 3/5] glibmm: add checkdepends.

This enables all tests to run.
---
 srcpkgs/glibmm/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/glibmm/template b/srcpkgs/glibmm/template
index bc373d3a90b..49370cfce28 100644
--- a/srcpkgs/glibmm/template
+++ b/srcpkgs/glibmm/template
@@ -5,6 +5,7 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="glib-devel perl pkg-config"
 makedepends="libglib-devel libsigc++-devel"
+checkdepends="glib-networking"
 short_desc="C++ bindings for GLib"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -12,11 +13,6 @@ homepage="https://www.gtkmm.org"
 distfiles="${GNOME_SITE}/glibmm/${version%.*}/glibmm-${version}.tar.xz"
 checksum=a75282e58d556d9b2bb44262b6f5fb76c824ac46a25a06f527108bec86b8d4ec
 
-post_patch() {
-	# remove failing test
-	echo "int main() { return 0; }" > tests/giomm_tls_client/main.cc
-}
-
 glibmm-doc_package() {
 	archs=noarch
 	short_desc+=" - documentation"

From 9d9751dd043eb8893647f7ed473189fc570d0ab3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 7 Oct 2020 18:02:14 -0300
Subject: [PATCH 4/5] glib: update to 2.66.1.

---
 srcpkgs/glib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index e927e5f06dd..a7f02570db0 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.66.0
+version=2.66.1
 revision=1
 build_style=meson
 configure_args="-Dfam=false -Dman=true -Dselinux=disabled
@@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=c5a66bf143065648c135da4c943d2ac23cce15690fc91c358013b2889111156c
+checksum=a269ffe69fbcc3a21ff1acb1b6146b2a5723499d6e2de33ae16ccb6d2438ef60
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"

From 38ec5c23e09be522d92068556b6b38e35833168d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 7 Oct 2020 18:03:55 -0300
Subject: [PATCH 5/5] cabbage: leave note about xvfb-run.

Not possible to check if tests run correctly with it, since the package
is broken.
---
 srcpkgs/cabbage/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/cabbage/template b/srcpkgs/cabbage/template
index feb3808203b..88667b0e185 100644
--- a/srcpkgs/cabbage/template
+++ b/srcpkgs/cabbage/template
@@ -49,6 +49,7 @@ Projucer() {
 	# https://github.com/WeAreROLI/JUCE/issues/422
 	# The HOME variable is spoofed because it looks for headers in
 	# ~/SDKs/ (path hardcoded)
+	# TODO: use xfbv-run script for testing
 
 	Xvfb :999 &
 	XVFB_PID=$!