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-apps | |
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-apps')
13 files changed, 168 insertions, 19 deletions
diff --git a/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.6.bb b/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.6.bb new file mode 100644 index 000000000..229f882d0 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.6.bb @@ -0,0 +1,17 @@ +SUMMARY = "Catfish is a handy file searching tool for linux and unix" +SECTION = "x11/application" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" + +inherit xfce-app distutils3 gtk-icon-cache + +DEPENDS += "python3-distutils-extra-native" + +B = "${S}" + +SRC_URI[md5sum] = "879197c9400be2a80d51abf494bfffb6" +SRC_URI[sha256sum] = "e1caee14c5268ac781434701c0eb26eddfced2c0f1ae066549583ed05f99adbf" + +FILES_${PN} += "${datadir}/metainfo" + +RDEPENDS_${PN} += "python3-pygobject" diff --git a/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.1.5.bb b/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.0.bb index d1f3471d6..b0e4784fe 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.1.5.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.0.bb @@ -13,9 +13,9 @@ inherit distutils3 gtk-icon-cache distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "https://launchpad.net/menulibre/2.1/${PV}/+download/${PN}-${PV}.tar.gz" -SRC_URI[md5sum] = "efc7edb49bb0e5fea49e158b40573334" -SRC_URI[sha256sum] = "ef05b2722bab2acb7070d6c8ed0e7bd58bd4a4540bf498af9e889944f9da08b5" +SRC_URI = "https://launchpad.net/menulibre/2.2/${PV}/+download/${PN}-${PV}.tar.gz" +SRC_URI[md5sum] = "9690848dbf9196c3f7baa574e90378d8" +SRC_URI[sha256sum] = "546fec87f451c8f5c220d02b1f36dd850f4ce9ab607f8e9711ed8f2009e349fe" do_compile() { } diff --git a/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.0.bb b/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.1.bb index 4ca21a6bc..d122bfe37 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.0.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.1.bb @@ -10,8 +10,8 @@ DEPENDS = "gtk+ dbus dbus-glib gtksourceview2 intltool-native xfce4-dev-tools-na inherit xfce-app gsettings -SRC_URI[md5sum] = "f55314c5dda6323883241e6cf01550a7" -SRC_URI[sha256sum] = "60114431eac8db6bb6ce18bd38f1630cccb684375b97a445a1b6fd619848d132" +SRC_URI[md5sum] = "fb85c23bcb096a46aee9ec22b4e4fdf5" +SRC_URI[sha256sum] = "39a7379b929d964665299c385b2cf705e32e8760698ccc34f91c990bb733518b" # we have no gtksourceview 3.x around EXTRA_OECONF = "--disable-gtk3" diff --git a/meta-openembedded/meta-xfce/recipes-apps/orage/orage_4.12.1.bb b/meta-openembedded/meta-xfce/recipes-apps/orage/orage_4.12.1.bb index a2f25682b..eb9da2dff 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/orage/orage_4.12.1.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/orage/orage_4.12.1.bb @@ -14,6 +14,5 @@ PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify" PACKAGES =+ "xfce4-orageclock-plugin" FILES_${PN} += "${datadir}/dbus-1" -FILES_${PN}-dbg += "${libdir}/xfce4/panel/plugins/.debug" FILES_xfce4-orageclock-plugin = "${libdir}/xfce4/panel/plugins/*.so ${datadir}/xfce4/panel/plugins" - +FILES_${PN}-dev += "${libdir}/xfce4/panel/plugins/*.la" diff --git a/meta-openembedded/meta-xfce/recipes-apps/ristretto/files/0001-Fix-build-after-update-of-xfconf.patch b/meta-openembedded/meta-xfce/recipes-apps/ristretto/files/0001-Fix-build-after-update-of-xfconf.patch new file mode 100644 index 000000000..5cdc8c728 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/ristretto/files/0001-Fix-build-after-update-of-xfconf.patch @@ -0,0 +1,40 @@ +From 2b6bdb860ef53975c7e866f393b61d253c00754d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Mon, 22 Jan 2018 15:52:09 +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> +--- + src/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 36a31dc..3dd56bc 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -30,6 +30,7 @@ ristretto_CFLAGS = \ + $(GIO_UNIX_CFLAGS) \ + $(LIBEXIF_CFLAGS) \ + $(XFCONF_CFLAGS) \ ++ $(DBUS_GLIB_CFLAGS) \ + $(EXO_CFLAGS) \ + $(CAIRO_CFLAGS) \ + $(LIBXFCE4UTIL_CFLAGS) \ +@@ -48,6 +49,7 @@ ristretto_LDADD = \ + $(GIO_UNIX_LIBS) \ + $(LIBEXIF_LIBS) \ + $(XFCONF_LIBS) \ ++ $(DBUS_GLIB_LIBS) \ + $(EXO_LIBS) \ + $(CAIRO_LIBS) \ + $(LIBXFCE4UTIL_LIBS) \ +-- +2.14.3 + diff --git a/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.8.2.bb b/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.8.3.bb index c4baa727e..d9b9b2cb0 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.8.2.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.8.3.bb @@ -9,7 +9,8 @@ inherit xfce-app RRECOMMENDS_${PN} += "tumbler" -SRC_URI[md5sum] = "a8d8bb6b8fa7f868cfa3ae778630946e" -SRC_URI[sha256sum] = "f8f3b77ca6fc77ddf8cff1bb52e5c5802c462663f72f324393b3a0360f6901b8" +SRC_URI[md5sum] = "5866b4e11c32a38f72bc737239102544" +SRC_URI[sha256sum] = "8c9c11760816dfd9ed57fb8b9df86c6a98a2604ab551be3133996a1c32ca2665" +SRC_URI += "file://0001-Fix-build-after-update-of-xfconf.patch" FILES_${PN} += "${datadir}/appdata" 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 new file mode 100644 index 000000000..31216c038 --- /dev/null +++ b/meta-openembedded/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?= <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-openembedded/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb index bdbec458b..6c057d884 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb +++ b/meta-openembedded/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" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.2.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.3.bb index 15ec51b2b..d7719051b 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.2.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.3.bb @@ -15,8 +15,8 @@ DEPENDS = " \ inherit xfce-app -SRC_URI[md5sum] = "ecb930ef6ae6e1f310a5afe5f638eff8" -SRC_URI[sha256sum] = "f6f28af47fdfb41db84bd003f0d76f5f4abf2137d1e27e9d378f063bb8f82356" +SRC_URI[md5sum] = "4887c62dfcb4c3e4f45c9acfb3def515" +SRC_URI[sha256sum] = "293dda084cfca4887ae740e2725fdfc64412bc10eac7a55a924eb14482dceac0" # Avoid trouble with other desktops e.g KDE which also ships dbus service named # org.freedesktop.Notifications diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.8.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.8.bb new file mode 100644 index 000000000..5fa2a7bce --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.8.bb @@ -0,0 +1,28 @@ +SUMMARY = "Backup, restore, import, and export panel layouts" +SECTION = "x11/application" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +inherit python3native gettext distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +DEPENDS += "intltool-native" + +SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/1.0/${BPN}-${PV}.tar.bz2" +SRC_URI[md5sum] = "bc75a143423fba3a82f114f47e86580c" +SRC_URI[sha256sum] = "a69e20f5e637319e14898b5c13ff7ba31d001a6e38e7516d70dbfd7600ad72db" + +do_configure() { + # special configure - no autotools... + ./configure --prefix=${prefix} +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install + sed -i 's:${PYTHON}:python3:g' ${D}${bindir}/xfce4-panel-profiles +} + +FILES_${PN} += "${datadir}/metainfo" + +RDEPENDS_${PN} += "python3-pygobject python3-pexpect" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.1.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.3.bb index e449dceed..c6a4cdb9a 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.1.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.3.bb @@ -7,12 +7,12 @@ DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+ glib-2.0 libsoup- inherit xfce-app -SRC_URI[md5sum] = "75e1501418f904769e4fd25eff6a3946" -SRC_URI[sha256sum] = "e62b31d9cf06a7414a26400c2ebe7a2ae7c2b22aa60f997f25145ea9ebe6e0db" +SRC_URI[md5sum] = "f783eb575e2015f39e1c1aae499b113f" +SRC_URI[sha256sum] = "364ebddc4c9971b4023aa8019d4e3bd08f091b65dc98b218beb55851f69ceda2" do_compile_prepend() { mkdir -p lib - mkdir -p src + mkdir -p src panel-plugin } FILES_${PN} += " \ diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.0.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.1.bb index f9555852d..8afea1d22 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.0.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.1.bb @@ -6,5 +6,5 @@ inherit xfce-app DEPENDS += "gtk+ cairo libwnck libxmu xfce4-dev-tools-native exo-native" -SRC_URI[md5sum] = "6f30ce3c688454812008281065a6e05c" -SRC_URI[sha256sum] = "5746d473ad428b13db7c05cfcbc8099fbea13da6be26d3a9359bcb4de971ba69" +SRC_URI[md5sum] = "4a2d0b1e8001fb343139a97d57b56eaa" +SRC_URI[sha256sum] = "22e523e2ee231713f40a48890d8cbae99320ac1173f7c68502f490318e1e0409" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.3.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.4.bb index 7630abc6b..7fc638e47 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.3.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.4.bb @@ -8,5 +8,5 @@ inherit xfce-app FILES_${PN} += "${datadir}/xfce4 \ ${datadir}/gnome-control-center" -SRC_URI[md5sum] = "f014d613438848b452f1f9eecbf7027d" -SRC_URI[sha256sum] = "dafa155177934fc7dce2d4efb33402f74b1a593a17ff17d2187a6429f599dfd6" +SRC_URI[md5sum] = "c861540dd1dd05f56e62382b3851cf66" +SRC_URI[sha256sum] = "a88f98af4da72394f2cfbd7f14b0f053ec0a3b58a4f6a577836357c60a6c42ab" |