From 72ccf65bd0072f2eabc21a2a014b22182b547887649a04d44fcfba1f621bb916 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 7 Sep 2017 19:21:06 +0000 Subject: [PATCH] Accepting request 522122 from GNOME:Next Since upstream called .92 without releasing mutter and gnome-shell .92, make patch official, fix build in G:F and :G OBS-URL: https://build.opensuse.org/request/show/522122 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=251 --- mutter-new-libgudev.patch | 31 +++++++++++++++++++++++++++++++ mutter.changes | 6 ++++++ mutter.spec | 5 ++++- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 mutter-new-libgudev.patch diff --git a/mutter-new-libgudev.patch b/mutter-new-libgudev.patch new file mode 100644 index 0000000..950d201 --- /dev/null +++ b/mutter-new-libgudev.patch @@ -0,0 +1,31 @@ +From 361bf847af82c7dca097302fe64c575079280c9c Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +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 +--- + 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/mutter.changes b/mutter.changes index 58b3781..482c3ef 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 7 18:09:43 UTC 2017 - zaitor@opensuse.org + +- Add mutter-new-libgudev.patch: Fix build with new libgudev + (bgo#760670). + ------------------------------------------------------------------- Thu Aug 24 07:59:06 UTC 2017 - zaitor@opensuse.org diff --git a/mutter.spec b/mutter.spec index a582aae..9c93f41 100644 --- a/mutter.spec +++ b/mutter.spec @@ -35,6 +35,8 @@ Patch0: mutter-fix-startup.patch Patch1: mutter-iconcache-Support-RGB16_565-format-for-16-bit-color-.patch # PATCH-FIX-UPSTREAM mutter-no-mandatory-eglGetPlatformDisplayEXT.patch bgo#786619 zaitor@opensuse.org -- egl: Don't require eglGetPlatformDisplayEXT Patch2: mutter-no-mandatory-eglGetPlatformDisplayEXT.patch +# PATCH-FIX-UPSTREAM mutter-new-libgudev.patch bgo#760670 zaitor@opensuse.org -- Fix build with new libgudev +Patch3: mutter-new-libgudev.patch # SLE only patches start at 1000 # PATCH-FEATURE-SLE mutter-SLE-bell.patch FATE#316042 bnc#889218 idonmez@suse.com -- make audible bell work out of the box. Patch1000: mutter-SLE-bell.patch @@ -91,7 +93,7 @@ BuildRequires: translation-update-upstream %endif %if %{with wayland} BuildRequires: pkgconfig(gbm) >= 10.3 -BuildRequires: pkgconfig(gudev-1.0) +BuildRequires: pkgconfig(gudev-1.0) >= 232 BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(wayland-protocols) >= 1.9 @@ -145,6 +147,7 @@ applications that want to make use of the mutter library. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # SLE only patches and translations. %if !0%{?is_opensuse} translation-update-upstream