[PATCH 0/7] upgrades

[PATCH 0/7] upgrades

[Andreas Müller]

Patch 1-3 are resends - patchwork ignored them first time

Andreas Müller (7):
  garcon: upgrade 0.8.0 -> 4.16.1
  xfce4-whiskermenu-plugin: upgrade 2.5.1 -> 2.5.2
  thunar: upgrade 4.16.0 -> 4.16.2
  jack: upgrade 1.19.16 -> 1.19.17
  networkmanager: upgrade 1.22.14 -> 1.28.0
  appstream-glib: upgrade 0.7.17 -> 0.7.18
  vlc: upgrade 3.0.11.1 -> 3.0.12

 ...lib_0.7.17.bb => appstream-glib_0.7.18.bb} |  3 +-
 .../vlc/vlc/0005-Fix-build-with-Qt-5.15.patch | 56 -----------------
 ...Use-SYS_futex-instead-of-__NR_futex.patch} |  0
 .../vlc/{vlc_3.0.11.1.bb => vlc_3.0.12.bb}    |  5 +-
 ...ttings-settings-property-documentati.patch | 43 ++++++++-----
 ...-to-var-libdir-rather-than-hardcod-.patch} |  0
 ...atch => 0004-fix_reallocarray_check.patch} |  2 +-
 ...Fix-build-with-musl-systemd-specific.patch | 29 +++++----
 .../musl/0002-Fix-build-with-musl.patch       | 23 ++++---
 ...0003-Fix-build-with-musl-for-n-dhcp4.patch | 61 ------------------
 ...ix-build-with-musl-systemd-specific.patch} |  6 +-
 ...er_1.22.14.bb => networkmanager_1.28.0.bb} |  9 ++-
 ...-Use-SYS_futex-instead-of-__NR_futex.patch | 62 -------------------
 .../jack/{jack_1.19.16.bb => jack_1.19.17.bb} |  3 +-
 ...1.bb => xfce4-whiskermenu-plugin_2.5.2.bb} |  2 +-
 .../{garcon_0.8.0.bb => garcon_4.16.1.bb}     |  2 +-
 .../{thunar_4.16.0.bb => thunar_4.16.2.bb}    |  2 +-
 17 files changed, 72 insertions(+), 236 deletions(-)
 rename meta-gnome/recipes-support/appstream-glib/{appstream-glib_0.7.17.bb => appstream-glib_0.7.18.bb} (84%)
 delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch
 rename meta-multimedia/recipes-multimedia/vlc/vlc/{0001-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch => 0005-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch} (100%)
 rename meta-multimedia/recipes-multimedia/vlc/{vlc_3.0.11.1.bb => vlc_3.0.12.bb} (96%)
 rename meta-networking/recipes-connectivity/networkmanager/networkmanager/{0001-install-firewalld-to-var-libdir-rather-than-hardcod-.patch => 0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch} (100%)
 rename meta-networking/recipes-connectivity/networkmanager/networkmanager/{fix_reallocarray_check.patch => 0004-fix_reallocarray_check.patch} (90%)
 delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-for-n-dhcp4.patch
 rename meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/{0004-Fix-build-with-musl-systemd-specific.patch => 0003-Fix-build-with-musl-systemd-specific.patch} (81%)
 rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.22.14.bb => networkmanager_1.28.0.bb} (95%)
 delete mode 100644 meta-oe/recipes-multimedia/jack/jack/0001-Use-SYS_futex-instead-of-__NR_futex.patch
 rename meta-oe/recipes-multimedia/jack/{jack_1.19.16.bb => jack_1.19.17.bb} (93%)
 rename meta-xfce/recipes-panel-plugins/whiskermenu/{xfce4-whiskermenu-plugin_2.5.1.bb => xfce4-whiskermenu-plugin_2.5.2.bb} (76%)
 rename meta-xfce/recipes-xfce/garcon/{garcon_0.8.0.bb => garcon_4.16.1.bb} (86%)
 rename meta-xfce/recipes-xfce/thunar/{thunar_4.16.0.bb => thunar_4.16.2.bb} (89%)

-- 
2.26.2

[PATCH 1/7] garcon: upgrade 0.8.0 -> 4.16.1

[Andreas Müller]

Release notes for 4.16.1
========================
- Launch applications as children again (Fixes #18)
- Translation Updates:
  Kabyle, Portuguese

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../recipes-xfce/garcon/{garcon_0.8.0.bb => garcon_4.16.1.bb}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-xfce/recipes-xfce/garcon/{garcon_0.8.0.bb => garcon_4.16.1.bb} (86%)

diff --git a/meta-xfce/recipes-xfce/garcon/garcon_0.8.0.bb b/meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb
similarity index 86%
rename from meta-xfce/recipes-xfce/garcon/garcon_0.8.0.bb
rename to meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb
index bbaa6fd6f..3e596323d 100644
--- a/meta-xfce/recipes-xfce/garcon/garcon_0.8.0.bb
+++ b/meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb
@@ -9,7 +9,7 @@ inherit xfce gtk-doc gobject-introspection features_check
 REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI += "file://0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.patch"
-SRC_URI[sha256sum] = "4811d89ee5bc48dbdeffd69fc3eec6c112bbf01fde98a9e848335b374a4aa1bb"
+SRC_URI[sha256sum] = "84914927a2c1fda167f67af26a6640630a744a22940df508aa6c752cdbd3d21d"
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
-- 
2.26.2

[PATCH 2/7] xfce4-whiskermenu-plugin: upgrade 2.5.1 -> 2.5.2

[Andreas Müller]

Release notes for 2.5.2
=======================
- Do not reparent launched programs. (Issue #32)
- Translation updates: Basque, Danish, Greek.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...ermenu-plugin_2.5.1.bb => xfce4-whiskermenu-plugin_2.5.2.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-xfce/recipes-panel-plugins/whiskermenu/{xfce4-whiskermenu-plugin_2.5.1.bb => xfce4-whiskermenu-plugin_2.5.2.bb} (76%)

diff --git a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.5.1.bb b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.5.2.bb
similarity index 76%
rename from meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.5.1.bb
rename to meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.5.2.bb
index 6077fdfc6..366597731 100644
--- a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.5.1.bb
+++ b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.5.2.bb
@@ -5,6 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 inherit xfce-panel-plugin cmake
 
-SRC_URI[sha256sum] = "b2074f8a9caa766e2d97f0b960ef2f4d1e20dd804497229bc1f0157791896925"
+SRC_URI[sha256sum] = "a6f7070afd1c9020257d8ed7483872643a6cddd76d5d73de107c7fbd981fc515"
 
 RRECOMMENDS_${PN} += "menulibre"
-- 
2.26.2

[PATCH 3/7] thunar: upgrade 4.16.0 -> 4.16.2

[Andreas Müller]

Changes (and yes 4.16.2 'Regression:'... was on my list)

4.16.2

- Regression: "Open with other application" missing (Issue #470)
- Always create new files and folders in current directory (Issue #462)
- Translation Updates:
  Albanian, Arabic, Armenian, Armenian (Armenia), Asturian, Basque,
  Belarusian, Bengali, Bulgarian, Catalan, Chinese (China), Chinese
  (Hong Kong), Chinese (Taiwan), Croatian, Czech, Danish, Dutch,
  Eastern Armenian, English (Australia), English (United Kingdom),
  Esperanto, Estonian, Finnish, French, Galician, German, Greek,
  Hebrew, Hungarian, Icelandic, Indonesian, Interlingue, Italian,
  Japanese, Kazakh, Korean, Latvian, Lithuanian, Malay, Norwegian
  Bokmål, Norwegian Nynorsk, Occitan (post 1500), Panjabi (Punjabi),
  Persian (Iran), Polish, Portuguese, Portuguese (Brazil), Romanian,
  Russian, Serbian, Slovak, Spanish, Swedish, Telugu, Thai, Turkish,
  Ukrainian, Urdu, Urdu (Pakistan), Vietnamese

4.16.1

- Prevent crash on Ctrl+H when there is no sidepane (Issue #453)
- Roleback to previous spinner handling (Issue #448)

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../recipes-xfce/thunar/{thunar_4.16.0.bb => thunar_4.16.2.bb}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-xfce/recipes-xfce/thunar/{thunar_4.16.0.bb => thunar_4.16.2.bb} (89%)

diff --git a/meta-xfce/recipes-xfce/thunar/thunar_4.16.0.bb b/meta-xfce/recipes-xfce/thunar/thunar_4.16.2.bb
similarity index 89%
rename from meta-xfce/recipes-xfce/thunar/thunar_4.16.0.bb
rename to meta-xfce/recipes-xfce/thunar/thunar_4.16.2.bb
index ae05f867f..6b1a6b482 100644
--- a/meta-xfce/recipes-xfce/thunar/thunar_4.16.0.bb
+++ b/meta-xfce/recipes-xfce/thunar/thunar_4.16.2.bb
@@ -8,7 +8,7 @@ inherit xfce gobject-introspection features_check mime-xdg
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI[sha256sum] = "6277c448116a91ebfa564972645d8d79ef69864992a02bb164b7b13f98fdfd9b"
+SRC_URI[sha256sum] = "67a90b98c436192f9aa6cd18a22a089e713007864aebfa65f36f121c86ba7add"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre"
-- 
2.26.2

[PATCH 4/7] jack: upgrade 1.19.16 -> 1.19.17

[Andreas Müller]

removed patch was merged

1.9.17

    Fix jack_control stopping after first command iteration
    Fix library compat/current version under macOS
    Fix return codes of jackd on success
    Ignore DB_VERSION_MISMATCH error on windows, it is expected
    Remove old workaround for asio4all, as it breaks with jack-router

External changes, related to macOS/Windows installer:

    Add jack-router to Windows installer, opt-in
    Fix registry keys for Windows, add 32bit compat ones on 64bit
    Support for arm64 macOS builds
    Show welcome and license pages on windows installer
    Update QjackCtl used in macOS/Windows installers to v0.9.0, with some commits cherry-picked from develop branch

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...-Use-SYS_futex-instead-of-__NR_futex.patch | 62 -------------------
 .../jack/{jack_1.19.16.bb => jack_1.19.17.bb} |  3 +-
 2 files changed, 1 insertion(+), 64 deletions(-)
 delete mode 100644 meta-oe/recipes-multimedia/jack/jack/0001-Use-SYS_futex-instead-of-__NR_futex.patch
 rename meta-oe/recipes-multimedia/jack/{jack_1.19.16.bb => jack_1.19.17.bb} (93%)

diff --git a/meta-oe/recipes-multimedia/jack/jack/0001-Use-SYS_futex-instead-of-__NR_futex.patch b/meta-oe/recipes-multimedia/jack/jack/0001-Use-SYS_futex-instead-of-__NR_futex.patch
deleted file mode 100644
index dd1b7ccfd..000000000
--- a/meta-oe/recipes-multimedia/jack/jack/0001-Use-SYS_futex-instead-of-__NR_futex.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 83068f9b71aea16d1ad036fdcc326de1027b5585 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 15 Nov 2020 22:13:29 -0800
-Subject: [PATCH] Use SYS_futex instead of __NR_futex
-
-SYS_futex is expected from system C library.
-in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex)
-rv32 is using 64bit time_t from get go unlike other 32bit architectures
-in glibc, therefore it wont have NR_futex defined but just NR_futex_time64
-this aliases it to NR_futex so that SYS_futex is then defined for rv32
-
-Upstream-Status: Submitted [https://github.com/jackaudio/jack2/pull/670]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- linux/JackLinuxFutex.cpp | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/linux/JackLinuxFutex.cpp b/linux/JackLinuxFutex.cpp
-index deff006b..aef99cd2 100644
---- a/linux/JackLinuxFutex.cpp
-+++ b/linux/JackLinuxFutex.cpp
-@@ -29,6 +29,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #include <syscall.h>
- #include <linux/futex.h>
- 
-+#if !defined(SYS_futex) && defined(SYS_futex_time64)
-+#define SYS_futex SYS_futex_time64
-+#endif
-+
- namespace Jack
- {
- 
-@@ -67,7 +71,7 @@ bool JackLinuxFutex::Signal()
-         if (! fFutex->internal) return true;
-     }
- 
--    ::syscall(__NR_futex, fFutex, fFutex->internal ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, 1, NULL, NULL, 0);
-+    ::syscall(SYS_futex, fFutex, fFutex->internal ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, 1, NULL, NULL, 0);
-     return true;
- }
- 
-@@ -94,7 +98,7 @@ bool JackLinuxFutex::Wait()
-         if (__sync_bool_compare_and_swap(&fFutex->futex, 1, 0))
-             return true;
- 
--        if (::syscall(__NR_futex, fFutex, fFutex->internal ? FUTEX_WAIT_PRIVATE : FUTEX_WAIT, 0, NULL, NULL, 0) != 0 && errno != EWOULDBLOCK)
-+        if (::syscall(SYS_futex, fFutex, fFutex->internal ? FUTEX_WAIT_PRIVATE : FUTEX_WAIT, 0, NULL, NULL, 0) != 0 && errno != EWOULDBLOCK)
-             return false;
-     }
- }
-@@ -122,7 +126,7 @@ bool JackLinuxFutex::TimedWait(long usec)
-         if (__sync_bool_compare_and_swap(&fFutex->futex, 1, 0))
-             return true;
- 
--        if (::syscall(__NR_futex, fFutex, fFutex->internal ? FUTEX_WAIT_PRIVATE : FUTEX_WAIT, 0, &timeout, NULL, 0) != 0 && errno != EWOULDBLOCK)
-+        if (::syscall(SYS_futex, fFutex, fFutex->internal ? FUTEX_WAIT_PRIVATE : FUTEX_WAIT, 0, &timeout, NULL, 0) != 0 && errno != EWOULDBLOCK)
-             return false;
-     }
- }
--- 
-2.29.2
-
diff --git a/meta-oe/recipes-multimedia/jack/jack_1.19.16.bb b/meta-oe/recipes-multimedia/jack/jack_1.19.17.bb
similarity index 93%
rename from meta-oe/recipes-multimedia/jack/jack_1.19.16.bb
rename to meta-oe/recipes-multimedia/jack/jack_1.19.17.bb
index c13d6261c..d5288c7b7 100644
--- a/meta-oe/recipes-multimedia/jack/jack_1.19.16.bb
+++ b/meta-oe/recipes-multimedia/jack/jack_1.19.17.bb
@@ -16,9 +16,8 @@ DEPENDS = "libsamplerate0 libsndfile1 readline"
 
 SRC_URI = "git://github.com/jackaudio/jack2.git \
            file://0001-example-clients-Use-c-compiler-for-jack_simdtests.patch \
-           file://0001-Use-SYS_futex-instead-of-__NR_futex.patch \
           "
-SRCREV = "5b78c2ef158c2d9ffe09818a7dd80209ed251c5f"
+SRCREV = "9e23888b8def6527774889cf4ef6348fb78c7154"
 
 S = "${WORKDIR}/git"
 
-- 
2.26.2

[PATCH 5/7] networkmanager: upgrade 1.22.14 -> 1.28.0

[Andreas Müller]

* Build tested on aarch64 glibc/musl
* 0003-Fix-build-with-musl-for-n-dhcp4.patch has to go. Grepped nm code for
  seed48_r / mrand48_r => no findings
* Since this is a huge version bump no detaile release notes are provided here
* Have tried to move to meson build few months ago but it turned into huge
  efforts and ended without success. Maybe situation changed but let's postpone
  for now

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...ttings-settings-property-documentati.patch | 43 +++++++------
 ...-to-var-libdir-rather-than-hardcod-.patch} |  0
 ...atch => 0004-fix_reallocarray_check.patch} |  2 +-
 ...Fix-build-with-musl-systemd-specific.patch | 29 +++++----
 .../musl/0002-Fix-build-with-musl.patch       | 23 ++++---
 ...0003-Fix-build-with-musl-for-n-dhcp4.patch | 61 -------------------
 ...ix-build-with-musl-systemd-specific.patch} |  6 +-
 ...er_1.22.14.bb => networkmanager_1.28.0.bb} |  9 ++-
 8 files changed, 65 insertions(+), 108 deletions(-)
 rename meta-networking/recipes-connectivity/networkmanager/networkmanager/{0001-install-firewalld-to-var-libdir-rather-than-hardcod-.patch => 0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch} (100%)
 rename meta-networking/recipes-connectivity/networkmanager/networkmanager/{fix_reallocarray_check.patch => 0004-fix_reallocarray_check.patch} (90%)
 delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-for-n-dhcp4.patch
 rename meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/{0004-Fix-build-with-musl-systemd-specific.patch => 0003-Fix-build-with-musl-systemd-specific.patch} (81%)
 rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.22.14.bb => networkmanager_1.28.0.bb} (95%)

diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch
index 446637b27..ecd13504d 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch
@@ -1,6 +1,6 @@
 From 9eab96351a726e9ce6a15d158f743e35d73a8900 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Thu, 22 Mar 2018 11:08:30 +0100
+Date: Sat, 16 Jan 2021 14:27:38 +0100
 Subject: [PATCH] Do not create settings settings/property documentation
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -11,38 +11,44 @@ MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
-It was tried to get this work but gi / GirRepository could not be found by
-python. Anyway it is not necessary for us to have the settings/property docs.
+It was tried to get this work by adding python3-pygobject-native to DEPENDS but
+compile could not find (configure passed) python module gi. 
+Anyway it is not necessary for us to have the settings/property docs.
 
 Upstream-Status: Inappropriate [OE specific]
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 
 ---
- Makefile.am  | 11 -----------
+ Makefile.am  | 13 -------------
  configure.ac |  5 -----
- 2 files changed, 16 deletions(-)
+ 2 files changed, 18 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index d5cbcf5..2a1819a 100644
+index 110957a..b4cfbcc 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -1473,9 +1473,7 @@ libnm/libnm.typelib: libnm/libnm.gir
+@@ -1587,14 +1587,10 @@ libnm/libnm.typelib: libnm/libnm.gir
  INTROSPECTION_GIRS += libnm/NM-1.0.gir
  
  libnm_noinst_data = \
--	libnm/nm-property-docs.xml \
- 	libnm/nm-settings-docs-overrides.xml \
--	libnm/nm-settings-docs.xml \
- 	libnm/nm-settings-keyfile-docs.xml \
- 	libnm/nm-settings-ifcfg-rh-docs.xml
+-	clients/cli/generate-docs-nm-settings-nmcli.xml \
+ 	libnm/nm-property-infos-dbus.xml \
+ 	libnm/nm-property-infos-ifcfg-rh.xml \
+ 	libnm/nm-property-infos-keyfile.xml \
+ 	libnm/nm-property-infos-nmcli.xml \
+-	libnm/nm-settings-docs-gir.xml \
+-	man/nm-settings-docs-dbus.xml \
+-	man/nm-settings-docs-nmcli.xml \
+ 	$(NULL)
  
-@@ -4236,18 +4234,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
+ noinst_DATA += $(libnm_noinst_data)
+@@ -4448,18 +4444,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
  $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp
  
  clients_common_settings_doc_h = clients/common/settings-docs.h
 -if HAVE_INTROSPECTION
--$(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-property-docs.xml clients/common/.dirstamp
+-$(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-settings-docs-gir.xml clients/common/.dirstamp
 -	$(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^)
 -DISTCLEANFILES += $(clients_common_settings_doc_h)
 -check-local-settings-docs: $(clients_common_settings_doc_h)
@@ -57,18 +63,21 @@ index d5cbcf5..2a1819a 100644
  	$(clients_common_settings_doc_h) \
  	$(clients_common_settings_doc_h).in
 diff --git a/configure.ac b/configure.ac
-index ad4b0fc..0092092 100644
+index 704b1c1..18bba87 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1201,11 +1201,6 @@ GTK_DOC_CHECK(1.0)
+@@ -1228,11 +1228,6 @@ GTK_DOC_CHECK(1.0)
  # check if we can build setting property documentation
  build_docs=no
  if test -n "$INTROSPECTION_MAKEFILE"; then
 -	# If g-i is installed we know we have python, but we might not have pygobject
--	if ! "$PYTHON" -c 'from gi.repository import GObject' >& /dev/null; then
+-	if ! "$PYTHON" -c 'from gi.repository import GObject' > /dev/null 2>&1; then
 -		AC_MSG_ERROR(["--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)])
 -	fi
 -
  	AC_PATH_PROG(PERL, perl)
  	if test -z "$PERL"; then
  		AC_MSG_ERROR([--enable-introspection requires perl])
+-- 
+2.26.2
+
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-install-firewalld-to-var-libdir-rather-than-hardcod-.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch
similarity index 100%
rename from meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-install-firewalld-to-var-libdir-rather-than-hardcod-.patch
rename to meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/fix_reallocarray_check.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-fix_reallocarray_check.patch
similarity index 90%
rename from meta-networking/recipes-connectivity/networkmanager/networkmanager/fix_reallocarray_check.patch
rename to meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-fix_reallocarray_check.patch
index 0a8de5410..2df449f2e 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/fix_reallocarray_check.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-fix_reallocarray_check.patch
@@ -6,7 +6,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 --- a/meson.build
 +++ b/meson.build
 @@ -114,7 +114,7 @@ config_h.set10('HAVE_GETRANDOM', use_sys
- # FIXME secure_getenv check is not useful?
+                                                                                      #include <sys/wait.h>'''))
  config_h.set('HAVE_SECURE_GETENV', cc.has_function('secure_getenv'))
  config_h.set('HAVE___SECURE_GETENV', cc.has_function('__secure_getenv'))
 -config_h.set10('HAVE_DECL_REALLOCARRAY', cc.has_function('reallocarray', prefix: '#include <malloc.h>'))
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch
index c23fc308f..7807fc77c 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch
@@ -1,4 +1,4 @@
-From e7ed91c48e1a07527a860637a7865eb67ce34cf3 Mon Sep 17 00:00:00 2001
+From 9597122867c22e949ef3b69c779e0facebce6eb5 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Tue, 2 Apr 2019 01:34:35 +0200
 Subject: [PATCH] Fix build with musl - systemd specific
@@ -6,6 +6,11 @@ MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
 Networkmanager imported some code from systemd. This requires some adjustments
 for musl.
 
@@ -23,7 +28,7 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  6 files changed, 27 insertions(+), 23 deletions(-)
 
 diff --git a/shared/systemd/src/basic/in-addr-util.c b/shared/systemd/src/basic/in-addr-util.c
-index 91d687c..8388304 100644
+index 1ea3e7f..1204393 100644
 --- a/shared/systemd/src/basic/in-addr-util.c
 +++ b/shared/systemd/src/basic/in-addr-util.c
 @@ -15,6 +15,7 @@
@@ -32,10 +37,10 @@ index 91d687c..8388304 100644
  #include "parse-util.h"
 +#include "string-util.h"
  #include "random-util.h"
+ #include "string-util.h"
  #include "strxcpyx.h"
- #include "util.h"
 diff --git a/shared/systemd/src/basic/process-util.c b/shared/systemd/src/basic/process-util.c
-index 1456167..42f51a0 100644
+index 03ca04e..be8bca8 100644
 --- a/shared/systemd/src/basic/process-util.c
 +++ b/shared/systemd/src/basic/process-util.c
 @@ -17,6 +17,9 @@
@@ -48,7 +53,7 @@ index 1456167..42f51a0 100644
  #if 0 /* NM_IGNORED */
  #if HAVE_VALGRIND_VALGRIND_H
  #include <valgrind/valgrind.h>
-@@ -1123,11 +1126,13 @@ void reset_cached_pid(void) {
+@@ -1152,11 +1155,13 @@ void reset_cached_pid(void) {
          cached_pid = CACHED_PID_UNSET;
  }
  
@@ -62,7 +67,7 @@ index 1456167..42f51a0 100644
  
  pid_t getpid_cached(void) {
          static bool installed = false;
-@@ -1156,7 +1161,11 @@ pid_t getpid_cached(void) {
+@@ -1185,7 +1190,11 @@ pid_t getpid_cached(void) {
                           * only half-documented (glibc doesn't document it but LSB does — though only superficially)
                           * we'll check for errors only in the most generic fashion possible. */
  
@@ -75,7 +80,7 @@ index 1456167..42f51a0 100644
                                  cached_pid = CACHED_PID_UNSET;
                                  return new_pid;
 diff --git a/shared/systemd/src/basic/socket-util.h b/shared/systemd/src/basic/socket-util.h
-index a0886e0..da47d14 100644
+index 1ece911..290e94c 100644
 --- a/shared/systemd/src/basic/socket-util.h
 +++ b/shared/systemd/src/basic/socket-util.h
 @@ -14,6 +14,12 @@
@@ -92,7 +97,7 @@ index a0886e0..da47d14 100644
  #include "missing_socket.h"
  #include "sparse-endian.h"
 diff --git a/shared/systemd/src/basic/sort-util.h b/shared/systemd/src/basic/sort-util.h
-index e029f86..1e8b6e1 100644
+index a8dc3bb..ff0aa88 100644
 --- a/shared/systemd/src/basic/sort-util.h
 +++ b/shared/systemd/src/basic/sort-util.h
 @@ -5,15 +5,10 @@
@@ -115,9 +120,9 @@ index e029f86..1e8b6e1 100644
  
  /**
   * Normal bsearch requires base to be nonnull. Here were require
-@@ -54,17 +49,3 @@ static inline void qsort_safe(void *base, size_t nmemb, size_t size, __compar_fn
+@@ -54,17 +49,3 @@ static inline void _qsort_safe(void *base, size_t nmemb, size_t size, __compar_f
                  int (*_func_)(const typeof(p[0])*, const typeof(p[0])*) = func; \
-                 qsort_safe((p), (n), sizeof((p)[0]), (__compar_fn_t) _func_); \
+                 _qsort_safe((p), (n), sizeof((p)[0]), (__compar_fn_t) _func_); \
          })
 -
 -static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_d_fn_t compar, void *userdata) {
@@ -148,7 +153,7 @@ index c3b9448..e80a938 100644
  #include <stdio.h>
  #include <sys/types.h>
 diff --git a/shared/systemd/src/basic/string-util.h b/shared/systemd/src/basic/string-util.h
-index 04cc82b..2cf589a 100644
+index cefbda3..71e4dec 100644
 --- a/shared/systemd/src/basic/string-util.h
 +++ b/shared/systemd/src/basic/string-util.h
 @@ -26,6 +26,11 @@
@@ -161,5 +166,5 @@ index 04cc82b..2cf589a 100644
 +#endif
 +
  int strcmp_ptr(const char *a, const char *b) _pure_;
+ int strcasecmp_ptr(const char *a, const char *b) _pure_;
  
- static inline bool streq_ptr(const char *a, const char *b) {
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch
index 196a3358d..0f43c0c68 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch
@@ -1,4 +1,4 @@
-From 877fbb4e848629ff57371b5bdb0d56369abe9d81 Mon Sep 17 00:00:00 2001
+From bacc14089c80ec757025789ff054a05e1f9c088d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Mon, 8 Apr 2019 23:10:43 +0200
 Subject: [PATCH] Fix build with musl
@@ -6,6 +6,11 @@ MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
 The build issues caused by definition conflicts musl vs linux-libc headers
 (error: redefinition of ...) can be reduced to two headers:
 
@@ -42,7 +47,7 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  5 files changed, 8 insertions(+), 3 deletions(-)
 
 diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c
-index 4ab5932..915248c 100644
+index 692a467..cf9b32e 100644
 --- a/clients/tui/nmt-device-entry.c
 +++ b/clients/tui/nmt-device-entry.c
 @@ -26,7 +26,6 @@
@@ -54,11 +59,11 @@ index 4ab5932..915248c 100644
  #include "nmtui.h"
  
 diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
-index 5418a1e..f492da6 100644
+index 9589c51..b82c5cf 100644
 --- a/libnm-core/nm-utils.h
 +++ b/libnm-core/nm-utils.h
 @@ -10,6 +10,10 @@
- #error "Only <NetworkManager.h> can be included directly."
+     #error "Only <NetworkManager.h> can be included directly."
  #endif
  
 +/* include as early as possible for musl */
@@ -69,10 +74,10 @@ index 5418a1e..f492da6 100644
  
  #include <netinet/in.h>
 diff --git a/shared/nm-default.h b/shared/nm-default.h
-index ace6ede..25357da 100644
+index b322f1d..c287dbe 100644
 --- a/shared/nm-default.h
 +++ b/shared/nm-default.h
-@@ -182,6 +182,9 @@
+@@ -178,6 +178,9 @@
  #endif
  
  #include <stdlib.h>
@@ -83,7 +88,7 @@ index ace6ede..25357da 100644
  /*****************************************************************************/
  
 diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index 3bbc975..4e8a3f6 100644
+index 0be05f2..04061f9 100644
 --- a/src/devices/nm-device.c
 +++ b/src/devices/nm-device.c
 @@ -9,6 +9,7 @@
@@ -100,10 +105,10 @@ index 3bbc975..4e8a3f6 100644
  #include <linux/if_addr.h>
 -#include <linux/if_arp.h>
  #include <linux/rtnetlink.h>
- #include <linux/pkt_sched.h>
  
+ #include "nm-std-aux/unaligned.h"
 diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
-index 7abe4df..9f53147 100644
+index b377c85..87af59a 100644
 --- a/src/platform/nm-linux-platform.c
 +++ b/src/platform/nm-linux-platform.c
 @@ -14,7 +14,6 @@
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-for-n-dhcp4.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-for-n-dhcp4.patch
deleted file mode 100644
index 62252826e..000000000
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-for-n-dhcp4.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From aff5cded8847f3eee59f5cec22afb8630d401a85 Mon Sep 17 00:00:00 2001
-From: Adrian Freihofer <adrian.freihofer@siemens.com>
-Date: Sat, 7 Mar 2020 14:22:36 +0100
-Subject: [PATCH 3/4] Fix build with musl for n-dhcp4
-
----
- shared/n-dhcp4/src/n-dhcp4-c-probe.c | 8 ++++++++
- shared/n-dhcp4/src/n-dhcp4-private.h | 4 ++++
- 2 files changed, 12 insertions(+)
-
-diff --git a/shared/n-dhcp4/src/n-dhcp4-c-probe.c b/shared/n-dhcp4/src/n-dhcp4-c-probe.c
-index e4477a7..75713c8 100644
---- a/shared/n-dhcp4/src/n-dhcp4-c-probe.c
-+++ b/shared/n-dhcp4/src/n-dhcp4-c-probe.c
-@@ -360,8 +360,12 @@ static void n_dhcp4_client_probe_config_initialize_random_seed(NDhcp4ClientProbe
-         seed16v[1] = (u64 >> 16) ^ (u64 >>  0);
-         seed16v[2] = (u64 >> 32) ^ (u64 >> 16);
- 
-+#ifdef __GLIBC__
-         r = seed48_r(seed16v, &config->entropy);
-         c_assert(!r);
-+#else
-+        memcpy(config->entropy, seed16v, sizeof seed16v);
-+#endif
- }
- 
- /**
-@@ -375,10 +379,14 @@ static void n_dhcp4_client_probe_config_initialize_random_seed(NDhcp4ClientProbe
-  */
- uint32_t n_dhcp4_client_probe_config_get_random(NDhcp4ClientProbeConfig *config) {
-         long int result;
-+#ifdef __GLIBC__
-         int r;
- 
-         r = mrand48_r(&config->entropy, &result);
-         c_assert(!r);
-+#else
-+        result = jrand48(config->entropy);
-+#endif
- 
-         return result;
- };
-diff --git a/shared/n-dhcp4/src/n-dhcp4-private.h b/shared/n-dhcp4/src/n-dhcp4-private.h
-index 436ee80..ffcb4b2 100644
---- a/shared/n-dhcp4/src/n-dhcp4-private.h
-+++ b/shared/n-dhcp4/src/n-dhcp4-private.h
-@@ -267,7 +267,11 @@ struct NDhcp4ClientProbeConfig {
-         bool inform_only;
-         bool init_reboot;
-         struct in_addr requested_ip;
-+#ifdef __GLIBC__
-         struct drand48_data entropy;    /* entropy pool */
-+#else
-+        unsigned short entropy[3];      /* entropy pool */
-+#endif
-         uint64_t ms_start_delay;        /* max ms to wait before starting probe */
-         NDhcp4ClientProbeOption *options[UINT8_MAX + 1];
-         int8_t request_parameters[UINT8_MAX + 1];
--- 
-2.24.1
-
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-Fix-build-with-musl-systemd-specific.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-systemd-specific.patch
similarity index 81%
rename from meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-Fix-build-with-musl-systemd-specific.patch
rename to meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-systemd-specific.patch
index 55aa4d265..5735d51a8 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-Fix-build-with-musl-systemd-specific.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-systemd-specific.patch
@@ -1,14 +1,14 @@
-From 80c7d3391510993cba1a7499bf33a5b2b115280d Mon Sep 17 00:00:00 2001
+From ed748a28076eada9f38e3f4a476f28d7a10ba84b Mon Sep 17 00:00:00 2001
 From: Adrian Freihofer <adrian.freihofer@siemens.com>
 Date: Sat, 7 Mar 2020 14:24:01 +0100
-Subject: [PATCH 4/4] Fix build with musl - systemd specific
+Subject: [PATCH] Fix build with musl - systemd specific
 
 ---
  src/systemd/src/libsystemd-network/sd-dhcp6-client.c | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-index e1150f9..2c63bac 100644
+index ec7f1be..31bcd4d 100644
 --- a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
 +++ b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
 @@ -7,7 +7,9 @@
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.28.0.bb
similarity index 95%
rename from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb
rename to meta-networking/recipes-connectivity/networkmanager/networkmanager_1.28.0.bb
index aa8ab899b..1053bdd42 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.28.0.bb
@@ -26,16 +26,15 @@ SRC_URI = " \
     file://${BPN}.initd \
     file://0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \
     file://0002-Do-not-create-settings-settings-property-documentati.patch \
-    file://0001-install-firewalld-to-var-libdir-rather-than-hardcod-.patch \
-    file://fix_reallocarray_check.patch \
+    file://0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch \
+    file://0004-fix_reallocarray_check.patch \
 "
 SRC_URI_append_libc-musl = " \
     file://musl/0001-Fix-build-with-musl-systemd-specific.patch \
     file://musl/0002-Fix-build-with-musl.patch \
-    file://musl/0003-Fix-build-with-musl-for-n-dhcp4.patch \
-    file://musl/0004-Fix-build-with-musl-systemd-specific.patch \
+    file://musl/0003-Fix-build-with-musl-systemd-specific.patch \
 "
-SRC_URI[sha256sum] = "c6893971936a1ce252ba4fdff830c972d2ae93fec6751b57dcfd3ad9f0c949dd"
+SRC_URI[sha256sum] = "3e170e9045e20598d2630e40c5789b2e2c46b942bfe5cb220f36202299253062"
 
 S = "${WORKDIR}/NetworkManager-${PV}"
 
-- 
2.26.2

[PATCH 6/7] appstream-glib: upgrade 0.7.17 -> 0.7.18

[Andreas Müller]

Version 0.7.18
~~~~~~~~~~~~~~
Released: 2020-09-07

New Features:
 - Add content rating system APIs from gnome-software (Philip Withnall)
 - Add "validate-version" command (Florian Müllner)

Bugfixes:
 - Allow timestamp in the future in validate-relax (Bartłomiej Piotrowski)
 - Don't ignore localized strings that are the same as original (Isaque Galdino)
 - Fix crash with invalid children of <ul/> (Fabian Vogt)
 - Lower the OARS/CSM mapping of sex-homosexuality/intense (Philip Withnall)
 - Properly initialize mutexes (Laurent Bigonville)
 - Test launchable tags in validation (Ian McInerney)

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../{appstream-glib_0.7.17.bb => appstream-glib_0.7.18.bb}     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta-gnome/recipes-support/appstream-glib/{appstream-glib_0.7.17.bb => appstream-glib_0.7.18.bb} (84%)

diff --git a/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.17.bb b/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.18.bb
similarity index 84%
rename from meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.17.bb
rename to meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.18.bb
index eb60bd968..e40354f56 100644
--- a/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.17.bb
+++ b/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.18.bb
@@ -20,8 +20,7 @@ DEPENDS = " \
 inherit meson gobject-introspection gettext bash-completion
 
 SRC_URI = "https://people.freedesktop.org/~hughsient/${BPN}/releases/${BP}.tar.xz"
-SRC_URI[md5sum] = "67d441fb0fb3e14551b47db656565fc4"
-SRC_URI[sha256sum] = "7ca7e91d4accefa1c0d2c6e310cb3fe2686c017810e23b3f82d9f5724345e549"
+SRC_URI[sha256sum] = "ca1ed22e3bde3912cb903aaa7de085d55771da454f1c0573fd9608e1de9c4002"
 
 EXTRA_OEMESON = " \
     -Drpm=false \
-- 
2.26.2

[PATCH 7/7] vlc: upgrade 3.0.11.1 -> 3.0.12

[Andreas Müller]

This at least a security upgrade. Although not mentioning CVEs in [1] it sounds
importand to upgrade.

[1] https://www.videolan.org/security/sb-vlc3012.html

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../vlc/vlc/0005-Fix-build-with-Qt-5.15.patch | 56 -------------------
 ...Use-SYS_futex-instead-of-__NR_futex.patch} |  0
 .../vlc/{vlc_3.0.11.1.bb => vlc_3.0.12.bb}    |  5 +-
 3 files changed, 2 insertions(+), 59 deletions(-)
 delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch
 rename meta-multimedia/recipes-multimedia/vlc/vlc/{0001-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch => 0005-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch} (100%)
 rename meta-multimedia/recipes-multimedia/vlc/{vlc_3.0.11.1.bb => vlc_3.0.12.bb} (96%)

diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch
deleted file mode 100644
index c4465b6af..000000000
--- a/meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From c805c6f64da6d8b03355b4796865b75e2f3b500d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Mon, 8 Jun 2020 00:50:08 +0200
-Subject: [PATCH] Fix build with Qt >= 5.15
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- modules/gui/qt/components/playlist/views.cpp | 1 +
- modules/gui/qt/dialogs/plugins.cpp           | 1 +
- modules/gui/qt/util/timetooltip.hpp          | 1 +
- 3 files changed, 3 insertion(+)
-
-diff --git a/modules/gui/qt/components/playlist/views.cpp b/modules/gui/qt/components/playlist/views.cpp
-index 24db9d9..71d8514 100644
---- a/modules/gui/qt/components/playlist/views.cpp
-+++ b/modules/gui/qt/components/playlist/views.cpp
-@@ -35,6 +35,7 @@
- #include <QMetaType>
- #include <QHeaderView>
- #include <QSvgRenderer>
-+#include <QPainterPath>
- 
- #include <assert.h>
- 
-diff --git a/modules/gui/qt/dialogs/plugins.cpp b/modules/gui/qt/dialogs/plugins.cpp
-index d233382..9ae9a63 100644
---- a/modules/gui/qt/dialogs/plugins.cpp
-+++ b/modules/gui/qt/dialogs/plugins.cpp
-@@ -66,6 +66,7 @@
- #include <QSplitter>
- #include <QToolButton>
- #include <QStackedWidget>
-+#include <QPainterPath>
- 
- //match the image source (width/height)
- #define SCORE_ICON_WIDTH_SCALE 4
-diff --git a/modules/gui/qt/util/timetooltip.hpp b/modules/gui/qt/util/timetooltip.hpp
-index 6a1329e..9f50b18 100644
---- a/modules/gui/qt/util/timetooltip.hpp
-+++ b/modules/gui/qt/util/timetooltip.hpp
-@@ -25,6 +25,7 @@
- #include "qt.hpp"
- 
- #include <QWidget>
-+#include <QPainterPath>
- 
- class TimeTooltip : public QWidget
- {
--- 
-2.26.2
-
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0001-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0005-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch
similarity index 100%
rename from meta-multimedia/recipes-multimedia/vlc/vlc/0001-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch
rename to meta-multimedia/recipes-multimedia/vlc/vlc/0005-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.11.1.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb
similarity index 96%
rename from meta-multimedia/recipes-multimedia/vlc/vlc_3.0.11.1.bb
rename to meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb
index 7902825f2..046c059fb 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.11.1.bb
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb
@@ -24,10 +24,9 @@ SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz \
            file://0002-use-vorbisidec.patch \
            file://0003-fix-luaL-checkint.patch \
            file://0004-Use-packageconfig-to-detect-mmal-support.patch \
-           file://0005-Fix-build-with-Qt-5.15.patch \
-           file://0001-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch \
+           file://0005-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch \
 "
-SRC_URI[sha256sum] = "189311d28aa814f106a7b3645211ac52c0b3e2b9f4b348de2f63bab3218086b8"
+SRC_URI[sha256sum] = "eff458f38a92126094f44f2263c2bf2c7cdef271b48192d0fe7b1726388cf879"
 
 inherit autotools features_check gettext pkgconfig mime-xdg
 
-- 
2.26.2