diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
tree | 38caf00263451b5036435cdc36e035b25d32e623 /meta-openembedded/meta-xfce/recipes-panel-plugins | |
parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-openembedded/meta-xfce/recipes-panel-plugins')
7 files changed, 57 insertions, 14 deletions
diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.3.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.6.1.bb index a1ac05729..f2a145f5c 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.3.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.6.1.bb @@ -8,8 +8,8 @@ inherit xfce-panel-plugin DEPENDS += "xfconf xorgproto libxtst" -SRC_URI[md5sum] = "fa0acd5f5e3298e56ebd47d2944cd02b" -SRC_URI[sha256sum] = "29cdb85efb54bd5c9c04cc695b7c4914d6dff972b9fd969cbfb5504e9c632ad2" +SRC_URI[md5sum] = "c9306940c0ca7abd838a14c9d19b3a7e" +SRC_URI[sha256sum] = "b3e8317796289196fa78c4526626fe061fd35d11e848cf300ca1ace47febceb4" PACKAGECONFIG ??= "" PACKAGECONFIG[qrencode] = "--enable-libqrencode,--disable-libqrencode,qrencode" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb index 3cd4ee65e..8dfb2e626 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb @@ -5,12 +5,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b6952d9a47fc2ad0f315510e1290455f" inherit xfce-panel-plugin xfce-git gtk-icon-cache perlnative -DEPENDS += "exo-native libwnck xfconf" +DEPENDS += "exo-native libwnck3 xfconf" PV = "0.1.0+gitr${SRCPV}" SRC_URI = "git://github.com/schnitzeltony/xfce4-closebutton-plugin.git;branch=master" -SRCREV = "02b74f13ad6f639234c8db1854963038b2780a2c" +SRCREV = "6ed5c3ee1ba7103ca854c5e81fb2c1220b913a40" S = "${WORKDIR}/git" EXTRA_OECONF += "--enable-maintainer-mode" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.3.bb index fc380c153..f3e4df298 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.2.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.3.bb @@ -8,8 +8,8 @@ REQUIRED_DISTRO_FEATURES = "pulseaudio x11" DEPENDS += "dbus-glib pulseaudio" -SRC_URI[md5sum] = "9a34eadf06ed217ec0732a096f178987" -SRC_URI[sha256sum] = "4ae8aebc2458675d4f885bf16f73829be359e16370a684301bbef6a23758a120" +SRC_URI[md5sum] = "3d86032acb9364d47e0a144350c63e1a" +SRC_URI[sha256sum] = "5a518237e2137341d8ca6584938950525e20c28a0177e30ecaea3ba8e7a2615b" PACKAGECONFIG ??= "" PACKAGECONFIG[libnotify] = "--enable-libnotify,--disable-libnotify,libnotify" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch b/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch new file mode 100644 index 000000000..ac1d603b2 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch @@ -0,0 +1,44 @@ +From 9b7e1beca872ca4a5fce8938c58379103787f79a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sun, 23 Feb 2020 22:06:32 +0100 +Subject: [PATCH] Do not check for /sys/class/power_supply - we are cross + compiling +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + configure.ac | 12 +----------- + 1 file changed, 1 insertion(+), 11 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c281af9..60ba0c0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -209,19 +209,9 @@ dnl Check for interface for /sys/class/power_supply to be used + AC_ARG_ENABLE([sysfsacpi], [AC_HELP_STRING([--enable-sysfsacpi], [Use /sys/class/power_supply to read your battery value @<:@default=auto@:>@])], + [], + [ +- enable_sysfsacpi=auto ++ enable_sysfsacpi=yes + ]) + +-if test x"$enable_sysfsacpi" = x"auto"; then +- AC_CHECK_FILE([/sys/class/power_supply], +- [ +- enable_sysfsacpi=yes +- ], +- [ +- enable_sysfsacpi=no +- ]) +-fi +- + if test x"$enable_sysfsacpi" = x"yes"; then + AC_DEFINE([HAVE_SYSFS_ACPI], [1], [Define to 1 if /sys/class/power_supply is found]) + enable_procacpi=yes +-- +2.21.0 + diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.2.97.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb index 4d78bb2bf..3fd0ff6cf 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.2.97.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb @@ -5,12 +5,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b94789bed9aec03b9656a9cc5398c706" inherit xfce-panel-plugin -SRC_URI[md5sum] = "0c74c3112c5e6e07647c116cd43ff5a7" -SRC_URI[sha256sum] = "7524ec4534de9ef7f676de2895a41bf70b73b94da5a27fd4a022b16eda56d0f4" +SRC_URI[md5sum] = "7327c4c316ebd5d93665e77b432b8d89" +SRC_URI[sha256sum] = "3dc6643d2c064b7718badff44b948f8d410f00f13db197820b26ae38045f5112" +SRC_URI += "file://0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch" EXTRA_OECONF = " \ --disable-procacpi \ - --disable-sysfsacpi \ --disable-xnvctrl \ " @@ -18,7 +18,6 @@ do_configure_prepend() { sed -i 's:LIBSENSORS_CFLAGS=.*:LIBSENSORS_CFLAGS=-I${STAGING_INCDIR}:g' ${S}/configure.ac } -PACKAGECONFIG ??= "libsensors" PACKAGECONFIG[libsensors] = "--enable-libsensors,--disable-libsensors, lmsensors" PACKAGECONFIG[hddtemp] = "--enable-hddtemp,--disable-hddtemp, hddtemp" PACKAGECONFIG[netcat] = "--enable-netcat,--disable-netcat, netcat" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.1.bb index 96c2048be..ad9b6e9e7 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.0.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.1.bb @@ -7,7 +7,7 @@ inherit xfce-panel-plugin DEPENDS += "libsoup-2.4 dbus-glib upower" -SRC_URI[md5sum] = "7ff4ab636f93addba0817bf6436d2964" -SRC_URI[sha256sum] = "4423a0c27830fd1f08e063aaefbf70f31d89235d75549ca841d677ab2e409572" +SRC_URI[md5sum] = "203ad16e74d4823f6fb6e9a18bb7df55" +SRC_URI[sha256sum] = "afb2af5f3effc2ea6181636ed0e82e6dafd556ec1b8478100802f85a5d167a89" FILES_${PN} += "${datadir}/xfce4/weather" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.4.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.3.bb index 595e3c815..3da631bb2 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.4.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.3.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin cmake -SRC_URI[md5sum] = "ee9e378fae78b230a23b241cf727c84b" -SRC_URI[sha256sum] = "84d3de35695a023aab181f7a9b75f59029eb3b07c3e47a5e11e8bd79db62570e" +SRC_URI[md5sum] = "7b66438996127b759ad634f6579e003c" +SRC_URI[sha256sum] = "39faeee91ceb3cb727f9de09dbf20a8c73e524851a2c3b76a4b19a0732de5ff0" RRECOMMENDS_${PN} += "menulibre" |