diff options
Diffstat (limited to 'source/n')
| -rwxr-xr-x | source/n/NetworkManager/NetworkManager.SlackBuild | 9 | ||||
| -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, 6 insertions, 28 deletions
diff --git a/source/n/NetworkManager/NetworkManager.SlackBuild b/source/n/NetworkManager/NetworkManager.SlackBuild index fdfe6ef31..d547ec176 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:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -107,6 +107,9 @@ automake # json-c library. If there's any interest or usefulness with that, let me # know. The library is fairly small, but in order to actually use team # interfaces will probably require more stuff (not sure how much). +# +# Update September 2018: Added those options since we needed Jansson +# already for HTTP/2 support. CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -128,8 +131,8 @@ CXXFLAGS="$SLKCFLAGS" \ --with-nmtui=yes \ --with-libnm-glib \ --disable-vala \ - --disable-json-validation \ - --disable-ovs \ + --enable-json-validation \ + --enable-ovs \ --with-session-tracking=consolekit \ --with-suspend-resume=consolekit \ --with-hostname-persist=slackware \ 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 deleted file mode 100644 index 2783890f0..000000000 --- a/source/n/NetworkManager/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 |