|
 |
e47e58 |
From 23f4b91105c4fa9fa2231d2e1049728a6383cd65 Mon Sep 17 00:00:00 2001
|
|
|
e47e58 |
From: Olivier Fourdan <ofourdan@redhat.com>
|
|
|
e47e58 |
Date: Fri, 15 Sep 2017 09:39:18 +0200
|
|
|
e47e58 |
Subject: [PATCH] Revert "build: Require libgudev >= 232"
|
|
|
e47e58 |
|
|
|
e47e58 |
This reverts commit 361bf847af82c7dca097302fe64c575079280c9c.
|
|
|
e47e58 |
---
|
|
|
e47e58 |
configure.ac | 4 ++--
|
|
|
e47e58 |
src/backends/native/meta-launcher.c | 4 ++++
|
|
|
e47e58 |
2 files changed, 6 insertions(+), 2 deletions(-)
|
|
|
e47e58 |
|
|
|
e47e58 |
diff --git a/configure.ac b/configure.ac
|
|
|
e47e58 |
index 805707933..813ca008a 100644
|
|
|
e47e58 |
--- a/configure.ac
|
|
|
e47e58 |
+++ b/configure.ac
|
|
|
e47e58 |
@@ -225,10 +225,10 @@ AC_MSG_CHECKING([gudev])
|
|
|
e47e58 |
if test x$with_gudev = xno ; then
|
|
|
e47e58 |
AC_MSG_RESULT([disabled])
|
|
|
e47e58 |
else
|
|
|
e47e58 |
- if $PKG_CONFIG --exists "gudev-1.0 >= 232"; then
|
|
|
e47e58 |
+ if $PKG_CONFIG --exists gudev-1.0; then
|
|
|
e47e58 |
have_gudev=yes
|
|
|
e47e58 |
AC_MSG_RESULT(yes)
|
|
|
e47e58 |
- MUTTER_PC_MODULES="$MUTTER_PC_MODULES gudev-1.0 >= 232"
|
|
|
e47e58 |
+ MUTTER_PC_MODULES="$MUTTER_PC_MODULES gudev-1.0"
|
|
|
e47e58 |
AC_DEFINE([HAVE_LIBGUDEV], 1, [Building with gudev for device type detection])
|
|
|
e47e58 |
else
|
|
|
e47e58 |
AC_MSG_RESULT(no)
|
|
|
e47e58 |
diff --git a/src/backends/native/meta-launcher.c b/src/backends/native/meta-launcher.c
|
|
|
e47e58 |
index eb35f88be..90b4b98ba 100644
|
|
|
e47e58 |
--- a/src/backends/native/meta-launcher.c
|
|
|
e47e58 |
+++ b/src/backends/native/meta-launcher.c
|
|
|
e47e58 |
@@ -49,6 +49,10 @@
|
|
|
e47e58 |
|
|
|
e47e58 |
#define DRM_CARD_UDEV_DEVICE_TYPE "drm_minor"
|
|
|
e47e58 |
|
|
|
e47e58 |
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevDevice, g_object_unref)
|
|
|
e47e58 |
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevClient, g_object_unref)
|
|
|
e47e58 |
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevEnumerator, g_object_unref)
|
|
|
e47e58 |
+
|
|
|
e47e58 |
struct _MetaLauncher
|
|
|
e47e58 |
{
|
|
|
e47e58 |
Login1Session *session_proxy;
|
|
|
e47e58 |
--
|
|
|
e47e58 |
2.13.5
|
|
|
e47e58 |
|