From 3e4c440ec2889110aac4201cc8c6ee43467b523d Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 10 Jun 2018 17:08:06 +0200 Subject: xfce4-mixer: fix build after update of xfconf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../0001-Fix-build-after-update-of-xfconf.patch | 61 ++++++++++++++++++++++ .../recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb | 5 +- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 meta-xfce/recipes-apps/xfce4-mixer/files/0001-Fix-build-after-update-of-xfconf.patch (limited to 'meta-xfce/recipes-apps/xfce4-mixer') 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 new file mode 100644 index 0000000000..31216c0381 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-mixer/files/0001-Fix-build-after-update-of-xfconf.patch @@ -0,0 +1,61 @@ +From 6ecaeced291f935a9d41e9bc33411358c95a5e91 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +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 +--- + 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/xfce4-mixer_4.11.0.bb b/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb index bdbec458bc..6c057d8845 100644 --- a/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb +++ b/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb @@ -6,7 +6,10 @@ inherit xfce-panel-plugin DEPENDS += "glib-2.0 gst-plugins-base gtk+ xfconf libunique" -SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2" +SRC_URI = " \ + http://archive.xfce.org/src/apps/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2 \ + file://0001-Fix-build-after-update-of-xfconf.patch \ +" SRC_URI[md5sum] = "1b3753b91224867a3a2dfddda239c28d" SRC_URI[sha256sum] = "fb0c1df201ed1130f54f15b914cbe5a59286e994a137acda5609570c57112de2" -- cgit 1.2.3-korg