meta-openembedded: subtree update:08c0280b7c..4fe1065655

Alexander Kanavin (1):
      libmicrohttpd: remove the recipe

Andreas Müller (4):
      jack: upgrade 1.19.17 -> 1.19.18
      xfce4-settings: upgrade 4.16.0 -> 4.16.1
      zsh: reduce priority slightly to avoid conflict with bash
      mutter/wayland: replace xserver-xorg-xwayland by xwayland in rdep

Andrej Kozemcak (1):
      proftpd: Update to 1.3.7a release

Armin Kuster (3):
      wireguard: update to v1.0.20210219 +1
      nostromo: remove recipe
      packagegroup-meta-webserver: remove nostromo from pkg grp

Chen Qi (3):
      tigervnc: upgrade to 1.11.0
      python3-django: upgrade to 2.2.20
      tigervnc: fix do_package error when enabling user merge

Gianfranco (1):
      vboxguestdrivers: upgrade 6.1.18 -> 6.1.20

Hongxu Jia (1):
      debootstrap: explicitly add virtual/fakeroot-native to depends

Joe Hershberger (1):
      strongswan: Make PACKAGECONFIG a default value

Justin Standring (1):
      tslib: add PACKAGECONFIG for evthres, one-wire-ts-input

Kai Kang (1):
      freeradius: check existence of openssl's commands in bootstrap

Khem Raj (36):
      nss: Re-enable -Werror
      gimp: Disable vector icon generation on mips/glibc too
      iwd: Upgade to 1.13
      python3-icu: Upgrade to 2.7.2
      nodejs: Update to 14.16.1
      nodejs: Fix build with icu-69
      nodejs: Use qemu usermode to run target binaries during build
      nodejs: Fix build on mips
      nodejs: Fix build with clang for x86 target
      tbb: Re-introduce PE
      bearssl: Update to tip of master
      gimp: Disable vector icons on musl/x86
      gd: Replace deprecated types from tiff
      nodejs: Enable snapshot
      python3-docutils: Delete
      libchamplain: Require opengl distro feature
      aom: Match the name for AOM-Patent-License-1.0
      libdevmapper,lvm2: Do not inherit license
      gnome-disk-utility: Require polkit in distro features
      README: Make git send-email example work
      sysprof: Enable sysprofd/libsysprof only when polkit in DISTRO_FEATURES
      packagegroup-gnome-apps: Add gnome-disk-utility only if polkit is in DISTRO_FEATURES
      python3-jinja2_2.%.bbappend: Delete
      python3-pyyaml: Do not check for meta-python
      python3-pyyaml: Delete
      python3-markupsafe: Delete bbappend
      snort,proftpd,net-snmp: Deal with -ffile-prefix-map as well
      apache2: Deal with -ffile-prefix-map
      vk-gl-cts: Fix build with GCC 11
      gegl: Update to 0.4.30
      python3-m2crypto: Upgrade to 0.37.1
      libupnp: Upgrade to 1.14.6
      ctags: Switch to universal ctags
      dibbler: Add libpthread to linker flags
      libowfat: Replace __pure__ with pure and remove using __deprecated__
      emacs: Do not use SIGSTKSZ

Leon Anavi (21):
      python3-bitarray: Upgrade 1.9.2 -> 2.0.0
      python3-xxhash: Upgrade 2.0.0 -> 2.0.2
      python3-xlsxwriter: Upgrade 1.3.8 -> 1.3.9
      python3-docutils: Upgrade 0.17 -> 0.17.1
      python3-portion: Upgrade 2.1.5 -> 2.1.6
      python3-huey: Upgrade 2.3.1 -> 2.3.2
      python3-pysonos: Upgrade 0.0.42 -> 0.0.43
      python3-asttokens: Upgrade 2.0.4 -> 2.0.5
      python3-hyperframe: Upgrade 6.0.0 -> 6.0.1
      python3-argcomplete: Upgrade 1.12.2 -> 1.12.3
      python3-python-vlc: Upgrade 3.0.12117 -> 3.0.12118
      python3-bitarray: Upgrade 2.0.0 -> 2.0.1
      python3-sqlalchemy: Upgrade 1.4.7 -> 1.4.11
      python3-watchdog: Upgrade 2.0.2 -> 2.0.3
      python3-pytest-asyncio: Upgrade 0.14.0 -> 0.15.1
      python3-xlsxwriter: Upgrade 1.3.9 -> 1.4.0
      python3-astroid: Upgrade 2.5.3 -> 2.5.6
      python3-arpeggio: Upgrade 1.10.1 -> 1.10.2
      python3-cachetools: Upgrade 4.2.1 -> 4.2.2
      python3-pymisp: Upgrade 2.4.141.1 -> 2.4.142
      python3-et-xmlfile: Upgrade 1.0.1 -> 1.1.0

Mingli Yu (4):
      python3-cryptography: Upgrade to 3.3.2
      onig: add oniguruma to PROVIDES
      php: Upgrade to 7.4.16
      tk: adapt to potential pseudo changes

Persian Prince (1):
      libdvdnav 6.1.1

Peter Kjellerstedt (1):
      syslog-ng: Merge .bb and .inc

Ramon Fried (1):
      bitwise: Upgrade 0.41 -> 0.42

Reto Schneider (1):
      nng: Upgrade 1.2.5 -> 1.4.0

Saul Wold (2):
      tbb: Disable PPC as COMPATIBLE_MACHINE
      packagegroup-meta-oe: conditional remove tbb for powerpc

Silcet (2):
      ufw: fix python shebang
      ufw: bump version to 0.36 and add services

Sinan Kaya (1):
      zram: add support for mem_limit

Stefan Ghinea (1):
      python3-django: fix CVE-2021-28658

Ulrich Ölmann (1):
      v4l-utils: fix reproducibility

Yi Fan Yu (3):
      syslog-ng: upgrade 3.24.1 -> 3.31.2
      syslog-ng: remove CONFIG_TLS override for arm DEBUG_BUILD
      syslog-ng: Drop an obsolete patch to add --enable-libnet

Yi Zhao (1):
      gvfs: rdepend on gsettings-desktop-schemas

zangrc (19):
      fuse3: upgrade 3.10.2 -> 3.10.3
      cifs-utils: upgrade 6.12 -> 6.13
      dnsmasq: upgrade 2.84 -> 2.85
      nbdkit: upgrade 1.25.5 -> 1.25.6
      wolfssl: upgrade 4.7.0 -> 4.7.1
      networkmanager: upgrade 1.30.2 -> 1.30.4
      libdvdread: upgrade 6.1.1 -> 6.1.2
      libwebsockets: upgrade 4.1.6 -> 4.2.0
      ostree: upgrade 2021.1 -> 2021.2
      redis: upgrade 6.2.1 -> 6.2.2
      tinyproxy: upgrade 1.10.0 -> 1.11.0
      nss: upgrade 3.63 -> 3.64
      babeld: upgrade 1.9.2 -> 1.10
      fetchmail: upgrade 6.4.18 -> 6.4.19
      openvpn: upgrade 2.5.1 -> 2.5.2
      wireshark: upgrade 3.4.4 -> 3.4.5
      debootstrap: upgrade 1.0.123 -> 1.0.124
      mailcap: upgrade 2.1.52 -> 2.1.53
      rsyslog: upgrade 8.2102.0 -> 8.2104.0

zhengruoqin (7):
      irssi: upgrade 1.2.2 -> 1.2.3
      librsync: upgrade 2.3.1 -> 2.3.2
      hiawatha: upgrade 10.11 -> 10.12
      python3-supervisor: upgrade 4.2.1 -> 4.2.2
      python3-zopeinterface: upgrade 5.3.0 -> 5.4.0
      sdparm: upgrade 1.11 -> 1.12
      tcsh: upgrade 6.22.03 -> 6.22.04

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Iaeb2fe4ee0a49cf44ea60bc3c1aef83528d92f55

11 files changed, 44 insertions, 43 deletions

diff --git a/meta-openembedded/meta-gnome/README b/meta-openembedded/meta-gnome/README
index a11815fb1..1a9105000 100644
--- a/meta-openembedded/meta-gnome/README
+++ b/meta-openembedded/meta-gnome/README
@@ -13,6 +13,6 @@ revision: HEAD
 Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-gnome]' in the subject'
 
 When sending single patches, please using something like:
-'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-gnome][PATCH'
+git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-gnome][PATCH'
 
 Layer maintainer: Andreas Müller <schnitzeltony@gmail.com>
diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl/0001-Fix-build-with-OpenEXR-3.patch b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl/0001-Fix-build-with-OpenEXR-3.patch
new file mode 100644
index 000000000..b2f13afd5
--- /dev/null
+++ b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl/0001-Fix-build-with-OpenEXR-3.patch
@@ -0,0 +1,28 @@
+From 073d622fbf8564271cd9be87c2f619ea00498578 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 1 May 2021 08:25:24 -0700
+Subject: [PATCH] Fix build with OpenEXR 3
+
+Add a header that is no longer transitively included
+
+Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/96]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ operations/external/exr-save.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/operations/external/exr-save.cc b/operations/external/exr-save.cc
+index 1e8c09d..87abed5 100644
+--- a/operations/external/exr-save.cc
++++ b/operations/external/exr-save.cc
+@@ -45,6 +45,7 @@ extern "C" {
+ #include <ImfChromaticities.h>
+ #include <ImfStandardAttributes.h>
+ #include <ImfArray.h>
++#include <ImfFrameBuffer.h>
+ #include "ImathRandom.h"
+ 
+ 
+-- 
+2.31.1
+
diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch
deleted file mode 100644
index 6a49f1d7c..000000000
--- a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 6bed199a73a7af39344cf8e799b665011553600c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sat, 8 Feb 2020 14:29:52 +0100
-Subject: [PATCH] meson.build: Give note if sdl2 was found
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Configure output confused me a bit
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/meson.build b/meson.build
-index 9d5b484..296b5f3 100644
---- a/meson.build
-+++ b/meson.build
-@@ -374,6 +374,7 @@ message('\n'.join(['',
- '  OpenEXR:         @0@'.format(openexr.found()),
- '  rsvg:            @0@'.format(librsvg.found()),
- '  SDL:             @0@'.format(sdl1.found()),
-+'  SDL2:            @0@'.format(sdl2.found()),
- '  libraw:          @0@'.format(libraw.found()),
- '  Jasper:          @0@'.format(jasper.found()),
- '  av libs:         @0@'.format(avlibs_found),
--- 
-2.21.0
-
diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.28.bb b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb
index 810036162..d08a3a3c9 100644
--- a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.28.bb
+++ b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb
@@ -24,9 +24,9 @@ SHPV = "${@gnome_verdir("${PV}")}"
 
 SRC_URI = " \
     https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz \
-    file://0001-meson.build-Give-note-if-sdl2-was-found.patch \
+    file://0001-Fix-build-with-OpenEXR-3.patch \
 "
-SRC_URI[sha256sum] = "1d110d8577d54cca3b34239315bd37c57ccb27dd4355655074a2d2b3fd897900"
+SRC_URI[sha256sum] = "c112782cf4096969e23217ccdfabe42284e35d5435ff0c43d40e4c70faeca8dd"
 
 PACKAGECONFIG ??= "gexiv2 jpeg libpng librsvg sdl2"
 PACKAGECONFIG_class-native = "libpng librsvg"
diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb
index aa5112add..717716e1f 100644
--- a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb
+++ b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb
@@ -53,8 +53,9 @@ EXTRA_OECONF = "--disable-python \
                 --disable-check-update \
                 --without-wmf"
 
-EXTRA_OECONF_append_libc-musl_mipsarch = " --disable-vector-icons"
+EXTRA_OECONF_append_mipsarch = " --disable-vector-icons"
 EXTRA_OECONF_append_libc-musl_riscv32 = " --disable-vector-icons"
+EXTRA_OECONF_append_libc-musl_x86 = " --disable-vector-icons"
 EXTRA_OECONF_append_arm = " --disable-vector-icons"
 
 do_configure_append() {
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.36.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.36.3.bb
index 08fd96472..1045dea25 100644
--- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.36.3.bb
+++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.36.3.bb
@@ -18,7 +18,7 @@ GNOMEBASEBUILDCLASS = "meson"
 
 inherit gnomebase gsettings gtk-icon-cache gettext features_check upstream-version-is-even mime-xdg
 
-REQUIRED_DISTRO_FEATURES = "x11"
+REQUIRED_DISTRO_FEATURES = "x11 polkit"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 
@@ -31,4 +31,3 @@ FILES_${PN} += " \
     ${datadir}/metainfo \
     ${datadir}/dbus-1 \
 "
-
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb
index ad5dab5ec..c8c16a3c5 100644
--- a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb
+++ b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb
@@ -8,6 +8,8 @@ inherit gnomebase gsettings bash-completion gettext upstream-version-is-even fea
 DEPENDS += "libsecret glib-2.0 glib-2.0-native libgudev shadow-native \
             gsettings-desktop-schemas dbus"
 
+RDEPENDS_${PN} += "gsettings-desktop-schemas"
+
 SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive"
 SRC_URI[archive.md5sum] = "72383474f52d05c21ef2be96d0b91974"
 SRC_URI[archive.sha256sum] = "50ef3245d1b03666a40455109169a2a1bd51419fd2d51f9fa6cfd4f89f04fb46"
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb b/meta-openembedded/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb
index 90e553301..24312c78a 100644
--- a/meta-openembedded/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb
+++ b/meta-openembedded/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb
@@ -3,7 +3,9 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
 DEPENDS = "glib-2.0 gtk+3 gdk-pixbuf clutter-1.0 clutter-gtk-1.0 libsoup-2.4"
 
-inherit meson gobject-introspection
+inherit features_check gobject-introspection meson
+
+REQUIRED_DISTRO_FEATURES = "opengl"
 
 SRCREV = "145e417f32e507b63c21ad4e915b808a6174099e"
 SRC_URI = "git://github.com/gnome/libchamplain.git"
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_3.34.6.bb b/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_3.34.6.bb
index a3e479869..adbfcd6d7 100644
--- a/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_3.34.6.bb
+++ b/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_3.34.6.bb
@@ -57,7 +57,7 @@ PACKAGECONFIG[remote-desktop] = "-Dremote_desktop=true, -Dremote_desktop=false,
 PACKAGECONFIG[sm] = "-Dsm=true, -Dsm=false, libsm"
 PACKAGECONFIG[profiler] = "-Dprofiler=true,-Dprofiler=false,sysprof"
 PACKAGECONFIG[startup-notification] = "-Dstartup_notification=true, -Dstartup_notification=false, startup-notification, startup-notification"
-PACKAGECONFIG[wayland] = "-Dwayland=true,-Dwayland=false,wayland wayland-native, xserver-xorg-xwayland"
+PACKAGECONFIG[wayland] = "-Dwayland=true,-Dwayland=false,wayland wayland-native, xwayland"
 PACKAGECONFIG[wayland-eglstream] = "-Dwayland_eglstream=true,-Dwayland_eglstream=false"
 
 # yes they changed from mutter-4 -> mutter-5 recently so be perpared
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 275fbaa69..e9fa25c63 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
@@ -21,7 +21,9 @@ SRC_URI += " \
     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)}"
+PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'sysprofd', '', d)} \
+                  ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'libsysprof', '', d)} \
+                  ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}"
 PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3 libdazzle"
 PACKAGECONFIG[sysprofd] = "-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit"
 PACKAGECONFIG[libsysprof] = "-Dlibsysprof=true,-Dlibsysprof=false,polkit"
diff --git a/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb b/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb
index 1f450fd9d..593e5866d 100644
--- a/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb
+++ b/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb
@@ -14,11 +14,10 @@ RDEPENDS_${PN} = " \
     ghex \
     gnome-calculator \
     gnome-calendar \
-    gnome-disk-utility \
     gnome-font-viewer \
     gnome-photos \
     gnome-terminal \
     libwnck3 \
     nautilus \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'gnome-system-monitor', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'gnome-system-monitor gnome-disk-utility', '', d)} \
 "