1 |
commit: 40c1832fb0d2b37861ed4dbdc2cd2876a53f90cd |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 5 19:09:53 2018 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 5 19:09:53 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40c1832f |
7 |
|
8 |
xfce-base/xfce4-session: Fix relying on implicit dbus header paths |
9 |
|
10 |
Backport an upstream patch removing unnecessary use of dbus headers. |
11 |
This causes the package to implicitly rely on dbus include paths being |
12 |
added by pkg-config, and causes build failure in the rare case when |
13 |
xfce4-session dependencies do not require dbus. |
14 |
|
15 |
Closes: https://bugs.gentoo.org/667440 |
16 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
17 |
|
18 |
.../xfce4-session-4.13.1-kill-dbus-includes.patch | 43 ++++++++++++++++++++++ |
19 |
.../xfce4-session/xfce4-session-4.13.1.ebuild | 4 ++ |
20 |
2 files changed, 47 insertions(+) |
21 |
|
22 |
diff --git a/xfce-base/xfce4-session/files/xfce4-session-4.13.1-kill-dbus-includes.patch b/xfce-base/xfce4-session/files/xfce4-session-4.13.1-kill-dbus-includes.patch |
23 |
new file mode 100644 |
24 |
index 00000000000..cc5bb9d653e |
25 |
--- /dev/null |
26 |
+++ b/xfce-base/xfce4-session/files/xfce4-session-4.13.1-kill-dbus-includes.patch |
27 |
@@ -0,0 +1,43 @@ |
28 |
+From 3bddf152b902d8a1e0f674b792577b2cca635c4b Mon Sep 17 00:00:00 2001 |
29 |
+From: Brandon Bergren <xfce@××××××××××××.net> |
30 |
+Date: Sun, 26 Aug 2018 10:28:05 -0400 |
31 |
+Subject: [PATCH] fix build failure when dbus is not in the system include path |
32 |
+ (Bug #14386) |
33 |
+ |
34 |
+The d-bus direct depenencies were taken out in 91860af3a38080, |
35 |
+but the #include <dbus/dbus.h> in xfce4-session/xfsm-global.h |
36 |
+and the #include <dbus/dbus-glib.h> line in xfsm-error.c got left |
37 |
+in accidentally. |
38 |
+--- |
39 |
+ xfce4-session/xfsm-error.c | 2 -- |
40 |
+ xfce4-session/xfsm-global.h | 1 - |
41 |
+ 2 files changed, 3 deletions(-) |
42 |
+ |
43 |
+diff --git a/xfce4-session/xfsm-error.c b/xfce4-session/xfsm-error.c |
44 |
+index 2b7f6c04..f0766f5f 100644 |
45 |
+--- a/xfce4-session/xfsm-error.c |
46 |
++++ b/xfce4-session/xfsm-error.c |
47 |
+@@ -20,8 +20,6 @@ |
48 |
+ #include <config.h> |
49 |
+ #endif |
50 |
+ |
51 |
+-#include <dbus/dbus-glib.h> |
52 |
+- |
53 |
+ #include <xfce4-session/xfsm-error.h> |
54 |
+ |
55 |
+ #define XFSM_DBUS_NAME "org.xfce.SessionManager" |
56 |
+diff --git a/xfce4-session/xfsm-global.h b/xfce4-session/xfsm-global.h |
57 |
+index d4587123..610d5bf7 100644 |
58 |
+--- a/xfce4-session/xfsm-global.h |
59 |
++++ b/xfce4-session/xfsm-global.h |
60 |
+@@ -27,7 +27,6 @@ |
61 |
+ #include <X11/SM/SMlib.h> |
62 |
+ |
63 |
+ #include <xfce4-session/xfsm-splash-screen.h> |
64 |
+-#include <dbus/dbus.h> |
65 |
+ |
66 |
+ typedef struct _FailsafeClient FailsafeClient; |
67 |
+ struct _FailsafeClient |
68 |
+-- |
69 |
+2.19.0 |
70 |
+ |
71 |
|
72 |
diff --git a/xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild |
73 |
index 7819b1d8883..d0df74cf881 100644 |
74 |
--- a/xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild |
75 |
+++ b/xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild |
76 |
@@ -44,6 +44,10 @@ PATCHES=( |
77 |
# TODO: this patch needs updating for the new version, and finding |
78 |
# upstream bug. |
79 |
# "${FILESDIR}"/${PN}-4.12.1-light-locker_support_to_xflock4.patch |
80 |
+ |
81 |
+ # fix building with no dbus dependency |
82 |
+ # https://bugs.gentoo.org/667440 |
83 |
+ "${FILESDIR}"/xfce4-session-4.13.1-kill-dbus-includes.patch |
84 |
) |
85 |
|
86 |
src_configure() { |