From e2d04aaa8c31c3aeb3ad9fc504950ad579cab160 Mon Sep 17 00:00:00 2001 From: Nafis Date: Tue, 6 Oct 2020 02:53:14 +0600 Subject: [PATCH 1/3] gnome-desktop: update to 3.38.1. --- 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 bd0b2f5c1d9..86c1d11e182 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.0 +version=3.38.1 revision=1 build_style=meson build_helper="gir" @@ -16,7 +16,7 @@ maintainer="Enno Boland " 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=089dbbe3c66fe5575659a4a385d5d4bbd99cf637034df317f21cf586b5dd6b90 +checksum=17903513fed60814e967512dd892751cb6a1d2716136232884bc65bd53cc3be0 build_options="gir" build_options_default="gir" From ac903711bc20bd07c6347b395e320c597ac6fe57 Mon Sep 17 00:00:00 2001 From: Nafis Date: Tue, 6 Oct 2020 04:51:42 +0600 Subject: [PATCH 2/3] mutter: update to 3.38.1. --- .../patches/dont-pull-generated-headers.patch | 49 +++++++++++++++++++ srcpkgs/mutter/template | 4 +- 2 files changed, 51 insertions(+), 2 deletions(-) create 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 new file mode 100644 index 00000000000..a75365a6324 --- /dev/null +++ b/srcpkgs/mutter/patches/dont-pull-generated-headers.patch @@ -0,0 +1,49 @@ +From ff379fb93ae2539bf9fae70ccc8e0351e5665fb0 Mon Sep 17 00:00:00 2001 +From: Carlos Garnacho +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 479284034ea..64da9242157 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,6 +1,6 @@ # Template file for 'mutter' pkgname=mutter -version=3.38.0 +version=3.38.1 revision=1 build_helper="gir" build_style=meson @@ -18,7 +18,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/Mutter/" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=058ed13d102085d3e9b6fa5564c66050a478c364a0cc55bc844fea3ddcd90eab +checksum=e921570c9fdf63805dbd40aa21daa05504a1b9a21432d6119c54c17ee0217a33 shlib_provides="libmutter-clutter-7.so libmutter-cogl-7.so libmutter-cogl-pango-7.so libmutter-cogl-path-7.so" From f046ef281a92de287bcd3a3f074712303480da94 Mon Sep 17 00:00:00 2001 From: Nafis Date: Tue, 6 Oct 2020 06:04:46 +0600 Subject: [PATCH 3/3] gnome-shell: update to 3.38.1. --- srcpkgs/gnome-shell/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template index f27795572ef..bc4cd67fae7 100644 --- a/srcpkgs/gnome-shell/template +++ b/srcpkgs/gnome-shell/template @@ -1,6 +1,6 @@ # Template file for 'gnome-shell' pkgname=gnome-shell -version=3.38.0 +version=3.38.1 revision=1 build_style=meson build_helper=gir @@ -21,7 +21,7 @@ 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=c626403bc0875ee6da8c7a62ac0cee312badb523af073cb166125015a75a0a97 +checksum=b789e3296463c4cbfa329ad1724df38439c3e6d7537a01025cd8f2fec8c90bb4 # needs X do_check() {