From: cinerea0 <cinerea0@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] network-manager-applet: add libappindicator support
Date: Tue, 06 Oct 2020 15:40:52 +0200 [thread overview]
Message-ID: <20201006134052.MDCY52H2PJodlbk1hAUeCaPnMawON773OXDr9G8xseA@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24497@inbox.vuxu.org>
[-- 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
next prev parent reply other threads:[~2020-10-06 13:40 UTC|newest]
Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-27 1:13 [PR PATCH] " 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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201006134052.MDCY52H2PJodlbk1hAUeCaPnMawON773OXDr9G8xseA@z \
--to=cinerea0@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).