[ptxdist] [PATCH v2] networkmanager: version bump 1.20.0 -> 1.20.8

[ptxdist] [PATCH v2] networkmanager: version bump 1.20.0 -> 1.20.8

[Ladislav Michl]

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 Changes:
 -v2: removed patch already present upstream

 ...dependency-to-gdbus-generated-header.patch | 53 -------------------
 patches/NetworkManager-1.20.0/series          |  4 --
 rules/networkmanager.make                     |  4 +-
 3 files changed, 2 insertions(+), 59 deletions(-)
 delete mode 100644 patches/NetworkManager-1.20.0/0001-build-meson-fix-dependency-to-gdbus-generated-header.patch
 delete mode 100644 patches/NetworkManager-1.20.0/series

diff --git a/patches/NetworkManager-1.20.0/0001-build-meson-fix-dependency-to-gdbus-generated-header.patch b/patches/NetworkManager-1.20.0/0001-build-meson-fix-dependency-to-gdbus-generated-header.patch
deleted file mode 100644
index f6edaaa12..000000000
--- a/patches/NetworkManager-1.20.0/0001-build-meson-fix-dependency-to-gdbus-generated-header.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Tue, 19 Nov 2019 18:17:59 +0100
-Subject: [PATCH] build: meson: fix dependency to gdbus generated headers
-
-libnm has a dependency on 'libnmdbus_dep', which contains 'link_with:
-libnmdbus'. This however only enforces that libnm is linked after the
-libnmdbus static library is built; it doesn't give any guarantees
-about the compilation phase.
-
-We need to make libnm compilation depend on the generated header
-files. The output of 'gnome.gdbus_codegen' is an array with the header
-file in the second position; use it to add a proper
-dependency. Unfortunately this works only with meson >= 0.46.
-
-In the future libnm will no longer use gdbus generated code and this
-dependency will not be needed anymore.
-
-https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/286
----
- introspection/meson.build | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/introspection/meson.build b/introspection/meson.build
-index 631432a7a229..ad9a6db0e2bc 100644
---- a/introspection/meson.build
-+++ b/introspection/meson.build
-@@ -56,6 +56,7 @@ ifaces = [
- ifaces_xmls = []
- sources = []
- introspection_files = []
-+headers = []
- 
- # FIXME?: DBUS_INTERFACE_DOCS/docbook files are generated in
- # "meson.current_build_dir()" instead of "meson.source_root()/docs/api"
-@@ -85,6 +86,7 @@ foreach iface: ifaces
-   # older versions
-   if meson.version().version_compare('>= 0.46.0')
-     introspection_files += [ [res[2], dbus_iface_xml_path] ]
-+    headers += res[1]
-   endif
- 
- endforeach
-@@ -102,9 +104,7 @@ libnmdbus = static_library(
- )
- 
- libnmdbus_dep = declare_dependency(
--  # FIXME: only headers should be added here to resolve dependencies on
--  #        libNetworkManagerBase and libNetworkManager
--  #sources: sources,
-+  sources: headers,
-   include_directories: include_directories('.'),
-   link_with: libnmdbus,
- )
diff --git a/patches/NetworkManager-1.20.0/series b/patches/NetworkManager-1.20.0/series
deleted file mode 100644
index 40c988c32..000000000
--- a/patches/NetworkManager-1.20.0/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-build-meson-fix-dependency-to-gdbus-generated-header.patch
-# 432fcfeb741737684aac57c507ce17c5  - git-ptx-patches magic
diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index 682764f65..de0e755b3 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
 #
 # Paths and names
 #
-NETWORKMANAGER_VERSION	:= 1.20.0
-NETWORKMANAGER_MD5	:= 109df9b0813755a98735206f5b2d68da
+NETWORKMANAGER_VERSION	:= 1.20.8
+NETWORKMANAGER_MD5	:= c0ceb5ab14bfdfeee07536d94cc5c548
 NETWORKMANAGER		:= NetworkManager-$(NETWORKMANAGER_VERSION)
 NETWORKMANAGER_SUFFIX	:= tar.xz
 NETWORKMANAGER_URL	:= https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.20/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
-- 
2.24.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de