Signed-off-by: Ladislav Michl <[email protected]> --- Changes: -v2: add upstream patch to prevent compile error when building plugins
...ile-error-due-to-NM_AVAILABLE_IN_1_1.patch | 29 +++++++++++++++++++ patches/NetworkManager-1.12.2/series | 1 + rules/networkmanager.make | 4 +-- 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 patches/NetworkManager-1.12.2/0001-version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_1.patch create mode 100644 patches/NetworkManager-1.12.2/series diff --git a/patches/NetworkManager-1.12.2/0001-version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_1.patch b/patches/NetworkManager-1.12.2/0001-version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_1.patch new file mode 100644 index 000000000..7a13bb76d --- /dev/null +++ b/patches/NetworkManager-1.12.2/0001-version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_1.patch @@ -0,0 +1,29 @@ +From 0a3755c1799d3a4dc1875d4c59c7c568a64c8456 Mon Sep 17 00:00:00 2001 +From: Thomas Haller <[email protected]> +Date: Tue, 31 Jul 2018 14:13:57 +0200 +Subject: [PATCH] version: fix compile error due to NM_AVAILABLE_IN_1_12_2 + macro + +Fixes: 8d09660481e1ff8b513aa60b2c40a4982ccc57cd + +https://mail.gnome.org/archives/networkmanager-list/2018-July/msg00023.html +--- + libnm-core/nm-version.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h +index ee6dbc0bd..c24048955 100644 +--- a/libnm-core/nm-version.h ++++ b/libnm-core/nm-version.h +@@ -161,7 +161,7 @@ + #endif + + #if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_12_2 +-# define NM_AVAILABLE_IN_1_12_2 G_UNAVAILABLE(1,12,2) ++# define NM_AVAILABLE_IN_1_12_2 G_UNAVAILABLE(1,12.2) + #else + # define NM_AVAILABLE_IN_1_12_2 + #endif +-- +2.18.0 + diff --git a/patches/NetworkManager-1.12.2/series b/patches/NetworkManager-1.12.2/series new file mode 100644 index 000000000..9e9e56c08 --- /dev/null +++ b/patches/NetworkManager-1.12.2/series @@ -0,0 +1 @@ +0001-version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_1.patch diff --git a/rules/networkmanager.make b/rules/networkmanager.make index e36d2deb9..5ee8dcd3e 100644 --- a/rules/networkmanager.make +++ b/rules/networkmanager.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager # # Paths and names # -NETWORKMANAGER_VERSION := 1.12.0 -NETWORKMANAGER_MD5 := f728a42310c85b53386b172b15d7fc20 +NETWORKMANAGER_VERSION := 1.12.2 +NETWORKMANAGER_MD5 := 94d02b80b120f166927e6ef242b29a9b NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION) NETWORKMANAGER_SUFFIX := tar.xz NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.12/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) -- 2.18.0 _______________________________________________ ptxdist mailing list [email protected]
