1 files changed, 0 insertions, 61 deletions
diff --git a/meta-xfce/recipes-apps/xfce4-mixer/files/0001-Fix-build-after-update-of-xfconf.patch b/meta-xfce/recipes-apps/xfce4-mixer/files/0001-Fix-build-after-update-of-xfconf.patch
deleted file mode 100644
index 31216c038..000000000
--- a/meta-xfce/recipes-apps/xfce4-mixer/files/0001-Fix-build-after-update-of-xfconf.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 6ecaeced291f935a9d41e9bc33411358c95a5e91 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Mon, 22 Jan 2018 15:35:08 +0100
-Subject: [PATCH] Fix build after update of xfconf
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-xfconf stopped using dbus-glib so required flags must be included here
-Upstream-Status: Pending
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- panel-plugin/Makefile.am | 2 ++
- xfce4-mixer/Makefile.am  | 2 ++
- 2 files changed, 4 insertions(+)
-diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
-index a494682..b094472 100644
--- a/panel-plugin/Makefile.am
-+++ b/panel-plugin/Makefile.am
-@@ -27,6 +27,7 @@ libmixer_la_CFLAGS =                                                  \
-        $(LIBXFCE4UI_CFLAGS)                                            \
-        $(LIBXFCE4PANEL_CFLAGS)                                         \
-        $(XFCONF_CFLAGS)                                                \
-+       $(DBUS_GLIB_CFLAGS)                                             \
-        $(GST_PLUGINS_BASE_CFLAGS)                                      \
-        $(KEYBINDER_CFLAGS)
- 
-@@ -48,6 +49,7 @@ libmixer_la_LIBADD =                                                  \
-        $(LIBXFCE4UI_LIBS)                                              \
-        $(LIBXFCE4PANEL_LIBS)                                           \
-        $(XFCONF_LIBS)                                                  \
-+       $(DBUS_GLIB_LIBS)                                               \
-        $(GST_PLUGINS_BASE_LIBS)                                        \
-        -lgstaudio-0.10                                                 \
-        -lgstinterfaces-0.10                                            \
-diff --git a/xfce4-mixer/Makefile.am b/xfce4-mixer/Makefile.am
-index 4af69e9..e076fc8 100644
--- a/xfce4-mixer/Makefile.am
-+++ b/xfce4-mixer/Makefile.am
-@@ -32,6 +32,7 @@ xfce4_mixer_CFLAGS =                                                  \
-        $(UNIQUE_CFLAGS)                                                \
-        $(LIBXFCE4UTIL_CFLAGS)                                          \
-        $(LIBXFCE4UI_CFLAGS)                                            \
-+       $(DBUS_GLIB_CFLAGS)                                             \
-        $(XFCONF_CFLAGS)                                                \
-        $(GST_PLUGINS_BASE_CFLAGS)
- 
-@@ -46,6 +47,7 @@ xfce4_mixer_LDFLAGS =                                                         \
-        $(UNIQUE_LIBS)                                                  \
-        $(LIBXFCE4UTIL_LIBS)                                            \
-        $(LIBXFCE4UI_LIBS)                                              \
-+       $(DBUS_GLIB_LIBS)                                               \
-        $(XFCONF_LIBS)                                                  \
-        $(GST_PLUGINS_BASE_LIBS)                                        \
-        -lgstaudio-0.10                                                 \
-- 
-2.14.3

diff --git a/meta-xfce/recipes-apps/xfce4-mixer/files/0001-Fix-build-after-update-of-xfconf.patch b/meta-xfce/recipes-apps/xfce4-mixer/files/0001-Fix-build-after-update-of-xfconf.patch deleted file mode 100644 index 31216c038..000000000 --- a/meta-xfce/recipes-apps/xfce4-mixer/files/0001-Fix-build-after-update-of-xfconf.patch +++ /dev/null
@@ -1,61 +0,0 @@
1	From 6ecaeced291f935a9d41e9bc33411358c95a5e91 Mon Sep 17 00:00:00 2001
2	From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3	Date: Mon, 22 Jan 2018 15:35:08 +0100
4	Subject: [PATCH] Fix build after update of xfconf
5	MIME-Version: 1.0
6	Content-Type: text/plain; charset=UTF-8
7	Content-Transfer-Encoding: 8bit
8
9	xfconf stopped using dbus-glib so required flags must be included here
10
11	Upstream-Status: Pending
12
13	Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
14	---
15	panel-plugin/Makefile.am \| 2 ++
16	xfce4-mixer/Makefile.am \| 2 ++
17	2 files changed, 4 insertions(+)
18
19	diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
20	index a494682..b094472 100644
21	--- a/panel-plugin/Makefile.am
22	+++ b/panel-plugin/Makefile.am
23	@@ -27,6 +27,7 @@ libmixer_la_CFLAGS = \
24	$(LIBXFCE4UI_CFLAGS) \
25	$(LIBXFCE4PANEL_CFLAGS) \
26	$(XFCONF_CFLAGS) \
27	+ $(DBUS_GLIB_CFLAGS) \
28	$(GST_PLUGINS_BASE_CFLAGS) \
29	$(KEYBINDER_CFLAGS)
30
31	@@ -48,6 +49,7 @@ libmixer_la_LIBADD = \
32	$(LIBXFCE4UI_LIBS) \
33	$(LIBXFCE4PANEL_LIBS) \
34	$(XFCONF_LIBS) \
35	+ $(DBUS_GLIB_LIBS) \
36	$(GST_PLUGINS_BASE_LIBS) \
37	-lgstaudio-0.10 \
38	-lgstinterfaces-0.10 \
39	diff --git a/xfce4-mixer/Makefile.am b/xfce4-mixer/Makefile.am
40	index 4af69e9..e076fc8 100644
41	--- a/xfce4-mixer/Makefile.am
42	+++ b/xfce4-mixer/Makefile.am
43	@@ -32,6 +32,7 @@ xfce4_mixer_CFLAGS = \
44	$(UNIQUE_CFLAGS) \
45	$(LIBXFCE4UTIL_CFLAGS) \
46	$(LIBXFCE4UI_CFLAGS) \
47	+ $(DBUS_GLIB_CFLAGS) \
48	$(XFCONF_CFLAGS) \
49	$(GST_PLUGINS_BASE_CFLAGS)
50
51	@@ -46,6 +47,7 @@ xfce4_mixer_LDFLAGS = \
52	$(UNIQUE_LIBS) \
53	$(LIBXFCE4UTIL_LIBS) \
54	$(LIBXFCE4UI_LIBS) \
55	+ $(DBUS_GLIB_LIBS) \
56	$(XFCONF_LIBS) \
57	$(GST_PLUGINS_BASE_LIBS) \
58	-lgstaudio-0.10 \
59	--
60	2.14.3
61