Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] network-manager-applet: add libappindicator support
@ 2020-08-27  1:13 cinerea0
  2020-08-27  1:39 ` cinerea0
                   ` (90 more replies)
  0 siblings, 91 replies; 92+ messages in thread
From: cinerea0 @ 2020-08-27  1:13 UTC (permalink / raw)
  To: ml

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

There is a new pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From a11982efc5e63b7c27deee82bfb9acc85e9c107f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 26 Aug 2020 21:04:32 -0400
Subject: [PATCH] network-manager-applet: add libappindicator support

---
 srcpkgs/network-manager-applet/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 0656107b1af..6ec84c1bd94 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,12 +1,14 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
 version=1.8.24
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
+configure_args="--disable-static --without-selinux --with-appindicator
+ $(vopt_enable gir introspection)"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
+ libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
  libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
  polkit-devel mobile-broadband-provider-info"
 depends="NetworkManager hicolor-icon-theme iso-codes"

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
@ 2020-08-27  1:39 ` cinerea0
  2020-09-09 14:07 ` sgn
                   ` (89 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-08-27  1:39 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/24497#issuecomment-681259892

Comment:
Pinging @Gottox because it's his package.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
  2020-08-27  1:39 ` cinerea0
@ 2020-09-09 14:07 ` sgn
  2020-09-11  3:51 ` cinerea0
                   ` (88 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: sgn @ 2020-09-09 14:07 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-689587035

Comment:
Should we also bump to v1.18.0? I don't use this package, so I don't really know.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
  2020-08-27  1:39 ` cinerea0
  2020-09-09 14:07 ` sgn
@ 2020-09-11  3:51 ` cinerea0
  2020-09-11  5:41 ` CameronNemo
                   ` (87 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-09-11  3:51 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-690857623

Comment:
I attempted to build v1.18.0, but ran into the following build error:

> configure: error: Package requirements (libnma >= 1.8.27) were not met

That file is provided by the `libnm-gtk` package, which is a subpackage of `network-manager-applet`. xbps-src appears to be unable to resolve this circular dependency.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (2 preceding siblings ...)
  2020-09-11  3:51 ` cinerea0
@ 2020-09-11  5:41 ` CameronNemo
  2020-09-11  5:42 ` CameronNemo
                   ` (86 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: CameronNemo @ 2020-09-11  5:41 UTC (permalink / raw)
  To: ml

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

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-690887597

Comment:
they must have split the source package https://gitlab.gnome.org/GNOME/libnma

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (3 preceding siblings ...)
  2020-09-11  5:41 ` CameronNemo
@ 2020-09-11  5:42 ` CameronNemo
  2020-09-11  5:44 ` CameronNemo
                   ` (85 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: CameronNemo @ 2020-09-11  5:42 UTC (permalink / raw)
  To: ml

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

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-690887597

Comment:
they must have split the source package https://gitlab.gnome.org/GNOME/libnma . you will need to package libnma then add it to network-manager-applet's makedepends.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (4 preceding siblings ...)
  2020-09-11  5:42 ` CameronNemo
@ 2020-09-11  5:44 ` CameronNemo
  2020-09-11 23:24 ` cinerea0
                   ` (84 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: CameronNemo @ 2020-09-11  5:44 UTC (permalink / raw)
  To: ml

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

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-690887597

Comment:
they must have split the source package https://gitlab.gnome.org/GNOME/libnma . you will need to package libnma then add it to network-manager-applet's makedepends. drop both the subpackages for network-manager-applet. Probably need to revbump:

```
NetworkManager-l2tp-1.8.2_1
NetworkManager-openvpn-1.8.10_2
NetworkManager-pptp-1.2.8_3
NetworkManager-strongswan-1.4.5_2
NetworkManager-vpnc-1.2.6_3
cinnamon-control-center-4.6.2_1
gnome-control-center-3.34.1_1
gnome-initial-setup-3.34.1_2
network-manager-applet-1.8.24_1
network-manager-applet-devel-1.8.24_1
switchboard-plug-network-2.1.4_1
```

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (5 preceding siblings ...)
  2020-09-11  5:44 ` CameronNemo
@ 2020-09-11 23:24 ` cinerea0
  2020-09-11 23:39 ` CameronNemo
                   ` (83 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-09-11 23:24 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-691352082

Comment:
Gotcha. What would be the correct order to perform these changes in? My first thought would be:

1. Package `libnma`(separate PR)

2. Change the `network-manager-applet` template to use `libnma` and get rid of the subpackages (this PR)

3. Revbump the packages you listed with updated dependencies (separate PR)

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (6 preceding siblings ...)
  2020-09-11 23:24 ` cinerea0
@ 2020-09-11 23:39 ` CameronNemo
  2020-09-30 20:51 ` [PR PATCH] [Updated] " cinerea0
                   ` (82 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: CameronNemo @ 2020-09-11 23:39 UTC (permalink / raw)
  To: ml

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

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-691355414

Comment:
all in one PR, separate commits for each package.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (7 preceding siblings ...)
  2020-09-11 23:39 ` CameronNemo
@ 2020-09-30 20:51 ` cinerea0
  2020-09-30 21:15 ` cinerea0
                   ` (81 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-09-30 20:51 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From a92e03a4dc4ed9a8e7d7930cefe745b9e25d9f34 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 30 Sep 2020 16:51:10 -0400
Subject: [PATCH] New package: libnma-1.8.30

---
 srcpkgs/libnma/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/libnma/template

diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..0fcb9809bcd
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,20 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="cmake gettext gtk-doc pkg-config"
+makedepends="gcr-devel glib-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="GPL-2.0-only"
+homepage="https://gitlab.gnome.org/GNOME/libnma"
+distfiles="https://gitlab.gnome.org/GNOME/libnma/-/archive/${version}/libnma-${version}.tar.gz"
+checksum=c874d83dd59468b68c79ff20e8f5a689a009c89b618e89b5939fbdc81776fbf5
+
+# Package build options
+build_options="gir"
+build_options_default="gir"

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (8 preceding siblings ...)
  2020-09-30 20:51 ` [PR PATCH] [Updated] " cinerea0
@ 2020-09-30 21:15 ` cinerea0
  2020-09-30 21:31 ` cinerea0
                   ` (80 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-09-30 21:15 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From a9bf49f385d5007f4d135a41cf048155b4b7fc1e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 30 Sep 2020 17:14:09 -0400
Subject: [PATCH] New package: libnma-1.8.30

---
 srcpkgs/libnma/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/libnma/template

diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..def07b729fe
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,20 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="cmake gettext gtk-doc pkg-config vala"
+makedepends="gcr-devel glib-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="GPL-2.0-only"
+homepage="https://gitlab.gnome.org/GNOME/libnma"
+distfiles="https://gitlab.gnome.org/GNOME/libnma/-/archive/${version}/libnma-${version}.tar.gz"
+checksum=c874d83dd59468b68c79ff20e8f5a689a009c89b618e89b5939fbdc81776fbf5
+
+# Package build options
+build_options="gir"
+build_options_default="gir"

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (9 preceding siblings ...)
  2020-09-30 21:15 ` cinerea0
@ 2020-09-30 21:31 ` cinerea0
  2020-09-30 23:37 ` [PR REVIEW] " CameronNemo
                   ` (79 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-09-30 21:31 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 9fb008de5432e0c38cf594cafc0ce279860a8941 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 30 Sep 2020 17:30:41 -0400
Subject: [PATCH] New package: libnma-1.8.30

---
 srcpkgs/libnma/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/libnma/template

diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..aa884638c6b
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,20 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="cmake gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="GPL-2.0-only"
+homepage="https://gitlab.gnome.org/GNOME/libnma"
+distfiles="https://gitlab.gnome.org/GNOME/libnma/-/archive/${version}/libnma-${version}.tar.gz"
+checksum=c874d83dd59468b68c79ff20e8f5a689a009c89b618e89b5939fbdc81776fbf5
+
+# Package build options
+build_options="gir"
+build_options_default="gir"

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR REVIEW] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (10 preceding siblings ...)
  2020-09-30 21:31 ` cinerea0
@ 2020-09-30 23:37 ` CameronNemo
  2020-09-30 23:37 ` CameronNemo
                   ` (78 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: CameronNemo @ 2020-09-30 23:37 UTC (permalink / raw)
  To: ml

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

New review comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#discussion_r497856155

Comment:
you will need the "qemu" build helper too.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR REVIEW] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (11 preceding siblings ...)
  2020-09-30 23:37 ` [PR REVIEW] " CameronNemo
@ 2020-09-30 23:37 ` CameronNemo
  2020-09-30 23:37 ` CameronNemo
                   ` (77 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: CameronNemo @ 2020-09-30 23:37 UTC (permalink / raw)
  To: ml

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

New review comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#discussion_r497857872

Comment:
Looks like a non-trivial amount of the project is LGPL, so change this line to:

`license="GPL-2.0-only, LGPL-2.1-or-later"`

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR REVIEW] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (13 preceding siblings ...)
  2020-09-30 23:37 ` CameronNemo
@ 2020-09-30 23:37 ` CameronNemo
  2020-09-30 23:54 ` [PR PATCH] [Updated] " cinerea0
                   ` (75 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: CameronNemo @ 2020-09-30 23:37 UTC (permalink / raw)
  To: ml

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

New review comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#discussion_r497856512

Comment:
are you sure you need cmake given this is a meson-built package?

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR REVIEW] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (12 preceding siblings ...)
  2020-09-30 23:37 ` CameronNemo
@ 2020-09-30 23:37 ` CameronNemo
  2020-09-30 23:37 ` CameronNemo
                   ` (76 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: CameronNemo @ 2020-09-30 23:37 UTC (permalink / raw)
  To: ml

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

New review comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#discussion_r497857133

Comment:
Typically we only specify options when something about a package is actually optional. In this case it always needs gir. Good rule of thumb is that a build option should actually change the behavior of the build, ejemplos gratis: dependencies, arguments passed to the build system.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (14 preceding siblings ...)
  2020-09-30 23:37 ` CameronNemo
@ 2020-09-30 23:54 ` cinerea0
  2020-10-01  0:05 ` [PR REVIEW] " cinerea0
                   ` (74 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-09-30 23:54 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From cb4004c667cf9511f2963feb03ba36ad1bd22390 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 30 Sep 2020 19:44:46 -0400
Subject: [PATCH] New package: libnma-1.8.30

---
 srcpkgs/libnma/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/libnma/template

diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..73c9a7ad0a9
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,16 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir qemu"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libnma"
+distfiles="https://gitlab.gnome.org/GNOME/libnma/-/archive/${version}/libnma-${version}.tar.gz"
+checksum=c874d83dd59468b68c79ff20e8f5a689a009c89b618e89b5939fbdc81776fbf5

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR REVIEW] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (15 preceding siblings ...)
  2020-09-30 23:54 ` [PR PATCH] [Updated] " cinerea0
@ 2020-10-01  0:05 ` cinerea0
  2020-10-01  0:05 ` cinerea0
                   ` (73 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-01  0:05 UTC (permalink / raw)
  To: ml

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

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#discussion_r497866136

Comment:
Gotcha, I've removed those lines.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR REVIEW] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (16 preceding siblings ...)
  2020-10-01  0:05 ` [PR REVIEW] " cinerea0
@ 2020-10-01  0:05 ` cinerea0
  2020-10-01  0:07 ` cinerea0
                   ` (72 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-01  0:05 UTC (permalink / raw)
  To: ml

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

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#discussion_r497866221

Comment:
Thank you, I've changed the license like you said.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR REVIEW] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (17 preceding siblings ...)
  2020-10-01  0:05 ` cinerea0
@ 2020-10-01  0:07 ` cinerea0
  2020-10-01  0:08 ` cinerea0
                   ` (71 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-01  0:07 UTC (permalink / raw)
  To: ml

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

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#discussion_r497866487

Comment:
When I was testing building the package locally I needed it. However, after my most recent test it seems like I don't. I've removed it from my most recent push and it hasn't introduced new errors.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR REVIEW] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (18 preceding siblings ...)
  2020-10-01  0:07 ` cinerea0
@ 2020-10-01  0:08 ` cinerea0
  2020-10-04  3:09 ` [PR PATCH] [Updated] " cinerea0
                   ` (70 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-01  0:08 UTC (permalink / raw)
  To: ml

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

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#discussion_r497866898

Comment:
I changed the `build_helper` value to `"gir qemu"`, but I'm still getting the same errors as before on the ARM architectures.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (19 preceding siblings ...)
  2020-10-01  0:08 ` cinerea0
@ 2020-10-04  3:09 ` cinerea0
  2020-10-04  4:57 ` cinerea0
                   ` (69 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-04  3:09 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From ed567d2a9048d959a8fc6ef2ed6e9f9d39fad1c1 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Sat, 3 Oct 2020 23:08:46 -0400
Subject: [PATCH] New package: libnma-1.8.30

---
 srcpkgs/libnma/patches/meson_options.patch | 10 ++++++++++
 srcpkgs/libnma/template                    | 16 ++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 srcpkgs/libnma/patches/meson_options.patch
 create mode 100644 srcpkgs/libnma/template

diff --git a/srcpkgs/libnma/patches/meson_options.patch b/srcpkgs/libnma/patches/meson_options.patch
new file mode 100644
index 00000000000..74c41ff52c0
--- /dev/null
+++ b/srcpkgs/libnma/patches/meson_options.patch
@@ -0,0 +1,10 @@
+--- meson_options.txt	2020-06-22 09:08:50.000000000 -0400
++++ "meson_options.txt copy"	2020-10-03 22:33:37.223920239 -0400
+@@ -4,6 +4,6 @@
+ option('iso_codes', type: 'boolean', value: true, description: 'check for iso-codes at build-time')
+ option('mobile_broadband_provider_info', type: 'boolean', value: true, description: 'check for mobile-broadband-provider-info at build-time')
+ option('ld_gc', type: 'boolean', value: true, description: 'Enable garbage collection of unused symbols on linking')
+-option('gtk_doc', type: 'boolean', value: true, description: 'use gtk-doc to build documentation')
++option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
+ option('introspection', type: 'boolean', value: true, description: 'Enable introspection for this build')
+ option('vapi', type: 'boolean', value: true, description: 'build Vala bindings')
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..db08134f4d4
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,16 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir qemu"
+hostmakedepends="glib-devel pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libnma"
+distfiles="https://gitlab.gnome.org/GNOME/libnma/-/archive/${version}/libnma-${version}.tar.gz"
+checksum=c874d83dd59468b68c79ff20e8f5a689a009c89b618e89b5939fbdc81776fbf5

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (20 preceding siblings ...)
  2020-10-04  3:09 ` [PR PATCH] [Updated] " cinerea0
@ 2020-10-04  4:57 ` cinerea0
  2020-10-04  5:34 ` cinerea0
                   ` (68 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-04  4:57 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 275c8abeb867f5b2cc4356bfa4d47645a05d1b3a Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Sun, 4 Oct 2020 00:57:04 -0400
Subject: [PATCH] New package: libnma-1.8.30

---
 srcpkgs/libnma/template | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 srcpkgs/libnma/template

diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..d535e78b6ac
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,27 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libnma"
+distfiles="https://gitlab.gnome.org/GNOME/libnma/-/archive/${version}/libnma-${version}.tar.gz"
+checksum=c874d83dd59468b68c79ff20e8f5a689a009c89b618e89b5939fbdc81776fbf5
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vcopy /usr/share/libnma usr/share
+	fi
+}

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (21 preceding siblings ...)
  2020-10-04  4:57 ` cinerea0
@ 2020-10-04  5:34 ` cinerea0
  2020-10-04 23:05 ` cinerea0
                   ` (67 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-04  5:34 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 4db9699ec66d9767a9944a4ab9d84c632800c4f6 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Sun, 4 Oct 2020 01:34:30 -0400
Subject: [PATCH] New package: libnma-1.8.30

---
 srcpkgs/libnma/template | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 srcpkgs/libnma/template

diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c3d7cee7b6c
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,27 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libnma"
+distfiles="https://gitlab.gnome.org/GNOME/libnma/-/archive/${version}/libnma-${version}.tar.gz"
+checksum=c874d83dd59468b68c79ff20e8f5a689a009c89b618e89b5939fbdc81776fbf5
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vcopy /usr/share/gtk-doc/html/libnma/ usr/share/gtk-doc/html/
+	fi
+}

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (22 preceding siblings ...)
  2020-10-04  5:34 ` cinerea0
@ 2020-10-04 23:05 ` cinerea0
  2020-10-04 23:43 ` cinerea0
                   ` (66 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-04 23:05 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 7eb7f267a8c56d091a0cb5f51dc6af4182ac9e36 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Sun, 4 Oct 2020 19:05:23 -0400
Subject: [PATCH] New package: libnma-1.8.30

---
 srcpkgs/libnma/template | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/libnma/template

diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..ffea47a6193
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,28 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libnma"
+distfiles="https://gitlab.gnome.org/GNOME/libnma/-/archive/${version}/libnma-${version}.tar.gz"
+checksum=c874d83dd59468b68c79ff20e8f5a689a009c89b618e89b5939fbdc81776fbf5
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (23 preceding siblings ...)
  2020-10-04 23:05 ` cinerea0
@ 2020-10-04 23:43 ` cinerea0
  2020-10-05  0:17 ` cinerea0
                   ` (65 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-04 23:43 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From bf79a7f20c9473c1a89fa495684cf39c839b5793 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Sun, 4 Oct 2020 19:43:14 -0400
Subject: [PATCH] New package: libnma-1.8.30

---
 srcpkgs/libnma/template | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/libnma/template

diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c1778bab62c
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,28 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libnma"
+distfiles="https://gitlab.gnome.org/GNOME/libnma/-/archive/${version}/libnma-${version}.tar.gz"
+checksum=c874d83dd59468b68c79ff20e8f5a689a009c89b618e89b5939fbdc81776fbf5
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (24 preceding siblings ...)
  2020-10-04 23:43 ` cinerea0
@ 2020-10-05  0:17 ` cinerea0
  2020-10-05  0:44 ` [PR PATCH] [Updated] " cinerea0
                   ` (64 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-05  0:17 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-703337328

Comment:
It finally worked! Alright, `libnma` down, `network-manager-applet` is up next.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (25 preceding siblings ...)
  2020-10-05  0:17 ` cinerea0
@ 2020-10-05  0:44 ` cinerea0
  2020-10-05  0:48 ` [PR REVIEW] " CameronNemo
                   ` (63 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-05  0:44 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 99abe96bd62e626f389d1fc383031156f311e314 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Sun, 4 Oct 2020 20:44:20 -0400
Subject: [PATCH] New package: libnma-1.8.30

---
 srcpkgs/libnma/template | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 srcpkgs/libnma/template

diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..55d78880b5e
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,29 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libnma"
+distfiles="https://gitlab.gnome.org/GNOME/libnma/-/archive/${version}/libnma-${version}.tar.gz"
+checksum=c874d83dd59468b68c79ff20e8f5a689a009c89b618e89b5939fbdc81776fbf5
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+		vmove usr/lib/girepository-1.0
+	fi
+}

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR REVIEW] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (26 preceding siblings ...)
  2020-10-05  0:44 ` [PR PATCH] [Updated] " cinerea0
@ 2020-10-05  0:48 ` CameronNemo
  2020-10-05  1:17 ` cinerea0
                   ` (62 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: CameronNemo @ 2020-10-05  0:48 UTC (permalink / raw)
  To: ml

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

New review comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#discussion_r499307219

Comment:
why is this only being installed for cross builds? should it not just always be installed?

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR REVIEW] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (27 preceding siblings ...)
  2020-10-05  0:48 ` [PR REVIEW] " CameronNemo
@ 2020-10-05  1:17 ` cinerea0
  2020-10-05  1:27 ` CameronNemo
                   ` (61 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-05  1:17 UTC (permalink / raw)
  To: ml

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

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#discussion_r499310669

Comment:
That last line is a mistake and doesn't need to be there. As for the first two, the package fails to build documentation properly only on ARM architectures. Those lines install files that are only missing when built on ARM.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR REVIEW] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (28 preceding siblings ...)
  2020-10-05  1:17 ` cinerea0
@ 2020-10-05  1:27 ` CameronNemo
  2020-10-05  1:44 ` cinerea0
                   ` (60 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: CameronNemo @ 2020-10-05  1:27 UTC (permalink / raw)
  To: ml

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

New review comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#discussion_r499311907

Comment:
yeah I was following the convo in #xbps regarding the docs. the gir line is what I was referring to.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR REVIEW] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (29 preceding siblings ...)
  2020-10-05  1:27 ` CameronNemo
@ 2020-10-05  1:44 ` cinerea0
  2020-10-05  1:48 ` cinerea0
                   ` (59 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-05  1:44 UTC (permalink / raw)
  To: ml

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

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#discussion_r499314085

Comment:
Yeah, that'll be removed on my next push.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (30 preceding siblings ...)
  2020-10-05  1:44 ` cinerea0
@ 2020-10-05  1:48 ` cinerea0
  2020-10-05  1:51 ` CameronNemo
                   ` (58 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-05  1:48 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-703355423

Comment:
In the original `network-manager-applet` template, one of the configure options is "--disable-static". Does anyone know what option in the following file would most likely correspond to enabling/disabling static compilation?

```
option('appindicator', type: 'string', value: 'yes', description: 'Build with lib(ayatana-)appindicator support in addition to xembed systray support (no|yes|auto|ayatana|ubuntu). Default is "yes", "yes" is an alias for "auto".')
option('wwan', type: 'boolean', value: true, description: 'Enable WWAN support.')
option('selinux', type: 'boolean', value: true, description: 'Enable support for adjusting SELinux labels in configuration editor.')
option('team', type: 'boolean', value: true, description: 'Enable team configuration editor.')
option('more_asserts', type: 'string', value: '0', description: 'Enable more assertions for debugging.')
option('ld_gc', type: 'boolean', value: true, description: 'Enable garbage collection of unused symbols on linking')
```

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (31 preceding siblings ...)
  2020-10-05  1:48 ` cinerea0
@ 2020-10-05  1:51 ` CameronNemo
  2020-10-05  2:20 ` cinerea0
                   ` (57 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: CameronNemo @ 2020-10-05  1:51 UTC (permalink / raw)
  To: ml

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

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-703356012

Comment:
There is none from what I can tell. It would apply to the library, libnma, if it existed.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (32 preceding siblings ...)
  2020-10-05  1:51 ` CameronNemo
@ 2020-10-05  2:20 ` cinerea0
  2020-10-05 22:32 ` cinerea0
                   ` (56 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-05  2:20 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-703361988

Comment:
> There is none from what I can tell. It would apply to the library, libnma, if it existed.

I checked libnma's options, and it doesn't exist. It's probably fine to take that option out then.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (33 preceding siblings ...)
  2020-10-05  2:20 ` cinerea0
@ 2020-10-05 22:32 ` cinerea0
  2020-10-05 22:46 ` cinerea0
                   ` (55 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-05 22:32 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-703924679

Comment:
Upon trying to revbump and build `NetworkManager-vpnc` with the new `libnma` dependency, I get the following error:

```
checking for LIBNMA... no
configure: error: Package requirements (libnma >= 1.2.0) were not met:

Package 'libnm', required by 'libnma', not found
```
However, `libnm` is in the makedepends. What's going wrong here? Do I need to be installing more files from `libnma`, like a `libnma-devel`?

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (34 preceding siblings ...)
  2020-10-05 22:32 ` cinerea0
@ 2020-10-05 22:46 ` cinerea0
  2020-10-05 23:32 ` [PR PATCH] [Updated] " cinerea0
                   ` (54 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-05 22:46 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-703924679

Comment:
Upon trying to revbump and build `NetworkManager-vpnc` with the new `libnma` dependency, I get the following error:

```
checking for LIBNMA... no
configure: error: Package requirements (libnma >= 1.2.0) were not met:

Package 'libnm', required by 'libnma', not found
```
However, `libnm` is in the makedepends. What's going wrong here? Do I need to be installing more files from `libnma`, like a `libnma-devel`?

EDIT: Also, looking through the build output for `libnma`, could this be the problem:
```
WARNING: libnma-1.8.30_1: libnma.so.0 not found in common/shlibs!
```

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (35 preceding siblings ...)
  2020-10-05 22:46 ` cinerea0
@ 2020-10-05 23:32 ` cinerea0
  2020-10-06  2:12 ` CameronNemo
                   ` (53 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-05 23:32 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From b4488cf1d9ed474cc9dfca2decb632768a7b57de Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 5 Oct 2020 19:32:36 -0400
Subject: [PATCH] New package: libnma-1.8.30

---
 srcpkgs/libnma/template | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/libnma/template

diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c1778bab62c
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,28 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libnma"
+distfiles="https://gitlab.gnome.org/GNOME/libnma/-/archive/${version}/libnma-${version}.tar.gz"
+checksum=c874d83dd59468b68c79ff20e8f5a689a009c89b618e89b5939fbdc81776fbf5
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (36 preceding siblings ...)
  2020-10-05 23:32 ` [PR PATCH] [Updated] " cinerea0
@ 2020-10-06  2:12 ` CameronNemo
  2020-10-06  2:14 ` CameronNemo
                   ` (52 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: CameronNemo @ 2020-10-06  2:12 UTC (permalink / raw)
  To: ml

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

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-703986791

Comment:
@cinerea0 check the last two commits here: https://github.com/CameronNemo/void-packages/commits/c0nma

Some notes on what I changed:

* using GNOME_SITE in distfiles, we never get the tarballs from the GNOME gitlab
* adjusting the common/shlibs file
* adding a libnma-devel subpackage -- when packaging libraries you almost always need a subpackage for the development headers
* adjusting network-manager-applet to build against the new libnma

All that is left from my perspective is revbumping the packages I mentioned above:

```
NetworkManager-l2tp-1.8.2_1
NetworkManager-openvpn-1.8.10_2
NetworkManager-pptp-1.2.8_3
NetworkManager-strongswan-1.4.5_2
NetworkManager-vpnc-1.2.6_3
cinnamon-control-center-4.6.2_1
gnome-control-center-3.34.1_1
gnome-initial-setup-3.34.1_2
switchboard-plug-network-2.1.4_1
```

On each of these packages, you will need to replace the `network-manager-applet-devel` dependency with `libnma-devel`.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (37 preceding siblings ...)
  2020-10-06  2:12 ` CameronNemo
@ 2020-10-06  2:14 ` CameronNemo
  2020-10-06  2:30 ` [PR PATCH] [Updated] " cinerea0
                   ` (51 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: CameronNemo @ 2020-10-06  2:14 UTC (permalink / raw)
  To: ml

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

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-703986791

Comment:
@cinerea0 check the last two commits here: https://github.com/CameronNemo/void-packages/commits/c0nma

Edit: note: you can fetch the branch above by running `git fetch https://github.com/CameronNemo/void-packages c0nma:destination-branch-name` while in your local copy of the void-packages git repo.

Some notes on what I changed:

* using GNOME_SITE in distfiles, we never get the tarballs from the GNOME gitlab
* adjusting the common/shlibs file
* adding a libnma-devel subpackage -- when packaging libraries you almost always need a subpackage for the development headers
* adjusting network-manager-applet to build against the new libnma

All that is left from my perspective is revbumping the packages I mentioned above:

```
NetworkManager-l2tp-1.8.2_1
NetworkManager-openvpn-1.8.10_2
NetworkManager-pptp-1.2.8_3
NetworkManager-strongswan-1.4.5_2
NetworkManager-vpnc-1.2.6_3
cinnamon-control-center-4.6.2_1
gnome-control-center-3.34.1_1
gnome-initial-setup-3.34.1_2
switchboard-plug-network-2.1.4_1
```

On each of these packages, you will need to replace the `network-manager-applet-devel` dependency with `libnma-devel`.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (38 preceding siblings ...)
  2020-10-06  2:14 ` CameronNemo
@ 2020-10-06  2:30 ` cinerea0
  2020-10-06  2:45 ` cinerea0
                   ` (50 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-06  2:30 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 3dc570ce92c22b51a79b7415046fbcb76de86fe6 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 5 Oct 2020 22:28:59 -0400
Subject: [PATCH 1/2] New package: libnma-1.8.30

---
 srcpkgs/libnma-devel    |  1 +
 srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 120000 srcpkgs/libnma-devel
 create mode 100644 srcpkgs/libnma/template

diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+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
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}
+
+libnma-devel_package() {
+	short_desc+=" - library development files"
+	depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove usr/share/gtk-doc
+	}
+}

From 552d5779249ac06d09b53cf6492c7f778a2f5fb8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 5 Oct 2020 22:30:06 -0400
Subject: [PATCH 2/2] common/shlibs: change source of libnma

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 36efd174d6b..91635660be4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2981,7 +2981,7 @@ libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
 liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
-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
 libimagequant.so.0 libimagequant-2.8.2_1

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (39 preceding siblings ...)
  2020-10-06  2:30 ` [PR PATCH] [Updated] " cinerea0
@ 2020-10-06  2:45 ` cinerea0
  2020-10-06  3:01 ` cinerea0
                   ` (49 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-06  2:45 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 3dc570ce92c22b51a79b7415046fbcb76de86fe6 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 5 Oct 2020 22:28:59 -0400
Subject: [PATCH 1/4] New package: libnma-1.8.30

---
 srcpkgs/libnma-devel    |  1 +
 srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 120000 srcpkgs/libnma-devel
 create mode 100644 srcpkgs/libnma/template

diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+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
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}
+
+libnma-devel_package() {
+	short_desc+=" - library development files"
+	depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove usr/share/gtk-doc
+	}
+}

From 552d5779249ac06d09b53cf6492c7f778a2f5fb8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 5 Oct 2020 22:30:06 -0400
Subject: [PATCH 2/4] common/shlibs: change source of libnma

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 36efd174d6b..91635660be4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2981,7 +2981,7 @@ libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
 liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
-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
 libimagequant.so.0 libimagequant-2.8.2_1

From 7e8960a11ed0baba1b9e9956ec9c0685dfd15541 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 5 Oct 2020 22:42:47 -0400
Subject: [PATCH 3/4] network-manager-applet: update to 1.18.0

---
 srcpkgs/libnm-gtk                       |  1 -
 srcpkgs/network-manager-applet-devel    |  1 -
 srcpkgs/network-manager-applet/template | 47 ++++---------------------
 3 files changed, 7 insertions(+), 42 deletions(-)
 delete mode 120000 srcpkgs/libnm-gtk
 delete mode 120000 srcpkgs/network-manager-applet-devel

diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/libnm-gtk
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/network-manager-applet-devel
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 0656107b1af..12149bac70b 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,14 +1,14 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.24
+version=1.18.0
 revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
- libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
- polkit-devel mobile-broadband-provider-info"
+ libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libgnome-keyring-devel libgudev-devel libnotify-devel libnma
+ libsecret-devel polkit-devel mobile-broadband-provider-info"
 depends="NetworkManager hicolor-icon-theme iso-codes"
 short_desc="NetworkManager panel applet for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,38 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
+checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b
 lib32disabled=yes
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_build() {
-	export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs:${wrksrc}/src/libnm-gtk/.libs"
-}
-
-libnm-gtk_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
-	}
-}
-
-network-manager-applet-devel_package() {
-	depends="gtk+3-devel NetworkManager-devel>=1.0
-	 libnm-gtk>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		vmove usr/share/gtk-doc
-	}
-}

From c770e4202951d2d3b61f6810c119db8f42829857 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 5 Oct 2020 22:45:07 -0400
Subject: [PATCH 4/4] common/shlibs: remove libnm-gtk

---
 common/shlibs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 91635660be4..00839f3c723 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -905,7 +905,6 @@ liblcms2.so.2 lcms2-2.2_1
 libcolord.so.2 libcolord-1.1.7_1
 libcolordprivate.so.2 libcolord-1.1.7_1
 libcolorhug.so.2 libcolord-1.1.7_1
-libnm-gtk.so.0 libnm-gtk-0.9.1.95_1
 libcaribou.so.0 caribou-0.4.0_1
 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
 libgrilo-0.3.so.0 grilo-0.3.2_1

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (40 preceding siblings ...)
  2020-10-06  2:45 ` cinerea0
@ 2020-10-06  3:01 ` cinerea0
  2020-10-06  3:07 ` cinerea0
                   ` (48 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-06  3:01 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From ef2a3e6f60044460cc91484c87dafcead9dcd5b2 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 5 Oct 2020 22:58:46 -0400
Subject: [PATCH 1/2] New package: libnma-1.8.30

---
 common/shlibs           |  2 +-
 srcpkgs/libnma-devel    |  1 +
 srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/libnma-devel
 create mode 100644 srcpkgs/libnma/template

diff --git a/common/shlibs b/common/shlibs
index 36efd174d6b..91635660be4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2981,7 +2981,7 @@ libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
 liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
-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
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+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
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}
+
+libnma-devel_package() {
+	short_desc+=" - library development files"
+	depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove usr/share/gtk-doc
+	}
+}

From 2e16d32ac1a13bf4c6554272bdf0b9f5068d0de1 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 5 Oct 2020 23:01:28 -0400
Subject: [PATCH 2/2] network-manager-applet: update to 1.18.0

---
 common/shlibs                           |  1 -
 srcpkgs/libnm-gtk                       |  1 -
 srcpkgs/network-manager-applet-devel    |  1 -
 srcpkgs/network-manager-applet/template | 47 ++++---------------------
 4 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 120000 srcpkgs/libnm-gtk
 delete mode 120000 srcpkgs/network-manager-applet-devel

diff --git a/common/shlibs b/common/shlibs
index 91635660be4..00839f3c723 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -905,7 +905,6 @@ liblcms2.so.2 lcms2-2.2_1
 libcolord.so.2 libcolord-1.1.7_1
 libcolordprivate.so.2 libcolord-1.1.7_1
 libcolorhug.so.2 libcolord-1.1.7_1
-libnm-gtk.so.0 libnm-gtk-0.9.1.95_1
 libcaribou.so.0 caribou-0.4.0_1
 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
 libgrilo-0.3.so.0 grilo-0.3.2_1
diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/libnm-gtk
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/network-manager-applet-devel
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 0656107b1af..12149bac70b 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,14 +1,14 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.24
+version=1.18.0
 revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
- libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
- polkit-devel mobile-broadband-provider-info"
+ libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libgnome-keyring-devel libgudev-devel libnotify-devel libnma
+ libsecret-devel polkit-devel mobile-broadband-provider-info"
 depends="NetworkManager hicolor-icon-theme iso-codes"
 short_desc="NetworkManager panel applet for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,38 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
+checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b
 lib32disabled=yes
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_build() {
-	export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs:${wrksrc}/src/libnm-gtk/.libs"
-}
-
-libnm-gtk_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
-	}
-}
-
-network-manager-applet-devel_package() {
-	depends="gtk+3-devel NetworkManager-devel>=1.0
-	 libnm-gtk>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		vmove usr/share/gtk-doc
-	}
-}

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (41 preceding siblings ...)
  2020-10-06  3:01 ` cinerea0
@ 2020-10-06  3:07 ` cinerea0
  2020-10-06  3:16 ` CameronNemo
                   ` (47 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-06  3:07 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-704000942

Comment:
After performing these changes, I'm still getting the error above when trying to build `NetworkManager-vpnc` with `libnma` in makedepends. When switching to `libnma-devel`, I get the following error:

```
ERROR: libnma-devel-1.8.30_1: file `/usr/include/libnma/nma-bar-code-widget.h' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/include/libnma/nma-bar-code.h' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/include/libnma/nma-cert-chooser.h' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/include/libnma/nma-mobile-providers.h' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/include/libnma/nma-mobile-wizard.h' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/include/libnma/nma-ui-utils.h' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/include/libnma/nma-version.h' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/include/libnma/nma-vpn-password-dialog.h' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/include/libnma/nma-wifi-dialog.h' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/include/libnma/nma-ws-802-1x.h' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/include/libnma/nma-ws-dynamic-wep.h' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/include/libnma/nma-ws-leap.h' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/include/libnma/nma-ws-sae.h' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/include/libnma/nma-ws-wep-key.h' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/include/libnma/nma-ws-wpa-eap.h' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/include/libnma/nma-ws-wpa-psk.h' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/include/libnma/nma-ws.h' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/lib/pkgconfig/libnma.pc' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/share/gir-1.0/NMA-1.0.gir' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/share/gtk-doc/html/libnma/NMABarCode.html' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/share/gtk-doc/html/libnma/NMACertChooser.html' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/share/gtk-doc/html/libnma/NMAMobileProvidersDatabase.html' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/share/gtk-doc/html/libnma/NMAMobileWizard.html' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/share/gtk-doc/html/libnma/NMAVpnPasswordDialog.html' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/share/gtk-doc/html/libnma/NMAWifiDialog.html' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/share/gtk-doc/html/libnma/annotation-glossary.html' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/share/gtk-doc/html/libnma/api-index-1.8.0.html' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/share/gtk-doc/html/libnma/api-index-full.html' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/share/gtk-doc/html/libnma/api-reference.html' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/share/gtk-doc/html/libnma/home.png' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/share/gtk-doc/html/libnma/index.html' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/share/gtk-doc/html/libnma/left-insensitive.png' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/share/gtk-doc/html/libnma/left.png' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/share/gtk-doc/html/libnma/libnma-nma-ui-utils.html' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/share/gtk-doc/html/libnma/libnma.devhelp2' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/share/gtk-doc/html/libnma/object-tree.html' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/share/gtk-doc/html/libnma/right-insensitive.png' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/share/gtk-doc/html/libnma/right.png' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/share/gtk-doc/html/libnma/style.css' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/share/gtk-doc/html/libnma/up-insensitive.png' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/share/gtk-doc/html/libnma/up.png' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/share/vala/vapi/libnma.deps' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/share/vala/vapi/libnma.vapi' already installed by package libnma-1.8.30_1.
ERROR: libnma-devel-1.8.30_1: file `/usr/lib/libnma.so' already installed by package libnma-1.8.30_1.
Transaction failed! see above for errors.
```

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (42 preceding siblings ...)
  2020-10-06  3:07 ` cinerea0
@ 2020-10-06  3:16 ` CameronNemo
  2020-10-06  3:28 ` cinerea0
                   ` (46 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: CameronNemo @ 2020-10-06  3:16 UTC (permalink / raw)
  To: ml

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

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-704003083

Comment:
Rebuild libnma with the force flag: `./xbps-src -f pkg libnma`. I moved the docs from the regular package to the devel package.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (43 preceding siblings ...)
  2020-10-06  3:16 ` CameronNemo
@ 2020-10-06  3:28 ` cinerea0
  2020-10-06  3:39 ` CameronNemo
                   ` (45 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-06  3:28 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-704006200

Comment:
@CameronNemo Yep, that worked. I'll refresh the travis build in the morning so every subsequent push doesn't lead to a failed build just because it doesn't recognize `libnma`. Final thing I've come across tonight is a new error when building `NetworkManager-vpnc` with `libnma-devel`:

```
checking for LIBNM_GTK... no
configure: error: Package requirements (libnm-gtk >= 1.2.0) were not met:

No package 'libnm-gtk' found
```

Since we're getting rid of `libnm-gtk` since everything I've seen makes it seem like the library is deprecated, I'm confused why this package requires it.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (44 preceding siblings ...)
  2020-10-06  3:28 ` cinerea0
@ 2020-10-06  3:39 ` CameronNemo
  2020-10-06  3:40 ` CameronNemo
                   ` (44 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: CameronNemo @ 2020-10-06  3:39 UTC (permalink / raw)
  To: ml

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

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-704008662

Comment:
I would just:

* file an issue upstream https://gitlab.gnome.org/GNOME/NetworkManager-vpnc . say "FTBFS with recent versions of libnma"
* mark the package broken, linking to the issue you filed

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (45 preceding siblings ...)
  2020-10-06  3:39 ` CameronNemo
@ 2020-10-06  3:40 ` CameronNemo
  2020-10-06  3:40 ` CameronNemo
                   ` (43 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: CameronNemo @ 2020-10-06  3:40 UTC (permalink / raw)
  To: ml

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

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-704008662

Comment:
I would just:

* file an issue upstream https://gitlab.gnome.org/GNOME/NetworkManager-vpnc . say "FTBFS with recent versions of libnma" and include the log and version number of libnma
* mark the package broken, linking to the issue you filed

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (46 preceding siblings ...)
  2020-10-06  3:40 ` CameronNemo
@ 2020-10-06  3:40 ` CameronNemo
  2020-10-06  3:46 ` CameronNemo
                   ` (42 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: CameronNemo @ 2020-10-06  3:40 UTC (permalink / raw)
  To: ml

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

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-704008662

Comment:
I would just:

* file an issue upstream https://gitlab.gnome.org/GNOME/NetworkManager-vpnc . say "FTBFS with recent versions of libnma" and include the build log and version number of libnma
* mark the package broken, linking to the issue you filed

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (47 preceding siblings ...)
  2020-10-06  3:40 ` CameronNemo
@ 2020-10-06  3:46 ` CameronNemo
  2020-10-06 13:07 ` [PR PATCH] [Updated] " cinerea0
                   ` (41 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: CameronNemo @ 2020-10-06  3:46 UTC (permalink / raw)
  To: ml

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

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-704008662

Comment:
Would be best to file an issue upstream https://gitlab.gnome.org/GNOME/NetworkManager-vpnc . say "FTBFS with recent versions of libnma" and include the build log and version number of libnma

Until it is fixed, use the following to get it to build in a limited capacity:

```patch
--- a/srcpkgs/NetworkManager-vpnc/template
+++ b/srcpkgs/NetworkManager-vpnc/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-vpnc'
 pkgname=NetworkManager-vpnc
 version=1.2.6
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--localstatedir=/var --disable-static --without-libnm-glib"
+configure_args="--localstatedir=/var --disable-static --without-gnome --without-libnm-glib"
 hostmakedepends="pkg-config intltool"
-makedepends="libnm libnm-gtk network-manager-applet-devel libsecret-devel"
+makedepends="NetworkManager-devel libsecret-devel"
 depends="vpnc"
 short_desc="NetworkManager VPN plugin for VPNC"
 maintainer="Peter Kuchar <masaj@gmx.com>"
```

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (48 preceding siblings ...)
  2020-10-06  3:46 ` CameronNemo
@ 2020-10-06 13:07 ` cinerea0
  2020-10-06 13:23 ` cinerea0
                   ` (40 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-06 13:07 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 72b9dff466459202b58e30b7b7a9fa934e2d03ba Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:06:34 -0400
Subject: [PATCH] New package: libnma-1.8.30

---
 common/shlibs           |  2 +-
 srcpkgs/libnma-devel    |  1 +
 srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/libnma-devel
 create mode 100644 srcpkgs/libnma/template

diff --git a/common/shlibs b/common/shlibs
index 36efd174d6b..91635660be4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2981,7 +2981,7 @@ libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
 liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
-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
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+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
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}
+
+libnma-devel_package() {
+	short_desc+=" - library development files"
+	depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove usr/share/gtk-doc
+	}
+}

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (49 preceding siblings ...)
  2020-10-06 13:07 ` [PR PATCH] [Updated] " cinerea0
@ 2020-10-06 13:23 ` cinerea0
  2020-10-06 13:40 ` cinerea0
                   ` (39 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-06 13:23 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 72b9dff466459202b58e30b7b7a9fa934e2d03ba Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:06:34 -0400
Subject: [PATCH 1/2] New package: libnma-1.8.30

---
 common/shlibs           |  2 +-
 srcpkgs/libnma-devel    |  1 +
 srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/libnma-devel
 create mode 100644 srcpkgs/libnma/template

diff --git a/common/shlibs b/common/shlibs
index 36efd174d6b..91635660be4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2981,7 +2981,7 @@ libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
 liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
-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
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+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
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}
+
+libnma-devel_package() {
+	short_desc+=" - library development files"
+	depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove usr/share/gtk-doc
+	}
+}

From 2ca17ec4f553b00c82bb3b32c37867d71bd70417 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:09:38 -0400
Subject: [PATCH 2/2] network-manager-applet: update to 1.18.0

---
 common/shlibs                           |  1 -
 srcpkgs/libnm-gtk                       |  1 -
 srcpkgs/network-manager-applet-devel    |  1 -
 srcpkgs/network-manager-applet/template | 47 ++++---------------------
 4 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 120000 srcpkgs/libnm-gtk
 delete mode 120000 srcpkgs/network-manager-applet-devel

diff --git a/common/shlibs b/common/shlibs
index 91635660be4..00839f3c723 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -905,7 +905,6 @@ liblcms2.so.2 lcms2-2.2_1
 libcolord.so.2 libcolord-1.1.7_1
 libcolordprivate.so.2 libcolord-1.1.7_1
 libcolorhug.so.2 libcolord-1.1.7_1
-libnm-gtk.so.0 libnm-gtk-0.9.1.95_1
 libcaribou.so.0 caribou-0.4.0_1
 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
 libgrilo-0.3.so.0 grilo-0.3.2_1
diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/libnm-gtk
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/network-manager-applet-devel
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 0656107b1af..2d9861a94ba 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,14 +1,14 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.24
+version=1.18.0
 revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
- libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
- polkit-devel mobile-broadband-provider-info"
+ libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libgnome-keyring-devel libgudev-devel libnotify-devel libnma-devel
+ libsecret-devel polkit-devel mobile-broadband-provider-info"
 depends="NetworkManager hicolor-icon-theme iso-codes"
 short_desc="NetworkManager panel applet for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,38 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
+checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b
 lib32disabled=yes
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_build() {
-	export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs:${wrksrc}/src/libnm-gtk/.libs"
-}
-
-libnm-gtk_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
-	}
-}
-
-network-manager-applet-devel_package() {
-	depends="gtk+3-devel NetworkManager-devel>=1.0
-	 libnm-gtk>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		vmove usr/share/gtk-doc
-	}
-}

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (50 preceding siblings ...)
  2020-10-06 13:23 ` cinerea0
@ 2020-10-06 13:40 ` cinerea0
  2020-10-06 14:06 ` cinerea0
                   ` (38 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-06 13:40 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 72b9dff466459202b58e30b7b7a9fa934e2d03ba Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:06:34 -0400
Subject: [PATCH 1/3] New package: libnma-1.8.30

---
 common/shlibs           |  2 +-
 srcpkgs/libnma-devel    |  1 +
 srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/libnma-devel
 create mode 100644 srcpkgs/libnma/template

diff --git a/common/shlibs b/common/shlibs
index 36efd174d6b..91635660be4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2981,7 +2981,7 @@ libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
 liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
-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
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+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
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}
+
+libnma-devel_package() {
+	short_desc+=" - library development files"
+	depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove usr/share/gtk-doc
+	}
+}

From 2ca17ec4f553b00c82bb3b32c37867d71bd70417 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:09:38 -0400
Subject: [PATCH 2/3] network-manager-applet: update to 1.18.0

---
 common/shlibs                           |  1 -
 srcpkgs/libnm-gtk                       |  1 -
 srcpkgs/network-manager-applet-devel    |  1 -
 srcpkgs/network-manager-applet/template | 47 ++++---------------------
 4 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 120000 srcpkgs/libnm-gtk
 delete mode 120000 srcpkgs/network-manager-applet-devel

diff --git a/common/shlibs b/common/shlibs
index 91635660be4..00839f3c723 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -905,7 +905,6 @@ liblcms2.so.2 lcms2-2.2_1
 libcolord.so.2 libcolord-1.1.7_1
 libcolordprivate.so.2 libcolord-1.1.7_1
 libcolorhug.so.2 libcolord-1.1.7_1
-libnm-gtk.so.0 libnm-gtk-0.9.1.95_1
 libcaribou.so.0 caribou-0.4.0_1
 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
 libgrilo-0.3.so.0 grilo-0.3.2_1
diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/libnm-gtk
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/network-manager-applet-devel
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 0656107b1af..2d9861a94ba 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,14 +1,14 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.24
+version=1.18.0
 revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
- libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
- polkit-devel mobile-broadband-provider-info"
+ libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libgnome-keyring-devel libgudev-devel libnotify-devel libnma-devel
+ libsecret-devel polkit-devel mobile-broadband-provider-info"
 depends="NetworkManager hicolor-icon-theme iso-codes"
 short_desc="NetworkManager panel applet for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,38 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
+checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b
 lib32disabled=yes
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_build() {
-	export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs:${wrksrc}/src/libnm-gtk/.libs"
-}
-
-libnm-gtk_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
-	}
-}
-
-network-manager-applet-devel_package() {
-	depends="gtk+3-devel NetworkManager-devel>=1.0
-	 libnm-gtk>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		vmove usr/share/gtk-doc
-	}
-}

From 92ec1bdd5dc9227331993288404b2ef8f35d2bfb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:34:07 -0400
Subject: [PATCH 3/3] NetworkManager-strongswan: update to 1.5.2

---
 srcpkgs/NetworkManager-strongswan/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 4d8d2b14306..46c02d092e5 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,16 +1,16 @@
 # Template file for 'NetworkManager-strongswan'
 pkgname=NetworkManager-strongswan
-version=1.4.5
-revision=2
+version=1.5.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-more-warnings --without-libnm-glib
  --disable-more-warnings"
 hostmakedepends="intltool pkg-config"
-makedepends="NetworkManager-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel NetworkManager-devel libnma-devel libsecret-devel"
 depends="strongswan"
 short_desc="Strongswan NetworkManager plugin"
 maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://www.strongswan.org/"
 distfiles="https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-${version}.tar.bz2"
-checksum=343b68cbe32f65e2baa01b37716415e4360addc8c90209d45504b52b8864bd04
+checksum=c8452b952653881dcc2745f0ab460c061086215b297129212a743bd9e9f78169

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (51 preceding siblings ...)
  2020-10-06 13:40 ` cinerea0
@ 2020-10-06 14:06 ` cinerea0
  2020-10-06 15:21 ` cinerea0
                   ` (37 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-06 14:06 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 72b9dff466459202b58e30b7b7a9fa934e2d03ba Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:06:34 -0400
Subject: [PATCH 1/4] New package: libnma-1.8.30

---
 common/shlibs           |  2 +-
 srcpkgs/libnma-devel    |  1 +
 srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/libnma-devel
 create mode 100644 srcpkgs/libnma/template

diff --git a/common/shlibs b/common/shlibs
index 36efd174d6b..91635660be4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2981,7 +2981,7 @@ libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
 liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
-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
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+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
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}
+
+libnma-devel_package() {
+	short_desc+=" - library development files"
+	depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove usr/share/gtk-doc
+	}
+}

From 2ca17ec4f553b00c82bb3b32c37867d71bd70417 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:09:38 -0400
Subject: [PATCH 2/4] network-manager-applet: update to 1.18.0

---
 common/shlibs                           |  1 -
 srcpkgs/libnm-gtk                       |  1 -
 srcpkgs/network-manager-applet-devel    |  1 -
 srcpkgs/network-manager-applet/template | 47 ++++---------------------
 4 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 120000 srcpkgs/libnm-gtk
 delete mode 120000 srcpkgs/network-manager-applet-devel

diff --git a/common/shlibs b/common/shlibs
index 91635660be4..00839f3c723 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -905,7 +905,6 @@ liblcms2.so.2 lcms2-2.2_1
 libcolord.so.2 libcolord-1.1.7_1
 libcolordprivate.so.2 libcolord-1.1.7_1
 libcolorhug.so.2 libcolord-1.1.7_1
-libnm-gtk.so.0 libnm-gtk-0.9.1.95_1
 libcaribou.so.0 caribou-0.4.0_1
 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
 libgrilo-0.3.so.0 grilo-0.3.2_1
diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/libnm-gtk
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/network-manager-applet-devel
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 0656107b1af..2d9861a94ba 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,14 +1,14 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.24
+version=1.18.0
 revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
- libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
- polkit-devel mobile-broadband-provider-info"
+ libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libgnome-keyring-devel libgudev-devel libnotify-devel libnma-devel
+ libsecret-devel polkit-devel mobile-broadband-provider-info"
 depends="NetworkManager hicolor-icon-theme iso-codes"
 short_desc="NetworkManager panel applet for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,38 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
+checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b
 lib32disabled=yes
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_build() {
-	export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs:${wrksrc}/src/libnm-gtk/.libs"
-}
-
-libnm-gtk_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
-	}
-}
-
-network-manager-applet-devel_package() {
-	depends="gtk+3-devel NetworkManager-devel>=1.0
-	 libnm-gtk>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		vmove usr/share/gtk-doc
-	}
-}

From 92ec1bdd5dc9227331993288404b2ef8f35d2bfb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:34:07 -0400
Subject: [PATCH 3/4] NetworkManager-strongswan: update to 1.5.2

---
 srcpkgs/NetworkManager-strongswan/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 4d8d2b14306..46c02d092e5 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,16 +1,16 @@
 # Template file for 'NetworkManager-strongswan'
 pkgname=NetworkManager-strongswan
-version=1.4.5
-revision=2
+version=1.5.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-more-warnings --without-libnm-glib
  --disable-more-warnings"
 hostmakedepends="intltool pkg-config"
-makedepends="NetworkManager-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel NetworkManager-devel libnma-devel libsecret-devel"
 depends="strongswan"
 short_desc="Strongswan NetworkManager plugin"
 maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://www.strongswan.org/"
 distfiles="https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-${version}.tar.bz2"
-checksum=343b68cbe32f65e2baa01b37716415e4360addc8c90209d45504b52b8864bd04
+checksum=c8452b952653881dcc2745f0ab460c061086215b297129212a743bd9e9f78169

From b53e6adb7d7db896b6603a22475de8eb28607b8f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 10:05:40 -0400
Subject: [PATCH 4/4] NetworkManager-l2tp: change dependency to libnma-devel

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

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index d60f5878792..1dea408c423 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="gtk+3-devel glib-devel libglib-devel libsecret-devel
- network-manager-applet-devel libressl-devel nss-devel ppp-devel"
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+ libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"
 maintainer="Douglas Kosovic <doug@uq.edu.au>"

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (52 preceding siblings ...)
  2020-10-06 14:06 ` cinerea0
@ 2020-10-06 15:21 ` cinerea0
  2020-10-06 16:34 ` cinerea0
                   ` (36 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-06 15:21 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 72b9dff466459202b58e30b7b7a9fa934e2d03ba Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:06:34 -0400
Subject: [PATCH 1/5] New package: libnma-1.8.30

---
 common/shlibs           |  2 +-
 srcpkgs/libnma-devel    |  1 +
 srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/libnma-devel
 create mode 100644 srcpkgs/libnma/template

diff --git a/common/shlibs b/common/shlibs
index 36efd174d6b..91635660be4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2981,7 +2981,7 @@ libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
 liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
-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
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+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
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}
+
+libnma-devel_package() {
+	short_desc+=" - library development files"
+	depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove usr/share/gtk-doc
+	}
+}

From 2ca17ec4f553b00c82bb3b32c37867d71bd70417 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:09:38 -0400
Subject: [PATCH 2/5] network-manager-applet: update to 1.18.0

---
 common/shlibs                           |  1 -
 srcpkgs/libnm-gtk                       |  1 -
 srcpkgs/network-manager-applet-devel    |  1 -
 srcpkgs/network-manager-applet/template | 47 ++++---------------------
 4 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 120000 srcpkgs/libnm-gtk
 delete mode 120000 srcpkgs/network-manager-applet-devel

diff --git a/common/shlibs b/common/shlibs
index 91635660be4..00839f3c723 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -905,7 +905,6 @@ liblcms2.so.2 lcms2-2.2_1
 libcolord.so.2 libcolord-1.1.7_1
 libcolordprivate.so.2 libcolord-1.1.7_1
 libcolorhug.so.2 libcolord-1.1.7_1
-libnm-gtk.so.0 libnm-gtk-0.9.1.95_1
 libcaribou.so.0 caribou-0.4.0_1
 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
 libgrilo-0.3.so.0 grilo-0.3.2_1
diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/libnm-gtk
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/network-manager-applet-devel
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 0656107b1af..2d9861a94ba 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,14 +1,14 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.24
+version=1.18.0
 revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
- libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
- polkit-devel mobile-broadband-provider-info"
+ libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libgnome-keyring-devel libgudev-devel libnotify-devel libnma-devel
+ libsecret-devel polkit-devel mobile-broadband-provider-info"
 depends="NetworkManager hicolor-icon-theme iso-codes"
 short_desc="NetworkManager panel applet for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,38 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
+checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b
 lib32disabled=yes
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_build() {
-	export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs:${wrksrc}/src/libnm-gtk/.libs"
-}
-
-libnm-gtk_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
-	}
-}
-
-network-manager-applet-devel_package() {
-	depends="gtk+3-devel NetworkManager-devel>=1.0
-	 libnm-gtk>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		vmove usr/share/gtk-doc
-	}
-}

From 92ec1bdd5dc9227331993288404b2ef8f35d2bfb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:34:07 -0400
Subject: [PATCH 3/5] NetworkManager-strongswan: update to 1.5.2

---
 srcpkgs/NetworkManager-strongswan/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 4d8d2b14306..46c02d092e5 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,16 +1,16 @@
 # Template file for 'NetworkManager-strongswan'
 pkgname=NetworkManager-strongswan
-version=1.4.5
-revision=2
+version=1.5.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-more-warnings --without-libnm-glib
  --disable-more-warnings"
 hostmakedepends="intltool pkg-config"
-makedepends="NetworkManager-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel NetworkManager-devel libnma-devel libsecret-devel"
 depends="strongswan"
 short_desc="Strongswan NetworkManager plugin"
 maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://www.strongswan.org/"
 distfiles="https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-${version}.tar.bz2"
-checksum=343b68cbe32f65e2baa01b37716415e4360addc8c90209d45504b52b8864bd04
+checksum=c8452b952653881dcc2745f0ab460c061086215b297129212a743bd9e9f78169

From b53e6adb7d7db896b6603a22475de8eb28607b8f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 10:05:40 -0400
Subject: [PATCH 4/5] NetworkManager-l2tp: change dependency to libnma-devel

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

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index d60f5878792..1dea408c423 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="gtk+3-devel glib-devel libglib-devel libsecret-devel
- network-manager-applet-devel libressl-devel nss-devel ppp-devel"
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+ libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"
 maintainer="Douglas Kosovic <doug@uq.edu.au>"

From 9be7a3a1f2d437d5ffb3aa26d42dc34596a1c780 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 11:20:26 -0400
Subject: [PATCH 5/5] NetworkManager-openconnect: change dependency to
 libnma-devel

---
 srcpkgs/NetworkManager-openconnect/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index 327f2bd84cb..f32a075180f 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -1,18 +1,17 @@
-# Template build file for 'NetworkManager-openconnect'.
+# Template file for 'NetworkManager-openconnect'
 pkgname=NetworkManager-openconnect
 version=1.2.6
-revision=2
-lib32disabled=yes
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
-makedepends="gtk+3-devel network-manager-applet-devel libsecret-devel
- libxml2-devel openconnect-devel libressl-devel liblz4-devel
- gcr-devel"
+makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
+ libressl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-license="GPL-2"
-maintainer="Enno Boland <gottox@voidlinux.org>"
 checksum=95109803596a9782680a5dca3b51c4ad8ff7e126169d5431278cab694112975a
+lib32disabled=yes

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (53 preceding siblings ...)
  2020-10-06 15:21 ` cinerea0
@ 2020-10-06 16:34 ` cinerea0
  2020-10-06 22:19 ` cinerea0
                   ` (35 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-06 16:34 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 72b9dff466459202b58e30b7b7a9fa934e2d03ba Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:06:34 -0400
Subject: [PATCH 1/6] New package: libnma-1.8.30

---
 common/shlibs           |  2 +-
 srcpkgs/libnma-devel    |  1 +
 srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/libnma-devel
 create mode 100644 srcpkgs/libnma/template

diff --git a/common/shlibs b/common/shlibs
index 36efd174d6b..91635660be4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2981,7 +2981,7 @@ libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
 liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
-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
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+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
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}
+
+libnma-devel_package() {
+	short_desc+=" - library development files"
+	depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove usr/share/gtk-doc
+	}
+}

From 2ca17ec4f553b00c82bb3b32c37867d71bd70417 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:09:38 -0400
Subject: [PATCH 2/6] network-manager-applet: update to 1.18.0

---
 common/shlibs                           |  1 -
 srcpkgs/libnm-gtk                       |  1 -
 srcpkgs/network-manager-applet-devel    |  1 -
 srcpkgs/network-manager-applet/template | 47 ++++---------------------
 4 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 120000 srcpkgs/libnm-gtk
 delete mode 120000 srcpkgs/network-manager-applet-devel

diff --git a/common/shlibs b/common/shlibs
index 91635660be4..00839f3c723 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -905,7 +905,6 @@ liblcms2.so.2 lcms2-2.2_1
 libcolord.so.2 libcolord-1.1.7_1
 libcolordprivate.so.2 libcolord-1.1.7_1
 libcolorhug.so.2 libcolord-1.1.7_1
-libnm-gtk.so.0 libnm-gtk-0.9.1.95_1
 libcaribou.so.0 caribou-0.4.0_1
 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
 libgrilo-0.3.so.0 grilo-0.3.2_1
diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/libnm-gtk
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/network-manager-applet-devel
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 0656107b1af..2d9861a94ba 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,14 +1,14 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.24
+version=1.18.0
 revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
- libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
- polkit-devel mobile-broadband-provider-info"
+ libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libgnome-keyring-devel libgudev-devel libnotify-devel libnma-devel
+ libsecret-devel polkit-devel mobile-broadband-provider-info"
 depends="NetworkManager hicolor-icon-theme iso-codes"
 short_desc="NetworkManager panel applet for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,38 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
+checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b
 lib32disabled=yes
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_build() {
-	export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs:${wrksrc}/src/libnm-gtk/.libs"
-}
-
-libnm-gtk_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
-	}
-}
-
-network-manager-applet-devel_package() {
-	depends="gtk+3-devel NetworkManager-devel>=1.0
-	 libnm-gtk>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		vmove usr/share/gtk-doc
-	}
-}

From 92ec1bdd5dc9227331993288404b2ef8f35d2bfb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:34:07 -0400
Subject: [PATCH 3/6] NetworkManager-strongswan: update to 1.5.2

---
 srcpkgs/NetworkManager-strongswan/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 4d8d2b14306..46c02d092e5 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,16 +1,16 @@
 # Template file for 'NetworkManager-strongswan'
 pkgname=NetworkManager-strongswan
-version=1.4.5
-revision=2
+version=1.5.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-more-warnings --without-libnm-glib
  --disable-more-warnings"
 hostmakedepends="intltool pkg-config"
-makedepends="NetworkManager-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel NetworkManager-devel libnma-devel libsecret-devel"
 depends="strongswan"
 short_desc="Strongswan NetworkManager plugin"
 maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://www.strongswan.org/"
 distfiles="https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-${version}.tar.bz2"
-checksum=343b68cbe32f65e2baa01b37716415e4360addc8c90209d45504b52b8864bd04
+checksum=c8452b952653881dcc2745f0ab460c061086215b297129212a743bd9e9f78169

From b53e6adb7d7db896b6603a22475de8eb28607b8f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 10:05:40 -0400
Subject: [PATCH 4/6] NetworkManager-l2tp: change dependency to libnma-devel

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

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index d60f5878792..1dea408c423 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="gtk+3-devel glib-devel libglib-devel libsecret-devel
- network-manager-applet-devel libressl-devel nss-devel ppp-devel"
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+ libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"
 maintainer="Douglas Kosovic <doug@uq.edu.au>"

From 9be7a3a1f2d437d5ffb3aa26d42dc34596a1c780 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 11:20:26 -0400
Subject: [PATCH 5/6] NetworkManager-openconnect: change dependency to
 libnma-devel

---
 srcpkgs/NetworkManager-openconnect/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index 327f2bd84cb..f32a075180f 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -1,18 +1,17 @@
-# Template build file for 'NetworkManager-openconnect'.
+# Template file for 'NetworkManager-openconnect'
 pkgname=NetworkManager-openconnect
 version=1.2.6
-revision=2
-lib32disabled=yes
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
-makedepends="gtk+3-devel network-manager-applet-devel libsecret-devel
- libxml2-devel openconnect-devel libressl-devel liblz4-devel
- gcr-devel"
+makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
+ libressl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-license="GPL-2"
-maintainer="Enno Boland <gottox@voidlinux.org>"
 checksum=95109803596a9782680a5dca3b51c4ad8ff7e126169d5431278cab694112975a
+lib32disabled=yes

From 67d062296686207ed7b1bf697c75bfc50437056e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 12:33:51 -0400
Subject: [PATCH 6/6] NetworkManager-openvpn: update to 1.8.12

---
 ...isable-libnm-glib-support-by-default.patch | 52 -------------------
 srcpkgs/NetworkManager-openvpn/template       |  8 +--
 2 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch

diff --git a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
deleted file mode 100644
index 7eb72e1dbb6..00000000000
--- a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-source: https://git.archlinux.org/svntogit/packages.git/tree/trunk/0001-build-disable-libnm-glib-support-by-default.patch?h=packages/networkmanager-openvpn
-
-From 52aad4911ffad04cf8274b5574124a4d5470c7fa Mon Sep 17 00:00:00 2001
-Message-Id: <52aad4911ffad04cf8274b5574124a4d5470c7fa.1549642989.git.jan.steffens@gmail.com>
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Wed, 17 Oct 2018 15:21:30 +0200
-Subject: [PATCH] build: disable libnm-glib support by default
-
-By now nobody should be using this. Keep the code around for a little
-longer just in case anybody still uses this.
-
-The libnm-glib support also serves as an example how do we build two
-different versions of the properties plugin. We'll soon be in a similar
-situation with Gtk 4.0. (sigh.) Just don't drop it yet.
-
-Conflicts:
-	NEWS
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11ff5d0..eaf015b 100644
---- configure.ac
-+++ configure.ac
-@@ -75,20 +75,20 @@ dnl
- dnl GNOME support
- dnl
- AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
--AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openvpn without libnm-glib comatibility]), [], [with_libnm_glib_specified=no])
-+AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-openvpn with libnm-glib comatibility (depreacted)]), [], [with_libnm_glib_specified=no])
- if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
- 	if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
- 		AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
- 	fi
- fi
- if test "$with_gnome" != no; then
- 	with_gnome=yes
- fi
- if test "$with_libnm_glib_specified" == no; then
--	with_libnm_glib="$with_gnome"
-+	with_libnm_glib=no
- fi
--if test "$with_libnm_glib" != no; then
--	with_libnm_glib=yes
-+if test "$with_libnm_glib" != yes; then
-+	with_libnm_glib=no
- fi
- AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
- AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
--- 
-2.20.1
diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index 170d992326e..7f2c40e6de3 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,18 +1,18 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
-version=1.8.10
-revision=2
+version=1.8.12
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
-makedepends="gtk+3-devel libglib-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef
+checksum=0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f815318
 system_accounts="_nm_openvpn"
 lib32disabled=yes
 _nm_openvpn_homedir="/var/empty"

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (54 preceding siblings ...)
  2020-10-06 16:34 ` cinerea0
@ 2020-10-06 22:19 ` cinerea0
  2020-10-07  0:09 ` cinerea0
                   ` (34 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-06 22:19 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 72b9dff466459202b58e30b7b7a9fa934e2d03ba Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:06:34 -0400
Subject: [PATCH 1/7] New package: libnma-1.8.30

---
 common/shlibs           |  2 +-
 srcpkgs/libnma-devel    |  1 +
 srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/libnma-devel
 create mode 100644 srcpkgs/libnma/template

diff --git a/common/shlibs b/common/shlibs
index 36efd174d6b..91635660be4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2981,7 +2981,7 @@ libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
 liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
-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
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+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
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}
+
+libnma-devel_package() {
+	short_desc+=" - library development files"
+	depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove usr/share/gtk-doc
+	}
+}

From 2ca17ec4f553b00c82bb3b32c37867d71bd70417 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:09:38 -0400
Subject: [PATCH 2/7] network-manager-applet: update to 1.18.0

---
 common/shlibs                           |  1 -
 srcpkgs/libnm-gtk                       |  1 -
 srcpkgs/network-manager-applet-devel    |  1 -
 srcpkgs/network-manager-applet/template | 47 ++++---------------------
 4 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 120000 srcpkgs/libnm-gtk
 delete mode 120000 srcpkgs/network-manager-applet-devel

diff --git a/common/shlibs b/common/shlibs
index 91635660be4..00839f3c723 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -905,7 +905,6 @@ liblcms2.so.2 lcms2-2.2_1
 libcolord.so.2 libcolord-1.1.7_1
 libcolordprivate.so.2 libcolord-1.1.7_1
 libcolorhug.so.2 libcolord-1.1.7_1
-libnm-gtk.so.0 libnm-gtk-0.9.1.95_1
 libcaribou.so.0 caribou-0.4.0_1
 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
 libgrilo-0.3.so.0 grilo-0.3.2_1
diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/libnm-gtk
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/network-manager-applet-devel
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 0656107b1af..2d9861a94ba 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,14 +1,14 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.24
+version=1.18.0
 revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
- libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
- polkit-devel mobile-broadband-provider-info"
+ libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libgnome-keyring-devel libgudev-devel libnotify-devel libnma-devel
+ libsecret-devel polkit-devel mobile-broadband-provider-info"
 depends="NetworkManager hicolor-icon-theme iso-codes"
 short_desc="NetworkManager panel applet for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,38 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
+checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b
 lib32disabled=yes
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_build() {
-	export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs:${wrksrc}/src/libnm-gtk/.libs"
-}
-
-libnm-gtk_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
-	}
-}
-
-network-manager-applet-devel_package() {
-	depends="gtk+3-devel NetworkManager-devel>=1.0
-	 libnm-gtk>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		vmove usr/share/gtk-doc
-	}
-}

From 92ec1bdd5dc9227331993288404b2ef8f35d2bfb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:34:07 -0400
Subject: [PATCH 3/7] NetworkManager-strongswan: update to 1.5.2

---
 srcpkgs/NetworkManager-strongswan/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 4d8d2b14306..46c02d092e5 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,16 +1,16 @@
 # Template file for 'NetworkManager-strongswan'
 pkgname=NetworkManager-strongswan
-version=1.4.5
-revision=2
+version=1.5.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-more-warnings --without-libnm-glib
  --disable-more-warnings"
 hostmakedepends="intltool pkg-config"
-makedepends="NetworkManager-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel NetworkManager-devel libnma-devel libsecret-devel"
 depends="strongswan"
 short_desc="Strongswan NetworkManager plugin"
 maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://www.strongswan.org/"
 distfiles="https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-${version}.tar.bz2"
-checksum=343b68cbe32f65e2baa01b37716415e4360addc8c90209d45504b52b8864bd04
+checksum=c8452b952653881dcc2745f0ab460c061086215b297129212a743bd9e9f78169

From b53e6adb7d7db896b6603a22475de8eb28607b8f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 10:05:40 -0400
Subject: [PATCH 4/7] NetworkManager-l2tp: change dependency to libnma-devel

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

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index d60f5878792..1dea408c423 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="gtk+3-devel glib-devel libglib-devel libsecret-devel
- network-manager-applet-devel libressl-devel nss-devel ppp-devel"
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+ libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"
 maintainer="Douglas Kosovic <doug@uq.edu.au>"

From 9be7a3a1f2d437d5ffb3aa26d42dc34596a1c780 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 11:20:26 -0400
Subject: [PATCH 5/7] NetworkManager-openconnect: change dependency to
 libnma-devel

---
 srcpkgs/NetworkManager-openconnect/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index 327f2bd84cb..f32a075180f 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -1,18 +1,17 @@
-# Template build file for 'NetworkManager-openconnect'.
+# Template file for 'NetworkManager-openconnect'
 pkgname=NetworkManager-openconnect
 version=1.2.6
-revision=2
-lib32disabled=yes
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
-makedepends="gtk+3-devel network-manager-applet-devel libsecret-devel
- libxml2-devel openconnect-devel libressl-devel liblz4-devel
- gcr-devel"
+makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
+ libressl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-license="GPL-2"
-maintainer="Enno Boland <gottox@voidlinux.org>"
 checksum=95109803596a9782680a5dca3b51c4ad8ff7e126169d5431278cab694112975a
+lib32disabled=yes

From 67d062296686207ed7b1bf697c75bfc50437056e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 12:33:51 -0400
Subject: [PATCH 6/7] NetworkManager-openvpn: update to 1.8.12

---
 ...isable-libnm-glib-support-by-default.patch | 52 -------------------
 srcpkgs/NetworkManager-openvpn/template       |  8 +--
 2 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch

diff --git a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
deleted file mode 100644
index 7eb72e1dbb6..00000000000
--- a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-source: https://git.archlinux.org/svntogit/packages.git/tree/trunk/0001-build-disable-libnm-glib-support-by-default.patch?h=packages/networkmanager-openvpn
-
-From 52aad4911ffad04cf8274b5574124a4d5470c7fa Mon Sep 17 00:00:00 2001
-Message-Id: <52aad4911ffad04cf8274b5574124a4d5470c7fa.1549642989.git.jan.steffens@gmail.com>
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Wed, 17 Oct 2018 15:21:30 +0200
-Subject: [PATCH] build: disable libnm-glib support by default
-
-By now nobody should be using this. Keep the code around for a little
-longer just in case anybody still uses this.
-
-The libnm-glib support also serves as an example how do we build two
-different versions of the properties plugin. We'll soon be in a similar
-situation with Gtk 4.0. (sigh.) Just don't drop it yet.
-
-Conflicts:
-	NEWS
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11ff5d0..eaf015b 100644
---- configure.ac
-+++ configure.ac
-@@ -75,20 +75,20 @@ dnl
- dnl GNOME support
- dnl
- AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
--AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openvpn without libnm-glib comatibility]), [], [with_libnm_glib_specified=no])
-+AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-openvpn with libnm-glib comatibility (depreacted)]), [], [with_libnm_glib_specified=no])
- if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
- 	if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
- 		AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
- 	fi
- fi
- if test "$with_gnome" != no; then
- 	with_gnome=yes
- fi
- if test "$with_libnm_glib_specified" == no; then
--	with_libnm_glib="$with_gnome"
-+	with_libnm_glib=no
- fi
--if test "$with_libnm_glib" != no; then
--	with_libnm_glib=yes
-+if test "$with_libnm_glib" != yes; then
-+	with_libnm_glib=no
- fi
- AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
- AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
--- 
-2.20.1
diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index 170d992326e..7f2c40e6de3 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,18 +1,18 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
-version=1.8.10
-revision=2
+version=1.8.12
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
-makedepends="gtk+3-devel libglib-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef
+checksum=0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f815318
 system_accounts="_nm_openvpn"
 lib32disabled=yes
 _nm_openvpn_homedir="/var/empty"

From 0fcb2577b3074df7d0da5067d8f50eb81a40f111 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 18:18:52 -0400
Subject: [PATCH 7/7] NetworkManager-pptp: change dependency to libnma-devel

---
 srcpkgs/NetworkManager-pptp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 7889bb47800..9c541cf246f 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-pptp'
 pkgname=NetworkManager-pptp
 version=1.2.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--without-libnm-glib"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="libglib-devel gtk+3-devel libsecret-devel ppp-devel
- network-manager-applet-devel NetworkManager-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel
+ NetworkManager-devel ppp-devel"
 depends="pptpclient"
 short_desc="NetworkManager VPN plugin for pptp"
 maintainer="Enno Boland <gottox@voidlinux.org>"

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (55 preceding siblings ...)
  2020-10-06 22:19 ` cinerea0
@ 2020-10-07  0:09 ` cinerea0
  2020-10-07  1:03 ` cinerea0
                   ` (33 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-07  0:09 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 72b9dff466459202b58e30b7b7a9fa934e2d03ba Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:06:34 -0400
Subject: [PATCH 1/8] New package: libnma-1.8.30

---
 common/shlibs           |  2 +-
 srcpkgs/libnma-devel    |  1 +
 srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/libnma-devel
 create mode 100644 srcpkgs/libnma/template

diff --git a/common/shlibs b/common/shlibs
index 36efd174d6b..91635660be4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2981,7 +2981,7 @@ libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
 liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
-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
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+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
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}
+
+libnma-devel_package() {
+	short_desc+=" - library development files"
+	depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove usr/share/gtk-doc
+	}
+}

From 2ca17ec4f553b00c82bb3b32c37867d71bd70417 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:09:38 -0400
Subject: [PATCH 2/8] network-manager-applet: update to 1.18.0

---
 common/shlibs                           |  1 -
 srcpkgs/libnm-gtk                       |  1 -
 srcpkgs/network-manager-applet-devel    |  1 -
 srcpkgs/network-manager-applet/template | 47 ++++---------------------
 4 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 120000 srcpkgs/libnm-gtk
 delete mode 120000 srcpkgs/network-manager-applet-devel

diff --git a/common/shlibs b/common/shlibs
index 91635660be4..00839f3c723 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -905,7 +905,6 @@ liblcms2.so.2 lcms2-2.2_1
 libcolord.so.2 libcolord-1.1.7_1
 libcolordprivate.so.2 libcolord-1.1.7_1
 libcolorhug.so.2 libcolord-1.1.7_1
-libnm-gtk.so.0 libnm-gtk-0.9.1.95_1
 libcaribou.so.0 caribou-0.4.0_1
 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
 libgrilo-0.3.so.0 grilo-0.3.2_1
diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/libnm-gtk
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/network-manager-applet-devel
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 0656107b1af..2d9861a94ba 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,14 +1,14 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.24
+version=1.18.0
 revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
- libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
- polkit-devel mobile-broadband-provider-info"
+ libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libgnome-keyring-devel libgudev-devel libnotify-devel libnma-devel
+ libsecret-devel polkit-devel mobile-broadband-provider-info"
 depends="NetworkManager hicolor-icon-theme iso-codes"
 short_desc="NetworkManager panel applet for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,38 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
+checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b
 lib32disabled=yes
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_build() {
-	export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs:${wrksrc}/src/libnm-gtk/.libs"
-}
-
-libnm-gtk_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
-	}
-}
-
-network-manager-applet-devel_package() {
-	depends="gtk+3-devel NetworkManager-devel>=1.0
-	 libnm-gtk>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		vmove usr/share/gtk-doc
-	}
-}

From 92ec1bdd5dc9227331993288404b2ef8f35d2bfb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:34:07 -0400
Subject: [PATCH 3/8] NetworkManager-strongswan: update to 1.5.2

---
 srcpkgs/NetworkManager-strongswan/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 4d8d2b14306..46c02d092e5 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,16 +1,16 @@
 # Template file for 'NetworkManager-strongswan'
 pkgname=NetworkManager-strongswan
-version=1.4.5
-revision=2
+version=1.5.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-more-warnings --without-libnm-glib
  --disable-more-warnings"
 hostmakedepends="intltool pkg-config"
-makedepends="NetworkManager-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel NetworkManager-devel libnma-devel libsecret-devel"
 depends="strongswan"
 short_desc="Strongswan NetworkManager plugin"
 maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://www.strongswan.org/"
 distfiles="https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-${version}.tar.bz2"
-checksum=343b68cbe32f65e2baa01b37716415e4360addc8c90209d45504b52b8864bd04
+checksum=c8452b952653881dcc2745f0ab460c061086215b297129212a743bd9e9f78169

From b53e6adb7d7db896b6603a22475de8eb28607b8f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 10:05:40 -0400
Subject: [PATCH 4/8] NetworkManager-l2tp: change dependency to libnma-devel

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

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index d60f5878792..1dea408c423 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="gtk+3-devel glib-devel libglib-devel libsecret-devel
- network-manager-applet-devel libressl-devel nss-devel ppp-devel"
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+ libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"
 maintainer="Douglas Kosovic <doug@uq.edu.au>"

From 9be7a3a1f2d437d5ffb3aa26d42dc34596a1c780 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 11:20:26 -0400
Subject: [PATCH 5/8] NetworkManager-openconnect: change dependency to
 libnma-devel

---
 srcpkgs/NetworkManager-openconnect/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index 327f2bd84cb..f32a075180f 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -1,18 +1,17 @@
-# Template build file for 'NetworkManager-openconnect'.
+# Template file for 'NetworkManager-openconnect'
 pkgname=NetworkManager-openconnect
 version=1.2.6
-revision=2
-lib32disabled=yes
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
-makedepends="gtk+3-devel network-manager-applet-devel libsecret-devel
- libxml2-devel openconnect-devel libressl-devel liblz4-devel
- gcr-devel"
+makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
+ libressl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-license="GPL-2"
-maintainer="Enno Boland <gottox@voidlinux.org>"
 checksum=95109803596a9782680a5dca3b51c4ad8ff7e126169d5431278cab694112975a
+lib32disabled=yes

From 67d062296686207ed7b1bf697c75bfc50437056e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 12:33:51 -0400
Subject: [PATCH 6/8] NetworkManager-openvpn: update to 1.8.12

---
 ...isable-libnm-glib-support-by-default.patch | 52 -------------------
 srcpkgs/NetworkManager-openvpn/template       |  8 +--
 2 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch

diff --git a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
deleted file mode 100644
index 7eb72e1dbb6..00000000000
--- a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-source: https://git.archlinux.org/svntogit/packages.git/tree/trunk/0001-build-disable-libnm-glib-support-by-default.patch?h=packages/networkmanager-openvpn
-
-From 52aad4911ffad04cf8274b5574124a4d5470c7fa Mon Sep 17 00:00:00 2001
-Message-Id: <52aad4911ffad04cf8274b5574124a4d5470c7fa.1549642989.git.jan.steffens@gmail.com>
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Wed, 17 Oct 2018 15:21:30 +0200
-Subject: [PATCH] build: disable libnm-glib support by default
-
-By now nobody should be using this. Keep the code around for a little
-longer just in case anybody still uses this.
-
-The libnm-glib support also serves as an example how do we build two
-different versions of the properties plugin. We'll soon be in a similar
-situation with Gtk 4.0. (sigh.) Just don't drop it yet.
-
-Conflicts:
-	NEWS
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11ff5d0..eaf015b 100644
---- configure.ac
-+++ configure.ac
-@@ -75,20 +75,20 @@ dnl
- dnl GNOME support
- dnl
- AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
--AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openvpn without libnm-glib comatibility]), [], [with_libnm_glib_specified=no])
-+AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-openvpn with libnm-glib comatibility (depreacted)]), [], [with_libnm_glib_specified=no])
- if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
- 	if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
- 		AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
- 	fi
- fi
- if test "$with_gnome" != no; then
- 	with_gnome=yes
- fi
- if test "$with_libnm_glib_specified" == no; then
--	with_libnm_glib="$with_gnome"
-+	with_libnm_glib=no
- fi
--if test "$with_libnm_glib" != no; then
--	with_libnm_glib=yes
-+if test "$with_libnm_glib" != yes; then
-+	with_libnm_glib=no
- fi
- AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
- AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
--- 
-2.20.1
diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index 170d992326e..7f2c40e6de3 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,18 +1,18 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
-version=1.8.10
-revision=2
+version=1.8.12
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
-makedepends="gtk+3-devel libglib-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef
+checksum=0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f815318
 system_accounts="_nm_openvpn"
 lib32disabled=yes
 _nm_openvpn_homedir="/var/empty"

From 0fcb2577b3074df7d0da5067d8f50eb81a40f111 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 18:18:52 -0400
Subject: [PATCH 7/8] NetworkManager-pptp: change dependency to libnma-devel

---
 srcpkgs/NetworkManager-pptp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 7889bb47800..9c541cf246f 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-pptp'
 pkgname=NetworkManager-pptp
 version=1.2.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--without-libnm-glib"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="libglib-devel gtk+3-devel libsecret-devel ppp-devel
- network-manager-applet-devel NetworkManager-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel
+ NetworkManager-devel ppp-devel"
 depends="pptpclient"
 short_desc="NetworkManager VPN plugin for pptp"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From e795e479f8820f93e1c80846f9df2f9d667e7e99 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 20:09:35 -0400
Subject: [PATCH 8/8] gnome-control-center: update to 3.38.1

---
 srcpkgs/gnome-control-center/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 191101afaad..b4be62deaa3 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.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
  gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
  libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
- libpwquality-devel mit-krb5-devel network-manager-applet-devel polkit-devel
+ libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
  pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
  libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
  clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
@@ -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=f6b6b5b8ef9c38d895ba5af87f31adae02194ad86c9aa6cff2d2b9755c2db1da
+checksum=8d90006c610f6fccb3cddbcf413b1bc4137fb4977b901a3989420fe160082026
 
 build_options="cheese"
 build_options_default="cheese"

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (56 preceding siblings ...)
  2020-10-07  0:09 ` cinerea0
@ 2020-10-07  1:03 ` cinerea0
  2020-10-07  2:30 ` cinerea0
                   ` (32 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-07  1:03 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 72b9dff466459202b58e30b7b7a9fa934e2d03ba Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:06:34 -0400
Subject: [PATCH 1/9] New package: libnma-1.8.30

---
 common/shlibs           |  2 +-
 srcpkgs/libnma-devel    |  1 +
 srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/libnma-devel
 create mode 100644 srcpkgs/libnma/template

diff --git a/common/shlibs b/common/shlibs
index 36efd174d6b..91635660be4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2981,7 +2981,7 @@ libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
 liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
-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
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+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
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}
+
+libnma-devel_package() {
+	short_desc+=" - library development files"
+	depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove usr/share/gtk-doc
+	}
+}

From 2ca17ec4f553b00c82bb3b32c37867d71bd70417 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:09:38 -0400
Subject: [PATCH 2/9] network-manager-applet: update to 1.18.0

---
 common/shlibs                           |  1 -
 srcpkgs/libnm-gtk                       |  1 -
 srcpkgs/network-manager-applet-devel    |  1 -
 srcpkgs/network-manager-applet/template | 47 ++++---------------------
 4 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 120000 srcpkgs/libnm-gtk
 delete mode 120000 srcpkgs/network-manager-applet-devel

diff --git a/common/shlibs b/common/shlibs
index 91635660be4..00839f3c723 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -905,7 +905,6 @@ liblcms2.so.2 lcms2-2.2_1
 libcolord.so.2 libcolord-1.1.7_1
 libcolordprivate.so.2 libcolord-1.1.7_1
 libcolorhug.so.2 libcolord-1.1.7_1
-libnm-gtk.so.0 libnm-gtk-0.9.1.95_1
 libcaribou.so.0 caribou-0.4.0_1
 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
 libgrilo-0.3.so.0 grilo-0.3.2_1
diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/libnm-gtk
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/network-manager-applet-devel
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 0656107b1af..2d9861a94ba 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,14 +1,14 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.24
+version=1.18.0
 revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
- libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
- polkit-devel mobile-broadband-provider-info"
+ libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libgnome-keyring-devel libgudev-devel libnotify-devel libnma-devel
+ libsecret-devel polkit-devel mobile-broadband-provider-info"
 depends="NetworkManager hicolor-icon-theme iso-codes"
 short_desc="NetworkManager panel applet for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,38 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
+checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b
 lib32disabled=yes
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_build() {
-	export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs:${wrksrc}/src/libnm-gtk/.libs"
-}
-
-libnm-gtk_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
-	}
-}
-
-network-manager-applet-devel_package() {
-	depends="gtk+3-devel NetworkManager-devel>=1.0
-	 libnm-gtk>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		vmove usr/share/gtk-doc
-	}
-}

From 92ec1bdd5dc9227331993288404b2ef8f35d2bfb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:34:07 -0400
Subject: [PATCH 3/9] NetworkManager-strongswan: update to 1.5.2

---
 srcpkgs/NetworkManager-strongswan/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 4d8d2b14306..46c02d092e5 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,16 +1,16 @@
 # Template file for 'NetworkManager-strongswan'
 pkgname=NetworkManager-strongswan
-version=1.4.5
-revision=2
+version=1.5.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-more-warnings --without-libnm-glib
  --disable-more-warnings"
 hostmakedepends="intltool pkg-config"
-makedepends="NetworkManager-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel NetworkManager-devel libnma-devel libsecret-devel"
 depends="strongswan"
 short_desc="Strongswan NetworkManager plugin"
 maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://www.strongswan.org/"
 distfiles="https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-${version}.tar.bz2"
-checksum=343b68cbe32f65e2baa01b37716415e4360addc8c90209d45504b52b8864bd04
+checksum=c8452b952653881dcc2745f0ab460c061086215b297129212a743bd9e9f78169

From b53e6adb7d7db896b6603a22475de8eb28607b8f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 10:05:40 -0400
Subject: [PATCH 4/9] NetworkManager-l2tp: change dependency to libnma-devel

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

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index d60f5878792..1dea408c423 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="gtk+3-devel glib-devel libglib-devel libsecret-devel
- network-manager-applet-devel libressl-devel nss-devel ppp-devel"
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+ libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"
 maintainer="Douglas Kosovic <doug@uq.edu.au>"

From 9be7a3a1f2d437d5ffb3aa26d42dc34596a1c780 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 11:20:26 -0400
Subject: [PATCH 5/9] NetworkManager-openconnect: change dependency to
 libnma-devel

---
 srcpkgs/NetworkManager-openconnect/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index 327f2bd84cb..f32a075180f 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -1,18 +1,17 @@
-# Template build file for 'NetworkManager-openconnect'.
+# Template file for 'NetworkManager-openconnect'
 pkgname=NetworkManager-openconnect
 version=1.2.6
-revision=2
-lib32disabled=yes
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
-makedepends="gtk+3-devel network-manager-applet-devel libsecret-devel
- libxml2-devel openconnect-devel libressl-devel liblz4-devel
- gcr-devel"
+makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
+ libressl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-license="GPL-2"
-maintainer="Enno Boland <gottox@voidlinux.org>"
 checksum=95109803596a9782680a5dca3b51c4ad8ff7e126169d5431278cab694112975a
+lib32disabled=yes

From 67d062296686207ed7b1bf697c75bfc50437056e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 12:33:51 -0400
Subject: [PATCH 6/9] NetworkManager-openvpn: update to 1.8.12

---
 ...isable-libnm-glib-support-by-default.patch | 52 -------------------
 srcpkgs/NetworkManager-openvpn/template       |  8 +--
 2 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch

diff --git a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
deleted file mode 100644
index 7eb72e1dbb6..00000000000
--- a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-source: https://git.archlinux.org/svntogit/packages.git/tree/trunk/0001-build-disable-libnm-glib-support-by-default.patch?h=packages/networkmanager-openvpn
-
-From 52aad4911ffad04cf8274b5574124a4d5470c7fa Mon Sep 17 00:00:00 2001
-Message-Id: <52aad4911ffad04cf8274b5574124a4d5470c7fa.1549642989.git.jan.steffens@gmail.com>
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Wed, 17 Oct 2018 15:21:30 +0200
-Subject: [PATCH] build: disable libnm-glib support by default
-
-By now nobody should be using this. Keep the code around for a little
-longer just in case anybody still uses this.
-
-The libnm-glib support also serves as an example how do we build two
-different versions of the properties plugin. We'll soon be in a similar
-situation with Gtk 4.0. (sigh.) Just don't drop it yet.
-
-Conflicts:
-	NEWS
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11ff5d0..eaf015b 100644
---- configure.ac
-+++ configure.ac
-@@ -75,20 +75,20 @@ dnl
- dnl GNOME support
- dnl
- AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
--AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openvpn without libnm-glib comatibility]), [], [with_libnm_glib_specified=no])
-+AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-openvpn with libnm-glib comatibility (depreacted)]), [], [with_libnm_glib_specified=no])
- if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
- 	if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
- 		AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
- 	fi
- fi
- if test "$with_gnome" != no; then
- 	with_gnome=yes
- fi
- if test "$with_libnm_glib_specified" == no; then
--	with_libnm_glib="$with_gnome"
-+	with_libnm_glib=no
- fi
--if test "$with_libnm_glib" != no; then
--	with_libnm_glib=yes
-+if test "$with_libnm_glib" != yes; then
-+	with_libnm_glib=no
- fi
- AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
- AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
--- 
-2.20.1
diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index 170d992326e..7f2c40e6de3 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,18 +1,18 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
-version=1.8.10
-revision=2
+version=1.8.12
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
-makedepends="gtk+3-devel libglib-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef
+checksum=0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f815318
 system_accounts="_nm_openvpn"
 lib32disabled=yes
 _nm_openvpn_homedir="/var/empty"

From 0fcb2577b3074df7d0da5067d8f50eb81a40f111 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 18:18:52 -0400
Subject: [PATCH 7/9] NetworkManager-pptp: change dependency to libnma-devel

---
 srcpkgs/NetworkManager-pptp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 7889bb47800..9c541cf246f 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-pptp'
 pkgname=NetworkManager-pptp
 version=1.2.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--without-libnm-glib"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="libglib-devel gtk+3-devel libsecret-devel ppp-devel
- network-manager-applet-devel NetworkManager-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel
+ NetworkManager-devel ppp-devel"
 depends="pptpclient"
 short_desc="NetworkManager VPN plugin for pptp"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From e795e479f8820f93e1c80846f9df2f9d667e7e99 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 20:09:35 -0400
Subject: [PATCH 8/9] gnome-control-center: update to 3.38.1

---
 srcpkgs/gnome-control-center/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 191101afaad..b4be62deaa3 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.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
  gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
  libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
- libpwquality-devel mit-krb5-devel network-manager-applet-devel polkit-devel
+ libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
  pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
  libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
  clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
@@ -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=f6b6b5b8ef9c38d895ba5af87f31adae02194ad86c9aa6cff2d2b9755c2db1da
+checksum=8d90006c610f6fccb3cddbcf413b1bc4137fb4977b901a3989420fe160082026
 
 build_options="cheese"
 build_options_default="cheese"

From f62c87e772d0561e473a6e628ce2585dac7c55c8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 21:03:32 -0400
Subject: [PATCH 9/9] gnome-initial-setup: update to 3.38.1

---
 srcpkgs/gnome-initial-setup/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 63abd3c5c83..12886a0f9ae 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.0
+version=3.38.1
 revision=1
 build_style=meson
 configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config glib-devel gettext"
 makedepends="NetworkManager-devel accountsservice-devel libglib-devel
  gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
  gnome-online-accounts-devel gdm-devel libpwquality-devel
- mit-krb5-devel vala-devel network-manager-applet-devel polkit-devel
+ mit-krb5-devel vala-devel libnma-devel polkit-devel
  rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
  pango-devel"
 depends="iso-codes"
@@ -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=3a857aef5efb689f408632db8469ad27620f762d977070a36035c522c6f82759
+checksum=e55d4f4073998e0fb7b3dfcc470e2a4c7d950a96bedab15011b9084ebc813676

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (57 preceding siblings ...)
  2020-10-07  1:03 ` cinerea0
@ 2020-10-07  2:30 ` cinerea0
  2020-10-07  3:09 ` CameronNemo
                   ` (31 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-07  2:30 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 72b9dff466459202b58e30b7b7a9fa934e2d03ba Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:06:34 -0400
Subject: [PATCH 01/10] New package: libnma-1.8.30

---
 common/shlibs           |  2 +-
 srcpkgs/libnma-devel    |  1 +
 srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/libnma-devel
 create mode 100644 srcpkgs/libnma/template

diff --git a/common/shlibs b/common/shlibs
index 36efd174d6b..91635660be4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2981,7 +2981,7 @@ libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
 liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
-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
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+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
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}
+
+libnma-devel_package() {
+	short_desc+=" - library development files"
+	depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove usr/share/gtk-doc
+	}
+}

From 2ca17ec4f553b00c82bb3b32c37867d71bd70417 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:09:38 -0400
Subject: [PATCH 02/10] network-manager-applet: update to 1.18.0

---
 common/shlibs                           |  1 -
 srcpkgs/libnm-gtk                       |  1 -
 srcpkgs/network-manager-applet-devel    |  1 -
 srcpkgs/network-manager-applet/template | 47 ++++---------------------
 4 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 120000 srcpkgs/libnm-gtk
 delete mode 120000 srcpkgs/network-manager-applet-devel

diff --git a/common/shlibs b/common/shlibs
index 91635660be4..00839f3c723 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -905,7 +905,6 @@ liblcms2.so.2 lcms2-2.2_1
 libcolord.so.2 libcolord-1.1.7_1
 libcolordprivate.so.2 libcolord-1.1.7_1
 libcolorhug.so.2 libcolord-1.1.7_1
-libnm-gtk.so.0 libnm-gtk-0.9.1.95_1
 libcaribou.so.0 caribou-0.4.0_1
 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
 libgrilo-0.3.so.0 grilo-0.3.2_1
diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/libnm-gtk
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/network-manager-applet-devel
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 0656107b1af..2d9861a94ba 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,14 +1,14 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.24
+version=1.18.0
 revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
- libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
- polkit-devel mobile-broadband-provider-info"
+ libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libgnome-keyring-devel libgudev-devel libnotify-devel libnma-devel
+ libsecret-devel polkit-devel mobile-broadband-provider-info"
 depends="NetworkManager hicolor-icon-theme iso-codes"
 short_desc="NetworkManager panel applet for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,38 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
+checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b
 lib32disabled=yes
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_build() {
-	export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs:${wrksrc}/src/libnm-gtk/.libs"
-}
-
-libnm-gtk_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
-	}
-}
-
-network-manager-applet-devel_package() {
-	depends="gtk+3-devel NetworkManager-devel>=1.0
-	 libnm-gtk>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		vmove usr/share/gtk-doc
-	}
-}

From 92ec1bdd5dc9227331993288404b2ef8f35d2bfb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:34:07 -0400
Subject: [PATCH 03/10] NetworkManager-strongswan: update to 1.5.2

---
 srcpkgs/NetworkManager-strongswan/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 4d8d2b14306..46c02d092e5 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,16 +1,16 @@
 # Template file for 'NetworkManager-strongswan'
 pkgname=NetworkManager-strongswan
-version=1.4.5
-revision=2
+version=1.5.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-more-warnings --without-libnm-glib
  --disable-more-warnings"
 hostmakedepends="intltool pkg-config"
-makedepends="NetworkManager-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel NetworkManager-devel libnma-devel libsecret-devel"
 depends="strongswan"
 short_desc="Strongswan NetworkManager plugin"
 maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://www.strongswan.org/"
 distfiles="https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-${version}.tar.bz2"
-checksum=343b68cbe32f65e2baa01b37716415e4360addc8c90209d45504b52b8864bd04
+checksum=c8452b952653881dcc2745f0ab460c061086215b297129212a743bd9e9f78169

From b53e6adb7d7db896b6603a22475de8eb28607b8f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 10:05:40 -0400
Subject: [PATCH 04/10] NetworkManager-l2tp: change dependency to libnma-devel

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

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index d60f5878792..1dea408c423 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="gtk+3-devel glib-devel libglib-devel libsecret-devel
- network-manager-applet-devel libressl-devel nss-devel ppp-devel"
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+ libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"
 maintainer="Douglas Kosovic <doug@uq.edu.au>"

From 9be7a3a1f2d437d5ffb3aa26d42dc34596a1c780 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 11:20:26 -0400
Subject: [PATCH 05/10] NetworkManager-openconnect: change dependency to
 libnma-devel

---
 srcpkgs/NetworkManager-openconnect/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index 327f2bd84cb..f32a075180f 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -1,18 +1,17 @@
-# Template build file for 'NetworkManager-openconnect'.
+# Template file for 'NetworkManager-openconnect'
 pkgname=NetworkManager-openconnect
 version=1.2.6
-revision=2
-lib32disabled=yes
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
-makedepends="gtk+3-devel network-manager-applet-devel libsecret-devel
- libxml2-devel openconnect-devel libressl-devel liblz4-devel
- gcr-devel"
+makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
+ libressl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-license="GPL-2"
-maintainer="Enno Boland <gottox@voidlinux.org>"
 checksum=95109803596a9782680a5dca3b51c4ad8ff7e126169d5431278cab694112975a
+lib32disabled=yes

From 67d062296686207ed7b1bf697c75bfc50437056e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 12:33:51 -0400
Subject: [PATCH 06/10] NetworkManager-openvpn: update to 1.8.12

---
 ...isable-libnm-glib-support-by-default.patch | 52 -------------------
 srcpkgs/NetworkManager-openvpn/template       |  8 +--
 2 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch

diff --git a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
deleted file mode 100644
index 7eb72e1dbb6..00000000000
--- a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-source: https://git.archlinux.org/svntogit/packages.git/tree/trunk/0001-build-disable-libnm-glib-support-by-default.patch?h=packages/networkmanager-openvpn
-
-From 52aad4911ffad04cf8274b5574124a4d5470c7fa Mon Sep 17 00:00:00 2001
-Message-Id: <52aad4911ffad04cf8274b5574124a4d5470c7fa.1549642989.git.jan.steffens@gmail.com>
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Wed, 17 Oct 2018 15:21:30 +0200
-Subject: [PATCH] build: disable libnm-glib support by default
-
-By now nobody should be using this. Keep the code around for a little
-longer just in case anybody still uses this.
-
-The libnm-glib support also serves as an example how do we build two
-different versions of the properties plugin. We'll soon be in a similar
-situation with Gtk 4.0. (sigh.) Just don't drop it yet.
-
-Conflicts:
-	NEWS
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11ff5d0..eaf015b 100644
---- configure.ac
-+++ configure.ac
-@@ -75,20 +75,20 @@ dnl
- dnl GNOME support
- dnl
- AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
--AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openvpn without libnm-glib comatibility]), [], [with_libnm_glib_specified=no])
-+AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-openvpn with libnm-glib comatibility (depreacted)]), [], [with_libnm_glib_specified=no])
- if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
- 	if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
- 		AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
- 	fi
- fi
- if test "$with_gnome" != no; then
- 	with_gnome=yes
- fi
- if test "$with_libnm_glib_specified" == no; then
--	with_libnm_glib="$with_gnome"
-+	with_libnm_glib=no
- fi
--if test "$with_libnm_glib" != no; then
--	with_libnm_glib=yes
-+if test "$with_libnm_glib" != yes; then
-+	with_libnm_glib=no
- fi
- AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
- AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
--- 
-2.20.1
diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index 170d992326e..7f2c40e6de3 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,18 +1,18 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
-version=1.8.10
-revision=2
+version=1.8.12
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
-makedepends="gtk+3-devel libglib-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef
+checksum=0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f815318
 system_accounts="_nm_openvpn"
 lib32disabled=yes
 _nm_openvpn_homedir="/var/empty"

From 0fcb2577b3074df7d0da5067d8f50eb81a40f111 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 18:18:52 -0400
Subject: [PATCH 07/10] NetworkManager-pptp: change dependency to libnma-devel

---
 srcpkgs/NetworkManager-pptp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 7889bb47800..9c541cf246f 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-pptp'
 pkgname=NetworkManager-pptp
 version=1.2.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--without-libnm-glib"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="libglib-devel gtk+3-devel libsecret-devel ppp-devel
- network-manager-applet-devel NetworkManager-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel
+ NetworkManager-devel ppp-devel"
 depends="pptpclient"
 short_desc="NetworkManager VPN plugin for pptp"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From e795e479f8820f93e1c80846f9df2f9d667e7e99 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 20:09:35 -0400
Subject: [PATCH 08/10] gnome-control-center: update to 3.38.1

---
 srcpkgs/gnome-control-center/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 191101afaad..b4be62deaa3 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.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
  gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
  libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
- libpwquality-devel mit-krb5-devel network-manager-applet-devel polkit-devel
+ libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
  pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
  libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
  clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
@@ -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=f6b6b5b8ef9c38d895ba5af87f31adae02194ad86c9aa6cff2d2b9755c2db1da
+checksum=8d90006c610f6fccb3cddbcf413b1bc4137fb4977b901a3989420fe160082026
 
 build_options="cheese"
 build_options_default="cheese"

From f62c87e772d0561e473a6e628ce2585dac7c55c8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 21:03:32 -0400
Subject: [PATCH 09/10] gnome-initial-setup: update to 3.38.1

---
 srcpkgs/gnome-initial-setup/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 63abd3c5c83..12886a0f9ae 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.0
+version=3.38.1
 revision=1
 build_style=meson
 configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config glib-devel gettext"
 makedepends="NetworkManager-devel accountsservice-devel libglib-devel
  gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
  gnome-online-accounts-devel gdm-devel libpwquality-devel
- mit-krb5-devel vala-devel network-manager-applet-devel polkit-devel
+ mit-krb5-devel vala-devel libnma-devel polkit-devel
  rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
  pango-devel"
 depends="iso-codes"
@@ -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=3a857aef5efb689f408632db8469ad27620f762d977070a36035c522c6f82759
+checksum=e55d4f4073998e0fb7b3dfcc470e2a4c7d950a96bedab15011b9084ebc813676

From c94c6600aba7d99d89c17eb961e5766a6c5bacf7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 22:29:32 -0400
Subject: [PATCH 10/10] gnome-shell: update to 3.38.1

---
 srcpkgs/gnome-shell/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index f27795572ef..6753b6ac54e 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=3.38.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper=gir
@@ -12,7 +12,7 @@ makedepends="at-spi2-atk caribou-devel evolution-data-server-devel folks-devel
  gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
- network-manager-applet-devel polkit-devel pulseaudio-devel
+ libnma-devel polkit-devel pulseaudio-devel
  startup-notification-devel telepathy-logger-devel gnome-autoar-devel"
 depends="caribou elogind glxinfo gnome-control-center gsettings-desktop-schemas upower"
 short_desc="GNOME core user interface"
@@ -21,7 +21,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c626403bc0875ee6da8c7a62ac0cee312badb523af073cb166125015a75a0a97
+checksum=b789e3296463c4cbfa329ad1724df38439c3e6d7537a01025cd8f2fec8c90bb4
 
 # needs X
 do_check() {

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (58 preceding siblings ...)
  2020-10-07  2:30 ` cinerea0
@ 2020-10-07  3:09 ` CameronNemo
  2020-10-07  3:27 ` [PR PATCH] [Updated] " cinerea0
                   ` (30 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: CameronNemo @ 2020-10-07  3:09 UTC (permalink / raw)
  To: ml

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

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-704664816

Comment:
@Gottox your name is all over these packages, you might want to take a look.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (59 preceding siblings ...)
  2020-10-07  3:09 ` CameronNemo
@ 2020-10-07  3:27 ` cinerea0
  2020-10-07  4:17 ` cinerea0
                   ` (29 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-07  3:27 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 72b9dff466459202b58e30b7b7a9fa934e2d03ba Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:06:34 -0400
Subject: [PATCH 01/11] New package: libnma-1.8.30

---
 common/shlibs           |  2 +-
 srcpkgs/libnma-devel    |  1 +
 srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/libnma-devel
 create mode 100644 srcpkgs/libnma/template

diff --git a/common/shlibs b/common/shlibs
index 36efd174d6b..91635660be4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2981,7 +2981,7 @@ libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
 liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
-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
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+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
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}
+
+libnma-devel_package() {
+	short_desc+=" - library development files"
+	depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove usr/share/gtk-doc
+	}
+}

From 2ca17ec4f553b00c82bb3b32c37867d71bd70417 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:09:38 -0400
Subject: [PATCH 02/11] network-manager-applet: update to 1.18.0

---
 common/shlibs                           |  1 -
 srcpkgs/libnm-gtk                       |  1 -
 srcpkgs/network-manager-applet-devel    |  1 -
 srcpkgs/network-manager-applet/template | 47 ++++---------------------
 4 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 120000 srcpkgs/libnm-gtk
 delete mode 120000 srcpkgs/network-manager-applet-devel

diff --git a/common/shlibs b/common/shlibs
index 91635660be4..00839f3c723 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -905,7 +905,6 @@ liblcms2.so.2 lcms2-2.2_1
 libcolord.so.2 libcolord-1.1.7_1
 libcolordprivate.so.2 libcolord-1.1.7_1
 libcolorhug.so.2 libcolord-1.1.7_1
-libnm-gtk.so.0 libnm-gtk-0.9.1.95_1
 libcaribou.so.0 caribou-0.4.0_1
 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
 libgrilo-0.3.so.0 grilo-0.3.2_1
diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/libnm-gtk
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/network-manager-applet-devel
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 0656107b1af..2d9861a94ba 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,14 +1,14 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.24
+version=1.18.0
 revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
- libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
- polkit-devel mobile-broadband-provider-info"
+ libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libgnome-keyring-devel libgudev-devel libnotify-devel libnma-devel
+ libsecret-devel polkit-devel mobile-broadband-provider-info"
 depends="NetworkManager hicolor-icon-theme iso-codes"
 short_desc="NetworkManager panel applet for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,38 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
+checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b
 lib32disabled=yes
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_build() {
-	export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs:${wrksrc}/src/libnm-gtk/.libs"
-}
-
-libnm-gtk_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
-	}
-}
-
-network-manager-applet-devel_package() {
-	depends="gtk+3-devel NetworkManager-devel>=1.0
-	 libnm-gtk>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		vmove usr/share/gtk-doc
-	}
-}

From 92ec1bdd5dc9227331993288404b2ef8f35d2bfb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:34:07 -0400
Subject: [PATCH 03/11] NetworkManager-strongswan: update to 1.5.2

---
 srcpkgs/NetworkManager-strongswan/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 4d8d2b14306..46c02d092e5 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,16 +1,16 @@
 # Template file for 'NetworkManager-strongswan'
 pkgname=NetworkManager-strongswan
-version=1.4.5
-revision=2
+version=1.5.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-more-warnings --without-libnm-glib
  --disable-more-warnings"
 hostmakedepends="intltool pkg-config"
-makedepends="NetworkManager-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel NetworkManager-devel libnma-devel libsecret-devel"
 depends="strongswan"
 short_desc="Strongswan NetworkManager plugin"
 maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://www.strongswan.org/"
 distfiles="https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-${version}.tar.bz2"
-checksum=343b68cbe32f65e2baa01b37716415e4360addc8c90209d45504b52b8864bd04
+checksum=c8452b952653881dcc2745f0ab460c061086215b297129212a743bd9e9f78169

From b53e6adb7d7db896b6603a22475de8eb28607b8f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 10:05:40 -0400
Subject: [PATCH 04/11] NetworkManager-l2tp: change dependency to libnma-devel

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

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index d60f5878792..1dea408c423 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="gtk+3-devel glib-devel libglib-devel libsecret-devel
- network-manager-applet-devel libressl-devel nss-devel ppp-devel"
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+ libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"
 maintainer="Douglas Kosovic <doug@uq.edu.au>"

From 9be7a3a1f2d437d5ffb3aa26d42dc34596a1c780 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 11:20:26 -0400
Subject: [PATCH 05/11] NetworkManager-openconnect: change dependency to
 libnma-devel

---
 srcpkgs/NetworkManager-openconnect/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index 327f2bd84cb..f32a075180f 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -1,18 +1,17 @@
-# Template build file for 'NetworkManager-openconnect'.
+# Template file for 'NetworkManager-openconnect'
 pkgname=NetworkManager-openconnect
 version=1.2.6
-revision=2
-lib32disabled=yes
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
-makedepends="gtk+3-devel network-manager-applet-devel libsecret-devel
- libxml2-devel openconnect-devel libressl-devel liblz4-devel
- gcr-devel"
+makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
+ libressl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-license="GPL-2"
-maintainer="Enno Boland <gottox@voidlinux.org>"
 checksum=95109803596a9782680a5dca3b51c4ad8ff7e126169d5431278cab694112975a
+lib32disabled=yes

From 67d062296686207ed7b1bf697c75bfc50437056e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 12:33:51 -0400
Subject: [PATCH 06/11] NetworkManager-openvpn: update to 1.8.12

---
 ...isable-libnm-glib-support-by-default.patch | 52 -------------------
 srcpkgs/NetworkManager-openvpn/template       |  8 +--
 2 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch

diff --git a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
deleted file mode 100644
index 7eb72e1dbb6..00000000000
--- a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-source: https://git.archlinux.org/svntogit/packages.git/tree/trunk/0001-build-disable-libnm-glib-support-by-default.patch?h=packages/networkmanager-openvpn
-
-From 52aad4911ffad04cf8274b5574124a4d5470c7fa Mon Sep 17 00:00:00 2001
-Message-Id: <52aad4911ffad04cf8274b5574124a4d5470c7fa.1549642989.git.jan.steffens@gmail.com>
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Wed, 17 Oct 2018 15:21:30 +0200
-Subject: [PATCH] build: disable libnm-glib support by default
-
-By now nobody should be using this. Keep the code around for a little
-longer just in case anybody still uses this.
-
-The libnm-glib support also serves as an example how do we build two
-different versions of the properties plugin. We'll soon be in a similar
-situation with Gtk 4.0. (sigh.) Just don't drop it yet.
-
-Conflicts:
-	NEWS
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11ff5d0..eaf015b 100644
---- configure.ac
-+++ configure.ac
-@@ -75,20 +75,20 @@ dnl
- dnl GNOME support
- dnl
- AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
--AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openvpn without libnm-glib comatibility]), [], [with_libnm_glib_specified=no])
-+AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-openvpn with libnm-glib comatibility (depreacted)]), [], [with_libnm_glib_specified=no])
- if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
- 	if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
- 		AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
- 	fi
- fi
- if test "$with_gnome" != no; then
- 	with_gnome=yes
- fi
- if test "$with_libnm_glib_specified" == no; then
--	with_libnm_glib="$with_gnome"
-+	with_libnm_glib=no
- fi
--if test "$with_libnm_glib" != no; then
--	with_libnm_glib=yes
-+if test "$with_libnm_glib" != yes; then
-+	with_libnm_glib=no
- fi
- AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
- AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
--- 
-2.20.1
diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index 170d992326e..7f2c40e6de3 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,18 +1,18 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
-version=1.8.10
-revision=2
+version=1.8.12
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
-makedepends="gtk+3-devel libglib-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef
+checksum=0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f815318
 system_accounts="_nm_openvpn"
 lib32disabled=yes
 _nm_openvpn_homedir="/var/empty"

From 0fcb2577b3074df7d0da5067d8f50eb81a40f111 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 18:18:52 -0400
Subject: [PATCH 07/11] NetworkManager-pptp: change dependency to libnma-devel

---
 srcpkgs/NetworkManager-pptp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 7889bb47800..9c541cf246f 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-pptp'
 pkgname=NetworkManager-pptp
 version=1.2.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--without-libnm-glib"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="libglib-devel gtk+3-devel libsecret-devel ppp-devel
- network-manager-applet-devel NetworkManager-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel
+ NetworkManager-devel ppp-devel"
 depends="pptpclient"
 short_desc="NetworkManager VPN plugin for pptp"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From e795e479f8820f93e1c80846f9df2f9d667e7e99 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 20:09:35 -0400
Subject: [PATCH 08/11] gnome-control-center: update to 3.38.1

---
 srcpkgs/gnome-control-center/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 191101afaad..b4be62deaa3 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.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
  gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
  libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
- libpwquality-devel mit-krb5-devel network-manager-applet-devel polkit-devel
+ libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
  pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
  libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
  clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
@@ -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=f6b6b5b8ef9c38d895ba5af87f31adae02194ad86c9aa6cff2d2b9755c2db1da
+checksum=8d90006c610f6fccb3cddbcf413b1bc4137fb4977b901a3989420fe160082026
 
 build_options="cheese"
 build_options_default="cheese"

From f62c87e772d0561e473a6e628ce2585dac7c55c8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 21:03:32 -0400
Subject: [PATCH 09/11] gnome-initial-setup: update to 3.38.1

---
 srcpkgs/gnome-initial-setup/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 63abd3c5c83..12886a0f9ae 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.0
+version=3.38.1
 revision=1
 build_style=meson
 configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config glib-devel gettext"
 makedepends="NetworkManager-devel accountsservice-devel libglib-devel
  gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
  gnome-online-accounts-devel gdm-devel libpwquality-devel
- mit-krb5-devel vala-devel network-manager-applet-devel polkit-devel
+ mit-krb5-devel vala-devel libnma-devel polkit-devel
  rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
  pango-devel"
 depends="iso-codes"
@@ -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=3a857aef5efb689f408632db8469ad27620f762d977070a36035c522c6f82759
+checksum=e55d4f4073998e0fb7b3dfcc470e2a4c7d950a96bedab15011b9084ebc813676

From c94c6600aba7d99d89c17eb961e5766a6c5bacf7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 22:29:32 -0400
Subject: [PATCH 10/11] gnome-shell: update to 3.38.1

---
 srcpkgs/gnome-shell/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index f27795572ef..6753b6ac54e 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=3.38.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper=gir
@@ -12,7 +12,7 @@ makedepends="at-spi2-atk caribou-devel evolution-data-server-devel folks-devel
  gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
- network-manager-applet-devel polkit-devel pulseaudio-devel
+ libnma-devel polkit-devel pulseaudio-devel
  startup-notification-devel telepathy-logger-devel gnome-autoar-devel"
 depends="caribou elogind glxinfo gnome-control-center gsettings-desktop-schemas upower"
 short_desc="GNOME core user interface"
@@ -21,7 +21,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c626403bc0875ee6da8c7a62ac0cee312badb523af073cb166125015a75a0a97
+checksum=b789e3296463c4cbfa329ad1724df38439c3e6d7537a01025cd8f2fec8c90bb4
 
 # needs X
 do_check() {

From 233a527ed3beccbf98c796eb56b8b48f6f7ddfcd Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 23:26:56 -0400
Subject: [PATCH 11/11] cinnamon-control-center: change dependency to
 libnma-devel

---
 srcpkgs/cinnamon-control-center/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 27f0fbeb748..b9ebe5f22d1 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=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -10,7 +10,7 @@ hostmakedepends="autoconf-archive gettext-devel glib-devel gnome-common
 makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
  cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
  libSM-devel libXxf86misc-devel libcanberra-devel libgnomekbd-devel
- libnotify-devel libwacom-devel network-manager-applet-devel polkit-devel
+ libnotify-devel libwacom-devel libnma-devel polkit-devel
  pulseaudio-devel tzdata upower-devel"
 depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
  cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (60 preceding siblings ...)
  2020-10-07  3:27 ` [PR PATCH] [Updated] " cinerea0
@ 2020-10-07  4:17 ` cinerea0
  2020-10-07  4:59 ` CameronNemo
                   ` (28 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-07  4:17 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-704681087

Comment:
@CameronNemo The most recent push failed because one of the targets could not fetch the distfile; this problem did not occur on any of the other targets. What should I do?

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (61 preceding siblings ...)
  2020-10-07  4:17 ` cinerea0
@ 2020-10-07  4:59 ` CameronNemo
  2020-10-07  5:25 ` [PR PATCH] [Updated] " cinerea0
                   ` (27 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: CameronNemo @ 2020-10-07  4:59 UTC (permalink / raw)
  To: ml

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

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-704692477

Comment:
Did you try pushing again? Could have just been a blip.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (62 preceding siblings ...)
  2020-10-07  4:59 ` CameronNemo
@ 2020-10-07  5:25 ` cinerea0
  2020-10-07 14:29 ` cinerea0
                   ` (26 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-07  5:25 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 72b9dff466459202b58e30b7b7a9fa934e2d03ba Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:06:34 -0400
Subject: [PATCH 01/11] New package: libnma-1.8.30

---
 common/shlibs           |  2 +-
 srcpkgs/libnma-devel    |  1 +
 srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/libnma-devel
 create mode 100644 srcpkgs/libnma/template

diff --git a/common/shlibs b/common/shlibs
index 36efd174d6b..91635660be4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2981,7 +2981,7 @@ libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
 liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
-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
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+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
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}
+
+libnma-devel_package() {
+	short_desc+=" - library development files"
+	depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove usr/share/gtk-doc
+	}
+}

From 2ca17ec4f553b00c82bb3b32c37867d71bd70417 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:09:38 -0400
Subject: [PATCH 02/11] network-manager-applet: update to 1.18.0

---
 common/shlibs                           |  1 -
 srcpkgs/libnm-gtk                       |  1 -
 srcpkgs/network-manager-applet-devel    |  1 -
 srcpkgs/network-manager-applet/template | 47 ++++---------------------
 4 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 120000 srcpkgs/libnm-gtk
 delete mode 120000 srcpkgs/network-manager-applet-devel

diff --git a/common/shlibs b/common/shlibs
index 91635660be4..00839f3c723 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -905,7 +905,6 @@ liblcms2.so.2 lcms2-2.2_1
 libcolord.so.2 libcolord-1.1.7_1
 libcolordprivate.so.2 libcolord-1.1.7_1
 libcolorhug.so.2 libcolord-1.1.7_1
-libnm-gtk.so.0 libnm-gtk-0.9.1.95_1
 libcaribou.so.0 caribou-0.4.0_1
 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
 libgrilo-0.3.so.0 grilo-0.3.2_1
diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/libnm-gtk
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/network-manager-applet-devel
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 0656107b1af..2d9861a94ba 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,14 +1,14 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.24
+version=1.18.0
 revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
- libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
- polkit-devel mobile-broadband-provider-info"
+ libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libgnome-keyring-devel libgudev-devel libnotify-devel libnma-devel
+ libsecret-devel polkit-devel mobile-broadband-provider-info"
 depends="NetworkManager hicolor-icon-theme iso-codes"
 short_desc="NetworkManager panel applet for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,38 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
+checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b
 lib32disabled=yes
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_build() {
-	export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs:${wrksrc}/src/libnm-gtk/.libs"
-}
-
-libnm-gtk_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
-	}
-}
-
-network-manager-applet-devel_package() {
-	depends="gtk+3-devel NetworkManager-devel>=1.0
-	 libnm-gtk>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		vmove usr/share/gtk-doc
-	}
-}

From 92ec1bdd5dc9227331993288404b2ef8f35d2bfb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:34:07 -0400
Subject: [PATCH 03/11] NetworkManager-strongswan: update to 1.5.2

---
 srcpkgs/NetworkManager-strongswan/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 4d8d2b14306..46c02d092e5 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,16 +1,16 @@
 # Template file for 'NetworkManager-strongswan'
 pkgname=NetworkManager-strongswan
-version=1.4.5
-revision=2
+version=1.5.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-more-warnings --without-libnm-glib
  --disable-more-warnings"
 hostmakedepends="intltool pkg-config"
-makedepends="NetworkManager-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel NetworkManager-devel libnma-devel libsecret-devel"
 depends="strongswan"
 short_desc="Strongswan NetworkManager plugin"
 maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://www.strongswan.org/"
 distfiles="https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-${version}.tar.bz2"
-checksum=343b68cbe32f65e2baa01b37716415e4360addc8c90209d45504b52b8864bd04
+checksum=c8452b952653881dcc2745f0ab460c061086215b297129212a743bd9e9f78169

From b53e6adb7d7db896b6603a22475de8eb28607b8f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 10:05:40 -0400
Subject: [PATCH 04/11] NetworkManager-l2tp: change dependency to libnma-devel

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

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index d60f5878792..1dea408c423 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="gtk+3-devel glib-devel libglib-devel libsecret-devel
- network-manager-applet-devel libressl-devel nss-devel ppp-devel"
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+ libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"
 maintainer="Douglas Kosovic <doug@uq.edu.au>"

From 9be7a3a1f2d437d5ffb3aa26d42dc34596a1c780 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 11:20:26 -0400
Subject: [PATCH 05/11] NetworkManager-openconnect: change dependency to
 libnma-devel

---
 srcpkgs/NetworkManager-openconnect/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index 327f2bd84cb..f32a075180f 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -1,18 +1,17 @@
-# Template build file for 'NetworkManager-openconnect'.
+# Template file for 'NetworkManager-openconnect'
 pkgname=NetworkManager-openconnect
 version=1.2.6
-revision=2
-lib32disabled=yes
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
-makedepends="gtk+3-devel network-manager-applet-devel libsecret-devel
- libxml2-devel openconnect-devel libressl-devel liblz4-devel
- gcr-devel"
+makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
+ libressl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-license="GPL-2"
-maintainer="Enno Boland <gottox@voidlinux.org>"
 checksum=95109803596a9782680a5dca3b51c4ad8ff7e126169d5431278cab694112975a
+lib32disabled=yes

From 67d062296686207ed7b1bf697c75bfc50437056e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 12:33:51 -0400
Subject: [PATCH 06/11] NetworkManager-openvpn: update to 1.8.12

---
 ...isable-libnm-glib-support-by-default.patch | 52 -------------------
 srcpkgs/NetworkManager-openvpn/template       |  8 +--
 2 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch

diff --git a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
deleted file mode 100644
index 7eb72e1dbb6..00000000000
--- a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-source: https://git.archlinux.org/svntogit/packages.git/tree/trunk/0001-build-disable-libnm-glib-support-by-default.patch?h=packages/networkmanager-openvpn
-
-From 52aad4911ffad04cf8274b5574124a4d5470c7fa Mon Sep 17 00:00:00 2001
-Message-Id: <52aad4911ffad04cf8274b5574124a4d5470c7fa.1549642989.git.jan.steffens@gmail.com>
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Wed, 17 Oct 2018 15:21:30 +0200
-Subject: [PATCH] build: disable libnm-glib support by default
-
-By now nobody should be using this. Keep the code around for a little
-longer just in case anybody still uses this.
-
-The libnm-glib support also serves as an example how do we build two
-different versions of the properties plugin. We'll soon be in a similar
-situation with Gtk 4.0. (sigh.) Just don't drop it yet.
-
-Conflicts:
-	NEWS
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11ff5d0..eaf015b 100644
---- configure.ac
-+++ configure.ac
-@@ -75,20 +75,20 @@ dnl
- dnl GNOME support
- dnl
- AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
--AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openvpn without libnm-glib comatibility]), [], [with_libnm_glib_specified=no])
-+AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-openvpn with libnm-glib comatibility (depreacted)]), [], [with_libnm_glib_specified=no])
- if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
- 	if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
- 		AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
- 	fi
- fi
- if test "$with_gnome" != no; then
- 	with_gnome=yes
- fi
- if test "$with_libnm_glib_specified" == no; then
--	with_libnm_glib="$with_gnome"
-+	with_libnm_glib=no
- fi
--if test "$with_libnm_glib" != no; then
--	with_libnm_glib=yes
-+if test "$with_libnm_glib" != yes; then
-+	with_libnm_glib=no
- fi
- AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
- AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
--- 
-2.20.1
diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index 170d992326e..7f2c40e6de3 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,18 +1,18 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
-version=1.8.10
-revision=2
+version=1.8.12
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
-makedepends="gtk+3-devel libglib-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef
+checksum=0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f815318
 system_accounts="_nm_openvpn"
 lib32disabled=yes
 _nm_openvpn_homedir="/var/empty"

From 0fcb2577b3074df7d0da5067d8f50eb81a40f111 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 18:18:52 -0400
Subject: [PATCH 07/11] NetworkManager-pptp: change dependency to libnma-devel

---
 srcpkgs/NetworkManager-pptp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 7889bb47800..9c541cf246f 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-pptp'
 pkgname=NetworkManager-pptp
 version=1.2.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--without-libnm-glib"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="libglib-devel gtk+3-devel libsecret-devel ppp-devel
- network-manager-applet-devel NetworkManager-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel
+ NetworkManager-devel ppp-devel"
 depends="pptpclient"
 short_desc="NetworkManager VPN plugin for pptp"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From e795e479f8820f93e1c80846f9df2f9d667e7e99 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 20:09:35 -0400
Subject: [PATCH 08/11] gnome-control-center: update to 3.38.1

---
 srcpkgs/gnome-control-center/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 191101afaad..b4be62deaa3 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.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
  gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
  libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
- libpwquality-devel mit-krb5-devel network-manager-applet-devel polkit-devel
+ libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
  pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
  libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
  clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
@@ -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=f6b6b5b8ef9c38d895ba5af87f31adae02194ad86c9aa6cff2d2b9755c2db1da
+checksum=8d90006c610f6fccb3cddbcf413b1bc4137fb4977b901a3989420fe160082026
 
 build_options="cheese"
 build_options_default="cheese"

From f62c87e772d0561e473a6e628ce2585dac7c55c8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 21:03:32 -0400
Subject: [PATCH 09/11] gnome-initial-setup: update to 3.38.1

---
 srcpkgs/gnome-initial-setup/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 63abd3c5c83..12886a0f9ae 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.0
+version=3.38.1
 revision=1
 build_style=meson
 configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config glib-devel gettext"
 makedepends="NetworkManager-devel accountsservice-devel libglib-devel
  gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
  gnome-online-accounts-devel gdm-devel libpwquality-devel
- mit-krb5-devel vala-devel network-manager-applet-devel polkit-devel
+ mit-krb5-devel vala-devel libnma-devel polkit-devel
  rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
  pango-devel"
 depends="iso-codes"
@@ -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=3a857aef5efb689f408632db8469ad27620f762d977070a36035c522c6f82759
+checksum=e55d4f4073998e0fb7b3dfcc470e2a4c7d950a96bedab15011b9084ebc813676

From c94c6600aba7d99d89c17eb961e5766a6c5bacf7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 22:29:32 -0400
Subject: [PATCH 10/11] gnome-shell: update to 3.38.1

---
 srcpkgs/gnome-shell/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index f27795572ef..6753b6ac54e 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=3.38.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper=gir
@@ -12,7 +12,7 @@ makedepends="at-spi2-atk caribou-devel evolution-data-server-devel folks-devel
  gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
- network-manager-applet-devel polkit-devel pulseaudio-devel
+ libnma-devel polkit-devel pulseaudio-devel
  startup-notification-devel telepathy-logger-devel gnome-autoar-devel"
 depends="caribou elogind glxinfo gnome-control-center gsettings-desktop-schemas upower"
 short_desc="GNOME core user interface"
@@ -21,7 +21,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c626403bc0875ee6da8c7a62ac0cee312badb523af073cb166125015a75a0a97
+checksum=b789e3296463c4cbfa329ad1724df38439c3e6d7537a01025cd8f2fec8c90bb4
 
 # needs X
 do_check() {

From 5ebb26ce729e2cd25ad314e553e1b1f80f7259fa Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 7 Oct 2020 01:24:58 -0400
Subject: [PATCH 11/11] cinnamon-control-center: change dependency to
 libnma-devel

---
 srcpkgs/cinnamon-control-center/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 27f0fbeb748..b9ebe5f22d1 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=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -10,7 +10,7 @@ hostmakedepends="autoconf-archive gettext-devel glib-devel gnome-common
 makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
  cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
  libSM-devel libXxf86misc-devel libcanberra-devel libgnomekbd-devel
- libnotify-devel libwacom-devel network-manager-applet-devel polkit-devel
+ libnotify-devel libwacom-devel libnma-devel polkit-devel
  pulseaudio-devel tzdata upower-devel"
 depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
  cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (63 preceding siblings ...)
  2020-10-07  5:25 ` [PR PATCH] [Updated] " cinerea0
@ 2020-10-07 14:29 ` cinerea0
  2020-10-07 14:30 ` cinerea0
                   ` (25 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-07 14:29 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 72b9dff466459202b58e30b7b7a9fa934e2d03ba Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:06:34 -0400
Subject: [PATCH 01/12] New package: libnma-1.8.30

---
 common/shlibs           |  2 +-
 srcpkgs/libnma-devel    |  1 +
 srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/libnma-devel
 create mode 100644 srcpkgs/libnma/template

diff --git a/common/shlibs b/common/shlibs
index 36efd174d6b..91635660be4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2981,7 +2981,7 @@ libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
 liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
-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
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+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
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}
+
+libnma-devel_package() {
+	short_desc+=" - library development files"
+	depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove usr/share/gtk-doc
+	}
+}

From 2ca17ec4f553b00c82bb3b32c37867d71bd70417 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:09:38 -0400
Subject: [PATCH 02/12] network-manager-applet: update to 1.18.0

---
 common/shlibs                           |  1 -
 srcpkgs/libnm-gtk                       |  1 -
 srcpkgs/network-manager-applet-devel    |  1 -
 srcpkgs/network-manager-applet/template | 47 ++++---------------------
 4 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 120000 srcpkgs/libnm-gtk
 delete mode 120000 srcpkgs/network-manager-applet-devel

diff --git a/common/shlibs b/common/shlibs
index 91635660be4..00839f3c723 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -905,7 +905,6 @@ liblcms2.so.2 lcms2-2.2_1
 libcolord.so.2 libcolord-1.1.7_1
 libcolordprivate.so.2 libcolord-1.1.7_1
 libcolorhug.so.2 libcolord-1.1.7_1
-libnm-gtk.so.0 libnm-gtk-0.9.1.95_1
 libcaribou.so.0 caribou-0.4.0_1
 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
 libgrilo-0.3.so.0 grilo-0.3.2_1
diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/libnm-gtk
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/network-manager-applet-devel
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 0656107b1af..2d9861a94ba 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,14 +1,14 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.24
+version=1.18.0
 revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
- libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
- polkit-devel mobile-broadband-provider-info"
+ libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libgnome-keyring-devel libgudev-devel libnotify-devel libnma-devel
+ libsecret-devel polkit-devel mobile-broadband-provider-info"
 depends="NetworkManager hicolor-icon-theme iso-codes"
 short_desc="NetworkManager panel applet for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,38 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
+checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b
 lib32disabled=yes
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_build() {
-	export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs:${wrksrc}/src/libnm-gtk/.libs"
-}
-
-libnm-gtk_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
-	}
-}
-
-network-manager-applet-devel_package() {
-	depends="gtk+3-devel NetworkManager-devel>=1.0
-	 libnm-gtk>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		vmove usr/share/gtk-doc
-	}
-}

From 92ec1bdd5dc9227331993288404b2ef8f35d2bfb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:34:07 -0400
Subject: [PATCH 03/12] NetworkManager-strongswan: update to 1.5.2

---
 srcpkgs/NetworkManager-strongswan/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 4d8d2b14306..46c02d092e5 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,16 +1,16 @@
 # Template file for 'NetworkManager-strongswan'
 pkgname=NetworkManager-strongswan
-version=1.4.5
-revision=2
+version=1.5.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-more-warnings --without-libnm-glib
  --disable-more-warnings"
 hostmakedepends="intltool pkg-config"
-makedepends="NetworkManager-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel NetworkManager-devel libnma-devel libsecret-devel"
 depends="strongswan"
 short_desc="Strongswan NetworkManager plugin"
 maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://www.strongswan.org/"
 distfiles="https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-${version}.tar.bz2"
-checksum=343b68cbe32f65e2baa01b37716415e4360addc8c90209d45504b52b8864bd04
+checksum=c8452b952653881dcc2745f0ab460c061086215b297129212a743bd9e9f78169

From b53e6adb7d7db896b6603a22475de8eb28607b8f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 10:05:40 -0400
Subject: [PATCH 04/12] NetworkManager-l2tp: change dependency to libnma-devel

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

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index d60f5878792..1dea408c423 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="gtk+3-devel glib-devel libglib-devel libsecret-devel
- network-manager-applet-devel libressl-devel nss-devel ppp-devel"
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+ libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"
 maintainer="Douglas Kosovic <doug@uq.edu.au>"

From 9be7a3a1f2d437d5ffb3aa26d42dc34596a1c780 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 11:20:26 -0400
Subject: [PATCH 05/12] NetworkManager-openconnect: change dependency to
 libnma-devel

---
 srcpkgs/NetworkManager-openconnect/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index 327f2bd84cb..f32a075180f 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -1,18 +1,17 @@
-# Template build file for 'NetworkManager-openconnect'.
+# Template file for 'NetworkManager-openconnect'
 pkgname=NetworkManager-openconnect
 version=1.2.6
-revision=2
-lib32disabled=yes
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
-makedepends="gtk+3-devel network-manager-applet-devel libsecret-devel
- libxml2-devel openconnect-devel libressl-devel liblz4-devel
- gcr-devel"
+makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
+ libressl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-license="GPL-2"
-maintainer="Enno Boland <gottox@voidlinux.org>"
 checksum=95109803596a9782680a5dca3b51c4ad8ff7e126169d5431278cab694112975a
+lib32disabled=yes

From 67d062296686207ed7b1bf697c75bfc50437056e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 12:33:51 -0400
Subject: [PATCH 06/12] NetworkManager-openvpn: update to 1.8.12

---
 ...isable-libnm-glib-support-by-default.patch | 52 -------------------
 srcpkgs/NetworkManager-openvpn/template       |  8 +--
 2 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch

diff --git a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
deleted file mode 100644
index 7eb72e1dbb6..00000000000
--- a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-source: https://git.archlinux.org/svntogit/packages.git/tree/trunk/0001-build-disable-libnm-glib-support-by-default.patch?h=packages/networkmanager-openvpn
-
-From 52aad4911ffad04cf8274b5574124a4d5470c7fa Mon Sep 17 00:00:00 2001
-Message-Id: <52aad4911ffad04cf8274b5574124a4d5470c7fa.1549642989.git.jan.steffens@gmail.com>
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Wed, 17 Oct 2018 15:21:30 +0200
-Subject: [PATCH] build: disable libnm-glib support by default
-
-By now nobody should be using this. Keep the code around for a little
-longer just in case anybody still uses this.
-
-The libnm-glib support also serves as an example how do we build two
-different versions of the properties plugin. We'll soon be in a similar
-situation with Gtk 4.0. (sigh.) Just don't drop it yet.
-
-Conflicts:
-	NEWS
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11ff5d0..eaf015b 100644
---- configure.ac
-+++ configure.ac
-@@ -75,20 +75,20 @@ dnl
- dnl GNOME support
- dnl
- AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
--AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openvpn without libnm-glib comatibility]), [], [with_libnm_glib_specified=no])
-+AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-openvpn with libnm-glib comatibility (depreacted)]), [], [with_libnm_glib_specified=no])
- if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
- 	if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
- 		AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
- 	fi
- fi
- if test "$with_gnome" != no; then
- 	with_gnome=yes
- fi
- if test "$with_libnm_glib_specified" == no; then
--	with_libnm_glib="$with_gnome"
-+	with_libnm_glib=no
- fi
--if test "$with_libnm_glib" != no; then
--	with_libnm_glib=yes
-+if test "$with_libnm_glib" != yes; then
-+	with_libnm_glib=no
- fi
- AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
- AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
--- 
-2.20.1
diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index 170d992326e..7f2c40e6de3 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,18 +1,18 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
-version=1.8.10
-revision=2
+version=1.8.12
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
-makedepends="gtk+3-devel libglib-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef
+checksum=0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f815318
 system_accounts="_nm_openvpn"
 lib32disabled=yes
 _nm_openvpn_homedir="/var/empty"

From 0fcb2577b3074df7d0da5067d8f50eb81a40f111 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 18:18:52 -0400
Subject: [PATCH 07/12] NetworkManager-pptp: change dependency to libnma-devel

---
 srcpkgs/NetworkManager-pptp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 7889bb47800..9c541cf246f 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-pptp'
 pkgname=NetworkManager-pptp
 version=1.2.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--without-libnm-glib"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="libglib-devel gtk+3-devel libsecret-devel ppp-devel
- network-manager-applet-devel NetworkManager-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel
+ NetworkManager-devel ppp-devel"
 depends="pptpclient"
 short_desc="NetworkManager VPN plugin for pptp"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From e795e479f8820f93e1c80846f9df2f9d667e7e99 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 20:09:35 -0400
Subject: [PATCH 08/12] gnome-control-center: update to 3.38.1

---
 srcpkgs/gnome-control-center/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 191101afaad..b4be62deaa3 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.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
  gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
  libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
- libpwquality-devel mit-krb5-devel network-manager-applet-devel polkit-devel
+ libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
  pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
  libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
  clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
@@ -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=f6b6b5b8ef9c38d895ba5af87f31adae02194ad86c9aa6cff2d2b9755c2db1da
+checksum=8d90006c610f6fccb3cddbcf413b1bc4137fb4977b901a3989420fe160082026
 
 build_options="cheese"
 build_options_default="cheese"

From f62c87e772d0561e473a6e628ce2585dac7c55c8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 21:03:32 -0400
Subject: [PATCH 09/12] gnome-initial-setup: update to 3.38.1

---
 srcpkgs/gnome-initial-setup/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 63abd3c5c83..12886a0f9ae 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.0
+version=3.38.1
 revision=1
 build_style=meson
 configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config glib-devel gettext"
 makedepends="NetworkManager-devel accountsservice-devel libglib-devel
  gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
  gnome-online-accounts-devel gdm-devel libpwquality-devel
- mit-krb5-devel vala-devel network-manager-applet-devel polkit-devel
+ mit-krb5-devel vala-devel libnma-devel polkit-devel
  rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
  pango-devel"
 depends="iso-codes"
@@ -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=3a857aef5efb689f408632db8469ad27620f762d977070a36035c522c6f82759
+checksum=e55d4f4073998e0fb7b3dfcc470e2a4c7d950a96bedab15011b9084ebc813676

From c94c6600aba7d99d89c17eb961e5766a6c5bacf7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 22:29:32 -0400
Subject: [PATCH 10/12] gnome-shell: update to 3.38.1

---
 srcpkgs/gnome-shell/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index f27795572ef..6753b6ac54e 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=3.38.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper=gir
@@ -12,7 +12,7 @@ makedepends="at-spi2-atk caribou-devel evolution-data-server-devel folks-devel
  gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
- network-manager-applet-devel polkit-devel pulseaudio-devel
+ libnma-devel polkit-devel pulseaudio-devel
  startup-notification-devel telepathy-logger-devel gnome-autoar-devel"
 depends="caribou elogind glxinfo gnome-control-center gsettings-desktop-schemas upower"
 short_desc="GNOME core user interface"
@@ -21,7 +21,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c626403bc0875ee6da8c7a62ac0cee312badb523af073cb166125015a75a0a97
+checksum=b789e3296463c4cbfa329ad1724df38439c3e6d7537a01025cd8f2fec8c90bb4
 
 # needs X
 do_check() {

From 5ebb26ce729e2cd25ad314e553e1b1f80f7259fa Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 7 Oct 2020 01:24:58 -0400
Subject: [PATCH 11/12] cinnamon-control-center: change dependency to
 libnma-devel

---
 srcpkgs/cinnamon-control-center/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 27f0fbeb748..b9ebe5f22d1 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=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -10,7 +10,7 @@ hostmakedepends="autoconf-archive gettext-devel glib-devel gnome-common
 makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
  cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
  libSM-devel libXxf86misc-devel libcanberra-devel libgnomekbd-devel
- libnotify-devel libwacom-devel network-manager-applet-devel polkit-devel
+ libnotify-devel libwacom-devel libnma-devel polkit-devel
  pulseaudio-devel tzdata upower-devel"
 depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
  cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"

From 3c38e52e89fe0985c3361a09ba5b2a4139132d69 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 7 Oct 2020 10:29:08 -0400
Subject: [PATCH 12/12] switchboard-plug-network: update to 2.3.2

---
 srcpkgs/switchboard-plug-network/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template
index d7e5cac19d3..329d1ce17f8 100644
--- a/srcpkgs/switchboard-plug-network/template
+++ b/srcpkgs/switchboard-plug-network/template
@@ -1,14 +1,14 @@
 # Template file for 'switchboard-plug-network'
 pkgname=switchboard-plug-network
-version=2.1.4
+version=2.3.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala"
 makedepends="switchboard-devel granite-devel gtk+3-devel
- network-manager-applet-devel NetworkManager-devel"
+ libnma-devel NetworkManager-devel"
 short_desc="Switchboard Network Plug"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=0b039bcb2a33fbdc8364da865c3abebb825e0d36ab89a2bf4589704722f76bba
+homepage="https://github.com/elementary/switchboard-plug-network"
+distfiles="https://github.com/elementary/${pkgname}/archive/${version}.tar.gz"
+checksum=61c3803dccf68324afe7cb67094fd9dbcb874cae47284b9b131b9bd49971d9b8

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (64 preceding siblings ...)
  2020-10-07 14:29 ` cinerea0
@ 2020-10-07 14:30 ` cinerea0
  2020-10-07 16:41 ` CameronNemo
                   ` (24 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-07 14:30 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-704976024

Comment:
Yep, that worked. I'll hopefully finish up the last of the package updates today.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (65 preceding siblings ...)
  2020-10-07 14:30 ` cinerea0
@ 2020-10-07 16:41 ` CameronNemo
  2020-10-08  0:30 ` [PR PATCH] [Updated] " cinerea0
                   ` (23 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: CameronNemo @ 2020-10-07 16:41 UTC (permalink / raw)
  To: ml

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

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-705058515

Comment:
For the switchboard plug, you probably need to add `build_helper="gir"`

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (66 preceding siblings ...)
  2020-10-07 16:41 ` CameronNemo
@ 2020-10-08  0:30 ` cinerea0
  2020-10-08  1:39 ` cinerea0
                   ` (22 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-08  0:30 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 72b9dff466459202b58e30b7b7a9fa934e2d03ba Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:06:34 -0400
Subject: [PATCH 01/12] New package: libnma-1.8.30

---
 common/shlibs           |  2 +-
 srcpkgs/libnma-devel    |  1 +
 srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/libnma-devel
 create mode 100644 srcpkgs/libnma/template

diff --git a/common/shlibs b/common/shlibs
index 36efd174d6b..91635660be4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2981,7 +2981,7 @@ libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
 liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
-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
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+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
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}
+
+libnma-devel_package() {
+	short_desc+=" - library development files"
+	depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove usr/share/gtk-doc
+	}
+}

From 2ca17ec4f553b00c82bb3b32c37867d71bd70417 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:09:38 -0400
Subject: [PATCH 02/12] network-manager-applet: update to 1.18.0

---
 common/shlibs                           |  1 -
 srcpkgs/libnm-gtk                       |  1 -
 srcpkgs/network-manager-applet-devel    |  1 -
 srcpkgs/network-manager-applet/template | 47 ++++---------------------
 4 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 120000 srcpkgs/libnm-gtk
 delete mode 120000 srcpkgs/network-manager-applet-devel

diff --git a/common/shlibs b/common/shlibs
index 91635660be4..00839f3c723 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -905,7 +905,6 @@ liblcms2.so.2 lcms2-2.2_1
 libcolord.so.2 libcolord-1.1.7_1
 libcolordprivate.so.2 libcolord-1.1.7_1
 libcolorhug.so.2 libcolord-1.1.7_1
-libnm-gtk.so.0 libnm-gtk-0.9.1.95_1
 libcaribou.so.0 caribou-0.4.0_1
 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
 libgrilo-0.3.so.0 grilo-0.3.2_1
diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/libnm-gtk
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/network-manager-applet-devel
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 0656107b1af..2d9861a94ba 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,14 +1,14 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.24
+version=1.18.0
 revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
- libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
- polkit-devel mobile-broadband-provider-info"
+ libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libgnome-keyring-devel libgudev-devel libnotify-devel libnma-devel
+ libsecret-devel polkit-devel mobile-broadband-provider-info"
 depends="NetworkManager hicolor-icon-theme iso-codes"
 short_desc="NetworkManager panel applet for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,38 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
+checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b
 lib32disabled=yes
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_build() {
-	export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs:${wrksrc}/src/libnm-gtk/.libs"
-}
-
-libnm-gtk_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
-	}
-}
-
-network-manager-applet-devel_package() {
-	depends="gtk+3-devel NetworkManager-devel>=1.0
-	 libnm-gtk>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		vmove usr/share/gtk-doc
-	}
-}

From 92ec1bdd5dc9227331993288404b2ef8f35d2bfb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:34:07 -0400
Subject: [PATCH 03/12] NetworkManager-strongswan: update to 1.5.2

---
 srcpkgs/NetworkManager-strongswan/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 4d8d2b14306..46c02d092e5 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,16 +1,16 @@
 # Template file for 'NetworkManager-strongswan'
 pkgname=NetworkManager-strongswan
-version=1.4.5
-revision=2
+version=1.5.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-more-warnings --without-libnm-glib
  --disable-more-warnings"
 hostmakedepends="intltool pkg-config"
-makedepends="NetworkManager-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel NetworkManager-devel libnma-devel libsecret-devel"
 depends="strongswan"
 short_desc="Strongswan NetworkManager plugin"
 maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://www.strongswan.org/"
 distfiles="https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-${version}.tar.bz2"
-checksum=343b68cbe32f65e2baa01b37716415e4360addc8c90209d45504b52b8864bd04
+checksum=c8452b952653881dcc2745f0ab460c061086215b297129212a743bd9e9f78169

From b53e6adb7d7db896b6603a22475de8eb28607b8f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 10:05:40 -0400
Subject: [PATCH 04/12] NetworkManager-l2tp: change dependency to libnma-devel

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

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index d60f5878792..1dea408c423 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="gtk+3-devel glib-devel libglib-devel libsecret-devel
- network-manager-applet-devel libressl-devel nss-devel ppp-devel"
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+ libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"
 maintainer="Douglas Kosovic <doug@uq.edu.au>"

From 9be7a3a1f2d437d5ffb3aa26d42dc34596a1c780 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 11:20:26 -0400
Subject: [PATCH 05/12] NetworkManager-openconnect: change dependency to
 libnma-devel

---
 srcpkgs/NetworkManager-openconnect/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index 327f2bd84cb..f32a075180f 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -1,18 +1,17 @@
-# Template build file for 'NetworkManager-openconnect'.
+# Template file for 'NetworkManager-openconnect'
 pkgname=NetworkManager-openconnect
 version=1.2.6
-revision=2
-lib32disabled=yes
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
-makedepends="gtk+3-devel network-manager-applet-devel libsecret-devel
- libxml2-devel openconnect-devel libressl-devel liblz4-devel
- gcr-devel"
+makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
+ libressl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-license="GPL-2"
-maintainer="Enno Boland <gottox@voidlinux.org>"
 checksum=95109803596a9782680a5dca3b51c4ad8ff7e126169d5431278cab694112975a
+lib32disabled=yes

From 67d062296686207ed7b1bf697c75bfc50437056e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 12:33:51 -0400
Subject: [PATCH 06/12] NetworkManager-openvpn: update to 1.8.12

---
 ...isable-libnm-glib-support-by-default.patch | 52 -------------------
 srcpkgs/NetworkManager-openvpn/template       |  8 +--
 2 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch

diff --git a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
deleted file mode 100644
index 7eb72e1dbb6..00000000000
--- a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-source: https://git.archlinux.org/svntogit/packages.git/tree/trunk/0001-build-disable-libnm-glib-support-by-default.patch?h=packages/networkmanager-openvpn
-
-From 52aad4911ffad04cf8274b5574124a4d5470c7fa Mon Sep 17 00:00:00 2001
-Message-Id: <52aad4911ffad04cf8274b5574124a4d5470c7fa.1549642989.git.jan.steffens@gmail.com>
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Wed, 17 Oct 2018 15:21:30 +0200
-Subject: [PATCH] build: disable libnm-glib support by default
-
-By now nobody should be using this. Keep the code around for a little
-longer just in case anybody still uses this.
-
-The libnm-glib support also serves as an example how do we build two
-different versions of the properties plugin. We'll soon be in a similar
-situation with Gtk 4.0. (sigh.) Just don't drop it yet.
-
-Conflicts:
-	NEWS
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11ff5d0..eaf015b 100644
---- configure.ac
-+++ configure.ac
-@@ -75,20 +75,20 @@ dnl
- dnl GNOME support
- dnl
- AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
--AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openvpn without libnm-glib comatibility]), [], [with_libnm_glib_specified=no])
-+AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-openvpn with libnm-glib comatibility (depreacted)]), [], [with_libnm_glib_specified=no])
- if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
- 	if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
- 		AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
- 	fi
- fi
- if test "$with_gnome" != no; then
- 	with_gnome=yes
- fi
- if test "$with_libnm_glib_specified" == no; then
--	with_libnm_glib="$with_gnome"
-+	with_libnm_glib=no
- fi
--if test "$with_libnm_glib" != no; then
--	with_libnm_glib=yes
-+if test "$with_libnm_glib" != yes; then
-+	with_libnm_glib=no
- fi
- AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
- AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
--- 
-2.20.1
diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index 170d992326e..7f2c40e6de3 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,18 +1,18 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
-version=1.8.10
-revision=2
+version=1.8.12
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
-makedepends="gtk+3-devel libglib-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef
+checksum=0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f815318
 system_accounts="_nm_openvpn"
 lib32disabled=yes
 _nm_openvpn_homedir="/var/empty"

From 0fcb2577b3074df7d0da5067d8f50eb81a40f111 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 18:18:52 -0400
Subject: [PATCH 07/12] NetworkManager-pptp: change dependency to libnma-devel

---
 srcpkgs/NetworkManager-pptp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 7889bb47800..9c541cf246f 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-pptp'
 pkgname=NetworkManager-pptp
 version=1.2.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--without-libnm-glib"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="libglib-devel gtk+3-devel libsecret-devel ppp-devel
- network-manager-applet-devel NetworkManager-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel
+ NetworkManager-devel ppp-devel"
 depends="pptpclient"
 short_desc="NetworkManager VPN plugin for pptp"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From e795e479f8820f93e1c80846f9df2f9d667e7e99 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 20:09:35 -0400
Subject: [PATCH 08/12] gnome-control-center: update to 3.38.1

---
 srcpkgs/gnome-control-center/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 191101afaad..b4be62deaa3 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.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
  gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
  libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
- libpwquality-devel mit-krb5-devel network-manager-applet-devel polkit-devel
+ libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
  pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
  libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
  clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
@@ -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=f6b6b5b8ef9c38d895ba5af87f31adae02194ad86c9aa6cff2d2b9755c2db1da
+checksum=8d90006c610f6fccb3cddbcf413b1bc4137fb4977b901a3989420fe160082026
 
 build_options="cheese"
 build_options_default="cheese"

From f62c87e772d0561e473a6e628ce2585dac7c55c8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 21:03:32 -0400
Subject: [PATCH 09/12] gnome-initial-setup: update to 3.38.1

---
 srcpkgs/gnome-initial-setup/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 63abd3c5c83..12886a0f9ae 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.0
+version=3.38.1
 revision=1
 build_style=meson
 configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config glib-devel gettext"
 makedepends="NetworkManager-devel accountsservice-devel libglib-devel
  gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
  gnome-online-accounts-devel gdm-devel libpwquality-devel
- mit-krb5-devel vala-devel network-manager-applet-devel polkit-devel
+ mit-krb5-devel vala-devel libnma-devel polkit-devel
  rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
  pango-devel"
 depends="iso-codes"
@@ -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=3a857aef5efb689f408632db8469ad27620f762d977070a36035c522c6f82759
+checksum=e55d4f4073998e0fb7b3dfcc470e2a4c7d950a96bedab15011b9084ebc813676

From c94c6600aba7d99d89c17eb961e5766a6c5bacf7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 22:29:32 -0400
Subject: [PATCH 10/12] gnome-shell: update to 3.38.1

---
 srcpkgs/gnome-shell/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index f27795572ef..6753b6ac54e 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=3.38.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper=gir
@@ -12,7 +12,7 @@ makedepends="at-spi2-atk caribou-devel evolution-data-server-devel folks-devel
  gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
- network-manager-applet-devel polkit-devel pulseaudio-devel
+ libnma-devel polkit-devel pulseaudio-devel
  startup-notification-devel telepathy-logger-devel gnome-autoar-devel"
 depends="caribou elogind glxinfo gnome-control-center gsettings-desktop-schemas upower"
 short_desc="GNOME core user interface"
@@ -21,7 +21,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c626403bc0875ee6da8c7a62ac0cee312badb523af073cb166125015a75a0a97
+checksum=b789e3296463c4cbfa329ad1724df38439c3e6d7537a01025cd8f2fec8c90bb4
 
 # needs X
 do_check() {

From 5ebb26ce729e2cd25ad314e553e1b1f80f7259fa Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 7 Oct 2020 01:24:58 -0400
Subject: [PATCH 11/12] cinnamon-control-center: change dependency to
 libnma-devel

---
 srcpkgs/cinnamon-control-center/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 27f0fbeb748..b9ebe5f22d1 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=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -10,7 +10,7 @@ hostmakedepends="autoconf-archive gettext-devel glib-devel gnome-common
 makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
  cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
  libSM-devel libXxf86misc-devel libcanberra-devel libgnomekbd-devel
- libnotify-devel libwacom-devel network-manager-applet-devel polkit-devel
+ libnotify-devel libwacom-devel libnma-devel polkit-devel
  pulseaudio-devel tzdata upower-devel"
 depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
  cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"

From aa4ad814f6822a246a56af18966620a9b633a320 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 7 Oct 2020 20:30:11 -0400
Subject: [PATCH 12/12] switchboard-plug-network: update to 2.3.2

---
 srcpkgs/switchboard-plug-network/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template
index d7e5cac19d3..453aa670e0f 100644
--- a/srcpkgs/switchboard-plug-network/template
+++ b/srcpkgs/switchboard-plug-network/template
@@ -1,14 +1,15 @@
 # Template file for 'switchboard-plug-network'
 pkgname=switchboard-plug-network
-version=2.1.4
+version=2.3.2
 revision=1
 build_style=meson
+build_helper=gir
 hostmakedepends="pkg-config vala"
 makedepends="switchboard-devel granite-devel gtk+3-devel
- network-manager-applet-devel NetworkManager-devel"
+ libnma-devel NetworkManager-devel"
 short_desc="Switchboard Network Plug"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=0b039bcb2a33fbdc8364da865c3abebb825e0d36ab89a2bf4589704722f76bba
+homepage="https://github.com/elementary/switchboard-plug-network"
+distfiles="https://github.com/elementary/${pkgname}/archive/${version}.tar.gz"
+checksum=61c3803dccf68324afe7cb67094fd9dbcb874cae47284b9b131b9bd49971d9b8

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (67 preceding siblings ...)
  2020-10-08  0:30 ` [PR PATCH] [Updated] " cinerea0
@ 2020-10-08  1:39 ` cinerea0
  2020-10-08  3:12 ` CameronNemo
                   ` (21 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-08  1:39 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-705280236

Comment:
Still failing on ARM even after adding `build_helper=gir`, unfortunately.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (68 preceding siblings ...)
  2020-10-08  1:39 ` cinerea0
@ 2020-10-08  3:12 ` CameronNemo
  2020-10-08  5:02 ` [PR PATCH] [Updated] " cinerea0
                   ` (20 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: CameronNemo @ 2020-10-08  3:12 UTC (permalink / raw)
  To: ml

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

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-705303682

Comment:
@cinerea0 then just mark it nocross for now, we will have to figure it out later

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (69 preceding siblings ...)
  2020-10-08  3:12 ` CameronNemo
@ 2020-10-08  5:02 ` cinerea0
  2020-10-08 16:01 ` cinerea0
                   ` (19 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-08  5:02 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 72b9dff466459202b58e30b7b7a9fa934e2d03ba Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:06:34 -0400
Subject: [PATCH 01/12] New package: libnma-1.8.30

---
 common/shlibs           |  2 +-
 srcpkgs/libnma-devel    |  1 +
 srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/libnma-devel
 create mode 100644 srcpkgs/libnma/template

diff --git a/common/shlibs b/common/shlibs
index 36efd174d6b..91635660be4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2981,7 +2981,7 @@ libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
 liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
-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
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+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
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}
+
+libnma-devel_package() {
+	short_desc+=" - library development files"
+	depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove usr/share/gtk-doc
+	}
+}

From 2ca17ec4f553b00c82bb3b32c37867d71bd70417 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:09:38 -0400
Subject: [PATCH 02/12] network-manager-applet: update to 1.18.0

---
 common/shlibs                           |  1 -
 srcpkgs/libnm-gtk                       |  1 -
 srcpkgs/network-manager-applet-devel    |  1 -
 srcpkgs/network-manager-applet/template | 47 ++++---------------------
 4 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 120000 srcpkgs/libnm-gtk
 delete mode 120000 srcpkgs/network-manager-applet-devel

diff --git a/common/shlibs b/common/shlibs
index 91635660be4..00839f3c723 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -905,7 +905,6 @@ liblcms2.so.2 lcms2-2.2_1
 libcolord.so.2 libcolord-1.1.7_1
 libcolordprivate.so.2 libcolord-1.1.7_1
 libcolorhug.so.2 libcolord-1.1.7_1
-libnm-gtk.so.0 libnm-gtk-0.9.1.95_1
 libcaribou.so.0 caribou-0.4.0_1
 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
 libgrilo-0.3.so.0 grilo-0.3.2_1
diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/libnm-gtk
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/network-manager-applet-devel
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 0656107b1af..2d9861a94ba 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,14 +1,14 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.24
+version=1.18.0
 revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
- libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
- polkit-devel mobile-broadband-provider-info"
+ libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libgnome-keyring-devel libgudev-devel libnotify-devel libnma-devel
+ libsecret-devel polkit-devel mobile-broadband-provider-info"
 depends="NetworkManager hicolor-icon-theme iso-codes"
 short_desc="NetworkManager panel applet for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,38 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
+checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b
 lib32disabled=yes
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_build() {
-	export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs:${wrksrc}/src/libnm-gtk/.libs"
-}
-
-libnm-gtk_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
-	}
-}
-
-network-manager-applet-devel_package() {
-	depends="gtk+3-devel NetworkManager-devel>=1.0
-	 libnm-gtk>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		vmove usr/share/gtk-doc
-	}
-}

From 92ec1bdd5dc9227331993288404b2ef8f35d2bfb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:34:07 -0400
Subject: [PATCH 03/12] NetworkManager-strongswan: update to 1.5.2

---
 srcpkgs/NetworkManager-strongswan/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 4d8d2b14306..46c02d092e5 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,16 +1,16 @@
 # Template file for 'NetworkManager-strongswan'
 pkgname=NetworkManager-strongswan
-version=1.4.5
-revision=2
+version=1.5.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-more-warnings --without-libnm-glib
  --disable-more-warnings"
 hostmakedepends="intltool pkg-config"
-makedepends="NetworkManager-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel NetworkManager-devel libnma-devel libsecret-devel"
 depends="strongswan"
 short_desc="Strongswan NetworkManager plugin"
 maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://www.strongswan.org/"
 distfiles="https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-${version}.tar.bz2"
-checksum=343b68cbe32f65e2baa01b37716415e4360addc8c90209d45504b52b8864bd04
+checksum=c8452b952653881dcc2745f0ab460c061086215b297129212a743bd9e9f78169

From b53e6adb7d7db896b6603a22475de8eb28607b8f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 10:05:40 -0400
Subject: [PATCH 04/12] NetworkManager-l2tp: change dependency to libnma-devel

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

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index d60f5878792..1dea408c423 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="gtk+3-devel glib-devel libglib-devel libsecret-devel
- network-manager-applet-devel libressl-devel nss-devel ppp-devel"
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+ libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"
 maintainer="Douglas Kosovic <doug@uq.edu.au>"

From 9be7a3a1f2d437d5ffb3aa26d42dc34596a1c780 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 11:20:26 -0400
Subject: [PATCH 05/12] NetworkManager-openconnect: change dependency to
 libnma-devel

---
 srcpkgs/NetworkManager-openconnect/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index 327f2bd84cb..f32a075180f 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -1,18 +1,17 @@
-# Template build file for 'NetworkManager-openconnect'.
+# Template file for 'NetworkManager-openconnect'
 pkgname=NetworkManager-openconnect
 version=1.2.6
-revision=2
-lib32disabled=yes
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
-makedepends="gtk+3-devel network-manager-applet-devel libsecret-devel
- libxml2-devel openconnect-devel libressl-devel liblz4-devel
- gcr-devel"
+makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
+ libressl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-license="GPL-2"
-maintainer="Enno Boland <gottox@voidlinux.org>"
 checksum=95109803596a9782680a5dca3b51c4ad8ff7e126169d5431278cab694112975a
+lib32disabled=yes

From 67d062296686207ed7b1bf697c75bfc50437056e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 12:33:51 -0400
Subject: [PATCH 06/12] NetworkManager-openvpn: update to 1.8.12

---
 ...isable-libnm-glib-support-by-default.patch | 52 -------------------
 srcpkgs/NetworkManager-openvpn/template       |  8 +--
 2 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch

diff --git a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
deleted file mode 100644
index 7eb72e1dbb6..00000000000
--- a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-source: https://git.archlinux.org/svntogit/packages.git/tree/trunk/0001-build-disable-libnm-glib-support-by-default.patch?h=packages/networkmanager-openvpn
-
-From 52aad4911ffad04cf8274b5574124a4d5470c7fa Mon Sep 17 00:00:00 2001
-Message-Id: <52aad4911ffad04cf8274b5574124a4d5470c7fa.1549642989.git.jan.steffens@gmail.com>
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Wed, 17 Oct 2018 15:21:30 +0200
-Subject: [PATCH] build: disable libnm-glib support by default
-
-By now nobody should be using this. Keep the code around for a little
-longer just in case anybody still uses this.
-
-The libnm-glib support also serves as an example how do we build two
-different versions of the properties plugin. We'll soon be in a similar
-situation with Gtk 4.0. (sigh.) Just don't drop it yet.
-
-Conflicts:
-	NEWS
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11ff5d0..eaf015b 100644
---- configure.ac
-+++ configure.ac
-@@ -75,20 +75,20 @@ dnl
- dnl GNOME support
- dnl
- AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
--AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openvpn without libnm-glib comatibility]), [], [with_libnm_glib_specified=no])
-+AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-openvpn with libnm-glib comatibility (depreacted)]), [], [with_libnm_glib_specified=no])
- if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
- 	if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
- 		AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
- 	fi
- fi
- if test "$with_gnome" != no; then
- 	with_gnome=yes
- fi
- if test "$with_libnm_glib_specified" == no; then
--	with_libnm_glib="$with_gnome"
-+	with_libnm_glib=no
- fi
--if test "$with_libnm_glib" != no; then
--	with_libnm_glib=yes
-+if test "$with_libnm_glib" != yes; then
-+	with_libnm_glib=no
- fi
- AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
- AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
--- 
-2.20.1
diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index 170d992326e..7f2c40e6de3 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,18 +1,18 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
-version=1.8.10
-revision=2
+version=1.8.12
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
-makedepends="gtk+3-devel libglib-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef
+checksum=0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f815318
 system_accounts="_nm_openvpn"
 lib32disabled=yes
 _nm_openvpn_homedir="/var/empty"

From 0fcb2577b3074df7d0da5067d8f50eb81a40f111 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 18:18:52 -0400
Subject: [PATCH 07/12] NetworkManager-pptp: change dependency to libnma-devel

---
 srcpkgs/NetworkManager-pptp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 7889bb47800..9c541cf246f 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-pptp'
 pkgname=NetworkManager-pptp
 version=1.2.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--without-libnm-glib"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="libglib-devel gtk+3-devel libsecret-devel ppp-devel
- network-manager-applet-devel NetworkManager-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel
+ NetworkManager-devel ppp-devel"
 depends="pptpclient"
 short_desc="NetworkManager VPN plugin for pptp"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From e795e479f8820f93e1c80846f9df2f9d667e7e99 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 20:09:35 -0400
Subject: [PATCH 08/12] gnome-control-center: update to 3.38.1

---
 srcpkgs/gnome-control-center/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 191101afaad..b4be62deaa3 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.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
  gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
  libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
- libpwquality-devel mit-krb5-devel network-manager-applet-devel polkit-devel
+ libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
  pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
  libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
  clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
@@ -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=f6b6b5b8ef9c38d895ba5af87f31adae02194ad86c9aa6cff2d2b9755c2db1da
+checksum=8d90006c610f6fccb3cddbcf413b1bc4137fb4977b901a3989420fe160082026
 
 build_options="cheese"
 build_options_default="cheese"

From f62c87e772d0561e473a6e628ce2585dac7c55c8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 21:03:32 -0400
Subject: [PATCH 09/12] gnome-initial-setup: update to 3.38.1

---
 srcpkgs/gnome-initial-setup/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 63abd3c5c83..12886a0f9ae 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.0
+version=3.38.1
 revision=1
 build_style=meson
 configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config glib-devel gettext"
 makedepends="NetworkManager-devel accountsservice-devel libglib-devel
  gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
  gnome-online-accounts-devel gdm-devel libpwquality-devel
- mit-krb5-devel vala-devel network-manager-applet-devel polkit-devel
+ mit-krb5-devel vala-devel libnma-devel polkit-devel
  rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
  pango-devel"
 depends="iso-codes"
@@ -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=3a857aef5efb689f408632db8469ad27620f762d977070a36035c522c6f82759
+checksum=e55d4f4073998e0fb7b3dfcc470e2a4c7d950a96bedab15011b9084ebc813676

From c94c6600aba7d99d89c17eb961e5766a6c5bacf7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 22:29:32 -0400
Subject: [PATCH 10/12] gnome-shell: update to 3.38.1

---
 srcpkgs/gnome-shell/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index f27795572ef..6753b6ac54e 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=3.38.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper=gir
@@ -12,7 +12,7 @@ makedepends="at-spi2-atk caribou-devel evolution-data-server-devel folks-devel
  gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
- network-manager-applet-devel polkit-devel pulseaudio-devel
+ libnma-devel polkit-devel pulseaudio-devel
  startup-notification-devel telepathy-logger-devel gnome-autoar-devel"
 depends="caribou elogind glxinfo gnome-control-center gsettings-desktop-schemas upower"
 short_desc="GNOME core user interface"
@@ -21,7 +21,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c626403bc0875ee6da8c7a62ac0cee312badb523af073cb166125015a75a0a97
+checksum=b789e3296463c4cbfa329ad1724df38439c3e6d7537a01025cd8f2fec8c90bb4
 
 # needs X
 do_check() {

From 5ebb26ce729e2cd25ad314e553e1b1f80f7259fa Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 7 Oct 2020 01:24:58 -0400
Subject: [PATCH 11/12] cinnamon-control-center: change dependency to
 libnma-devel

---
 srcpkgs/cinnamon-control-center/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 27f0fbeb748..b9ebe5f22d1 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=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -10,7 +10,7 @@ hostmakedepends="autoconf-archive gettext-devel glib-devel gnome-common
 makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
  cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
  libSM-devel libXxf86misc-devel libcanberra-devel libgnomekbd-devel
- libnotify-devel libwacom-devel network-manager-applet-devel polkit-devel
+ libnotify-devel libwacom-devel libnma-devel polkit-devel
  pulseaudio-devel tzdata upower-devel"
 depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
  cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"

From b0e8572cad6ca1c7fca4d6e044d6f8caf69552ee Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Thu, 8 Oct 2020 01:02:11 -0400
Subject: [PATCH 12/12] switchboard-plug-network: update to 2.3.2

---
 srcpkgs/switchboard-plug-network/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template
index d7e5cac19d3..d243f041ed4 100644
--- a/srcpkgs/switchboard-plug-network/template
+++ b/srcpkgs/switchboard-plug-network/template
@@ -1,14 +1,15 @@
 # Template file for 'switchboard-plug-network'
 pkgname=switchboard-plug-network
-version=2.1.4
+version=2.3.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala"
 makedepends="switchboard-devel granite-devel gtk+3-devel
- network-manager-applet-devel NetworkManager-devel"
+ libnma-devel NetworkManager-devel"
 short_desc="Switchboard Network Plug"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=0b039bcb2a33fbdc8364da865c3abebb825e0d36ab89a2bf4589704722f76bba
+homepage="https://github.com/elementary/switchboard-plug-network"
+distfiles="https://github.com/elementary/${pkgname}/archive/${version}.tar.gz"
+checksum=61c3803dccf68324afe7cb67094fd9dbcb874cae47284b9b131b9bd49971d9b8
+nocross="https://travis-ci.org/github/void-linux/void-packages/builds/733837363"

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (70 preceding siblings ...)
  2020-10-08  5:02 ` [PR PATCH] [Updated] " cinerea0
@ 2020-10-08 16:01 ` cinerea0
  2020-10-08 21:34 ` cinerea0
                   ` (18 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-08 16:01 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 72b9dff466459202b58e30b7b7a9fa934e2d03ba Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:06:34 -0400
Subject: [PATCH 01/12] New package: libnma-1.8.30

---
 common/shlibs           |  2 +-
 srcpkgs/libnma-devel    |  1 +
 srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/libnma-devel
 create mode 100644 srcpkgs/libnma/template

diff --git a/common/shlibs b/common/shlibs
index 36efd174d6b..91635660be4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2981,7 +2981,7 @@ libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
 liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
-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
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+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
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}
+
+libnma-devel_package() {
+	short_desc+=" - library development files"
+	depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove usr/share/gtk-doc
+	}
+}

From 2ca17ec4f553b00c82bb3b32c37867d71bd70417 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:09:38 -0400
Subject: [PATCH 02/12] network-manager-applet: update to 1.18.0

---
 common/shlibs                           |  1 -
 srcpkgs/libnm-gtk                       |  1 -
 srcpkgs/network-manager-applet-devel    |  1 -
 srcpkgs/network-manager-applet/template | 47 ++++---------------------
 4 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 120000 srcpkgs/libnm-gtk
 delete mode 120000 srcpkgs/network-manager-applet-devel

diff --git a/common/shlibs b/common/shlibs
index 91635660be4..00839f3c723 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -905,7 +905,6 @@ liblcms2.so.2 lcms2-2.2_1
 libcolord.so.2 libcolord-1.1.7_1
 libcolordprivate.so.2 libcolord-1.1.7_1
 libcolorhug.so.2 libcolord-1.1.7_1
-libnm-gtk.so.0 libnm-gtk-0.9.1.95_1
 libcaribou.so.0 caribou-0.4.0_1
 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
 libgrilo-0.3.so.0 grilo-0.3.2_1
diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/libnm-gtk
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/network-manager-applet-devel
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 0656107b1af..2d9861a94ba 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,14 +1,14 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.24
+version=1.18.0
 revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
- libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
- polkit-devel mobile-broadband-provider-info"
+ libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libgnome-keyring-devel libgudev-devel libnotify-devel libnma-devel
+ libsecret-devel polkit-devel mobile-broadband-provider-info"
 depends="NetworkManager hicolor-icon-theme iso-codes"
 short_desc="NetworkManager panel applet for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,38 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
+checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b
 lib32disabled=yes
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_build() {
-	export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs:${wrksrc}/src/libnm-gtk/.libs"
-}
-
-libnm-gtk_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
-	}
-}
-
-network-manager-applet-devel_package() {
-	depends="gtk+3-devel NetworkManager-devel>=1.0
-	 libnm-gtk>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		vmove usr/share/gtk-doc
-	}
-}

From 92ec1bdd5dc9227331993288404b2ef8f35d2bfb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:34:07 -0400
Subject: [PATCH 03/12] NetworkManager-strongswan: update to 1.5.2

---
 srcpkgs/NetworkManager-strongswan/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 4d8d2b14306..46c02d092e5 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,16 +1,16 @@
 # Template file for 'NetworkManager-strongswan'
 pkgname=NetworkManager-strongswan
-version=1.4.5
-revision=2
+version=1.5.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-more-warnings --without-libnm-glib
  --disable-more-warnings"
 hostmakedepends="intltool pkg-config"
-makedepends="NetworkManager-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel NetworkManager-devel libnma-devel libsecret-devel"
 depends="strongswan"
 short_desc="Strongswan NetworkManager plugin"
 maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://www.strongswan.org/"
 distfiles="https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-${version}.tar.bz2"
-checksum=343b68cbe32f65e2baa01b37716415e4360addc8c90209d45504b52b8864bd04
+checksum=c8452b952653881dcc2745f0ab460c061086215b297129212a743bd9e9f78169

From b53e6adb7d7db896b6603a22475de8eb28607b8f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 10:05:40 -0400
Subject: [PATCH 04/12] NetworkManager-l2tp: change dependency to libnma-devel

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

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index d60f5878792..1dea408c423 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="gtk+3-devel glib-devel libglib-devel libsecret-devel
- network-manager-applet-devel libressl-devel nss-devel ppp-devel"
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+ libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"
 maintainer="Douglas Kosovic <doug@uq.edu.au>"

From 9be7a3a1f2d437d5ffb3aa26d42dc34596a1c780 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 11:20:26 -0400
Subject: [PATCH 05/12] NetworkManager-openconnect: change dependency to
 libnma-devel

---
 srcpkgs/NetworkManager-openconnect/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index 327f2bd84cb..f32a075180f 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -1,18 +1,17 @@
-# Template build file for 'NetworkManager-openconnect'.
+# Template file for 'NetworkManager-openconnect'
 pkgname=NetworkManager-openconnect
 version=1.2.6
-revision=2
-lib32disabled=yes
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
-makedepends="gtk+3-devel network-manager-applet-devel libsecret-devel
- libxml2-devel openconnect-devel libressl-devel liblz4-devel
- gcr-devel"
+makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
+ libressl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-license="GPL-2"
-maintainer="Enno Boland <gottox@voidlinux.org>"
 checksum=95109803596a9782680a5dca3b51c4ad8ff7e126169d5431278cab694112975a
+lib32disabled=yes

From 67d062296686207ed7b1bf697c75bfc50437056e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 12:33:51 -0400
Subject: [PATCH 06/12] NetworkManager-openvpn: update to 1.8.12

---
 ...isable-libnm-glib-support-by-default.patch | 52 -------------------
 srcpkgs/NetworkManager-openvpn/template       |  8 +--
 2 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch

diff --git a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
deleted file mode 100644
index 7eb72e1dbb6..00000000000
--- a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-source: https://git.archlinux.org/svntogit/packages.git/tree/trunk/0001-build-disable-libnm-glib-support-by-default.patch?h=packages/networkmanager-openvpn
-
-From 52aad4911ffad04cf8274b5574124a4d5470c7fa Mon Sep 17 00:00:00 2001
-Message-Id: <52aad4911ffad04cf8274b5574124a4d5470c7fa.1549642989.git.jan.steffens@gmail.com>
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Wed, 17 Oct 2018 15:21:30 +0200
-Subject: [PATCH] build: disable libnm-glib support by default
-
-By now nobody should be using this. Keep the code around for a little
-longer just in case anybody still uses this.
-
-The libnm-glib support also serves as an example how do we build two
-different versions of the properties plugin. We'll soon be in a similar
-situation with Gtk 4.0. (sigh.) Just don't drop it yet.
-
-Conflicts:
-	NEWS
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11ff5d0..eaf015b 100644
---- configure.ac
-+++ configure.ac
-@@ -75,20 +75,20 @@ dnl
- dnl GNOME support
- dnl
- AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
--AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openvpn without libnm-glib comatibility]), [], [with_libnm_glib_specified=no])
-+AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-openvpn with libnm-glib comatibility (depreacted)]), [], [with_libnm_glib_specified=no])
- if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
- 	if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
- 		AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
- 	fi
- fi
- if test "$with_gnome" != no; then
- 	with_gnome=yes
- fi
- if test "$with_libnm_glib_specified" == no; then
--	with_libnm_glib="$with_gnome"
-+	with_libnm_glib=no
- fi
--if test "$with_libnm_glib" != no; then
--	with_libnm_glib=yes
-+if test "$with_libnm_glib" != yes; then
-+	with_libnm_glib=no
- fi
- AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
- AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
--- 
-2.20.1
diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index 170d992326e..7f2c40e6de3 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,18 +1,18 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
-version=1.8.10
-revision=2
+version=1.8.12
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
-makedepends="gtk+3-devel libglib-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef
+checksum=0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f815318
 system_accounts="_nm_openvpn"
 lib32disabled=yes
 _nm_openvpn_homedir="/var/empty"

From 0fcb2577b3074df7d0da5067d8f50eb81a40f111 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 18:18:52 -0400
Subject: [PATCH 07/12] NetworkManager-pptp: change dependency to libnma-devel

---
 srcpkgs/NetworkManager-pptp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 7889bb47800..9c541cf246f 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-pptp'
 pkgname=NetworkManager-pptp
 version=1.2.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--without-libnm-glib"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="libglib-devel gtk+3-devel libsecret-devel ppp-devel
- network-manager-applet-devel NetworkManager-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel
+ NetworkManager-devel ppp-devel"
 depends="pptpclient"
 short_desc="NetworkManager VPN plugin for pptp"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From e795e479f8820f93e1c80846f9df2f9d667e7e99 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 20:09:35 -0400
Subject: [PATCH 08/12] gnome-control-center: update to 3.38.1

---
 srcpkgs/gnome-control-center/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 191101afaad..b4be62deaa3 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.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
  gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
  libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
- libpwquality-devel mit-krb5-devel network-manager-applet-devel polkit-devel
+ libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
  pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
  libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
  clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
@@ -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=f6b6b5b8ef9c38d895ba5af87f31adae02194ad86c9aa6cff2d2b9755c2db1da
+checksum=8d90006c610f6fccb3cddbcf413b1bc4137fb4977b901a3989420fe160082026
 
 build_options="cheese"
 build_options_default="cheese"

From f62c87e772d0561e473a6e628ce2585dac7c55c8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 21:03:32 -0400
Subject: [PATCH 09/12] gnome-initial-setup: update to 3.38.1

---
 srcpkgs/gnome-initial-setup/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 63abd3c5c83..12886a0f9ae 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.0
+version=3.38.1
 revision=1
 build_style=meson
 configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config glib-devel gettext"
 makedepends="NetworkManager-devel accountsservice-devel libglib-devel
  gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
  gnome-online-accounts-devel gdm-devel libpwquality-devel
- mit-krb5-devel vala-devel network-manager-applet-devel polkit-devel
+ mit-krb5-devel vala-devel libnma-devel polkit-devel
  rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
  pango-devel"
 depends="iso-codes"
@@ -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=3a857aef5efb689f408632db8469ad27620f762d977070a36035c522c6f82759
+checksum=e55d4f4073998e0fb7b3dfcc470e2a4c7d950a96bedab15011b9084ebc813676

From c94c6600aba7d99d89c17eb961e5766a6c5bacf7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 22:29:32 -0400
Subject: [PATCH 10/12] gnome-shell: update to 3.38.1

---
 srcpkgs/gnome-shell/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index f27795572ef..6753b6ac54e 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=3.38.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper=gir
@@ -12,7 +12,7 @@ makedepends="at-spi2-atk caribou-devel evolution-data-server-devel folks-devel
  gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
- network-manager-applet-devel polkit-devel pulseaudio-devel
+ libnma-devel polkit-devel pulseaudio-devel
  startup-notification-devel telepathy-logger-devel gnome-autoar-devel"
 depends="caribou elogind glxinfo gnome-control-center gsettings-desktop-schemas upower"
 short_desc="GNOME core user interface"
@@ -21,7 +21,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c626403bc0875ee6da8c7a62ac0cee312badb523af073cb166125015a75a0a97
+checksum=b789e3296463c4cbfa329ad1724df38439c3e6d7537a01025cd8f2fec8c90bb4
 
 # needs X
 do_check() {

From 5ebb26ce729e2cd25ad314e553e1b1f80f7259fa Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 7 Oct 2020 01:24:58 -0400
Subject: [PATCH 11/12] cinnamon-control-center: change dependency to
 libnma-devel

---
 srcpkgs/cinnamon-control-center/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 27f0fbeb748..b9ebe5f22d1 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=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -10,7 +10,7 @@ hostmakedepends="autoconf-archive gettext-devel glib-devel gnome-common
 makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
  cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
  libSM-devel libXxf86misc-devel libcanberra-devel libgnomekbd-devel
- libnotify-devel libwacom-devel network-manager-applet-devel polkit-devel
+ libnotify-devel libwacom-devel libnma-devel polkit-devel
  pulseaudio-devel tzdata upower-devel"
 depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
  cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"

From 3590c4f58020795c987f6adb9e702feaca4a4eb1 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Thu, 8 Oct 2020 12:01:28 -0400
Subject: [PATCH 12/12] switchboard-plug-network: update to 2.3.2

---
 srcpkgs/switchboard-plug-network/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template
index d7e5cac19d3..d243f041ed4 100644
--- a/srcpkgs/switchboard-plug-network/template
+++ b/srcpkgs/switchboard-plug-network/template
@@ -1,14 +1,15 @@
 # Template file for 'switchboard-plug-network'
 pkgname=switchboard-plug-network
-version=2.1.4
+version=2.3.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala"
 makedepends="switchboard-devel granite-devel gtk+3-devel
- network-manager-applet-devel NetworkManager-devel"
+ libnma-devel NetworkManager-devel"
 short_desc="Switchboard Network Plug"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=0b039bcb2a33fbdc8364da865c3abebb825e0d36ab89a2bf4589704722f76bba
+homepage="https://github.com/elementary/switchboard-plug-network"
+distfiles="https://github.com/elementary/${pkgname}/archive/${version}.tar.gz"
+checksum=61c3803dccf68324afe7cb67094fd9dbcb874cae47284b9b131b9bd49971d9b8
+nocross="https://travis-ci.org/github/void-linux/void-packages/builds/733837363"

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (71 preceding siblings ...)
  2020-10-08 16:01 ` cinerea0
@ 2020-10-08 21:34 ` cinerea0
  2020-10-08 21:35 ` [PR PATCH] [Updated] " cinerea0
                   ` (17 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-08 21:34 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-705836029

Comment:
Seriously, two transient resolver errors in a row? This is crazy-making.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (72 preceding siblings ...)
  2020-10-08 21:34 ` cinerea0
@ 2020-10-08 21:35 ` cinerea0
  2020-10-08 22:13 ` cinerea0
                   ` (16 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-08 21:35 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 72b9dff466459202b58e30b7b7a9fa934e2d03ba Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:06:34 -0400
Subject: [PATCH 01/12] New package: libnma-1.8.30

---
 common/shlibs           |  2 +-
 srcpkgs/libnma-devel    |  1 +
 srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/libnma-devel
 create mode 100644 srcpkgs/libnma/template

diff --git a/common/shlibs b/common/shlibs
index 36efd174d6b..91635660be4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2981,7 +2981,7 @@ libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
 liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
-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
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+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
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}
+
+libnma-devel_package() {
+	short_desc+=" - library development files"
+	depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove usr/share/gtk-doc
+	}
+}

From 2ca17ec4f553b00c82bb3b32c37867d71bd70417 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:09:38 -0400
Subject: [PATCH 02/12] network-manager-applet: update to 1.18.0

---
 common/shlibs                           |  1 -
 srcpkgs/libnm-gtk                       |  1 -
 srcpkgs/network-manager-applet-devel    |  1 -
 srcpkgs/network-manager-applet/template | 47 ++++---------------------
 4 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 120000 srcpkgs/libnm-gtk
 delete mode 120000 srcpkgs/network-manager-applet-devel

diff --git a/common/shlibs b/common/shlibs
index 91635660be4..00839f3c723 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -905,7 +905,6 @@ liblcms2.so.2 lcms2-2.2_1
 libcolord.so.2 libcolord-1.1.7_1
 libcolordprivate.so.2 libcolord-1.1.7_1
 libcolorhug.so.2 libcolord-1.1.7_1
-libnm-gtk.so.0 libnm-gtk-0.9.1.95_1
 libcaribou.so.0 caribou-0.4.0_1
 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
 libgrilo-0.3.so.0 grilo-0.3.2_1
diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/libnm-gtk
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/network-manager-applet-devel
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 0656107b1af..2d9861a94ba 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,14 +1,14 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.24
+version=1.18.0
 revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
- libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
- polkit-devel mobile-broadband-provider-info"
+ libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libgnome-keyring-devel libgudev-devel libnotify-devel libnma-devel
+ libsecret-devel polkit-devel mobile-broadband-provider-info"
 depends="NetworkManager hicolor-icon-theme iso-codes"
 short_desc="NetworkManager panel applet for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,38 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
+checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b
 lib32disabled=yes
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_build() {
-	export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs:${wrksrc}/src/libnm-gtk/.libs"
-}
-
-libnm-gtk_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
-	}
-}
-
-network-manager-applet-devel_package() {
-	depends="gtk+3-devel NetworkManager-devel>=1.0
-	 libnm-gtk>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		vmove usr/share/gtk-doc
-	}
-}

From 92ec1bdd5dc9227331993288404b2ef8f35d2bfb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:34:07 -0400
Subject: [PATCH 03/12] NetworkManager-strongswan: update to 1.5.2

---
 srcpkgs/NetworkManager-strongswan/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 4d8d2b14306..46c02d092e5 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,16 +1,16 @@
 # Template file for 'NetworkManager-strongswan'
 pkgname=NetworkManager-strongswan
-version=1.4.5
-revision=2
+version=1.5.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-more-warnings --without-libnm-glib
  --disable-more-warnings"
 hostmakedepends="intltool pkg-config"
-makedepends="NetworkManager-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel NetworkManager-devel libnma-devel libsecret-devel"
 depends="strongswan"
 short_desc="Strongswan NetworkManager plugin"
 maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://www.strongswan.org/"
 distfiles="https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-${version}.tar.bz2"
-checksum=343b68cbe32f65e2baa01b37716415e4360addc8c90209d45504b52b8864bd04
+checksum=c8452b952653881dcc2745f0ab460c061086215b297129212a743bd9e9f78169

From b53e6adb7d7db896b6603a22475de8eb28607b8f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 10:05:40 -0400
Subject: [PATCH 04/12] NetworkManager-l2tp: change dependency to libnma-devel

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

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index d60f5878792..1dea408c423 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="gtk+3-devel glib-devel libglib-devel libsecret-devel
- network-manager-applet-devel libressl-devel nss-devel ppp-devel"
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+ libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"
 maintainer="Douglas Kosovic <doug@uq.edu.au>"

From 9be7a3a1f2d437d5ffb3aa26d42dc34596a1c780 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 11:20:26 -0400
Subject: [PATCH 05/12] NetworkManager-openconnect: change dependency to
 libnma-devel

---
 srcpkgs/NetworkManager-openconnect/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index 327f2bd84cb..f32a075180f 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -1,18 +1,17 @@
-# Template build file for 'NetworkManager-openconnect'.
+# Template file for 'NetworkManager-openconnect'
 pkgname=NetworkManager-openconnect
 version=1.2.6
-revision=2
-lib32disabled=yes
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
-makedepends="gtk+3-devel network-manager-applet-devel libsecret-devel
- libxml2-devel openconnect-devel libressl-devel liblz4-devel
- gcr-devel"
+makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
+ libressl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-license="GPL-2"
-maintainer="Enno Boland <gottox@voidlinux.org>"
 checksum=95109803596a9782680a5dca3b51c4ad8ff7e126169d5431278cab694112975a
+lib32disabled=yes

From 67d062296686207ed7b1bf697c75bfc50437056e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 12:33:51 -0400
Subject: [PATCH 06/12] NetworkManager-openvpn: update to 1.8.12

---
 ...isable-libnm-glib-support-by-default.patch | 52 -------------------
 srcpkgs/NetworkManager-openvpn/template       |  8 +--
 2 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch

diff --git a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
deleted file mode 100644
index 7eb72e1dbb6..00000000000
--- a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-source: https://git.archlinux.org/svntogit/packages.git/tree/trunk/0001-build-disable-libnm-glib-support-by-default.patch?h=packages/networkmanager-openvpn
-
-From 52aad4911ffad04cf8274b5574124a4d5470c7fa Mon Sep 17 00:00:00 2001
-Message-Id: <52aad4911ffad04cf8274b5574124a4d5470c7fa.1549642989.git.jan.steffens@gmail.com>
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Wed, 17 Oct 2018 15:21:30 +0200
-Subject: [PATCH] build: disable libnm-glib support by default
-
-By now nobody should be using this. Keep the code around for a little
-longer just in case anybody still uses this.
-
-The libnm-glib support also serves as an example how do we build two
-different versions of the properties plugin. We'll soon be in a similar
-situation with Gtk 4.0. (sigh.) Just don't drop it yet.
-
-Conflicts:
-	NEWS
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11ff5d0..eaf015b 100644
---- configure.ac
-+++ configure.ac
-@@ -75,20 +75,20 @@ dnl
- dnl GNOME support
- dnl
- AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
--AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openvpn without libnm-glib comatibility]), [], [with_libnm_glib_specified=no])
-+AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-openvpn with libnm-glib comatibility (depreacted)]), [], [with_libnm_glib_specified=no])
- if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
- 	if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
- 		AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
- 	fi
- fi
- if test "$with_gnome" != no; then
- 	with_gnome=yes
- fi
- if test "$with_libnm_glib_specified" == no; then
--	with_libnm_glib="$with_gnome"
-+	with_libnm_glib=no
- fi
--if test "$with_libnm_glib" != no; then
--	with_libnm_glib=yes
-+if test "$with_libnm_glib" != yes; then
-+	with_libnm_glib=no
- fi
- AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
- AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
--- 
-2.20.1
diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index 170d992326e..7f2c40e6de3 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,18 +1,18 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
-version=1.8.10
-revision=2
+version=1.8.12
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
-makedepends="gtk+3-devel libglib-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef
+checksum=0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f815318
 system_accounts="_nm_openvpn"
 lib32disabled=yes
 _nm_openvpn_homedir="/var/empty"

From 0fcb2577b3074df7d0da5067d8f50eb81a40f111 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 18:18:52 -0400
Subject: [PATCH 07/12] NetworkManager-pptp: change dependency to libnma-devel

---
 srcpkgs/NetworkManager-pptp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 7889bb47800..9c541cf246f 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-pptp'
 pkgname=NetworkManager-pptp
 version=1.2.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--without-libnm-glib"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="libglib-devel gtk+3-devel libsecret-devel ppp-devel
- network-manager-applet-devel NetworkManager-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel
+ NetworkManager-devel ppp-devel"
 depends="pptpclient"
 short_desc="NetworkManager VPN plugin for pptp"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From e795e479f8820f93e1c80846f9df2f9d667e7e99 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 20:09:35 -0400
Subject: [PATCH 08/12] gnome-control-center: update to 3.38.1

---
 srcpkgs/gnome-control-center/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 191101afaad..b4be62deaa3 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.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
  gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
  libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
- libpwquality-devel mit-krb5-devel network-manager-applet-devel polkit-devel
+ libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
  pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
  libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
  clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
@@ -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=f6b6b5b8ef9c38d895ba5af87f31adae02194ad86c9aa6cff2d2b9755c2db1da
+checksum=8d90006c610f6fccb3cddbcf413b1bc4137fb4977b901a3989420fe160082026
 
 build_options="cheese"
 build_options_default="cheese"

From f62c87e772d0561e473a6e628ce2585dac7c55c8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 21:03:32 -0400
Subject: [PATCH 09/12] gnome-initial-setup: update to 3.38.1

---
 srcpkgs/gnome-initial-setup/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 63abd3c5c83..12886a0f9ae 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.0
+version=3.38.1
 revision=1
 build_style=meson
 configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config glib-devel gettext"
 makedepends="NetworkManager-devel accountsservice-devel libglib-devel
  gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
  gnome-online-accounts-devel gdm-devel libpwquality-devel
- mit-krb5-devel vala-devel network-manager-applet-devel polkit-devel
+ mit-krb5-devel vala-devel libnma-devel polkit-devel
  rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
  pango-devel"
 depends="iso-codes"
@@ -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=3a857aef5efb689f408632db8469ad27620f762d977070a36035c522c6f82759
+checksum=e55d4f4073998e0fb7b3dfcc470e2a4c7d950a96bedab15011b9084ebc813676

From c94c6600aba7d99d89c17eb961e5766a6c5bacf7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 22:29:32 -0400
Subject: [PATCH 10/12] gnome-shell: update to 3.38.1

---
 srcpkgs/gnome-shell/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index f27795572ef..6753b6ac54e 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=3.38.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper=gir
@@ -12,7 +12,7 @@ makedepends="at-spi2-atk caribou-devel evolution-data-server-devel folks-devel
  gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
- network-manager-applet-devel polkit-devel pulseaudio-devel
+ libnma-devel polkit-devel pulseaudio-devel
  startup-notification-devel telepathy-logger-devel gnome-autoar-devel"
 depends="caribou elogind glxinfo gnome-control-center gsettings-desktop-schemas upower"
 short_desc="GNOME core user interface"
@@ -21,7 +21,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c626403bc0875ee6da8c7a62ac0cee312badb523af073cb166125015a75a0a97
+checksum=b789e3296463c4cbfa329ad1724df38439c3e6d7537a01025cd8f2fec8c90bb4
 
 # needs X
 do_check() {

From 5ebb26ce729e2cd25ad314e553e1b1f80f7259fa Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 7 Oct 2020 01:24:58 -0400
Subject: [PATCH 11/12] cinnamon-control-center: change dependency to
 libnma-devel

---
 srcpkgs/cinnamon-control-center/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 27f0fbeb748..b9ebe5f22d1 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=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -10,7 +10,7 @@ hostmakedepends="autoconf-archive gettext-devel glib-devel gnome-common
 makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
  cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
  libSM-devel libXxf86misc-devel libcanberra-devel libgnomekbd-devel
- libnotify-devel libwacom-devel network-manager-applet-devel polkit-devel
+ libnotify-devel libwacom-devel libnma-devel polkit-devel
  pulseaudio-devel tzdata upower-devel"
 depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
  cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"

From 36d31ea853277d6eaeb6dd922b844f6b7cd1f743 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Thu, 8 Oct 2020 17:35:03 -0400
Subject: [PATCH 12/12] switchboard-plug-network: update to 2.3.2

---
 srcpkgs/switchboard-plug-network/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template
index d7e5cac19d3..d243f041ed4 100644
--- a/srcpkgs/switchboard-plug-network/template
+++ b/srcpkgs/switchboard-plug-network/template
@@ -1,14 +1,15 @@
 # Template file for 'switchboard-plug-network'
 pkgname=switchboard-plug-network
-version=2.1.4
+version=2.3.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala"
 makedepends="switchboard-devel granite-devel gtk+3-devel
- network-manager-applet-devel NetworkManager-devel"
+ libnma-devel NetworkManager-devel"
 short_desc="Switchboard Network Plug"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=0b039bcb2a33fbdc8364da865c3abebb825e0d36ab89a2bf4589704722f76bba
+homepage="https://github.com/elementary/switchboard-plug-network"
+distfiles="https://github.com/elementary/${pkgname}/archive/${version}.tar.gz"
+checksum=61c3803dccf68324afe7cb67094fd9dbcb874cae47284b9b131b9bd49971d9b8
+nocross="https://travis-ci.org/github/void-linux/void-packages/builds/733837363"

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (73 preceding siblings ...)
  2020-10-08 21:35 ` [PR PATCH] [Updated] " cinerea0
@ 2020-10-08 22:13 ` cinerea0
  2020-10-08 23:46 ` [PR PATCH] [Updated] " cinerea0
                   ` (15 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-08 22:13 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-705850896

Comment:
Three times in a row! What am I even supposed to do about this?

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (74 preceding siblings ...)
  2020-10-08 22:13 ` cinerea0
@ 2020-10-08 23:46 ` cinerea0
  2020-10-09  1:29 ` cinerea0
                   ` (14 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-08 23:46 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 72b9dff466459202b58e30b7b7a9fa934e2d03ba Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:06:34 -0400
Subject: [PATCH 01/12] New package: libnma-1.8.30

---
 common/shlibs           |  2 +-
 srcpkgs/libnma-devel    |  1 +
 srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/libnma-devel
 create mode 100644 srcpkgs/libnma/template

diff --git a/common/shlibs b/common/shlibs
index 36efd174d6b..91635660be4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2981,7 +2981,7 @@ libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
 liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
-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
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+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
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}
+
+libnma-devel_package() {
+	short_desc+=" - library development files"
+	depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove usr/share/gtk-doc
+	}
+}

From 2ca17ec4f553b00c82bb3b32c37867d71bd70417 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:09:38 -0400
Subject: [PATCH 02/12] network-manager-applet: update to 1.18.0

---
 common/shlibs                           |  1 -
 srcpkgs/libnm-gtk                       |  1 -
 srcpkgs/network-manager-applet-devel    |  1 -
 srcpkgs/network-manager-applet/template | 47 ++++---------------------
 4 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 120000 srcpkgs/libnm-gtk
 delete mode 120000 srcpkgs/network-manager-applet-devel

diff --git a/common/shlibs b/common/shlibs
index 91635660be4..00839f3c723 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -905,7 +905,6 @@ liblcms2.so.2 lcms2-2.2_1
 libcolord.so.2 libcolord-1.1.7_1
 libcolordprivate.so.2 libcolord-1.1.7_1
 libcolorhug.so.2 libcolord-1.1.7_1
-libnm-gtk.so.0 libnm-gtk-0.9.1.95_1
 libcaribou.so.0 caribou-0.4.0_1
 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
 libgrilo-0.3.so.0 grilo-0.3.2_1
diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/libnm-gtk
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/network-manager-applet-devel
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 0656107b1af..2d9861a94ba 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,14 +1,14 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.24
+version=1.18.0
 revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
- libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
- polkit-devel mobile-broadband-provider-info"
+ libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libgnome-keyring-devel libgudev-devel libnotify-devel libnma-devel
+ libsecret-devel polkit-devel mobile-broadband-provider-info"
 depends="NetworkManager hicolor-icon-theme iso-codes"
 short_desc="NetworkManager panel applet for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,38 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
+checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b
 lib32disabled=yes
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_build() {
-	export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs:${wrksrc}/src/libnm-gtk/.libs"
-}
-
-libnm-gtk_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
-	}
-}
-
-network-manager-applet-devel_package() {
-	depends="gtk+3-devel NetworkManager-devel>=1.0
-	 libnm-gtk>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		vmove usr/share/gtk-doc
-	}
-}

From 92ec1bdd5dc9227331993288404b2ef8f35d2bfb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:34:07 -0400
Subject: [PATCH 03/12] NetworkManager-strongswan: update to 1.5.2

---
 srcpkgs/NetworkManager-strongswan/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 4d8d2b14306..46c02d092e5 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,16 +1,16 @@
 # Template file for 'NetworkManager-strongswan'
 pkgname=NetworkManager-strongswan
-version=1.4.5
-revision=2
+version=1.5.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-more-warnings --without-libnm-glib
  --disable-more-warnings"
 hostmakedepends="intltool pkg-config"
-makedepends="NetworkManager-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel NetworkManager-devel libnma-devel libsecret-devel"
 depends="strongswan"
 short_desc="Strongswan NetworkManager plugin"
 maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://www.strongswan.org/"
 distfiles="https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-${version}.tar.bz2"
-checksum=343b68cbe32f65e2baa01b37716415e4360addc8c90209d45504b52b8864bd04
+checksum=c8452b952653881dcc2745f0ab460c061086215b297129212a743bd9e9f78169

From b53e6adb7d7db896b6603a22475de8eb28607b8f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 10:05:40 -0400
Subject: [PATCH 04/12] NetworkManager-l2tp: change dependency to libnma-devel

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

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index d60f5878792..1dea408c423 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="gtk+3-devel glib-devel libglib-devel libsecret-devel
- network-manager-applet-devel libressl-devel nss-devel ppp-devel"
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+ libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"
 maintainer="Douglas Kosovic <doug@uq.edu.au>"

From 9be7a3a1f2d437d5ffb3aa26d42dc34596a1c780 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 11:20:26 -0400
Subject: [PATCH 05/12] NetworkManager-openconnect: change dependency to
 libnma-devel

---
 srcpkgs/NetworkManager-openconnect/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index 327f2bd84cb..f32a075180f 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -1,18 +1,17 @@
-# Template build file for 'NetworkManager-openconnect'.
+# Template file for 'NetworkManager-openconnect'
 pkgname=NetworkManager-openconnect
 version=1.2.6
-revision=2
-lib32disabled=yes
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
-makedepends="gtk+3-devel network-manager-applet-devel libsecret-devel
- libxml2-devel openconnect-devel libressl-devel liblz4-devel
- gcr-devel"
+makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
+ libressl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-license="GPL-2"
-maintainer="Enno Boland <gottox@voidlinux.org>"
 checksum=95109803596a9782680a5dca3b51c4ad8ff7e126169d5431278cab694112975a
+lib32disabled=yes

From 67d062296686207ed7b1bf697c75bfc50437056e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 12:33:51 -0400
Subject: [PATCH 06/12] NetworkManager-openvpn: update to 1.8.12

---
 ...isable-libnm-glib-support-by-default.patch | 52 -------------------
 srcpkgs/NetworkManager-openvpn/template       |  8 +--
 2 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch

diff --git a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
deleted file mode 100644
index 7eb72e1dbb6..00000000000
--- a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-source: https://git.archlinux.org/svntogit/packages.git/tree/trunk/0001-build-disable-libnm-glib-support-by-default.patch?h=packages/networkmanager-openvpn
-
-From 52aad4911ffad04cf8274b5574124a4d5470c7fa Mon Sep 17 00:00:00 2001
-Message-Id: <52aad4911ffad04cf8274b5574124a4d5470c7fa.1549642989.git.jan.steffens@gmail.com>
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Wed, 17 Oct 2018 15:21:30 +0200
-Subject: [PATCH] build: disable libnm-glib support by default
-
-By now nobody should be using this. Keep the code around for a little
-longer just in case anybody still uses this.
-
-The libnm-glib support also serves as an example how do we build two
-different versions of the properties plugin. We'll soon be in a similar
-situation with Gtk 4.0. (sigh.) Just don't drop it yet.
-
-Conflicts:
-	NEWS
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11ff5d0..eaf015b 100644
---- configure.ac
-+++ configure.ac
-@@ -75,20 +75,20 @@ dnl
- dnl GNOME support
- dnl
- AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
--AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openvpn without libnm-glib comatibility]), [], [with_libnm_glib_specified=no])
-+AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-openvpn with libnm-glib comatibility (depreacted)]), [], [with_libnm_glib_specified=no])
- if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
- 	if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
- 		AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
- 	fi
- fi
- if test "$with_gnome" != no; then
- 	with_gnome=yes
- fi
- if test "$with_libnm_glib_specified" == no; then
--	with_libnm_glib="$with_gnome"
-+	with_libnm_glib=no
- fi
--if test "$with_libnm_glib" != no; then
--	with_libnm_glib=yes
-+if test "$with_libnm_glib" != yes; then
-+	with_libnm_glib=no
- fi
- AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
- AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
--- 
-2.20.1
diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index 170d992326e..7f2c40e6de3 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,18 +1,18 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
-version=1.8.10
-revision=2
+version=1.8.12
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
-makedepends="gtk+3-devel libglib-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef
+checksum=0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f815318
 system_accounts="_nm_openvpn"
 lib32disabled=yes
 _nm_openvpn_homedir="/var/empty"

From 0fcb2577b3074df7d0da5067d8f50eb81a40f111 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 18:18:52 -0400
Subject: [PATCH 07/12] NetworkManager-pptp: change dependency to libnma-devel

---
 srcpkgs/NetworkManager-pptp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 7889bb47800..9c541cf246f 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-pptp'
 pkgname=NetworkManager-pptp
 version=1.2.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--without-libnm-glib"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="libglib-devel gtk+3-devel libsecret-devel ppp-devel
- network-manager-applet-devel NetworkManager-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel
+ NetworkManager-devel ppp-devel"
 depends="pptpclient"
 short_desc="NetworkManager VPN plugin for pptp"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From e795e479f8820f93e1c80846f9df2f9d667e7e99 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 20:09:35 -0400
Subject: [PATCH 08/12] gnome-control-center: update to 3.38.1

---
 srcpkgs/gnome-control-center/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 191101afaad..b4be62deaa3 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.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
  gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
  libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
- libpwquality-devel mit-krb5-devel network-manager-applet-devel polkit-devel
+ libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
  pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
  libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
  clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
@@ -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=f6b6b5b8ef9c38d895ba5af87f31adae02194ad86c9aa6cff2d2b9755c2db1da
+checksum=8d90006c610f6fccb3cddbcf413b1bc4137fb4977b901a3989420fe160082026
 
 build_options="cheese"
 build_options_default="cheese"

From f62c87e772d0561e473a6e628ce2585dac7c55c8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 21:03:32 -0400
Subject: [PATCH 09/12] gnome-initial-setup: update to 3.38.1

---
 srcpkgs/gnome-initial-setup/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 63abd3c5c83..12886a0f9ae 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.0
+version=3.38.1
 revision=1
 build_style=meson
 configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config glib-devel gettext"
 makedepends="NetworkManager-devel accountsservice-devel libglib-devel
  gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
  gnome-online-accounts-devel gdm-devel libpwquality-devel
- mit-krb5-devel vala-devel network-manager-applet-devel polkit-devel
+ mit-krb5-devel vala-devel libnma-devel polkit-devel
  rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
  pango-devel"
 depends="iso-codes"
@@ -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=3a857aef5efb689f408632db8469ad27620f762d977070a36035c522c6f82759
+checksum=e55d4f4073998e0fb7b3dfcc470e2a4c7d950a96bedab15011b9084ebc813676

From c94c6600aba7d99d89c17eb961e5766a6c5bacf7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 22:29:32 -0400
Subject: [PATCH 10/12] gnome-shell: update to 3.38.1

---
 srcpkgs/gnome-shell/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index f27795572ef..6753b6ac54e 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=3.38.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper=gir
@@ -12,7 +12,7 @@ makedepends="at-spi2-atk caribou-devel evolution-data-server-devel folks-devel
  gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
- network-manager-applet-devel polkit-devel pulseaudio-devel
+ libnma-devel polkit-devel pulseaudio-devel
  startup-notification-devel telepathy-logger-devel gnome-autoar-devel"
 depends="caribou elogind glxinfo gnome-control-center gsettings-desktop-schemas upower"
 short_desc="GNOME core user interface"
@@ -21,7 +21,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c626403bc0875ee6da8c7a62ac0cee312badb523af073cb166125015a75a0a97
+checksum=b789e3296463c4cbfa329ad1724df38439c3e6d7537a01025cd8f2fec8c90bb4
 
 # needs X
 do_check() {

From 5ebb26ce729e2cd25ad314e553e1b1f80f7259fa Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 7 Oct 2020 01:24:58 -0400
Subject: [PATCH 11/12] cinnamon-control-center: change dependency to
 libnma-devel

---
 srcpkgs/cinnamon-control-center/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 27f0fbeb748..b9ebe5f22d1 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=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -10,7 +10,7 @@ hostmakedepends="autoconf-archive gettext-devel glib-devel gnome-common
 makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
  cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
  libSM-devel libXxf86misc-devel libcanberra-devel libgnomekbd-devel
- libnotify-devel libwacom-devel network-manager-applet-devel polkit-devel
+ libnotify-devel libwacom-devel libnma-devel polkit-devel
  pulseaudio-devel tzdata upower-devel"
 depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
  cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"

From 679602ab7cc60b1d8fd23d705266a75b72dbedf3 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Thu, 8 Oct 2020 19:45:42 -0400
Subject: [PATCH 12/12] switchboard-plug-network: update to 2.3.2

---
 srcpkgs/switchboard-plug-network/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template
index d7e5cac19d3..d243f041ed4 100644
--- a/srcpkgs/switchboard-plug-network/template
+++ b/srcpkgs/switchboard-plug-network/template
@@ -1,14 +1,15 @@
 # Template file for 'switchboard-plug-network'
 pkgname=switchboard-plug-network
-version=2.1.4
+version=2.3.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala"
 makedepends="switchboard-devel granite-devel gtk+3-devel
- network-manager-applet-devel NetworkManager-devel"
+ libnma-devel NetworkManager-devel"
 short_desc="Switchboard Network Plug"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=0b039bcb2a33fbdc8364da865c3abebb825e0d36ab89a2bf4589704722f76bba
+homepage="https://github.com/elementary/switchboard-plug-network"
+distfiles="https://github.com/elementary/${pkgname}/archive/${version}.tar.gz"
+checksum=61c3803dccf68324afe7cb67094fd9dbcb874cae47284b9b131b9bd49971d9b8
+nocross="https://travis-ci.org/github/void-linux/void-packages/builds/733837363"

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (75 preceding siblings ...)
  2020-10-08 23:46 ` [PR PATCH] [Updated] " cinerea0
@ 2020-10-09  1:29 ` cinerea0
  2020-10-09  4:42 ` [PR PATCH] [Updated] " cinerea0
                   ` (13 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-09  1:29 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-705914688

Comment:
You know what? I know that it builds properly on all architectures because the DNS failure keeps happening on different arches. I'll be moving on to the last one shortly.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (76 preceding siblings ...)
  2020-10-09  1:29 ` cinerea0
@ 2020-10-09  4:42 ` cinerea0
  2020-10-09  6:42 ` CameronNemo
                   ` (12 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-09  4:42 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 72b9dff466459202b58e30b7b7a9fa934e2d03ba Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:06:34 -0400
Subject: [PATCH 01/13] New package: libnma-1.8.30

---
 common/shlibs           |  2 +-
 srcpkgs/libnma-devel    |  1 +
 srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/libnma-devel
 create mode 100644 srcpkgs/libnma/template

diff --git a/common/shlibs b/common/shlibs
index 36efd174d6b..91635660be4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2981,7 +2981,7 @@ libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
 liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
-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
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+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
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}
+
+libnma-devel_package() {
+	short_desc+=" - library development files"
+	depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove usr/share/gtk-doc
+	}
+}

From 2ca17ec4f553b00c82bb3b32c37867d71bd70417 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:09:38 -0400
Subject: [PATCH 02/13] network-manager-applet: update to 1.18.0

---
 common/shlibs                           |  1 -
 srcpkgs/libnm-gtk                       |  1 -
 srcpkgs/network-manager-applet-devel    |  1 -
 srcpkgs/network-manager-applet/template | 47 ++++---------------------
 4 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 120000 srcpkgs/libnm-gtk
 delete mode 120000 srcpkgs/network-manager-applet-devel

diff --git a/common/shlibs b/common/shlibs
index 91635660be4..00839f3c723 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -905,7 +905,6 @@ liblcms2.so.2 lcms2-2.2_1
 libcolord.so.2 libcolord-1.1.7_1
 libcolordprivate.so.2 libcolord-1.1.7_1
 libcolorhug.so.2 libcolord-1.1.7_1
-libnm-gtk.so.0 libnm-gtk-0.9.1.95_1
 libcaribou.so.0 caribou-0.4.0_1
 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
 libgrilo-0.3.so.0 grilo-0.3.2_1
diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/libnm-gtk
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/network-manager-applet-devel
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 0656107b1af..2d9861a94ba 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,14 +1,14 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.24
+version=1.18.0
 revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
- libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
- polkit-devel mobile-broadband-provider-info"
+ libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libgnome-keyring-devel libgudev-devel libnotify-devel libnma-devel
+ libsecret-devel polkit-devel mobile-broadband-provider-info"
 depends="NetworkManager hicolor-icon-theme iso-codes"
 short_desc="NetworkManager panel applet for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,38 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
+checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b
 lib32disabled=yes
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_build() {
-	export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs:${wrksrc}/src/libnm-gtk/.libs"
-}
-
-libnm-gtk_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
-	}
-}
-
-network-manager-applet-devel_package() {
-	depends="gtk+3-devel NetworkManager-devel>=1.0
-	 libnm-gtk>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		vmove usr/share/gtk-doc
-	}
-}

From 92ec1bdd5dc9227331993288404b2ef8f35d2bfb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:34:07 -0400
Subject: [PATCH 03/13] NetworkManager-strongswan: update to 1.5.2

---
 srcpkgs/NetworkManager-strongswan/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 4d8d2b14306..46c02d092e5 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,16 +1,16 @@
 # Template file for 'NetworkManager-strongswan'
 pkgname=NetworkManager-strongswan
-version=1.4.5
-revision=2
+version=1.5.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-more-warnings --without-libnm-glib
  --disable-more-warnings"
 hostmakedepends="intltool pkg-config"
-makedepends="NetworkManager-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel NetworkManager-devel libnma-devel libsecret-devel"
 depends="strongswan"
 short_desc="Strongswan NetworkManager plugin"
 maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://www.strongswan.org/"
 distfiles="https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-${version}.tar.bz2"
-checksum=343b68cbe32f65e2baa01b37716415e4360addc8c90209d45504b52b8864bd04
+checksum=c8452b952653881dcc2745f0ab460c061086215b297129212a743bd9e9f78169

From b53e6adb7d7db896b6603a22475de8eb28607b8f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 10:05:40 -0400
Subject: [PATCH 04/13] NetworkManager-l2tp: change dependency to libnma-devel

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

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index d60f5878792..1dea408c423 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="gtk+3-devel glib-devel libglib-devel libsecret-devel
- network-manager-applet-devel libressl-devel nss-devel ppp-devel"
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+ libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"
 maintainer="Douglas Kosovic <doug@uq.edu.au>"

From 9be7a3a1f2d437d5ffb3aa26d42dc34596a1c780 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 11:20:26 -0400
Subject: [PATCH 05/13] NetworkManager-openconnect: change dependency to
 libnma-devel

---
 srcpkgs/NetworkManager-openconnect/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index 327f2bd84cb..f32a075180f 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -1,18 +1,17 @@
-# Template build file for 'NetworkManager-openconnect'.
+# Template file for 'NetworkManager-openconnect'
 pkgname=NetworkManager-openconnect
 version=1.2.6
-revision=2
-lib32disabled=yes
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
-makedepends="gtk+3-devel network-manager-applet-devel libsecret-devel
- libxml2-devel openconnect-devel libressl-devel liblz4-devel
- gcr-devel"
+makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
+ libressl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-license="GPL-2"
-maintainer="Enno Boland <gottox@voidlinux.org>"
 checksum=95109803596a9782680a5dca3b51c4ad8ff7e126169d5431278cab694112975a
+lib32disabled=yes

From 67d062296686207ed7b1bf697c75bfc50437056e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 12:33:51 -0400
Subject: [PATCH 06/13] NetworkManager-openvpn: update to 1.8.12

---
 ...isable-libnm-glib-support-by-default.patch | 52 -------------------
 srcpkgs/NetworkManager-openvpn/template       |  8 +--
 2 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch

diff --git a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
deleted file mode 100644
index 7eb72e1dbb6..00000000000
--- a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-source: https://git.archlinux.org/svntogit/packages.git/tree/trunk/0001-build-disable-libnm-glib-support-by-default.patch?h=packages/networkmanager-openvpn
-
-From 52aad4911ffad04cf8274b5574124a4d5470c7fa Mon Sep 17 00:00:00 2001
-Message-Id: <52aad4911ffad04cf8274b5574124a4d5470c7fa.1549642989.git.jan.steffens@gmail.com>
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Wed, 17 Oct 2018 15:21:30 +0200
-Subject: [PATCH] build: disable libnm-glib support by default
-
-By now nobody should be using this. Keep the code around for a little
-longer just in case anybody still uses this.
-
-The libnm-glib support also serves as an example how do we build two
-different versions of the properties plugin. We'll soon be in a similar
-situation with Gtk 4.0. (sigh.) Just don't drop it yet.
-
-Conflicts:
-	NEWS
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11ff5d0..eaf015b 100644
---- configure.ac
-+++ configure.ac
-@@ -75,20 +75,20 @@ dnl
- dnl GNOME support
- dnl
- AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
--AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openvpn without libnm-glib comatibility]), [], [with_libnm_glib_specified=no])
-+AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-openvpn with libnm-glib comatibility (depreacted)]), [], [with_libnm_glib_specified=no])
- if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
- 	if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
- 		AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
- 	fi
- fi
- if test "$with_gnome" != no; then
- 	with_gnome=yes
- fi
- if test "$with_libnm_glib_specified" == no; then
--	with_libnm_glib="$with_gnome"
-+	with_libnm_glib=no
- fi
--if test "$with_libnm_glib" != no; then
--	with_libnm_glib=yes
-+if test "$with_libnm_glib" != yes; then
-+	with_libnm_glib=no
- fi
- AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
- AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
--- 
-2.20.1
diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index 170d992326e..7f2c40e6de3 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,18 +1,18 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
-version=1.8.10
-revision=2
+version=1.8.12
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
-makedepends="gtk+3-devel libglib-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef
+checksum=0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f815318
 system_accounts="_nm_openvpn"
 lib32disabled=yes
 _nm_openvpn_homedir="/var/empty"

From 0fcb2577b3074df7d0da5067d8f50eb81a40f111 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 18:18:52 -0400
Subject: [PATCH 07/13] NetworkManager-pptp: change dependency to libnma-devel

---
 srcpkgs/NetworkManager-pptp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 7889bb47800..9c541cf246f 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-pptp'
 pkgname=NetworkManager-pptp
 version=1.2.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--without-libnm-glib"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="libglib-devel gtk+3-devel libsecret-devel ppp-devel
- network-manager-applet-devel NetworkManager-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel
+ NetworkManager-devel ppp-devel"
 depends="pptpclient"
 short_desc="NetworkManager VPN plugin for pptp"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From e795e479f8820f93e1c80846f9df2f9d667e7e99 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 20:09:35 -0400
Subject: [PATCH 08/13] gnome-control-center: update to 3.38.1

---
 srcpkgs/gnome-control-center/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 191101afaad..b4be62deaa3 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.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
  gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
  libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
- libpwquality-devel mit-krb5-devel network-manager-applet-devel polkit-devel
+ libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
  pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
  libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
  clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
@@ -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=f6b6b5b8ef9c38d895ba5af87f31adae02194ad86c9aa6cff2d2b9755c2db1da
+checksum=8d90006c610f6fccb3cddbcf413b1bc4137fb4977b901a3989420fe160082026
 
 build_options="cheese"
 build_options_default="cheese"

From f62c87e772d0561e473a6e628ce2585dac7c55c8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 21:03:32 -0400
Subject: [PATCH 09/13] gnome-initial-setup: update to 3.38.1

---
 srcpkgs/gnome-initial-setup/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 63abd3c5c83..12886a0f9ae 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.0
+version=3.38.1
 revision=1
 build_style=meson
 configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config glib-devel gettext"
 makedepends="NetworkManager-devel accountsservice-devel libglib-devel
  gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
  gnome-online-accounts-devel gdm-devel libpwquality-devel
- mit-krb5-devel vala-devel network-manager-applet-devel polkit-devel
+ mit-krb5-devel vala-devel libnma-devel polkit-devel
  rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
  pango-devel"
 depends="iso-codes"
@@ -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=3a857aef5efb689f408632db8469ad27620f762d977070a36035c522c6f82759
+checksum=e55d4f4073998e0fb7b3dfcc470e2a4c7d950a96bedab15011b9084ebc813676

From c94c6600aba7d99d89c17eb961e5766a6c5bacf7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 22:29:32 -0400
Subject: [PATCH 10/13] gnome-shell: update to 3.38.1

---
 srcpkgs/gnome-shell/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index f27795572ef..6753b6ac54e 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=3.38.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper=gir
@@ -12,7 +12,7 @@ makedepends="at-spi2-atk caribou-devel evolution-data-server-devel folks-devel
  gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
- network-manager-applet-devel polkit-devel pulseaudio-devel
+ libnma-devel polkit-devel pulseaudio-devel
  startup-notification-devel telepathy-logger-devel gnome-autoar-devel"
 depends="caribou elogind glxinfo gnome-control-center gsettings-desktop-schemas upower"
 short_desc="GNOME core user interface"
@@ -21,7 +21,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c626403bc0875ee6da8c7a62ac0cee312badb523af073cb166125015a75a0a97
+checksum=b789e3296463c4cbfa329ad1724df38439c3e6d7537a01025cd8f2fec8c90bb4
 
 # needs X
 do_check() {

From 5ebb26ce729e2cd25ad314e553e1b1f80f7259fa Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 7 Oct 2020 01:24:58 -0400
Subject: [PATCH 11/13] cinnamon-control-center: change dependency to
 libnma-devel

---
 srcpkgs/cinnamon-control-center/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 27f0fbeb748..b9ebe5f22d1 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=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -10,7 +10,7 @@ hostmakedepends="autoconf-archive gettext-devel glib-devel gnome-common
 makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
  cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
  libSM-devel libXxf86misc-devel libcanberra-devel libgnomekbd-devel
- libnotify-devel libwacom-devel network-manager-applet-devel polkit-devel
+ libnotify-devel libwacom-devel libnma-devel polkit-devel
  pulseaudio-devel tzdata upower-devel"
 depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
  cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"

From 679602ab7cc60b1d8fd23d705266a75b72dbedf3 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Thu, 8 Oct 2020 19:45:42 -0400
Subject: [PATCH 12/13] switchboard-plug-network: update to 2.3.2

---
 srcpkgs/switchboard-plug-network/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template
index d7e5cac19d3..d243f041ed4 100644
--- a/srcpkgs/switchboard-plug-network/template
+++ b/srcpkgs/switchboard-plug-network/template
@@ -1,14 +1,15 @@
 # Template file for 'switchboard-plug-network'
 pkgname=switchboard-plug-network
-version=2.1.4
+version=2.3.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala"
 makedepends="switchboard-devel granite-devel gtk+3-devel
- network-manager-applet-devel NetworkManager-devel"
+ libnma-devel NetworkManager-devel"
 short_desc="Switchboard Network Plug"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=0b039bcb2a33fbdc8364da865c3abebb825e0d36ab89a2bf4589704722f76bba
+homepage="https://github.com/elementary/switchboard-plug-network"
+distfiles="https://github.com/elementary/${pkgname}/archive/${version}.tar.gz"
+checksum=61c3803dccf68324afe7cb67094fd9dbcb874cae47284b9b131b9bd49971d9b8
+nocross="https://travis-ci.org/github/void-linux/void-packages/builds/733837363"

From 71d8054e2fe6c92dff387e55bb6d5c6a73e365a0 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Fri, 9 Oct 2020 00:41:35 -0400
Subject: [PATCH 13/13] NetworkManager-vpnc: change dependency to libnma-devel

---
 srcpkgs/NetworkManager-vpnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-vpnc/template b/srcpkgs/NetworkManager-vpnc/template
index a8b8ce12176..b9d17226132 100644
--- a/srcpkgs/NetworkManager-vpnc/template
+++ b/srcpkgs/NetworkManager-vpnc/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-vpnc'
 pkgname=NetworkManager-vpnc
 version=1.2.6
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--localstatedir=/var --disable-static --without-libnm-glib"
 hostmakedepends="pkg-config intltool"
-makedepends="libnm libnm-gtk network-manager-applet-devel libsecret-devel"
+makedepends="gtk+3-devel libnm libnma-devel libsecret-devel"
 depends="vpnc"
 short_desc="NetworkManager VPN plugin for VPNC"
 maintainer="Peter Kuchar <masaj@gmx.com>"

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (77 preceding siblings ...)
  2020-10-09  4:42 ` [PR PATCH] [Updated] " cinerea0
@ 2020-10-09  6:42 ` CameronNemo
  2020-10-09 16:27 ` cinerea0
                   ` (11 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: CameronNemo @ 2020-10-09  6:42 UTC (permalink / raw)
  To: ml

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

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-706001994

Comment:
the vpnc plugin should not need libnma-devel... see the diff I included in [my comment above](https://github.com/void-linux/void-packages/pull/24497#issuecomment-704008662)

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (78 preceding siblings ...)
  2020-10-09  6:42 ` CameronNemo
@ 2020-10-09 16:27 ` cinerea0
  2020-10-10 21:51 ` cinerea0
                   ` (10 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-09 16:27 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-706278465

Comment:
@CameronNemo I discovered that the error I was encountering before was due to a typo in the configure_args line, not because of anything wrong with the vpnc plugin itself. As such, the version I pushed with `libnma-devel` should build properly on all archs, at least if travis would stop having connectivity problems.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (79 preceding siblings ...)
  2020-10-09 16:27 ` cinerea0
@ 2020-10-10 21:51 ` cinerea0
  2020-10-10 21:51 ` [PR PATCH] [Updated] " cinerea0
                   ` (9 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-10 21:51 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-706616297

Comment:
Alright, here's a screenshot of the last build. The two builds that failed did so because of a DNS failure on Travis's end. If the force-push I'm about to do results in non-overlapping failing builds (or even a completely successful build), I'll mark this as ready for review so it can hopefully be merged.
![Screenshot_2020-10-10 Build #39844 - void-linux void-packages - Travis CI](https://user-images.githubusercontent.com/49368915/95665749-b194d400-0b42-11eb-96d3-5085754de822.png)


^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (80 preceding siblings ...)
  2020-10-10 21:51 ` cinerea0
@ 2020-10-10 21:51 ` cinerea0
  2020-10-10 22:54 ` cinerea0
                   ` (8 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-10 21:51 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 72b9dff466459202b58e30b7b7a9fa934e2d03ba Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:06:34 -0400
Subject: [PATCH 01/13] New package: libnma-1.8.30

---
 common/shlibs           |  2 +-
 srcpkgs/libnma-devel    |  1 +
 srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/libnma-devel
 create mode 100644 srcpkgs/libnma/template

diff --git a/common/shlibs b/common/shlibs
index 36efd174d6b..91635660be4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2981,7 +2981,7 @@ libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
 liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
-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
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+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
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}
+
+libnma-devel_package() {
+	short_desc+=" - library development files"
+	depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove usr/share/gtk-doc
+	}
+}

From 2ca17ec4f553b00c82bb3b32c37867d71bd70417 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:09:38 -0400
Subject: [PATCH 02/13] network-manager-applet: update to 1.18.0

---
 common/shlibs                           |  1 -
 srcpkgs/libnm-gtk                       |  1 -
 srcpkgs/network-manager-applet-devel    |  1 -
 srcpkgs/network-manager-applet/template | 47 ++++---------------------
 4 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 120000 srcpkgs/libnm-gtk
 delete mode 120000 srcpkgs/network-manager-applet-devel

diff --git a/common/shlibs b/common/shlibs
index 91635660be4..00839f3c723 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -905,7 +905,6 @@ liblcms2.so.2 lcms2-2.2_1
 libcolord.so.2 libcolord-1.1.7_1
 libcolordprivate.so.2 libcolord-1.1.7_1
 libcolorhug.so.2 libcolord-1.1.7_1
-libnm-gtk.so.0 libnm-gtk-0.9.1.95_1
 libcaribou.so.0 caribou-0.4.0_1
 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
 libgrilo-0.3.so.0 grilo-0.3.2_1
diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/libnm-gtk
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/network-manager-applet-devel
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 0656107b1af..2d9861a94ba 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,14 +1,14 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.24
+version=1.18.0
 revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
- libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
- polkit-devel mobile-broadband-provider-info"
+ libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libgnome-keyring-devel libgudev-devel libnotify-devel libnma-devel
+ libsecret-devel polkit-devel mobile-broadband-provider-info"
 depends="NetworkManager hicolor-icon-theme iso-codes"
 short_desc="NetworkManager panel applet for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,38 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
+checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b
 lib32disabled=yes
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_build() {
-	export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs:${wrksrc}/src/libnm-gtk/.libs"
-}
-
-libnm-gtk_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
-	}
-}
-
-network-manager-applet-devel_package() {
-	depends="gtk+3-devel NetworkManager-devel>=1.0
-	 libnm-gtk>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		vmove usr/share/gtk-doc
-	}
-}

From 92ec1bdd5dc9227331993288404b2ef8f35d2bfb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:34:07 -0400
Subject: [PATCH 03/13] NetworkManager-strongswan: update to 1.5.2

---
 srcpkgs/NetworkManager-strongswan/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 4d8d2b14306..46c02d092e5 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,16 +1,16 @@
 # Template file for 'NetworkManager-strongswan'
 pkgname=NetworkManager-strongswan
-version=1.4.5
-revision=2
+version=1.5.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-more-warnings --without-libnm-glib
  --disable-more-warnings"
 hostmakedepends="intltool pkg-config"
-makedepends="NetworkManager-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel NetworkManager-devel libnma-devel libsecret-devel"
 depends="strongswan"
 short_desc="Strongswan NetworkManager plugin"
 maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://www.strongswan.org/"
 distfiles="https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-${version}.tar.bz2"
-checksum=343b68cbe32f65e2baa01b37716415e4360addc8c90209d45504b52b8864bd04
+checksum=c8452b952653881dcc2745f0ab460c061086215b297129212a743bd9e9f78169

From b53e6adb7d7db896b6603a22475de8eb28607b8f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 10:05:40 -0400
Subject: [PATCH 04/13] NetworkManager-l2tp: change dependency to libnma-devel

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

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index d60f5878792..1dea408c423 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="gtk+3-devel glib-devel libglib-devel libsecret-devel
- network-manager-applet-devel libressl-devel nss-devel ppp-devel"
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+ libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"
 maintainer="Douglas Kosovic <doug@uq.edu.au>"

From 9be7a3a1f2d437d5ffb3aa26d42dc34596a1c780 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 11:20:26 -0400
Subject: [PATCH 05/13] NetworkManager-openconnect: change dependency to
 libnma-devel

---
 srcpkgs/NetworkManager-openconnect/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index 327f2bd84cb..f32a075180f 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -1,18 +1,17 @@
-# Template build file for 'NetworkManager-openconnect'.
+# Template file for 'NetworkManager-openconnect'
 pkgname=NetworkManager-openconnect
 version=1.2.6
-revision=2
-lib32disabled=yes
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
-makedepends="gtk+3-devel network-manager-applet-devel libsecret-devel
- libxml2-devel openconnect-devel libressl-devel liblz4-devel
- gcr-devel"
+makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
+ libressl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-license="GPL-2"
-maintainer="Enno Boland <gottox@voidlinux.org>"
 checksum=95109803596a9782680a5dca3b51c4ad8ff7e126169d5431278cab694112975a
+lib32disabled=yes

From 67d062296686207ed7b1bf697c75bfc50437056e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 12:33:51 -0400
Subject: [PATCH 06/13] NetworkManager-openvpn: update to 1.8.12

---
 ...isable-libnm-glib-support-by-default.patch | 52 -------------------
 srcpkgs/NetworkManager-openvpn/template       |  8 +--
 2 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch

diff --git a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
deleted file mode 100644
index 7eb72e1dbb6..00000000000
--- a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-source: https://git.archlinux.org/svntogit/packages.git/tree/trunk/0001-build-disable-libnm-glib-support-by-default.patch?h=packages/networkmanager-openvpn
-
-From 52aad4911ffad04cf8274b5574124a4d5470c7fa Mon Sep 17 00:00:00 2001
-Message-Id: <52aad4911ffad04cf8274b5574124a4d5470c7fa.1549642989.git.jan.steffens@gmail.com>
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Wed, 17 Oct 2018 15:21:30 +0200
-Subject: [PATCH] build: disable libnm-glib support by default
-
-By now nobody should be using this. Keep the code around for a little
-longer just in case anybody still uses this.
-
-The libnm-glib support also serves as an example how do we build two
-different versions of the properties plugin. We'll soon be in a similar
-situation with Gtk 4.0. (sigh.) Just don't drop it yet.
-
-Conflicts:
-	NEWS
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11ff5d0..eaf015b 100644
---- configure.ac
-+++ configure.ac
-@@ -75,20 +75,20 @@ dnl
- dnl GNOME support
- dnl
- AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
--AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openvpn without libnm-glib comatibility]), [], [with_libnm_glib_specified=no])
-+AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-openvpn with libnm-glib comatibility (depreacted)]), [], [with_libnm_glib_specified=no])
- if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
- 	if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
- 		AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
- 	fi
- fi
- if test "$with_gnome" != no; then
- 	with_gnome=yes
- fi
- if test "$with_libnm_glib_specified" == no; then
--	with_libnm_glib="$with_gnome"
-+	with_libnm_glib=no
- fi
--if test "$with_libnm_glib" != no; then
--	with_libnm_glib=yes
-+if test "$with_libnm_glib" != yes; then
-+	with_libnm_glib=no
- fi
- AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
- AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
--- 
-2.20.1
diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index 170d992326e..7f2c40e6de3 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,18 +1,18 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
-version=1.8.10
-revision=2
+version=1.8.12
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
-makedepends="gtk+3-devel libglib-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef
+checksum=0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f815318
 system_accounts="_nm_openvpn"
 lib32disabled=yes
 _nm_openvpn_homedir="/var/empty"

From 0fcb2577b3074df7d0da5067d8f50eb81a40f111 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 18:18:52 -0400
Subject: [PATCH 07/13] NetworkManager-pptp: change dependency to libnma-devel

---
 srcpkgs/NetworkManager-pptp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 7889bb47800..9c541cf246f 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-pptp'
 pkgname=NetworkManager-pptp
 version=1.2.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--without-libnm-glib"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="libglib-devel gtk+3-devel libsecret-devel ppp-devel
- network-manager-applet-devel NetworkManager-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel
+ NetworkManager-devel ppp-devel"
 depends="pptpclient"
 short_desc="NetworkManager VPN plugin for pptp"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From e795e479f8820f93e1c80846f9df2f9d667e7e99 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 20:09:35 -0400
Subject: [PATCH 08/13] gnome-control-center: update to 3.38.1

---
 srcpkgs/gnome-control-center/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 191101afaad..b4be62deaa3 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.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
  gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
  libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
- libpwquality-devel mit-krb5-devel network-manager-applet-devel polkit-devel
+ libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
  pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
  libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
  clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
@@ -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=f6b6b5b8ef9c38d895ba5af87f31adae02194ad86c9aa6cff2d2b9755c2db1da
+checksum=8d90006c610f6fccb3cddbcf413b1bc4137fb4977b901a3989420fe160082026
 
 build_options="cheese"
 build_options_default="cheese"

From f62c87e772d0561e473a6e628ce2585dac7c55c8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 21:03:32 -0400
Subject: [PATCH 09/13] gnome-initial-setup: update to 3.38.1

---
 srcpkgs/gnome-initial-setup/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 63abd3c5c83..12886a0f9ae 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.0
+version=3.38.1
 revision=1
 build_style=meson
 configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config glib-devel gettext"
 makedepends="NetworkManager-devel accountsservice-devel libglib-devel
  gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
  gnome-online-accounts-devel gdm-devel libpwquality-devel
- mit-krb5-devel vala-devel network-manager-applet-devel polkit-devel
+ mit-krb5-devel vala-devel libnma-devel polkit-devel
  rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
  pango-devel"
 depends="iso-codes"
@@ -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=3a857aef5efb689f408632db8469ad27620f762d977070a36035c522c6f82759
+checksum=e55d4f4073998e0fb7b3dfcc470e2a4c7d950a96bedab15011b9084ebc813676

From c94c6600aba7d99d89c17eb961e5766a6c5bacf7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 22:29:32 -0400
Subject: [PATCH 10/13] gnome-shell: update to 3.38.1

---
 srcpkgs/gnome-shell/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index f27795572ef..6753b6ac54e 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=3.38.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper=gir
@@ -12,7 +12,7 @@ makedepends="at-spi2-atk caribou-devel evolution-data-server-devel folks-devel
  gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
- network-manager-applet-devel polkit-devel pulseaudio-devel
+ libnma-devel polkit-devel pulseaudio-devel
  startup-notification-devel telepathy-logger-devel gnome-autoar-devel"
 depends="caribou elogind glxinfo gnome-control-center gsettings-desktop-schemas upower"
 short_desc="GNOME core user interface"
@@ -21,7 +21,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c626403bc0875ee6da8c7a62ac0cee312badb523af073cb166125015a75a0a97
+checksum=b789e3296463c4cbfa329ad1724df38439c3e6d7537a01025cd8f2fec8c90bb4
 
 # needs X
 do_check() {

From 5ebb26ce729e2cd25ad314e553e1b1f80f7259fa Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 7 Oct 2020 01:24:58 -0400
Subject: [PATCH 11/13] cinnamon-control-center: change dependency to
 libnma-devel

---
 srcpkgs/cinnamon-control-center/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 27f0fbeb748..b9ebe5f22d1 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=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -10,7 +10,7 @@ hostmakedepends="autoconf-archive gettext-devel glib-devel gnome-common
 makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
  cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
  libSM-devel libXxf86misc-devel libcanberra-devel libgnomekbd-devel
- libnotify-devel libwacom-devel network-manager-applet-devel polkit-devel
+ libnotify-devel libwacom-devel libnma-devel polkit-devel
  pulseaudio-devel tzdata upower-devel"
 depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
  cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"

From 679602ab7cc60b1d8fd23d705266a75b72dbedf3 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Thu, 8 Oct 2020 19:45:42 -0400
Subject: [PATCH 12/13] switchboard-plug-network: update to 2.3.2

---
 srcpkgs/switchboard-plug-network/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template
index d7e5cac19d3..d243f041ed4 100644
--- a/srcpkgs/switchboard-plug-network/template
+++ b/srcpkgs/switchboard-plug-network/template
@@ -1,14 +1,15 @@
 # Template file for 'switchboard-plug-network'
 pkgname=switchboard-plug-network
-version=2.1.4
+version=2.3.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala"
 makedepends="switchboard-devel granite-devel gtk+3-devel
- network-manager-applet-devel NetworkManager-devel"
+ libnma-devel NetworkManager-devel"
 short_desc="Switchboard Network Plug"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=0b039bcb2a33fbdc8364da865c3abebb825e0d36ab89a2bf4589704722f76bba
+homepage="https://github.com/elementary/switchboard-plug-network"
+distfiles="https://github.com/elementary/${pkgname}/archive/${version}.tar.gz"
+checksum=61c3803dccf68324afe7cb67094fd9dbcb874cae47284b9b131b9bd49971d9b8
+nocross="https://travis-ci.org/github/void-linux/void-packages/builds/733837363"

From 04c0a1c9a3474e20f9677d4f47c40025f10724fa Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Sat, 10 Oct 2020 17:47:48 -0400
Subject: [PATCH 13/13] NetworkManager-vpnc: change dependency to libnma-devel

---
 srcpkgs/NetworkManager-vpnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-vpnc/template b/srcpkgs/NetworkManager-vpnc/template
index a8b8ce12176..b9d17226132 100644
--- a/srcpkgs/NetworkManager-vpnc/template
+++ b/srcpkgs/NetworkManager-vpnc/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-vpnc'
 pkgname=NetworkManager-vpnc
 version=1.2.6
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--localstatedir=/var --disable-static --without-libnm-glib"
 hostmakedepends="pkg-config intltool"
-makedepends="libnm libnm-gtk network-manager-applet-devel libsecret-devel"
+makedepends="gtk+3-devel libnm libnma-devel libsecret-devel"
 depends="vpnc"
 short_desc="NetworkManager VPN plugin for VPNC"
 maintainer="Peter Kuchar <masaj@gmx.com>"

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (81 preceding siblings ...)
  2020-10-10 21:51 ` [PR PATCH] [Updated] " cinerea0
@ 2020-10-10 22:54 ` cinerea0
  2020-10-13  0:53 ` [PR PATCH] [Updated] " cinerea0
                   ` (7 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-10 22:54 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-706622431

Comment:
New error with the new push:

> ERROR: gnome-control-center-3.38.1_1: failed to install 'ModemManager-devel-1.12.10_1' dependency!

Not even sure how to solve this, given that this package exists in the repos.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (82 preceding siblings ...)
  2020-10-10 22:54 ` cinerea0
@ 2020-10-13  0:53 ` cinerea0
  2020-10-13  2:18 ` cinerea0
                   ` (6 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-13  0:53 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

network-manager-applet: add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 72b9dff466459202b58e30b7b7a9fa934e2d03ba Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:06:34 -0400
Subject: [PATCH 01/13] New package: libnma-1.8.30

---
 common/shlibs           |  2 +-
 srcpkgs/libnma-devel    |  1 +
 srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/libnma-devel
 create mode 100644 srcpkgs/libnma/template

diff --git a/common/shlibs b/common/shlibs
index 36efd174d6b..91635660be4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2981,7 +2981,7 @@ libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
 liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
-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
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+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
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}
+
+libnma-devel_package() {
+	short_desc+=" - library development files"
+	depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove usr/share/gtk-doc
+	}
+}

From 2ca17ec4f553b00c82bb3b32c37867d71bd70417 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:09:38 -0400
Subject: [PATCH 02/13] network-manager-applet: update to 1.18.0

---
 common/shlibs                           |  1 -
 srcpkgs/libnm-gtk                       |  1 -
 srcpkgs/network-manager-applet-devel    |  1 -
 srcpkgs/network-manager-applet/template | 47 ++++---------------------
 4 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 120000 srcpkgs/libnm-gtk
 delete mode 120000 srcpkgs/network-manager-applet-devel

diff --git a/common/shlibs b/common/shlibs
index 91635660be4..00839f3c723 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -905,7 +905,6 @@ liblcms2.so.2 lcms2-2.2_1
 libcolord.so.2 libcolord-1.1.7_1
 libcolordprivate.so.2 libcolord-1.1.7_1
 libcolorhug.so.2 libcolord-1.1.7_1
-libnm-gtk.so.0 libnm-gtk-0.9.1.95_1
 libcaribou.so.0 caribou-0.4.0_1
 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
 libgrilo-0.3.so.0 grilo-0.3.2_1
diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/libnm-gtk
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/network-manager-applet-devel
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 0656107b1af..2d9861a94ba 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,14 +1,14 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.24
+version=1.18.0
 revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
- libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
- polkit-devel mobile-broadband-provider-info"
+ libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libgnome-keyring-devel libgudev-devel libnotify-devel libnma-devel
+ libsecret-devel polkit-devel mobile-broadband-provider-info"
 depends="NetworkManager hicolor-icon-theme iso-codes"
 short_desc="NetworkManager panel applet for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,38 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
+checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b
 lib32disabled=yes
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_build() {
-	export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs:${wrksrc}/src/libnm-gtk/.libs"
-}
-
-libnm-gtk_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
-	}
-}
-
-network-manager-applet-devel_package() {
-	depends="gtk+3-devel NetworkManager-devel>=1.0
-	 libnm-gtk>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		vmove usr/share/gtk-doc
-	}
-}

From 92ec1bdd5dc9227331993288404b2ef8f35d2bfb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:34:07 -0400
Subject: [PATCH 03/13] NetworkManager-strongswan: update to 1.5.2

---
 srcpkgs/NetworkManager-strongswan/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 4d8d2b14306..46c02d092e5 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,16 +1,16 @@
 # Template file for 'NetworkManager-strongswan'
 pkgname=NetworkManager-strongswan
-version=1.4.5
-revision=2
+version=1.5.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-more-warnings --without-libnm-glib
  --disable-more-warnings"
 hostmakedepends="intltool pkg-config"
-makedepends="NetworkManager-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel NetworkManager-devel libnma-devel libsecret-devel"
 depends="strongswan"
 short_desc="Strongswan NetworkManager plugin"
 maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://www.strongswan.org/"
 distfiles="https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-${version}.tar.bz2"
-checksum=343b68cbe32f65e2baa01b37716415e4360addc8c90209d45504b52b8864bd04
+checksum=c8452b952653881dcc2745f0ab460c061086215b297129212a743bd9e9f78169

From b53e6adb7d7db896b6603a22475de8eb28607b8f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 10:05:40 -0400
Subject: [PATCH 04/13] NetworkManager-l2tp: change dependency to libnma-devel

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

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index d60f5878792..1dea408c423 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="gtk+3-devel glib-devel libglib-devel libsecret-devel
- network-manager-applet-devel libressl-devel nss-devel ppp-devel"
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+ libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"
 maintainer="Douglas Kosovic <doug@uq.edu.au>"

From 9be7a3a1f2d437d5ffb3aa26d42dc34596a1c780 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 11:20:26 -0400
Subject: [PATCH 05/13] NetworkManager-openconnect: change dependency to
 libnma-devel

---
 srcpkgs/NetworkManager-openconnect/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index 327f2bd84cb..f32a075180f 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -1,18 +1,17 @@
-# Template build file for 'NetworkManager-openconnect'.
+# Template file for 'NetworkManager-openconnect'
 pkgname=NetworkManager-openconnect
 version=1.2.6
-revision=2
-lib32disabled=yes
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
-makedepends="gtk+3-devel network-manager-applet-devel libsecret-devel
- libxml2-devel openconnect-devel libressl-devel liblz4-devel
- gcr-devel"
+makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
+ libressl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-license="GPL-2"
-maintainer="Enno Boland <gottox@voidlinux.org>"
 checksum=95109803596a9782680a5dca3b51c4ad8ff7e126169d5431278cab694112975a
+lib32disabled=yes

From 67d062296686207ed7b1bf697c75bfc50437056e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 12:33:51 -0400
Subject: [PATCH 06/13] NetworkManager-openvpn: update to 1.8.12

---
 ...isable-libnm-glib-support-by-default.patch | 52 -------------------
 srcpkgs/NetworkManager-openvpn/template       |  8 +--
 2 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch

diff --git a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
deleted file mode 100644
index 7eb72e1dbb6..00000000000
--- a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-source: https://git.archlinux.org/svntogit/packages.git/tree/trunk/0001-build-disable-libnm-glib-support-by-default.patch?h=packages/networkmanager-openvpn
-
-From 52aad4911ffad04cf8274b5574124a4d5470c7fa Mon Sep 17 00:00:00 2001
-Message-Id: <52aad4911ffad04cf8274b5574124a4d5470c7fa.1549642989.git.jan.steffens@gmail.com>
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Wed, 17 Oct 2018 15:21:30 +0200
-Subject: [PATCH] build: disable libnm-glib support by default
-
-By now nobody should be using this. Keep the code around for a little
-longer just in case anybody still uses this.
-
-The libnm-glib support also serves as an example how do we build two
-different versions of the properties plugin. We'll soon be in a similar
-situation with Gtk 4.0. (sigh.) Just don't drop it yet.
-
-Conflicts:
-	NEWS
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11ff5d0..eaf015b 100644
---- configure.ac
-+++ configure.ac
-@@ -75,20 +75,20 @@ dnl
- dnl GNOME support
- dnl
- AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
--AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openvpn without libnm-glib comatibility]), [], [with_libnm_glib_specified=no])
-+AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-openvpn with libnm-glib comatibility (depreacted)]), [], [with_libnm_glib_specified=no])
- if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
- 	if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
- 		AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
- 	fi
- fi
- if test "$with_gnome" != no; then
- 	with_gnome=yes
- fi
- if test "$with_libnm_glib_specified" == no; then
--	with_libnm_glib="$with_gnome"
-+	with_libnm_glib=no
- fi
--if test "$with_libnm_glib" != no; then
--	with_libnm_glib=yes
-+if test "$with_libnm_glib" != yes; then
-+	with_libnm_glib=no
- fi
- AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
- AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
--- 
-2.20.1
diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index 170d992326e..7f2c40e6de3 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,18 +1,18 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
-version=1.8.10
-revision=2
+version=1.8.12
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
-makedepends="gtk+3-devel libglib-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef
+checksum=0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f815318
 system_accounts="_nm_openvpn"
 lib32disabled=yes
 _nm_openvpn_homedir="/var/empty"

From 0fcb2577b3074df7d0da5067d8f50eb81a40f111 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 18:18:52 -0400
Subject: [PATCH 07/13] NetworkManager-pptp: change dependency to libnma-devel

---
 srcpkgs/NetworkManager-pptp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 7889bb47800..9c541cf246f 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-pptp'
 pkgname=NetworkManager-pptp
 version=1.2.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--without-libnm-glib"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="libglib-devel gtk+3-devel libsecret-devel ppp-devel
- network-manager-applet-devel NetworkManager-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel
+ NetworkManager-devel ppp-devel"
 depends="pptpclient"
 short_desc="NetworkManager VPN plugin for pptp"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From e795e479f8820f93e1c80846f9df2f9d667e7e99 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 20:09:35 -0400
Subject: [PATCH 08/13] gnome-control-center: update to 3.38.1

---
 srcpkgs/gnome-control-center/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 191101afaad..b4be62deaa3 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.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
  gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
  libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
- libpwquality-devel mit-krb5-devel network-manager-applet-devel polkit-devel
+ libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
  pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
  libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
  clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
@@ -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=f6b6b5b8ef9c38d895ba5af87f31adae02194ad86c9aa6cff2d2b9755c2db1da
+checksum=8d90006c610f6fccb3cddbcf413b1bc4137fb4977b901a3989420fe160082026
 
 build_options="cheese"
 build_options_default="cheese"

From f62c87e772d0561e473a6e628ce2585dac7c55c8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 21:03:32 -0400
Subject: [PATCH 09/13] gnome-initial-setup: update to 3.38.1

---
 srcpkgs/gnome-initial-setup/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 63abd3c5c83..12886a0f9ae 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.0
+version=3.38.1
 revision=1
 build_style=meson
 configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config glib-devel gettext"
 makedepends="NetworkManager-devel accountsservice-devel libglib-devel
  gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
  gnome-online-accounts-devel gdm-devel libpwquality-devel
- mit-krb5-devel vala-devel network-manager-applet-devel polkit-devel
+ mit-krb5-devel vala-devel libnma-devel polkit-devel
  rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
  pango-devel"
 depends="iso-codes"
@@ -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=3a857aef5efb689f408632db8469ad27620f762d977070a36035c522c6f82759
+checksum=e55d4f4073998e0fb7b3dfcc470e2a4c7d950a96bedab15011b9084ebc813676

From c94c6600aba7d99d89c17eb961e5766a6c5bacf7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 22:29:32 -0400
Subject: [PATCH 10/13] gnome-shell: update to 3.38.1

---
 srcpkgs/gnome-shell/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index f27795572ef..6753b6ac54e 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=3.38.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper=gir
@@ -12,7 +12,7 @@ makedepends="at-spi2-atk caribou-devel evolution-data-server-devel folks-devel
  gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
- network-manager-applet-devel polkit-devel pulseaudio-devel
+ libnma-devel polkit-devel pulseaudio-devel
  startup-notification-devel telepathy-logger-devel gnome-autoar-devel"
 depends="caribou elogind glxinfo gnome-control-center gsettings-desktop-schemas upower"
 short_desc="GNOME core user interface"
@@ -21,7 +21,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c626403bc0875ee6da8c7a62ac0cee312badb523af073cb166125015a75a0a97
+checksum=b789e3296463c4cbfa329ad1724df38439c3e6d7537a01025cd8f2fec8c90bb4
 
 # needs X
 do_check() {

From 5ebb26ce729e2cd25ad314e553e1b1f80f7259fa Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 7 Oct 2020 01:24:58 -0400
Subject: [PATCH 11/13] cinnamon-control-center: change dependency to
 libnma-devel

---
 srcpkgs/cinnamon-control-center/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 27f0fbeb748..b9ebe5f22d1 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=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -10,7 +10,7 @@ hostmakedepends="autoconf-archive gettext-devel glib-devel gnome-common
 makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
  cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
  libSM-devel libXxf86misc-devel libcanberra-devel libgnomekbd-devel
- libnotify-devel libwacom-devel network-manager-applet-devel polkit-devel
+ libnotify-devel libwacom-devel libnma-devel polkit-devel
  pulseaudio-devel tzdata upower-devel"
 depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
  cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"

From 679602ab7cc60b1d8fd23d705266a75b72dbedf3 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Thu, 8 Oct 2020 19:45:42 -0400
Subject: [PATCH 12/13] switchboard-plug-network: update to 2.3.2

---
 srcpkgs/switchboard-plug-network/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template
index d7e5cac19d3..d243f041ed4 100644
--- a/srcpkgs/switchboard-plug-network/template
+++ b/srcpkgs/switchboard-plug-network/template
@@ -1,14 +1,15 @@
 # Template file for 'switchboard-plug-network'
 pkgname=switchboard-plug-network
-version=2.1.4
+version=2.3.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala"
 makedepends="switchboard-devel granite-devel gtk+3-devel
- network-manager-applet-devel NetworkManager-devel"
+ libnma-devel NetworkManager-devel"
 short_desc="Switchboard Network Plug"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=0b039bcb2a33fbdc8364da865c3abebb825e0d36ab89a2bf4589704722f76bba
+homepage="https://github.com/elementary/switchboard-plug-network"
+distfiles="https://github.com/elementary/${pkgname}/archive/${version}.tar.gz"
+checksum=61c3803dccf68324afe7cb67094fd9dbcb874cae47284b9b131b9bd49971d9b8
+nocross="https://travis-ci.org/github/void-linux/void-packages/builds/733837363"

From 0f2a7ffa7fc342f26d99c19232dbe21e7aab14bb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 12 Oct 2020 20:52:23 -0400
Subject: [PATCH 13/13] NetworkManager-vpnc: change dependency to libnma-devel

---
 srcpkgs/NetworkManager-vpnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-vpnc/template b/srcpkgs/NetworkManager-vpnc/template
index a8b8ce12176..b9d17226132 100644
--- a/srcpkgs/NetworkManager-vpnc/template
+++ b/srcpkgs/NetworkManager-vpnc/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-vpnc'
 pkgname=NetworkManager-vpnc
 version=1.2.6
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--localstatedir=/var --disable-static --without-libnm-glib"
 hostmakedepends="pkg-config intltool"
-makedepends="libnm libnm-gtk network-manager-applet-devel libsecret-devel"
+makedepends="gtk+3-devel libnm libnma-devel libsecret-devel"
 depends="vpnc"
 short_desc="NetworkManager VPN plugin for VPNC"
 maintainer="Peter Kuchar <masaj@gmx.com>"

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (83 preceding siblings ...)
  2020-10-13  0:53 ` [PR PATCH] [Updated] " cinerea0
@ 2020-10-13  2:18 ` cinerea0
  2020-10-15 23:51 ` cinerea0
                   ` (5 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-13  2:18 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-707442578

Comment:
The most recent force-push only failed on armv6 due to a DNS error which, as you can see above, does not overlap with the previous error. As such, I am marking this PR ready for review with the hope that it will be merged. I would also request that whoever merges this:

1. Removes `network-manager-applet-devel` and `libnm-gtk` from the repository index.
2. Checks out #24776 to see if it can also be merged.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: network-manager-applet: add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (84 preceding siblings ...)
  2020-10-13  2:18 ` cinerea0
@ 2020-10-15 23:51 ` cinerea0
  2020-11-18  5:55 ` [PR PATCH] [Updated] New package: libnma-1.8.30; network-manager-applet: update to 1.18.0 and " cinerea0
                   ` (4 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-10-15 23:51 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-709647896

Comment:
@Vaelatern if you have time, could you take a look at this PR?

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] New package: libnma-1.8.30; network-manager-applet: update to 1.18.0 and add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (85 preceding siblings ...)
  2020-10-15 23:51 ` cinerea0
@ 2020-11-18  5:55 ` cinerea0
  2020-11-18  6:55 ` Piraty
                   ` (3 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-11-18  5:55 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

New package: libnma-1.8.30; network-manager-applet: update to 1.18.0 and add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From 72b9dff466459202b58e30b7b7a9fa934e2d03ba Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:06:34 -0400
Subject: [PATCH 01/13] New package: libnma-1.8.30

---
 common/shlibs           |  2 +-
 srcpkgs/libnma-devel    |  1 +
 srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/libnma-devel
 create mode 100644 srcpkgs/libnma/template

diff --git a/common/shlibs b/common/shlibs
index 36efd174d6b..91635660be4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2981,7 +2981,7 @@ libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
 liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
-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
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+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
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}
+
+libnma-devel_package() {
+	short_desc+=" - library development files"
+	depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove usr/share/gtk-doc
+	}
+}

From 2ca17ec4f553b00c82bb3b32c37867d71bd70417 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:09:38 -0400
Subject: [PATCH 02/13] network-manager-applet: update to 1.18.0

---
 common/shlibs                           |  1 -
 srcpkgs/libnm-gtk                       |  1 -
 srcpkgs/network-manager-applet-devel    |  1 -
 srcpkgs/network-manager-applet/template | 47 ++++---------------------
 4 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 120000 srcpkgs/libnm-gtk
 delete mode 120000 srcpkgs/network-manager-applet-devel

diff --git a/common/shlibs b/common/shlibs
index 91635660be4..00839f3c723 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -905,7 +905,6 @@ liblcms2.so.2 lcms2-2.2_1
 libcolord.so.2 libcolord-1.1.7_1
 libcolordprivate.so.2 libcolord-1.1.7_1
 libcolorhug.so.2 libcolord-1.1.7_1
-libnm-gtk.so.0 libnm-gtk-0.9.1.95_1
 libcaribou.so.0 caribou-0.4.0_1
 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
 libgrilo-0.3.so.0 grilo-0.3.2_1
diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/libnm-gtk
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/network-manager-applet-devel
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 0656107b1af..2d9861a94ba 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,14 +1,14 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.24
+version=1.18.0
 revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
- libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
- polkit-devel mobile-broadband-provider-info"
+ libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libgnome-keyring-devel libgudev-devel libnotify-devel libnma-devel
+ libsecret-devel polkit-devel mobile-broadband-provider-info"
 depends="NetworkManager hicolor-icon-theme iso-codes"
 short_desc="NetworkManager panel applet for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,38 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
+checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b
 lib32disabled=yes
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_build() {
-	export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs:${wrksrc}/src/libnm-gtk/.libs"
-}
-
-libnm-gtk_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
-	}
-}
-
-network-manager-applet-devel_package() {
-	depends="gtk+3-devel NetworkManager-devel>=1.0
-	 libnm-gtk>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		vmove usr/share/gtk-doc
-	}
-}

From 92ec1bdd5dc9227331993288404b2ef8f35d2bfb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:34:07 -0400
Subject: [PATCH 03/13] NetworkManager-strongswan: update to 1.5.2

---
 srcpkgs/NetworkManager-strongswan/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 4d8d2b14306..46c02d092e5 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,16 +1,16 @@
 # Template file for 'NetworkManager-strongswan'
 pkgname=NetworkManager-strongswan
-version=1.4.5
-revision=2
+version=1.5.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-more-warnings --without-libnm-glib
  --disable-more-warnings"
 hostmakedepends="intltool pkg-config"
-makedepends="NetworkManager-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel NetworkManager-devel libnma-devel libsecret-devel"
 depends="strongswan"
 short_desc="Strongswan NetworkManager plugin"
 maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://www.strongswan.org/"
 distfiles="https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-${version}.tar.bz2"
-checksum=343b68cbe32f65e2baa01b37716415e4360addc8c90209d45504b52b8864bd04
+checksum=c8452b952653881dcc2745f0ab460c061086215b297129212a743bd9e9f78169

From b53e6adb7d7db896b6603a22475de8eb28607b8f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 10:05:40 -0400
Subject: [PATCH 04/13] NetworkManager-l2tp: change dependency to libnma-devel

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

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index d60f5878792..1dea408c423 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="gtk+3-devel glib-devel libglib-devel libsecret-devel
- network-manager-applet-devel libressl-devel nss-devel ppp-devel"
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+ libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"
 maintainer="Douglas Kosovic <doug@uq.edu.au>"

From 9be7a3a1f2d437d5ffb3aa26d42dc34596a1c780 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 11:20:26 -0400
Subject: [PATCH 05/13] NetworkManager-openconnect: change dependency to
 libnma-devel

---
 srcpkgs/NetworkManager-openconnect/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index 327f2bd84cb..f32a075180f 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -1,18 +1,17 @@
-# Template build file for 'NetworkManager-openconnect'.
+# Template file for 'NetworkManager-openconnect'
 pkgname=NetworkManager-openconnect
 version=1.2.6
-revision=2
-lib32disabled=yes
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
-makedepends="gtk+3-devel network-manager-applet-devel libsecret-devel
- libxml2-devel openconnect-devel libressl-devel liblz4-devel
- gcr-devel"
+makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
+ libressl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-license="GPL-2"
-maintainer="Enno Boland <gottox@voidlinux.org>"
 checksum=95109803596a9782680a5dca3b51c4ad8ff7e126169d5431278cab694112975a
+lib32disabled=yes

From 67d062296686207ed7b1bf697c75bfc50437056e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 12:33:51 -0400
Subject: [PATCH 06/13] NetworkManager-openvpn: update to 1.8.12

---
 ...isable-libnm-glib-support-by-default.patch | 52 -------------------
 srcpkgs/NetworkManager-openvpn/template       |  8 +--
 2 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch

diff --git a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
deleted file mode 100644
index 7eb72e1dbb6..00000000000
--- a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-source: https://git.archlinux.org/svntogit/packages.git/tree/trunk/0001-build-disable-libnm-glib-support-by-default.patch?h=packages/networkmanager-openvpn
-
-From 52aad4911ffad04cf8274b5574124a4d5470c7fa Mon Sep 17 00:00:00 2001
-Message-Id: <52aad4911ffad04cf8274b5574124a4d5470c7fa.1549642989.git.jan.steffens@gmail.com>
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Wed, 17 Oct 2018 15:21:30 +0200
-Subject: [PATCH] build: disable libnm-glib support by default
-
-By now nobody should be using this. Keep the code around for a little
-longer just in case anybody still uses this.
-
-The libnm-glib support also serves as an example how do we build two
-different versions of the properties plugin. We'll soon be in a similar
-situation with Gtk 4.0. (sigh.) Just don't drop it yet.
-
-Conflicts:
-	NEWS
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11ff5d0..eaf015b 100644
---- configure.ac
-+++ configure.ac
-@@ -75,20 +75,20 @@ dnl
- dnl GNOME support
- dnl
- AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
--AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openvpn without libnm-glib comatibility]), [], [with_libnm_glib_specified=no])
-+AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-openvpn with libnm-glib comatibility (depreacted)]), [], [with_libnm_glib_specified=no])
- if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
- 	if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
- 		AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
- 	fi
- fi
- if test "$with_gnome" != no; then
- 	with_gnome=yes
- fi
- if test "$with_libnm_glib_specified" == no; then
--	with_libnm_glib="$with_gnome"
-+	with_libnm_glib=no
- fi
--if test "$with_libnm_glib" != no; then
--	with_libnm_glib=yes
-+if test "$with_libnm_glib" != yes; then
-+	with_libnm_glib=no
- fi
- AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
- AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
--- 
-2.20.1
diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index 170d992326e..7f2c40e6de3 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,18 +1,18 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
-version=1.8.10
-revision=2
+version=1.8.12
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
-makedepends="gtk+3-devel libglib-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef
+checksum=0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f815318
 system_accounts="_nm_openvpn"
 lib32disabled=yes
 _nm_openvpn_homedir="/var/empty"

From 0fcb2577b3074df7d0da5067d8f50eb81a40f111 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 18:18:52 -0400
Subject: [PATCH 07/13] NetworkManager-pptp: change dependency to libnma-devel

---
 srcpkgs/NetworkManager-pptp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 7889bb47800..9c541cf246f 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-pptp'
 pkgname=NetworkManager-pptp
 version=1.2.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--without-libnm-glib"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="libglib-devel gtk+3-devel libsecret-devel ppp-devel
- network-manager-applet-devel NetworkManager-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel
+ NetworkManager-devel ppp-devel"
 depends="pptpclient"
 short_desc="NetworkManager VPN plugin for pptp"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From e795e479f8820f93e1c80846f9df2f9d667e7e99 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 20:09:35 -0400
Subject: [PATCH 08/13] gnome-control-center: update to 3.38.1

---
 srcpkgs/gnome-control-center/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 191101afaad..b4be62deaa3 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.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
  gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
  libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
- libpwquality-devel mit-krb5-devel network-manager-applet-devel polkit-devel
+ libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
  pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
  libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
  clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
@@ -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=f6b6b5b8ef9c38d895ba5af87f31adae02194ad86c9aa6cff2d2b9755c2db1da
+checksum=8d90006c610f6fccb3cddbcf413b1bc4137fb4977b901a3989420fe160082026
 
 build_options="cheese"
 build_options_default="cheese"

From f62c87e772d0561e473a6e628ce2585dac7c55c8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 21:03:32 -0400
Subject: [PATCH 09/13] gnome-initial-setup: update to 3.38.1

---
 srcpkgs/gnome-initial-setup/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 63abd3c5c83..12886a0f9ae 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.0
+version=3.38.1
 revision=1
 build_style=meson
 configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config glib-devel gettext"
 makedepends="NetworkManager-devel accountsservice-devel libglib-devel
  gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
  gnome-online-accounts-devel gdm-devel libpwquality-devel
- mit-krb5-devel vala-devel network-manager-applet-devel polkit-devel
+ mit-krb5-devel vala-devel libnma-devel polkit-devel
  rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
  pango-devel"
 depends="iso-codes"
@@ -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=3a857aef5efb689f408632db8469ad27620f762d977070a36035c522c6f82759
+checksum=e55d4f4073998e0fb7b3dfcc470e2a4c7d950a96bedab15011b9084ebc813676

From c94c6600aba7d99d89c17eb961e5766a6c5bacf7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 22:29:32 -0400
Subject: [PATCH 10/13] gnome-shell: update to 3.38.1

---
 srcpkgs/gnome-shell/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index f27795572ef..6753b6ac54e 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=3.38.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper=gir
@@ -12,7 +12,7 @@ makedepends="at-spi2-atk caribou-devel evolution-data-server-devel folks-devel
  gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
- network-manager-applet-devel polkit-devel pulseaudio-devel
+ libnma-devel polkit-devel pulseaudio-devel
  startup-notification-devel telepathy-logger-devel gnome-autoar-devel"
 depends="caribou elogind glxinfo gnome-control-center gsettings-desktop-schemas upower"
 short_desc="GNOME core user interface"
@@ -21,7 +21,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c626403bc0875ee6da8c7a62ac0cee312badb523af073cb166125015a75a0a97
+checksum=b789e3296463c4cbfa329ad1724df38439c3e6d7537a01025cd8f2fec8c90bb4
 
 # needs X
 do_check() {

From 5ebb26ce729e2cd25ad314e553e1b1f80f7259fa Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 7 Oct 2020 01:24:58 -0400
Subject: [PATCH 11/13] cinnamon-control-center: change dependency to
 libnma-devel

---
 srcpkgs/cinnamon-control-center/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 27f0fbeb748..b9ebe5f22d1 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=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -10,7 +10,7 @@ hostmakedepends="autoconf-archive gettext-devel glib-devel gnome-common
 makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
  cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
  libSM-devel libXxf86misc-devel libcanberra-devel libgnomekbd-devel
- libnotify-devel libwacom-devel network-manager-applet-devel polkit-devel
+ libnotify-devel libwacom-devel libnma-devel polkit-devel
  pulseaudio-devel tzdata upower-devel"
 depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
  cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"

From 679602ab7cc60b1d8fd23d705266a75b72dbedf3 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Thu, 8 Oct 2020 19:45:42 -0400
Subject: [PATCH 12/13] switchboard-plug-network: update to 2.3.2

---
 srcpkgs/switchboard-plug-network/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template
index d7e5cac19d3..d243f041ed4 100644
--- a/srcpkgs/switchboard-plug-network/template
+++ b/srcpkgs/switchboard-plug-network/template
@@ -1,14 +1,15 @@
 # Template file for 'switchboard-plug-network'
 pkgname=switchboard-plug-network
-version=2.1.4
+version=2.3.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala"
 makedepends="switchboard-devel granite-devel gtk+3-devel
- network-manager-applet-devel NetworkManager-devel"
+ libnma-devel NetworkManager-devel"
 short_desc="Switchboard Network Plug"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=0b039bcb2a33fbdc8364da865c3abebb825e0d36ab89a2bf4589704722f76bba
+homepage="https://github.com/elementary/switchboard-plug-network"
+distfiles="https://github.com/elementary/${pkgname}/archive/${version}.tar.gz"
+checksum=61c3803dccf68324afe7cb67094fd9dbcb874cae47284b9b131b9bd49971d9b8
+nocross="https://travis-ci.org/github/void-linux/void-packages/builds/733837363"

From 0f2a7ffa7fc342f26d99c19232dbe21e7aab14bb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 12 Oct 2020 20:52:23 -0400
Subject: [PATCH 13/13] NetworkManager-vpnc: change dependency to libnma-devel

---
 srcpkgs/NetworkManager-vpnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-vpnc/template b/srcpkgs/NetworkManager-vpnc/template
index a8b8ce12176..b9d17226132 100644
--- a/srcpkgs/NetworkManager-vpnc/template
+++ b/srcpkgs/NetworkManager-vpnc/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-vpnc'
 pkgname=NetworkManager-vpnc
 version=1.2.6
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--localstatedir=/var --disable-static --without-libnm-glib"
 hostmakedepends="pkg-config intltool"
-makedepends="libnm libnm-gtk network-manager-applet-devel libsecret-devel"
+makedepends="gtk+3-devel libnm libnma-devel libsecret-devel"
 depends="vpnc"
 short_desc="NetworkManager VPN plugin for VPNC"
 maintainer="Peter Kuchar <masaj@gmx.com>"

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: New package: libnma-1.8.30; network-manager-applet: update to 1.18.0 and add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (86 preceding siblings ...)
  2020-11-18  5:55 ` [PR PATCH] [Updated] New package: libnma-1.8.30; network-manager-applet: update to 1.18.0 and " cinerea0
@ 2020-11-18  6:55 ` Piraty
  2020-11-19  1:40 ` [PR PATCH] [Updated] " cinerea0
                   ` (2 subsequent siblings)
  90 siblings, 0 replies; 92+ messages in thread
From: Piraty @ 2020-11-18  6:55 UTC (permalink / raw)
  To: ml

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

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-729475129

Comment:
we don't want merge commits, rebase instead.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Updated] New package: libnma-1.8.30; network-manager-applet: update to 1.18.0 and add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (87 preceding siblings ...)
  2020-11-18  6:55 ` Piraty
@ 2020-11-19  1:40 ` cinerea0
  2020-11-19  5:50 ` cinerea0
  2020-11-22  6:25 ` [PR PATCH] [Merged]: " the-maldridge
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-11-19  1:40 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages nm-applet
https://github.com/void-linux/void-packages/pull/24497

New package: libnma-1.8.30; network-manager-applet: update to 1.18.0 and add libappindicator support
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

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

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

From cc9d7f33413438a8ac587ae760eb2f8384d725e0 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:06:34 -0400
Subject: [PATCH 01/13] New package: libnma-1.8.30

---
 common/shlibs           |  1 +
 srcpkgs/libnma-devel    |  1 +
 srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 120000 srcpkgs/libnma-devel
 create mode 100644 srcpkgs/libnma/template

diff --git a/common/shlibs b/common/shlibs
index 9a576f18d0f..c7dd9b7d170 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2981,6 +2981,7 @@ 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
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+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
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}
+
+libnma-devel_package() {
+	short_desc+=" - library development files"
+	depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove usr/share/gtk-doc
+	}
+}

From 44af9ce2eaab13314cdb377317bb259b3b0edb91 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:09:38 -0400
Subject: [PATCH 02/13] network-manager-applet: update to 1.18.0

---
 common/shlibs                           |  1 -
 srcpkgs/libnm-gtk                       |  1 -
 srcpkgs/network-manager-applet-devel    |  1 -
 srcpkgs/network-manager-applet/template | 47 ++++---------------------
 4 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 120000 srcpkgs/libnm-gtk
 delete mode 120000 srcpkgs/network-manager-applet-devel

diff --git a/common/shlibs b/common/shlibs
index c7dd9b7d170..b9c84e555b2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -905,7 +905,6 @@ liblcms2.so.2 lcms2-2.2_1
 libcolord.so.2 libcolord-1.1.7_1
 libcolordprivate.so.2 libcolord-1.1.7_1
 libcolorhug.so.2 libcolord-1.1.7_1
-libnm-gtk.so.0 libnm-gtk-0.9.1.95_1
 libcaribou.so.0 caribou-0.4.0_1
 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
 libgrilo-0.3.so.0 grilo-0.3.2_1
diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/libnm-gtk
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/network-manager-applet-devel
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 0656107b1af..2d9861a94ba 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,14 +1,14 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.24
+version=1.18.0
 revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
- libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
- polkit-devel mobile-broadband-provider-info"
+ libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libgnome-keyring-devel libgudev-devel libnotify-devel libnma-devel
+ libsecret-devel polkit-devel mobile-broadband-provider-info"
 depends="NetworkManager hicolor-icon-theme iso-codes"
 short_desc="NetworkManager panel applet for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,38 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
+checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b
 lib32disabled=yes
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_build() {
-	export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs:${wrksrc}/src/libnm-gtk/.libs"
-}
-
-libnm-gtk_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
-	}
-}
-
-network-manager-applet-devel_package() {
-	depends="gtk+3-devel NetworkManager-devel>=1.0
-	 libnm-gtk>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		vmove usr/share/gtk-doc
-	}
-}

From 900603547206583d0c7d0a22cf266e3cb7002e6b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:34:07 -0400
Subject: [PATCH 03/13] NetworkManager-strongswan: update to 1.5.2

---
 srcpkgs/NetworkManager-strongswan/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 4d8d2b14306..46c02d092e5 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,16 +1,16 @@
 # Template file for 'NetworkManager-strongswan'
 pkgname=NetworkManager-strongswan
-version=1.4.5
-revision=2
+version=1.5.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-more-warnings --without-libnm-glib
  --disable-more-warnings"
 hostmakedepends="intltool pkg-config"
-makedepends="NetworkManager-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel NetworkManager-devel libnma-devel libsecret-devel"
 depends="strongswan"
 short_desc="Strongswan NetworkManager plugin"
 maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://www.strongswan.org/"
 distfiles="https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-${version}.tar.bz2"
-checksum=343b68cbe32f65e2baa01b37716415e4360addc8c90209d45504b52b8864bd04
+checksum=c8452b952653881dcc2745f0ab460c061086215b297129212a743bd9e9f78169

From 7c5228d8d826b4cf48b775647f8ed1c00176ff30 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 10:05:40 -0400
Subject: [PATCH 04/13] NetworkManager-l2tp: change dependency to libnma-devel

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

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index d60f5878792..1dea408c423 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="gtk+3-devel glib-devel libglib-devel libsecret-devel
- network-manager-applet-devel libressl-devel nss-devel ppp-devel"
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+ libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"
 maintainer="Douglas Kosovic <doug@uq.edu.au>"

From f809f00bf7566a4d0f23a0468705dc34edac5914 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 11:20:26 -0400
Subject: [PATCH 05/13] NetworkManager-openconnect: change dependency to
 libnma-devel

---
 srcpkgs/NetworkManager-openconnect/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index 327f2bd84cb..f32a075180f 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -1,18 +1,17 @@
-# Template build file for 'NetworkManager-openconnect'.
+# Template file for 'NetworkManager-openconnect'
 pkgname=NetworkManager-openconnect
 version=1.2.6
-revision=2
-lib32disabled=yes
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
-makedepends="gtk+3-devel network-manager-applet-devel libsecret-devel
- libxml2-devel openconnect-devel libressl-devel liblz4-devel
- gcr-devel"
+makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
+ libressl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-license="GPL-2"
-maintainer="Enno Boland <gottox@voidlinux.org>"
 checksum=95109803596a9782680a5dca3b51c4ad8ff7e126169d5431278cab694112975a
+lib32disabled=yes

From a2f514f1a439e331f5d2385d26d0844149eb9702 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 12:33:51 -0400
Subject: [PATCH 06/13] NetworkManager-openvpn: update to 1.8.12

---
 ...isable-libnm-glib-support-by-default.patch | 52 -------------------
 srcpkgs/NetworkManager-openvpn/template       |  8 +--
 2 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch

diff --git a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
deleted file mode 100644
index 7eb72e1dbb6..00000000000
--- a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-source: https://git.archlinux.org/svntogit/packages.git/tree/trunk/0001-build-disable-libnm-glib-support-by-default.patch?h=packages/networkmanager-openvpn
-
-From 52aad4911ffad04cf8274b5574124a4d5470c7fa Mon Sep 17 00:00:00 2001
-Message-Id: <52aad4911ffad04cf8274b5574124a4d5470c7fa.1549642989.git.jan.steffens@gmail.com>
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Wed, 17 Oct 2018 15:21:30 +0200
-Subject: [PATCH] build: disable libnm-glib support by default
-
-By now nobody should be using this. Keep the code around for a little
-longer just in case anybody still uses this.
-
-The libnm-glib support also serves as an example how do we build two
-different versions of the properties plugin. We'll soon be in a similar
-situation with Gtk 4.0. (sigh.) Just don't drop it yet.
-
-Conflicts:
-	NEWS
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11ff5d0..eaf015b 100644
---- configure.ac
-+++ configure.ac
-@@ -75,20 +75,20 @@ dnl
- dnl GNOME support
- dnl
- AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
--AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openvpn without libnm-glib comatibility]), [], [with_libnm_glib_specified=no])
-+AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-openvpn with libnm-glib comatibility (depreacted)]), [], [with_libnm_glib_specified=no])
- if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
- 	if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
- 		AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
- 	fi
- fi
- if test "$with_gnome" != no; then
- 	with_gnome=yes
- fi
- if test "$with_libnm_glib_specified" == no; then
--	with_libnm_glib="$with_gnome"
-+	with_libnm_glib=no
- fi
--if test "$with_libnm_glib" != no; then
--	with_libnm_glib=yes
-+if test "$with_libnm_glib" != yes; then
-+	with_libnm_glib=no
- fi
- AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
- AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
--- 
-2.20.1
diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index 170d992326e..7f2c40e6de3 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,18 +1,18 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
-version=1.8.10
-revision=2
+version=1.8.12
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
-makedepends="gtk+3-devel libglib-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef
+checksum=0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f815318
 system_accounts="_nm_openvpn"
 lib32disabled=yes
 _nm_openvpn_homedir="/var/empty"

From bc15d15244d5bcc603f177b5eef3eadc1db43c2b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 18:18:52 -0400
Subject: [PATCH 07/13] NetworkManager-pptp: change dependency to libnma-devel

---
 srcpkgs/NetworkManager-pptp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 7889bb47800..9c541cf246f 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-pptp'
 pkgname=NetworkManager-pptp
 version=1.2.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--without-libnm-glib"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="libglib-devel gtk+3-devel libsecret-devel ppp-devel
- network-manager-applet-devel NetworkManager-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel
+ NetworkManager-devel ppp-devel"
 depends="pptpclient"
 short_desc="NetworkManager VPN plugin for pptp"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 10b212273843ba8ab59562915667e83326072815 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 20:09:35 -0400
Subject: [PATCH 08/13] gnome-control-center: update to 3.38.1

---
 srcpkgs/gnome-control-center/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 191101afaad..b4be62deaa3 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.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
  gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
  libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
- libpwquality-devel mit-krb5-devel network-manager-applet-devel polkit-devel
+ libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
  pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
  libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
  clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
@@ -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=f6b6b5b8ef9c38d895ba5af87f31adae02194ad86c9aa6cff2d2b9755c2db1da
+checksum=8d90006c610f6fccb3cddbcf413b1bc4137fb4977b901a3989420fe160082026
 
 build_options="cheese"
 build_options_default="cheese"

From f38634f71ffd43642529a37f5377eb189e1ab0e5 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 21:03:32 -0400
Subject: [PATCH 09/13] gnome-initial-setup: update to 3.38.1

---
 srcpkgs/gnome-initial-setup/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 63abd3c5c83..12886a0f9ae 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.0
+version=3.38.1
 revision=1
 build_style=meson
 configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config glib-devel gettext"
 makedepends="NetworkManager-devel accountsservice-devel libglib-devel
  gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
  gnome-online-accounts-devel gdm-devel libpwquality-devel
- mit-krb5-devel vala-devel network-manager-applet-devel polkit-devel
+ mit-krb5-devel vala-devel libnma-devel polkit-devel
  rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
  pango-devel"
 depends="iso-codes"
@@ -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=3a857aef5efb689f408632db8469ad27620f762d977070a36035c522c6f82759
+checksum=e55d4f4073998e0fb7b3dfcc470e2a4c7d950a96bedab15011b9084ebc813676

From 826ada14fa74bfab2cf6537ea6503c7b60ee92f4 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 22:29:32 -0400
Subject: [PATCH 10/13] gnome-shell: update to 3.38.1

---
 srcpkgs/gnome-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index bc4cd67fae7..6753b6ac54e 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -12,7 +12,7 @@ makedepends="at-spi2-atk caribou-devel evolution-data-server-devel folks-devel
  gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
- network-manager-applet-devel polkit-devel pulseaudio-devel
+ libnma-devel polkit-devel pulseaudio-devel
  startup-notification-devel telepathy-logger-devel gnome-autoar-devel"
 depends="caribou elogind glxinfo gnome-control-center gsettings-desktop-schemas upower"
 short_desc="GNOME core user interface"

From 14bef9469c71440398afece8f73d22492d9a2a1d Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 7 Oct 2020 01:24:58 -0400
Subject: [PATCH 11/13] cinnamon-control-center: change dependency to
 libnma-devel

---
 srcpkgs/cinnamon-control-center/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 27f0fbeb748..b9ebe5f22d1 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=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -10,7 +10,7 @@ hostmakedepends="autoconf-archive gettext-devel glib-devel gnome-common
 makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
  cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
  libSM-devel libXxf86misc-devel libcanberra-devel libgnomekbd-devel
- libnotify-devel libwacom-devel network-manager-applet-devel polkit-devel
+ libnotify-devel libwacom-devel libnma-devel polkit-devel
  pulseaudio-devel tzdata upower-devel"
 depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
  cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"

From 92033645c506b35585538fab99b29d61a6490234 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Thu, 8 Oct 2020 19:45:42 -0400
Subject: [PATCH 12/13] switchboard-plug-network: update to 2.3.2

---
 srcpkgs/switchboard-plug-network/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template
index d7e5cac19d3..d243f041ed4 100644
--- a/srcpkgs/switchboard-plug-network/template
+++ b/srcpkgs/switchboard-plug-network/template
@@ -1,14 +1,15 @@
 # Template file for 'switchboard-plug-network'
 pkgname=switchboard-plug-network
-version=2.1.4
+version=2.3.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala"
 makedepends="switchboard-devel granite-devel gtk+3-devel
- network-manager-applet-devel NetworkManager-devel"
+ libnma-devel NetworkManager-devel"
 short_desc="Switchboard Network Plug"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=0b039bcb2a33fbdc8364da865c3abebb825e0d36ab89a2bf4589704722f76bba
+homepage="https://github.com/elementary/switchboard-plug-network"
+distfiles="https://github.com/elementary/${pkgname}/archive/${version}.tar.gz"
+checksum=61c3803dccf68324afe7cb67094fd9dbcb874cae47284b9b131b9bd49971d9b8
+nocross="https://travis-ci.org/github/void-linux/void-packages/builds/733837363"

From 6fe211d0194401ae08b9eab4677792505adcb497 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 12 Oct 2020 20:52:23 -0400
Subject: [PATCH 13/13] NetworkManager-vpnc: change dependency to libnma-devel

---
 srcpkgs/NetworkManager-vpnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-vpnc/template b/srcpkgs/NetworkManager-vpnc/template
index a8b8ce12176..b9d17226132 100644
--- a/srcpkgs/NetworkManager-vpnc/template
+++ b/srcpkgs/NetworkManager-vpnc/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-vpnc'
 pkgname=NetworkManager-vpnc
 version=1.2.6
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--localstatedir=/var --disable-static --without-libnm-glib"
 hostmakedepends="pkg-config intltool"
-makedepends="libnm libnm-gtk network-manager-applet-devel libsecret-devel"
+makedepends="gtk+3-devel libnm libnma-devel libsecret-devel"
 depends="vpnc"
 short_desc="NetworkManager VPN plugin for VPNC"
 maintainer="Peter Kuchar <masaj@gmx.com>"

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: New package: libnma-1.8.30; network-manager-applet: update to 1.18.0 and add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (88 preceding siblings ...)
  2020-11-19  1:40 ` [PR PATCH] [Updated] " cinerea0
@ 2020-11-19  5:50 ` cinerea0
  2020-11-22  6:25 ` [PR PATCH] [Merged]: " the-maldridge
  90 siblings, 0 replies; 92+ messages in thread
From: cinerea0 @ 2020-11-19  5:50 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/24497#issuecomment-730145827

Comment:
@Piraty Fixed! I would prefer to not have to do it again before this gets merged, though.

^ permalink raw reply	[flat|nested] 92+ messages in thread

* Re: [PR PATCH] [Merged]: New package: libnma-1.8.30; network-manager-applet: update to 1.18.0 and add libappindicator support
  2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
                   ` (89 preceding siblings ...)
  2020-11-19  5:50 ` cinerea0
@ 2020-11-22  6:25 ` the-maldridge
  90 siblings, 0 replies; 92+ messages in thread
From: the-maldridge @ 2020-11-22  6:25 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

New package: libnma-1.8.30; network-manager-applet: update to 1.18.0 and add libappindicator support
https://github.com/void-linux/void-packages/pull/24497

Description:
This commit adds support for `nm-applet`'s `--indicator` flag, which allows the applet to run in trays that use the AppIndicator protocol.

^ permalink raw reply	[flat|nested] 92+ messages in thread

end of thread, other threads:[~2020-11-22  6:25 UTC | newest]

Thread overview: 92+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-27  1:13 [PR PATCH] network-manager-applet: add libappindicator support cinerea0
2020-08-27  1:39 ` cinerea0
2020-09-09 14:07 ` sgn
2020-09-11  3:51 ` cinerea0
2020-09-11  5:41 ` CameronNemo
2020-09-11  5:42 ` CameronNemo
2020-09-11  5:44 ` CameronNemo
2020-09-11 23:24 ` cinerea0
2020-09-11 23:39 ` CameronNemo
2020-09-30 20:51 ` [PR PATCH] [Updated] " cinerea0
2020-09-30 21:15 ` cinerea0
2020-09-30 21:31 ` cinerea0
2020-09-30 23:37 ` [PR REVIEW] " CameronNemo
2020-09-30 23:37 ` CameronNemo
2020-09-30 23:37 ` CameronNemo
2020-09-30 23:37 ` CameronNemo
2020-09-30 23:54 ` [PR PATCH] [Updated] " cinerea0
2020-10-01  0:05 ` [PR REVIEW] " cinerea0
2020-10-01  0:05 ` cinerea0
2020-10-01  0:07 ` cinerea0
2020-10-01  0:08 ` cinerea0
2020-10-04  3:09 ` [PR PATCH] [Updated] " cinerea0
2020-10-04  4:57 ` cinerea0
2020-10-04  5:34 ` cinerea0
2020-10-04 23:05 ` cinerea0
2020-10-04 23:43 ` cinerea0
2020-10-05  0:17 ` cinerea0
2020-10-05  0:44 ` [PR PATCH] [Updated] " cinerea0
2020-10-05  0:48 ` [PR REVIEW] " CameronNemo
2020-10-05  1:17 ` cinerea0
2020-10-05  1:27 ` CameronNemo
2020-10-05  1:44 ` cinerea0
2020-10-05  1:48 ` cinerea0
2020-10-05  1:51 ` CameronNemo
2020-10-05  2:20 ` cinerea0
2020-10-05 22:32 ` cinerea0
2020-10-05 22:46 ` cinerea0
2020-10-05 23:32 ` [PR PATCH] [Updated] " cinerea0
2020-10-06  2:12 ` CameronNemo
2020-10-06  2:14 ` CameronNemo
2020-10-06  2:30 ` [PR PATCH] [Updated] " cinerea0
2020-10-06  2:45 ` cinerea0
2020-10-06  3:01 ` cinerea0
2020-10-06  3:07 ` cinerea0
2020-10-06  3:16 ` CameronNemo
2020-10-06  3:28 ` cinerea0
2020-10-06  3:39 ` CameronNemo
2020-10-06  3:40 ` CameronNemo
2020-10-06  3:40 ` CameronNemo
2020-10-06  3:46 ` CameronNemo
2020-10-06 13:07 ` [PR PATCH] [Updated] " cinerea0
2020-10-06 13:23 ` cinerea0
2020-10-06 13:40 ` cinerea0
2020-10-06 14:06 ` cinerea0
2020-10-06 15:21 ` cinerea0
2020-10-06 16:34 ` cinerea0
2020-10-06 22:19 ` cinerea0
2020-10-07  0:09 ` cinerea0
2020-10-07  1:03 ` cinerea0
2020-10-07  2:30 ` cinerea0
2020-10-07  3:09 ` CameronNemo
2020-10-07  3:27 ` [PR PATCH] [Updated] " cinerea0
2020-10-07  4:17 ` cinerea0
2020-10-07  4:59 ` CameronNemo
2020-10-07  5:25 ` [PR PATCH] [Updated] " cinerea0
2020-10-07 14:29 ` cinerea0
2020-10-07 14:30 ` cinerea0
2020-10-07 16:41 ` CameronNemo
2020-10-08  0:30 ` [PR PATCH] [Updated] " cinerea0
2020-10-08  1:39 ` cinerea0
2020-10-08  3:12 ` CameronNemo
2020-10-08  5:02 ` [PR PATCH] [Updated] " cinerea0
2020-10-08 16:01 ` cinerea0
2020-10-08 21:34 ` cinerea0
2020-10-08 21:35 ` [PR PATCH] [Updated] " cinerea0
2020-10-08 22:13 ` cinerea0
2020-10-08 23:46 ` [PR PATCH] [Updated] " cinerea0
2020-10-09  1:29 ` cinerea0
2020-10-09  4:42 ` [PR PATCH] [Updated] " cinerea0
2020-10-09  6:42 ` CameronNemo
2020-10-09 16:27 ` cinerea0
2020-10-10 21:51 ` cinerea0
2020-10-10 21:51 ` [PR PATCH] [Updated] " cinerea0
2020-10-10 22:54 ` cinerea0
2020-10-13  0:53 ` [PR PATCH] [Updated] " cinerea0
2020-10-13  2:18 ` cinerea0
2020-10-15 23:51 ` cinerea0
2020-11-18  5:55 ` [PR PATCH] [Updated] New package: libnma-1.8.30; network-manager-applet: update to 1.18.0 and " cinerea0
2020-11-18  6:55 ` Piraty
2020-11-19  1:40 ` [PR PATCH] [Updated] " cinerea0
2020-11-19  5:50 ` cinerea0
2020-11-22  6:25 ` [PR PATCH] [Merged]: " the-maldridge

Github messages for voidlinux

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.vuxu.org/voidlinux-github

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 voidlinux-github voidlinux-github/ http://inbox.vuxu.org/voidlinux-github \
		voidlinux-github@inbox.vuxu.org
	public-inbox-index voidlinux-github

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git