You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
47 lines
1.5 KiB
47 lines
1.5 KiB
7 years ago
|
From 23f4b91105c4fa9fa2231d2e1049728a6383cd65 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Olivier Fourdan <ofourdan@redhat.com>
|
||
|
|
Date: Fri, 15 Sep 2017 09:39:18 +0200
|
||
|
|
Subject: [PATCH] Revert "build: Require libgudev >= 232"
|
||
|
|
|
||
|
|
This reverts commit 361bf847af82c7dca097302fe64c575079280c9c.
|
||
|
|
---
|
||
|
|
configure.ac | 4 ++--
|
||
|
|
src/backends/native/meta-launcher.c | 4 ++++
|
||
|
|
2 files changed, 6 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index 805707933..813ca008a 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -225,10 +225,10 @@ AC_MSG_CHECKING([gudev])
|
||
|
|
if test x$with_gudev = xno ; then
|
||
|
|
AC_MSG_RESULT([disabled])
|
||
|
|
else
|
||
|
|
- if $PKG_CONFIG --exists "gudev-1.0 >= 232"; then
|
||
|
|
+ if $PKG_CONFIG --exists gudev-1.0; then
|
||
|
|
have_gudev=yes
|
||
|
|
AC_MSG_RESULT(yes)
|
||
|
|
- MUTTER_PC_MODULES="$MUTTER_PC_MODULES gudev-1.0 >= 232"
|
||
|
|
+ MUTTER_PC_MODULES="$MUTTER_PC_MODULES gudev-1.0"
|
||
|
|
AC_DEFINE([HAVE_LIBGUDEV], 1, [Building with gudev for device type detection])
|
||
|
|
else
|
||
|
|
AC_MSG_RESULT(no)
|
||
|
|
diff --git a/src/backends/native/meta-launcher.c b/src/backends/native/meta-launcher.c
|
||
|
|
index eb35f88be..90b4b98ba 100644
|
||
|
|
--- a/src/backends/native/meta-launcher.c
|
||
|
|
+++ b/src/backends/native/meta-launcher.c
|
||
|
|
@@ -49,6 +49,10 @@
|
||
|
|
|
||
|
|
#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;
|
||
|
|
--
|
||
|
|
2.13.5
|
||
|
|
|