* [PR PATCH] gtk+3: update to 3.24.30. switch to meson
@ 2021-10-04 13:53 Gottox
2021-10-04 13:58 ` [PR PATCH] [Updated] " Gottox
` (11 more replies)
0 siblings, 12 replies; 14+ messages in thread
From: Gottox @ 2021-10-04 13:53 UTC (permalink / raw)
To: ml
[-- 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/33315
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/33315.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gtk+3-meson-33315.patch --]
[-- Type: text/x-diff, Size: 4168 bytes --]
From da17ee63ab1b82612bcb55e63892b265dd51ee54 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 | 62 ++++++++++++++++++++++++++++++++----------
1 file changed, 47 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index be97801ad473..c8ee23df98f6 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,18 +1,22 @@
# 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"
hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
pkg-config $(vopt_if wayland 'wayland-devel wayland-protocols')"
@@ -29,19 +33,46 @@ 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"
+
+case "$XBPS_TARGET_MACHINE" in
+ i686*) _broken_tests+=" gtk/cellarea" ;;
+esac
# 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"
+if ! [ "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
+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
+}
do_check() {
- # TODO: don't pass fully
- xvfb-run dbus-run-session make ${makejobs} check
+ xvfb-run dbus-run-session ninja -C build ${makejobs} test
}
post_install() {
@@ -59,7 +90,9 @@ gtk+3-devel_package() {
if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0
fi
- vmove usr/share/gtk-doc
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/gtk-doc
+ fi
vmove usr/share/aclocal
}
}
@@ -73,7 +106,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
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] gtk+3: update to 3.24.30. switch to meson
2021-10-04 13:53 [PR PATCH] gtk+3: update to 3.24.30. switch to meson Gottox
@ 2021-10-04 13:58 ` Gottox
2021-10-04 15:16 ` [PR REVIEW] " ericonr
` (10 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Gottox @ 2021-10-04 13:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 493 bytes --]
There is an updated 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/33315
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/33315.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gtk+3-meson-33315.patch --]
[-- Type: text/x-diff, Size: 4206 bytes --]
From d7c6eeb6486807fc20d10bb96aa602f62be5c328 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.
Also remove obsolete revbump message
---
srcpkgs/gtk+3/template | 63 +++++++++++++++++++++++++++++++-----------
1 file changed, 47 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index be97801ad473..8ebf780feac4 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,18 +1,21 @@
# 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"
hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
pkg-config $(vopt_if wayland 'wayland-devel wayland-protocols')"
@@ -29,19 +32,46 @@ 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"
+
+case "$XBPS_TARGET_MACHINE" in
+ i686*) _broken_tests+=" gtk/cellarea" ;;
+esac
# 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"
+if ! [ "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
+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
+}
do_check() {
- # TODO: don't pass fully
- xvfb-run dbus-run-session make ${makejobs} check
+ xvfb-run dbus-run-session ninja -C build ${makejobs} test
}
post_install() {
@@ -59,7 +89,9 @@ gtk+3-devel_package() {
if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0
fi
- vmove usr/share/gtk-doc
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/gtk-doc
+ fi
vmove usr/share/aclocal
}
}
@@ -73,7 +105,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
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] gtk+3: update to 3.24.30. switch to meson
2021-10-04 13:53 [PR PATCH] gtk+3: update to 3.24.30. switch to meson Gottox
2021-10-04 13:58 ` [PR PATCH] [Updated] " Gottox
@ 2021-10-04 15:16 ` ericonr
2021-10-04 15:16 ` ericonr
` (9 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: ericonr @ 2021-10-04 15:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 225 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/33315#discussion_r721465158
Comment:
```suggestion
-Dprint_backends=$(vopt_if cups 'cups,')file
```
style nit
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] gtk+3: update to 3.24.30. switch to meson
2021-10-04 13:53 [PR PATCH] gtk+3: update to 3.24.30. switch to meson Gottox
2021-10-04 13:58 ` [PR PATCH] [Updated] " Gottox
2021-10-04 15:16 ` [PR REVIEW] " ericonr
@ 2021-10-04 15:16 ` ericonr
2021-10-04 15:17 ` ericonr
` (8 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: ericonr @ 2021-10-04 15:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 197 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/33315#discussion_r721459431
Comment:
```suggestion
if [ -z "$CROSS_BUILD" ]; then
```
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: gtk+3: update to 3.24.30. switch to meson
2021-10-04 13:53 [PR PATCH] gtk+3: update to 3.24.30. switch to meson Gottox
` (2 preceding siblings ...)
2021-10-04 15:16 ` ericonr
@ 2021-10-04 15:17 ` ericonr
2021-10-04 20:17 ` [PR PATCH] [Updated] " Gottox
` (7 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: ericonr @ 2021-10-04 15:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 206 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/33315#issuecomment-933588549
Comment:
I guess I need to look into the gtk-layer-shell thing to be sure.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] gtk+3: update to 3.24.30. switch to meson
2021-10-04 13:53 [PR PATCH] gtk+3: update to 3.24.30. switch to meson Gottox
` (3 preceding siblings ...)
2021-10-04 15:17 ` ericonr
@ 2021-10-04 20:17 ` Gottox
2021-10-04 20:17 ` Gottox
` (6 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Gottox @ 2021-10-04 20:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 493 bytes --]
There is an updated 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/33315
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/33315.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gtk+3-meson-33315.patch --]
[-- Type: text/x-diff, Size: 5149 bytes --]
From d7c6eeb6486807fc20d10bb96aa602f62be5c328 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 4 Oct 2021 13:05:46 +0200
Subject: [PATCH 1/2] 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.
Also remove obsolete revbump message
---
srcpkgs/gtk+3/template | 63 +++++++++++++++++++++++++++++++-----------
1 file changed, 47 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index be97801ad473..8ebf780feac4 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,18 +1,21 @@
# 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"
hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
pkg-config $(vopt_if wayland 'wayland-devel wayland-protocols')"
@@ -29,19 +32,46 @@ 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"
+
+case "$XBPS_TARGET_MACHINE" in
+ i686*) _broken_tests+=" gtk/cellarea" ;;
+esac
# 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"
+if ! [ "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
+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
+}
do_check() {
- # TODO: don't pass fully
- xvfb-run dbus-run-session make ${makejobs} check
+ xvfb-run dbus-run-session ninja -C build ${makejobs} test
}
post_install() {
@@ -59,7 +89,9 @@ gtk+3-devel_package() {
if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0
fi
- vmove usr/share/gtk-doc
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/gtk-doc
+ fi
vmove usr/share/aclocal
}
}
@@ -73,7 +105,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
From 2dafe3490b782012c3e83d405690a5e7ffc8005b Mon Sep 17 00:00:00 2001
From: "Enno T. Boland" <g@s01.de>
Date: Mon, 4 Oct 2021 22:17:40 +0200
Subject: [PATCH 2/2] Update srcpkgs/gtk+3/template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>
---
srcpkgs/gtk+3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index 8ebf780feac4..b0fa137aae8d 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -9,7 +9,7 @@ configure_args="
$(vopt_bool x11 x11_backend)
$(vopt_bool wayland wayland_backend)
$(vopt_bool broadway broadway_backend)
- -Dprint_backends=$(vopt_if cups "cups," "")file
+ -Dprint_backends=$(vopt_if cups 'cups,')file
$(vopt_bool cloudproviders)
-Dcolord=$(vopt_if colord yes no)
$(vopt_bool gtk_doc)
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] gtk+3: update to 3.24.30. switch to meson
2021-10-04 13:53 [PR PATCH] gtk+3: update to 3.24.30. switch to meson Gottox
` (4 preceding siblings ...)
2021-10-04 20:17 ` [PR PATCH] [Updated] " Gottox
@ 2021-10-04 20:17 ` Gottox
2021-10-04 20:18 ` Gottox
` (5 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Gottox @ 2021-10-04 20:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 493 bytes --]
There is an updated 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/33315
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/33315.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gtk+3-meson-33315.patch --]
[-- Type: text/x-diff, Size: 6088 bytes --]
From d7c6eeb6486807fc20d10bb96aa602f62be5c328 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 4 Oct 2021 13:05:46 +0200
Subject: [PATCH 1/3] 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.
Also remove obsolete revbump message
---
srcpkgs/gtk+3/template | 63 +++++++++++++++++++++++++++++++-----------
1 file changed, 47 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index be97801ad473..8ebf780feac4 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,18 +1,21 @@
# 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"
hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
pkg-config $(vopt_if wayland 'wayland-devel wayland-protocols')"
@@ -29,19 +32,46 @@ 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"
+
+case "$XBPS_TARGET_MACHINE" in
+ i686*) _broken_tests+=" gtk/cellarea" ;;
+esac
# 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"
+if ! [ "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
+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
+}
do_check() {
- # TODO: don't pass fully
- xvfb-run dbus-run-session make ${makejobs} check
+ xvfb-run dbus-run-session ninja -C build ${makejobs} test
}
post_install() {
@@ -59,7 +89,9 @@ gtk+3-devel_package() {
if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0
fi
- vmove usr/share/gtk-doc
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/gtk-doc
+ fi
vmove usr/share/aclocal
}
}
@@ -73,7 +105,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
From 2dafe3490b782012c3e83d405690a5e7ffc8005b Mon Sep 17 00:00:00 2001
From: "Enno T. Boland" <g@s01.de>
Date: Mon, 4 Oct 2021 22:17:40 +0200
Subject: [PATCH 2/3] Update srcpkgs/gtk+3/template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>
---
srcpkgs/gtk+3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index 8ebf780feac4..b0fa137aae8d 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -9,7 +9,7 @@ configure_args="
$(vopt_bool x11 x11_backend)
$(vopt_bool wayland wayland_backend)
$(vopt_bool broadway broadway_backend)
- -Dprint_backends=$(vopt_if cups "cups," "")file
+ -Dprint_backends=$(vopt_if cups 'cups,')file
$(vopt_bool cloudproviders)
-Dcolord=$(vopt_if colord yes no)
$(vopt_bool gtk_doc)
From 46b06436ebad49175d97d1c8f5f0b583db407eef Mon Sep 17 00:00:00 2001
From: "Enno T. Boland" <g@s01.de>
Date: Mon, 4 Oct 2021 22:17:53 +0200
Subject: [PATCH 3/3] Update srcpkgs/gtk+3/template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>
---
srcpkgs/gtk+3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index b0fa137aae8d..c6660b618f10 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -57,7 +57,7 @@ desc_option_cloudproviders="Enable integration with cloudproviders, such as Next
# Enable all options (other than cloudproviders) by default.
build_options_default="colord cups gir broadway wayland x11"
-if ! [ "$CROSS_BUILD" ]; then
+if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" gtk_doc"
fi
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] gtk+3: update to 3.24.30. switch to meson
2021-10-04 13:53 [PR PATCH] gtk+3: update to 3.24.30. switch to meson Gottox
` (5 preceding siblings ...)
2021-10-04 20:17 ` Gottox
@ 2021-10-04 20:18 ` Gottox
2021-10-04 20:30 ` Gottox
` (4 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Gottox @ 2021-10-04 20:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 493 bytes --]
There is an updated 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/33315
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/33315.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gtk+3-meson-33315.patch --]
[-- Type: text/x-diff, Size: 4204 bytes --]
From 52a77c4d2e304c83d10c2e682e31a7d5424615b7 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.
Also remove obsolete revbump message
---
srcpkgs/gtk+3/template | 63 +++++++++++++++++++++++++++++++-----------
1 file changed, 47 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index be97801ad473..c6660b618f10 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,18 +1,21 @@
# 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"
hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
pkg-config $(vopt_if wayland 'wayland-devel wayland-protocols')"
@@ -29,19 +32,46 @@ 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"
+
+case "$XBPS_TARGET_MACHINE" in
+ i686*) _broken_tests+=" gtk/cellarea" ;;
+esac
# 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"
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
+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
+}
do_check() {
- # TODO: don't pass fully
- xvfb-run dbus-run-session make ${makejobs} check
+ xvfb-run dbus-run-session ninja -C build ${makejobs} test
}
post_install() {
@@ -59,7 +89,9 @@ gtk+3-devel_package() {
if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0
fi
- vmove usr/share/gtk-doc
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/gtk-doc
+ fi
vmove usr/share/aclocal
}
}
@@ -73,7 +105,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
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: gtk+3: update to 3.24.30. switch to meson
2021-10-04 13:53 [PR PATCH] gtk+3: update to 3.24.30. switch to meson Gottox
` (6 preceding siblings ...)
2021-10-04 20:18 ` Gottox
@ 2021-10-04 20:30 ` Gottox
2021-10-04 20:37 ` Gottox
` (3 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Gottox @ 2021-10-04 20:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 428 bytes --]
New comment by Gottox on void-packages repository
https://github.com/void-linux/void-packages/pull/33315#issuecomment-933832012
Comment:
@ericonr I guess it's [this warning](https://github.com/wmww/gtk-layer-shell/blob/master/gtk-priv/h/common.h#L30-L39).
[3.24.26](https://github.com/wmww/gtk-layer-shell/blob/master/compatibility.md) is the newest supported version and I guess this warning won't be fixed by revbumping.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: gtk+3: update to 3.24.30. switch to meson
2021-10-04 13:53 [PR PATCH] gtk+3: update to 3.24.30. switch to meson Gottox
` (7 preceding siblings ...)
2021-10-04 20:30 ` Gottox
@ 2021-10-04 20:37 ` Gottox
2021-10-04 21:11 ` paper42
` (2 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Gottox @ 2021-10-04 20:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
New comment by Gottox on void-packages repository
https://github.com/void-linux/void-packages/pull/33315#issuecomment-933832012
Comment:
@ericonr I guess it's [this warning](https://github.com/wmww/gtk-layer-shell/blob/master/gtk-priv/h/common.h#L30-L39).
[3.24.26](https://github.com/wmww/gtk-layer-shell/blob/master/compatibility.md) is the newest supported version and I guess this warning won't be fixed by revbumping.
So my guess the mechanism and warning of gtk-layer-shell was misunderstood.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: gtk+3: update to 3.24.30. switch to meson
2021-10-04 13:53 [PR PATCH] gtk+3: update to 3.24.30. switch to meson Gottox
` (8 preceding siblings ...)
2021-10-04 20:37 ` Gottox
@ 2021-10-04 21:11 ` paper42
2021-10-05 12:13 ` Gottox
2021-10-07 8:02 ` [PR PATCH] [Merged]: " Gottox
11 siblings, 0 replies; 14+ messages in thread
From: paper42 @ 2021-10-04 21:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 357 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/33315#issuecomment-933859001
Comment:
> So my guess the mechanism and warning of gtk-layer-shell was misunderstood.
It used to be correct, but they reworked the mechanism. Now they hardcode the supported versions, so rebuilding it doesn't help anymore.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: gtk+3: update to 3.24.30. switch to meson
2021-10-04 13:53 [PR PATCH] gtk+3: update to 3.24.30. switch to meson Gottox
` (9 preceding siblings ...)
2021-10-04 21:11 ` paper42
@ 2021-10-05 12:13 ` Gottox
2021-10-07 8:02 ` [PR PATCH] [Merged]: " Gottox
11 siblings, 0 replies; 14+ messages in thread
From: Gottox @ 2021-10-05 12:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 179 bytes --]
New comment by Gottox on void-packages repository
https://github.com/void-linux/void-packages/pull/33315#issuecomment-934353172
Comment:
Ok. The new mechanism looks more sane.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Merged]: gtk+3: update to 3.24.30. switch to meson
2021-10-04 13:53 [PR PATCH] gtk+3: update to 3.24.30. switch to meson Gottox
` (10 preceding siblings ...)
2021-10-05 12:13 ` Gottox
@ 2021-10-07 8:02 ` Gottox
11 siblings, 0 replies; 14+ messages in thread
From: Gottox @ 2021-10-07 8:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 335 bytes --]
There's a merged pull request on the void-packages repository
gtk+3: update to 3.24.30. switch to meson
https://github.com/void-linux/void-packages/pull/33315
Description:
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.
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PR PATCH] gtk+3: update to 3.24.30. switch to meson
@ 2021-10-04 12:39 Gottox
0 siblings, 0 replies; 14+ messages in thread
From: Gottox @ 2021-10-04 12:39 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2021-10-07 8:02 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-04 13:53 [PR PATCH] gtk+3: update to 3.24.30. switch to meson Gottox
2021-10-04 13:58 ` [PR PATCH] [Updated] " Gottox
2021-10-04 15:16 ` [PR REVIEW] " ericonr
2021-10-04 15:16 ` ericonr
2021-10-04 15:17 ` ericonr
2021-10-04 20:17 ` [PR PATCH] [Updated] " Gottox
2021-10-04 20:17 ` Gottox
2021-10-04 20:18 ` Gottox
2021-10-04 20:30 ` Gottox
2021-10-04 20:37 ` Gottox
2021-10-04 21:11 ` paper42
2021-10-05 12:13 ` Gottox
2021-10-07 8:02 ` [PR PATCH] [Merged]: " Gottox
-- strict thread matches above, loose matches on Subject: below --
2021-10-04 12:39 [PR PATCH] " Gottox
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).