diff options
| author | Michael Biebl <biebl@debian.org> | 2018-01-21 03:08:04 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-01-21 03:08:04 +0100 |
| commit | e1deb8e738364e393f077880e059411968c2f5e2 (patch) | |
| tree | ba4369c624b023a9aa6d1a19632f069ea30e881c | |
| parent | 0d0e867343fc576e737b5f68dedfa065de4c5a02 (diff) | |
libnm-core/tc-config: remove deprecation guards from typedefs
Closes: #887815
| -rw-r--r-- | debian/patches/libnm-core-tc-config-remove-deprecation-guards-from-typed.patch | 41 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 42 insertions, 0 deletions
diff --git a/debian/patches/libnm-core-tc-config-remove-deprecation-guards-from-typed.patch b/debian/patches/libnm-core-tc-config-remove-deprecation-guards-from-typed.patch new file mode 100644 index 00000000..16d5cc62 --- /dev/null +++ b/debian/patches/libnm-core-tc-config-remove-deprecation-guards-from-typed.patch @@ -0,0 +1,41 @@ +From: Lubomir Rintel <lkundrak@v3.sk> +Date: Mon, 18 Dec 2017 08:27:25 +0100 +Subject: libnm-core/tc-config: remove deprecation guards from typedefs + +They're triggered by the prototypes in header file inclusion, even +though no routines or variables that use the type are actually used. + +(cherry picked from commit 685cb5c88bf90b285a18a98a6bbeafa559938fee) +(cherry picked from commit 8d120a6fda1761430241367781c57d302ffc5fe3) +--- + libnm-core/nm-setting-tc-config.h | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/libnm-core/nm-setting-tc-config.h b/libnm-core/nm-setting-tc-config.h +index 736d5ad..8117d5e 100644 +--- a/libnm-core/nm-setting-tc-config.h ++++ b/libnm-core/nm-setting-tc-config.h +@@ -28,7 +28,6 @@ + + G_BEGIN_DECLS + +-NM_AVAILABLE_IN_1_10_2 + typedef struct NMTCQdisc NMTCQdisc; + + NM_AVAILABLE_IN_1_10_2 +@@ -61,7 +60,6 @@ void nm_tc_qdisc_set_handle (NMTCQdisc *qdisc, + NM_AVAILABLE_IN_1_10_2 + guint32 nm_tc_qdisc_get_parent (NMTCQdisc *qdisc); + +-NM_AVAILABLE_IN_1_10_2 + typedef struct NMTCAction NMTCAction; + + NM_AVAILABLE_IN_1_10_2 +@@ -96,7 +94,6 @@ void nm_tc_action_set_attribute (NMTCAction *action, + const char *name, + GVariant *value); + +-NM_AVAILABLE_IN_1_10_2 + typedef struct NMTCTfilter NMTCTfilter; + + NM_AVAILABLE_IN_1_10_2 diff --git a/debian/patches/series b/debian/patches/series index e44814db..fba0cbd9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ Fix-arping-path.patch Don-t-make-NetworkManager-D-Bus-activatable.patch Fix-iscsiadm-path.patch libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch +libnm-core-tc-config-remove-deprecation-guards-from-typed.patch |