diff options
| author | Michael Biebl <biebl@debian.org> | 2018-08-05 15:00:14 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-08-05 15:00:14 +0200 |
| commit | c0f037a4c260bd455d13f755d068b4d9e3f9a551 (patch) | |
| tree | 4004fc4efe7f433021e4f9d3dfc04406bbbe7c24 | |
| parent | 517cab4c80a5e3c85afe0882a2c6d212e2644568 (diff) | |
Fix compile error due to NM_AVAILABLE_IN_1_12_2 macro
Closes: #905372
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch | 25 |
2 files changed, 26 insertions, 0 deletions
diff --git a/debian/patches/series b/debian/patches/series index 0adf0cf1..3a4a99fc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ Force-online-state-with-unmanaged-devices.patch Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch Don-t-make-NetworkManager-D-Bus-activatable.patch Fix-iscsiadm-path.patch +version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch diff --git a/debian/patches/version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch b/debian/patches/version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch new file mode 100644 index 00000000..2783890f --- /dev/null +++ b/debian/patches/version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch @@ -0,0 +1,25 @@ +From: Thomas Haller <thaller@redhat.com> +Date: Tue, 31 Jul 2018 14:13:57 +0200 +Subject: 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 +(cherry picked from commit 0a3755c1799d3a4dc1875d4c59c7c568a64c8456) +--- + 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 ee6dbc0..c240489 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 |