Re: [PR PATCH] [Updated] libnma: replace libnm-gtk; revbump packages previously depending on libnm-gtk

[cinerea0 <cinerea0@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 578 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages nma
https://github.com/void-linux/void-packages/pull/26791

libnma: replace libnm-gtk; revbump packages previously depending on libnm-gtk
This PR adds a "replaces" line to the `libnma` template and gets rid of the last line referencing `libnm-gtk` in `common/shlibs`. Additionally, it adds a runtime dependency on `libnma` to `network-manager-applet`.

A patch file from https://github.com/void-linux/void-packages/pull/26791.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nma-26791.patch --]
[-- Type: text/x-diff, Size: 4538 bytes --]

From 0666ff06496782da3ac28bb3a47354028f372ed7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Sun, 29 Nov 2020 00:25:30 -0500
Subject: [PATCH 1/4] libnma: replace libnm-gtk

---
 common/shlibs           | 1 -
 srcpkgs/libnma/template | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c2ee4943039..0b40f41e21b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2982,7 +2982,6 @@ libczmq.so.4 czmq-4.0.1_1
 liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
 libseat.so.1 libseat-0.3.0_1
-libnma.so.0 libnm-gtk-1.4.0_1
 libnma.so.0 libnma-1.8.30_1
 libgspell-1.so.2 gspell-1.8.0_1
 libotf.so.1 libotf-0.9.16_1
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
index c6c0aba1901..18b016b2b93 100644
--- a/srcpkgs/libnma/template
+++ b/srcpkgs/libnma/template
@@ -1,7 +1,7 @@
 # Template file for 'libnma'
 pkgname=libnma
 version=1.8.30
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
@@ -14,6 +14,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libnma"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=da33e72a49e07d855d97a52aa9a8962a4c96f52b9168c4e0027117ad8ffdafb4
+replaces="libnm-gtk>=0"
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+="-Dgtk_doc=false"

From 2048f96e51e3cff107ee01de7eefa2b1023feb84 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 12:35:50 -0500
Subject: [PATCH 2/4] network-manager-applet: revbump for libnma

---
 srcpkgs/network-manager-applet/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 2d9861a94ba..303ded92456 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,7 +1,7 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
 version=1.18.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"

From 831bcb00a58c754195db12964cfa7f68296256c2 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 14:19:38 -0500
Subject: [PATCH 3/4] NetworkManager-l2tp: update to 1.8.6

---
 srcpkgs/NetworkManager-l2tp/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1dea408c423..1769dc9d267 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,7 +1,7 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
-version=1.8.2
-revision=2
+version=1.8.6
+revision=1
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
@@ -13,7 +13,7 @@ maintainer="Douglas Kosovic <doug@uq.edu.au>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/nm-l2tp/NetworkManager-l2tp"
 distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=1d80986dc88951e298446833d314bab7af0a933e736960d6b3b025e6b7faca94
+checksum=e345263c440ef8f48bcd95661d7772ffdbdd65e37d0a3eca813a542a3357ac23
 
 # Automatically determine the pppd plugin dir location, but will need to
 # revbump this package whenever version of ppp package is updated.
@@ -22,7 +22,3 @@ do_configure() {
 
 	./configure ${configure_args} --with-pppd-plugin-dir=/usr/lib/pppd/${PPP_VERSION}
 }
-
-post_install() {
-	mv $DESTDIR/etc/dbus-1 $DESTDIR/usr/share
-}

From 68a932e44f70f315a6931fe9d56edc7e1d6189e1 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 14:33:19 -0500
Subject: [PATCH 4/4] NetworkManager-openvpn: revbump for libnma

---
 srcpkgs/NetworkManager-openvpn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index 7f2c40e6de3..82429aed916 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,7 +1,7 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
 version=1.8.12
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"