net-misc/networkmanager-fortisslvpn-1.2.6: fix dependency on nm-utils.

This applies upstream patch 4195187fbe5be348222c9a8472f7c9cf0e51d346 to
prevent the error 'undefined symbol: _nm_utils_ascii_str_to_int64' from
happening.

Closes: https://bugs.gentoo.org/631008
Closes: https://github.com/gentoo/gentoo/pull/6144
Package-Manager: Portage-2.3.8, Repoman-2.3.4

diff --git a/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff b/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff
new file mode 100644 (file)
index 0000000..f882679
--- /dev/null
+++ b/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff
@@ -0,0 +1,21 @@
+diff --git a/Makefile.am b/Makefile.am
+index 6bef38ed5..951b829e3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -95,6 +95,7 @@ pppd_plugindir = $(PPPD_PLUGIN_DIR)
+ pppd_plugin_LTLIBRARIES = src/nm-fortisslvpn-pppd-plugin.la
+ 
+ src_nm_fortisslvpn_pppd_plugin_la_SOURCES = \
++      shared/nm-utils/nm-shared-utils.c \
+       src/nm-fortisslvpn-pppd-plugin.c \
+       src/nm-ppp-status.h
+ src_nm_fortisslvpn_pppd_plugin_la_CPPFLAGS = $(src_cppflags)
+@@ -102,7 +103,7 @@ src_nm_fortisslvpn_pppd_plugin_la_LDFLAGS = \
+       -module -avoid-version
+ src_nm_fortisslvpn_pppd_plugin_la_LIBADD = \
+       src/libnm-fortisslvpn-pppd-service-dbus.la \
+-      $(GLIB_LIBS)
++      $(GLIB_LIBS) \
+       $(LIBNM_LIBS)
+ 
+ ###############################################################################

diff --git a/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild b/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild
index 98442620baa3c838bbc8cfa163f3675d217e4e7e..94074c6b078a4206bc5c2e5fd12c2084088a2445 100644 (file)
--- a/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild
+++ b/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild
@@ -36,6 +36,8 @@ DEPEND="${RDEPEND}
 PATCHES=(
        # Upstream patch e5d476076e068f58ef4fa938f09945159fce36a6
        "${FILESDIR}"/${P}-location-fix.diff
+       # Upstream patch 4195187fbe5be348222c9a8472f7c9cf0e51d346
+       "${FILESDIR}"/${P}-nm-utils-dependency-fix.diff
 )
 
 src_configure() {