From: Gottox <Gottox@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] gtk+3: update to 3.24.30. switch to meson
Date: Mon, 04 Oct 2021 14:39:10 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-33314@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 488 bytes --]
There is a new pull request by Gottox against master on the void-packages repository
https://github.com/Gottox/void-packages gtk+3-meson
https://github.com/void-linux/void-packages/pull/33314
gtk+3: update to 3.24.30. switch to meson
This commit also disables failing tests. This is an improvement over
having the buildsystem fail completely as we can actually start to track
regressions here.
A patch file from https://github.com/void-linux/void-packages/pull/33314.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gtk+3-meson-33314.patch --]
[-- Type: text/x-diff, Size: 3891 bytes --]
From 99aa17ba41409b644a4141bc3b85c80699b97ebc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 4 Oct 2021 13:05:46 +0200
Subject: [PATCH] gtk+3: update to 3.24.30. switch to meson
This commit also disables failing tests. This is an improvement over
having the buildsystem fail completely as we can actually start to track
regressions here.
---
srcpkgs/gtk+3/template | 52 +++++++++++++++++++++++++++++-------------
1 file changed, 36 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index be97801ad473..00a927c22ee1 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,19 +1,24 @@
# Template file for 'gtk+3'
# Revbump gtk-layer-shell when updating, otherwise it presents a warning message
pkgname=gtk+3
-version=3.24.29
+version=3.24.30
revision=1
wrksrc="gtk+-${version}"
-build_style=gnu-configure
+build_style=meson
build_helper="gir"
-#XXX broken configure script: Can't use vopt_enable cloudproviders, configure
-#checks for libcloudproviders when we pass '--disable-cloudproviders' to it!
-configure_args="--disable-schemas-compile
- $(vopt_enable broadway broadway-backend) $(vopt_enable colord)
- $(vopt_enable cups) $(vopt_enable gir introspection)
- $(vopt_enable wayland wayland-backend) $(vopt_enable x11 x11-backend)
- $(vopt_if cloudproviders '--enable-cloudproviders')"
+configure_args="
+ $(vopt_bool x11 x11_backend)
+ $(vopt_bool wayland wayland_backend)
+ $(vopt_bool broadway broadway_backend)
+ -Dprint_backends=$(vopt_if cups "cups," "")file
+ $(vopt_bool cloudproviders)
+ -Dcolord=$(vopt_if colord yes no)
+ $(vopt_bool gtk_doc)
+ -Dman=true
+ $(vopt_bool gir introspection)
+ "
conf_files="/etc/gtk-3.0/im-multipress.conf"
+make_cmd="xvfb-run dbus-run-session ninja"
hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
pkg-config $(vopt_if wayland 'wayland-devel wayland-protocols')"
makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
@@ -29,19 +34,35 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://www.gtk.org/"
distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz"
-checksum=f57ec4ade8f15cab0c23a80dcaee85b876e70a8823d9105f067ce335a8268caa
+checksum=ba75bfff320ad1f4cfbee92ba813ec336322cc3c660d406aad014b07087a3ba9
+_broken_tests="
+ a11y/scale-drawvalue
+ a11y/menu
+ a11y/menubutton
+ a11y/menubutton2
+ a11y/menubutton3
+ a11y/tooltips
+ reftests/button-wrapping.ui
+ reftests/cellrenderer-pixbuf-stock-rtl.ui
+ reftests/icon-effect-missing.ui
+ reftests/symbolic-icon-translucent-color.ui
+ reftests/window-height-for-width.ui"
# Package build options
-build_options="broadway colord cups gir cloudproviders wayland x11"
+build_options="broadway colord cups gir cloudproviders wayland x11 gtk_doc"
desc_option_broadway="Enable support for the HTML5 Broadway backend"
desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
# Enable all options (other than cloudproviders) by default.
-build_options_default="colord cups gir broadway wayland x11"
+build_options_default="colord cups gir broadway wayland x11 gtk_doc"
-do_check() {
- # TODO: don't pass fully
- xvfb-run dbus-run-session make ${makejobs} check
+pre_check() {
+ for t in $_broken_tests; do
+ test_dir="testsuite/${t%\/*}"
+ test_name="${t##*\/}"
+
+ vsed -e "/'${test_name}',/d" -i "$test_dir/meson.build"
+ done
}
post_install() {
@@ -73,7 +94,6 @@ gtk+3-demo_package() {
vmove usr/share/man/man1/gtk3-widget-factory.1
vmove usr/share/gtk-3.0/gtkbuilder.rng
vmove usr/share/glib-2.0/schemas/org.gtk.Demo.gschema.xml
- vmove usr/share/glib-2.0/schemas/org.gtk.exampleapp.gschema.xml
vmove usr/share/applications/gtk3-widget-factory.desktop
vmove usr/share/applications/gtk3-demo.desktop
vmove usr/share/icons
next reply other threads:[~2021-10-04 12:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-04 12:39 Gottox [this message]
2021-10-04 12:59 ` [PR PATCH] [Updated] " Gottox
2021-10-04 13:28 ` Gottox
2021-10-04 13:29 ` Gottox
2021-10-04 13:52 ` [PR PATCH] [Closed]: " Gottox
2021-10-04 13:53 [PR PATCH] " Gottox
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-33314@inbox.vuxu.org \
--to=gottox@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).