* Re: [PR REVIEW] libnma: replace libnm-gtk; network-manager-applet: add dependency on libnma
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26791@inbox.vuxu.org>
@ 2020-11-30 11:30 ` not-chicken
2020-11-30 12:15 ` ericonr
` (25 subsequent siblings)
26 siblings, 0 replies; 27+ messages in thread
From: not-chicken @ 2020-11-30 11:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 435 bytes --]
New review comment by not-chicken on void-packages repository
https://github.com/void-linux/void-packages/pull/26791#discussion_r532529230
Comment:
This will be detected automatically.
`SONAME: libnma.so.0 <-> libnma>=1.8.30_1`
The dangling entry of `libnm-gtk` in `common/shlibs` was causing xbps to incorrectly detect `libnm-gtk` as runtime dependency, with that gone explicitly listing it in depends should not be necessary.
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: libnma: replace libnm-gtk; network-manager-applet: add dependency on libnma
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26791@inbox.vuxu.org>
2020-11-30 11:30 ` [PR REVIEW] libnma: replace libnm-gtk; network-manager-applet: add dependency on libnma not-chicken
@ 2020-11-30 12:15 ` ericonr
2020-11-30 16:09 ` [PR REVIEW] " cinerea0
` (24 subsequent siblings)
26 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2020-11-30 12:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 577 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26791#issuecomment-735750478
Comment:
Don't all these need to be revbumped?
```
~ ➜ xbps-query -RX libnm-gtk
NetworkManager-l2tp-1.8.2_2
NetworkManager-openvpn-1.8.12_1
NetworkManager-pptp-1.2.8_4
NetworkManager-strongswan-1.5.2_1
NetworkManager-vpnc-1.2.6_4
cinnamon-control-center-4.6.2_2
gnome-control-center-3.38.1_1
gnome-initial-setup-3.38.1_1
network-manager-applet-1.18.0_1
network-manager-applet-devel-1.8.24_1
switchboard-plug-network-2.3.2_1
```
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR REVIEW] libnma: replace libnm-gtk; network-manager-applet: add dependency on libnma
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26791@inbox.vuxu.org>
2020-11-30 11:30 ` [PR REVIEW] libnma: replace libnm-gtk; network-manager-applet: add dependency on libnma not-chicken
2020-11-30 12:15 ` ericonr
@ 2020-11-30 16:09 ` cinerea0
2020-11-30 16:18 ` cinerea0
` (23 subsequent siblings)
26 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2020-11-30 16:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 219 bytes --]
New review comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/26791#discussion_r532712958
Comment:
Gotcha. So `network-manager-applet` doesn't need to be revbumped, then?
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: libnma: replace libnm-gtk; network-manager-applet: add dependency on libnma
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26791@inbox.vuxu.org>
` (2 preceding siblings ...)
2020-11-30 16:09 ` [PR REVIEW] " cinerea0
@ 2020-11-30 16:18 ` cinerea0
2020-11-30 16:41 ` ericonr
` (22 subsequent siblings)
26 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2020-11-30 16:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 357 bytes --]
New comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/26791#issuecomment-735887214
Comment:
@ericonr None of those templates explicitly include a reference to `libnm-gtk` anymore, they were the ones I updated in my PR that packaged `libnma`. Do packages need to be revbumped when `common/shlibs` is altered?
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: libnma: replace libnm-gtk; network-manager-applet: add dependency on libnma
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26791@inbox.vuxu.org>
` (3 preceding siblings ...)
2020-11-30 16:18 ` cinerea0
@ 2020-11-30 16:41 ` ericonr
2020-11-30 16:42 ` ericonr
` (21 subsequent siblings)
26 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2020-11-30 16:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 247 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26791#issuecomment-735901502
Comment:
Yes. At the moment, they think that `libnm-gtk` fullfils their dependency, so they won't pull in `libnma`.
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: libnma: replace libnm-gtk; network-manager-applet: add dependency on libnma
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26791@inbox.vuxu.org>
` (4 preceding siblings ...)
2020-11-30 16:41 ` ericonr
@ 2020-11-30 16:42 ` ericonr
2020-11-30 17:36 ` [PR PATCH] [Updated] " cinerea0
` (20 subsequent siblings)
26 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2020-11-30 16:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 352 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26791#issuecomment-735901502
Comment:
Yes. At the moment, they think that `libnm-gtk` fullfils their dependency, so they won't pull in `libnma`.
(If you run `xbps-query -RX libnma`, you'll see that no packages depend on it besides `libnma-devel`)
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] libnma: replace libnm-gtk; network-manager-applet: add dependency on libnma
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26791@inbox.vuxu.org>
` (5 preceding siblings ...)
2020-11-30 16:42 ` ericonr
@ 2020-11-30 17:36 ` cinerea0
2020-11-30 17:37 ` [PR REVIEW] " cinerea0
` (19 subsequent siblings)
26 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2020-11-30 17:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 576 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; network-manager-applet: add dependency on libnma
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: 2214 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/2] 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/2] 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"
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR REVIEW] libnma: replace libnm-gtk; network-manager-applet: add dependency on libnma
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26791@inbox.vuxu.org>
` (6 preceding siblings ...)
2020-11-30 17:36 ` [PR PATCH] [Updated] " cinerea0
@ 2020-11-30 17:37 ` cinerea0
2020-11-30 17:40 ` cinerea0
` (18 subsequent siblings)
26 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2020-11-30 17:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 221 bytes --]
New review comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/26791#discussion_r532777158
Comment:
Nevermind, ericonr just explained to me why it does need to be revbumped.
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: libnma: replace libnm-gtk; network-manager-applet: add dependency on libnma
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26791@inbox.vuxu.org>
` (7 preceding siblings ...)
2020-11-30 17:37 ` [PR REVIEW] " cinerea0
@ 2020-11-30 17:40 ` cinerea0
2020-11-30 18:04 ` ericonr
` (17 subsequent siblings)
26 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2020-11-30 17:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 366 bytes --]
New comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/26791#issuecomment-735935564
Comment:
@ericonr Understood, I'll get to work on revbumping all of those right away. One thing is weird about that list: `network-manager-applet-devel` no longer exists, or at least it shouldn't since I removed it in my `libnma` PR.
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: libnma: replace libnm-gtk; network-manager-applet: add dependency on libnma
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26791@inbox.vuxu.org>
` (8 preceding siblings ...)
2020-11-30 17:40 ` cinerea0
@ 2020-11-30 18:04 ` ericonr
2020-11-30 18:04 ` ericonr
` (16 subsequent siblings)
26 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2020-11-30 18:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 360 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26791#issuecomment-735948335
Comment:
> One thing is weird about that list: network-manager-applet-devel no longer exists, or at least it shouldn't since I removed it in my libnma PR.
Feel free to add it (along with `libnm-gtk` and any others) to #23575
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: libnma: replace libnm-gtk; network-manager-applet: add dependency on libnma
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26791@inbox.vuxu.org>
` (9 preceding siblings ...)
2020-11-30 18:04 ` ericonr
@ 2020-11-30 18:04 ` ericonr
2020-11-30 19:20 ` [PR PATCH] [Updated] libnma: replace libnm-gtk; revbump packages previously depending on libnm-gtk cinerea0
` (15 subsequent siblings)
26 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2020-11-30 18:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 354 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26791#issuecomment-735948335
Comment:
> One thing is weird about that list: network-manager-applet-devel no longer exists, or at least it shouldn't since I removed it in my libnma PR.
Please add it (along with `libnm-gtk` and any others) to #23575
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] libnma: replace libnm-gtk; revbump packages previously depending on libnm-gtk
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26791@inbox.vuxu.org>
` (10 preceding siblings ...)
2020-11-30 18:04 ` ericonr
@ 2020-11-30 19:20 ` cinerea0
2020-11-30 19:33 ` cinerea0
` (14 subsequent siblings)
26 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2020-11-30 19:20 UTC (permalink / raw)
To: ml
[-- 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: 3720 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/3] 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/3] 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/3] 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
-}
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] libnma: replace libnm-gtk; revbump packages previously depending on libnm-gtk
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26791@inbox.vuxu.org>
` (11 preceding siblings ...)
2020-11-30 19:20 ` [PR PATCH] [Updated] libnma: replace libnm-gtk; revbump packages previously depending on libnm-gtk cinerea0
@ 2020-11-30 19:33 ` cinerea0
2020-11-30 20:17 ` cinerea0
` (13 subsequent siblings)
26 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2020-11-30 19:33 UTC (permalink / raw)
To: ml
[-- 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"
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] libnma: replace libnm-gtk; revbump packages previously depending on libnm-gtk
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26791@inbox.vuxu.org>
` (12 preceding siblings ...)
2020-11-30 19:33 ` cinerea0
@ 2020-11-30 20:17 ` cinerea0
2020-11-30 20:33 ` cinerea0
` (12 subsequent siblings)
26 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2020-11-30 20:17 UTC (permalink / raw)
To: ml
[-- 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: 5304 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/5] 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/5] 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/5] 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/5] 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"
From 37f39171c8c41a0b26fdd1e97382e38c9c9601d7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 15:17:38 -0500
Subject: [PATCH 5/5] NetworkManager-pptp: revbump for libnma
---
srcpkgs/NetworkManager-pptp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 9c541cf246f..09568b2cec0 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,7 +1,7 @@
# Template file for 'NetworkManager-pptp'
pkgname=NetworkManager-pptp
version=1.2.8
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--without-libnm-glib"
hostmakedepends="pkg-config intltool glib-devel"
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] libnma: replace libnm-gtk; revbump packages previously depending on libnm-gtk
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26791@inbox.vuxu.org>
` (13 preceding siblings ...)
2020-11-30 20:17 ` cinerea0
@ 2020-11-30 20:33 ` cinerea0
2020-11-30 20:49 ` cinerea0
` (11 subsequent siblings)
26 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2020-11-30 20:33 UTC (permalink / raw)
To: ml
[-- 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: 6135 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/6] 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/6] 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/6] 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/6] 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"
From 37f39171c8c41a0b26fdd1e97382e38c9c9601d7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 15:17:38 -0500
Subject: [PATCH 5/6] NetworkManager-pptp: revbump for libnma
---
srcpkgs/NetworkManager-pptp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 9c541cf246f..09568b2cec0 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,7 +1,7 @@
# Template file for 'NetworkManager-pptp'
pkgname=NetworkManager-pptp
version=1.2.8
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--without-libnm-glib"
hostmakedepends="pkg-config intltool glib-devel"
From 5b3f912d9680700e31a127d34125c930924a9af3 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 15:20:38 -0500
Subject: [PATCH 6/6] NetworkManager-strongswan: revbump for libnma
---
srcpkgs/NetworkManager-strongswan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 46c02d092e5..5cf6472410f 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,7 +1,7 @@
# Template file for 'NetworkManager-strongswan'
pkgname=NetworkManager-strongswan
version=1.5.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --disable-more-warnings --without-libnm-glib
--disable-more-warnings"
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] libnma: replace libnm-gtk; revbump packages previously depending on libnm-gtk
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26791@inbox.vuxu.org>
` (14 preceding siblings ...)
2020-11-30 20:33 ` cinerea0
@ 2020-11-30 20:49 ` cinerea0
2020-11-30 21:24 ` cinerea0
` (10 subsequent siblings)
26 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2020-11-30 20:49 UTC (permalink / raw)
To: ml
[-- 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: 6928 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/7] 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/7] 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/7] 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/7] 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"
From 37f39171c8c41a0b26fdd1e97382e38c9c9601d7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 15:17:38 -0500
Subject: [PATCH 5/7] NetworkManager-pptp: revbump for libnma
---
srcpkgs/NetworkManager-pptp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 9c541cf246f..09568b2cec0 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,7 +1,7 @@
# Template file for 'NetworkManager-pptp'
pkgname=NetworkManager-pptp
version=1.2.8
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--without-libnm-glib"
hostmakedepends="pkg-config intltool glib-devel"
From 5b3f912d9680700e31a127d34125c930924a9af3 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 15:20:38 -0500
Subject: [PATCH 6/7] NetworkManager-strongswan: revbump for libnma
---
srcpkgs/NetworkManager-strongswan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 46c02d092e5..5cf6472410f 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,7 +1,7 @@
# Template file for 'NetworkManager-strongswan'
pkgname=NetworkManager-strongswan
version=1.5.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --disable-more-warnings --without-libnm-glib
--disable-more-warnings"
From 0c7aa555745d651d29459e6b61ae287bc386796f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 15:34:00 -0500
Subject: [PATCH 7/7] NetworkManager-vpnc: revbump for libnma
---
srcpkgs/NetworkManager-vpnc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/NetworkManager-vpnc/template b/srcpkgs/NetworkManager-vpnc/template
index b9d17226132..2ce5c6efd60 100644
--- a/srcpkgs/NetworkManager-vpnc/template
+++ b/srcpkgs/NetworkManager-vpnc/template
@@ -1,7 +1,7 @@
# Template file for 'NetworkManager-vpnc'
pkgname=NetworkManager-vpnc
version=1.2.6
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--localstatedir=/var --disable-static --without-libnm-glib"
hostmakedepends="pkg-config intltool"
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: libnma: replace libnm-gtk; revbump packages previously depending on libnm-gtk
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26791@inbox.vuxu.org>
` (15 preceding siblings ...)
2020-11-30 20:49 ` cinerea0
@ 2020-11-30 21:24 ` cinerea0
2020-11-30 21:25 ` CameronNemo
` (9 subsequent siblings)
26 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2020-11-30 21:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 512 bytes --]
New comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/26791#issuecomment-736065387
Comment:
I've run into a problem with `cinnamon-control-center`. In between my last PR and now they've pushed a new version, and with that they changed the build style to meson. As a result, the following line in the template no longer works and I have no idea how to interpret it: `make -C shell DESTDIR="$DESTDIR" uninstall-binPROGRAMS uninstall-directoryDATA uninstall-uiDATA`
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: libnma: replace libnm-gtk; revbump packages previously depending on libnm-gtk
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26791@inbox.vuxu.org>
` (16 preceding siblings ...)
2020-11-30 21:24 ` cinerea0
@ 2020-11-30 21:25 ` CameronNemo
2020-11-30 21:55 ` cinerea0
` (8 subsequent siblings)
26 siblings, 0 replies; 27+ messages in thread
From: CameronNemo @ 2020-11-30 21:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 186 bytes --]
New comment by CameronNemo on void-packages repository
https://github.com/void-linux/void-packages/pull/26791#issuecomment-736066190
Comment:
You should not need to update the version
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: libnma: replace libnm-gtk; revbump packages previously depending on libnm-gtk
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26791@inbox.vuxu.org>
` (17 preceding siblings ...)
2020-11-30 21:25 ` CameronNemo
@ 2020-11-30 21:55 ` cinerea0
2020-11-30 21:55 ` [PR PATCH] [Updated] " cinerea0
` (7 subsequent siblings)
26 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2020-11-30 21:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 330 bytes --]
New comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/26791#issuecomment-736079669
Comment:
Understood, I'll push a revbump momentarily. I was under the impression that it was a general rule to update package versions if possible when updating a template, but I guess I was wrong.
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] libnma: replace libnm-gtk; revbump packages previously depending on libnm-gtk
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26791@inbox.vuxu.org>
` (18 preceding siblings ...)
2020-11-30 21:55 ` cinerea0
@ 2020-11-30 21:55 ` cinerea0
2020-11-30 22:03 ` ericonr
` (6 subsequent siblings)
26 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2020-11-30 21:55 UTC (permalink / raw)
To: ml
[-- 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: 8209 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/8] 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/8] 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/8] 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/8] 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"
From 37f39171c8c41a0b26fdd1e97382e38c9c9601d7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 15:17:38 -0500
Subject: [PATCH 5/8] NetworkManager-pptp: revbump for libnma
---
srcpkgs/NetworkManager-pptp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 9c541cf246f..09568b2cec0 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,7 +1,7 @@
# Template file for 'NetworkManager-pptp'
pkgname=NetworkManager-pptp
version=1.2.8
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--without-libnm-glib"
hostmakedepends="pkg-config intltool glib-devel"
From 5b3f912d9680700e31a127d34125c930924a9af3 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 15:20:38 -0500
Subject: [PATCH 6/8] NetworkManager-strongswan: revbump for libnma
---
srcpkgs/NetworkManager-strongswan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 46c02d092e5..5cf6472410f 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,7 +1,7 @@
# Template file for 'NetworkManager-strongswan'
pkgname=NetworkManager-strongswan
version=1.5.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --disable-more-warnings --without-libnm-glib
--disable-more-warnings"
From 0c7aa555745d651d29459e6b61ae287bc386796f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 15:34:00 -0500
Subject: [PATCH 7/8] NetworkManager-vpnc: revbump for libnma
---
srcpkgs/NetworkManager-vpnc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/NetworkManager-vpnc/template b/srcpkgs/NetworkManager-vpnc/template
index b9d17226132..2ce5c6efd60 100644
--- a/srcpkgs/NetworkManager-vpnc/template
+++ b/srcpkgs/NetworkManager-vpnc/template
@@ -1,7 +1,7 @@
# Template file for 'NetworkManager-vpnc'
pkgname=NetworkManager-vpnc
version=1.2.6
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--localstatedir=/var --disable-static --without-libnm-glib"
hostmakedepends="pkg-config intltool"
From d9b57d2c8d007a366d0cf59d10007b73643761d7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 16:53:49 -0500
Subject: [PATCH 8/8] cinnamon-control-center: revbump for libnma
---
srcpkgs/cinnamon-control-center/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index b9ebe5f22d1..9da17ca74f3 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
version=4.6.2
-revision=2
+revision=3
build_style=gnu-configure
build_helper=gir
configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -28,6 +28,7 @@ do_check() {
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
}
+
post_install() {
# Remove unused stuff
make -C shell DESTDIR="$DESTDIR" uninstall-binPROGRAMS uninstall-directoryDATA uninstall-uiDATA
@@ -41,6 +42,7 @@ libcinnamon-control-center_package() {
vmove "usr/lib/*.so.*"
}
}
+
cinnamon-control-center-devel_package() {
short_desc+=" - development files"
depends="libglib-devel gtk+3-devel lib${sourcepkg}>=${version}_${revision}"
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: libnma: replace libnm-gtk; revbump packages previously depending on libnm-gtk
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26791@inbox.vuxu.org>
` (19 preceding siblings ...)
2020-11-30 21:55 ` [PR PATCH] [Updated] " cinerea0
@ 2020-11-30 22:03 ` ericonr
2020-11-30 22:27 ` [PR PATCH] [Updated] " cinerea0
` (5 subsequent siblings)
26 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2020-11-30 22:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26791#issuecomment-736083651
Comment:
> I was under the impression that it was a general rule to update package versions if possible when updating a template, but I guess I was wrong.
It can be, but if doing the update is going to be complicated / messy, it's simpler to just revbump it :)
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] libnma: replace libnm-gtk; revbump packages previously depending on libnm-gtk
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26791@inbox.vuxu.org>
` (20 preceding siblings ...)
2020-11-30 22:03 ` ericonr
@ 2020-11-30 22:27 ` cinerea0
2020-11-30 23:24 ` cinerea0
` (4 subsequent siblings)
26 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2020-11-30 22:27 UTC (permalink / raw)
To: ml
[-- 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: 9380 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/9] 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 c2ee49430390..0b40f41e21b3 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 c6c0aba1901f..18b016b2b93b 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/9] 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 2d9861a94ba2..303ded924567 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/9] 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 1dea408c4235..1769dc9d2673 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/9] 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 7f2c40e6de34..82429aed9169 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"
From 37f39171c8c41a0b26fdd1e97382e38c9c9601d7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 15:17:38 -0500
Subject: [PATCH 5/9] NetworkManager-pptp: revbump for libnma
---
srcpkgs/NetworkManager-pptp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 9c541cf246f6..09568b2cec06 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,7 +1,7 @@
# Template file for 'NetworkManager-pptp'
pkgname=NetworkManager-pptp
version=1.2.8
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--without-libnm-glib"
hostmakedepends="pkg-config intltool glib-devel"
From 5b3f912d9680700e31a127d34125c930924a9af3 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 15:20:38 -0500
Subject: [PATCH 6/9] NetworkManager-strongswan: revbump for libnma
---
srcpkgs/NetworkManager-strongswan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 46c02d092e5e..5cf6472410f6 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,7 +1,7 @@
# Template file for 'NetworkManager-strongswan'
pkgname=NetworkManager-strongswan
version=1.5.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --disable-more-warnings --without-libnm-glib
--disable-more-warnings"
From 0c7aa555745d651d29459e6b61ae287bc386796f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 15:34:00 -0500
Subject: [PATCH 7/9] NetworkManager-vpnc: revbump for libnma
---
srcpkgs/NetworkManager-vpnc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/NetworkManager-vpnc/template b/srcpkgs/NetworkManager-vpnc/template
index b9d172261329..2ce5c6efd600 100644
--- a/srcpkgs/NetworkManager-vpnc/template
+++ b/srcpkgs/NetworkManager-vpnc/template
@@ -1,7 +1,7 @@
# Template file for 'NetworkManager-vpnc'
pkgname=NetworkManager-vpnc
version=1.2.6
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--localstatedir=/var --disable-static --without-libnm-glib"
hostmakedepends="pkg-config intltool"
From d9b57d2c8d007a366d0cf59d10007b73643761d7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 16:53:49 -0500
Subject: [PATCH 8/9] cinnamon-control-center: revbump for libnma
---
srcpkgs/cinnamon-control-center/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index b9ebe5f22d14..9da17ca74f32 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
version=4.6.2
-revision=2
+revision=3
build_style=gnu-configure
build_helper=gir
configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -28,6 +28,7 @@ do_check() {
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
}
+
post_install() {
# Remove unused stuff
make -C shell DESTDIR="$DESTDIR" uninstall-binPROGRAMS uninstall-directoryDATA uninstall-uiDATA
@@ -41,6 +42,7 @@ libcinnamon-control-center_package() {
vmove "usr/lib/*.so.*"
}
}
+
cinnamon-control-center-devel_package() {
short_desc+=" - development files"
depends="libglib-devel gtk+3-devel lib${sourcepkg}>=${version}_${revision}"
From ae469a4da86d0d5f34ef3c54853005efedf7ef94 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 17:26:48 -0500
Subject: [PATCH 9/9] gnome-control-center: update to 3.38.2
---
srcpkgs/gnome-control-center/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index b4be62deaa30..8bb8a374e991 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=3.38.1
+version=3.38.2
revision=1
build_style=meson
build_helper="gir"
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8d90006c610f6fccb3cddbcf413b1bc4137fb4977b901a3989420fe160082026
+checksum=1500e0ec0dbbb3f0b9289d084d6987b9430fe444872adbea5ca7fe0cd5f8476c
build_options="cheese"
build_options_default="cheese"
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] libnma: replace libnm-gtk; revbump packages previously depending on libnm-gtk
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26791@inbox.vuxu.org>
` (21 preceding siblings ...)
2020-11-30 22:27 ` [PR PATCH] [Updated] " cinerea0
@ 2020-11-30 23:24 ` cinerea0
2020-12-01 0:06 ` cinerea0
` (3 subsequent siblings)
26 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2020-11-30 23:24 UTC (permalink / raw)
To: ml
[-- 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: 10513 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 01/10] 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 02/10] 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 03/10] 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 04/10] 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"
From 37f39171c8c41a0b26fdd1e97382e38c9c9601d7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 15:17:38 -0500
Subject: [PATCH 05/10] NetworkManager-pptp: revbump for libnma
---
srcpkgs/NetworkManager-pptp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 9c541cf246f..09568b2cec0 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,7 +1,7 @@
# Template file for 'NetworkManager-pptp'
pkgname=NetworkManager-pptp
version=1.2.8
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--without-libnm-glib"
hostmakedepends="pkg-config intltool glib-devel"
From 5b3f912d9680700e31a127d34125c930924a9af3 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 15:20:38 -0500
Subject: [PATCH 06/10] NetworkManager-strongswan: revbump for libnma
---
srcpkgs/NetworkManager-strongswan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 46c02d092e5..5cf6472410f 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,7 +1,7 @@
# Template file for 'NetworkManager-strongswan'
pkgname=NetworkManager-strongswan
version=1.5.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --disable-more-warnings --without-libnm-glib
--disable-more-warnings"
From 0c7aa555745d651d29459e6b61ae287bc386796f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 15:34:00 -0500
Subject: [PATCH 07/10] NetworkManager-vpnc: revbump for libnma
---
srcpkgs/NetworkManager-vpnc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/NetworkManager-vpnc/template b/srcpkgs/NetworkManager-vpnc/template
index b9d17226132..2ce5c6efd60 100644
--- a/srcpkgs/NetworkManager-vpnc/template
+++ b/srcpkgs/NetworkManager-vpnc/template
@@ -1,7 +1,7 @@
# Template file for 'NetworkManager-vpnc'
pkgname=NetworkManager-vpnc
version=1.2.6
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--localstatedir=/var --disable-static --without-libnm-glib"
hostmakedepends="pkg-config intltool"
From d9b57d2c8d007a366d0cf59d10007b73643761d7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 16:53:49 -0500
Subject: [PATCH 08/10] cinnamon-control-center: revbump for libnma
---
srcpkgs/cinnamon-control-center/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index b9ebe5f22d1..9da17ca74f3 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
version=4.6.2
-revision=2
+revision=3
build_style=gnu-configure
build_helper=gir
configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -28,6 +28,7 @@ do_check() {
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
}
+
post_install() {
# Remove unused stuff
make -C shell DESTDIR="$DESTDIR" uninstall-binPROGRAMS uninstall-directoryDATA uninstall-uiDATA
@@ -41,6 +42,7 @@ libcinnamon-control-center_package() {
vmove "usr/lib/*.so.*"
}
}
+
cinnamon-control-center-devel_package() {
short_desc+=" - development files"
depends="libglib-devel gtk+3-devel lib${sourcepkg}>=${version}_${revision}"
From ae469a4da86d0d5f34ef3c54853005efedf7ef94 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 17:26:48 -0500
Subject: [PATCH 09/10] gnome-control-center: update to 3.38.2
---
srcpkgs/gnome-control-center/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index b4be62deaa3..8bb8a374e99 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=3.38.1
+version=3.38.2
revision=1
build_style=meson
build_helper="gir"
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8d90006c610f6fccb3cddbcf413b1bc4137fb4977b901a3989420fe160082026
+checksum=1500e0ec0dbbb3f0b9289d084d6987b9430fe444872adbea5ca7fe0cd5f8476c
build_options="cheese"
build_options_default="cheese"
From 86005daa438c2aae84d063e8547e0504e158aca4 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 18:24:18 -0500
Subject: [PATCH 10/10] gnome-initial-setup: update to 3.38.2
---
srcpkgs/gnome-initial-setup/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 12886a0f9ae..d24f6b4fa4d 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-initial-setup'
pkgname=gnome-initial-setup
-version=3.38.1
+version=3.38.2
revision=1
build_style=meson
configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -18,4 +18,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e55d4f4073998e0fb7b3dfcc470e2a4c7d950a96bedab15011b9084ebc813676
+checksum=aa5889274f8b0b6de6a0512b47742b82ac3400daec82dd4effe2eea27464a3b8
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] libnma: replace libnm-gtk; revbump packages previously depending on libnm-gtk
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26791@inbox.vuxu.org>
` (22 preceding siblings ...)
2020-11-30 23:24 ` cinerea0
@ 2020-12-01 0:06 ` cinerea0
2020-12-01 1:03 ` ericonr
` (2 subsequent siblings)
26 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2020-12-01 0:06 UTC (permalink / raw)
To: ml
[-- 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: 11733 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 01/11] 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 02/11] 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 03/11] 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 04/11] 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"
From 37f39171c8c41a0b26fdd1e97382e38c9c9601d7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 15:17:38 -0500
Subject: [PATCH 05/11] NetworkManager-pptp: revbump for libnma
---
srcpkgs/NetworkManager-pptp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 9c541cf246f..09568b2cec0 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,7 +1,7 @@
# Template file for 'NetworkManager-pptp'
pkgname=NetworkManager-pptp
version=1.2.8
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--without-libnm-glib"
hostmakedepends="pkg-config intltool glib-devel"
From 5b3f912d9680700e31a127d34125c930924a9af3 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 15:20:38 -0500
Subject: [PATCH 06/11] NetworkManager-strongswan: revbump for libnma
---
srcpkgs/NetworkManager-strongswan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 46c02d092e5..5cf6472410f 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,7 +1,7 @@
# Template file for 'NetworkManager-strongswan'
pkgname=NetworkManager-strongswan
version=1.5.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --disable-more-warnings --without-libnm-glib
--disable-more-warnings"
From 0c7aa555745d651d29459e6b61ae287bc386796f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 15:34:00 -0500
Subject: [PATCH 07/11] NetworkManager-vpnc: revbump for libnma
---
srcpkgs/NetworkManager-vpnc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/NetworkManager-vpnc/template b/srcpkgs/NetworkManager-vpnc/template
index b9d17226132..2ce5c6efd60 100644
--- a/srcpkgs/NetworkManager-vpnc/template
+++ b/srcpkgs/NetworkManager-vpnc/template
@@ -1,7 +1,7 @@
# Template file for 'NetworkManager-vpnc'
pkgname=NetworkManager-vpnc
version=1.2.6
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--localstatedir=/var --disable-static --without-libnm-glib"
hostmakedepends="pkg-config intltool"
From d9b57d2c8d007a366d0cf59d10007b73643761d7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 16:53:49 -0500
Subject: [PATCH 08/11] cinnamon-control-center: revbump for libnma
---
srcpkgs/cinnamon-control-center/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index b9ebe5f22d1..9da17ca74f3 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
version=4.6.2
-revision=2
+revision=3
build_style=gnu-configure
build_helper=gir
configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -28,6 +28,7 @@ do_check() {
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
}
+
post_install() {
# Remove unused stuff
make -C shell DESTDIR="$DESTDIR" uninstall-binPROGRAMS uninstall-directoryDATA uninstall-uiDATA
@@ -41,6 +42,7 @@ libcinnamon-control-center_package() {
vmove "usr/lib/*.so.*"
}
}
+
cinnamon-control-center-devel_package() {
short_desc+=" - development files"
depends="libglib-devel gtk+3-devel lib${sourcepkg}>=${version}_${revision}"
From ae469a4da86d0d5f34ef3c54853005efedf7ef94 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 17:26:48 -0500
Subject: [PATCH 09/11] gnome-control-center: update to 3.38.2
---
srcpkgs/gnome-control-center/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index b4be62deaa3..8bb8a374e99 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=3.38.1
+version=3.38.2
revision=1
build_style=meson
build_helper="gir"
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8d90006c610f6fccb3cddbcf413b1bc4137fb4977b901a3989420fe160082026
+checksum=1500e0ec0dbbb3f0b9289d084d6987b9430fe444872adbea5ca7fe0cd5f8476c
build_options="cheese"
build_options_default="cheese"
From 86005daa438c2aae84d063e8547e0504e158aca4 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 18:24:18 -0500
Subject: [PATCH 10/11] gnome-initial-setup: update to 3.38.2
---
srcpkgs/gnome-initial-setup/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 12886a0f9ae..d24f6b4fa4d 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-initial-setup'
pkgname=gnome-initial-setup
-version=3.38.1
+version=3.38.2
revision=1
build_style=meson
configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -18,4 +18,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e55d4f4073998e0fb7b3dfcc470e2a4c7d950a96bedab15011b9084ebc813676
+checksum=aa5889274f8b0b6de6a0512b47742b82ac3400daec82dd4effe2eea27464a3b8
From 806c25882201971f393b3ded3f91769d2b77b201 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 30 Nov 2020 19:05:55 -0500
Subject: [PATCH 11/11] switchboard-plug-network: update to 2.3.3
---
srcpkgs/switchboard-plug-network/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template
index d243f041ed4..31f640cf25d 100644
--- a/srcpkgs/switchboard-plug-network/template
+++ b/srcpkgs/switchboard-plug-network/template
@@ -1,6 +1,6 @@
# Template file for 'switchboard-plug-network'
pkgname=switchboard-plug-network
-version=2.3.2
+version=2.3.3
revision=1
build_style=meson
hostmakedepends="pkg-config vala"
@@ -11,5 +11,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/switchboard-plug-network"
distfiles="https://github.com/elementary/${pkgname}/archive/${version}.tar.gz"
-checksum=61c3803dccf68324afe7cb67094fd9dbcb874cae47284b9b131b9bd49971d9b8
+checksum=a2f29b3054c187f2be9688bb04b6800cf4c2d3dd74cdd4fa37626f0b2ac5df50
nocross="https://travis-ci.org/github/void-linux/void-packages/builds/733837363"
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: libnma: replace libnm-gtk; revbump packages previously depending on libnm-gtk
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26791@inbox.vuxu.org>
` (23 preceding siblings ...)
2020-12-01 0:06 ` cinerea0
@ 2020-12-01 1:03 ` ericonr
2020-12-01 1:06 ` cinerea0
2020-12-01 1:12 ` [PR PATCH] [Merged]: " ericonr
26 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2020-12-01 1:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 165 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26791#issuecomment-736149117
Comment:
@cinerea0 all done? LGTM
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: libnma: replace libnm-gtk; revbump packages previously depending on libnm-gtk
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26791@inbox.vuxu.org>
` (24 preceding siblings ...)
2020-12-01 1:03 ` ericonr
@ 2020-12-01 1:06 ` cinerea0
2020-12-01 1:12 ` [PR PATCH] [Merged]: " ericonr
26 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2020-12-01 1:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 183 bytes --]
New comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/26791#issuecomment-736150187
Comment:
@ericonr Yes, that should be all of them.
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Merged]: libnma: replace libnm-gtk; revbump packages previously depending on libnm-gtk
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26791@inbox.vuxu.org>
` (25 preceding siblings ...)
2020-12-01 1:06 ` cinerea0
@ 2020-12-01 1:12 ` ericonr
26 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2020-12-01 1:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 424 bytes --]
There's a merged pull request on the void-packages repository
libnma: replace libnm-gtk; revbump packages previously depending on libnm-gtk
https://github.com/void-linux/void-packages/pull/26791
Description:
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`.
^ permalink raw reply [flat|nested] 27+ messages in thread