diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-05-18 10:44:32 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-05-19 08:36:24 +0200 |
| commit | abeccc64381f65877335b97e121c53fcce7beff8 (patch) | |
| tree | da1ae27837d5e4527e76d83f0544f2b83d7e0c85 /patches | |
| parent | 7382619678b171ae4eba44842fb619ebcdee3aff (diff) | |
| download | ptxdist-abeccc64381f65877335b97e121c53fcce7beff8.tar.gz ptxdist-abeccc64381f65877335b97e121c53fcce7beff8.tar.xz | |
networkmanager: version bump 1.2.0 -> 1.2.2
Update & cleanup options and dependencies while at it.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/NetworkManager-1.2.2/0001-sleep-monitor-upower-add-missing-include.patch | 26 | ||||
| -rw-r--r-- | patches/NetworkManager-1.2.2/series | 4 |
2 files changed, 30 insertions, 0 deletions
diff --git a/patches/NetworkManager-1.2.2/0001-sleep-monitor-upower-add-missing-include.patch b/patches/NetworkManager-1.2.2/0001-sleep-monitor-upower-add-missing-include.patch new file mode 100644 index 000000000..425974c51 --- /dev/null +++ b/patches/NetworkManager-1.2.2/0001-sleep-monitor-upower-add-missing-include.patch @@ -0,0 +1,26 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Wed, 18 May 2016 10:16:15 +0200 +Subject: [PATCH] sleep-monitor-upower: add missing include + +Otherwise building fails with: + +nm-sleep-monitor-upower.c:132:45: error: expected declaration specifiers or '...' before 'nm_sleep_monitor_get' +nm-sleep-monitor-upower.c:132:67: error: expected declaration specifiers or '...' before '(' token + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + src/nm-sleep-monitor-upower.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c +index 5f0ff24552b2..8d0719039ccf 100644 +--- a/src/nm-sleep-monitor-upower.c ++++ b/src/nm-sleep-monitor-upower.c +@@ -24,6 +24,7 @@ + #include <sys/stat.h> + + #include "nm-core-internal.h" ++#include "NetworkManagerUtils.h" + + #include "nm-sleep-monitor.h" + diff --git a/patches/NetworkManager-1.2.2/series b/patches/NetworkManager-1.2.2/series new file mode 100644 index 000000000..d288508b4 --- /dev/null +++ b/patches/NetworkManager-1.2.2/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-sleep-monitor-upower-add-missing-include.patch +# ed83c6f2cf812e4453d3644fb7eafaaf - git-ptx-patches magic |