| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | From b6e46e6a84e45f7bd954687be703987825a54c1e Mon Sep 17 00:00:00 2001 |
| 2 | From: Eric Koegel <eric.koegel@gmail.com> |
| 3 | Date: Sun, 11 Jun 2017 11:38:26 +0300 |
| 4 | Subject: [PATCH] Fix linking to dbus-glib (bug #13633) |
| 5 | |
| 6 | With xfconf moving to GDBus nothing provides the libs for dbus-glib |
| 7 | that xfce4-settings requires. This patch adds the libs back in until |
| 8 | settings can be ported to GDBus. |
| 9 | |
| 10 | Signed-off-by: Sean Davis <smd.seandavis@gmail.com> |
| 11 | |
| 12 | Upstream-Status: Backport |
| 13 | --- |
| 14 | xfce4-settings-editor/Makefile.am | 4 +++- |
| 15 | 1 file changed, 3 insertions(+), 1 deletion(-) |
| 16 | |
| 17 | diff --git a/xfce4-settings-editor/Makefile.am b/xfce4-settings-editor/Makefile.am |
| 18 | index 5964366..c2c7c4b 100644 |
| 19 | --- a/xfce4-settings-editor/Makefile.am |
| 20 | +++ b/xfce4-settings-editor/Makefile.am |
| 21 | @@ -28,6 +28,7 @@ xfce4_settings_editor_CFLAGS = \ |
| 22 | $(LIBXFCE4UTIL_CFLAGS) \ |
| 23 | $(LIBXFCE4UI_CFLAGS) \ |
| 24 | $(XFCONF_CFLAGS) \ |
| 25 | + $(DBUS_GLIB_CFLAGS) \ |
| 26 | $(PLATFORM_CFLAGS) |
| 27 | |
| 28 | xfce4_settings_editor_LDFLAGS = \ |
| 29 | @@ -39,7 +40,8 @@ xfce4_settings_editor_LDADD = \ |
| 30 | $(DBUS_GLIB_LIBS) \ |
| 31 | $(LIBXFCE4UTIL_LIBS) \ |
| 32 | $(LIBXFCE4UI_LIBS) \ |
| 33 | - $(XFCONF_LIBS) |
| 34 | + $(XFCONF_LIBS) \ |
| 35 | + $(DBUS_GLIB_LIBS) |
| 36 | |
| 37 | desktopdir = $(datadir)/applications |
| 38 | desktop_in_files = xfce4-settings-editor.desktop.in |
| 39 | -- |
| 40 | 2.14.3 |
| 41 | |