* [PR PATCH] gnome-desktop, gnome-shell, mutter: update to 3.38.1.
@ 2020-10-06 0:07 mnabid
2020-10-06 11:14 ` sgn
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: mnabid @ 2020-10-06 0:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 338 bytes --]
There is a new pull request by mnabid against master on the void-packages repository
https://github.com/mnabid/void-packages kde_sucks
https://github.com/void-linux/void-packages/pull/25376
gnome-desktop, gnome-shell, mutter: update to 3.38.1.
A patch file from https://github.com/void-linux/void-packages/pull/25376.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kde_sucks-25376.patch --]
[-- Type: text/x-diff, Size: 5337 bytes --]
From 5319ff1f1cd392108324e0f5fe01c5a5d98f89f2 Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
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 <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=089dbbe3c66fe5575659a4a385d5d4bbd99cf637034df317f21cf586b5dd6b90
+checksum=17903513fed60814e967512dd892751cb6a1d2716136232884bc65bd53cc3be0
build_options="gir"
build_options_default="gir"
From b85669993680a97e9d09d8432556fc6cea2a03c6 Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
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 <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 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 <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=058ed13d102085d3e9b6fa5564c66050a478c364a0cc55bc844fea3ddcd90eab
+checksum=e921570c9fdf63805dbd40aa21daa05504a1b9a21432d6119c54c17ee0217a33
shlib_provides="libmutter-clutter-7.so libmutter-cogl-7.so
libmutter-cogl-pango-7.so libmutter-cogl-path-7.so"
From abf442d9eefdc4c0b1fc377ae183ea4db07c5c6f Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
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() {
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: gnome-desktop, gnome-shell, mutter: update to 3.38.1.
2020-10-06 0:07 [PR PATCH] gnome-desktop, gnome-shell, mutter: update to 3.38.1 mnabid
@ 2020-10-06 11:14 ` sgn
2020-10-07 5:37 ` [PR PATCH] [Updated] " mnabid
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2020-10-06 11:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 218 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/25376#issuecomment-704199308
Comment:
```sh
ninja -C build src/meta-dbus-display-config.h
```
can help in your case.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] gnome-desktop, gnome-shell, mutter: update to 3.38.1.
2020-10-06 0:07 [PR PATCH] gnome-desktop, gnome-shell, mutter: update to 3.38.1 mnabid
2020-10-06 11:14 ` sgn
@ 2020-10-07 5:37 ` mnabid
2020-10-07 8:41 ` mnabid
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: mnabid @ 2020-10-07 5:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 3306 bytes --]
There is an updated pull request by mnabid against master on the void-packages repository
https://github.com/mnabid/void-packages kde_sucks
https://github.com/void-linux/void-packages/pull/25376
gnome-desktop, gnome-shell, mutter: update to 3.38.1.
### TODO:
- [ ] mutter: fix build for `i686*` (probably needs a patch similar to [GNOME/mutter!1470](https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1470))
<details>
<summary>
<b>
from <a href="https://travis-ci.org/github/void-linux/void-packages/jobs/733149209" target="_blank">Travis log</a>:
</b>
</summary>
```
[188/863] Compiling C object src/tests/clutter/conform/timeline.p/.._.._clutter-test-utils.c.o
FAILED: src/tests/clutter/conform/timeline.p/.._.._clutter-test-utils.c.o
cc -Isrc/tests/clutter/conform/timeline.p -Isrc/tests/clutter/conform -I../src/tests/clutter/conform -Iclutter -I../clutter -Iclutter/clutter -I../clutter/clutter -Icogl -I../cogl -Icogl/cogl -I../cogl/cogl -Isrc -I../src -I. -I.. -I/usr/include/atk-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/uuid -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/json-glib-1.0 -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/harfbuzz -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libwacom-1.0 -I/usr/include/gudev-1.0 -I/usr/include/graphene-1.0 -I/usr/lib/graphene-1.0/include -I/usr/include/gsettings-desktop-schemas -I/usr/include/gtk-3.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib32/dbus-1.0/include -I/usr/include/gnome-desktop-3.0 -I/usr/include/gnome-settings-daemon-3.0 -I/usr/include/startup-notification-1.0 -I/usr/include/pipewire-0.3 -I/usr/include/spa-0.2 -I/usr/include/gobject-introspection-1.0 -I/usr/include/libdrm -I/usr/include/elogind -flto -fdiagnostics-color=always -DNDEBUG -pipe -D_FILE_OFFSET_BITS=64 -ffloat-store -D_GNU_SOURCE -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=i686 -O2 -pthread -D_REENTRANT -mfpmath=sse -msse -msse2 '-DG_LOG_DOMAIN="Clutter-Conform"' -DCOGL_DISABLE_DEPRECATION_WARNINGS '-DGETTEXT_PACKAGE="mutter"' -MD -MQ src/tests/clutter/conform/timeline.p/.._.._clutter-test-utils.c.o -MF src/tests/clutter/conform/timeline.p/.._.._clutter-test-utils.c.o.d -o src/tests/clutter/conform/timeline.p/.._.._clutter-test-utils.c.o -c ../src/tests/clutter-test-utils.c
In file included from ../src/backends/meta-backend-private.h:38,
from ../src/backends/x11/meta-backend-x11.h:31,
from ../src/backends/x11/nested/meta-backend-x11-nested.h:25,
from ../src/tests/clutter-test-utils.h:36,
from ../src/tests/clutter-test-utils.c:1:
../src/backends/meta-monitor-manager-private.h:38:10: fatal error: meta-dbus-display-config.h: No such file or directory
38 | #include "meta-dbus-display-config.h"
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
[189/863] Compiling C object clutter/clutter/libmutter-clutter-7.so.0.0.0.p/clutter-canvas.c.o
ninja: build stopped: subcommand failed.
```
</details>
A patch file from https://github.com/void-linux/void-packages/pull/25376.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kde_sucks-25376.patch --]
[-- Type: text/x-diff, Size: 5337 bytes --]
From e2d04aaa8c31c3aeb3ad9fc504950ad579cab160 Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
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 <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=089dbbe3c66fe5575659a4a385d5d4bbd99cf637034df317f21cf586b5dd6b90
+checksum=17903513fed60814e967512dd892751cb6a1d2716136232884bc65bd53cc3be0
build_options="gir"
build_options_default="gir"
From ac903711bc20bd07c6347b395e320c597ac6fe57 Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
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 <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 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 <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=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 <mnabid.25@outlook.com>
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() {
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] gnome-desktop, gnome-shell, mutter: update to 3.38.1.
2020-10-06 0:07 [PR PATCH] gnome-desktop, gnome-shell, mutter: update to 3.38.1 mnabid
2020-10-06 11:14 ` sgn
2020-10-07 5:37 ` [PR PATCH] [Updated] " mnabid
@ 2020-10-07 8:41 ` mnabid
2020-10-07 9:08 ` mnabid
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: mnabid @ 2020-10-07 8:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 3306 bytes --]
There is an updated pull request by mnabid against master on the void-packages repository
https://github.com/mnabid/void-packages kde_sucks
https://github.com/void-linux/void-packages/pull/25376
gnome-desktop, gnome-shell, mutter: update to 3.38.1.
### TODO:
- [ ] mutter: fix build for `i686*` (probably needs a patch similar to [GNOME/mutter!1470](https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1470))
<details>
<summary>
<b>
from <a href="https://travis-ci.org/github/void-linux/void-packages/jobs/733149209" target="_blank">Travis log</a>:
</b>
</summary>
```
[188/863] Compiling C object src/tests/clutter/conform/timeline.p/.._.._clutter-test-utils.c.o
FAILED: src/tests/clutter/conform/timeline.p/.._.._clutter-test-utils.c.o
cc -Isrc/tests/clutter/conform/timeline.p -Isrc/tests/clutter/conform -I../src/tests/clutter/conform -Iclutter -I../clutter -Iclutter/clutter -I../clutter/clutter -Icogl -I../cogl -Icogl/cogl -I../cogl/cogl -Isrc -I../src -I. -I.. -I/usr/include/atk-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/uuid -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/json-glib-1.0 -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/harfbuzz -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libwacom-1.0 -I/usr/include/gudev-1.0 -I/usr/include/graphene-1.0 -I/usr/lib/graphene-1.0/include -I/usr/include/gsettings-desktop-schemas -I/usr/include/gtk-3.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib32/dbus-1.0/include -I/usr/include/gnome-desktop-3.0 -I/usr/include/gnome-settings-daemon-3.0 -I/usr/include/startup-notification-1.0 -I/usr/include/pipewire-0.3 -I/usr/include/spa-0.2 -I/usr/include/gobject-introspection-1.0 -I/usr/include/libdrm -I/usr/include/elogind -flto -fdiagnostics-color=always -DNDEBUG -pipe -D_FILE_OFFSET_BITS=64 -ffloat-store -D_GNU_SOURCE -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=i686 -O2 -pthread -D_REENTRANT -mfpmath=sse -msse -msse2 '-DG_LOG_DOMAIN="Clutter-Conform"' -DCOGL_DISABLE_DEPRECATION_WARNINGS '-DGETTEXT_PACKAGE="mutter"' -MD -MQ src/tests/clutter/conform/timeline.p/.._.._clutter-test-utils.c.o -MF src/tests/clutter/conform/timeline.p/.._.._clutter-test-utils.c.o.d -o src/tests/clutter/conform/timeline.p/.._.._clutter-test-utils.c.o -c ../src/tests/clutter-test-utils.c
In file included from ../src/backends/meta-backend-private.h:38,
from ../src/backends/x11/meta-backend-x11.h:31,
from ../src/backends/x11/nested/meta-backend-x11-nested.h:25,
from ../src/tests/clutter-test-utils.h:36,
from ../src/tests/clutter-test-utils.c:1:
../src/backends/meta-monitor-manager-private.h:38:10: fatal error: meta-dbus-display-config.h: No such file or directory
38 | #include "meta-dbus-display-config.h"
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
[189/863] Compiling C object clutter/clutter/libmutter-clutter-7.so.0.0.0.p/clutter-canvas.c.o
ninja: build stopped: subcommand failed.
```
</details>
A patch file from https://github.com/void-linux/void-packages/pull/25376.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kde_sucks-25376.patch --]
[-- Type: text/x-diff, Size: 5496 bytes --]
From 585f3ccacd3a81399bbb4f1282e18082f6f4a71a Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
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 <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=089dbbe3c66fe5575659a4a385d5d4bbd99cf637034df317f21cf586b5dd6b90
+checksum=17903513fed60814e967512dd892751cb6a1d2716136232884bc65bd53cc3be0
build_options="gir"
build_options_default="gir"
From ce31e6ac3f781d7cb9afe0cc9dc8bfb06ea5ebb9 Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
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 | 11 ++++-
2 files changed, 58 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 <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 479284034ea..80bfe109da6 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,10 +18,17 @@ 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=058ed13d102085d3e9b6fa5564c66050a478c364a0cc55bc844fea3ddcd90eab
+checksum=e921570c9fdf63805dbd40aa21daa05504a1b9a21432d6119c54c17ee0217a33
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
+
# needs X
do_check() {
:
From f749e35e9759f391fe998692c079b2a1ce521af9 Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
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() {
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: gnome-desktop, gnome-shell, mutter: update to 3.38.1.
2020-10-06 0:07 [PR PATCH] gnome-desktop, gnome-shell, mutter: update to 3.38.1 mnabid
` (2 preceding siblings ...)
2020-10-07 8:41 ` mnabid
@ 2020-10-07 9:08 ` mnabid
2020-10-08 0:42 ` sgn
2020-10-09 14:57 ` [PR PATCH] [Merged]: " sgn
5 siblings, 0 replies; 7+ messages in thread
From: mnabid @ 2020-10-07 9:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1002 bytes --]
New comment by mnabid on void-packages repository
https://github.com/void-linux/void-packages/pull/25376#issuecomment-704801182
Comment:
Thanks a lot!
For some reason, crossbuilding for `i686` works fine (without applying your suggestion).
________________________________
From: Đoàn Trần Công Danh <notifications@github.com>
Sent: Tuesday, October 6, 2020 5:14 PM
To: void-linux/void-packages <void-packages@noreply.github.com>
Cc: Nafis <mnabid.25@outlook.com>; Author <author@noreply.github.com>
Subject: Re: [void-linux/void-packages] gnome-desktop, gnome-shell, mutter: update to 3.38.1. (#25376)
ninja -C build src/meta-dbus-display-config.h
can help in your case.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub<https://github.com/void-linux/void-packages/pull/25376#issuecomment-704199308>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AOZ5LGG5LO2WA4JLJZPKFWLSJL3ZDANCNFSM4SFKMM5A>.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: gnome-desktop, gnome-shell, mutter: update to 3.38.1.
2020-10-06 0:07 [PR PATCH] gnome-desktop, gnome-shell, mutter: update to 3.38.1 mnabid
` (3 preceding siblings ...)
2020-10-07 9:08 ` mnabid
@ 2020-10-08 0:42 ` sgn
2020-10-09 14:57 ` [PR PATCH] [Merged]: " sgn
5 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2020-10-08 0:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 604 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/25376#issuecomment-705266136
Comment:
> Thanks a lot! For some reason, crossbuilding for `i686` works fine (without applying your suggestion).
The dependencies is incorrect, I think, it's like
```
exe ----> lib -----> lsrc.c ----> gen-src.h ----> prototype
`---> esrc.c
```
Where `esrc.c` should depend on `gen-src.h` but not declared so. and ninja decided to build `esrc.c` before `gen-src.h
The dependency graph will be generated by host machine so they should only depend on host meson/ninja.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Merged]: gnome-desktop, gnome-shell, mutter: update to 3.38.1.
2020-10-06 0:07 [PR PATCH] gnome-desktop, gnome-shell, mutter: update to 3.38.1 mnabid
` (4 preceding siblings ...)
2020-10-08 0:42 ` sgn
@ 2020-10-09 14:57 ` sgn
5 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2020-10-09 14:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 3037 bytes --]
There's a merged pull request on the void-packages repository
gnome-desktop, gnome-shell, mutter: update to 3.38.1.
https://github.com/void-linux/void-packages/pull/25376
Description:
### TODO:
- [x] mutter: fix build for `i686*`
<details>
<summary>
<b>
from <a href="https://travis-ci.org/github/void-linux/void-packages/jobs/733149209" target="_blank">old Travis log</a>:
</b>
</summary>
```
[188/863] Compiling C object src/tests/clutter/conform/timeline.p/.._.._clutter-test-utils.c.o
FAILED: src/tests/clutter/conform/timeline.p/.._.._clutter-test-utils.c.o
cc -Isrc/tests/clutter/conform/timeline.p -Isrc/tests/clutter/conform -I../src/tests/clutter/conform -Iclutter -I../clutter -Iclutter/clutter -I../clutter/clutter -Icogl -I../cogl -Icogl/cogl -I../cogl/cogl -Isrc -I../src -I. -I.. -I/usr/include/atk-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/uuid -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/json-glib-1.0 -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/harfbuzz -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libwacom-1.0 -I/usr/include/gudev-1.0 -I/usr/include/graphene-1.0 -I/usr/lib/graphene-1.0/include -I/usr/include/gsettings-desktop-schemas -I/usr/include/gtk-3.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib32/dbus-1.0/include -I/usr/include/gnome-desktop-3.0 -I/usr/include/gnome-settings-daemon-3.0 -I/usr/include/startup-notification-1.0 -I/usr/include/pipewire-0.3 -I/usr/include/spa-0.2 -I/usr/include/gobject-introspection-1.0 -I/usr/include/libdrm -I/usr/include/elogind -flto -fdiagnostics-color=always -DNDEBUG -pipe -D_FILE_OFFSET_BITS=64 -ffloat-store -D_GNU_SOURCE -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=i686 -O2 -pthread -D_REENTRANT -mfpmath=sse -msse -msse2 '-DG_LOG_DOMAIN="Clutter-Conform"' -DCOGL_DISABLE_DEPRECATION_WARNINGS '-DGETTEXT_PACKAGE="mutter"' -MD -MQ src/tests/clutter/conform/timeline.p/.._.._clutter-test-utils.c.o -MF src/tests/clutter/conform/timeline.p/.._.._clutter-test-utils.c.o.d -o src/tests/clutter/conform/timeline.p/.._.._clutter-test-utils.c.o -c ../src/tests/clutter-test-utils.c
In file included from ../src/backends/meta-backend-private.h:38,
from ../src/backends/x11/meta-backend-x11.h:31,
from ../src/backends/x11/nested/meta-backend-x11-nested.h:25,
from ../src/tests/clutter-test-utils.h:36,
from ../src/tests/clutter-test-utils.c:1:
../src/backends/meta-monitor-manager-private.h:38:10: fatal error: meta-dbus-display-config.h: No such file or directory
38 | #include "meta-dbus-display-config.h"
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
[189/863] Compiling C object clutter/clutter/libmutter-clutter-7.so.0.0.0.p/clutter-canvas.c.o
ninja: build stopped: subcommand failed.
```
</details>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-10-09 14:57 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-06 0:07 [PR PATCH] gnome-desktop, gnome-shell, mutter: update to 3.38.1 mnabid
2020-10-06 11:14 ` sgn
2020-10-07 5:37 ` [PR PATCH] [Updated] " mnabid
2020-10-07 8:41 ` mnabid
2020-10-07 9:08 ` mnabid
2020-10-08 0:42 ` sgn
2020-10-09 14:57 ` [PR PATCH] [Merged]: " sgn
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).