diff options
3 files changed, 0 insertions, 78 deletions
diff --git a/debian/patches/git-newglib-test.patch b/debian/patches/git-newglib-test.patch deleted file mode 100644 index eec6aafb..00000000 --- a/debian/patches/git-newglib-test.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 3e8eef538987c909e87b871a6b8c74aee08661a3 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel <lkundrak@v3.sk> -Date: Sat, 11 Aug 2018 11:08:42 +0200 -Subject: [PATCH] utils/test: don't assert on debug level messages - -They come and go in GLib core for all sorts of purposes. Don't let that -break our tests. ---- - shared/nm-utils/nm-test-utils.h | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/shared/nm-utils/nm-test-utils.h b/shared/nm-utils/nm-test-utils.h -index 246357f8a..b575382e4 100644 ---- a/shared/nm-utils/nm-test-utils.h -+++ b/shared/nm-utils/nm-test-utils.h -@@ -574,7 +574,7 @@ __nmtst_init (int *argc, char ***argv, g - } else { - /* We were called not to set logging levels. This means, that the user - * expects to assert against (all) messages. Any uncought message is fatal. */ -- g_log_set_always_fatal (G_LOG_LEVEL_MASK); -+ g_log_set_always_fatal (G_LOG_LEVEL_MASK & ~G_LOG_LEVEL_DEBUG); - } - - if ((!__nmtst_internal.assert_logging || (__nmtst_internal.assert_logging && __nmtst_internal.no_expect_message)) && diff --git a/debian/patches/utils-test-don-t-assert-on-debug-level-messages.patch b/debian/patches/utils-test-don-t-assert-on-debug-level-messages.patch deleted file mode 100644 index a9374f7b..00000000 --- a/debian/patches/utils-test-don-t-assert-on-debug-level-messages.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Lubomir Rintel <lkundrak@v3.sk> -Date: Sat, 11 Aug 2018 11:08:42 +0200 -Subject: utils/test: don't assert on debug level messages - -They come and go in GLib core for all sorts of purposes. Don't let that -break our tests. - -(cherry picked from commit 3e8eef538987c909e87b871a6b8c74aee08661a3) -Origin: upstream, 1.12.4, commit:5810c46b118447567e52199ca139c7a5e9be6ab4 ---- - shared/nm-utils/nm-test-utils.h | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -Index: network-manager-1.12.2/shared/nm-utils/nm-test-utils.h -=================================================================== ---- network-manager-1.12.2.orig/shared/nm-utils/nm-test-utils.h -+++ network-manager-1.12.2/shared/nm-utils/nm-test-utils.h -@@ -573,8 +573,9 @@ __nmtst_init (int *argc, char ***argv, g - #endif - } else { - /* We were called not to set logging levels. This means, that the user -- * expects to assert against (all) messages. Any uncought message is fatal. */ -- g_log_set_always_fatal (G_LOG_LEVEL_MASK & ~G_LOG_LEVEL_DEBUG); -+ * expects to assert against (all) messages. -+ * Any uncaught message on >debug level is fatal. */ -+ g_log_set_always_fatal (G_LOG_LEVEL_MASK & ~G_LOG_LEVEL_DEBUG); - } - - if ((!__nmtst_internal.assert_logging || (__nmtst_internal.assert_logging && __nmtst_internal.no_expect_message)) && 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 deleted file mode 100644 index 2783890f..00000000 --- a/debian/patches/version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 |