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 | |
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')
-rw-r--r-- | meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.7.bb (renamed from meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.6.bb) | 4 | ||||
-rw-r--r-- | meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.0.bb | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb | 21 | ||||
-rw-r--r-- | meta-openembedded/meta-xfce/recipes-apps/xfce4-mixer/files/0001-Fix-build-after-update-of-xfconf.patch | 61 | ||||
-rw-r--r-- | meta-openembedded/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb | 17 | ||||
-rw-r--r-- | meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.4.bb (renamed from meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.3.bb) | 4 | ||||
-rw-r--r-- | meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.1.bb | 10 | ||||
-rw-r--r-- | meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.2.bb | 10 |
8 files changed, 29 insertions, 100 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.7.bb index 229f882d0..84d5692ef 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.6.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.7.bb @@ -9,8 +9,8 @@ DEPENDS += "python3-distutils-extra-native" B = "${S}" -SRC_URI[md5sum] = "879197c9400be2a80d51abf494bfffb6" -SRC_URI[sha256sum] = "e1caee14c5268ac781434701c0eb26eddfced2c0f1ae066549583ed05f99adbf" +SRC_URI[md5sum] = "f4c1c2b2c560824cab8d7f6c7bd624ca" +SRC_URI[sha256sum] = "48caaac872d29e2762e31e59ade1310cb860af55f1a36f2520ce1d90c39227e9" FILES_${PN} += "${datadir}/metainfo" diff --git a/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.0.bb b/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.0.bb index b0e4784fe..1e9e5f1a1 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.0.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.0.bb @@ -13,7 +13,7 @@ inherit distutils3 gtk-icon-cache distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "https://launchpad.net/menulibre/2.2/${PV}/+download/${PN}-${PV}.tar.gz" +SRC_URI = "https://launchpad.net/menulibre/2.2/${PV}/+download/${BPN}-${PV}.tar.gz" SRC_URI[md5sum] = "9690848dbf9196c3f7baa574e90378d8" SRC_URI[sha256sum] = "546fec87f451c8f5c220d02b1f36dd850f4ce9ab607f8e9711ed8f2009e349fe" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb b/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb index a27c8f553..7445cd7c5 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb @@ -5,22 +5,29 @@ SECTION = "x11" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "gtk+ glib-2.0 xfce4-dev-tools-native intltool-native" +DEPENDS = "gtk+3 glib-2.0 xfce4-dev-tools-native intltool-native" -SRC_URI = "git://github.com/schnitzeltony/xarchiver.git;branch=master" -SRCREV = "5a26dd8ceab0af71b30c83286d7c7398a858c814" -PV = "0.5.3" +SRC_URI = "git://github.com/ib/xarchiver.git" +SRCREV = "9ab958a4023b62b43972c55a3143ff0722bd88a6" +PV = "0.5.4.14" S = "${WORKDIR}/git" -inherit xfce-git gettext pkgconfig autotools gtk-icon-cache distro_features_check +inherit gettext pkgconfig autotools gtk-icon-cache distro_features_check REQUIRED_DISTRO_FEATURES = "x11" # install tap files for thunar-archive-plugin in ${libdir}/thunar-archive-plugin EXTRA_OECONF += "--libexecdir=${libdir}" -EXTRA_OECONF += "--enable-maintainer-mode" +EXTRA_OECONF += " \ + --enable-maintainer-mode \ + --disable-doc \ +" + +do_configure_prepend() { + touch ${S}/NEWS ${S}/AUTHORS +} FILES_${PN} += "${libdir}/thunar-archive-plugin" -RRECOMMENDS_${PN} = "lzop zip tar bzip2 unzip xz" +RRECOMMENDS_${PN} = "lzop zip tar bzip2 unzip xz p7zip" 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 - 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 deleted file mode 100644 index 6c057d884..000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "A volume control application based on GStreamer" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -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 \ - file://0001-Fix-build-after-update-of-xfconf.patch \ -" - -SRC_URI[md5sum] = "1b3753b91224867a3a2dfddda239c28d" -SRC_URI[sha256sum] = "fb0c1df201ed1130f54f15b914cbe5a59286e994a137acda5609570c57112de2" - -RDEPENDS_${PN} = "gst-meta-audio" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.3.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.4.bb index c6a4cdb9a..7c5848b92 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.3.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.4.bb @@ -7,8 +7,8 @@ DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+ glib-2.0 libsoup- inherit xfce-app -SRC_URI[md5sum] = "f783eb575e2015f39e1c1aae499b113f" -SRC_URI[sha256sum] = "364ebddc4c9971b4023aa8019d4e3bd08f091b65dc98b218beb55851f69ceda2" +SRC_URI[md5sum] = "68321e50939fea3c66f0771d59845dab" +SRC_URI[sha256sum] = "c4f3225b3f73f1feb1869807b8b27aec4c32a3e9c2954915a5fb39d18d3a60f2" do_compile_prepend() { mkdir -p lib diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.1.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.1.bb deleted file mode 100644 index 8afea1d22..000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "Easy to use task manager" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -inherit xfce-app - -DEPENDS += "gtk+ cairo libwnck libxmu xfce4-dev-tools-native exo-native" - -SRC_URI[md5sum] = "4a2d0b1e8001fb343139a97d57b56eaa" -SRC_URI[sha256sum] = "22e523e2ee231713f40a48890d8cbae99320ac1173f7c68502f490318e1e0409" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.2.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.2.bb new file mode 100644 index 000000000..f3a59c96c --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.2.bb @@ -0,0 +1,10 @@ +SUMMARY = "Easy to use task manager" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +inherit xfce-app + +DEPENDS += "gtk+3 cairo libwnck libxmu xfce4-dev-tools-native exo-native" + +SRC_URI[md5sum] = "6578625ffbe069b138533ff5e77df734" +SRC_URI[sha256sum] = "e49a61c819a4fd9286a65ae61605984f327c8b26cf939289f644e656bfa20e13" |