commit: c90faff75f9c20b4710e8c6cbe206d88c5ed654f Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Mon Jun 3 17:52:48 2019 +0000 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> CommitDate: Tue Jun 18 00:34:57 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c90faff7
xfce-base/xfce4-session: remove unused patch Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/12183 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> .../xfce4-session-4.13.1-kill-dbus-includes.patch | 43 ---------------------- 1 file changed, 43 deletions(-) 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 deleted file mode 100644 index cc5bb9d653e..00000000000 --- a/xfce-base/xfce4-session/files/xfce4-session-4.13.1-kill-dbus-includes.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 3bddf152b902d8a1e0f674b792577b2cca635c4b Mon Sep 17 00:00:00 2001 -From: Brandon Bergren <x...@bdragon.rtk0.net> -Date: Sun, 26 Aug 2018 10:28:05 -0400 -Subject: [PATCH] fix build failure when dbus is not in the system include path - (Bug #14386) - -The d-bus direct depenencies were taken out in 91860af3a38080, -but the #include <dbus/dbus.h> in xfce4-session/xfsm-global.h -and the #include <dbus/dbus-glib.h> line in xfsm-error.c got left -in accidentally. ---- - xfce4-session/xfsm-error.c | 2 -- - xfce4-session/xfsm-global.h | 1 - - 2 files changed, 3 deletions(-) - -diff --git a/xfce4-session/xfsm-error.c b/xfce4-session/xfsm-error.c -index 2b7f6c04..f0766f5f 100644 ---- a/xfce4-session/xfsm-error.c -+++ b/xfce4-session/xfsm-error.c -@@ -20,8 +20,6 @@ - #include <config.h> - #endif - --#include <dbus/dbus-glib.h> -- - #include <xfce4-session/xfsm-error.h> - - #define XFSM_DBUS_NAME "org.xfce.SessionManager" -diff --git a/xfce4-session/xfsm-global.h b/xfce4-session/xfsm-global.h -index d4587123..610d5bf7 100644 ---- a/xfce4-session/xfsm-global.h -+++ b/xfce4-session/xfsm-global.h -@@ -27,7 +27,6 @@ - #include <X11/SM/SMlib.h> - - #include <xfce4-session/xfsm-splash-screen.h> --#include <dbus/dbus.h> - - typedef struct _FailsafeClient FailsafeClient; - struct _FailsafeClient --- -2.19.0 -
