diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-08-07 23:24:17 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-08-08 09:00:27 +0200 |
| commit | 16c26916c02e8f062fc4cdf8fbb8f5be9b204093 (patch) | |
| tree | 02357ef1554a0f6862af5b549fdf25cdeb3ccb4d /source/n/NetworkManager | |
| parent | 2f3a6405501b3de32999677153f1bcb2f96b74ed (diff) | |
| download | current-16c26916c02e8f062fc4cdf8fbb8f5be9b204093.tar.gz | |
Tue Aug 7 23:24:17 UTC 201820180807232417
a/btrfs-progs-v4.17.1-x86_64-1.txz: Upgraded.
a/sysvinit-scripts-2.1-noarch-16.txz: Rebuilt.
rc.M: call update-gdk-pixbuf-loaders with HOME=/root to prevent creating
a .cache directory in /. Thanks to Konrad Rzepecki.
n/NetworkManager-1.12.2-x86_64-2.txz: Rebuilt.
Fix libnm compile errors due to NM_AVAILABLE_IN_1_12_2 macro.
x/xorg-server-1.20.1-x86_64-1.txz: Upgraded.
x/xorg-server-xephyr-1.20.1-x86_64-1.txz: Upgraded.
x/xorg-server-xnest-1.20.1-x86_64-1.txz: Upgraded.
x/xorg-server-xvfb-1.20.1-x86_64-1.txz: Upgraded.
xap/network-manager-applet-1.8.16-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/n/NetworkManager')
| -rwxr-xr-x | source/n/NetworkManager/NetworkManager.SlackBuild | 2 | ||||
| -rw-r--r-- | source/n/NetworkManager/patches/version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch | 25 |
2 files changed, 26 insertions, 1 deletions
diff --git a/source/n/NetworkManager/NetworkManager.SlackBuild b/source/n/NetworkManager/NetworkManager.SlackBuild index 9f370bc8..fdfe6ef3 100755 --- a/source/n/NetworkManager/NetworkManager.SlackBuild +++ b/source/n/NetworkManager/NetworkManager.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=NetworkManager VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) diff --git a/source/n/NetworkManager/patches/version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch b/source/n/NetworkManager/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/source/n/NetworkManager/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 |