gentoo resync : 05.04.2019

2 files changed, 35 insertions, 51 deletions

diff --git a/dev-util/sysprof/files/3.28.1-fix-nosystemd-build.patch b/dev-util/sysprof/files/3.28.1-fix-nosystemd-build.patch
deleted file mode 100644
index c83a951d846a..000000000000
--- a/dev-util/sysprof/files/3.28.1-fix-nosystemd-build.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 28c28eb11ac1696ce08c9c90e8a7a7759bc5c50b Mon Sep 17 00:00:00 2001
-From: Christian Hergert <chergert@redhat.com>
-Date: Tue, 28 Aug 2018 12:22:57 -0700
-Subject: [PATCH] kernel-symbol: respect ENABLE_POLKIT setting
-
-This fixes the compilation when we have sysprofd fully disabled.
-That is not an ideal configuration, but keeping it working
-ensures that some of the code is easy copy/paste'able in the
-future for some situations.
----
- lib/symbols/sp-kernel-symbol.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/lib/symbols/sp-kernel-symbol.c b/lib/symbols/sp-kernel-symbol.c
-index 8eb8087..14e026f 100644
---- a/lib/symbols/sp-kernel-symbol.c
-+++ b/lib/symbols/sp-kernel-symbol.c
-@@ -18,8 +18,13 @@
- 
- #define G_LOG_DOMAIN "sp-kernel-symbol"
- 
-+#include "config.h"
-+
- #include <gio/gio.h>
--#include <polkit/polkit.h>
-+
-+#ifdef ENABLE_POLKIT
-+# include <polkit/polkit.h>
-+#endif
- 
- #include "sp-kallsyms.h"
- 
-@@ -87,6 +92,7 @@ type_is_ignored (guint8 type)
- static gboolean
- authorize_proxy (GDBusConnection *conn)
- {
-+#ifdef ENABLE_POLKIT
-   PolkitSubject *subject = NULL;
-   GPermission *permission = NULL;
-   const gchar *name;
-@@ -113,6 +119,7 @@ authorize_proxy (GDBusConnection *conn)
- failure:
-   g_clear_object (&subject);
-   g_clear_object (&permission);
-+#endif
- 
-   return FALSE;
- }
--- 
-2.17.0
-
diff --git a/dev-util/sysprof/files/3.30.2-elogind.patch b/dev-util/sysprof/files/3.30.2-elogind.patch
new file mode 100644
index 000000000000..2a57fff3a9c6
--- /dev/null
+++ b/dev-util/sysprof/files/3.30.2-elogind.patch
@@ -0,0 +1,35 @@
+From b30057251d3f2b5860b36505fed440a6bebe0359 Mon Sep 17 00:00:00 2001
+From: Shiba <not@telling.you>
+Date: Wed, 19 Dec 2018 00:37:57 +0100
+Subject: [PATCH] elogind support
+
+---
+ daemon/meson.build | 11 ++++++++++-
+ 2 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/daemon/meson.build b/daemon/meson.build
+index d0cf87c..c7f85d7 100644
+--- a/daemon/meson.build
++++ b/daemon/meson.build
+@@ -11,8 +11,17 @@ sysprofd_sources = [
+ # NOTE: This is used in data/meson.build
+ pkglibexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), 'sysprof')
+ 
++# Check for sd-bus support either by systemd or elogind
++sdbus_dep = dependency('libsystemd', version: '>=222', required: false)
++if not sdbus_dep.found()
++  sdbus_dep = dependency('libelogind', version: '>=239.3', required: false)
++  if not sdbus_dep.found()
++    error('sysprofd requires sd-bus but neither systemd nor elogind were found')
++  endif
++endif
++
+ sysprofd_deps = [
+-  dependency('libsystemd', version: '>=222'),
++  sdbus_dep,
+   dependency('glib-2.0'),
+ ]
+ 
+-- 
+2.18.1
+