From d221e0389dc9bafd72e541090a9c401a25a84ce3 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 10 Jul 2020 16:13:21 -0500 Subject: meta-openembedded: subtree update:629696b64b..e93d527a33 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adrian (1): firewalld: upgrade 0.7.3 -> 0.7.5 Andre Carvalho (1): netcat: Set CVE_PRODUCT Andreas Müller (6): networkmanager: upgrade 1.22.10 -> 1.22.14 blueman: upgrade 2.1.1 -> 2.1.3 modemmanager: upgrade 1.12.10 -> 1.12.12 ibus: upgrade 1.5.21 -> 1.5.22 network-manager-applet: upgrade 1.16.0 -> 1.18.0 sysprof: remove linux-gnueabi-patch Armin Kuster (2): net-snmp: Security fix CVE-2019-20892 wireshark: Update to 3.2.5 Changqing Li (1): libmcrypt: set CLEANBROKEN Daniel Gomez (1): ttf-fonts: Update ttf-ubuntu-font-family recipe Fagundes, Paulo (1): redis-plus-plus: add recipe Hongxu Jia (1): networkmanager: fix Files/directories were installed but not shipped Jacopo Dall'Aglio (2): netplan: upgrade 0.98 -> 0.99 python3-libconf: add recipe version 2.0.1 Khem Raj (1): lirc: Inherit distutils-common-base Konrad Weihmann (6): ntop: remove static libs from dev package ruli: recipe cleanup postgresql: remove vacuumlo from contrib libconfig: remove cmake append from base package gattlib: remove includedir from base package openldap: packaging fixes Leon Anavi (63): python3-pyro4: Upgrade 4.77 -> 4.80 python3-rdflib: Upgrade 4.2.2 -> 5.0.0 python3-httplib2: Upgrade 0.17.3 -> 0.18.1 python3-cppy: Add new recipe python3-kiwisolver: Upgrade 1.1.0 -> 1.2.0 python3-sqlalchemy: Upgrade 1.3.17 -> 1.3.18 python3-greenlet: Upgrade 0.4.15 -> 0.4.16 python3-pkgconfig: Upgrade 1.4.0 -> 1.5.1 python3-msm: Upgrade 0.8.3 -> 0.8.7 python3-pulsectl: Upgrade 20.2.4 -> 20.5.1 python3-pybind11: Consolidate in a single file python3-pybind11: Upgrade 2.4.3 -> 2.5.0 python3-pyparted: Consolidate in a single file python3-pyparted: Upgrade 3.11.3 -> 3.11.6 python3-pywbem: Consolidate in a single file python3-pywbem: Upgrade 0.15.0 -> 0.17.2 python3-jsonrpcserver: Upgrade 4.1.2 -> 4.1.3 python3-humanize: Upgrade 2.4.0 -> 2.4.1 python3-autobahn: Upgrade 20.4.3 -> 20.6.2 python3-yappi: Upgrade 1.0 -> 1.2.5 python3-sympy: Upgrade 1.5.1 -> 1.6 python3-watchdog: Upgrade 0.10.2 -> 0.10.3 python3-tqdm: Upgrade 4.43.0 -> 4.47.0 python3-pyflakes: Upgrade 2.1.1 -> 2.2.0 python3-pymisp: Upgrade 2.4.122 -> 2.4.128 python3-pychromecast: Upgrade 4.2.3 -> 7.0.1 python3-py: Upgrade 1.8.2 -> 1.9.0 python3-html5lib: Upgrade 1.0.1 -> 1.1 python3-lz4: Upgrade 3.0.2 -> 3.1.0 python3-cassandra-driver: Upgrade 3.14.0 -> 3.24.0 python3-configargparse: Upgrade 0.15.1 -> 1.2.3 python3-cachetools: Upgrade 4.1.0 -> 4.1.1 python3-keras-preprocessing: Upgrade 1.1.0 -> 1.1.2 python3-pywbem: Upgrade 0.17.2 -> 0.17.3 python3-h2: Consolidate in a single file python3-h2: Upgrade 3.1.1 -> 3.2.0 python3-requests: Upgrade 2.23.0 -> 2.24.0 python3-google-api-python-client: Upgrade 1.7.11 -> 1.9.3 python3-pyperclip: Upgrade 1.7.0 -> 1.8.0 python3-pyhamcrest: Upgrade 1.9.0 -> 2.0.2 python3-pint: Upgrade 0.13 -> 0.14 python3-dbus-next: Upgrade 0.1.2 -> 0.1.3 python3-pybluez: Upgrade 0.22 -> 0.23 python3-stevedore: Upgrade 1.31.0 -> 2.0.1 python3-h5py: Upgrade 2.9.0 -> 2.10.0 python3-cryptography-vectors: Upgrade 2.8 -> 2.9.2 python3-importlib-metadata: Upgrade 1.6.1 -> 1.7.0 python3-websocket-client: Upgrade 0.56.0 -> 0.57.0 python3-sentry-sdk: Upgrade 0.14.0 -> 0.16.0 python3-regex: Upgrade 2020.1.8 -> 2020.6.8 python3-python-vlc: Upgrade 3.0.9113 -> 3.0.10114 python3-robotframework: Upgrade 3.0.4 -> 3.2.1 python3-pychromecast: Upgrade 7.0.1 -> 7.1.0 python3-pyasn1-modules: Consolidate in a single file python3-pyasn1-modules: Upgrade 0.2.7 -> 0.2.8 python3-sympy: Upgrade 1.6 -> 1.6.1 python3-pychromecast: Upgrade 7.1.0 -> 7.1.1 python3-imageio: Upgrade 2.8.0 -> 2.9.0 python3-humanize: Upgrade 2.4.1 -> 2.5.0 python3-tinyrecord: Upgrade 0.1.5 -> 0.2.0 python3-luma-oled: Upgrade 3.4.0 -> 3.5.0 python3-pyconnman: Consolidate in a single file python3-jsonref: Consolidate in a single file Pierre-Jean Texier (4): minicoredumper: update SRC_URI to use github instead tslib: upgrade 1.21 -> 1.22 haveged: upgrade 1.9.9 -> 1.9.13 xxhash: upgrade 0.7.3 -> 0.7.4 Qi.Chen@windriver.com (1): multipath-tools: disable parallel build as a workaround Robert Yang (1): drbd-utils: Add CLEANBROKEN to fix rebuild errors Sakib Sajal (2): python3-betamax: add recipe cunit: add ptest Wang Mingyu (2): nspr: upgrade 4.25 -> 4.26 python3-pytest: upgrade 5.4.2 -> 5.4.3 Zang Ruochen (20): python3-ansicolors: Enable ptest python3-anyjson: Enable ptest python3-atomicwrites: upgrade 1.3.0 -> 1.4.0 python3-backports-functools-lru-cache: Enable ptest python3-bcrypt: Enable ptest nftables: upgrade 0.9.5 -> 0.9.6 ccid: upgrade 1.4.32 -> 1.4.33 docopt.cpp: upgrade 0.6.2 -> 0.6.3 libiio: upgrade 0.20 -> 0.21 librelp: upgrade 1.5.0 -> 1.6.0 redis: upgrade 6.0.4 -> 6.0.5 rsyslog: upgrade 0.2004.0 -> 0.2006.0 libnet-dns-perl: upgrade 1.24 -> 1.25 python3-blinker: Enable ptest python3-cbor2: Enable ptest python3-click: Enable ptest python3-u-msgpack-python: Enable ptest fuse3: Enable ptest sshfs-fuse: Enable ptest python3-wcwidth: Enable ptest Zheng Ruoqin (7): Fix build error when enable multilib. tracker: Fix build error when enable multilib. mraa: Disable python2, otherwise, there is a build error when enable multilib. paho-mqtt-c: Fix build error when enable multilib. upm:Fix build error when enable multilib. python3-unidiff: Enable ptest python3-uritemplate: Enable ptest Signed-off-by: Andrew Geissler Change-Id: I26a4e709d5f1416e73ec42e6dfc0e702dd1079bb --- .../network-manager-applet_1.16.0.bb | 25 ------------- .../network-manager-applet_1.18.0.bb | 27 ++++++++++++++ ...-do-not-hardcode-linux-as-host_machine-.s.patch | 42 ---------------------- ..._GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch | 31 ++++++++++++++++ ..._GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch | 31 ---------------- .../recipes-gnome/sysprof/sysprof_3.36.0.bb | 3 +- .../recipes-gnome/tracker/tracker-miners_2.3.3.bb | 4 +++ .../recipes-gnome/tracker/tracker_2.3.4.bb | 4 ++- .../meta-gnome/recipes-support/ibus/ibus.inc | 4 +-- 9 files changed, 68 insertions(+), 103 deletions(-) delete mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.16.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0003-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch (limited to 'meta-openembedded/meta-gnome') diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.16.0.bb b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.16.0.bb deleted file mode 100644 index 0cac52c05..000000000 --- a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.16.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "GTK+ applet for NetworkManager" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "gtk+3 libnma libnotify libsecret networkmanager iso-codes nss" - -GNOMEBASEBUILDCLASS = "meson" -inherit features_check gnomebase gsettings gtk-icon-cache gettext - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[archive.md5sum] = "9652c2757e85d6caba657405cf794fbd" -SRC_URI[archive.sha256sum] = "d6f98a455a271e7e169b5d35d290f4880f503cdf7593251572c9330941b5c3e5" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[modemmanager] = "-Dwwan=true, -Dwwan=false, modemmanager" -PACKAGECONFIG[selinux] = "-Dselinux=true, -Dselinux=false, libselinux" - -RDEPENDS_${PN} =+ "networkmanager" - -FILES_${PN} += " \ - ${datadir}/nm-applet/ \ - ${datadir}/libnma/wifi.ui \ - ${datadir}/metainfo \ -" diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb new file mode 100644 index 000000000..60e4c2205 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb @@ -0,0 +1,27 @@ +SUMMARY = "GTK+ applet for NetworkManager" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "gtk+3 libnma libnotify libsecret networkmanager iso-codes nss" + +GNOMEBASEBUILDCLASS = "meson" +inherit features_check gnomebase gsettings gtk-icon-cache gettext + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.sha256sum] = "ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b" + +# We don't not have ubuntu's appindicator (yet?) +EXTRA_OEMESON = "-Dappindicator=no" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[modemmanager] = "-Dwwan=true, -Dwwan=false, modemmanager" +PACKAGECONFIG[selinux] = "-Dselinux=true, -Dselinux=false, libselinux" + +RDEPENDS_${PN} =+ "networkmanager" + +FILES_${PN} += " \ + ${datadir}/nm-applet/ \ + ${datadir}/libnma/wifi.ui \ + ${datadir}/metainfo \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch deleted file mode 100644 index 9db111e8e..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 43c39b5685445242d071b3706af2903efa508b4a Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Tue, 14 Jan 2020 12:58:27 +0100 -Subject: [PATCH] meson.build: do not hardcode 'linux' as - host_machine().system() value - -In some build environmets such as OpenEmbedded this can be 'linux-gnueabi' -or otherwise not exactly 'linux'. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - src/libsysprof/meson.build | 2 +- - src/tools/meson.build | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/libsysprof/meson.build b/src/libsysprof/meson.build -index 3449961..3c2d186 100644 ---- a/src/libsysprof/meson.build -+++ b/src/libsysprof/meson.build -@@ -84,7 +84,7 @@ libsysprof_deps = [ - librax_dep, - ] - --if host_machine.system() == 'linux' -+if host_machine.system().contains('linux') - libsysprof_public_sources += [ - 'sysprof-memory-source.c', - 'sysprof-perf-counter.c', -diff --git a/src/tools/meson.build b/src/tools/meson.build -index 670052a..3fb7f0c 100644 ---- a/src/tools/meson.build -+++ b/src/tools/meson.build -@@ -2,7 +2,7 @@ tools_deps = [ - libsysprof_capture_dep, - ] - --if get_option('libsysprof') and host_machine.system() == 'linux' -+if get_option('libsysprof') and host_machine.system().contains('linux') - polkit_agent_dep = dependency('polkit-agent-1') - sysprof_cli = executable('sysprof-cli', 'sysprof-cli.c', - dependencies: tools_deps + [libsysprof_dep, polkit_dep, polkit_agent_dep], diff --git a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch new file mode 100644 index 000000000..d8fffbb7e --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch @@ -0,0 +1,31 @@ +From 5dea152c7728f5a37370ad8a229115833e36b4f6 Mon Sep 17 00:00:00 2001 +From: Rasmus Thomsen +Date: Sat, 7 Mar 2020 10:44:16 +0100 +Subject: [PATCH] tests: use G_GSIZE_FORMAT instead of G_GUINT64_FORMAT for + gsize + +This fixes the build on 32-bit platforms with -Werror-format + +fixes #32 + +Upstream-Status: Applied[https://gitlab.gnome.org/GNOME/sysprof/-/commit/5dea152c7728f5a37370ad8a229115833e36b4f6] +--- + src/tests/allocs-by-size.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tests/allocs-by-size.c b/src/tests/allocs-by-size.c +index 666113a..6260d4b 100644 +--- a/src/tests/allocs-by-size.c ++++ b/src/tests/allocs-by-size.c +@@ -109,7 +109,7 @@ allocs_by_size (SysprofCaptureReader *reader) + { + const Item *item = &g_array_index (ar, Item, i); + +- g_print ("%"G_GUINT64_FORMAT",%"G_GUINT64_FORMAT",%"G_GUINT64_FORMAT"\n", ++ g_print ("%"G_GSIZE_FORMAT",%"G_GSIZE_FORMAT",%"G_GSIZE_FORMAT"\n", + item->size, item->cmp, item->count); + } + } +-- +2.21.3 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0003-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0003-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch deleted file mode 100644 index d8fffbb7e..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0003-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5dea152c7728f5a37370ad8a229115833e36b4f6 Mon Sep 17 00:00:00 2001 -From: Rasmus Thomsen -Date: Sat, 7 Mar 2020 10:44:16 +0100 -Subject: [PATCH] tests: use G_GSIZE_FORMAT instead of G_GUINT64_FORMAT for - gsize - -This fixes the build on 32-bit platforms with -Werror-format - -fixes #32 - -Upstream-Status: Applied[https://gitlab.gnome.org/GNOME/sysprof/-/commit/5dea152c7728f5a37370ad8a229115833e36b4f6] ---- - src/tests/allocs-by-size.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tests/allocs-by-size.c b/src/tests/allocs-by-size.c -index 666113a..6260d4b 100644 ---- a/src/tests/allocs-by-size.c -+++ b/src/tests/allocs-by-size.c -@@ -109,7 +109,7 @@ allocs_by_size (SysprofCaptureReader *reader) - { - const Item *item = &g_array_index (ar, Item, i); - -- g_print ("%"G_GUINT64_FORMAT",%"G_GUINT64_FORMAT",%"G_GUINT64_FORMAT"\n", -+ g_print ("%"G_GSIZE_FORMAT",%"G_GSIZE_FORMAT",%"G_GSIZE_FORMAT"\n", - item->size, item->cmp, item->count); - } - } --- -2.21.3 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb index a769dbf7d..275fbaa69 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb @@ -18,8 +18,7 @@ SRC_URI[archive.md5sum] = "3956e82b8744715006dde59e0ce8910b" SRC_URI[archive.sha256sum] = "8670db4dacf7b219d30c575c465b17c8ed6724dbade347f2cde9548bff039108" SRC_URI += " \ file://0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch \ - file://0002-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch \ - file://0003-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch \ + file://0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch \ " PACKAGECONFIG ?= "sysprofd libsysprof ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.3.bb index b40787f3c..e2ced395c 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.3.bb @@ -60,6 +60,10 @@ PACKAGECONFIG[libseccomp] = ",,libseccomp" # not yet in meta-gnome PACKAGECONFIG[rss] = "-Dminer_rss=true,-Dminer_rss=false,libgrss" +EXTRA_OEMESON += " \ + -Dsystemd_user_services=${systemd_user_unitdir} \ +" + FILES_${PN} += " \ ${datadir}/dbus-1 \ ${datadir}/tracker \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_2.3.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_2.3.4.bb index ae9077147..b36e66b45 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_2.3.4.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_2.3.4.bb @@ -41,7 +41,9 @@ do_write_config_append() { echo "sqlite3_has_fts5 = '${@bb.utils.contains('PACKAGECONFIG', 'fts', 'true', 'false', d)}'" >> ${WORKDIR}/meson-tracker.cross } -EXTRA_OEMESON = "--cross-file ${WORKDIR}/meson-tracker.cross" +EXTRA_OEMESON = "--cross-file ${WORKDIR}/meson-tracker.cross \ + -Dsystemd_user_services=${systemd_user_unitdir} \ +" FILES_${PN} += " \ ${datadir}/dbus-1 \ diff --git a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc index 0f4ae7d04..1bbeb2c48 100644 --- a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc +++ b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" inherit autotools-brokensep pkgconfig gobject-introspection gettext gtk-doc vala -PV = "1.5.21" +PV = "1.5.22" DEPENDS = "unicode-ucd" @@ -13,7 +13,7 @@ SRC_URI = " \ git://github.com/ibus/ibus.git \ file://0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch \ " -SRCREV = "ae0040c73466bb6e78fce5e669a55fcce6ffd16d" +SRCREV = "e3262f08b9e3efc57808700823b0622ec03a1b5f" S = "${WORKDIR}/git" PACKAGECONFIG[appindicator] = "--enable-appindicator,--disable-appindicator,qtbase" -- cgit v1.2.3