commit: 9d6462925b8c9b3f5513f6c8150961b7e1bc3b58 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> AuthorDate: Tue Sep 12 22:01:58 2017 +0000 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> CommitDate: Tue Sep 12 22:03:04 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d646292
x11-wm/mutter: fix build with libgudev-232, bug #630312 Closes: https://bugs.gentoo.org/630312 Package-Manager: Portage-2.3.8, Repoman-2.3.3 x11-wm/mutter/files/3.24.4-gudev-232.patch | 33 ++++++++++++++++++++++++++++++ x11-wm/mutter/mutter-3.24.4.ebuild | 9 ++++++-- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/x11-wm/mutter/files/3.24.4-gudev-232.patch b/x11-wm/mutter/files/3.24.4-gudev-232.patch new file mode 100644 index 00000000000..5808e977c73 --- /dev/null +++ b/x11-wm/mutter/files/3.24.4-gudev-232.patch @@ -0,0 +1,33 @@ +From 361bf847af82c7dca097302fe64c575079280c9c Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <had...@hadess.net> +Date: Fri, 1 Sep 2017 02:06:38 +0200 +Subject: build: Require libgudev >= 232 + +And remove the g_autoptr implementations in mutter itself. + +https://bugzilla.gnome.org/show_bug.cgi?id=760670 + +Gentoo: stripped configure.ac part to avoid autoreconf +--- + configure.ac | 4 ++-- + src/backends/native/meta-launcher.c | 4 ---- + 2 files changed, 2 insertions(+), 6 deletions(-) + +diff --git a/src/backends/native/meta-launcher.c b/src/backends/native/meta-launcher.c +index 90b4b98..eb35f88 100644 +--- a/src/backends/native/meta-launcher.c ++++ b/src/backends/native/meta-launcher.c +@@ -49,10 +49,6 @@ + + #define DRM_CARD_UDEV_DEVICE_TYPE "drm_minor" + +-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevDevice, g_object_unref) +-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevClient, g_object_unref) +-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevEnumerator, g_object_unref) +- + struct _MetaLauncher + { + Login1Session *session_proxy; +-- +cgit v0.12 + diff --git a/x11-wm/mutter/mutter-3.24.4.ebuild b/x11-wm/mutter/mutter-3.24.4.ebuild index cf11022b83b..c05bdb7e50c 100644 --- a/x11-wm/mutter/mutter-3.24.4.ebuild +++ b/x11-wm/mutter/mutter-3.24.4.ebuild @@ -54,14 +54,14 @@ COMMON_DEPEND=" gles2? ( media-libs/mesa[gles2] ) input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) - udev? ( virtual/libgudev:= ) + udev? ( >=virtual/libgudev-232:= ) wayland? ( >=dev-libs/libinput-1.4 >=dev-libs/wayland-1.6.90 >=dev-libs/wayland-protocols-1.7 >=media-libs/mesa-10.3[egl,gbm,wayland] sys-apps/systemd - virtual/libgudev:= + >=virtual/libgudev-232:= >=virtual/libudev-136:= x11-base/xorg-server[wayland] x11-libs/libdrm:= @@ -80,6 +80,11 @@ RDEPEND="${COMMON_DEPEND} !x11-misc/expocity " +PATCHES=( + # Fix build with >=gudev-232, bug #630312 + "${FILESDIR}"/3.24.4-gudev-232.patch +) + src_prepare() { # Disable building of noinst_PROGRAM for tests if ! use test; then
