diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 15:28:33 -0400 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 19:31:28 +0000 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-xfce/recipes-apps/xfce4-mixer/files | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | talos-openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.gz talos-openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.zip |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-xfce/recipes-apps/xfce4-mixer/files')
-rw-r--r-- | meta-openembedded/meta-xfce/recipes-apps/xfce4-mixer/files/0001-Fix-build-after-update-of-xfconf.patch | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-mixer/files/0001-Fix-build-after-update-of-xfconf.patch b/meta-openembedded/meta-xfce/recipes-apps/xfce4-mixer/files/0001-Fix-build-after-update-of-xfconf.patch deleted file mode 100644 index 31216c038..000000000 --- a/meta-openembedded/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 - |