From: circhioz <circhioz@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] mutter,gnome-{desktop,shell,control-center}: update to 3.38.3.
Date: Tue, 26 Jan 2021 12:32:34 +0100 [thread overview]
Message-ID: <20210126113234.h0nB9t0fjgrTHlMqdxolXBBZYAHI_dOoAxOfDCZyHUA@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28206@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 2022 bytes --]
There is an updated pull request by circhioz against master on the void-packages repository
https://github.com/circhioz/void-packages gnome-3-38-3
https://github.com/void-linux/void-packages/pull/28206
mutter,gnome-{desktop,shell,control-center}: update to 3.38.3.
Recent refactoring of libdirs exposed some brokenness in `mutter` and `gnome-shell` which I fixed taking inspiration from `gobject-introspection`'s template.
`mutter` now calls `Xwayland` at compile time to check for initfd support, so I added it as `hostmakedepend`. PR #25376 introduced a fix for some dependency issues. Now it has to be applied when the host is `x86_64`, too.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28206.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-3-38-3-28206.patch --]
[-- Type: text/x-diff, Size: 9927 bytes --]
From 8eb6854f884579f42412e3c3b422302bfadc80e2 Mon Sep 17 00:00:00 2001
From: Francesco Circhetta <francesco.circhetta@gmail.com>
Date: Sun, 24 Jan 2021 01:37:18 +0100
Subject: [PATCH 1/5] gnome-desktop: update to 3.38.3.
---
srcpkgs/gnome-desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 86c1d11e182..1d225d66abf 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
-version=3.38.1
+version=3.38.3
revision=1
build_style=meson
build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=17903513fed60814e967512dd892751cb6a1d2716136232884bc65bd53cc3be0
+checksum=bfe00257b2bb59fff04ac1c144804084d1c253e66f9d7408f6060bbf7ad1d831
build_options="gir"
build_options_default="gir"
From 3f95dbb1297a20b57a16d1b7a8749de245adffb5 Mon Sep 17 00:00:00 2001
From: Francesco Circhetta <francesco.circhetta@gmail.com>
Date: Sun, 24 Jan 2021 01:40:33 +0100
Subject: [PATCH 2/5] mutter: update to 3.38.3.
---
.../patches/dont-pull-generated-headers.patch | 49 -------------------
srcpkgs/mutter/template | 25 ++++++----
2 files changed, 16 insertions(+), 58 deletions(-)
delete mode 100644 srcpkgs/mutter/patches/dont-pull-generated-headers.patch
diff --git a/srcpkgs/mutter/patches/dont-pull-generated-headers.patch b/srcpkgs/mutter/patches/dont-pull-generated-headers.patch
deleted file mode 100644
index a75365a6324..00000000000
--- a/srcpkgs/mutter/patches/dont-pull-generated-headers.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From ff379fb93ae2539bf9fae70ccc8e0351e5665fb0 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Mon, 5 Oct 2020 12:13:07 +0200
-Subject: [PATCH] backend: Don't pull generated headers (indirectly)
-
-Use a typedef for MetaRemoteDesktop, so tests poking MetaBackend don't
-indirectly depend upon generated headers. This is arguably a code fix
-for a build system bug.
-
-https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1470
-
-Fixes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1449
-(or something...)
----
- src/backends/meta-backend-private.h | 4 ----
- src/backends/meta-backend-types.h | 4 ++++
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git src/backends/meta-backend-private.h src/backends/meta-backend-private.h
-index 6d7d3ad758..5f4981fda5 100644
---- src/backends/meta-backend-private.h
-+++ src/backends/meta-backend-private.h
-@@ -42,10 +42,6 @@
- #include "backends/meta-settings-private.h"
- #include "core/util-private.h"
-
--#ifdef HAVE_REMOTE_DESKTOP
--#include "backends/meta-remote-desktop.h"
--#endif
--
- #define DEFAULT_XKB_RULES_FILE "evdev"
- #define DEFAULT_XKB_MODEL "pc105+inet"
-
-diff --git src/backends/meta-backend-types.h src/backends/meta-backend-types.h
-index 4753c07440..146a8c3d7c 100644
---- src/backends/meta-backend-types.h
-+++ src/backends/meta-backend-types.h
-@@ -59,4 +59,8 @@ typedef struct _MetaScreenCastStream MetaScreenCastStream;
-
- typedef struct _MetaWaylandCompositor MetaWaylandCompositor;
-
-+#ifdef HAVE_REMOTE_DESKTOP
-+typedef struct _MetaRemoteDesktop MetaRemoteDesktop;
-+#endif
-+
- #endif /* META_BACKEND_TYPE_H */
---
-GitLab
-
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 80bfe109da6..87b5c41a59a 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,13 +1,14 @@
# Template file for 'mutter'
pkgname=mutter
-version=3.38.1
+version=3.38.3
revision=1
build_helper="gir"
build_style=meson
configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true
-Dprofiler=false -Dintrospection=true -Dxwayland_path=/usr/bin/Xwayland
-Dxwayland_initfd=disabled"
-hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server"
+hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
+ xorg-server-xwayland"
makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
@@ -18,22 +19,28 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Mutter/"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e921570c9fdf63805dbd40aa21daa05504a1b9a21432d6119c54c17ee0217a33
+checksum=b2321e73d1e3fe2e90e6301f42bba07f4d94bc64756a2bf13d75ae9d6faa201f
shlib_provides="libmutter-clutter-7.so libmutter-cogl-7.so
libmutter-cogl-pango-7.so libmutter-cogl-path-7.so"
-case "$XBPS_MACHINE" in i686*)
- pre_build() {
- ninja ${makejobs} -C build src/meta-dbus-display-config.h
- }
-;;
-esac
+# https://gitlab.gnome.org/GNOME/mutter/-/issues/1449
+pre_build() {
+ ninja ${makejobs} -C build src/meta-dbus-display-config.h
+}
# needs X
do_check() {
:
}
+post_install() {
+ # modify the pkg-config files to respect ${pc_sysrootdir} for variables that are
+ # meant to be called with 'pkg-config --variable'
+ vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-7|g' \
+ -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-7|g' \
+ -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-7.pc
+}
+
mutter-devel_package() {
depends="gtk+3-devel graphene-devel clutter-devel
libX11-devel libXtst-devel mutter-${version}_${revision}"
From e12453807fcbdda9e9500541e2410e4bec569565 Mon Sep 17 00:00:00 2001
From: Francesco Circhetta <francesco.circhetta@gmail.com>
Date: Sun, 24 Jan 2021 01:41:23 +0100
Subject: [PATCH 3/5] gnome-shell: update to 3.38.3.
---
srcpkgs/gnome-shell/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 6753b6ac54e..448ad932381 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,27 +1,27 @@
# Template file for 'gnome-shell'
pkgname=gnome-shell
-version=3.38.1
+version=3.38.3
revision=1
build_style=meson
build_helper=gir
configure_args="-Dsystemd=false"
hostmakedepends="gobject-introspection gtk-doc libxslt pkg-config python3 sassc
- asciidoc perl glib-devel mutter-devel gettext gjs-devel"
-makedepends="at-spi2-atk caribou-devel evolution-data-server-devel folks-devel
+ asciidoc perl glib-devel gettext gjs-devel"
+makedepends="at-spi2-atk evolution-data-server-devel folks-devel
gcr-devel gjs-devel gnome-bluetooth-devel gnome-control-center-devel gnome-desktop-devel
gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
libnma-devel polkit-devel pulseaudio-devel
startup-notification-devel telepathy-logger-devel gnome-autoar-devel"
-depends="caribou elogind glxinfo gnome-control-center gsettings-desktop-schemas upower"
+depends="elogind glxinfo gnome-control-center gsettings-desktop-schemas upower"
short_desc="GNOME core user interface"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeShell"
changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-30/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b789e3296463c4cbfa329ad1724df38439c3e6d7537a01025cd8f2fec8c90bb4
+checksum=5345b418cb12a972955ce5cceaed6662480027336b5c51daea5730575b621ced
# needs X
do_check() {
From 666882a5186a1f2e00a9d2cb035f68a04b23f582 Mon Sep 17 00:00:00 2001
From: Francesco Circhetta <francesco.circhetta@gmail.com>
Date: Sun, 24 Jan 2021 01:43:13 +0100
Subject: [PATCH 4/5] gnome-control-center: update to 3.38.3.
---
srcpkgs/gnome-control-center/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index ad35007c4b2..a7ccbdbcfb9 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=3.38.2
+version=3.38.3
revision=2
build_style=meson
build_helper="gir"
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1500e0ec0dbbb3f0b9289d084d6987b9430fe444872adbea5ca7fe0cd5f8476c
+checksum=3b4a4b18ba91803dce133f443f9d1d1f5a1b6c26b7727876e0a699349f5696e3
build_options="cheese"
build_options_default="cheese"
From 5fa5481a6a99774f19747ca5b6863b15c31b364b Mon Sep 17 00:00:00 2001
From: Francesco Circhetta <francesco.circhetta@gmail.com>
Date: Tue, 26 Jan 2021 11:23:48 +0100
Subject: [PATCH 5/5] gnome-core: remove caribou dependency.
---
srcpkgs/gnome-core/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 4aab60c6b74..075bd15cdd3 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-core'
pkgname=gnome-core
version=3.38.0
-revision=2
+revision=3
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
maintainer="q66 <daniel@octaforge.org>"
@@ -13,7 +13,6 @@ depends="
at-spi2-core>=2.38.0
at-spi2-atk>=2.38.0
cantarell-fonts>=0.201
- caribou>=0.4.21
dconf>=0.36.0
evolution-data-server>=3.38.0
folks>=0.14.0
next prev parent reply other threads:[~2021-01-26 11:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-24 22:58 [PR PATCH] " circhioz
2021-01-26 3:23 ` ericonr
2021-01-26 3:36 ` q66
2021-01-26 3:42 ` q66
2021-01-26 3:43 ` q66
2021-01-26 11:32 ` circhioz [this message]
2021-01-26 11:45 ` [PR PATCH] [Updated] " circhioz
2021-01-26 12:11 ` circhioz
2021-01-27 1:23 ` [PR PATCH] [Merged]: " q66
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=20210126113234.h0nB9t0fjgrTHlMqdxolXBBZYAHI_dOoAxOfDCZyHUA@z \
--to=circhioz@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).