diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
| commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
| tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings | |
| parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
| download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz | |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings')
2 files changed, 45 insertions, 3 deletions
diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/files/0002-Fix-linking-to-dbus-glib-bug-13633.patch b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/files/0002-Fix-linking-to-dbus-glib-bug-13633.patch new file mode 100644 index 0000000000..109b7b1459 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/files/0002-Fix-linking-to-dbus-glib-bug-13633.patch @@ -0,0 +1,41 @@ +From b6e46e6a84e45f7bd954687be703987825a54c1e Mon Sep 17 00:00:00 2001 +From: Eric Koegel <eric.koegel@gmail.com> +Date: Sun, 11 Jun 2017 11:38:26 +0300 +Subject: [PATCH] Fix linking to dbus-glib (bug #13633) + +With xfconf moving to GDBus nothing provides the libs for dbus-glib +that xfce4-settings requires. This patch adds the libs back in until +settings can be ported to GDBus. + +Signed-off-by: Sean Davis <smd.seandavis@gmail.com> + +Upstream-Status: Backport +--- + xfce4-settings-editor/Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/xfce4-settings-editor/Makefile.am b/xfce4-settings-editor/Makefile.am +index 5964366..c2c7c4b 100644 +--- a/xfce4-settings-editor/Makefile.am ++++ b/xfce4-settings-editor/Makefile.am +@@ -28,6 +28,7 @@ xfce4_settings_editor_CFLAGS = \ + $(LIBXFCE4UTIL_CFLAGS) \ + $(LIBXFCE4UI_CFLAGS) \ + $(XFCONF_CFLAGS) \ ++ $(DBUS_GLIB_CFLAGS) \ + $(PLATFORM_CFLAGS) + + xfce4_settings_editor_LDFLAGS = \ +@@ -39,7 +40,8 @@ xfce4_settings_editor_LDADD = \ + $(DBUS_GLIB_LIBS) \ + $(LIBXFCE4UTIL_LIBS) \ + $(LIBXFCE4UI_LIBS) \ +- $(XFCONF_LIBS) ++ $(XFCONF_LIBS) \ ++ $(DBUS_GLIB_LIBS) + + desktopdir = $(datadir)/applications + desktop_in_files = xfce4-settings-editor.desktop.in +-- +2.14.3 + diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb index bf9bd3102e..a4685aed33 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb @@ -13,12 +13,13 @@ REQUIRED_DISTRO_FEATURES = "x11" # + minor bugfixes - sent mainline but no response # + option to hide mousepointer for a specific (touch) input device - sent mainline but no response SRC_URI = " \ - git://github.com/schnitzeltony/xfce4-settings.git;protocol=git;branch=for-oe-4.12.3 \ + git://github.com/schnitzeltony/xfce4-settings.git;protocol=git;branch=for-oe-4.12.4 \ file://0001-xsettings.xml-Set-default-themes.patch \ + file://0002-Fix-linking-to-dbus-glib-bug-13633.patch \ " -SRCREV = "b701ac8b66b83c17469dd5009da51eeb59eba442" +SRCREV = "75d7c9b15e5ccce12b0864d3659ae9b6de96e245" S = "${WORKDIR}/git" -PV = "4.12.3+git${SRCPV}" +PV = "4.12.4+git${SRCPV}" EXTRA_OECONF += "--enable-maintainer-mode --disable-debug" |