* [PR PATCH] Ayatana indicators
@ 2022-11-25 18:04 tibequadorian
2022-11-25 19:05 ` [PR PATCH] [Updated] " tibequadorian
` (14 more replies)
0 siblings, 15 replies; 17+ messages in thread
From: tibequadorian @ 2022-11-25 18:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2295 bytes --]
There is a new pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ayatana-indicators
https://github.com/void-linux/void-packages/pull/40761
Ayatana indicators
<!-- Uncomment relevant sections and delete options which are not applicable -->
Continuation of #35135
`libappindicator` hasn't seen a release since 2012 (more than 10 years!)
Debian has removed it in buster and switched to [libayatana-appindicator](https://ayatanaindicators.github.io/).
This PR tries to replace `libappindicator` with `libayatana-appindicator`.
#### Testing the changes
- I tested the changes in this PR: **WIP**
#### TODO:
- [x] droidcam - [supported](https://github.com/dev47apps/droidcam/commit/71a74d22ed700650a83b7cb653bd92b0ed3cd01a) in master, use patch
- [x] gromit-mpx - [supported](https://github.com/bk138/gromit-mpx/commit/2a838303154df4a90495c4f93741846cbd63d37f)
- [x] network-manager-applet - supported
- [x] psensor - patched
- [x] remmina - [supported](https://github.com/FreeRDP/Remmina/commit/a34133add92c217943acad64bb0e41de0f2f619c)
- [ ] element-desktop
- [ ] caffeine-ng - [supported](https://codeberg.org/WhyNotHugo/caffeine-ng/commit/d13b2b97160649b465213e691a8df2e958ecf739) in master, wait for release 4.1.0
- [ ] gwe
- [ ] indicator-doom-cpu - not supported and probably abandoned, remove?
- [ ] safeeyes
- [ ] ulauncher
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40761.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ayatana-indicators-40761.patch --]
[-- Type: text/x-diff, Size: 20647 bytes --]
From e0fc0fb80fac3f0bf52cbd15f8a44199555e3676 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:37:25 +0100
Subject: [PATCH 1/8] New package: ayatana-ido-0.9.2
---
common/shlibs | 2 ++
srcpkgs/ayatana-ido-devel | 1 +
srcpkgs/ayatana-ido/template | 27 +++++++++++++++++++++++++++
3 files changed, 30 insertions(+)
create mode 120000 srcpkgs/ayatana-ido-devel
create mode 100644 srcpkgs/ayatana-ido/template
diff --git a/common/shlibs b/common/shlibs
index d24d3cbe695d..183b48826ee2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4202,3 +4202,5 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
libairspyhf.so.0 libairspyhf-1.6.8_1
+libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1
+libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
diff --git a/srcpkgs/ayatana-ido-devel b/srcpkgs/ayatana-ido-devel
new file mode 120000
index 000000000000..2e1aa73a149c
--- /dev/null
+++ b/srcpkgs/ayatana-ido-devel
@@ -0,0 +1 @@
+ayatana-ido
\ No newline at end of file
diff --git a/srcpkgs/ayatana-ido/template b/srcpkgs/ayatana-ido/template
new file mode 100644
index 000000000000..717ad5808405
--- /dev/null
+++ b/srcpkgs/ayatana-ido/template
@@ -0,0 +1,27 @@
+# Template file for 'ayatana-ido'
+pkgname=ayatana-ido
+version=0.9.2
+revision=1
+build_helper="gir"
+build_style=cmake
+hostmakedepends="pkg-config gobject-introspection vala"
+makedepends="gtk+3-devel glib-devel"
+short_desc="Ayatana Indicator Display Objects"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+changelog="https://github.com/AyatanaIndicators/ayatana-ido/raw/main/ChangeLog"
+distfiles="https://github.com/AyatanaIndicators/ayatana-ido/archive/${version}.tar.gz"
+checksum=b166e7a160458e4a71f6086d2e4e97e18cf1ac584231a4b9f1f338914203884c
+
+ayatana-ido-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
+ }
+}
From 9c4bb0073af18992d65d732d2582dc8660b5998a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:38:40 +0100
Subject: [PATCH 2/8] New package: libayatana-indicator-0.9.3
---
common/shlibs | 2 ++
srcpkgs/libayatana-indicator-devel | 1 +
srcpkgs/libayatana-indicator/template | 24 ++++++++++++++++++++++++
3 files changed, 27 insertions(+)
create mode 120000 srcpkgs/libayatana-indicator-devel
create mode 100644 srcpkgs/libayatana-indicator/template
diff --git a/common/shlibs b/common/shlibs
index 183b48826ee2..9d538fcf9fba 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4204,3 +4204,5 @@ libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
libairspyhf.so.0 libairspyhf-1.6.8_1
libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
+libayatana-ido3-0.4.so.0 ayatana-ido-0.9.1_1
+libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
diff --git a/srcpkgs/libayatana-indicator-devel b/srcpkgs/libayatana-indicator-devel
new file mode 120000
index 000000000000..fdfe7dbb5d64
--- /dev/null
+++ b/srcpkgs/libayatana-indicator-devel
@@ -0,0 +1 @@
+libayatana-indicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-indicator/template b/srcpkgs/libayatana-indicator/template
new file mode 100644
index 000000000000..a780816306c1
--- /dev/null
+++ b/srcpkgs/libayatana-indicator/template
@@ -0,0 +1,24 @@
+# Template file for 'libayatana-indicator'
+pkgname=libayatana-indicator
+version=0.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config python3"
+makedepends="glib-devel gtk+3-devel ayatana-ido-devel"
+short_desc="Ayatana Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="GPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+changelog="https://github.com/AyatanaIndicators/libayatana-indicator/raw/main/ChangeLog"
+distfiles="https://github.com/AyatanaIndicators/libayatana-indicator/archive/${version}.tar.gz"
+checksum=09c5456fcb430b6ee0626fafdf99a32eb8746b267d56ab2bd4c8a8dd6ca731da
+
+libayatana-indicator-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From 2d7afc6d95bbe32c1d8b7122ade13f79b044a062 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:44:14 +0100
Subject: [PATCH 3/8] New package: libayatana-appindicator-0.5.91
---
common/shlibs | 2 ++
srcpkgs/libayatana-appindicator-devel | 1 +
srcpkgs/libayatana-appindicator/template | 32 ++++++++++++++++++++++++
3 files changed, 35 insertions(+)
create mode 120000 srcpkgs/libayatana-appindicator-devel
create mode 100644 srcpkgs/libayatana-appindicator/template
diff --git a/common/shlibs b/common/shlibs
index 9d538fcf9fba..ee86afa3ba6b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4206,3 +4206,5 @@ libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.1_1
libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
+libayatana-indicator3.so.7 libayatana-indicator-0.9.1_1
+libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
diff --git a/srcpkgs/libayatana-appindicator-devel b/srcpkgs/libayatana-appindicator-devel
new file mode 120000
index 000000000000..a2ff93abbc17
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator-devel
@@ -0,0 +1 @@
+libayatana-appindicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-appindicator/template b/srcpkgs/libayatana-appindicator/template
new file mode 100644
index 000000000000..01b0a341d20a
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator/template
@@ -0,0 +1,32 @@
+# Template file for 'libayatana-appindicator'
+pkgname=libayatana-appindicator
+version=0.5.91
+revision=1
+build_helper="gir"
+build_style=cmake
+configure_args="-DENABLE_BINDINGS_MONO=OFF -DENABLE_BINDINGS_VALA=$(vopt_if vala ON OFF)"
+hostmakedepends="pkg-config gobject-introspection $(vopt_if vala vala)"
+makedepends="glib-devel gtk+3-devel libdbusmenu-gtk3-devel libayatana-indicator-devel"
+short_desc="Ayatana Application Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+distfiles="https://github.com/AyatanaIndicators/libayatana-appindicator/archive/${version}.tar.gz"
+checksum=52eb5d0c0de07177833e50fbaee592dcb3939e96c6b789921e2a8caf40a1ed26
+
+build_options="vala"
+build_options_default="vala"
+
+libayatana-appindicator-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ if [ "$build_option_vala" ]; then
+ vmove usr/share/vala
+ fi
+ }
+}
From 27daa2b7be44d7d915316b265fb31f469ea45ee4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:17:56 +0100
Subject: [PATCH 4/8] droidcam: replace libappindicator with
libayatana-appindicator
Patch is already upstreamed
---
.../0001-Support-ayatana-appindicator.patch | 133 ++++++++++++++++++
srcpkgs/droidcam/template | 10 +-
2 files changed, 140 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/droidcam/patches/0001-Support-ayatana-appindicator.patch
diff --git a/srcpkgs/droidcam/patches/0001-Support-ayatana-appindicator.patch b/srcpkgs/droidcam/patches/0001-Support-ayatana-appindicator.patch
new file mode 100644
index 000000000000..a51ae79c59ae
--- /dev/null
+++ b/srcpkgs/droidcam/patches/0001-Support-ayatana-appindicator.patch
@@ -0,0 +1,133 @@
+From 71a74d22ed700650a83b7cb653bd92b0ed3cd01a Mon Sep 17 00:00:00 2001
+From: aramg <aramg@users.noreply.github.com>
+Date: Fri, 4 Mar 2022 21:36:12 -0800
+Subject: [PATCH] Support ayatana-appindicator
+
+---
+ Makefile | 19 +++++++++++++++----
+ README.md | 20 ++++++++------------
+ src/droidcam.c | 11 +++++++----
+ 3 files changed, 30 insertions(+), 20 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7be3c15..b372b09 100644
+--- a/Makefile
++++ b/Makefile
+@@ -6,24 +6,35 @@
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ # Use at your own risk. See README file for more details.
+
+-JPEG_DIR ?= /opt/libjpeg-turbo
++#
++# Variables with ?= can be changed during invocation
++# Example:
++# APPINDICATOR=ayatana-appindicator3-0.1 make droidcam
++
++APPINDICATOR ?= appindicator3-0.1
++JPEG_DIR ?= /opt/libjpeg-turbo
+ JPEG_INCLUDE ?= $(JPEG_DIR)/include
+-JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
++JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
++
+
+ CC = gcc
+ CFLAGS = -Wall -O2
+ GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
+-GTK += `pkg-config --cflags --libs appindicator3-0.1`
++GTK += `pkg-config --libs --cflags $(APPINDICATOR)`
+ LIBAV = `pkg-config --libs --cflags libswscale libavutil`
+ LIBS = -lspeex -lasound -lpthread -lm
+ JPEG = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a
+ SRC = src/connection.c src/settings.c src/decoder*.c src/av.c src/usb.c src/queue.c
+ USBMUXD = -lusbmuxd
+
++ifneq ($(findstring ayatana,$(APPINDICATOR)),)
++ CFLAGS += -DUSE_AYATANA_APPINDICATOR
++endif
++
++
+ all: droidcam-cli droidcam
+
+ ifneq "$(RELEASE)" ""
+-LIBAV = /usr/lib/x86_64-linux-gnu/libswscale.a /usr/lib/x86_64-linux-gnu/libavutil.a
+ SRC += src/libusbmuxd.a src/libxml2.a src/libplist-2.0.a
+ package: clean all
+ zip "droidcam_$(RELEASE).zip" \
+diff --git a/README.md b/README.md
+index d1fcba0..b8c15e3 100644
+--- a/README.md
++++ b/README.md
+@@ -28,26 +28,20 @@ libusbmuxd-dev
+ libplist-dev
+
+ gtk+-3.0 # Only needed for GUI client
+-libappindicator3-dev # Only needed for GUI client**
++libappindicator3-dev # Only needed for GUI client^^
+
+ ```
+
+ Run `make`, or `make droidcam-cli` if you skipped installing GTK+, to build the droidcam binaries.
+
+-To install, run `sudo ./install-client`.
++To install, run `sudo ./install-client`
+
+-#### **libappindicator
++^^ Some distros are removing libappindicator in their latest versions (Ubuntu 21+, Fedora 33+, Debian Bullseye+), which is used for system tray icon.
++The new dependency is `libayatana-appindicator3-dev`
+
+-Some distros are removing libappindicator support, which is used for system tray icon.
++Building:
+
+-On Ubuntu 21, use sudo apt install libappindicator3-1.
+-
+-On Fedora 33, use sudo dnf install libappindicator-gtk3
+-
+-For Debian Bullseye, get:
+-
+-https://files.dev47apps.net/linux/libindicator3-7_0.5.0-4_amd64.deb
+-https://files.dev47apps.net/linux/libappindicator3-1_0.4.92-7_amd64.deb
++`APPINDICATOR=ayatana-appindicator3-0.1 make droidcam`
+
+
+ ## V4L2 Loopback (Webcam driver)
+@@ -71,6 +65,8 @@ Debian/Ubuntu and RHEL (Fedora/SUSE) based distros:
+
+ ## Sound
+
++DroidCam can use the Linux ALSA Loopback sound card for audio. There are many differences and quirks with the audio layers on different Linux systems. It’s recommended you use a regular microphone and keep droidcam for video only.
++
+ Run `sudo ./install-sound` to load the Linux ALSA Loopback sound card which the Droidcam client will use for audio input.
+
+ To get the mic to show up in PulseAudio you can either run `pacmd load-module module-alsa-source device=hw:Loopback,1,0` (you may need to adjust the last number),
+diff --git a/src/droidcam.c b/src/droidcam.c
+index cad1ee4..b8e93cf 100644
+--- a/src/droidcam.c
++++ b/src/droidcam.c
+@@ -7,7 +7,12 @@
+ */
+
+ #include <gtk/gtk.h>
++#ifdef USE_AYATANA_APPINDICATOR
++#include <libayatana-appindicator/app-indicator.h>
++#else
+ #include <libappindicator/app-indicator.h>
++#endif
++
+ #include <X11/Xlib.h>
+ #include <stdint.h>
+
+@@ -280,12 +285,10 @@ static void the_callback(GtkWidget* widget, gpointer extra)
+ ipEdit = FALSE;
+ break;
+ case CB_BTN_OTR:
+- gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 0, 0);
+- // TODO drop support for older OSs and use
+- // gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL);
++ gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL);
+ break;
+ case CB_BTN_WB:
+- gtk_menu_popup(GTK_MENU(wbMenu), NULL, NULL, NULL, NULL, 0, 0);
++ gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL);
+ break;
+ case CB_BTN_EL:
+ if (v_running != 1 || thread_cmd != 0) {
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1207bdec5cea..97a2c10cb094 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,12 +1,14 @@
# Template file for 'droidcam'
pkgname=droidcam
version=1.8.2
-revision=1
+revision=2
build_style=gnu-makefile
-make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg"
+make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg
+ APPINDICATOR=ayatana-appindicator3-0.1"
hostmakedepends="pkg-config"
makedepends="pkg-config libjpeg-turbo-devel ffmpeg-devel alsa-lib-devel
- speex-devel libusbmuxd-devel libplist-devel gtk+3-devel libappindicator-devel"
+ speex-devel libusbmuxd-devel libplist-devel gtk+3-devel
+ libayatana-appindicator-devel"
depends="v4l2loopback"
short_desc="Tool for using your android device as a wireless/usb webcam"
maintainer="ibrokemypie <ibrokemypie@bastardi.net>"
@@ -15,6 +17,8 @@ homepage="https://www.dev47apps.com/"
distfiles="https://github.com/dev47apps/droidcam/archive/v${version}.tar.gz"
checksum=9f18c6768572571c59bfe08ac70e24612e08fc3d887c127ff47899252d3dc662
+CFLAGS="-DUSE_AYATANA_APPINDICATOR"
+
post_patch() {
vsed -e "s/^Icon=.*/Icon=droidcam-icon.png/" -e "s,/local,," -i droidcam.desktop
}
From 2f5cb85ce30b053ca7ce49f074e821341d310622 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:35 +0100
Subject: [PATCH 5/8] gromit-mpx: replace libappindicator with
libayatana-appindicator
---
srcpkgs/gromit-mpx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gromit-mpx/template b/srcpkgs/gromit-mpx/template
index 3330ccfeba2b..82d1068872d7 100644
--- a/srcpkgs/gromit-mpx/template
+++ b/srcpkgs/gromit-mpx/template
@@ -1,10 +1,10 @@
# Template file for 'gromit-mpx'
pkgname=gromit-mpx
version=1.4.2
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="gtk+3-devel libappindicator-devel libdbusmenu-glib-devel"
+makedepends="gtk+3-devel libayatana-appindicator-devel libdbusmenu-glib-devel"
short_desc="Multi-pointer annotation tool"
maintainer="Toyam Cox <Vaelatern@gmail.com>"
license="GPL-2.0-only"
From c698116ab3d5f304e874fa29a07f610fb22964fe Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:49 +0100
Subject: [PATCH 6/8] network-manager-applet: replace libappindicator with
libayatana-appindicator
---
srcpkgs/network-manager-applet/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 7bbc7a671da5..ee5e63b467ed 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,12 +1,12 @@
# Template file for 'network-manager-applet'
pkgname=network-manager-applet
version=1.30.0
-revision=1
+revision=2
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
- libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libayatana-appindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
libgudev-devel libnotify-devel libnma-devel libsecret-devel
polkit-devel mobile-broadband-provider-info"
depends="NetworkManager hicolor-icon-theme iso-codes"
From 45275bae099b05ca4d106a6c88bb450d659711d2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:53 +0100
Subject: [PATCH 7/8] psensor: replace libappindicator with
libayatana-appindicator
---
.../0001-Use-ayatana-appindicator.patch | 53 +++++++++++++++++++
srcpkgs/psensor/template | 6 +--
2 files changed, 56 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/psensor/patches/0001-Use-ayatana-appindicator.patch
diff --git a/srcpkgs/psensor/patches/0001-Use-ayatana-appindicator.patch b/srcpkgs/psensor/patches/0001-Use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..f8350ca6f77f
--- /dev/null
+++ b/srcpkgs/psensor/patches/0001-Use-ayatana-appindicator.patch
@@ -0,0 +1,53 @@
+From d84498639263d6a8f8d4b4adddf3dab66631876b Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 22 Jan 2022 00:15:13 +0100
+Subject: [PATCH] Use ayatana appindicator
+
+---
+ configure.ac | 2 +-
+ src/ui.h | 2 +-
+ src/ui_appindicator.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 48b10eb..2ff857d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -117,7 +117,7 @@ AC_SUBST(LIBNOTIFY_LIBS)
+
+ # Checks AppIndicator
+ APPINDICATOR_LIBS=
+-PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1,
++PKG_CHECK_MODULES(APPINDICATOR, ayatana-appindicator3-0.1,
+ [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator3-0.1])],
+ [AC_MSG_WARN(AppIndicator 3-0.1 not present")])
+ AM_CONDITIONAL(APPINDICATOR, test -n "$APPINDICATOR_LIBS")
+diff --git a/src/ui.h b/src/ui.h
+index 426f29c..43ae4be 100644
+--- a/src/ui.h
++++ b/src/ui.h
+@@ -27,7 +27,7 @@
+ #include <gtk/gtk.h>
+
+ #if defined(HAVE_APPINDICATOR)
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+ #endif
+
+ #include "psensor.h"
+diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
+index ed4cc64..b3179c0 100644
+--- a/src/ui_appindicator.c
++++ b/src/ui_appindicator.c
+@@ -21,7 +21,7 @@
+ #include <string.h>
+
+ #include <gtk/gtk.h>
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+
+ #include <cfg.h>
+ #include <psensor.h>
+--
+2.34.1
+
diff --git a/srcpkgs/psensor/template b/srcpkgs/psensor/template
index d21a33c4c695..752e9fe04e7c 100644
--- a/srcpkgs/psensor/template
+++ b/srcpkgs/psensor/template
@@ -1,12 +1,12 @@
# Template file for 'psensor'
pkgname=psensor
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
-hostmakedepends="pkg-config glib-devel"
+hostmakedepends="pkg-config glib-devel automake"
makedepends="gtk+3-devel udisks2-devel libgtop-devel json-c-devel
libsensors-devel libatasmart-devel libcurl-devel libnotify-devel
- libappindicator-devel libmicrohttpd-devel"
+ libayatana-appindicator-devel libmicrohttpd-devel"
depends="lm_sensors"
short_desc="Graphical hardware temperature monitor for Linux"
maintainer="Foxlet <foxlet@furcode.co>"
From 65ef7f5fb36afaee954d88967016641be82ceaca Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:58 +0100
Subject: [PATCH 8/8] remmina: replace libappindicator with
libayatana-appindicator
---
srcpkgs/remmina/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 0da8cad6604b..9bf538220fef 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
# Template file for 'remmina'
pkgname=remmina
version=1.4.27
-revision=3
+revision=4
build_style=cmake
configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"
hostmakedepends="glib-devel intltool pkg-config shared-mime-info"
@@ -11,7 +11,7 @@ makedepends="avahi-glib-libs-devel avahi-ui-libs-devel freerdp-devel
libsecret-devel libsodium-devel libsoup3-devel libssh-devel libva-devel
libvncserver-devel libxkbfile-devel opus-devel phodav-devel
spice-gtk-devel spice-protocol telepathy-glib-devel usbredir-devel
- vte3-devel libappindicator-devel libwebkit2gtk41-devel python3-devel"
+ vte3-devel libayatana-appindicator-devel libwebkit2gtk41-devel python3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Remote desktop client written in GTK+"
maintainer="Frank Steinborn <steinex@nognu.de>"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] Ayatana indicators
2022-11-25 18:04 [PR PATCH] Ayatana indicators tibequadorian
@ 2022-11-25 19:05 ` tibequadorian
2022-11-25 21:27 ` tibequadorian
` (13 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: tibequadorian @ 2022-11-25 19:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2423 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ayatana-indicators
https://github.com/void-linux/void-packages/pull/40761
Ayatana indicators
<!-- Uncomment relevant sections and delete options which are not applicable -->
Continuation of #35135
`libappindicator` hasn't seen a release since 2012 (more than 10 years!)
Debian has removed it in buster and switched to [libayatana-appindicator](https://ayatanaindicators.github.io/).
This PR tries to replace `libappindicator` with `libayatana-appindicator`.
#### Testing the changes
- I tested the changes in this PR: **WIP**
#### TODO:
- [x] droidcam - [supported](https://github.com/dev47apps/droidcam/commit/71a74d22ed700650a83b7cb653bd92b0ed3cd01a) in master, use patch
- [x] gromit-mpx - [supported](https://github.com/bk138/gromit-mpx/commit/2a838303154df4a90495c4f93741846cbd63d37f)
- [x] network-manager-applet - supported
- [x] psensor - patched
- [x] remmina - [supported](https://github.com/FreeRDP/Remmina/commit/a34133add92c217943acad64bb0e41de0f2f619c)
- [x] ulauncher - supported
- [ ] element-desktop
- [ ] caffeine-ng - [supported](https://codeberg.org/WhyNotHugo/caffeine-ng/commit/d13b2b97160649b465213e691a8df2e958ecf739) in master, wait for release 4.1.0
- [ ] gwe
- [ ] indicator-doom-cpu - not supported and probably abandoned, remove?
- [ ] safeeyes - [supported](https://github.com/slgobinath/SafeEyes/commit/c784000e694f9fa508a2535f5d23d04456b4ff86) in 2.1.4
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40761.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ayatana-indicators-40761.patch --]
[-- Type: text/x-diff, Size: 21820 bytes --]
From e0fc0fb80fac3f0bf52cbd15f8a44199555e3676 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:37:25 +0100
Subject: [PATCH 1/9] New package: ayatana-ido-0.9.2
---
common/shlibs | 2 ++
srcpkgs/ayatana-ido-devel | 1 +
srcpkgs/ayatana-ido/template | 27 +++++++++++++++++++++++++++
3 files changed, 30 insertions(+)
create mode 120000 srcpkgs/ayatana-ido-devel
create mode 100644 srcpkgs/ayatana-ido/template
diff --git a/common/shlibs b/common/shlibs
index d24d3cbe695d..183b48826ee2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4202,3 +4202,5 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
libairspyhf.so.0 libairspyhf-1.6.8_1
+libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1
+libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
diff --git a/srcpkgs/ayatana-ido-devel b/srcpkgs/ayatana-ido-devel
new file mode 120000
index 000000000000..2e1aa73a149c
--- /dev/null
+++ b/srcpkgs/ayatana-ido-devel
@@ -0,0 +1 @@
+ayatana-ido
\ No newline at end of file
diff --git a/srcpkgs/ayatana-ido/template b/srcpkgs/ayatana-ido/template
new file mode 100644
index 000000000000..717ad5808405
--- /dev/null
+++ b/srcpkgs/ayatana-ido/template
@@ -0,0 +1,27 @@
+# Template file for 'ayatana-ido'
+pkgname=ayatana-ido
+version=0.9.2
+revision=1
+build_helper="gir"
+build_style=cmake
+hostmakedepends="pkg-config gobject-introspection vala"
+makedepends="gtk+3-devel glib-devel"
+short_desc="Ayatana Indicator Display Objects"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+changelog="https://github.com/AyatanaIndicators/ayatana-ido/raw/main/ChangeLog"
+distfiles="https://github.com/AyatanaIndicators/ayatana-ido/archive/${version}.tar.gz"
+checksum=b166e7a160458e4a71f6086d2e4e97e18cf1ac584231a4b9f1f338914203884c
+
+ayatana-ido-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
+ }
+}
From 9c4bb0073af18992d65d732d2582dc8660b5998a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:38:40 +0100
Subject: [PATCH 2/9] New package: libayatana-indicator-0.9.3
---
common/shlibs | 2 ++
srcpkgs/libayatana-indicator-devel | 1 +
srcpkgs/libayatana-indicator/template | 24 ++++++++++++++++++++++++
3 files changed, 27 insertions(+)
create mode 120000 srcpkgs/libayatana-indicator-devel
create mode 100644 srcpkgs/libayatana-indicator/template
diff --git a/common/shlibs b/common/shlibs
index 183b48826ee2..9d538fcf9fba 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4204,3 +4204,5 @@ libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
libairspyhf.so.0 libairspyhf-1.6.8_1
libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
+libayatana-ido3-0.4.so.0 ayatana-ido-0.9.1_1
+libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
diff --git a/srcpkgs/libayatana-indicator-devel b/srcpkgs/libayatana-indicator-devel
new file mode 120000
index 000000000000..fdfe7dbb5d64
--- /dev/null
+++ b/srcpkgs/libayatana-indicator-devel
@@ -0,0 +1 @@
+libayatana-indicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-indicator/template b/srcpkgs/libayatana-indicator/template
new file mode 100644
index 000000000000..a780816306c1
--- /dev/null
+++ b/srcpkgs/libayatana-indicator/template
@@ -0,0 +1,24 @@
+# Template file for 'libayatana-indicator'
+pkgname=libayatana-indicator
+version=0.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config python3"
+makedepends="glib-devel gtk+3-devel ayatana-ido-devel"
+short_desc="Ayatana Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="GPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+changelog="https://github.com/AyatanaIndicators/libayatana-indicator/raw/main/ChangeLog"
+distfiles="https://github.com/AyatanaIndicators/libayatana-indicator/archive/${version}.tar.gz"
+checksum=09c5456fcb430b6ee0626fafdf99a32eb8746b267d56ab2bd4c8a8dd6ca731da
+
+libayatana-indicator-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From 2d7afc6d95bbe32c1d8b7122ade13f79b044a062 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:44:14 +0100
Subject: [PATCH 3/9] New package: libayatana-appindicator-0.5.91
---
common/shlibs | 2 ++
srcpkgs/libayatana-appindicator-devel | 1 +
srcpkgs/libayatana-appindicator/template | 32 ++++++++++++++++++++++++
3 files changed, 35 insertions(+)
create mode 120000 srcpkgs/libayatana-appindicator-devel
create mode 100644 srcpkgs/libayatana-appindicator/template
diff --git a/common/shlibs b/common/shlibs
index 9d538fcf9fba..ee86afa3ba6b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4206,3 +4206,5 @@ libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.1_1
libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
+libayatana-indicator3.so.7 libayatana-indicator-0.9.1_1
+libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
diff --git a/srcpkgs/libayatana-appindicator-devel b/srcpkgs/libayatana-appindicator-devel
new file mode 120000
index 000000000000..a2ff93abbc17
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator-devel
@@ -0,0 +1 @@
+libayatana-appindicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-appindicator/template b/srcpkgs/libayatana-appindicator/template
new file mode 100644
index 000000000000..01b0a341d20a
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator/template
@@ -0,0 +1,32 @@
+# Template file for 'libayatana-appindicator'
+pkgname=libayatana-appindicator
+version=0.5.91
+revision=1
+build_helper="gir"
+build_style=cmake
+configure_args="-DENABLE_BINDINGS_MONO=OFF -DENABLE_BINDINGS_VALA=$(vopt_if vala ON OFF)"
+hostmakedepends="pkg-config gobject-introspection $(vopt_if vala vala)"
+makedepends="glib-devel gtk+3-devel libdbusmenu-gtk3-devel libayatana-indicator-devel"
+short_desc="Ayatana Application Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+distfiles="https://github.com/AyatanaIndicators/libayatana-appindicator/archive/${version}.tar.gz"
+checksum=52eb5d0c0de07177833e50fbaee592dcb3939e96c6b789921e2a8caf40a1ed26
+
+build_options="vala"
+build_options_default="vala"
+
+libayatana-appindicator-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ if [ "$build_option_vala" ]; then
+ vmove usr/share/vala
+ fi
+ }
+}
From 27daa2b7be44d7d915316b265fb31f469ea45ee4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:17:56 +0100
Subject: [PATCH 4/9] droidcam: replace libappindicator with
libayatana-appindicator
Patch is already upstreamed
---
.../0001-Support-ayatana-appindicator.patch | 133 ++++++++++++++++++
srcpkgs/droidcam/template | 10 +-
2 files changed, 140 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/droidcam/patches/0001-Support-ayatana-appindicator.patch
diff --git a/srcpkgs/droidcam/patches/0001-Support-ayatana-appindicator.patch b/srcpkgs/droidcam/patches/0001-Support-ayatana-appindicator.patch
new file mode 100644
index 000000000000..a51ae79c59ae
--- /dev/null
+++ b/srcpkgs/droidcam/patches/0001-Support-ayatana-appindicator.patch
@@ -0,0 +1,133 @@
+From 71a74d22ed700650a83b7cb653bd92b0ed3cd01a Mon Sep 17 00:00:00 2001
+From: aramg <aramg@users.noreply.github.com>
+Date: Fri, 4 Mar 2022 21:36:12 -0800
+Subject: [PATCH] Support ayatana-appindicator
+
+---
+ Makefile | 19 +++++++++++++++----
+ README.md | 20 ++++++++------------
+ src/droidcam.c | 11 +++++++----
+ 3 files changed, 30 insertions(+), 20 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7be3c15..b372b09 100644
+--- a/Makefile
++++ b/Makefile
+@@ -6,24 +6,35 @@
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ # Use at your own risk. See README file for more details.
+
+-JPEG_DIR ?= /opt/libjpeg-turbo
++#
++# Variables with ?= can be changed during invocation
++# Example:
++# APPINDICATOR=ayatana-appindicator3-0.1 make droidcam
++
++APPINDICATOR ?= appindicator3-0.1
++JPEG_DIR ?= /opt/libjpeg-turbo
+ JPEG_INCLUDE ?= $(JPEG_DIR)/include
+-JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
++JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
++
+
+ CC = gcc
+ CFLAGS = -Wall -O2
+ GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
+-GTK += `pkg-config --cflags --libs appindicator3-0.1`
++GTK += `pkg-config --libs --cflags $(APPINDICATOR)`
+ LIBAV = `pkg-config --libs --cflags libswscale libavutil`
+ LIBS = -lspeex -lasound -lpthread -lm
+ JPEG = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a
+ SRC = src/connection.c src/settings.c src/decoder*.c src/av.c src/usb.c src/queue.c
+ USBMUXD = -lusbmuxd
+
++ifneq ($(findstring ayatana,$(APPINDICATOR)),)
++ CFLAGS += -DUSE_AYATANA_APPINDICATOR
++endif
++
++
+ all: droidcam-cli droidcam
+
+ ifneq "$(RELEASE)" ""
+-LIBAV = /usr/lib/x86_64-linux-gnu/libswscale.a /usr/lib/x86_64-linux-gnu/libavutil.a
+ SRC += src/libusbmuxd.a src/libxml2.a src/libplist-2.0.a
+ package: clean all
+ zip "droidcam_$(RELEASE).zip" \
+diff --git a/README.md b/README.md
+index d1fcba0..b8c15e3 100644
+--- a/README.md
++++ b/README.md
+@@ -28,26 +28,20 @@ libusbmuxd-dev
+ libplist-dev
+
+ gtk+-3.0 # Only needed for GUI client
+-libappindicator3-dev # Only needed for GUI client**
++libappindicator3-dev # Only needed for GUI client^^
+
+ ```
+
+ Run `make`, or `make droidcam-cli` if you skipped installing GTK+, to build the droidcam binaries.
+
+-To install, run `sudo ./install-client`.
++To install, run `sudo ./install-client`
+
+-#### **libappindicator
++^^ Some distros are removing libappindicator in their latest versions (Ubuntu 21+, Fedora 33+, Debian Bullseye+), which is used for system tray icon.
++The new dependency is `libayatana-appindicator3-dev`
+
+-Some distros are removing libappindicator support, which is used for system tray icon.
++Building:
+
+-On Ubuntu 21, use sudo apt install libappindicator3-1.
+-
+-On Fedora 33, use sudo dnf install libappindicator-gtk3
+-
+-For Debian Bullseye, get:
+-
+-https://files.dev47apps.net/linux/libindicator3-7_0.5.0-4_amd64.deb
+-https://files.dev47apps.net/linux/libappindicator3-1_0.4.92-7_amd64.deb
++`APPINDICATOR=ayatana-appindicator3-0.1 make droidcam`
+
+
+ ## V4L2 Loopback (Webcam driver)
+@@ -71,6 +65,8 @@ Debian/Ubuntu and RHEL (Fedora/SUSE) based distros:
+
+ ## Sound
+
++DroidCam can use the Linux ALSA Loopback sound card for audio. There are many differences and quirks with the audio layers on different Linux systems. It’s recommended you use a regular microphone and keep droidcam for video only.
++
+ Run `sudo ./install-sound` to load the Linux ALSA Loopback sound card which the Droidcam client will use for audio input.
+
+ To get the mic to show up in PulseAudio you can either run `pacmd load-module module-alsa-source device=hw:Loopback,1,0` (you may need to adjust the last number),
+diff --git a/src/droidcam.c b/src/droidcam.c
+index cad1ee4..b8e93cf 100644
+--- a/src/droidcam.c
++++ b/src/droidcam.c
+@@ -7,7 +7,12 @@
+ */
+
+ #include <gtk/gtk.h>
++#ifdef USE_AYATANA_APPINDICATOR
++#include <libayatana-appindicator/app-indicator.h>
++#else
+ #include <libappindicator/app-indicator.h>
++#endif
++
+ #include <X11/Xlib.h>
+ #include <stdint.h>
+
+@@ -280,12 +285,10 @@ static void the_callback(GtkWidget* widget, gpointer extra)
+ ipEdit = FALSE;
+ break;
+ case CB_BTN_OTR:
+- gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 0, 0);
+- // TODO drop support for older OSs and use
+- // gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL);
++ gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL);
+ break;
+ case CB_BTN_WB:
+- gtk_menu_popup(GTK_MENU(wbMenu), NULL, NULL, NULL, NULL, 0, 0);
++ gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL);
+ break;
+ case CB_BTN_EL:
+ if (v_running != 1 || thread_cmd != 0) {
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1207bdec5cea..97a2c10cb094 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,12 +1,14 @@
# Template file for 'droidcam'
pkgname=droidcam
version=1.8.2
-revision=1
+revision=2
build_style=gnu-makefile
-make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg"
+make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg
+ APPINDICATOR=ayatana-appindicator3-0.1"
hostmakedepends="pkg-config"
makedepends="pkg-config libjpeg-turbo-devel ffmpeg-devel alsa-lib-devel
- speex-devel libusbmuxd-devel libplist-devel gtk+3-devel libappindicator-devel"
+ speex-devel libusbmuxd-devel libplist-devel gtk+3-devel
+ libayatana-appindicator-devel"
depends="v4l2loopback"
short_desc="Tool for using your android device as a wireless/usb webcam"
maintainer="ibrokemypie <ibrokemypie@bastardi.net>"
@@ -15,6 +17,8 @@ homepage="https://www.dev47apps.com/"
distfiles="https://github.com/dev47apps/droidcam/archive/v${version}.tar.gz"
checksum=9f18c6768572571c59bfe08ac70e24612e08fc3d887c127ff47899252d3dc662
+CFLAGS="-DUSE_AYATANA_APPINDICATOR"
+
post_patch() {
vsed -e "s/^Icon=.*/Icon=droidcam-icon.png/" -e "s,/local,," -i droidcam.desktop
}
From 2f5cb85ce30b053ca7ce49f074e821341d310622 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:35 +0100
Subject: [PATCH 5/9] gromit-mpx: replace libappindicator with
libayatana-appindicator
---
srcpkgs/gromit-mpx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gromit-mpx/template b/srcpkgs/gromit-mpx/template
index 3330ccfeba2b..82d1068872d7 100644
--- a/srcpkgs/gromit-mpx/template
+++ b/srcpkgs/gromit-mpx/template
@@ -1,10 +1,10 @@
# Template file for 'gromit-mpx'
pkgname=gromit-mpx
version=1.4.2
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="gtk+3-devel libappindicator-devel libdbusmenu-glib-devel"
+makedepends="gtk+3-devel libayatana-appindicator-devel libdbusmenu-glib-devel"
short_desc="Multi-pointer annotation tool"
maintainer="Toyam Cox <Vaelatern@gmail.com>"
license="GPL-2.0-only"
From c698116ab3d5f304e874fa29a07f610fb22964fe Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:49 +0100
Subject: [PATCH 6/9] network-manager-applet: replace libappindicator with
libayatana-appindicator
---
srcpkgs/network-manager-applet/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 7bbc7a671da5..ee5e63b467ed 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,12 +1,12 @@
# Template file for 'network-manager-applet'
pkgname=network-manager-applet
version=1.30.0
-revision=1
+revision=2
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
- libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libayatana-appindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
libgudev-devel libnotify-devel libnma-devel libsecret-devel
polkit-devel mobile-broadband-provider-info"
depends="NetworkManager hicolor-icon-theme iso-codes"
From 45275bae099b05ca4d106a6c88bb450d659711d2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:53 +0100
Subject: [PATCH 7/9] psensor: replace libappindicator with
libayatana-appindicator
---
.../0001-Use-ayatana-appindicator.patch | 53 +++++++++++++++++++
srcpkgs/psensor/template | 6 +--
2 files changed, 56 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/psensor/patches/0001-Use-ayatana-appindicator.patch
diff --git a/srcpkgs/psensor/patches/0001-Use-ayatana-appindicator.patch b/srcpkgs/psensor/patches/0001-Use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..f8350ca6f77f
--- /dev/null
+++ b/srcpkgs/psensor/patches/0001-Use-ayatana-appindicator.patch
@@ -0,0 +1,53 @@
+From d84498639263d6a8f8d4b4adddf3dab66631876b Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 22 Jan 2022 00:15:13 +0100
+Subject: [PATCH] Use ayatana appindicator
+
+---
+ configure.ac | 2 +-
+ src/ui.h | 2 +-
+ src/ui_appindicator.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 48b10eb..2ff857d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -117,7 +117,7 @@ AC_SUBST(LIBNOTIFY_LIBS)
+
+ # Checks AppIndicator
+ APPINDICATOR_LIBS=
+-PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1,
++PKG_CHECK_MODULES(APPINDICATOR, ayatana-appindicator3-0.1,
+ [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator3-0.1])],
+ [AC_MSG_WARN(AppIndicator 3-0.1 not present")])
+ AM_CONDITIONAL(APPINDICATOR, test -n "$APPINDICATOR_LIBS")
+diff --git a/src/ui.h b/src/ui.h
+index 426f29c..43ae4be 100644
+--- a/src/ui.h
++++ b/src/ui.h
+@@ -27,7 +27,7 @@
+ #include <gtk/gtk.h>
+
+ #if defined(HAVE_APPINDICATOR)
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+ #endif
+
+ #include "psensor.h"
+diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
+index ed4cc64..b3179c0 100644
+--- a/src/ui_appindicator.c
++++ b/src/ui_appindicator.c
+@@ -21,7 +21,7 @@
+ #include <string.h>
+
+ #include <gtk/gtk.h>
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+
+ #include <cfg.h>
+ #include <psensor.h>
+--
+2.34.1
+
diff --git a/srcpkgs/psensor/template b/srcpkgs/psensor/template
index d21a33c4c695..752e9fe04e7c 100644
--- a/srcpkgs/psensor/template
+++ b/srcpkgs/psensor/template
@@ -1,12 +1,12 @@
# Template file for 'psensor'
pkgname=psensor
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
-hostmakedepends="pkg-config glib-devel"
+hostmakedepends="pkg-config glib-devel automake"
makedepends="gtk+3-devel udisks2-devel libgtop-devel json-c-devel
libsensors-devel libatasmart-devel libcurl-devel libnotify-devel
- libappindicator-devel libmicrohttpd-devel"
+ libayatana-appindicator-devel libmicrohttpd-devel"
depends="lm_sensors"
short_desc="Graphical hardware temperature monitor for Linux"
maintainer="Foxlet <foxlet@furcode.co>"
From 65ef7f5fb36afaee954d88967016641be82ceaca Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:58 +0100
Subject: [PATCH 8/9] remmina: replace libappindicator with
libayatana-appindicator
---
srcpkgs/remmina/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 0da8cad6604b..9bf538220fef 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
# Template file for 'remmina'
pkgname=remmina
version=1.4.27
-revision=3
+revision=4
build_style=cmake
configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"
hostmakedepends="glib-devel intltool pkg-config shared-mime-info"
@@ -11,7 +11,7 @@ makedepends="avahi-glib-libs-devel avahi-ui-libs-devel freerdp-devel
libsecret-devel libsodium-devel libsoup3-devel libssh-devel libva-devel
libvncserver-devel libxkbfile-devel opus-devel phodav-devel
spice-gtk-devel spice-protocol telepathy-glib-devel usbredir-devel
- vte3-devel libappindicator-devel libwebkit2gtk41-devel python3-devel"
+ vte3-devel libayatana-appindicator-devel libwebkit2gtk41-devel python3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Remote desktop client written in GTK+"
maintainer="Frank Steinborn <steinex@nognu.de>"
From ce2a29cbfd90bef2d66bcb13466151300c86451b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 25 Nov 2022 20:03:58 +0100
Subject: [PATCH 9/9] ulauncher: replace libappindicator with
libayatana-appindicator
---
srcpkgs/ulauncher/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ulauncher/template b/srcpkgs/ulauncher/template
index 0eb497d16e1c..d592930f6d24 100644
--- a/srcpkgs/ulauncher/template
+++ b/srcpkgs/ulauncher/template
@@ -1,12 +1,12 @@
# Template file for 'ulauncher'
pkgname=ulauncher
version=5.14.3
-revision=2
+revision=3
build_style=python3-module
hostmakedepends="python3-distutils-extra intltool python3-Levenshtein
python3-dbus python3-gobject python3-inotify python3-websocket-client
python3-xdg"
-depends="libappindicator>=12.10.0_2 libkeybinder3 python3-Levenshtein python3-dbus
+depends="libayatana-appindicator libkeybinder3 python3-Levenshtein python3-dbus
python3-gobject python3-inotify python3-websocket-client python3-xdg webkit2gtk"
short_desc="Linux application launcher with fuzzy search and extensions"
maintainer="Alberto Pau <me@albertopau.com>"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] Ayatana indicators
2022-11-25 18:04 [PR PATCH] Ayatana indicators tibequadorian
2022-11-25 19:05 ` [PR PATCH] [Updated] " tibequadorian
@ 2022-11-25 21:27 ` tibequadorian
2022-11-26 10:49 ` tibequadorian
` (12 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: tibequadorian @ 2022-11-25 21:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2501 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ayatana-indicators
https://github.com/void-linux/void-packages/pull/40761
Ayatana indicators
<!-- Uncomment relevant sections and delete options which are not applicable -->
Continuation of #35135
`libappindicator` hasn't seen a release since 2012 (more than 10 years!)
Debian has removed it in buster and switched to [libayatana-appindicator](https://ayatanaindicators.github.io/).
This PR tries to replace `libappindicator` with `libayatana-appindicator`.
#### Testing the changes
- I tested the changes in this PR: **WIP**
#### TODO:
- [x] droidcam - [supported](https://github.com/dev47apps/droidcam/commit/71a74d22ed700650a83b7cb653bd92b0ed3cd01a) in master, use patch
- [x] gromit-mpx - [supported](https://github.com/bk138/gromit-mpx/commit/2a838303154df4a90495c4f93741846cbd63d37f)
- [x] network-manager-applet - supported
- [x] psensor - patched
- [x] remmina - [supported](https://github.com/FreeRDP/Remmina/commit/a34133add92c217943acad64bb0e41de0f2f619c)
- [x] ulauncher - supported
- [ ] element-desktop - [not supported](https://github.com/electron/electron/issues/27527)
- [ ] caffeine-ng - [supported](https://codeberg.org/WhyNotHugo/caffeine-ng/commit/d13b2b97160649b465213e691a8df2e958ecf739) in master, wait for release 4.1.0
- [ ] gwe
- [ ] indicator-doom-cpu - not supported and probably abandoned, remove?
- [ ] safeeyes - [supported](https://github.com/slgobinath/SafeEyes/commit/c784000e694f9fa508a2535f5d23d04456b4ff86) in 2.1.4, #40763
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40761.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ayatana-indicators-40761.patch --]
[-- Type: text/x-diff, Size: 23658 bytes --]
From e0fc0fb80fac3f0bf52cbd15f8a44199555e3676 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:37:25 +0100
Subject: [PATCH 01/10] New package: ayatana-ido-0.9.2
---
common/shlibs | 2 ++
srcpkgs/ayatana-ido-devel | 1 +
srcpkgs/ayatana-ido/template | 27 +++++++++++++++++++++++++++
3 files changed, 30 insertions(+)
create mode 120000 srcpkgs/ayatana-ido-devel
create mode 100644 srcpkgs/ayatana-ido/template
diff --git a/common/shlibs b/common/shlibs
index d24d3cbe695d..183b48826ee2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4202,3 +4202,5 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
libairspyhf.so.0 libairspyhf-1.6.8_1
+libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1
+libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
diff --git a/srcpkgs/ayatana-ido-devel b/srcpkgs/ayatana-ido-devel
new file mode 120000
index 000000000000..2e1aa73a149c
--- /dev/null
+++ b/srcpkgs/ayatana-ido-devel
@@ -0,0 +1 @@
+ayatana-ido
\ No newline at end of file
diff --git a/srcpkgs/ayatana-ido/template b/srcpkgs/ayatana-ido/template
new file mode 100644
index 000000000000..717ad5808405
--- /dev/null
+++ b/srcpkgs/ayatana-ido/template
@@ -0,0 +1,27 @@
+# Template file for 'ayatana-ido'
+pkgname=ayatana-ido
+version=0.9.2
+revision=1
+build_helper="gir"
+build_style=cmake
+hostmakedepends="pkg-config gobject-introspection vala"
+makedepends="gtk+3-devel glib-devel"
+short_desc="Ayatana Indicator Display Objects"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+changelog="https://github.com/AyatanaIndicators/ayatana-ido/raw/main/ChangeLog"
+distfiles="https://github.com/AyatanaIndicators/ayatana-ido/archive/${version}.tar.gz"
+checksum=b166e7a160458e4a71f6086d2e4e97e18cf1ac584231a4b9f1f338914203884c
+
+ayatana-ido-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
+ }
+}
From 9c4bb0073af18992d65d732d2582dc8660b5998a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:38:40 +0100
Subject: [PATCH 02/10] New package: libayatana-indicator-0.9.3
---
common/shlibs | 2 ++
srcpkgs/libayatana-indicator-devel | 1 +
srcpkgs/libayatana-indicator/template | 24 ++++++++++++++++++++++++
3 files changed, 27 insertions(+)
create mode 120000 srcpkgs/libayatana-indicator-devel
create mode 100644 srcpkgs/libayatana-indicator/template
diff --git a/common/shlibs b/common/shlibs
index 183b48826ee2..9d538fcf9fba 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4204,3 +4204,5 @@ libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
libairspyhf.so.0 libairspyhf-1.6.8_1
libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
+libayatana-ido3-0.4.so.0 ayatana-ido-0.9.1_1
+libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
diff --git a/srcpkgs/libayatana-indicator-devel b/srcpkgs/libayatana-indicator-devel
new file mode 120000
index 000000000000..fdfe7dbb5d64
--- /dev/null
+++ b/srcpkgs/libayatana-indicator-devel
@@ -0,0 +1 @@
+libayatana-indicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-indicator/template b/srcpkgs/libayatana-indicator/template
new file mode 100644
index 000000000000..a780816306c1
--- /dev/null
+++ b/srcpkgs/libayatana-indicator/template
@@ -0,0 +1,24 @@
+# Template file for 'libayatana-indicator'
+pkgname=libayatana-indicator
+version=0.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config python3"
+makedepends="glib-devel gtk+3-devel ayatana-ido-devel"
+short_desc="Ayatana Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="GPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+changelog="https://github.com/AyatanaIndicators/libayatana-indicator/raw/main/ChangeLog"
+distfiles="https://github.com/AyatanaIndicators/libayatana-indicator/archive/${version}.tar.gz"
+checksum=09c5456fcb430b6ee0626fafdf99a32eb8746b267d56ab2bd4c8a8dd6ca731da
+
+libayatana-indicator-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From 2d7afc6d95bbe32c1d8b7122ade13f79b044a062 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:44:14 +0100
Subject: [PATCH 03/10] New package: libayatana-appindicator-0.5.91
---
common/shlibs | 2 ++
srcpkgs/libayatana-appindicator-devel | 1 +
srcpkgs/libayatana-appindicator/template | 32 ++++++++++++++++++++++++
3 files changed, 35 insertions(+)
create mode 120000 srcpkgs/libayatana-appindicator-devel
create mode 100644 srcpkgs/libayatana-appindicator/template
diff --git a/common/shlibs b/common/shlibs
index 9d538fcf9fba..ee86afa3ba6b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4206,3 +4206,5 @@ libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.1_1
libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
+libayatana-indicator3.so.7 libayatana-indicator-0.9.1_1
+libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
diff --git a/srcpkgs/libayatana-appindicator-devel b/srcpkgs/libayatana-appindicator-devel
new file mode 120000
index 000000000000..a2ff93abbc17
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator-devel
@@ -0,0 +1 @@
+libayatana-appindicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-appindicator/template b/srcpkgs/libayatana-appindicator/template
new file mode 100644
index 000000000000..01b0a341d20a
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator/template
@@ -0,0 +1,32 @@
+# Template file for 'libayatana-appindicator'
+pkgname=libayatana-appindicator
+version=0.5.91
+revision=1
+build_helper="gir"
+build_style=cmake
+configure_args="-DENABLE_BINDINGS_MONO=OFF -DENABLE_BINDINGS_VALA=$(vopt_if vala ON OFF)"
+hostmakedepends="pkg-config gobject-introspection $(vopt_if vala vala)"
+makedepends="glib-devel gtk+3-devel libdbusmenu-gtk3-devel libayatana-indicator-devel"
+short_desc="Ayatana Application Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+distfiles="https://github.com/AyatanaIndicators/libayatana-appindicator/archive/${version}.tar.gz"
+checksum=52eb5d0c0de07177833e50fbaee592dcb3939e96c6b789921e2a8caf40a1ed26
+
+build_options="vala"
+build_options_default="vala"
+
+libayatana-appindicator-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ if [ "$build_option_vala" ]; then
+ vmove usr/share/vala
+ fi
+ }
+}
From 27daa2b7be44d7d915316b265fb31f469ea45ee4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:17:56 +0100
Subject: [PATCH 04/10] droidcam: replace libappindicator with
libayatana-appindicator
Patch is already upstreamed
---
.../0001-Support-ayatana-appindicator.patch | 133 ++++++++++++++++++
srcpkgs/droidcam/template | 10 +-
2 files changed, 140 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/droidcam/patches/0001-Support-ayatana-appindicator.patch
diff --git a/srcpkgs/droidcam/patches/0001-Support-ayatana-appindicator.patch b/srcpkgs/droidcam/patches/0001-Support-ayatana-appindicator.patch
new file mode 100644
index 000000000000..a51ae79c59ae
--- /dev/null
+++ b/srcpkgs/droidcam/patches/0001-Support-ayatana-appindicator.patch
@@ -0,0 +1,133 @@
+From 71a74d22ed700650a83b7cb653bd92b0ed3cd01a Mon Sep 17 00:00:00 2001
+From: aramg <aramg@users.noreply.github.com>
+Date: Fri, 4 Mar 2022 21:36:12 -0800
+Subject: [PATCH] Support ayatana-appindicator
+
+---
+ Makefile | 19 +++++++++++++++----
+ README.md | 20 ++++++++------------
+ src/droidcam.c | 11 +++++++----
+ 3 files changed, 30 insertions(+), 20 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7be3c15..b372b09 100644
+--- a/Makefile
++++ b/Makefile
+@@ -6,24 +6,35 @@
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ # Use at your own risk. See README file for more details.
+
+-JPEG_DIR ?= /opt/libjpeg-turbo
++#
++# Variables with ?= can be changed during invocation
++# Example:
++# APPINDICATOR=ayatana-appindicator3-0.1 make droidcam
++
++APPINDICATOR ?= appindicator3-0.1
++JPEG_DIR ?= /opt/libjpeg-turbo
+ JPEG_INCLUDE ?= $(JPEG_DIR)/include
+-JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
++JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
++
+
+ CC = gcc
+ CFLAGS = -Wall -O2
+ GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
+-GTK += `pkg-config --cflags --libs appindicator3-0.1`
++GTK += `pkg-config --libs --cflags $(APPINDICATOR)`
+ LIBAV = `pkg-config --libs --cflags libswscale libavutil`
+ LIBS = -lspeex -lasound -lpthread -lm
+ JPEG = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a
+ SRC = src/connection.c src/settings.c src/decoder*.c src/av.c src/usb.c src/queue.c
+ USBMUXD = -lusbmuxd
+
++ifneq ($(findstring ayatana,$(APPINDICATOR)),)
++ CFLAGS += -DUSE_AYATANA_APPINDICATOR
++endif
++
++
+ all: droidcam-cli droidcam
+
+ ifneq "$(RELEASE)" ""
+-LIBAV = /usr/lib/x86_64-linux-gnu/libswscale.a /usr/lib/x86_64-linux-gnu/libavutil.a
+ SRC += src/libusbmuxd.a src/libxml2.a src/libplist-2.0.a
+ package: clean all
+ zip "droidcam_$(RELEASE).zip" \
+diff --git a/README.md b/README.md
+index d1fcba0..b8c15e3 100644
+--- a/README.md
++++ b/README.md
+@@ -28,26 +28,20 @@ libusbmuxd-dev
+ libplist-dev
+
+ gtk+-3.0 # Only needed for GUI client
+-libappindicator3-dev # Only needed for GUI client**
++libappindicator3-dev # Only needed for GUI client^^
+
+ ```
+
+ Run `make`, or `make droidcam-cli` if you skipped installing GTK+, to build the droidcam binaries.
+
+-To install, run `sudo ./install-client`.
++To install, run `sudo ./install-client`
+
+-#### **libappindicator
++^^ Some distros are removing libappindicator in their latest versions (Ubuntu 21+, Fedora 33+, Debian Bullseye+), which is used for system tray icon.
++The new dependency is `libayatana-appindicator3-dev`
+
+-Some distros are removing libappindicator support, which is used for system tray icon.
++Building:
+
+-On Ubuntu 21, use sudo apt install libappindicator3-1.
+-
+-On Fedora 33, use sudo dnf install libappindicator-gtk3
+-
+-For Debian Bullseye, get:
+-
+-https://files.dev47apps.net/linux/libindicator3-7_0.5.0-4_amd64.deb
+-https://files.dev47apps.net/linux/libappindicator3-1_0.4.92-7_amd64.deb
++`APPINDICATOR=ayatana-appindicator3-0.1 make droidcam`
+
+
+ ## V4L2 Loopback (Webcam driver)
+@@ -71,6 +65,8 @@ Debian/Ubuntu and RHEL (Fedora/SUSE) based distros:
+
+ ## Sound
+
++DroidCam can use the Linux ALSA Loopback sound card for audio. There are many differences and quirks with the audio layers on different Linux systems. It’s recommended you use a regular microphone and keep droidcam for video only.
++
+ Run `sudo ./install-sound` to load the Linux ALSA Loopback sound card which the Droidcam client will use for audio input.
+
+ To get the mic to show up in PulseAudio you can either run `pacmd load-module module-alsa-source device=hw:Loopback,1,0` (you may need to adjust the last number),
+diff --git a/src/droidcam.c b/src/droidcam.c
+index cad1ee4..b8e93cf 100644
+--- a/src/droidcam.c
++++ b/src/droidcam.c
+@@ -7,7 +7,12 @@
+ */
+
+ #include <gtk/gtk.h>
++#ifdef USE_AYATANA_APPINDICATOR
++#include <libayatana-appindicator/app-indicator.h>
++#else
+ #include <libappindicator/app-indicator.h>
++#endif
++
+ #include <X11/Xlib.h>
+ #include <stdint.h>
+
+@@ -280,12 +285,10 @@ static void the_callback(GtkWidget* widget, gpointer extra)
+ ipEdit = FALSE;
+ break;
+ case CB_BTN_OTR:
+- gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 0, 0);
+- // TODO drop support for older OSs and use
+- // gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL);
++ gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL);
+ break;
+ case CB_BTN_WB:
+- gtk_menu_popup(GTK_MENU(wbMenu), NULL, NULL, NULL, NULL, 0, 0);
++ gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL);
+ break;
+ case CB_BTN_EL:
+ if (v_running != 1 || thread_cmd != 0) {
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1207bdec5cea..97a2c10cb094 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,12 +1,14 @@
# Template file for 'droidcam'
pkgname=droidcam
version=1.8.2
-revision=1
+revision=2
build_style=gnu-makefile
-make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg"
+make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg
+ APPINDICATOR=ayatana-appindicator3-0.1"
hostmakedepends="pkg-config"
makedepends="pkg-config libjpeg-turbo-devel ffmpeg-devel alsa-lib-devel
- speex-devel libusbmuxd-devel libplist-devel gtk+3-devel libappindicator-devel"
+ speex-devel libusbmuxd-devel libplist-devel gtk+3-devel
+ libayatana-appindicator-devel"
depends="v4l2loopback"
short_desc="Tool for using your android device as a wireless/usb webcam"
maintainer="ibrokemypie <ibrokemypie@bastardi.net>"
@@ -15,6 +17,8 @@ homepage="https://www.dev47apps.com/"
distfiles="https://github.com/dev47apps/droidcam/archive/v${version}.tar.gz"
checksum=9f18c6768572571c59bfe08ac70e24612e08fc3d887c127ff47899252d3dc662
+CFLAGS="-DUSE_AYATANA_APPINDICATOR"
+
post_patch() {
vsed -e "s/^Icon=.*/Icon=droidcam-icon.png/" -e "s,/local,," -i droidcam.desktop
}
From 2f5cb85ce30b053ca7ce49f074e821341d310622 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:35 +0100
Subject: [PATCH 05/10] gromit-mpx: replace libappindicator with
libayatana-appindicator
---
srcpkgs/gromit-mpx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gromit-mpx/template b/srcpkgs/gromit-mpx/template
index 3330ccfeba2b..82d1068872d7 100644
--- a/srcpkgs/gromit-mpx/template
+++ b/srcpkgs/gromit-mpx/template
@@ -1,10 +1,10 @@
# Template file for 'gromit-mpx'
pkgname=gromit-mpx
version=1.4.2
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="gtk+3-devel libappindicator-devel libdbusmenu-glib-devel"
+makedepends="gtk+3-devel libayatana-appindicator-devel libdbusmenu-glib-devel"
short_desc="Multi-pointer annotation tool"
maintainer="Toyam Cox <Vaelatern@gmail.com>"
license="GPL-2.0-only"
From c698116ab3d5f304e874fa29a07f610fb22964fe Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:49 +0100
Subject: [PATCH 06/10] network-manager-applet: replace libappindicator with
libayatana-appindicator
---
srcpkgs/network-manager-applet/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 7bbc7a671da5..ee5e63b467ed 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,12 +1,12 @@
# Template file for 'network-manager-applet'
pkgname=network-manager-applet
version=1.30.0
-revision=1
+revision=2
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
- libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libayatana-appindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
libgudev-devel libnotify-devel libnma-devel libsecret-devel
polkit-devel mobile-broadband-provider-info"
depends="NetworkManager hicolor-icon-theme iso-codes"
From 45275bae099b05ca4d106a6c88bb450d659711d2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:53 +0100
Subject: [PATCH 07/10] psensor: replace libappindicator with
libayatana-appindicator
---
.../0001-Use-ayatana-appindicator.patch | 53 +++++++++++++++++++
srcpkgs/psensor/template | 6 +--
2 files changed, 56 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/psensor/patches/0001-Use-ayatana-appindicator.patch
diff --git a/srcpkgs/psensor/patches/0001-Use-ayatana-appindicator.patch b/srcpkgs/psensor/patches/0001-Use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..f8350ca6f77f
--- /dev/null
+++ b/srcpkgs/psensor/patches/0001-Use-ayatana-appindicator.patch
@@ -0,0 +1,53 @@
+From d84498639263d6a8f8d4b4adddf3dab66631876b Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 22 Jan 2022 00:15:13 +0100
+Subject: [PATCH] Use ayatana appindicator
+
+---
+ configure.ac | 2 +-
+ src/ui.h | 2 +-
+ src/ui_appindicator.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 48b10eb..2ff857d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -117,7 +117,7 @@ AC_SUBST(LIBNOTIFY_LIBS)
+
+ # Checks AppIndicator
+ APPINDICATOR_LIBS=
+-PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1,
++PKG_CHECK_MODULES(APPINDICATOR, ayatana-appindicator3-0.1,
+ [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator3-0.1])],
+ [AC_MSG_WARN(AppIndicator 3-0.1 not present")])
+ AM_CONDITIONAL(APPINDICATOR, test -n "$APPINDICATOR_LIBS")
+diff --git a/src/ui.h b/src/ui.h
+index 426f29c..43ae4be 100644
+--- a/src/ui.h
++++ b/src/ui.h
+@@ -27,7 +27,7 @@
+ #include <gtk/gtk.h>
+
+ #if defined(HAVE_APPINDICATOR)
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+ #endif
+
+ #include "psensor.h"
+diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
+index ed4cc64..b3179c0 100644
+--- a/src/ui_appindicator.c
++++ b/src/ui_appindicator.c
+@@ -21,7 +21,7 @@
+ #include <string.h>
+
+ #include <gtk/gtk.h>
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+
+ #include <cfg.h>
+ #include <psensor.h>
+--
+2.34.1
+
diff --git a/srcpkgs/psensor/template b/srcpkgs/psensor/template
index d21a33c4c695..752e9fe04e7c 100644
--- a/srcpkgs/psensor/template
+++ b/srcpkgs/psensor/template
@@ -1,12 +1,12 @@
# Template file for 'psensor'
pkgname=psensor
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
-hostmakedepends="pkg-config glib-devel"
+hostmakedepends="pkg-config glib-devel automake"
makedepends="gtk+3-devel udisks2-devel libgtop-devel json-c-devel
libsensors-devel libatasmart-devel libcurl-devel libnotify-devel
- libappindicator-devel libmicrohttpd-devel"
+ libayatana-appindicator-devel libmicrohttpd-devel"
depends="lm_sensors"
short_desc="Graphical hardware temperature monitor for Linux"
maintainer="Foxlet <foxlet@furcode.co>"
From 65ef7f5fb36afaee954d88967016641be82ceaca Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:58 +0100
Subject: [PATCH 08/10] remmina: replace libappindicator with
libayatana-appindicator
---
srcpkgs/remmina/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 0da8cad6604b..9bf538220fef 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
# Template file for 'remmina'
pkgname=remmina
version=1.4.27
-revision=3
+revision=4
build_style=cmake
configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"
hostmakedepends="glib-devel intltool pkg-config shared-mime-info"
@@ -11,7 +11,7 @@ makedepends="avahi-glib-libs-devel avahi-ui-libs-devel freerdp-devel
libsecret-devel libsodium-devel libsoup3-devel libssh-devel libva-devel
libvncserver-devel libxkbfile-devel opus-devel phodav-devel
spice-gtk-devel spice-protocol telepathy-glib-devel usbredir-devel
- vte3-devel libappindicator-devel libwebkit2gtk41-devel python3-devel"
+ vte3-devel libayatana-appindicator-devel libwebkit2gtk41-devel python3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Remote desktop client written in GTK+"
maintainer="Frank Steinborn <steinex@nognu.de>"
From ce2a29cbfd90bef2d66bcb13466151300c86451b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 25 Nov 2022 20:03:58 +0100
Subject: [PATCH 09/10] ulauncher: replace libappindicator with
libayatana-appindicator
---
srcpkgs/ulauncher/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ulauncher/template b/srcpkgs/ulauncher/template
index 0eb497d16e1c..d592930f6d24 100644
--- a/srcpkgs/ulauncher/template
+++ b/srcpkgs/ulauncher/template
@@ -1,12 +1,12 @@
# Template file for 'ulauncher'
pkgname=ulauncher
version=5.14.3
-revision=2
+revision=3
build_style=python3-module
hostmakedepends="python3-distutils-extra intltool python3-Levenshtein
python3-dbus python3-gobject python3-inotify python3-websocket-client
python3-xdg"
-depends="libappindicator>=12.10.0_2 libkeybinder3 python3-Levenshtein python3-dbus
+depends="libayatana-appindicator libkeybinder3 python3-Levenshtein python3-dbus
python3-gobject python3-inotify python3-websocket-client python3-xdg webkit2gtk"
short_desc="Linux application launcher with fuzzy search and extensions"
maintainer="Alberto Pau <me@albertopau.com>"
From f5af55f1aef097ba63c3ebde44d44b67f5d874f2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 25 Nov 2022 22:26:55 +0100
Subject: [PATCH 10/10] gwe: replace libappindicator with
libayatana-appindicator
---
srcpkgs/gwe/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gwe/template b/srcpkgs/gwe/template
index f4473200cd67..b2cd25a3c855 100644
--- a/srcpkgs/gwe/template
+++ b/srcpkgs/gwe/template
@@ -1,14 +1,14 @@
# Template file for 'gwe'
pkgname=gwe
version=0.15.2
-revision=3
+revision=4
build_style=meson
hostmakedepends="pkg-config meson ninja glib-devel gtk+3-devel python3 python3-devel
python3-matplotlib python3-peewee python3-gobject python3-xlib python3-xdg
python3-requests python3-rx python3-nvml python3-injector python3-urllib3 python3-six
python3-chardet python3-idna python3-xlib python3-numpy python3-parsing python3-cycler python3-dateutil python3-Pillow"
makedepends="gobject-introspection appstream-glib"
-depends="python3 gobject-introspection libappindicator libdazzle python3-matplotlib
+depends="python3 gobject-introspection libayatana-appindicator libdazzle python3-matplotlib
python3-peewee python3-gobject python3-xlib python3-xdg python3-requests python3-rx
python3-nvml python3-injector python3-urllib3 python3-six python3-chardet python3-idna
python3-xlib python3-numpy python3-parsing python3-cycler python3-dateutil python3-Pillow"
@@ -18,3 +18,7 @@ license="GPL-3.0-or-later"
homepage="https://www.gitlab.com/leinardi/gwe"
distfiles="https://gitlab.com/leinardi/gwe/-/archive/${version}/gwe-${version}.tar.gz"
checksum=a827eeb8f18fd08213fb22e0e1ef6437ea749eb4b34fcea9d0ae5282912753a0
+
+post_patch() {
+ vsed -i gwe/view/main_view.py -e 's/AppIndicator3/AyatanaAppIndicator3/g'
+}
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] Ayatana indicators
2022-11-25 18:04 [PR PATCH] Ayatana indicators tibequadorian
2022-11-25 19:05 ` [PR PATCH] [Updated] " tibequadorian
2022-11-25 21:27 ` tibequadorian
@ 2022-11-26 10:49 ` tibequadorian
2022-11-26 11:01 ` tibequadorian
` (11 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: tibequadorian @ 2022-11-26 10:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2694 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ayatana-indicators
https://github.com/void-linux/void-packages/pull/40761
Ayatana indicators
<!-- Uncomment relevant sections and delete options which are not applicable -->
Continuation of #35135
`libappindicator` hasn't seen a release since 2012 (more than 10 years!)
Debian has removed it in buster and switched to [libayatana-appindicator](https://ayatanaindicators.github.io/).
This PR tries to replace `libappindicator` with `libayatana-appindicator`.
#### Testing the changes
- I tested the changes in this PR: **WIP**
#### TODO:
- [x] droidcam - [supported](https://github.com/dev47apps/droidcam/commit/71a74d22ed700650a83b7cb653bd92b0ed3cd01a) in master, use minimal patch
- [x] gromit-mpx - [supported](https://github.com/bk138/gromit-mpx/commit/2a838303154df4a90495c4f93741846cbd63d37f)
- [x] network-manager-applet - supported
- [x] psensor - use modified [patch](https://sources.debian.org/patches/psensor/1.1.5-1.4/ayatana-appindicator.patch/) from debian
- [x] remmina - [supported](https://github.com/FreeRDP/Remmina/commit/a34133add92c217943acad64bb0e41de0f2f619c)
- [x] ulauncher - supported
- [x] gwe - [not supported](https://gitlab.com/leinardi/gwe/-/issues/156), use minimal patch
- [x] caffeine-ng - [supported](https://codeberg.org/WhyNotHugo/caffeine-ng/commit/d13b2b97160649b465213e691a8df2e958ecf739) in master, use minimal patch
- [ ] element-desktop - [not supported](https://github.com/electron/electron/issues/27527)
- [ ] indicator-doom-cpu - not supported and probably abandoned, remove?
- [ ] safeeyes - [supported](https://github.com/slgobinath/SafeEyes/commit/c784000e694f9fa508a2535f5d23d04456b4ff86) in 2.1.4, #40763
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40761.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ayatana-indicators-40761.patch --]
[-- Type: text/x-diff, Size: 22563 bytes --]
From 817f23ccc141f5fd80d9e4ecddc7f43b336af869 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:37:25 +0100
Subject: [PATCH 01/11] New package: ayatana-ido-0.9.2
---
common/shlibs | 2 ++
srcpkgs/ayatana-ido-devel | 1 +
srcpkgs/ayatana-ido/template | 27 +++++++++++++++++++++++++++
3 files changed, 30 insertions(+)
create mode 120000 srcpkgs/ayatana-ido-devel
create mode 100644 srcpkgs/ayatana-ido/template
diff --git a/common/shlibs b/common/shlibs
index 74ae97843d38..09e54121c33e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4206,3 +4206,5 @@ libtraceevent.so.1 libtraceevent-1.6.2_1
libtracefs.so.1 libtracefs-1.4.2_1
libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
+libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1
+libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
diff --git a/srcpkgs/ayatana-ido-devel b/srcpkgs/ayatana-ido-devel
new file mode 120000
index 000000000000..2e1aa73a149c
--- /dev/null
+++ b/srcpkgs/ayatana-ido-devel
@@ -0,0 +1 @@
+ayatana-ido
\ No newline at end of file
diff --git a/srcpkgs/ayatana-ido/template b/srcpkgs/ayatana-ido/template
new file mode 100644
index 000000000000..717ad5808405
--- /dev/null
+++ b/srcpkgs/ayatana-ido/template
@@ -0,0 +1,27 @@
+# Template file for 'ayatana-ido'
+pkgname=ayatana-ido
+version=0.9.2
+revision=1
+build_helper="gir"
+build_style=cmake
+hostmakedepends="pkg-config gobject-introspection vala"
+makedepends="gtk+3-devel glib-devel"
+short_desc="Ayatana Indicator Display Objects"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+changelog="https://github.com/AyatanaIndicators/ayatana-ido/raw/main/ChangeLog"
+distfiles="https://github.com/AyatanaIndicators/ayatana-ido/archive/${version}.tar.gz"
+checksum=b166e7a160458e4a71f6086d2e4e97e18cf1ac584231a4b9f1f338914203884c
+
+ayatana-ido-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
+ }
+}
From 0944f2316e7d4065f948088021c38c648326cd09 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:38:40 +0100
Subject: [PATCH 02/11] New package: libayatana-indicator-0.9.3
---
common/shlibs | 2 ++
srcpkgs/libayatana-indicator-devel | 1 +
srcpkgs/libayatana-indicator/template | 24 ++++++++++++++++++++++++
3 files changed, 27 insertions(+)
create mode 120000 srcpkgs/libayatana-indicator-devel
create mode 100644 srcpkgs/libayatana-indicator/template
diff --git a/common/shlibs b/common/shlibs
index 09e54121c33e..6a08ac1572f2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4208,3 +4208,5 @@ libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
+libayatana-ido3-0.4.so.0 ayatana-ido-0.9.1_1
+libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
diff --git a/srcpkgs/libayatana-indicator-devel b/srcpkgs/libayatana-indicator-devel
new file mode 120000
index 000000000000..fdfe7dbb5d64
--- /dev/null
+++ b/srcpkgs/libayatana-indicator-devel
@@ -0,0 +1 @@
+libayatana-indicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-indicator/template b/srcpkgs/libayatana-indicator/template
new file mode 100644
index 000000000000..a780816306c1
--- /dev/null
+++ b/srcpkgs/libayatana-indicator/template
@@ -0,0 +1,24 @@
+# Template file for 'libayatana-indicator'
+pkgname=libayatana-indicator
+version=0.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config python3"
+makedepends="glib-devel gtk+3-devel ayatana-ido-devel"
+short_desc="Ayatana Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="GPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+changelog="https://github.com/AyatanaIndicators/libayatana-indicator/raw/main/ChangeLog"
+distfiles="https://github.com/AyatanaIndicators/libayatana-indicator/archive/${version}.tar.gz"
+checksum=09c5456fcb430b6ee0626fafdf99a32eb8746b267d56ab2bd4c8a8dd6ca731da
+
+libayatana-indicator-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From 842ff4cd62928e406a1e1a7aa2e44e9f8f023b7b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:44:14 +0100
Subject: [PATCH 03/11] New package: libayatana-appindicator-0.5.91
---
common/shlibs | 2 ++
srcpkgs/libayatana-appindicator-devel | 1 +
srcpkgs/libayatana-appindicator/template | 32 ++++++++++++++++++++++++
3 files changed, 35 insertions(+)
create mode 120000 srcpkgs/libayatana-appindicator-devel
create mode 100644 srcpkgs/libayatana-appindicator/template
diff --git a/common/shlibs b/common/shlibs
index 6a08ac1572f2..39f32e5cfb8c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4210,3 +4210,5 @@ libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.1_1
libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
+libayatana-indicator3.so.7 libayatana-indicator-0.9.1_1
+libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
diff --git a/srcpkgs/libayatana-appindicator-devel b/srcpkgs/libayatana-appindicator-devel
new file mode 120000
index 000000000000..a2ff93abbc17
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator-devel
@@ -0,0 +1 @@
+libayatana-appindicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-appindicator/template b/srcpkgs/libayatana-appindicator/template
new file mode 100644
index 000000000000..01b0a341d20a
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator/template
@@ -0,0 +1,32 @@
+# Template file for 'libayatana-appindicator'
+pkgname=libayatana-appindicator
+version=0.5.91
+revision=1
+build_helper="gir"
+build_style=cmake
+configure_args="-DENABLE_BINDINGS_MONO=OFF -DENABLE_BINDINGS_VALA=$(vopt_if vala ON OFF)"
+hostmakedepends="pkg-config gobject-introspection $(vopt_if vala vala)"
+makedepends="glib-devel gtk+3-devel libdbusmenu-gtk3-devel libayatana-indicator-devel"
+short_desc="Ayatana Application Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+distfiles="https://github.com/AyatanaIndicators/libayatana-appindicator/archive/${version}.tar.gz"
+checksum=52eb5d0c0de07177833e50fbaee592dcb3939e96c6b789921e2a8caf40a1ed26
+
+build_options="vala"
+build_options_default="vala"
+
+libayatana-appindicator-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ if [ "$build_option_vala" ]; then
+ vmove usr/share/vala
+ fi
+ }
+}
From a7ed75de5c8cefc469f2efc1a6f0672d85d80c85 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:17:56 +0100
Subject: [PATCH 04/11] droidcam: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 26 +++++++++++++++++++
srcpkgs/droidcam/template | 10 ++++---
2 files changed, 33 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..32ab45377152
--- /dev/null
+++ b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,26 @@
+diff --git a/Makefile b/Makefile
+index 7be3c15..b7f16c4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -13,7 +13,7 @@ JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
+ CC = gcc
+ CFLAGS = -Wall -O2
+ GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
+-GTK += `pkg-config --cflags --libs appindicator3-0.1`
++GTK += `pkg-config --cflags --libs ayatana-appindicator3-0.1`
+ LIBAV = `pkg-config --libs --cflags libswscale libavutil`
+ LIBS = -lspeex -lasound -lpthread -lm
+ JPEG = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a
+diff --git a/src/droidcam.c b/src/droidcam.c
+index cad1ee4..28f4000 100644
+--- a/src/droidcam.c
++++ b/src/droidcam.c
+@@ -7,7 +7,7 @@
+ */
+
+ #include <gtk/gtk.h>
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+ #include <X11/Xlib.h>
+ #include <stdint.h>
+
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1207bdec5cea..97a2c10cb094 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,12 +1,14 @@
# Template file for 'droidcam'
pkgname=droidcam
version=1.8.2
-revision=1
+revision=2
build_style=gnu-makefile
-make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg"
+make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg
+ APPINDICATOR=ayatana-appindicator3-0.1"
hostmakedepends="pkg-config"
makedepends="pkg-config libjpeg-turbo-devel ffmpeg-devel alsa-lib-devel
- speex-devel libusbmuxd-devel libplist-devel gtk+3-devel libappindicator-devel"
+ speex-devel libusbmuxd-devel libplist-devel gtk+3-devel
+ libayatana-appindicator-devel"
depends="v4l2loopback"
short_desc="Tool for using your android device as a wireless/usb webcam"
maintainer="ibrokemypie <ibrokemypie@bastardi.net>"
@@ -15,6 +17,8 @@ homepage="https://www.dev47apps.com/"
distfiles="https://github.com/dev47apps/droidcam/archive/v${version}.tar.gz"
checksum=9f18c6768572571c59bfe08ac70e24612e08fc3d887c127ff47899252d3dc662
+CFLAGS="-DUSE_AYATANA_APPINDICATOR"
+
post_patch() {
vsed -e "s/^Icon=.*/Icon=droidcam-icon.png/" -e "s,/local,," -i droidcam.desktop
}
From f86466ff491c6dfaf04df055b3e12c693ef9294d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:35 +0100
Subject: [PATCH 05/11] gromit-mpx: replace libappindicator with
libayatana-appindicator
---
srcpkgs/gromit-mpx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gromit-mpx/template b/srcpkgs/gromit-mpx/template
index 3330ccfeba2b..82d1068872d7 100644
--- a/srcpkgs/gromit-mpx/template
+++ b/srcpkgs/gromit-mpx/template
@@ -1,10 +1,10 @@
# Template file for 'gromit-mpx'
pkgname=gromit-mpx
version=1.4.2
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="gtk+3-devel libappindicator-devel libdbusmenu-glib-devel"
+makedepends="gtk+3-devel libayatana-appindicator-devel libdbusmenu-glib-devel"
short_desc="Multi-pointer annotation tool"
maintainer="Toyam Cox <Vaelatern@gmail.com>"
license="GPL-2.0-only"
From 15ef98b0ddfc074aa3a098e060503c9ea6b46e76 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:49 +0100
Subject: [PATCH 06/11] network-manager-applet: replace libappindicator with
libayatana-appindicator
---
srcpkgs/network-manager-applet/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 7bbc7a671da5..ee5e63b467ed 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,12 +1,12 @@
# Template file for 'network-manager-applet'
pkgname=network-manager-applet
version=1.30.0
-revision=1
+revision=2
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
- libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libayatana-appindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
libgudev-devel libnotify-devel libnma-devel libsecret-devel
polkit-devel mobile-broadband-provider-info"
depends="NetworkManager hicolor-icon-theme iso-codes"
From 7d55eedc4f9d2d19c1506fb6f65f17111ebea4aa Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:53 +0100
Subject: [PATCH 07/11] psensor: replace libappindicator with
libayatana-appindicator
---
.../0001-Use-ayatana-appindicator.patch | 53 +++++++++++++++++++
srcpkgs/psensor/template | 6 +--
2 files changed, 56 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/psensor/patches/0001-Use-ayatana-appindicator.patch
diff --git a/srcpkgs/psensor/patches/0001-Use-ayatana-appindicator.patch b/srcpkgs/psensor/patches/0001-Use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..f8350ca6f77f
--- /dev/null
+++ b/srcpkgs/psensor/patches/0001-Use-ayatana-appindicator.patch
@@ -0,0 +1,53 @@
+From d84498639263d6a8f8d4b4adddf3dab66631876b Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 22 Jan 2022 00:15:13 +0100
+Subject: [PATCH] Use ayatana appindicator
+
+---
+ configure.ac | 2 +-
+ src/ui.h | 2 +-
+ src/ui_appindicator.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 48b10eb..2ff857d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -117,7 +117,7 @@ AC_SUBST(LIBNOTIFY_LIBS)
+
+ # Checks AppIndicator
+ APPINDICATOR_LIBS=
+-PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1,
++PKG_CHECK_MODULES(APPINDICATOR, ayatana-appindicator3-0.1,
+ [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator3-0.1])],
+ [AC_MSG_WARN(AppIndicator 3-0.1 not present")])
+ AM_CONDITIONAL(APPINDICATOR, test -n "$APPINDICATOR_LIBS")
+diff --git a/src/ui.h b/src/ui.h
+index 426f29c..43ae4be 100644
+--- a/src/ui.h
++++ b/src/ui.h
+@@ -27,7 +27,7 @@
+ #include <gtk/gtk.h>
+
+ #if defined(HAVE_APPINDICATOR)
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+ #endif
+
+ #include "psensor.h"
+diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
+index ed4cc64..b3179c0 100644
+--- a/src/ui_appindicator.c
++++ b/src/ui_appindicator.c
+@@ -21,7 +21,7 @@
+ #include <string.h>
+
+ #include <gtk/gtk.h>
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+
+ #include <cfg.h>
+ #include <psensor.h>
+--
+2.34.1
+
diff --git a/srcpkgs/psensor/template b/srcpkgs/psensor/template
index d21a33c4c695..752e9fe04e7c 100644
--- a/srcpkgs/psensor/template
+++ b/srcpkgs/psensor/template
@@ -1,12 +1,12 @@
# Template file for 'psensor'
pkgname=psensor
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
-hostmakedepends="pkg-config glib-devel"
+hostmakedepends="pkg-config glib-devel automake"
makedepends="gtk+3-devel udisks2-devel libgtop-devel json-c-devel
libsensors-devel libatasmart-devel libcurl-devel libnotify-devel
- libappindicator-devel libmicrohttpd-devel"
+ libayatana-appindicator-devel libmicrohttpd-devel"
depends="lm_sensors"
short_desc="Graphical hardware temperature monitor for Linux"
maintainer="Foxlet <foxlet@furcode.co>"
From 087fb51377096f08e3ded5792371ceef14d0b26f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:58 +0100
Subject: [PATCH 08/11] remmina: replace libappindicator with
libayatana-appindicator
---
srcpkgs/remmina/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 0da8cad6604b..9bf538220fef 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
# Template file for 'remmina'
pkgname=remmina
version=1.4.27
-revision=3
+revision=4
build_style=cmake
configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"
hostmakedepends="glib-devel intltool pkg-config shared-mime-info"
@@ -11,7 +11,7 @@ makedepends="avahi-glib-libs-devel avahi-ui-libs-devel freerdp-devel
libsecret-devel libsodium-devel libsoup3-devel libssh-devel libva-devel
libvncserver-devel libxkbfile-devel opus-devel phodav-devel
spice-gtk-devel spice-protocol telepathy-glib-devel usbredir-devel
- vte3-devel libappindicator-devel libwebkit2gtk41-devel python3-devel"
+ vte3-devel libayatana-appindicator-devel libwebkit2gtk41-devel python3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Remote desktop client written in GTK+"
maintainer="Frank Steinborn <steinex@nognu.de>"
From 5ad7493fe1ea32db06b76834212c812d443783fe Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 25 Nov 2022 20:03:58 +0100
Subject: [PATCH 09/11] ulauncher: replace libappindicator with
libayatana-appindicator
---
srcpkgs/ulauncher/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ulauncher/template b/srcpkgs/ulauncher/template
index 0eb497d16e1c..d592930f6d24 100644
--- a/srcpkgs/ulauncher/template
+++ b/srcpkgs/ulauncher/template
@@ -1,12 +1,12 @@
# Template file for 'ulauncher'
pkgname=ulauncher
version=5.14.3
-revision=2
+revision=3
build_style=python3-module
hostmakedepends="python3-distutils-extra intltool python3-Levenshtein
python3-dbus python3-gobject python3-inotify python3-websocket-client
python3-xdg"
-depends="libappindicator>=12.10.0_2 libkeybinder3 python3-Levenshtein python3-dbus
+depends="libayatana-appindicator libkeybinder3 python3-Levenshtein python3-dbus
python3-gobject python3-inotify python3-websocket-client python3-xdg webkit2gtk"
short_desc="Linux application launcher with fuzzy search and extensions"
maintainer="Alberto Pau <me@albertopau.com>"
From c2fb5c965a3aacbf028c39d5eb711adccbfaa5ca Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 25 Nov 2022 22:26:55 +0100
Subject: [PATCH 10/11] gwe: replace libappindicator with
libayatana-appindicator
---
.../gwe/patches/use-ayatana-appindicator.patch | 15 +++++++++++++++
srcpkgs/gwe/template | 4 ++--
2 files changed, 17 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gwe/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/gwe/patches/use-ayatana-appindicator.patch b/srcpkgs/gwe/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..05029c1c7755
--- /dev/null
+++ b/srcpkgs/gwe/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,15 @@
+diff --git a/gwe/view/main_view.py b/gwe/view/main_view.py
+index 61c891d..6f573c2 100644
+--- a/gwe/view/main_view.py
++++ b/gwe/view/main_view.py
+@@ -31,8 +31,8 @@ from gwe.model.fan_profile import FanProfile
+ try: # AppIndicator3 may not be installed
+ import gi
+
+- gi.require_version('AppIndicator3', '0.1')
+- from gi.repository import AppIndicator3
++ gi.require_version('AyatanaAppIndicator3', '0.1')
++ from gi.repository import AyatanaAppIndicator3 as AppIndicator3
+ except (ImportError, ValueError):
+ AppIndicator3 = None
+ from gwe.di import MainBuilder
diff --git a/srcpkgs/gwe/template b/srcpkgs/gwe/template
index f4473200cd67..ce70ed78573c 100644
--- a/srcpkgs/gwe/template
+++ b/srcpkgs/gwe/template
@@ -1,14 +1,14 @@
# Template file for 'gwe'
pkgname=gwe
version=0.15.2
-revision=3
+revision=4
build_style=meson
hostmakedepends="pkg-config meson ninja glib-devel gtk+3-devel python3 python3-devel
python3-matplotlib python3-peewee python3-gobject python3-xlib python3-xdg
python3-requests python3-rx python3-nvml python3-injector python3-urllib3 python3-six
python3-chardet python3-idna python3-xlib python3-numpy python3-parsing python3-cycler python3-dateutil python3-Pillow"
makedepends="gobject-introspection appstream-glib"
-depends="python3 gobject-introspection libappindicator libdazzle python3-matplotlib
+depends="python3 gobject-introspection libayatana-appindicator libdazzle python3-matplotlib
python3-peewee python3-gobject python3-xlib python3-xdg python3-requests python3-rx
python3-nvml python3-injector python3-urllib3 python3-six python3-chardet python3-idna
python3-xlib python3-numpy python3-parsing python3-cycler python3-dateutil python3-Pillow"
From fce799050ce70d79c442cf441fb3efa9de25a374 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Nov 2022 11:22:47 +0100
Subject: [PATCH 11/11] caffeine-ng: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 16 ++++++++++++++++
srcpkgs/caffeine-ng/template | 4 ++--
2 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch b/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..925dad3e0410
--- /dev/null
+++ b/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,16 @@
+diff --git a/caffeine/main.py b/caffeine/main.py
+index 516a138..f48653b 100644
+--- a/caffeine/main.py
++++ b/caffeine/main.py
+@@ -32,9 +32,9 @@ try:
+ gi.require_version("Notify", "0.7")
+ except ValueError:
+ gi.require_version("Notify", "0.8")
+-gi.require_version("AppIndicator3", "0.1")
++gi.require_version("AyatanaAppIndicator3", "0.1")
+
+-from gi.repository import AppIndicator3 # noqa: E402
++from gi.repository import AyatanaAppIndicator3 as AppIndicator3 # noqa: E402
+ from gi.repository import GdkPixbuf # noqa: E402
+ from gi.repository import Gtk # noqa: E402
+ from gi.repository.Notify import Notification # noqa: E402
diff --git a/srcpkgs/caffeine-ng/template b/srcpkgs/caffeine-ng/template
index 4f1b6774cdd2..3289bf5bad43 100644
--- a/srcpkgs/caffeine-ng/template
+++ b/srcpkgs/caffeine-ng/template
@@ -1,13 +1,13 @@
# Template file for 'caffeine-ng'
pkgname=caffeine-ng
version=4.0.2
-revision=3
+revision=4
build_style=python3-module
hostmakedepends="python3-setuptools_scm"
depends="desktop-file-utils gtk+3 hicolor-icon-theme libnotify
python3-dbus python3-click python3-ewmh python3-gobject
python3-setproctitle python3-setuptools python3-xdg
- python3-pulsectl libappindicator"
+ python3-pulsectl libayatana-appindicator"
short_desc="Temporarily inhibits the screensaver and sleep mode"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] Ayatana indicators
2022-11-25 18:04 [PR PATCH] Ayatana indicators tibequadorian
` (2 preceding siblings ...)
2022-11-26 10:49 ` tibequadorian
@ 2022-11-26 11:01 ` tibequadorian
2022-11-26 12:17 ` tibequadorian
` (10 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: tibequadorian @ 2022-11-26 11:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2549 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ayatana-indicators
https://github.com/void-linux/void-packages/pull/40761
Ayatana indicators
<!-- Uncomment relevant sections and delete options which are not applicable -->
Continuation of #35135
`libappindicator` hasn't seen a release since 2012 (more than 10 years!)
Debian has removed it in buster and switched to [libayatana-appindicator](https://ayatanaindicators.github.io/).
This PR tries to replace `libappindicator` with `libayatana-appindicator`.
#### Testing the changes
- I tested the changes in this PR: **WIP**
#### TODO:
- [x] droidcam - [supported](https://github.com/dev47apps/droidcam/commit/71a74d22ed700650a83b7cb653bd92b0ed3cd01a) in master, patched
- [x] gromit-mpx - [supported](https://github.com/bk138/gromit-mpx/commit/2a838303154df4a90495c4f93741846cbd63d37f)
- [x] network-manager-applet - supported
- [x] psensor - not supported, patched
- [x] remmina - [supported](https://github.com/FreeRDP/Remmina/commit/a34133add92c217943acad64bb0e41de0f2f619c)
- [x] ulauncher - supported
- [x] gwe - [not supported](https://gitlab.com/leinardi/gwe/-/issues/156), patched
- [x] caffeine-ng - [supported](https://codeberg.org/WhyNotHugo/caffeine-ng/commit/d13b2b97160649b465213e691a8df2e958ecf739) in master, patched
- [x] indicator-doom-cpu - not supported, patched
- [ ] element-desktop - [not supported](https://github.com/electron/electron/issues/27527)
- [ ] safeeyes - [supported](https://github.com/slgobinath/SafeEyes/commit/c784000e694f9fa508a2535f5d23d04456b4ff86) in 2.1.4, #40763
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40761.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ayatana-indicators-40761.patch --]
[-- Type: text/x-diff, Size: 24344 bytes --]
From 817f23ccc141f5fd80d9e4ecddc7f43b336af869 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:37:25 +0100
Subject: [PATCH 01/12] New package: ayatana-ido-0.9.2
---
common/shlibs | 2 ++
srcpkgs/ayatana-ido-devel | 1 +
srcpkgs/ayatana-ido/template | 27 +++++++++++++++++++++++++++
3 files changed, 30 insertions(+)
create mode 120000 srcpkgs/ayatana-ido-devel
create mode 100644 srcpkgs/ayatana-ido/template
diff --git a/common/shlibs b/common/shlibs
index 74ae97843d38..09e54121c33e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4206,3 +4206,5 @@ libtraceevent.so.1 libtraceevent-1.6.2_1
libtracefs.so.1 libtracefs-1.4.2_1
libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
+libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1
+libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
diff --git a/srcpkgs/ayatana-ido-devel b/srcpkgs/ayatana-ido-devel
new file mode 120000
index 000000000000..2e1aa73a149c
--- /dev/null
+++ b/srcpkgs/ayatana-ido-devel
@@ -0,0 +1 @@
+ayatana-ido
\ No newline at end of file
diff --git a/srcpkgs/ayatana-ido/template b/srcpkgs/ayatana-ido/template
new file mode 100644
index 000000000000..717ad5808405
--- /dev/null
+++ b/srcpkgs/ayatana-ido/template
@@ -0,0 +1,27 @@
+# Template file for 'ayatana-ido'
+pkgname=ayatana-ido
+version=0.9.2
+revision=1
+build_helper="gir"
+build_style=cmake
+hostmakedepends="pkg-config gobject-introspection vala"
+makedepends="gtk+3-devel glib-devel"
+short_desc="Ayatana Indicator Display Objects"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+changelog="https://github.com/AyatanaIndicators/ayatana-ido/raw/main/ChangeLog"
+distfiles="https://github.com/AyatanaIndicators/ayatana-ido/archive/${version}.tar.gz"
+checksum=b166e7a160458e4a71f6086d2e4e97e18cf1ac584231a4b9f1f338914203884c
+
+ayatana-ido-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
+ }
+}
From 0944f2316e7d4065f948088021c38c648326cd09 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:38:40 +0100
Subject: [PATCH 02/12] New package: libayatana-indicator-0.9.3
---
common/shlibs | 2 ++
srcpkgs/libayatana-indicator-devel | 1 +
srcpkgs/libayatana-indicator/template | 24 ++++++++++++++++++++++++
3 files changed, 27 insertions(+)
create mode 120000 srcpkgs/libayatana-indicator-devel
create mode 100644 srcpkgs/libayatana-indicator/template
diff --git a/common/shlibs b/common/shlibs
index 09e54121c33e..6a08ac1572f2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4208,3 +4208,5 @@ libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
+libayatana-ido3-0.4.so.0 ayatana-ido-0.9.1_1
+libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
diff --git a/srcpkgs/libayatana-indicator-devel b/srcpkgs/libayatana-indicator-devel
new file mode 120000
index 000000000000..fdfe7dbb5d64
--- /dev/null
+++ b/srcpkgs/libayatana-indicator-devel
@@ -0,0 +1 @@
+libayatana-indicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-indicator/template b/srcpkgs/libayatana-indicator/template
new file mode 100644
index 000000000000..a780816306c1
--- /dev/null
+++ b/srcpkgs/libayatana-indicator/template
@@ -0,0 +1,24 @@
+# Template file for 'libayatana-indicator'
+pkgname=libayatana-indicator
+version=0.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config python3"
+makedepends="glib-devel gtk+3-devel ayatana-ido-devel"
+short_desc="Ayatana Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="GPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+changelog="https://github.com/AyatanaIndicators/libayatana-indicator/raw/main/ChangeLog"
+distfiles="https://github.com/AyatanaIndicators/libayatana-indicator/archive/${version}.tar.gz"
+checksum=09c5456fcb430b6ee0626fafdf99a32eb8746b267d56ab2bd4c8a8dd6ca731da
+
+libayatana-indicator-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From 842ff4cd62928e406a1e1a7aa2e44e9f8f023b7b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:44:14 +0100
Subject: [PATCH 03/12] New package: libayatana-appindicator-0.5.91
---
common/shlibs | 2 ++
srcpkgs/libayatana-appindicator-devel | 1 +
srcpkgs/libayatana-appindicator/template | 32 ++++++++++++++++++++++++
3 files changed, 35 insertions(+)
create mode 120000 srcpkgs/libayatana-appindicator-devel
create mode 100644 srcpkgs/libayatana-appindicator/template
diff --git a/common/shlibs b/common/shlibs
index 6a08ac1572f2..39f32e5cfb8c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4210,3 +4210,5 @@ libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.1_1
libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
+libayatana-indicator3.so.7 libayatana-indicator-0.9.1_1
+libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
diff --git a/srcpkgs/libayatana-appindicator-devel b/srcpkgs/libayatana-appindicator-devel
new file mode 120000
index 000000000000..a2ff93abbc17
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator-devel
@@ -0,0 +1 @@
+libayatana-appindicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-appindicator/template b/srcpkgs/libayatana-appindicator/template
new file mode 100644
index 000000000000..01b0a341d20a
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator/template
@@ -0,0 +1,32 @@
+# Template file for 'libayatana-appindicator'
+pkgname=libayatana-appindicator
+version=0.5.91
+revision=1
+build_helper="gir"
+build_style=cmake
+configure_args="-DENABLE_BINDINGS_MONO=OFF -DENABLE_BINDINGS_VALA=$(vopt_if vala ON OFF)"
+hostmakedepends="pkg-config gobject-introspection $(vopt_if vala vala)"
+makedepends="glib-devel gtk+3-devel libdbusmenu-gtk3-devel libayatana-indicator-devel"
+short_desc="Ayatana Application Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+distfiles="https://github.com/AyatanaIndicators/libayatana-appindicator/archive/${version}.tar.gz"
+checksum=52eb5d0c0de07177833e50fbaee592dcb3939e96c6b789921e2a8caf40a1ed26
+
+build_options="vala"
+build_options_default="vala"
+
+libayatana-appindicator-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ if [ "$build_option_vala" ]; then
+ vmove usr/share/vala
+ fi
+ }
+}
From a7ed75de5c8cefc469f2efc1a6f0672d85d80c85 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:17:56 +0100
Subject: [PATCH 04/12] droidcam: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 26 +++++++++++++++++++
srcpkgs/droidcam/template | 10 ++++---
2 files changed, 33 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..32ab45377152
--- /dev/null
+++ b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,26 @@
+diff --git a/Makefile b/Makefile
+index 7be3c15..b7f16c4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -13,7 +13,7 @@ JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
+ CC = gcc
+ CFLAGS = -Wall -O2
+ GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
+-GTK += `pkg-config --cflags --libs appindicator3-0.1`
++GTK += `pkg-config --cflags --libs ayatana-appindicator3-0.1`
+ LIBAV = `pkg-config --libs --cflags libswscale libavutil`
+ LIBS = -lspeex -lasound -lpthread -lm
+ JPEG = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a
+diff --git a/src/droidcam.c b/src/droidcam.c
+index cad1ee4..28f4000 100644
+--- a/src/droidcam.c
++++ b/src/droidcam.c
+@@ -7,7 +7,7 @@
+ */
+
+ #include <gtk/gtk.h>
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+ #include <X11/Xlib.h>
+ #include <stdint.h>
+
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1207bdec5cea..97a2c10cb094 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,12 +1,14 @@
# Template file for 'droidcam'
pkgname=droidcam
version=1.8.2
-revision=1
+revision=2
build_style=gnu-makefile
-make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg"
+make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg
+ APPINDICATOR=ayatana-appindicator3-0.1"
hostmakedepends="pkg-config"
makedepends="pkg-config libjpeg-turbo-devel ffmpeg-devel alsa-lib-devel
- speex-devel libusbmuxd-devel libplist-devel gtk+3-devel libappindicator-devel"
+ speex-devel libusbmuxd-devel libplist-devel gtk+3-devel
+ libayatana-appindicator-devel"
depends="v4l2loopback"
short_desc="Tool for using your android device as a wireless/usb webcam"
maintainer="ibrokemypie <ibrokemypie@bastardi.net>"
@@ -15,6 +17,8 @@ homepage="https://www.dev47apps.com/"
distfiles="https://github.com/dev47apps/droidcam/archive/v${version}.tar.gz"
checksum=9f18c6768572571c59bfe08ac70e24612e08fc3d887c127ff47899252d3dc662
+CFLAGS="-DUSE_AYATANA_APPINDICATOR"
+
post_patch() {
vsed -e "s/^Icon=.*/Icon=droidcam-icon.png/" -e "s,/local,," -i droidcam.desktop
}
From f86466ff491c6dfaf04df055b3e12c693ef9294d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:35 +0100
Subject: [PATCH 05/12] gromit-mpx: replace libappindicator with
libayatana-appindicator
---
srcpkgs/gromit-mpx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gromit-mpx/template b/srcpkgs/gromit-mpx/template
index 3330ccfeba2b..82d1068872d7 100644
--- a/srcpkgs/gromit-mpx/template
+++ b/srcpkgs/gromit-mpx/template
@@ -1,10 +1,10 @@
# Template file for 'gromit-mpx'
pkgname=gromit-mpx
version=1.4.2
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="gtk+3-devel libappindicator-devel libdbusmenu-glib-devel"
+makedepends="gtk+3-devel libayatana-appindicator-devel libdbusmenu-glib-devel"
short_desc="Multi-pointer annotation tool"
maintainer="Toyam Cox <Vaelatern@gmail.com>"
license="GPL-2.0-only"
From 15ef98b0ddfc074aa3a098e060503c9ea6b46e76 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:49 +0100
Subject: [PATCH 06/12] network-manager-applet: replace libappindicator with
libayatana-appindicator
---
srcpkgs/network-manager-applet/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 7bbc7a671da5..ee5e63b467ed 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,12 +1,12 @@
# Template file for 'network-manager-applet'
pkgname=network-manager-applet
version=1.30.0
-revision=1
+revision=2
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
- libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libayatana-appindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
libgudev-devel libnotify-devel libnma-devel libsecret-devel
polkit-devel mobile-broadband-provider-info"
depends="NetworkManager hicolor-icon-theme iso-codes"
From 6e73075ebfda5a2726a8b7b1e98e82518692665e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:53 +0100
Subject: [PATCH 07/12] psensor: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 53 +++++++++++++++++++
srcpkgs/psensor/template | 6 +--
2 files changed, 56 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/psensor/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/psensor/patches/use-ayatana-appindicator.patch b/srcpkgs/psensor/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..f8350ca6f77f
--- /dev/null
+++ b/srcpkgs/psensor/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,53 @@
+From d84498639263d6a8f8d4b4adddf3dab66631876b Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 22 Jan 2022 00:15:13 +0100
+Subject: [PATCH] Use ayatana appindicator
+
+---
+ configure.ac | 2 +-
+ src/ui.h | 2 +-
+ src/ui_appindicator.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 48b10eb..2ff857d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -117,7 +117,7 @@ AC_SUBST(LIBNOTIFY_LIBS)
+
+ # Checks AppIndicator
+ APPINDICATOR_LIBS=
+-PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1,
++PKG_CHECK_MODULES(APPINDICATOR, ayatana-appindicator3-0.1,
+ [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator3-0.1])],
+ [AC_MSG_WARN(AppIndicator 3-0.1 not present")])
+ AM_CONDITIONAL(APPINDICATOR, test -n "$APPINDICATOR_LIBS")
+diff --git a/src/ui.h b/src/ui.h
+index 426f29c..43ae4be 100644
+--- a/src/ui.h
++++ b/src/ui.h
+@@ -27,7 +27,7 @@
+ #include <gtk/gtk.h>
+
+ #if defined(HAVE_APPINDICATOR)
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+ #endif
+
+ #include "psensor.h"
+diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
+index ed4cc64..b3179c0 100644
+--- a/src/ui_appindicator.c
++++ b/src/ui_appindicator.c
+@@ -21,7 +21,7 @@
+ #include <string.h>
+
+ #include <gtk/gtk.h>
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+
+ #include <cfg.h>
+ #include <psensor.h>
+--
+2.34.1
+
diff --git a/srcpkgs/psensor/template b/srcpkgs/psensor/template
index d21a33c4c695..752e9fe04e7c 100644
--- a/srcpkgs/psensor/template
+++ b/srcpkgs/psensor/template
@@ -1,12 +1,12 @@
# Template file for 'psensor'
pkgname=psensor
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
-hostmakedepends="pkg-config glib-devel"
+hostmakedepends="pkg-config glib-devel automake"
makedepends="gtk+3-devel udisks2-devel libgtop-devel json-c-devel
libsensors-devel libatasmart-devel libcurl-devel libnotify-devel
- libappindicator-devel libmicrohttpd-devel"
+ libayatana-appindicator-devel libmicrohttpd-devel"
depends="lm_sensors"
short_desc="Graphical hardware temperature monitor for Linux"
maintainer="Foxlet <foxlet@furcode.co>"
From f6b59d7576701f577b4f7795119e9c67dc36ee5a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:58 +0100
Subject: [PATCH 08/12] remmina: replace libappindicator with
libayatana-appindicator
---
srcpkgs/remmina/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 0da8cad6604b..9bf538220fef 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
# Template file for 'remmina'
pkgname=remmina
version=1.4.27
-revision=3
+revision=4
build_style=cmake
configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"
hostmakedepends="glib-devel intltool pkg-config shared-mime-info"
@@ -11,7 +11,7 @@ makedepends="avahi-glib-libs-devel avahi-ui-libs-devel freerdp-devel
libsecret-devel libsodium-devel libsoup3-devel libssh-devel libva-devel
libvncserver-devel libxkbfile-devel opus-devel phodav-devel
spice-gtk-devel spice-protocol telepathy-glib-devel usbredir-devel
- vte3-devel libappindicator-devel libwebkit2gtk41-devel python3-devel"
+ vte3-devel libayatana-appindicator-devel libwebkit2gtk41-devel python3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Remote desktop client written in GTK+"
maintainer="Frank Steinborn <steinex@nognu.de>"
From a9a47ff775213cc330980db5f8acfbc8cccc74ba Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 25 Nov 2022 20:03:58 +0100
Subject: [PATCH 09/12] ulauncher: replace libappindicator with
libayatana-appindicator
---
srcpkgs/ulauncher/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ulauncher/template b/srcpkgs/ulauncher/template
index 0eb497d16e1c..d592930f6d24 100644
--- a/srcpkgs/ulauncher/template
+++ b/srcpkgs/ulauncher/template
@@ -1,12 +1,12 @@
# Template file for 'ulauncher'
pkgname=ulauncher
version=5.14.3
-revision=2
+revision=3
build_style=python3-module
hostmakedepends="python3-distutils-extra intltool python3-Levenshtein
python3-dbus python3-gobject python3-inotify python3-websocket-client
python3-xdg"
-depends="libappindicator>=12.10.0_2 libkeybinder3 python3-Levenshtein python3-dbus
+depends="libayatana-appindicator libkeybinder3 python3-Levenshtein python3-dbus
python3-gobject python3-inotify python3-websocket-client python3-xdg webkit2gtk"
short_desc="Linux application launcher with fuzzy search and extensions"
maintainer="Alberto Pau <me@albertopau.com>"
From 6ddf4b9acf6717dff63b34ac38f1e2246fedd446 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 25 Nov 2022 22:26:55 +0100
Subject: [PATCH 10/12] gwe: replace libappindicator with
libayatana-appindicator
---
.../gwe/patches/use-ayatana-appindicator.patch | 15 +++++++++++++++
srcpkgs/gwe/template | 4 ++--
2 files changed, 17 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gwe/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/gwe/patches/use-ayatana-appindicator.patch b/srcpkgs/gwe/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..05029c1c7755
--- /dev/null
+++ b/srcpkgs/gwe/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,15 @@
+diff --git a/gwe/view/main_view.py b/gwe/view/main_view.py
+index 61c891d..6f573c2 100644
+--- a/gwe/view/main_view.py
++++ b/gwe/view/main_view.py
+@@ -31,8 +31,8 @@ from gwe.model.fan_profile import FanProfile
+ try: # AppIndicator3 may not be installed
+ import gi
+
+- gi.require_version('AppIndicator3', '0.1')
+- from gi.repository import AppIndicator3
++ gi.require_version('AyatanaAppIndicator3', '0.1')
++ from gi.repository import AyatanaAppIndicator3 as AppIndicator3
+ except (ImportError, ValueError):
+ AppIndicator3 = None
+ from gwe.di import MainBuilder
diff --git a/srcpkgs/gwe/template b/srcpkgs/gwe/template
index f4473200cd67..ce70ed78573c 100644
--- a/srcpkgs/gwe/template
+++ b/srcpkgs/gwe/template
@@ -1,14 +1,14 @@
# Template file for 'gwe'
pkgname=gwe
version=0.15.2
-revision=3
+revision=4
build_style=meson
hostmakedepends="pkg-config meson ninja glib-devel gtk+3-devel python3 python3-devel
python3-matplotlib python3-peewee python3-gobject python3-xlib python3-xdg
python3-requests python3-rx python3-nvml python3-injector python3-urllib3 python3-six
python3-chardet python3-idna python3-xlib python3-numpy python3-parsing python3-cycler python3-dateutil python3-Pillow"
makedepends="gobject-introspection appstream-glib"
-depends="python3 gobject-introspection libappindicator libdazzle python3-matplotlib
+depends="python3 gobject-introspection libayatana-appindicator libdazzle python3-matplotlib
python3-peewee python3-gobject python3-xlib python3-xdg python3-requests python3-rx
python3-nvml python3-injector python3-urllib3 python3-six python3-chardet python3-idna
python3-xlib python3-numpy python3-parsing python3-cycler python3-dateutil python3-Pillow"
From 33aafe2f730198adabce8d66deba0961030bc6a3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Nov 2022 11:22:47 +0100
Subject: [PATCH 11/12] caffeine-ng: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 16 ++++++++++++++++
srcpkgs/caffeine-ng/template | 4 ++--
2 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch b/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..925dad3e0410
--- /dev/null
+++ b/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,16 @@
+diff --git a/caffeine/main.py b/caffeine/main.py
+index 516a138..f48653b 100644
+--- a/caffeine/main.py
++++ b/caffeine/main.py
+@@ -32,9 +32,9 @@ try:
+ gi.require_version("Notify", "0.7")
+ except ValueError:
+ gi.require_version("Notify", "0.8")
+-gi.require_version("AppIndicator3", "0.1")
++gi.require_version("AyatanaAppIndicator3", "0.1")
+
+-from gi.repository import AppIndicator3 # noqa: E402
++from gi.repository import AyatanaAppIndicator3 as AppIndicator3 # noqa: E402
+ from gi.repository import GdkPixbuf # noqa: E402
+ from gi.repository import Gtk # noqa: E402
+ from gi.repository.Notify import Notification # noqa: E402
diff --git a/srcpkgs/caffeine-ng/template b/srcpkgs/caffeine-ng/template
index 4f1b6774cdd2..3289bf5bad43 100644
--- a/srcpkgs/caffeine-ng/template
+++ b/srcpkgs/caffeine-ng/template
@@ -1,13 +1,13 @@
# Template file for 'caffeine-ng'
pkgname=caffeine-ng
version=4.0.2
-revision=3
+revision=4
build_style=python3-module
hostmakedepends="python3-setuptools_scm"
depends="desktop-file-utils gtk+3 hicolor-icon-theme libnotify
python3-dbus python3-click python3-ewmh python3-gobject
python3-setproctitle python3-setuptools python3-xdg
- python3-pulsectl libappindicator"
+ python3-pulsectl libayatana-appindicator"
short_desc="Temporarily inhibits the screensaver and sleep mode"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
From bffd9d15d0227237316756843b747621328cd1b5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Nov 2022 11:59:31 +0100
Subject: [PATCH 12/12] indicator-doom-cpu: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 13 +++++++++++++
srcpkgs/indicator-doom-cpu/template | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch b/srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..00a185b7d6ed
--- /dev/null
+++ b/srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,13 @@
+diff --git a/indicator-doom-cpu b/indicator-doom-cpu
+index a1528e3..c4ff4d2 100755
+--- a/indicator-doom-cpu
++++ b/indicator-doom-cpu
+@@ -27,7 +27,7 @@ import time
+ from gi.repository import Gtk, GObject, GdkPixbuf
+
+ try:
+- from gi.repository import AppIndicator3 as AppIndicator
++ from gi.repository import AyatanaAppIndicator3 as AppIndicator
+ appindicator_imported = True
+ except ImportError:
+ appindicator_imported = False
diff --git a/srcpkgs/indicator-doom-cpu/template b/srcpkgs/indicator-doom-cpu/template
index eb15aa66335a..3457df2dfebf 100644
--- a/srcpkgs/indicator-doom-cpu/template
+++ b/srcpkgs/indicator-doom-cpu/template
@@ -1,7 +1,7 @@
# Template file for 'indicator-doom-cpu'
pkgname=indicator-doom-cpu
version=1.0.1
-revision=3
+revision=4
depends="python3-gobject gtk+3 libappindicator"
short_desc="CPU load indicator showing the dying face from the video game DOOM"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] Ayatana indicators
2022-11-25 18:04 [PR PATCH] Ayatana indicators tibequadorian
` (3 preceding siblings ...)
2022-11-26 11:01 ` tibequadorian
@ 2022-11-26 12:17 ` tibequadorian
2022-11-27 17:35 ` tibequadorian
` (9 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: tibequadorian @ 2022-11-26 12:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2772 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ayatana-indicators
https://github.com/void-linux/void-packages/pull/40761
Ayatana indicators
<!-- Uncomment relevant sections and delete options which are not applicable -->
Continuation of #35135
`libappindicator` hasn't seen a release since 2012 (more than 10 years!)
Debian has removed it in buster and switched to [libayatana-appindicator](https://ayatanaindicators.github.io/).
This PR tries to replace `libappindicator` with `libayatana-appindicator`.
#### Testing the changes
- I tested the changes in this PR: **WIP**
#### TODO:
- [x] droidcam - only [supported](https://github.com/dev47apps/droidcam/commit/71a74d22ed700650a83b7cb653bd92b0ed3cd01a) in master, patched
- [x] gromit-mpx - [supported](https://github.com/bk138/gromit-mpx/commit/2a838303154df4a90495c4f93741846cbd63d37f)
- [x] network-manager-applet - supported
- [x] psensor - not supported, patched
- [x] remmina - [supported](https://github.com/FreeRDP/Remmina/commit/a34133add92c217943acad64bb0e41de0f2f619c)
- [x] ulauncher - supported
- [x] gwe - [not supported](https://gitlab.com/leinardi/gwe/-/issues/156), patched
- [x] caffeine-ng - only [supported](https://codeberg.org/WhyNotHugo/caffeine-ng/commit/d13b2b97160649b465213e691a8df2e958ecf739) in master, patched
- [x] indicator-doom-cpu - not supported, patched
- [x] element-desktop - [not supported](https://github.com/electron/electron/issues/27527) but works fine without it and uses systray instead, removed dependency,
see https://github.com/vector-im/element-desktop/pull/170
and https://github.com/signalapp/Signal-Desktop/pull/5031#issuecomment-788068627
- [ ] safeeyes - [supported](https://github.com/slgobinath/SafeEyes/commit/c784000e694f9fa508a2535f5d23d04456b4ff86) in 2.1.4, #40763
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40761.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ayatana-indicators-40761.patch --]
[-- Type: text/x-diff, Size: 24618 bytes --]
From 3fd83e79fedb7b90ba7e62fce72b5fa1e89803a4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:37:25 +0100
Subject: [PATCH 01/13] New package: ayatana-ido-0.9.2
---
common/shlibs | 1 +
srcpkgs/ayatana-ido-devel | 1 +
srcpkgs/ayatana-ido/template | 27 +++++++++++++++++++++++++++
3 files changed, 29 insertions(+)
create mode 120000 srcpkgs/ayatana-ido-devel
create mode 100644 srcpkgs/ayatana-ido/template
diff --git a/common/shlibs b/common/shlibs
index 74ae97843d38..94b34f757451 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4206,3 +4206,4 @@ libtraceevent.so.1 libtraceevent-1.6.2_1
libtracefs.so.1 libtracefs-1.4.2_1
libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
+libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
diff --git a/srcpkgs/ayatana-ido-devel b/srcpkgs/ayatana-ido-devel
new file mode 120000
index 000000000000..2e1aa73a149c
--- /dev/null
+++ b/srcpkgs/ayatana-ido-devel
@@ -0,0 +1 @@
+ayatana-ido
\ No newline at end of file
diff --git a/srcpkgs/ayatana-ido/template b/srcpkgs/ayatana-ido/template
new file mode 100644
index 000000000000..717ad5808405
--- /dev/null
+++ b/srcpkgs/ayatana-ido/template
@@ -0,0 +1,27 @@
+# Template file for 'ayatana-ido'
+pkgname=ayatana-ido
+version=0.9.2
+revision=1
+build_helper="gir"
+build_style=cmake
+hostmakedepends="pkg-config gobject-introspection vala"
+makedepends="gtk+3-devel glib-devel"
+short_desc="Ayatana Indicator Display Objects"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+changelog="https://github.com/AyatanaIndicators/ayatana-ido/raw/main/ChangeLog"
+distfiles="https://github.com/AyatanaIndicators/ayatana-ido/archive/${version}.tar.gz"
+checksum=b166e7a160458e4a71f6086d2e4e97e18cf1ac584231a4b9f1f338914203884c
+
+ayatana-ido-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
+ }
+}
From d7a815a4076126034a313e1d151b21b101fbf870 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:38:40 +0100
Subject: [PATCH 02/13] New package: libayatana-indicator-0.9.3
---
common/shlibs | 1 +
srcpkgs/libayatana-indicator-devel | 1 +
srcpkgs/libayatana-indicator/template | 24 ++++++++++++++++++++++++
3 files changed, 26 insertions(+)
create mode 120000 srcpkgs/libayatana-indicator-devel
create mode 100644 srcpkgs/libayatana-indicator/template
diff --git a/common/shlibs b/common/shlibs
index 94b34f757451..0b0f6f8edf51 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4207,3 +4207,4 @@ libtracefs.so.1 libtracefs-1.4.2_1
libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
+libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
diff --git a/srcpkgs/libayatana-indicator-devel b/srcpkgs/libayatana-indicator-devel
new file mode 120000
index 000000000000..fdfe7dbb5d64
--- /dev/null
+++ b/srcpkgs/libayatana-indicator-devel
@@ -0,0 +1 @@
+libayatana-indicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-indicator/template b/srcpkgs/libayatana-indicator/template
new file mode 100644
index 000000000000..a780816306c1
--- /dev/null
+++ b/srcpkgs/libayatana-indicator/template
@@ -0,0 +1,24 @@
+# Template file for 'libayatana-indicator'
+pkgname=libayatana-indicator
+version=0.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config python3"
+makedepends="glib-devel gtk+3-devel ayatana-ido-devel"
+short_desc="Ayatana Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="GPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+changelog="https://github.com/AyatanaIndicators/libayatana-indicator/raw/main/ChangeLog"
+distfiles="https://github.com/AyatanaIndicators/libayatana-indicator/archive/${version}.tar.gz"
+checksum=09c5456fcb430b6ee0626fafdf99a32eb8746b267d56ab2bd4c8a8dd6ca731da
+
+libayatana-indicator-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From a50b6cc42eeffe8c33ca74d3aef5770b13fd6678 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:44:14 +0100
Subject: [PATCH 03/13] New package: libayatana-appindicator-0.5.91
---
common/shlibs | 1 +
srcpkgs/libayatana-appindicator-devel | 1 +
srcpkgs/libayatana-appindicator/template | 32 ++++++++++++++++++++++++
3 files changed, 34 insertions(+)
create mode 120000 srcpkgs/libayatana-appindicator-devel
create mode 100644 srcpkgs/libayatana-appindicator/template
diff --git a/common/shlibs b/common/shlibs
index 0b0f6f8edf51..5e80cf556b64 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4208,3 +4208,4 @@ libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
+libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
diff --git a/srcpkgs/libayatana-appindicator-devel b/srcpkgs/libayatana-appindicator-devel
new file mode 120000
index 000000000000..a2ff93abbc17
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator-devel
@@ -0,0 +1 @@
+libayatana-appindicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-appindicator/template b/srcpkgs/libayatana-appindicator/template
new file mode 100644
index 000000000000..01b0a341d20a
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator/template
@@ -0,0 +1,32 @@
+# Template file for 'libayatana-appindicator'
+pkgname=libayatana-appindicator
+version=0.5.91
+revision=1
+build_helper="gir"
+build_style=cmake
+configure_args="-DENABLE_BINDINGS_MONO=OFF -DENABLE_BINDINGS_VALA=$(vopt_if vala ON OFF)"
+hostmakedepends="pkg-config gobject-introspection $(vopt_if vala vala)"
+makedepends="glib-devel gtk+3-devel libdbusmenu-gtk3-devel libayatana-indicator-devel"
+short_desc="Ayatana Application Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+distfiles="https://github.com/AyatanaIndicators/libayatana-appindicator/archive/${version}.tar.gz"
+checksum=52eb5d0c0de07177833e50fbaee592dcb3939e96c6b789921e2a8caf40a1ed26
+
+build_options="vala"
+build_options_default="vala"
+
+libayatana-appindicator-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ if [ "$build_option_vala" ]; then
+ vmove usr/share/vala
+ fi
+ }
+}
From 996d4081c7f6f4cb517db72881c0e2682c182619 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:17:56 +0100
Subject: [PATCH 04/13] droidcam: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 26 +++++++++++++++++++
srcpkgs/droidcam/template | 5 ++--
2 files changed, 29 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..32ab45377152
--- /dev/null
+++ b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,26 @@
+diff --git a/Makefile b/Makefile
+index 7be3c15..b7f16c4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -13,7 +13,7 @@ JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
+ CC = gcc
+ CFLAGS = -Wall -O2
+ GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
+-GTK += `pkg-config --cflags --libs appindicator3-0.1`
++GTK += `pkg-config --cflags --libs ayatana-appindicator3-0.1`
+ LIBAV = `pkg-config --libs --cflags libswscale libavutil`
+ LIBS = -lspeex -lasound -lpthread -lm
+ JPEG = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a
+diff --git a/src/droidcam.c b/src/droidcam.c
+index cad1ee4..28f4000 100644
+--- a/src/droidcam.c
++++ b/src/droidcam.c
+@@ -7,7 +7,7 @@
+ */
+
+ #include <gtk/gtk.h>
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+ #include <X11/Xlib.h>
+ #include <stdint.h>
+
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1207bdec5cea..1c3f1b8b1fc6 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,12 +1,13 @@
# Template file for 'droidcam'
pkgname=droidcam
version=1.8.2
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg"
hostmakedepends="pkg-config"
makedepends="pkg-config libjpeg-turbo-devel ffmpeg-devel alsa-lib-devel
- speex-devel libusbmuxd-devel libplist-devel gtk+3-devel libappindicator-devel"
+ speex-devel libusbmuxd-devel libplist-devel gtk+3-devel
+ libayatana-appindicator-devel"
depends="v4l2loopback"
short_desc="Tool for using your android device as a wireless/usb webcam"
maintainer="ibrokemypie <ibrokemypie@bastardi.net>"
From 6224addc48857beb48bd8109349b8ea990058580 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:35 +0100
Subject: [PATCH 05/13] gromit-mpx: replace libappindicator with
libayatana-appindicator
---
srcpkgs/gromit-mpx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gromit-mpx/template b/srcpkgs/gromit-mpx/template
index 3330ccfeba2b..82d1068872d7 100644
--- a/srcpkgs/gromit-mpx/template
+++ b/srcpkgs/gromit-mpx/template
@@ -1,10 +1,10 @@
# Template file for 'gromit-mpx'
pkgname=gromit-mpx
version=1.4.2
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="gtk+3-devel libappindicator-devel libdbusmenu-glib-devel"
+makedepends="gtk+3-devel libayatana-appindicator-devel libdbusmenu-glib-devel"
short_desc="Multi-pointer annotation tool"
maintainer="Toyam Cox <Vaelatern@gmail.com>"
license="GPL-2.0-only"
From d7d3856f0655f20cd2ff85fb93a3d0fb93c3a14e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:49 +0100
Subject: [PATCH 06/13] network-manager-applet: replace libappindicator with
libayatana-appindicator
---
srcpkgs/network-manager-applet/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 7bbc7a671da5..ee5e63b467ed 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,12 +1,12 @@
# Template file for 'network-manager-applet'
pkgname=network-manager-applet
version=1.30.0
-revision=1
+revision=2
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
- libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libayatana-appindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
libgudev-devel libnotify-devel libnma-devel libsecret-devel
polkit-devel mobile-broadband-provider-info"
depends="NetworkManager hicolor-icon-theme iso-codes"
From 794f129d784eb306334980a635a2331ca817b8ff Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:53 +0100
Subject: [PATCH 07/13] psensor: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 53 +++++++++++++++++++
srcpkgs/psensor/template | 6 +--
2 files changed, 56 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/psensor/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/psensor/patches/use-ayatana-appindicator.patch b/srcpkgs/psensor/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..f8350ca6f77f
--- /dev/null
+++ b/srcpkgs/psensor/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,53 @@
+From d84498639263d6a8f8d4b4adddf3dab66631876b Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 22 Jan 2022 00:15:13 +0100
+Subject: [PATCH] Use ayatana appindicator
+
+---
+ configure.ac | 2 +-
+ src/ui.h | 2 +-
+ src/ui_appindicator.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 48b10eb..2ff857d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -117,7 +117,7 @@ AC_SUBST(LIBNOTIFY_LIBS)
+
+ # Checks AppIndicator
+ APPINDICATOR_LIBS=
+-PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1,
++PKG_CHECK_MODULES(APPINDICATOR, ayatana-appindicator3-0.1,
+ [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator3-0.1])],
+ [AC_MSG_WARN(AppIndicator 3-0.1 not present")])
+ AM_CONDITIONAL(APPINDICATOR, test -n "$APPINDICATOR_LIBS")
+diff --git a/src/ui.h b/src/ui.h
+index 426f29c..43ae4be 100644
+--- a/src/ui.h
++++ b/src/ui.h
+@@ -27,7 +27,7 @@
+ #include <gtk/gtk.h>
+
+ #if defined(HAVE_APPINDICATOR)
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+ #endif
+
+ #include "psensor.h"
+diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
+index ed4cc64..b3179c0 100644
+--- a/src/ui_appindicator.c
++++ b/src/ui_appindicator.c
+@@ -21,7 +21,7 @@
+ #include <string.h>
+
+ #include <gtk/gtk.h>
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+
+ #include <cfg.h>
+ #include <psensor.h>
+--
+2.34.1
+
diff --git a/srcpkgs/psensor/template b/srcpkgs/psensor/template
index d21a33c4c695..752e9fe04e7c 100644
--- a/srcpkgs/psensor/template
+++ b/srcpkgs/psensor/template
@@ -1,12 +1,12 @@
# Template file for 'psensor'
pkgname=psensor
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
-hostmakedepends="pkg-config glib-devel"
+hostmakedepends="pkg-config glib-devel automake"
makedepends="gtk+3-devel udisks2-devel libgtop-devel json-c-devel
libsensors-devel libatasmart-devel libcurl-devel libnotify-devel
- libappindicator-devel libmicrohttpd-devel"
+ libayatana-appindicator-devel libmicrohttpd-devel"
depends="lm_sensors"
short_desc="Graphical hardware temperature monitor for Linux"
maintainer="Foxlet <foxlet@furcode.co>"
From 7962d3ee788cde69818e7e05711d35ac3addb66e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:58 +0100
Subject: [PATCH 08/13] remmina: replace libappindicator with
libayatana-appindicator
---
srcpkgs/remmina/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 0da8cad6604b..9bf538220fef 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
# Template file for 'remmina'
pkgname=remmina
version=1.4.27
-revision=3
+revision=4
build_style=cmake
configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"
hostmakedepends="glib-devel intltool pkg-config shared-mime-info"
@@ -11,7 +11,7 @@ makedepends="avahi-glib-libs-devel avahi-ui-libs-devel freerdp-devel
libsecret-devel libsodium-devel libsoup3-devel libssh-devel libva-devel
libvncserver-devel libxkbfile-devel opus-devel phodav-devel
spice-gtk-devel spice-protocol telepathy-glib-devel usbredir-devel
- vte3-devel libappindicator-devel libwebkit2gtk41-devel python3-devel"
+ vte3-devel libayatana-appindicator-devel libwebkit2gtk41-devel python3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Remote desktop client written in GTK+"
maintainer="Frank Steinborn <steinex@nognu.de>"
From 84bba0f0cde45beec406022e14286de6831f7ece Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 25 Nov 2022 20:03:58 +0100
Subject: [PATCH 09/13] ulauncher: replace libappindicator with
libayatana-appindicator
---
srcpkgs/ulauncher/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ulauncher/template b/srcpkgs/ulauncher/template
index 0eb497d16e1c..d592930f6d24 100644
--- a/srcpkgs/ulauncher/template
+++ b/srcpkgs/ulauncher/template
@@ -1,12 +1,12 @@
# Template file for 'ulauncher'
pkgname=ulauncher
version=5.14.3
-revision=2
+revision=3
build_style=python3-module
hostmakedepends="python3-distutils-extra intltool python3-Levenshtein
python3-dbus python3-gobject python3-inotify python3-websocket-client
python3-xdg"
-depends="libappindicator>=12.10.0_2 libkeybinder3 python3-Levenshtein python3-dbus
+depends="libayatana-appindicator libkeybinder3 python3-Levenshtein python3-dbus
python3-gobject python3-inotify python3-websocket-client python3-xdg webkit2gtk"
short_desc="Linux application launcher with fuzzy search and extensions"
maintainer="Alberto Pau <me@albertopau.com>"
From 5d9c3f4f44b9f6dfc0fa952e14ce8e67fa050d03 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 25 Nov 2022 22:26:55 +0100
Subject: [PATCH 10/13] gwe: replace libappindicator with
libayatana-appindicator
---
.../gwe/patches/use-ayatana-appindicator.patch | 15 +++++++++++++++
srcpkgs/gwe/template | 4 ++--
2 files changed, 17 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gwe/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/gwe/patches/use-ayatana-appindicator.patch b/srcpkgs/gwe/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..05029c1c7755
--- /dev/null
+++ b/srcpkgs/gwe/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,15 @@
+diff --git a/gwe/view/main_view.py b/gwe/view/main_view.py
+index 61c891d..6f573c2 100644
+--- a/gwe/view/main_view.py
++++ b/gwe/view/main_view.py
+@@ -31,8 +31,8 @@ from gwe.model.fan_profile import FanProfile
+ try: # AppIndicator3 may not be installed
+ import gi
+
+- gi.require_version('AppIndicator3', '0.1')
+- from gi.repository import AppIndicator3
++ gi.require_version('AyatanaAppIndicator3', '0.1')
++ from gi.repository import AyatanaAppIndicator3 as AppIndicator3
+ except (ImportError, ValueError):
+ AppIndicator3 = None
+ from gwe.di import MainBuilder
diff --git a/srcpkgs/gwe/template b/srcpkgs/gwe/template
index f4473200cd67..ce70ed78573c 100644
--- a/srcpkgs/gwe/template
+++ b/srcpkgs/gwe/template
@@ -1,14 +1,14 @@
# Template file for 'gwe'
pkgname=gwe
version=0.15.2
-revision=3
+revision=4
build_style=meson
hostmakedepends="pkg-config meson ninja glib-devel gtk+3-devel python3 python3-devel
python3-matplotlib python3-peewee python3-gobject python3-xlib python3-xdg
python3-requests python3-rx python3-nvml python3-injector python3-urllib3 python3-six
python3-chardet python3-idna python3-xlib python3-numpy python3-parsing python3-cycler python3-dateutil python3-Pillow"
makedepends="gobject-introspection appstream-glib"
-depends="python3 gobject-introspection libappindicator libdazzle python3-matplotlib
+depends="python3 gobject-introspection libayatana-appindicator libdazzle python3-matplotlib
python3-peewee python3-gobject python3-xlib python3-xdg python3-requests python3-rx
python3-nvml python3-injector python3-urllib3 python3-six python3-chardet python3-idna
python3-xlib python3-numpy python3-parsing python3-cycler python3-dateutil python3-Pillow"
From 9855282c454dc4eedf4768e9ca0ae31311d583b4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Nov 2022 11:22:47 +0100
Subject: [PATCH 11/13] caffeine-ng: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 16 ++++++++++++++++
srcpkgs/caffeine-ng/template | 4 ++--
2 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch b/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..925dad3e0410
--- /dev/null
+++ b/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,16 @@
+diff --git a/caffeine/main.py b/caffeine/main.py
+index 516a138..f48653b 100644
+--- a/caffeine/main.py
++++ b/caffeine/main.py
+@@ -32,9 +32,9 @@ try:
+ gi.require_version("Notify", "0.7")
+ except ValueError:
+ gi.require_version("Notify", "0.8")
+-gi.require_version("AppIndicator3", "0.1")
++gi.require_version("AyatanaAppIndicator3", "0.1")
+
+-from gi.repository import AppIndicator3 # noqa: E402
++from gi.repository import AyatanaAppIndicator3 as AppIndicator3 # noqa: E402
+ from gi.repository import GdkPixbuf # noqa: E402
+ from gi.repository import Gtk # noqa: E402
+ from gi.repository.Notify import Notification # noqa: E402
diff --git a/srcpkgs/caffeine-ng/template b/srcpkgs/caffeine-ng/template
index 4f1b6774cdd2..3289bf5bad43 100644
--- a/srcpkgs/caffeine-ng/template
+++ b/srcpkgs/caffeine-ng/template
@@ -1,13 +1,13 @@
# Template file for 'caffeine-ng'
pkgname=caffeine-ng
version=4.0.2
-revision=3
+revision=4
build_style=python3-module
hostmakedepends="python3-setuptools_scm"
depends="desktop-file-utils gtk+3 hicolor-icon-theme libnotify
python3-dbus python3-click python3-ewmh python3-gobject
python3-setproctitle python3-setuptools python3-xdg
- python3-pulsectl libappindicator"
+ python3-pulsectl libayatana-appindicator"
short_desc="Temporarily inhibits the screensaver and sleep mode"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
From fb3e89177460f38da00fe558e9b3361fd32e175d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Nov 2022 11:59:31 +0100
Subject: [PATCH 12/13] indicator-doom-cpu: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 13 +++++++++++++
srcpkgs/indicator-doom-cpu/template | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch b/srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..00a185b7d6ed
--- /dev/null
+++ b/srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,13 @@
+diff --git a/indicator-doom-cpu b/indicator-doom-cpu
+index a1528e3..c4ff4d2 100755
+--- a/indicator-doom-cpu
++++ b/indicator-doom-cpu
+@@ -27,7 +27,7 @@ import time
+ from gi.repository import Gtk, GObject, GdkPixbuf
+
+ try:
+- from gi.repository import AppIndicator3 as AppIndicator
++ from gi.repository import AyatanaAppIndicator3 as AppIndicator
+ appindicator_imported = True
+ except ImportError:
+ appindicator_imported = False
diff --git a/srcpkgs/indicator-doom-cpu/template b/srcpkgs/indicator-doom-cpu/template
index eb15aa66335a..3457df2dfebf 100644
--- a/srcpkgs/indicator-doom-cpu/template
+++ b/srcpkgs/indicator-doom-cpu/template
@@ -1,7 +1,7 @@
# Template file for 'indicator-doom-cpu'
pkgname=indicator-doom-cpu
version=1.0.1
-revision=3
+revision=4
depends="python3-gobject gtk+3 libappindicator"
short_desc="CPU load indicator showing the dying face from the video game DOOM"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From 42a8e31f0e28e32a73599c3a331bf9ae0f339990 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Nov 2022 13:16:22 +0100
Subject: [PATCH 13/13] element-desktop: remove build dependency on
libappindicator-devel
---
srcpkgs/element-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 7ff0efdd6463..ed4023ebf875 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -5,7 +5,7 @@ revision=1
create_wrksrc=yes
conf_files="/etc/${pkgname}/config.json"
hostmakedepends="git yarn nodejs rust cargo python3 curl
- sqlcipher-devel libappindicator-devel libnotify-devel pkg-config
+ sqlcipher-devel libnotify-devel pkg-config
app-builder jq moreutils"
makedepends="libsecret-devel"
depends="c-ares ffmpeg gtk+3 http-parser libevent
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] Ayatana indicators
2022-11-25 18:04 [PR PATCH] Ayatana indicators tibequadorian
` (4 preceding siblings ...)
2022-11-26 12:17 ` tibequadorian
@ 2022-11-27 17:35 ` tibequadorian
2022-11-29 11:11 ` tibequadorian
` (8 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: tibequadorian @ 2022-11-27 17:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2888 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ayatana-indicators
https://github.com/void-linux/void-packages/pull/40761
Ayatana indicators
<!-- Uncomment relevant sections and delete options which are not applicable -->
Continuation of #35135
`libappindicator` hasn't seen a release since 2012 (more than 10 years!)
Debian has removed it in buster and switched to [libayatana-appindicator](https://ayatanaindicators.github.io/).
This PR tries to replace `libappindicator` with `libayatana-appindicator`.
#### Testing the changes
- I tested the changes in this PR: **WIP**
#### TODO:
- [x] `droidcam` - only [supported](https://github.com/dev47apps/droidcam/commit/71a74d22ed700650a83b7cb653bd92b0ed3cd01a) in master, patched
- [x] `gromit-mpx` - [supported](https://github.com/bk138/gromit-mpx/commit/2a838303154df4a90495c4f93741846cbd63d37f)
- [x] `network-manager-applet` - supported
- [x] `psensor` - not supported, patched
- [x] `remmina` - [supported](https://github.com/FreeRDP/Remmina/commit/a34133add92c217943acad64bb0e41de0f2f619c)
- [x] `ulauncher` - supported
- [x] `gwe` - [not supported](https://gitlab.com/leinardi/gwe/-/issues/156), patched
- [x] `caffeine-ng` - only [supported](https://codeberg.org/WhyNotHugo/caffeine-ng/commit/d13b2b97160649b465213e691a8df2e958ecf739) in master, patched
- [x] `indicator-doom-cpu` - not supported, patched
- [x] `element-desktop` - [not supported](https://github.com/electron/electron/issues/27527) but works fine without it and uses systray instead, removed dependency,
see https://github.com/vector-im/element-desktop/pull/170
and https://github.com/signalapp/Signal-Desktop/pull/5031#issuecomment-788068627.
_No revbump needed because not the package but only the template required libappindicator._
- [ ] `safeeyes` - [supported](https://github.com/slgobinath/SafeEyes/commit/c784000e694f9fa508a2535f5d23d04456b4ff86) in 2.1.4, #40763
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40761.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ayatana-indicators-40761.patch --]
[-- Type: text/x-diff, Size: 25683 bytes --]
From 05f0a504008fba2cdd3877897448d05c2c48a062 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:37:25 +0100
Subject: [PATCH 01/14] New package: ayatana-ido-0.9.2
---
common/shlibs | 1 +
srcpkgs/ayatana-ido-devel | 1 +
srcpkgs/ayatana-ido/template | 27 +++++++++++++++++++++++++++
3 files changed, 29 insertions(+)
create mode 120000 srcpkgs/ayatana-ido-devel
create mode 100644 srcpkgs/ayatana-ido/template
diff --git a/common/shlibs b/common/shlibs
index 9e542d8df6a3..1fc6272e7775 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4205,3 +4205,4 @@ libtraceevent.so.1 libtraceevent-1.6.2_1
libtracefs.so.1 libtracefs-1.4.2_1
libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
+libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
diff --git a/srcpkgs/ayatana-ido-devel b/srcpkgs/ayatana-ido-devel
new file mode 120000
index 000000000000..2e1aa73a149c
--- /dev/null
+++ b/srcpkgs/ayatana-ido-devel
@@ -0,0 +1 @@
+ayatana-ido
\ No newline at end of file
diff --git a/srcpkgs/ayatana-ido/template b/srcpkgs/ayatana-ido/template
new file mode 100644
index 000000000000..717ad5808405
--- /dev/null
+++ b/srcpkgs/ayatana-ido/template
@@ -0,0 +1,27 @@
+# Template file for 'ayatana-ido'
+pkgname=ayatana-ido
+version=0.9.2
+revision=1
+build_helper="gir"
+build_style=cmake
+hostmakedepends="pkg-config gobject-introspection vala"
+makedepends="gtk+3-devel glib-devel"
+short_desc="Ayatana Indicator Display Objects"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+changelog="https://github.com/AyatanaIndicators/ayatana-ido/raw/main/ChangeLog"
+distfiles="https://github.com/AyatanaIndicators/ayatana-ido/archive/${version}.tar.gz"
+checksum=b166e7a160458e4a71f6086d2e4e97e18cf1ac584231a4b9f1f338914203884c
+
+ayatana-ido-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
+ }
+}
From 7c9752e5e875338852aa0259f48d3928ded18f14 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:38:40 +0100
Subject: [PATCH 02/14] New package: libayatana-indicator-0.9.3
---
common/shlibs | 1 +
srcpkgs/libayatana-indicator-devel | 1 +
srcpkgs/libayatana-indicator/template | 24 ++++++++++++++++++++++++
3 files changed, 26 insertions(+)
create mode 120000 srcpkgs/libayatana-indicator-devel
create mode 100644 srcpkgs/libayatana-indicator/template
diff --git a/common/shlibs b/common/shlibs
index 1fc6272e7775..8e72a737acdf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4206,3 +4206,4 @@ libtracefs.so.1 libtracefs-1.4.2_1
libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
+libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
diff --git a/srcpkgs/libayatana-indicator-devel b/srcpkgs/libayatana-indicator-devel
new file mode 120000
index 000000000000..fdfe7dbb5d64
--- /dev/null
+++ b/srcpkgs/libayatana-indicator-devel
@@ -0,0 +1 @@
+libayatana-indicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-indicator/template b/srcpkgs/libayatana-indicator/template
new file mode 100644
index 000000000000..a780816306c1
--- /dev/null
+++ b/srcpkgs/libayatana-indicator/template
@@ -0,0 +1,24 @@
+# Template file for 'libayatana-indicator'
+pkgname=libayatana-indicator
+version=0.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config python3"
+makedepends="glib-devel gtk+3-devel ayatana-ido-devel"
+short_desc="Ayatana Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="GPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+changelog="https://github.com/AyatanaIndicators/libayatana-indicator/raw/main/ChangeLog"
+distfiles="https://github.com/AyatanaIndicators/libayatana-indicator/archive/${version}.tar.gz"
+checksum=09c5456fcb430b6ee0626fafdf99a32eb8746b267d56ab2bd4c8a8dd6ca731da
+
+libayatana-indicator-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From f5a711b527d37b6abf376b690be22810609882cc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:44:14 +0100
Subject: [PATCH 03/14] New package: libayatana-appindicator-0.5.91
---
common/shlibs | 1 +
srcpkgs/libayatana-appindicator-devel | 1 +
srcpkgs/libayatana-appindicator/template | 32 ++++++++++++++++++++++++
3 files changed, 34 insertions(+)
create mode 120000 srcpkgs/libayatana-appindicator-devel
create mode 100644 srcpkgs/libayatana-appindicator/template
diff --git a/common/shlibs b/common/shlibs
index 8e72a737acdf..08ea18c88782 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4207,3 +4207,4 @@ libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
+libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
diff --git a/srcpkgs/libayatana-appindicator-devel b/srcpkgs/libayatana-appindicator-devel
new file mode 120000
index 000000000000..a2ff93abbc17
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator-devel
@@ -0,0 +1 @@
+libayatana-appindicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-appindicator/template b/srcpkgs/libayatana-appindicator/template
new file mode 100644
index 000000000000..01b0a341d20a
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator/template
@@ -0,0 +1,32 @@
+# Template file for 'libayatana-appindicator'
+pkgname=libayatana-appindicator
+version=0.5.91
+revision=1
+build_helper="gir"
+build_style=cmake
+configure_args="-DENABLE_BINDINGS_MONO=OFF -DENABLE_BINDINGS_VALA=$(vopt_if vala ON OFF)"
+hostmakedepends="pkg-config gobject-introspection $(vopt_if vala vala)"
+makedepends="glib-devel gtk+3-devel libdbusmenu-gtk3-devel libayatana-indicator-devel"
+short_desc="Ayatana Application Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+distfiles="https://github.com/AyatanaIndicators/libayatana-appindicator/archive/${version}.tar.gz"
+checksum=52eb5d0c0de07177833e50fbaee592dcb3939e96c6b789921e2a8caf40a1ed26
+
+build_options="vala"
+build_options_default="vala"
+
+libayatana-appindicator-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ if [ "$build_option_vala" ]; then
+ vmove usr/share/vala
+ fi
+ }
+}
From 8ee97bc094a3ed52b2ea25b15e4a1519f1a028fe Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:17:56 +0100
Subject: [PATCH 04/14] droidcam: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 26 +++++++++++++++++++
srcpkgs/droidcam/template | 5 ++--
2 files changed, 29 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..32ab45377152
--- /dev/null
+++ b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,26 @@
+diff --git a/Makefile b/Makefile
+index 7be3c15..b7f16c4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -13,7 +13,7 @@ JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
+ CC = gcc
+ CFLAGS = -Wall -O2
+ GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
+-GTK += `pkg-config --cflags --libs appindicator3-0.1`
++GTK += `pkg-config --cflags --libs ayatana-appindicator3-0.1`
+ LIBAV = `pkg-config --libs --cflags libswscale libavutil`
+ LIBS = -lspeex -lasound -lpthread -lm
+ JPEG = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a
+diff --git a/src/droidcam.c b/src/droidcam.c
+index cad1ee4..28f4000 100644
+--- a/src/droidcam.c
++++ b/src/droidcam.c
+@@ -7,7 +7,7 @@
+ */
+
+ #include <gtk/gtk.h>
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+ #include <X11/Xlib.h>
+ #include <stdint.h>
+
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1207bdec5cea..1c3f1b8b1fc6 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,12 +1,13 @@
# Template file for 'droidcam'
pkgname=droidcam
version=1.8.2
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg"
hostmakedepends="pkg-config"
makedepends="pkg-config libjpeg-turbo-devel ffmpeg-devel alsa-lib-devel
- speex-devel libusbmuxd-devel libplist-devel gtk+3-devel libappindicator-devel"
+ speex-devel libusbmuxd-devel libplist-devel gtk+3-devel
+ libayatana-appindicator-devel"
depends="v4l2loopback"
short_desc="Tool for using your android device as a wireless/usb webcam"
maintainer="ibrokemypie <ibrokemypie@bastardi.net>"
From a2000ebc7ab5e76f1560b68dcbd551c7eaab4262 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:35 +0100
Subject: [PATCH 05/14] gromit-mpx: replace libappindicator with
libayatana-appindicator
---
srcpkgs/gromit-mpx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gromit-mpx/template b/srcpkgs/gromit-mpx/template
index 3330ccfeba2b..82d1068872d7 100644
--- a/srcpkgs/gromit-mpx/template
+++ b/srcpkgs/gromit-mpx/template
@@ -1,10 +1,10 @@
# Template file for 'gromit-mpx'
pkgname=gromit-mpx
version=1.4.2
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="gtk+3-devel libappindicator-devel libdbusmenu-glib-devel"
+makedepends="gtk+3-devel libayatana-appindicator-devel libdbusmenu-glib-devel"
short_desc="Multi-pointer annotation tool"
maintainer="Toyam Cox <Vaelatern@gmail.com>"
license="GPL-2.0-only"
From 3fab291eeb5039430bf49fefd9dddfd71d89446c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:49 +0100
Subject: [PATCH 06/14] network-manager-applet: replace libappindicator with
libayatana-appindicator
---
srcpkgs/network-manager-applet/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 7bbc7a671da5..ee5e63b467ed 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,12 +1,12 @@
# Template file for 'network-manager-applet'
pkgname=network-manager-applet
version=1.30.0
-revision=1
+revision=2
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
- libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libayatana-appindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
libgudev-devel libnotify-devel libnma-devel libsecret-devel
polkit-devel mobile-broadband-provider-info"
depends="NetworkManager hicolor-icon-theme iso-codes"
From cdd2e7bb83a59e15f1fcf2755ceade219da75407 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:53 +0100
Subject: [PATCH 07/14] psensor: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 53 +++++++++++++++++++
srcpkgs/psensor/template | 6 +--
2 files changed, 56 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/psensor/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/psensor/patches/use-ayatana-appindicator.patch b/srcpkgs/psensor/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..f8350ca6f77f
--- /dev/null
+++ b/srcpkgs/psensor/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,53 @@
+From d84498639263d6a8f8d4b4adddf3dab66631876b Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 22 Jan 2022 00:15:13 +0100
+Subject: [PATCH] Use ayatana appindicator
+
+---
+ configure.ac | 2 +-
+ src/ui.h | 2 +-
+ src/ui_appindicator.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 48b10eb..2ff857d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -117,7 +117,7 @@ AC_SUBST(LIBNOTIFY_LIBS)
+
+ # Checks AppIndicator
+ APPINDICATOR_LIBS=
+-PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1,
++PKG_CHECK_MODULES(APPINDICATOR, ayatana-appindicator3-0.1,
+ [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator3-0.1])],
+ [AC_MSG_WARN(AppIndicator 3-0.1 not present")])
+ AM_CONDITIONAL(APPINDICATOR, test -n "$APPINDICATOR_LIBS")
+diff --git a/src/ui.h b/src/ui.h
+index 426f29c..43ae4be 100644
+--- a/src/ui.h
++++ b/src/ui.h
+@@ -27,7 +27,7 @@
+ #include <gtk/gtk.h>
+
+ #if defined(HAVE_APPINDICATOR)
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+ #endif
+
+ #include "psensor.h"
+diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
+index ed4cc64..b3179c0 100644
+--- a/src/ui_appindicator.c
++++ b/src/ui_appindicator.c
+@@ -21,7 +21,7 @@
+ #include <string.h>
+
+ #include <gtk/gtk.h>
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+
+ #include <cfg.h>
+ #include <psensor.h>
+--
+2.34.1
+
diff --git a/srcpkgs/psensor/template b/srcpkgs/psensor/template
index d21a33c4c695..752e9fe04e7c 100644
--- a/srcpkgs/psensor/template
+++ b/srcpkgs/psensor/template
@@ -1,12 +1,12 @@
# Template file for 'psensor'
pkgname=psensor
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
-hostmakedepends="pkg-config glib-devel"
+hostmakedepends="pkg-config glib-devel automake"
makedepends="gtk+3-devel udisks2-devel libgtop-devel json-c-devel
libsensors-devel libatasmart-devel libcurl-devel libnotify-devel
- libappindicator-devel libmicrohttpd-devel"
+ libayatana-appindicator-devel libmicrohttpd-devel"
depends="lm_sensors"
short_desc="Graphical hardware temperature monitor for Linux"
maintainer="Foxlet <foxlet@furcode.co>"
From e29c219c97e99baace47eb2479e1754ece67170d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:58 +0100
Subject: [PATCH 08/14] remmina: replace libappindicator with
libayatana-appindicator
---
srcpkgs/remmina/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 0da8cad6604b..9bf538220fef 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
# Template file for 'remmina'
pkgname=remmina
version=1.4.27
-revision=3
+revision=4
build_style=cmake
configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"
hostmakedepends="glib-devel intltool pkg-config shared-mime-info"
@@ -11,7 +11,7 @@ makedepends="avahi-glib-libs-devel avahi-ui-libs-devel freerdp-devel
libsecret-devel libsodium-devel libsoup3-devel libssh-devel libva-devel
libvncserver-devel libxkbfile-devel opus-devel phodav-devel
spice-gtk-devel spice-protocol telepathy-glib-devel usbredir-devel
- vte3-devel libappindicator-devel libwebkit2gtk41-devel python3-devel"
+ vte3-devel libayatana-appindicator-devel libwebkit2gtk41-devel python3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Remote desktop client written in GTK+"
maintainer="Frank Steinborn <steinex@nognu.de>"
From fd8fcc3eb5e38b68a85843f19f7c1a8060d23450 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 25 Nov 2022 20:03:58 +0100
Subject: [PATCH 09/14] ulauncher: replace libappindicator with
libayatana-appindicator
---
srcpkgs/ulauncher/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ulauncher/template b/srcpkgs/ulauncher/template
index 0eb497d16e1c..d592930f6d24 100644
--- a/srcpkgs/ulauncher/template
+++ b/srcpkgs/ulauncher/template
@@ -1,12 +1,12 @@
# Template file for 'ulauncher'
pkgname=ulauncher
version=5.14.3
-revision=2
+revision=3
build_style=python3-module
hostmakedepends="python3-distutils-extra intltool python3-Levenshtein
python3-dbus python3-gobject python3-inotify python3-websocket-client
python3-xdg"
-depends="libappindicator>=12.10.0_2 libkeybinder3 python3-Levenshtein python3-dbus
+depends="libayatana-appindicator libkeybinder3 python3-Levenshtein python3-dbus
python3-gobject python3-inotify python3-websocket-client python3-xdg webkit2gtk"
short_desc="Linux application launcher with fuzzy search and extensions"
maintainer="Alberto Pau <me@albertopau.com>"
From 7057c39da676ddbe7af4f8f30dabaea97962acf0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 25 Nov 2022 22:26:55 +0100
Subject: [PATCH 10/14] gwe: replace libappindicator with
libayatana-appindicator
---
.../gwe/patches/use-ayatana-appindicator.patch | 15 +++++++++++++++
srcpkgs/gwe/template | 4 ++--
2 files changed, 17 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gwe/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/gwe/patches/use-ayatana-appindicator.patch b/srcpkgs/gwe/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..05029c1c7755
--- /dev/null
+++ b/srcpkgs/gwe/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,15 @@
+diff --git a/gwe/view/main_view.py b/gwe/view/main_view.py
+index 61c891d..6f573c2 100644
+--- a/gwe/view/main_view.py
++++ b/gwe/view/main_view.py
+@@ -31,8 +31,8 @@ from gwe.model.fan_profile import FanProfile
+ try: # AppIndicator3 may not be installed
+ import gi
+
+- gi.require_version('AppIndicator3', '0.1')
+- from gi.repository import AppIndicator3
++ gi.require_version('AyatanaAppIndicator3', '0.1')
++ from gi.repository import AyatanaAppIndicator3 as AppIndicator3
+ except (ImportError, ValueError):
+ AppIndicator3 = None
+ from gwe.di import MainBuilder
diff --git a/srcpkgs/gwe/template b/srcpkgs/gwe/template
index f4473200cd67..ce70ed78573c 100644
--- a/srcpkgs/gwe/template
+++ b/srcpkgs/gwe/template
@@ -1,14 +1,14 @@
# Template file for 'gwe'
pkgname=gwe
version=0.15.2
-revision=3
+revision=4
build_style=meson
hostmakedepends="pkg-config meson ninja glib-devel gtk+3-devel python3 python3-devel
python3-matplotlib python3-peewee python3-gobject python3-xlib python3-xdg
python3-requests python3-rx python3-nvml python3-injector python3-urllib3 python3-six
python3-chardet python3-idna python3-xlib python3-numpy python3-parsing python3-cycler python3-dateutil python3-Pillow"
makedepends="gobject-introspection appstream-glib"
-depends="python3 gobject-introspection libappindicator libdazzle python3-matplotlib
+depends="python3 gobject-introspection libayatana-appindicator libdazzle python3-matplotlib
python3-peewee python3-gobject python3-xlib python3-xdg python3-requests python3-rx
python3-nvml python3-injector python3-urllib3 python3-six python3-chardet python3-idna
python3-xlib python3-numpy python3-parsing python3-cycler python3-dateutil python3-Pillow"
From e9664eaa37f5c8916550d2451c1569aad2616f51 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Nov 2022 11:22:47 +0100
Subject: [PATCH 11/14] caffeine-ng: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 16 ++++++++++++++++
srcpkgs/caffeine-ng/template | 4 ++--
2 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch b/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..925dad3e0410
--- /dev/null
+++ b/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,16 @@
+diff --git a/caffeine/main.py b/caffeine/main.py
+index 516a138..f48653b 100644
+--- a/caffeine/main.py
++++ b/caffeine/main.py
+@@ -32,9 +32,9 @@ try:
+ gi.require_version("Notify", "0.7")
+ except ValueError:
+ gi.require_version("Notify", "0.8")
+-gi.require_version("AppIndicator3", "0.1")
++gi.require_version("AyatanaAppIndicator3", "0.1")
+
+-from gi.repository import AppIndicator3 # noqa: E402
++from gi.repository import AyatanaAppIndicator3 as AppIndicator3 # noqa: E402
+ from gi.repository import GdkPixbuf # noqa: E402
+ from gi.repository import Gtk # noqa: E402
+ from gi.repository.Notify import Notification # noqa: E402
diff --git a/srcpkgs/caffeine-ng/template b/srcpkgs/caffeine-ng/template
index 4f1b6774cdd2..3289bf5bad43 100644
--- a/srcpkgs/caffeine-ng/template
+++ b/srcpkgs/caffeine-ng/template
@@ -1,13 +1,13 @@
# Template file for 'caffeine-ng'
pkgname=caffeine-ng
version=4.0.2
-revision=3
+revision=4
build_style=python3-module
hostmakedepends="python3-setuptools_scm"
depends="desktop-file-utils gtk+3 hicolor-icon-theme libnotify
python3-dbus python3-click python3-ewmh python3-gobject
python3-setproctitle python3-setuptools python3-xdg
- python3-pulsectl libappindicator"
+ python3-pulsectl libayatana-appindicator"
short_desc="Temporarily inhibits the screensaver and sleep mode"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
From cd49e1c1ffa5c1df05659d995eca0bf87f32184f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Nov 2022 11:59:31 +0100
Subject: [PATCH 12/14] indicator-doom-cpu: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 13 +++++++++++++
srcpkgs/indicator-doom-cpu/template | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch b/srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..00a185b7d6ed
--- /dev/null
+++ b/srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,13 @@
+diff --git a/indicator-doom-cpu b/indicator-doom-cpu
+index a1528e3..c4ff4d2 100755
+--- a/indicator-doom-cpu
++++ b/indicator-doom-cpu
+@@ -27,7 +27,7 @@ import time
+ from gi.repository import Gtk, GObject, GdkPixbuf
+
+ try:
+- from gi.repository import AppIndicator3 as AppIndicator
++ from gi.repository import AyatanaAppIndicator3 as AppIndicator
+ appindicator_imported = True
+ except ImportError:
+ appindicator_imported = False
diff --git a/srcpkgs/indicator-doom-cpu/template b/srcpkgs/indicator-doom-cpu/template
index eb15aa66335a..3457df2dfebf 100644
--- a/srcpkgs/indicator-doom-cpu/template
+++ b/srcpkgs/indicator-doom-cpu/template
@@ -1,7 +1,7 @@
# Template file for 'indicator-doom-cpu'
pkgname=indicator-doom-cpu
version=1.0.1
-revision=3
+revision=4
depends="python3-gobject gtk+3 libappindicator"
short_desc="CPU load indicator showing the dying face from the video game DOOM"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From 606951e9598e597e4c7a90552d42006cfc8911ad Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Nov 2022 13:16:22 +0100
Subject: [PATCH 13/14] element-desktop: remove build dependency on
libappindicator-devel
---
srcpkgs/element-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 7ff0efdd6463..ed4023ebf875 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -5,7 +5,7 @@ revision=1
create_wrksrc=yes
conf_files="/etc/${pkgname}/config.json"
hostmakedepends="git yarn nodejs rust cargo python3 curl
- sqlcipher-devel libappindicator-devel libnotify-devel pkg-config
+ sqlcipher-devel libnotify-devel pkg-config
app-builder jq moreutils"
makedepends="libsecret-devel"
depends="c-ares ffmpeg gtk+3 http-parser libevent
From 7214c3a629eb68a498f88dfc096d9db7b8f1f49b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 27 Nov 2022 18:35:37 +0100
Subject: [PATCH 14/14] safeeyes: replace libappindicator with
libayatana-appindicator
---
srcpkgs/safeeyes/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/safeeyes/template b/srcpkgs/safeeyes/template
index 0011b9c9c07e..ff42de3c805b 100644
--- a/srcpkgs/safeeyes/template
+++ b/srcpkgs/safeeyes/template
@@ -1,11 +1,11 @@
# Template file for 'safeeyes'
pkgname=safeeyes
version=2.1.4
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-pip python3-devel pkg-config"
makedepends="python3-devel cairo-devel libgirepository-devel"
-depends="python3-psutil libappindicator python3-gobject python3-Babel
+depends="python3-psutil libayatana-appindicator python3-gobject python3-Babel
python3-dbus xprop alsa-utils python3-xlib"
checkdepends="$depends"
short_desc="Tool to reduce and prevent repetitive strain injury"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] Ayatana indicators
2022-11-25 18:04 [PR PATCH] Ayatana indicators tibequadorian
` (5 preceding siblings ...)
2022-11-27 17:35 ` tibequadorian
@ 2022-11-29 11:11 ` tibequadorian
2022-11-30 9:53 ` tibequadorian
` (7 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: tibequadorian @ 2022-11-29 11:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2870 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ayatana-indicators
https://github.com/void-linux/void-packages/pull/40761
Ayatana indicators
<!-- Uncomment relevant sections and delete options which are not applicable -->
Continuation of #35135
`libappindicator` hasn't seen a release since 2012 (more than 10 years!)
Debian has removed it in buster and switched to [libayatana-appindicator](https://ayatanaindicators.github.io/).
This PR tries to replace `libappindicator` with `libayatana-appindicator`.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### TODO:
- [x] `droidcam` - only [supported](https://github.com/dev47apps/droidcam/commit/71a74d22ed700650a83b7cb653bd92b0ed3cd01a) in master, patched
- [x] `gromit-mpx` - [supported](https://github.com/bk138/gromit-mpx/commit/2a838303154df4a90495c4f93741846cbd63d37f)
- [x] `network-manager-applet` - supported
- [x] `psensor` - not supported, patched
- [x] `remmina` - [supported](https://github.com/FreeRDP/Remmina/commit/a34133add92c217943acad64bb0e41de0f2f619c)
- [x] `ulauncher` - supported
- [x] `gwe` - [not supported](https://gitlab.com/leinardi/gwe/-/issues/156), patched
- [x] `caffeine-ng` - only [supported](https://codeberg.org/WhyNotHugo/caffeine-ng/commit/d13b2b97160649b465213e691a8df2e958ecf739) in master, patched
- [x] `indicator-doom-cpu` - not supported, patched
- [x] `element-desktop` - [not supported](https://github.com/electron/electron/issues/27527) but works fine without it and uses systray instead, removed dependency,
see https://github.com/vector-im/element-desktop/pull/170
and https://github.com/signalapp/Signal-Desktop/pull/5031#issuecomment-788068627.
_No revbump needed because not the package but only the template required libappindicator._
- [x] `safeeyes` - [supported](https://github.com/slgobinath/SafeEyes/commit/c784000e694f9fa508a2535f5d23d04456b4ff86) in 2.1.4, #40763
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40761.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ayatana-indicators-40761.patch --]
[-- Type: text/x-diff, Size: 25767 bytes --]
From 856dc239ac77c81d7826b3a001b4ca8dc4c64b63 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:37:25 +0100
Subject: [PATCH 01/14] New package: ayatana-ido-0.9.2
---
common/shlibs | 1 +
srcpkgs/ayatana-ido-devel | 1 +
srcpkgs/ayatana-ido/template | 27 +++++++++++++++++++++++++++
3 files changed, 29 insertions(+)
create mode 120000 srcpkgs/ayatana-ido-devel
create mode 100644 srcpkgs/ayatana-ido/template
diff --git a/common/shlibs b/common/shlibs
index fc5bb4dda7e6..1fddf01bb8e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4205,3 +4205,4 @@ libtraceevent.so.1 libtraceevent-1.6.2_1
libtracefs.so.1 libtracefs-1.4.2_1
libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
+libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
diff --git a/srcpkgs/ayatana-ido-devel b/srcpkgs/ayatana-ido-devel
new file mode 120000
index 000000000000..2e1aa73a149c
--- /dev/null
+++ b/srcpkgs/ayatana-ido-devel
@@ -0,0 +1 @@
+ayatana-ido
\ No newline at end of file
diff --git a/srcpkgs/ayatana-ido/template b/srcpkgs/ayatana-ido/template
new file mode 100644
index 000000000000..717ad5808405
--- /dev/null
+++ b/srcpkgs/ayatana-ido/template
@@ -0,0 +1,27 @@
+# Template file for 'ayatana-ido'
+pkgname=ayatana-ido
+version=0.9.2
+revision=1
+build_helper="gir"
+build_style=cmake
+hostmakedepends="pkg-config gobject-introspection vala"
+makedepends="gtk+3-devel glib-devel"
+short_desc="Ayatana Indicator Display Objects"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+changelog="https://github.com/AyatanaIndicators/ayatana-ido/raw/main/ChangeLog"
+distfiles="https://github.com/AyatanaIndicators/ayatana-ido/archive/${version}.tar.gz"
+checksum=b166e7a160458e4a71f6086d2e4e97e18cf1ac584231a4b9f1f338914203884c
+
+ayatana-ido-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
+ }
+}
From 823b10c37f484dcade9f66df0fdd11ef7bc8b3fd Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:38:40 +0100
Subject: [PATCH 02/14] New package: libayatana-indicator-0.9.3
---
common/shlibs | 1 +
srcpkgs/libayatana-indicator-devel | 1 +
srcpkgs/libayatana-indicator/template | 24 ++++++++++++++++++++++++
3 files changed, 26 insertions(+)
create mode 120000 srcpkgs/libayatana-indicator-devel
create mode 100644 srcpkgs/libayatana-indicator/template
diff --git a/common/shlibs b/common/shlibs
index 1fddf01bb8e2..d348f1c4dbf8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4206,3 +4206,4 @@ libtracefs.so.1 libtracefs-1.4.2_1
libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
+libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
diff --git a/srcpkgs/libayatana-indicator-devel b/srcpkgs/libayatana-indicator-devel
new file mode 120000
index 000000000000..fdfe7dbb5d64
--- /dev/null
+++ b/srcpkgs/libayatana-indicator-devel
@@ -0,0 +1 @@
+libayatana-indicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-indicator/template b/srcpkgs/libayatana-indicator/template
new file mode 100644
index 000000000000..a780816306c1
--- /dev/null
+++ b/srcpkgs/libayatana-indicator/template
@@ -0,0 +1,24 @@
+# Template file for 'libayatana-indicator'
+pkgname=libayatana-indicator
+version=0.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config python3"
+makedepends="glib-devel gtk+3-devel ayatana-ido-devel"
+short_desc="Ayatana Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="GPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+changelog="https://github.com/AyatanaIndicators/libayatana-indicator/raw/main/ChangeLog"
+distfiles="https://github.com/AyatanaIndicators/libayatana-indicator/archive/${version}.tar.gz"
+checksum=09c5456fcb430b6ee0626fafdf99a32eb8746b267d56ab2bd4c8a8dd6ca731da
+
+libayatana-indicator-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From 606f51362d7383528dc53c0c4f77d2f3aab2b88d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:44:14 +0100
Subject: [PATCH 03/14] New package: libayatana-appindicator-0.5.91
---
common/shlibs | 1 +
srcpkgs/libayatana-appindicator-devel | 1 +
srcpkgs/libayatana-appindicator/template | 32 ++++++++++++++++++++++++
3 files changed, 34 insertions(+)
create mode 120000 srcpkgs/libayatana-appindicator-devel
create mode 100644 srcpkgs/libayatana-appindicator/template
diff --git a/common/shlibs b/common/shlibs
index d348f1c4dbf8..285acb2c41e8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4207,3 +4207,4 @@ libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
+libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
diff --git a/srcpkgs/libayatana-appindicator-devel b/srcpkgs/libayatana-appindicator-devel
new file mode 120000
index 000000000000..a2ff93abbc17
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator-devel
@@ -0,0 +1 @@
+libayatana-appindicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-appindicator/template b/srcpkgs/libayatana-appindicator/template
new file mode 100644
index 000000000000..01b0a341d20a
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator/template
@@ -0,0 +1,32 @@
+# Template file for 'libayatana-appindicator'
+pkgname=libayatana-appindicator
+version=0.5.91
+revision=1
+build_helper="gir"
+build_style=cmake
+configure_args="-DENABLE_BINDINGS_MONO=OFF -DENABLE_BINDINGS_VALA=$(vopt_if vala ON OFF)"
+hostmakedepends="pkg-config gobject-introspection $(vopt_if vala vala)"
+makedepends="glib-devel gtk+3-devel libdbusmenu-gtk3-devel libayatana-indicator-devel"
+short_desc="Ayatana Application Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+distfiles="https://github.com/AyatanaIndicators/libayatana-appindicator/archive/${version}.tar.gz"
+checksum=52eb5d0c0de07177833e50fbaee592dcb3939e96c6b789921e2a8caf40a1ed26
+
+build_options="vala"
+build_options_default="vala"
+
+libayatana-appindicator-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ if [ "$build_option_vala" ]; then
+ vmove usr/share/vala
+ fi
+ }
+}
From f6c2ac4a1e1eee001fcacea54c9bb440d3410cd4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:17:56 +0100
Subject: [PATCH 04/14] droidcam: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 26 +++++++++++++++++++
srcpkgs/droidcam/template | 5 ++--
2 files changed, 29 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..32ab45377152
--- /dev/null
+++ b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,26 @@
+diff --git a/Makefile b/Makefile
+index 7be3c15..b7f16c4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -13,7 +13,7 @@ JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
+ CC = gcc
+ CFLAGS = -Wall -O2
+ GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
+-GTK += `pkg-config --cflags --libs appindicator3-0.1`
++GTK += `pkg-config --cflags --libs ayatana-appindicator3-0.1`
+ LIBAV = `pkg-config --libs --cflags libswscale libavutil`
+ LIBS = -lspeex -lasound -lpthread -lm
+ JPEG = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a
+diff --git a/src/droidcam.c b/src/droidcam.c
+index cad1ee4..28f4000 100644
+--- a/src/droidcam.c
++++ b/src/droidcam.c
+@@ -7,7 +7,7 @@
+ */
+
+ #include <gtk/gtk.h>
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+ #include <X11/Xlib.h>
+ #include <stdint.h>
+
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1207bdec5cea..1c3f1b8b1fc6 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,12 +1,13 @@
# Template file for 'droidcam'
pkgname=droidcam
version=1.8.2
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg"
hostmakedepends="pkg-config"
makedepends="pkg-config libjpeg-turbo-devel ffmpeg-devel alsa-lib-devel
- speex-devel libusbmuxd-devel libplist-devel gtk+3-devel libappindicator-devel"
+ speex-devel libusbmuxd-devel libplist-devel gtk+3-devel
+ libayatana-appindicator-devel"
depends="v4l2loopback"
short_desc="Tool for using your android device as a wireless/usb webcam"
maintainer="ibrokemypie <ibrokemypie@bastardi.net>"
From 8d23903dfc960af3056fa2b4f530a53116db2507 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:35 +0100
Subject: [PATCH 05/14] gromit-mpx: replace libappindicator with
libayatana-appindicator
---
srcpkgs/gromit-mpx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gromit-mpx/template b/srcpkgs/gromit-mpx/template
index 3330ccfeba2b..82d1068872d7 100644
--- a/srcpkgs/gromit-mpx/template
+++ b/srcpkgs/gromit-mpx/template
@@ -1,10 +1,10 @@
# Template file for 'gromit-mpx'
pkgname=gromit-mpx
version=1.4.2
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="gtk+3-devel libappindicator-devel libdbusmenu-glib-devel"
+makedepends="gtk+3-devel libayatana-appindicator-devel libdbusmenu-glib-devel"
short_desc="Multi-pointer annotation tool"
maintainer="Toyam Cox <Vaelatern@gmail.com>"
license="GPL-2.0-only"
From 533e8351658f0e33b8b4708701f62c9c3e6ddfdb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:49 +0100
Subject: [PATCH 06/14] network-manager-applet: replace libappindicator with
libayatana-appindicator
---
srcpkgs/network-manager-applet/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 7bbc7a671da5..ee5e63b467ed 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,12 +1,12 @@
# Template file for 'network-manager-applet'
pkgname=network-manager-applet
version=1.30.0
-revision=1
+revision=2
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
- libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libayatana-appindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
libgudev-devel libnotify-devel libnma-devel libsecret-devel
polkit-devel mobile-broadband-provider-info"
depends="NetworkManager hicolor-icon-theme iso-codes"
From af827654045c24769fc4d6f55932c36d947f0a00 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:53 +0100
Subject: [PATCH 07/14] psensor: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 53 +++++++++++++++++++
srcpkgs/psensor/template | 6 +--
2 files changed, 56 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/psensor/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/psensor/patches/use-ayatana-appindicator.patch b/srcpkgs/psensor/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..f8350ca6f77f
--- /dev/null
+++ b/srcpkgs/psensor/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,53 @@
+From d84498639263d6a8f8d4b4adddf3dab66631876b Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 22 Jan 2022 00:15:13 +0100
+Subject: [PATCH] Use ayatana appindicator
+
+---
+ configure.ac | 2 +-
+ src/ui.h | 2 +-
+ src/ui_appindicator.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 48b10eb..2ff857d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -117,7 +117,7 @@ AC_SUBST(LIBNOTIFY_LIBS)
+
+ # Checks AppIndicator
+ APPINDICATOR_LIBS=
+-PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1,
++PKG_CHECK_MODULES(APPINDICATOR, ayatana-appindicator3-0.1,
+ [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator3-0.1])],
+ [AC_MSG_WARN(AppIndicator 3-0.1 not present")])
+ AM_CONDITIONAL(APPINDICATOR, test -n "$APPINDICATOR_LIBS")
+diff --git a/src/ui.h b/src/ui.h
+index 426f29c..43ae4be 100644
+--- a/src/ui.h
++++ b/src/ui.h
+@@ -27,7 +27,7 @@
+ #include <gtk/gtk.h>
+
+ #if defined(HAVE_APPINDICATOR)
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+ #endif
+
+ #include "psensor.h"
+diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
+index ed4cc64..b3179c0 100644
+--- a/src/ui_appindicator.c
++++ b/src/ui_appindicator.c
+@@ -21,7 +21,7 @@
+ #include <string.h>
+
+ #include <gtk/gtk.h>
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+
+ #include <cfg.h>
+ #include <psensor.h>
+--
+2.34.1
+
diff --git a/srcpkgs/psensor/template b/srcpkgs/psensor/template
index d21a33c4c695..752e9fe04e7c 100644
--- a/srcpkgs/psensor/template
+++ b/srcpkgs/psensor/template
@@ -1,12 +1,12 @@
# Template file for 'psensor'
pkgname=psensor
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
-hostmakedepends="pkg-config glib-devel"
+hostmakedepends="pkg-config glib-devel automake"
makedepends="gtk+3-devel udisks2-devel libgtop-devel json-c-devel
libsensors-devel libatasmart-devel libcurl-devel libnotify-devel
- libappindicator-devel libmicrohttpd-devel"
+ libayatana-appindicator-devel libmicrohttpd-devel"
depends="lm_sensors"
short_desc="Graphical hardware temperature monitor for Linux"
maintainer="Foxlet <foxlet@furcode.co>"
From 25d5af219b7ced9fef145a1c66951bdd2766bb29 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:18:58 +0100
Subject: [PATCH 08/14] remmina: replace libappindicator with
libayatana-appindicator
---
srcpkgs/remmina/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 0da8cad6604b..9bf538220fef 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
# Template file for 'remmina'
pkgname=remmina
version=1.4.27
-revision=3
+revision=4
build_style=cmake
configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"
hostmakedepends="glib-devel intltool pkg-config shared-mime-info"
@@ -11,7 +11,7 @@ makedepends="avahi-glib-libs-devel avahi-ui-libs-devel freerdp-devel
libsecret-devel libsodium-devel libsoup3-devel libssh-devel libva-devel
libvncserver-devel libxkbfile-devel opus-devel phodav-devel
spice-gtk-devel spice-protocol telepathy-glib-devel usbredir-devel
- vte3-devel libappindicator-devel libwebkit2gtk41-devel python3-devel"
+ vte3-devel libayatana-appindicator-devel libwebkit2gtk41-devel python3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Remote desktop client written in GTK+"
maintainer="Frank Steinborn <steinex@nognu.de>"
From ed8df5616c0f7ffe37cebfca34d63d3db05881d3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 25 Nov 2022 20:03:58 +0100
Subject: [PATCH 09/14] ulauncher: replace libappindicator with
libayatana-appindicator
---
srcpkgs/ulauncher/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ulauncher/template b/srcpkgs/ulauncher/template
index 0eb497d16e1c..d592930f6d24 100644
--- a/srcpkgs/ulauncher/template
+++ b/srcpkgs/ulauncher/template
@@ -1,12 +1,12 @@
# Template file for 'ulauncher'
pkgname=ulauncher
version=5.14.3
-revision=2
+revision=3
build_style=python3-module
hostmakedepends="python3-distutils-extra intltool python3-Levenshtein
python3-dbus python3-gobject python3-inotify python3-websocket-client
python3-xdg"
-depends="libappindicator>=12.10.0_2 libkeybinder3 python3-Levenshtein python3-dbus
+depends="libayatana-appindicator libkeybinder3 python3-Levenshtein python3-dbus
python3-gobject python3-inotify python3-websocket-client python3-xdg webkit2gtk"
short_desc="Linux application launcher with fuzzy search and extensions"
maintainer="Alberto Pau <me@albertopau.com>"
From f6ede511d77622ac455c6cb0fdd80e6139aa087e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 25 Nov 2022 22:26:55 +0100
Subject: [PATCH 10/14] gwe: replace libappindicator with
libayatana-appindicator
---
.../gwe/patches/use-ayatana-appindicator.patch | 15 +++++++++++++++
srcpkgs/gwe/template | 4 ++--
2 files changed, 17 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gwe/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/gwe/patches/use-ayatana-appindicator.patch b/srcpkgs/gwe/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..05029c1c7755
--- /dev/null
+++ b/srcpkgs/gwe/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,15 @@
+diff --git a/gwe/view/main_view.py b/gwe/view/main_view.py
+index 61c891d..6f573c2 100644
+--- a/gwe/view/main_view.py
++++ b/gwe/view/main_view.py
+@@ -31,8 +31,8 @@ from gwe.model.fan_profile import FanProfile
+ try: # AppIndicator3 may not be installed
+ import gi
+
+- gi.require_version('AppIndicator3', '0.1')
+- from gi.repository import AppIndicator3
++ gi.require_version('AyatanaAppIndicator3', '0.1')
++ from gi.repository import AyatanaAppIndicator3 as AppIndicator3
+ except (ImportError, ValueError):
+ AppIndicator3 = None
+ from gwe.di import MainBuilder
diff --git a/srcpkgs/gwe/template b/srcpkgs/gwe/template
index f4473200cd67..ce70ed78573c 100644
--- a/srcpkgs/gwe/template
+++ b/srcpkgs/gwe/template
@@ -1,14 +1,14 @@
# Template file for 'gwe'
pkgname=gwe
version=0.15.2
-revision=3
+revision=4
build_style=meson
hostmakedepends="pkg-config meson ninja glib-devel gtk+3-devel python3 python3-devel
python3-matplotlib python3-peewee python3-gobject python3-xlib python3-xdg
python3-requests python3-rx python3-nvml python3-injector python3-urllib3 python3-six
python3-chardet python3-idna python3-xlib python3-numpy python3-parsing python3-cycler python3-dateutil python3-Pillow"
makedepends="gobject-introspection appstream-glib"
-depends="python3 gobject-introspection libappindicator libdazzle python3-matplotlib
+depends="python3 gobject-introspection libayatana-appindicator libdazzle python3-matplotlib
python3-peewee python3-gobject python3-xlib python3-xdg python3-requests python3-rx
python3-nvml python3-injector python3-urllib3 python3-six python3-chardet python3-idna
python3-xlib python3-numpy python3-parsing python3-cycler python3-dateutil python3-Pillow"
From fcf5d60e2fe9456d9c76537242790fdfcaebd808 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Nov 2022 11:22:47 +0100
Subject: [PATCH 11/14] caffeine-ng: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 16 ++++++++++++++++
srcpkgs/caffeine-ng/template | 4 ++--
2 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch b/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..925dad3e0410
--- /dev/null
+++ b/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,16 @@
+diff --git a/caffeine/main.py b/caffeine/main.py
+index 516a138..f48653b 100644
+--- a/caffeine/main.py
++++ b/caffeine/main.py
+@@ -32,9 +32,9 @@ try:
+ gi.require_version("Notify", "0.7")
+ except ValueError:
+ gi.require_version("Notify", "0.8")
+-gi.require_version("AppIndicator3", "0.1")
++gi.require_version("AyatanaAppIndicator3", "0.1")
+
+-from gi.repository import AppIndicator3 # noqa: E402
++from gi.repository import AyatanaAppIndicator3 as AppIndicator3 # noqa: E402
+ from gi.repository import GdkPixbuf # noqa: E402
+ from gi.repository import Gtk # noqa: E402
+ from gi.repository.Notify import Notification # noqa: E402
diff --git a/srcpkgs/caffeine-ng/template b/srcpkgs/caffeine-ng/template
index 4f1b6774cdd2..3289bf5bad43 100644
--- a/srcpkgs/caffeine-ng/template
+++ b/srcpkgs/caffeine-ng/template
@@ -1,13 +1,13 @@
# Template file for 'caffeine-ng'
pkgname=caffeine-ng
version=4.0.2
-revision=3
+revision=4
build_style=python3-module
hostmakedepends="python3-setuptools_scm"
depends="desktop-file-utils gtk+3 hicolor-icon-theme libnotify
python3-dbus python3-click python3-ewmh python3-gobject
python3-setproctitle python3-setuptools python3-xdg
- python3-pulsectl libappindicator"
+ python3-pulsectl libayatana-appindicator"
short_desc="Temporarily inhibits the screensaver and sleep mode"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
From 641435b7768243365a027e5a50e94ad82ebdac26 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Nov 2022 11:59:31 +0100
Subject: [PATCH 12/14] indicator-doom-cpu: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 13 +++++++++++++
srcpkgs/indicator-doom-cpu/template | 4 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch b/srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..00a185b7d6ed
--- /dev/null
+++ b/srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,13 @@
+diff --git a/indicator-doom-cpu b/indicator-doom-cpu
+index a1528e3..c4ff4d2 100755
+--- a/indicator-doom-cpu
++++ b/indicator-doom-cpu
+@@ -27,7 +27,7 @@ import time
+ from gi.repository import Gtk, GObject, GdkPixbuf
+
+ try:
+- from gi.repository import AppIndicator3 as AppIndicator
++ from gi.repository import AyatanaAppIndicator3 as AppIndicator
+ appindicator_imported = True
+ except ImportError:
+ appindicator_imported = False
diff --git a/srcpkgs/indicator-doom-cpu/template b/srcpkgs/indicator-doom-cpu/template
index eb15aa66335a..75da2d47ae33 100644
--- a/srcpkgs/indicator-doom-cpu/template
+++ b/srcpkgs/indicator-doom-cpu/template
@@ -1,8 +1,8 @@
# Template file for 'indicator-doom-cpu'
pkgname=indicator-doom-cpu
version=1.0.1
-revision=3
-depends="python3-gobject gtk+3 libappindicator"
+revision=4
+depends="python3-gobject gtk+3 libayatana-appindicator"
short_desc="CPU load indicator showing the dying face from the video game DOOM"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-only"
From eb3337fe3ebe67e6199b9ce6eecb665783571f32 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Nov 2022 13:16:22 +0100
Subject: [PATCH 13/14] element-desktop: remove build dependency on
libappindicator-devel
---
srcpkgs/element-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 7ff0efdd6463..ed4023ebf875 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -5,7 +5,7 @@ revision=1
create_wrksrc=yes
conf_files="/etc/${pkgname}/config.json"
hostmakedepends="git yarn nodejs rust cargo python3 curl
- sqlcipher-devel libappindicator-devel libnotify-devel pkg-config
+ sqlcipher-devel libnotify-devel pkg-config
app-builder jq moreutils"
makedepends="libsecret-devel"
depends="c-ares ffmpeg gtk+3 http-parser libevent
From a08cc2dc663678ad1a6211325f0a2e48e5ed4019 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 27 Nov 2022 18:35:37 +0100
Subject: [PATCH 14/14] safeeyes: replace libappindicator with
libayatana-appindicator
---
srcpkgs/safeeyes/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/safeeyes/template b/srcpkgs/safeeyes/template
index 0011b9c9c07e..ff42de3c805b 100644
--- a/srcpkgs/safeeyes/template
+++ b/srcpkgs/safeeyes/template
@@ -1,11 +1,11 @@
# Template file for 'safeeyes'
pkgname=safeeyes
version=2.1.4
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-pip python3-devel pkg-config"
makedepends="python3-devel cairo-devel libgirepository-devel"
-depends="python3-psutil libappindicator python3-gobject python3-Babel
+depends="python3-psutil libayatana-appindicator python3-gobject python3-Babel
python3-dbus xprop alsa-utils python3-xlib"
checkdepends="$depends"
short_desc="Tool to reduce and prevent repetitive strain injury"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] Ayatana indicators
2022-11-25 18:04 [PR PATCH] Ayatana indicators tibequadorian
` (6 preceding siblings ...)
2022-11-29 11:11 ` tibequadorian
@ 2022-11-30 9:53 ` tibequadorian
2022-12-12 9:26 ` tibequadorian
` (6 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: tibequadorian @ 2022-11-30 9:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2870 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ayatana-indicators
https://github.com/void-linux/void-packages/pull/40761
Ayatana indicators
<!-- Uncomment relevant sections and delete options which are not applicable -->
Continuation of #35135
`libappindicator` hasn't seen a release since 2012 (more than 10 years!)
Debian has removed it in buster and switched to [libayatana-appindicator](https://ayatanaindicators.github.io/).
This PR tries to replace `libappindicator` with `libayatana-appindicator`.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### TODO:
- [x] `droidcam` - only [supported](https://github.com/dev47apps/droidcam/commit/71a74d22ed700650a83b7cb653bd92b0ed3cd01a) in master, patched
- [x] `gromit-mpx` - [supported](https://github.com/bk138/gromit-mpx/commit/2a838303154df4a90495c4f93741846cbd63d37f)
- [x] `network-manager-applet` - supported
- [x] `psensor` - not supported, patched
- [x] `remmina` - [supported](https://github.com/FreeRDP/Remmina/commit/a34133add92c217943acad64bb0e41de0f2f619c)
- [x] `ulauncher` - supported
- [x] `gwe` - [not supported](https://gitlab.com/leinardi/gwe/-/issues/156), patched
- [x] `caffeine-ng` - only [supported](https://codeberg.org/WhyNotHugo/caffeine-ng/commit/d13b2b97160649b465213e691a8df2e958ecf739) in master, patched
- [x] `indicator-doom-cpu` - not supported, patched
- [x] `element-desktop` - [not supported](https://github.com/electron/electron/issues/27527) but works fine without it and uses systray instead, removed dependency,
see https://github.com/vector-im/element-desktop/pull/170
and https://github.com/signalapp/Signal-Desktop/pull/5031#issuecomment-788068627.
_No revbump needed because not the package but only the template required libappindicator._
- [x] `safeeyes` - [supported](https://github.com/slgobinath/SafeEyes/commit/c784000e694f9fa508a2535f5d23d04456b4ff86) in 2.1.4, #40763
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40761.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ayatana-indicators-40761.patch --]
[-- Type: text/x-diff, Size: 25767 bytes --]
From 82c4e7d7d726f528c0cde958629d4ee0cd447f3f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:41 +0100
Subject: [PATCH 01/14] New package: ayatana-ido-0.9.2
---
common/shlibs | 1 +
srcpkgs/ayatana-ido-devel | 1 +
srcpkgs/ayatana-ido/template | 27 +++++++++++++++++++++++++++
3 files changed, 29 insertions(+)
create mode 120000 srcpkgs/ayatana-ido-devel
create mode 100644 srcpkgs/ayatana-ido/template
diff --git a/common/shlibs b/common/shlibs
index fc5bb4dda7e6..1fddf01bb8e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4205,3 +4205,4 @@ libtraceevent.so.1 libtraceevent-1.6.2_1
libtracefs.so.1 libtracefs-1.4.2_1
libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
+libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
diff --git a/srcpkgs/ayatana-ido-devel b/srcpkgs/ayatana-ido-devel
new file mode 120000
index 000000000000..2e1aa73a149c
--- /dev/null
+++ b/srcpkgs/ayatana-ido-devel
@@ -0,0 +1 @@
+ayatana-ido
\ No newline at end of file
diff --git a/srcpkgs/ayatana-ido/template b/srcpkgs/ayatana-ido/template
new file mode 100644
index 000000000000..717ad5808405
--- /dev/null
+++ b/srcpkgs/ayatana-ido/template
@@ -0,0 +1,27 @@
+# Template file for 'ayatana-ido'
+pkgname=ayatana-ido
+version=0.9.2
+revision=1
+build_helper="gir"
+build_style=cmake
+hostmakedepends="pkg-config gobject-introspection vala"
+makedepends="gtk+3-devel glib-devel"
+short_desc="Ayatana Indicator Display Objects"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+changelog="https://github.com/AyatanaIndicators/ayatana-ido/raw/main/ChangeLog"
+distfiles="https://github.com/AyatanaIndicators/ayatana-ido/archive/${version}.tar.gz"
+checksum=b166e7a160458e4a71f6086d2e4e97e18cf1ac584231a4b9f1f338914203884c
+
+ayatana-ido-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
+ }
+}
From 4792b518ccb5f5720da1f05087fd33ee2fb11156 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:41 +0100
Subject: [PATCH 02/14] New package: libayatana-indicator-0.9.3
---
common/shlibs | 1 +
srcpkgs/libayatana-indicator-devel | 1 +
srcpkgs/libayatana-indicator/template | 24 ++++++++++++++++++++++++
3 files changed, 26 insertions(+)
create mode 120000 srcpkgs/libayatana-indicator-devel
create mode 100644 srcpkgs/libayatana-indicator/template
diff --git a/common/shlibs b/common/shlibs
index 1fddf01bb8e2..d348f1c4dbf8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4206,3 +4206,4 @@ libtracefs.so.1 libtracefs-1.4.2_1
libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
+libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
diff --git a/srcpkgs/libayatana-indicator-devel b/srcpkgs/libayatana-indicator-devel
new file mode 120000
index 000000000000..fdfe7dbb5d64
--- /dev/null
+++ b/srcpkgs/libayatana-indicator-devel
@@ -0,0 +1 @@
+libayatana-indicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-indicator/template b/srcpkgs/libayatana-indicator/template
new file mode 100644
index 000000000000..a780816306c1
--- /dev/null
+++ b/srcpkgs/libayatana-indicator/template
@@ -0,0 +1,24 @@
+# Template file for 'libayatana-indicator'
+pkgname=libayatana-indicator
+version=0.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config python3"
+makedepends="glib-devel gtk+3-devel ayatana-ido-devel"
+short_desc="Ayatana Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="GPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+changelog="https://github.com/AyatanaIndicators/libayatana-indicator/raw/main/ChangeLog"
+distfiles="https://github.com/AyatanaIndicators/libayatana-indicator/archive/${version}.tar.gz"
+checksum=09c5456fcb430b6ee0626fafdf99a32eb8746b267d56ab2bd4c8a8dd6ca731da
+
+libayatana-indicator-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From b6958ca0e97e5e54556fc52cb7b72132c9c6e70e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:41 +0100
Subject: [PATCH 03/14] New package: libayatana-appindicator-0.5.91
---
common/shlibs | 1 +
srcpkgs/libayatana-appindicator-devel | 1 +
srcpkgs/libayatana-appindicator/template | 32 ++++++++++++++++++++++++
3 files changed, 34 insertions(+)
create mode 120000 srcpkgs/libayatana-appindicator-devel
create mode 100644 srcpkgs/libayatana-appindicator/template
diff --git a/common/shlibs b/common/shlibs
index d348f1c4dbf8..285acb2c41e8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4207,3 +4207,4 @@ libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
+libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
diff --git a/srcpkgs/libayatana-appindicator-devel b/srcpkgs/libayatana-appindicator-devel
new file mode 120000
index 000000000000..a2ff93abbc17
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator-devel
@@ -0,0 +1 @@
+libayatana-appindicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-appindicator/template b/srcpkgs/libayatana-appindicator/template
new file mode 100644
index 000000000000..01b0a341d20a
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator/template
@@ -0,0 +1,32 @@
+# Template file for 'libayatana-appindicator'
+pkgname=libayatana-appindicator
+version=0.5.91
+revision=1
+build_helper="gir"
+build_style=cmake
+configure_args="-DENABLE_BINDINGS_MONO=OFF -DENABLE_BINDINGS_VALA=$(vopt_if vala ON OFF)"
+hostmakedepends="pkg-config gobject-introspection $(vopt_if vala vala)"
+makedepends="glib-devel gtk+3-devel libdbusmenu-gtk3-devel libayatana-indicator-devel"
+short_desc="Ayatana Application Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+distfiles="https://github.com/AyatanaIndicators/libayatana-appindicator/archive/${version}.tar.gz"
+checksum=52eb5d0c0de07177833e50fbaee592dcb3939e96c6b789921e2a8caf40a1ed26
+
+build_options="vala"
+build_options_default="vala"
+
+libayatana-appindicator-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ if [ "$build_option_vala" ]; then
+ vmove usr/share/vala
+ fi
+ }
+}
From 03d441266addd8dbca0de4b7c6982a6178f2de45 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:41 +0100
Subject: [PATCH 04/14] droidcam: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 26 +++++++++++++++++++
srcpkgs/droidcam/template | 5 ++--
2 files changed, 29 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..32ab45377152
--- /dev/null
+++ b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,26 @@
+diff --git a/Makefile b/Makefile
+index 7be3c15..b7f16c4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -13,7 +13,7 @@ JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
+ CC = gcc
+ CFLAGS = -Wall -O2
+ GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
+-GTK += `pkg-config --cflags --libs appindicator3-0.1`
++GTK += `pkg-config --cflags --libs ayatana-appindicator3-0.1`
+ LIBAV = `pkg-config --libs --cflags libswscale libavutil`
+ LIBS = -lspeex -lasound -lpthread -lm
+ JPEG = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a
+diff --git a/src/droidcam.c b/src/droidcam.c
+index cad1ee4..28f4000 100644
+--- a/src/droidcam.c
++++ b/src/droidcam.c
+@@ -7,7 +7,7 @@
+ */
+
+ #include <gtk/gtk.h>
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+ #include <X11/Xlib.h>
+ #include <stdint.h>
+
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1207bdec5cea..1c3f1b8b1fc6 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,12 +1,13 @@
# Template file for 'droidcam'
pkgname=droidcam
version=1.8.2
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg"
hostmakedepends="pkg-config"
makedepends="pkg-config libjpeg-turbo-devel ffmpeg-devel alsa-lib-devel
- speex-devel libusbmuxd-devel libplist-devel gtk+3-devel libappindicator-devel"
+ speex-devel libusbmuxd-devel libplist-devel gtk+3-devel
+ libayatana-appindicator-devel"
depends="v4l2loopback"
short_desc="Tool for using your android device as a wireless/usb webcam"
maintainer="ibrokemypie <ibrokemypie@bastardi.net>"
From ad65f69689747a37bb6c439625b37454b14b2b23 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 05/14] gromit-mpx: replace libappindicator with
libayatana-appindicator
---
srcpkgs/gromit-mpx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gromit-mpx/template b/srcpkgs/gromit-mpx/template
index 3330ccfeba2b..82d1068872d7 100644
--- a/srcpkgs/gromit-mpx/template
+++ b/srcpkgs/gromit-mpx/template
@@ -1,10 +1,10 @@
# Template file for 'gromit-mpx'
pkgname=gromit-mpx
version=1.4.2
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="gtk+3-devel libappindicator-devel libdbusmenu-glib-devel"
+makedepends="gtk+3-devel libayatana-appindicator-devel libdbusmenu-glib-devel"
short_desc="Multi-pointer annotation tool"
maintainer="Toyam Cox <Vaelatern@gmail.com>"
license="GPL-2.0-only"
From 0118aeeeceb7ad0a9d49564738a63dd4d02ef3ba Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 06/14] network-manager-applet: replace libappindicator with
libayatana-appindicator
---
srcpkgs/network-manager-applet/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 7bbc7a671da5..ee5e63b467ed 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,12 +1,12 @@
# Template file for 'network-manager-applet'
pkgname=network-manager-applet
version=1.30.0
-revision=1
+revision=2
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
- libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libayatana-appindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
libgudev-devel libnotify-devel libnma-devel libsecret-devel
polkit-devel mobile-broadband-provider-info"
depends="NetworkManager hicolor-icon-theme iso-codes"
From 0da0b7b00c50ce80002fd4e62e031196e64e1688 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 07/14] psensor: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 53 +++++++++++++++++++
srcpkgs/psensor/template | 6 +--
2 files changed, 56 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/psensor/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/psensor/patches/use-ayatana-appindicator.patch b/srcpkgs/psensor/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..f8350ca6f77f
--- /dev/null
+++ b/srcpkgs/psensor/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,53 @@
+From d84498639263d6a8f8d4b4adddf3dab66631876b Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 22 Jan 2022 00:15:13 +0100
+Subject: [PATCH] Use ayatana appindicator
+
+---
+ configure.ac | 2 +-
+ src/ui.h | 2 +-
+ src/ui_appindicator.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 48b10eb..2ff857d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -117,7 +117,7 @@ AC_SUBST(LIBNOTIFY_LIBS)
+
+ # Checks AppIndicator
+ APPINDICATOR_LIBS=
+-PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1,
++PKG_CHECK_MODULES(APPINDICATOR, ayatana-appindicator3-0.1,
+ [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator3-0.1])],
+ [AC_MSG_WARN(AppIndicator 3-0.1 not present")])
+ AM_CONDITIONAL(APPINDICATOR, test -n "$APPINDICATOR_LIBS")
+diff --git a/src/ui.h b/src/ui.h
+index 426f29c..43ae4be 100644
+--- a/src/ui.h
++++ b/src/ui.h
+@@ -27,7 +27,7 @@
+ #include <gtk/gtk.h>
+
+ #if defined(HAVE_APPINDICATOR)
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+ #endif
+
+ #include "psensor.h"
+diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
+index ed4cc64..b3179c0 100644
+--- a/src/ui_appindicator.c
++++ b/src/ui_appindicator.c
+@@ -21,7 +21,7 @@
+ #include <string.h>
+
+ #include <gtk/gtk.h>
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+
+ #include <cfg.h>
+ #include <psensor.h>
+--
+2.34.1
+
diff --git a/srcpkgs/psensor/template b/srcpkgs/psensor/template
index d21a33c4c695..752e9fe04e7c 100644
--- a/srcpkgs/psensor/template
+++ b/srcpkgs/psensor/template
@@ -1,12 +1,12 @@
# Template file for 'psensor'
pkgname=psensor
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
-hostmakedepends="pkg-config glib-devel"
+hostmakedepends="pkg-config glib-devel automake"
makedepends="gtk+3-devel udisks2-devel libgtop-devel json-c-devel
libsensors-devel libatasmart-devel libcurl-devel libnotify-devel
- libappindicator-devel libmicrohttpd-devel"
+ libayatana-appindicator-devel libmicrohttpd-devel"
depends="lm_sensors"
short_desc="Graphical hardware temperature monitor for Linux"
maintainer="Foxlet <foxlet@furcode.co>"
From 674ae3f0839a7b6526279be254ec82fd684478d0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 08/14] remmina: replace libappindicator with
libayatana-appindicator
---
srcpkgs/remmina/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 0da8cad6604b..9bf538220fef 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
# Template file for 'remmina'
pkgname=remmina
version=1.4.27
-revision=3
+revision=4
build_style=cmake
configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"
hostmakedepends="glib-devel intltool pkg-config shared-mime-info"
@@ -11,7 +11,7 @@ makedepends="avahi-glib-libs-devel avahi-ui-libs-devel freerdp-devel
libsecret-devel libsodium-devel libsoup3-devel libssh-devel libva-devel
libvncserver-devel libxkbfile-devel opus-devel phodav-devel
spice-gtk-devel spice-protocol telepathy-glib-devel usbredir-devel
- vte3-devel libappindicator-devel libwebkit2gtk41-devel python3-devel"
+ vte3-devel libayatana-appindicator-devel libwebkit2gtk41-devel python3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Remote desktop client written in GTK+"
maintainer="Frank Steinborn <steinex@nognu.de>"
From 424fc2027ac94f0ab7209ff841a6510095c40afc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 09/14] ulauncher: replace libappindicator with
libayatana-appindicator
---
srcpkgs/ulauncher/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ulauncher/template b/srcpkgs/ulauncher/template
index 0eb497d16e1c..d592930f6d24 100644
--- a/srcpkgs/ulauncher/template
+++ b/srcpkgs/ulauncher/template
@@ -1,12 +1,12 @@
# Template file for 'ulauncher'
pkgname=ulauncher
version=5.14.3
-revision=2
+revision=3
build_style=python3-module
hostmakedepends="python3-distutils-extra intltool python3-Levenshtein
python3-dbus python3-gobject python3-inotify python3-websocket-client
python3-xdg"
-depends="libappindicator>=12.10.0_2 libkeybinder3 python3-Levenshtein python3-dbus
+depends="libayatana-appindicator libkeybinder3 python3-Levenshtein python3-dbus
python3-gobject python3-inotify python3-websocket-client python3-xdg webkit2gtk"
short_desc="Linux application launcher with fuzzy search and extensions"
maintainer="Alberto Pau <me@albertopau.com>"
From c1bccab7fd457466629e0c7c5fba6403e7ae6483 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 10/14] gwe: replace libappindicator with
libayatana-appindicator
---
.../gwe/patches/use-ayatana-appindicator.patch | 15 +++++++++++++++
srcpkgs/gwe/template | 4 ++--
2 files changed, 17 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gwe/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/gwe/patches/use-ayatana-appindicator.patch b/srcpkgs/gwe/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..05029c1c7755
--- /dev/null
+++ b/srcpkgs/gwe/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,15 @@
+diff --git a/gwe/view/main_view.py b/gwe/view/main_view.py
+index 61c891d..6f573c2 100644
+--- a/gwe/view/main_view.py
++++ b/gwe/view/main_view.py
+@@ -31,8 +31,8 @@ from gwe.model.fan_profile import FanProfile
+ try: # AppIndicator3 may not be installed
+ import gi
+
+- gi.require_version('AppIndicator3', '0.1')
+- from gi.repository import AppIndicator3
++ gi.require_version('AyatanaAppIndicator3', '0.1')
++ from gi.repository import AyatanaAppIndicator3 as AppIndicator3
+ except (ImportError, ValueError):
+ AppIndicator3 = None
+ from gwe.di import MainBuilder
diff --git a/srcpkgs/gwe/template b/srcpkgs/gwe/template
index f4473200cd67..ce70ed78573c 100644
--- a/srcpkgs/gwe/template
+++ b/srcpkgs/gwe/template
@@ -1,14 +1,14 @@
# Template file for 'gwe'
pkgname=gwe
version=0.15.2
-revision=3
+revision=4
build_style=meson
hostmakedepends="pkg-config meson ninja glib-devel gtk+3-devel python3 python3-devel
python3-matplotlib python3-peewee python3-gobject python3-xlib python3-xdg
python3-requests python3-rx python3-nvml python3-injector python3-urllib3 python3-six
python3-chardet python3-idna python3-xlib python3-numpy python3-parsing python3-cycler python3-dateutil python3-Pillow"
makedepends="gobject-introspection appstream-glib"
-depends="python3 gobject-introspection libappindicator libdazzle python3-matplotlib
+depends="python3 gobject-introspection libayatana-appindicator libdazzle python3-matplotlib
python3-peewee python3-gobject python3-xlib python3-xdg python3-requests python3-rx
python3-nvml python3-injector python3-urllib3 python3-six python3-chardet python3-idna
python3-xlib python3-numpy python3-parsing python3-cycler python3-dateutil python3-Pillow"
From cfda996f82bd01a5da4b9d1d92c93aff62382490 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 11/14] caffeine-ng: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 16 ++++++++++++++++
srcpkgs/caffeine-ng/template | 4 ++--
2 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch b/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..925dad3e0410
--- /dev/null
+++ b/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,16 @@
+diff --git a/caffeine/main.py b/caffeine/main.py
+index 516a138..f48653b 100644
+--- a/caffeine/main.py
++++ b/caffeine/main.py
+@@ -32,9 +32,9 @@ try:
+ gi.require_version("Notify", "0.7")
+ except ValueError:
+ gi.require_version("Notify", "0.8")
+-gi.require_version("AppIndicator3", "0.1")
++gi.require_version("AyatanaAppIndicator3", "0.1")
+
+-from gi.repository import AppIndicator3 # noqa: E402
++from gi.repository import AyatanaAppIndicator3 as AppIndicator3 # noqa: E402
+ from gi.repository import GdkPixbuf # noqa: E402
+ from gi.repository import Gtk # noqa: E402
+ from gi.repository.Notify import Notification # noqa: E402
diff --git a/srcpkgs/caffeine-ng/template b/srcpkgs/caffeine-ng/template
index 4f1b6774cdd2..3289bf5bad43 100644
--- a/srcpkgs/caffeine-ng/template
+++ b/srcpkgs/caffeine-ng/template
@@ -1,13 +1,13 @@
# Template file for 'caffeine-ng'
pkgname=caffeine-ng
version=4.0.2
-revision=3
+revision=4
build_style=python3-module
hostmakedepends="python3-setuptools_scm"
depends="desktop-file-utils gtk+3 hicolor-icon-theme libnotify
python3-dbus python3-click python3-ewmh python3-gobject
python3-setproctitle python3-setuptools python3-xdg
- python3-pulsectl libappindicator"
+ python3-pulsectl libayatana-appindicator"
short_desc="Temporarily inhibits the screensaver and sleep mode"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
From 19344a5c86fc963404e3b80c3a7290de9f6e2ee8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 12/14] indicator-doom-cpu: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 13 +++++++++++++
srcpkgs/indicator-doom-cpu/template | 4 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch b/srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..00a185b7d6ed
--- /dev/null
+++ b/srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,13 @@
+diff --git a/indicator-doom-cpu b/indicator-doom-cpu
+index a1528e3..c4ff4d2 100755
+--- a/indicator-doom-cpu
++++ b/indicator-doom-cpu
+@@ -27,7 +27,7 @@ import time
+ from gi.repository import Gtk, GObject, GdkPixbuf
+
+ try:
+- from gi.repository import AppIndicator3 as AppIndicator
++ from gi.repository import AyatanaAppIndicator3 as AppIndicator
+ appindicator_imported = True
+ except ImportError:
+ appindicator_imported = False
diff --git a/srcpkgs/indicator-doom-cpu/template b/srcpkgs/indicator-doom-cpu/template
index eb15aa66335a..75da2d47ae33 100644
--- a/srcpkgs/indicator-doom-cpu/template
+++ b/srcpkgs/indicator-doom-cpu/template
@@ -1,8 +1,8 @@
# Template file for 'indicator-doom-cpu'
pkgname=indicator-doom-cpu
version=1.0.1
-revision=3
-depends="python3-gobject gtk+3 libappindicator"
+revision=4
+depends="python3-gobject gtk+3 libayatana-appindicator"
short_desc="CPU load indicator showing the dying face from the video game DOOM"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-only"
From 22f7bc939168138c33862c2b4272faa737730d4a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:43 +0100
Subject: [PATCH 13/14] element-desktop: remove build dependency on
libappindicator-devel
---
srcpkgs/element-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 7ff0efdd6463..ed4023ebf875 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -5,7 +5,7 @@ revision=1
create_wrksrc=yes
conf_files="/etc/${pkgname}/config.json"
hostmakedepends="git yarn nodejs rust cargo python3 curl
- sqlcipher-devel libappindicator-devel libnotify-devel pkg-config
+ sqlcipher-devel libnotify-devel pkg-config
app-builder jq moreutils"
makedepends="libsecret-devel"
depends="c-ares ffmpeg gtk+3 http-parser libevent
From 8e5c10a0e6b6c5c44db59c0f20845885af94c1e8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:43 +0100
Subject: [PATCH 14/14] safeeyes: replace libappindicator with
libayatana-appindicator
---
srcpkgs/safeeyes/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/safeeyes/template b/srcpkgs/safeeyes/template
index 0011b9c9c07e..ff42de3c805b 100644
--- a/srcpkgs/safeeyes/template
+++ b/srcpkgs/safeeyes/template
@@ -1,11 +1,11 @@
# Template file for 'safeeyes'
pkgname=safeeyes
version=2.1.4
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-pip python3-devel pkg-config"
makedepends="python3-devel cairo-devel libgirepository-devel"
-depends="python3-psutil libappindicator python3-gobject python3-Babel
+depends="python3-psutil libayatana-appindicator python3-gobject python3-Babel
python3-dbus xprop alsa-utils python3-xlib"
checkdepends="$depends"
short_desc="Tool to reduce and prevent repetitive strain injury"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] Ayatana indicators
2022-11-25 18:04 [PR PATCH] Ayatana indicators tibequadorian
` (7 preceding siblings ...)
2022-11-30 9:53 ` tibequadorian
@ 2022-12-12 9:26 ` tibequadorian
2022-12-12 17:19 ` tibequadorian
` (5 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: tibequadorian @ 2022-12-12 9:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2870 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ayatana-indicators
https://github.com/void-linux/void-packages/pull/40761
Ayatana indicators
<!-- Uncomment relevant sections and delete options which are not applicable -->
Continuation of #35135
`libappindicator` hasn't seen a release since 2012 (more than 10 years!)
Debian has removed it in buster and switched to [libayatana-appindicator](https://ayatanaindicators.github.io/).
This PR tries to replace `libappindicator` with `libayatana-appindicator`.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### TODO:
- [x] `droidcam` - only [supported](https://github.com/dev47apps/droidcam/commit/71a74d22ed700650a83b7cb653bd92b0ed3cd01a) in master, patched
- [x] `gromit-mpx` - [supported](https://github.com/bk138/gromit-mpx/commit/2a838303154df4a90495c4f93741846cbd63d37f)
- [x] `network-manager-applet` - supported
- [x] `psensor` - not supported, patched
- [x] `remmina` - [supported](https://github.com/FreeRDP/Remmina/commit/a34133add92c217943acad64bb0e41de0f2f619c)
- [x] `ulauncher` - supported
- [x] `gwe` - [not supported](https://gitlab.com/leinardi/gwe/-/issues/156), patched
- [x] `caffeine-ng` - only [supported](https://codeberg.org/WhyNotHugo/caffeine-ng/commit/d13b2b97160649b465213e691a8df2e958ecf739) in master, patched
- [x] `indicator-doom-cpu` - not supported, patched
- [x] `element-desktop` - [not supported](https://github.com/electron/electron/issues/27527) but works fine without it and uses systray instead, removed dependency,
see https://github.com/vector-im/element-desktop/pull/170
and https://github.com/signalapp/Signal-Desktop/pull/5031#issuecomment-788068627.
_No revbump needed because not the package but only the template required libappindicator._
- [x] `safeeyes` - [supported](https://github.com/slgobinath/SafeEyes/commit/c784000e694f9fa508a2535f5d23d04456b4ff86) in 2.1.4, #40763
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40761.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ayatana-indicators-40761.patch --]
[-- Type: text/x-diff, Size: 25719 bytes --]
From b836fb75d831431d185baf4fcffbd3a2bab59bab Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:41 +0100
Subject: [PATCH 01/14] New package: ayatana-ido-0.9.2
---
common/shlibs | 1 +
srcpkgs/ayatana-ido-devel | 1 +
srcpkgs/ayatana-ido/template | 27 +++++++++++++++++++++++++++
3 files changed, 29 insertions(+)
create mode 120000 srcpkgs/ayatana-ido-devel
create mode 100644 srcpkgs/ayatana-ido/template
diff --git a/common/shlibs b/common/shlibs
index f4b1ffd29dee..e7ed149d82e9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4224,3 +4224,4 @@ libfst.so.25 openfst-1.8.2_1
libvosk.so vosk-api-0.3.43_1
libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
+libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
diff --git a/srcpkgs/ayatana-ido-devel b/srcpkgs/ayatana-ido-devel
new file mode 120000
index 000000000000..2e1aa73a149c
--- /dev/null
+++ b/srcpkgs/ayatana-ido-devel
@@ -0,0 +1 @@
+ayatana-ido
\ No newline at end of file
diff --git a/srcpkgs/ayatana-ido/template b/srcpkgs/ayatana-ido/template
new file mode 100644
index 000000000000..717ad5808405
--- /dev/null
+++ b/srcpkgs/ayatana-ido/template
@@ -0,0 +1,27 @@
+# Template file for 'ayatana-ido'
+pkgname=ayatana-ido
+version=0.9.2
+revision=1
+build_helper="gir"
+build_style=cmake
+hostmakedepends="pkg-config gobject-introspection vala"
+makedepends="gtk+3-devel glib-devel"
+short_desc="Ayatana Indicator Display Objects"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+changelog="https://github.com/AyatanaIndicators/ayatana-ido/raw/main/ChangeLog"
+distfiles="https://github.com/AyatanaIndicators/ayatana-ido/archive/${version}.tar.gz"
+checksum=b166e7a160458e4a71f6086d2e4e97e18cf1ac584231a4b9f1f338914203884c
+
+ayatana-ido-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
+ }
+}
From 2c3556d6af4bd4aa5c40b2710bffac079d023c36 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:41 +0100
Subject: [PATCH 02/14] New package: libayatana-indicator-0.9.3
---
common/shlibs | 1 +
srcpkgs/libayatana-indicator-devel | 1 +
srcpkgs/libayatana-indicator/template | 24 ++++++++++++++++++++++++
3 files changed, 26 insertions(+)
create mode 120000 srcpkgs/libayatana-indicator-devel
create mode 100644 srcpkgs/libayatana-indicator/template
diff --git a/common/shlibs b/common/shlibs
index e7ed149d82e9..19abf4f558dd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4225,3 +4225,4 @@ libvosk.so vosk-api-0.3.43_1
libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
+libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
diff --git a/srcpkgs/libayatana-indicator-devel b/srcpkgs/libayatana-indicator-devel
new file mode 120000
index 000000000000..fdfe7dbb5d64
--- /dev/null
+++ b/srcpkgs/libayatana-indicator-devel
@@ -0,0 +1 @@
+libayatana-indicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-indicator/template b/srcpkgs/libayatana-indicator/template
new file mode 100644
index 000000000000..a780816306c1
--- /dev/null
+++ b/srcpkgs/libayatana-indicator/template
@@ -0,0 +1,24 @@
+# Template file for 'libayatana-indicator'
+pkgname=libayatana-indicator
+version=0.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config python3"
+makedepends="glib-devel gtk+3-devel ayatana-ido-devel"
+short_desc="Ayatana Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="GPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+changelog="https://github.com/AyatanaIndicators/libayatana-indicator/raw/main/ChangeLog"
+distfiles="https://github.com/AyatanaIndicators/libayatana-indicator/archive/${version}.tar.gz"
+checksum=09c5456fcb430b6ee0626fafdf99a32eb8746b267d56ab2bd4c8a8dd6ca731da
+
+libayatana-indicator-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From 9befa881965bc0829f25805cba5f9df79d3de2e8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:41 +0100
Subject: [PATCH 03/14] New package: libayatana-appindicator-0.5.91
---
common/shlibs | 1 +
srcpkgs/libayatana-appindicator-devel | 1 +
srcpkgs/libayatana-appindicator/template | 32 ++++++++++++++++++++++++
3 files changed, 34 insertions(+)
create mode 120000 srcpkgs/libayatana-appindicator-devel
create mode 100644 srcpkgs/libayatana-appindicator/template
diff --git a/common/shlibs b/common/shlibs
index 19abf4f558dd..f4071db983dd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4226,3 +4226,4 @@ libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
+libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
diff --git a/srcpkgs/libayatana-appindicator-devel b/srcpkgs/libayatana-appindicator-devel
new file mode 120000
index 000000000000..a2ff93abbc17
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator-devel
@@ -0,0 +1 @@
+libayatana-appindicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-appindicator/template b/srcpkgs/libayatana-appindicator/template
new file mode 100644
index 000000000000..01b0a341d20a
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator/template
@@ -0,0 +1,32 @@
+# Template file for 'libayatana-appindicator'
+pkgname=libayatana-appindicator
+version=0.5.91
+revision=1
+build_helper="gir"
+build_style=cmake
+configure_args="-DENABLE_BINDINGS_MONO=OFF -DENABLE_BINDINGS_VALA=$(vopt_if vala ON OFF)"
+hostmakedepends="pkg-config gobject-introspection $(vopt_if vala vala)"
+makedepends="glib-devel gtk+3-devel libdbusmenu-gtk3-devel libayatana-indicator-devel"
+short_desc="Ayatana Application Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+distfiles="https://github.com/AyatanaIndicators/libayatana-appindicator/archive/${version}.tar.gz"
+checksum=52eb5d0c0de07177833e50fbaee592dcb3939e96c6b789921e2a8caf40a1ed26
+
+build_options="vala"
+build_options_default="vala"
+
+libayatana-appindicator-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ if [ "$build_option_vala" ]; then
+ vmove usr/share/vala
+ fi
+ }
+}
From 6c05001e13bf88b67778c0c3f1ed7848cf991b39 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:41 +0100
Subject: [PATCH 04/14] droidcam: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 26 +++++++++++++++++++
srcpkgs/droidcam/template | 5 ++--
2 files changed, 29 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..32ab45377152
--- /dev/null
+++ b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,26 @@
+diff --git a/Makefile b/Makefile
+index 7be3c15..b7f16c4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -13,7 +13,7 @@ JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
+ CC = gcc
+ CFLAGS = -Wall -O2
+ GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
+-GTK += `pkg-config --cflags --libs appindicator3-0.1`
++GTK += `pkg-config --cflags --libs ayatana-appindicator3-0.1`
+ LIBAV = `pkg-config --libs --cflags libswscale libavutil`
+ LIBS = -lspeex -lasound -lpthread -lm
+ JPEG = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a
+diff --git a/src/droidcam.c b/src/droidcam.c
+index cad1ee4..28f4000 100644
+--- a/src/droidcam.c
++++ b/src/droidcam.c
+@@ -7,7 +7,7 @@
+ */
+
+ #include <gtk/gtk.h>
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+ #include <X11/Xlib.h>
+ #include <stdint.h>
+
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1207bdec5cea..1c3f1b8b1fc6 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,12 +1,13 @@
# Template file for 'droidcam'
pkgname=droidcam
version=1.8.2
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg"
hostmakedepends="pkg-config"
makedepends="pkg-config libjpeg-turbo-devel ffmpeg-devel alsa-lib-devel
- speex-devel libusbmuxd-devel libplist-devel gtk+3-devel libappindicator-devel"
+ speex-devel libusbmuxd-devel libplist-devel gtk+3-devel
+ libayatana-appindicator-devel"
depends="v4l2loopback"
short_desc="Tool for using your android device as a wireless/usb webcam"
maintainer="ibrokemypie <ibrokemypie@bastardi.net>"
From 8efe9a42fd2763e9d79f751b42a81dda630c935d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 05/14] gromit-mpx: replace libappindicator with
libayatana-appindicator
---
srcpkgs/gromit-mpx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gromit-mpx/template b/srcpkgs/gromit-mpx/template
index 3330ccfeba2b..82d1068872d7 100644
--- a/srcpkgs/gromit-mpx/template
+++ b/srcpkgs/gromit-mpx/template
@@ -1,10 +1,10 @@
# Template file for 'gromit-mpx'
pkgname=gromit-mpx
version=1.4.2
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="gtk+3-devel libappindicator-devel libdbusmenu-glib-devel"
+makedepends="gtk+3-devel libayatana-appindicator-devel libdbusmenu-glib-devel"
short_desc="Multi-pointer annotation tool"
maintainer="Toyam Cox <Vaelatern@gmail.com>"
license="GPL-2.0-only"
From edd72490aed16abff0951dfe2de0bf3347465728 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 06/14] network-manager-applet: replace libappindicator with
libayatana-appindicator
---
srcpkgs/network-manager-applet/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 7bbc7a671da5..ee5e63b467ed 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,12 +1,12 @@
# Template file for 'network-manager-applet'
pkgname=network-manager-applet
version=1.30.0
-revision=1
+revision=2
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
- libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libayatana-appindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
libgudev-devel libnotify-devel libnma-devel libsecret-devel
polkit-devel mobile-broadband-provider-info"
depends="NetworkManager hicolor-icon-theme iso-codes"
From 78061b4310a08c3ac97d68968fc365cdcea42373 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 07/14] psensor: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 53 +++++++++++++++++++
srcpkgs/psensor/template | 6 +--
2 files changed, 56 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/psensor/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/psensor/patches/use-ayatana-appindicator.patch b/srcpkgs/psensor/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..f8350ca6f77f
--- /dev/null
+++ b/srcpkgs/psensor/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,53 @@
+From d84498639263d6a8f8d4b4adddf3dab66631876b Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 22 Jan 2022 00:15:13 +0100
+Subject: [PATCH] Use ayatana appindicator
+
+---
+ configure.ac | 2 +-
+ src/ui.h | 2 +-
+ src/ui_appindicator.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 48b10eb..2ff857d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -117,7 +117,7 @@ AC_SUBST(LIBNOTIFY_LIBS)
+
+ # Checks AppIndicator
+ APPINDICATOR_LIBS=
+-PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1,
++PKG_CHECK_MODULES(APPINDICATOR, ayatana-appindicator3-0.1,
+ [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator3-0.1])],
+ [AC_MSG_WARN(AppIndicator 3-0.1 not present")])
+ AM_CONDITIONAL(APPINDICATOR, test -n "$APPINDICATOR_LIBS")
+diff --git a/src/ui.h b/src/ui.h
+index 426f29c..43ae4be 100644
+--- a/src/ui.h
++++ b/src/ui.h
+@@ -27,7 +27,7 @@
+ #include <gtk/gtk.h>
+
+ #if defined(HAVE_APPINDICATOR)
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+ #endif
+
+ #include "psensor.h"
+diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
+index ed4cc64..b3179c0 100644
+--- a/src/ui_appindicator.c
++++ b/src/ui_appindicator.c
+@@ -21,7 +21,7 @@
+ #include <string.h>
+
+ #include <gtk/gtk.h>
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+
+ #include <cfg.h>
+ #include <psensor.h>
+--
+2.34.1
+
diff --git a/srcpkgs/psensor/template b/srcpkgs/psensor/template
index d21a33c4c695..752e9fe04e7c 100644
--- a/srcpkgs/psensor/template
+++ b/srcpkgs/psensor/template
@@ -1,12 +1,12 @@
# Template file for 'psensor'
pkgname=psensor
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
-hostmakedepends="pkg-config glib-devel"
+hostmakedepends="pkg-config glib-devel automake"
makedepends="gtk+3-devel udisks2-devel libgtop-devel json-c-devel
libsensors-devel libatasmart-devel libcurl-devel libnotify-devel
- libappindicator-devel libmicrohttpd-devel"
+ libayatana-appindicator-devel libmicrohttpd-devel"
depends="lm_sensors"
short_desc="Graphical hardware temperature monitor for Linux"
maintainer="Foxlet <foxlet@furcode.co>"
From cd13925fe1275177a35f80c98cbb7aefc6cb7aec Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 08/14] remmina: replace libappindicator with
libayatana-appindicator
---
srcpkgs/remmina/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 0da8cad6604b..9bf538220fef 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
# Template file for 'remmina'
pkgname=remmina
version=1.4.27
-revision=3
+revision=4
build_style=cmake
configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"
hostmakedepends="glib-devel intltool pkg-config shared-mime-info"
@@ -11,7 +11,7 @@ makedepends="avahi-glib-libs-devel avahi-ui-libs-devel freerdp-devel
libsecret-devel libsodium-devel libsoup3-devel libssh-devel libva-devel
libvncserver-devel libxkbfile-devel opus-devel phodav-devel
spice-gtk-devel spice-protocol telepathy-glib-devel usbredir-devel
- vte3-devel libappindicator-devel libwebkit2gtk41-devel python3-devel"
+ vte3-devel libayatana-appindicator-devel libwebkit2gtk41-devel python3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Remote desktop client written in GTK+"
maintainer="Frank Steinborn <steinex@nognu.de>"
From 361c43c9b7e6291f609689348fa472ebfa88cb68 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 09/14] ulauncher: replace libappindicator with
libayatana-appindicator
---
srcpkgs/ulauncher/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ulauncher/template b/srcpkgs/ulauncher/template
index 0eb497d16e1c..d592930f6d24 100644
--- a/srcpkgs/ulauncher/template
+++ b/srcpkgs/ulauncher/template
@@ -1,12 +1,12 @@
# Template file for 'ulauncher'
pkgname=ulauncher
version=5.14.3
-revision=2
+revision=3
build_style=python3-module
hostmakedepends="python3-distutils-extra intltool python3-Levenshtein
python3-dbus python3-gobject python3-inotify python3-websocket-client
python3-xdg"
-depends="libappindicator>=12.10.0_2 libkeybinder3 python3-Levenshtein python3-dbus
+depends="libayatana-appindicator libkeybinder3 python3-Levenshtein python3-dbus
python3-gobject python3-inotify python3-websocket-client python3-xdg webkit2gtk"
short_desc="Linux application launcher with fuzzy search and extensions"
maintainer="Alberto Pau <me@albertopau.com>"
From 16606d130d19ad5c4106693abdd0e3ee3e721b4b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 10/14] gwe: replace libappindicator with
libayatana-appindicator
---
.../gwe/patches/use-ayatana-appindicator.patch | 15 +++++++++++++++
srcpkgs/gwe/template | 4 ++--
2 files changed, 17 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gwe/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/gwe/patches/use-ayatana-appindicator.patch b/srcpkgs/gwe/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..05029c1c7755
--- /dev/null
+++ b/srcpkgs/gwe/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,15 @@
+diff --git a/gwe/view/main_view.py b/gwe/view/main_view.py
+index 61c891d..6f573c2 100644
+--- a/gwe/view/main_view.py
++++ b/gwe/view/main_view.py
+@@ -31,8 +31,8 @@ from gwe.model.fan_profile import FanProfile
+ try: # AppIndicator3 may not be installed
+ import gi
+
+- gi.require_version('AppIndicator3', '0.1')
+- from gi.repository import AppIndicator3
++ gi.require_version('AyatanaAppIndicator3', '0.1')
++ from gi.repository import AyatanaAppIndicator3 as AppIndicator3
+ except (ImportError, ValueError):
+ AppIndicator3 = None
+ from gwe.di import MainBuilder
diff --git a/srcpkgs/gwe/template b/srcpkgs/gwe/template
index f4473200cd67..ce70ed78573c 100644
--- a/srcpkgs/gwe/template
+++ b/srcpkgs/gwe/template
@@ -1,14 +1,14 @@
# Template file for 'gwe'
pkgname=gwe
version=0.15.2
-revision=3
+revision=4
build_style=meson
hostmakedepends="pkg-config meson ninja glib-devel gtk+3-devel python3 python3-devel
python3-matplotlib python3-peewee python3-gobject python3-xlib python3-xdg
python3-requests python3-rx python3-nvml python3-injector python3-urllib3 python3-six
python3-chardet python3-idna python3-xlib python3-numpy python3-parsing python3-cycler python3-dateutil python3-Pillow"
makedepends="gobject-introspection appstream-glib"
-depends="python3 gobject-introspection libappindicator libdazzle python3-matplotlib
+depends="python3 gobject-introspection libayatana-appindicator libdazzle python3-matplotlib
python3-peewee python3-gobject python3-xlib python3-xdg python3-requests python3-rx
python3-nvml python3-injector python3-urllib3 python3-six python3-chardet python3-idna
python3-xlib python3-numpy python3-parsing python3-cycler python3-dateutil python3-Pillow"
From 2248bf414fa53769af6dd13d693517617145986c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 11/14] caffeine-ng: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 16 ++++++++++++++++
srcpkgs/caffeine-ng/template | 4 ++--
2 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch b/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..925dad3e0410
--- /dev/null
+++ b/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,16 @@
+diff --git a/caffeine/main.py b/caffeine/main.py
+index 516a138..f48653b 100644
+--- a/caffeine/main.py
++++ b/caffeine/main.py
+@@ -32,9 +32,9 @@ try:
+ gi.require_version("Notify", "0.7")
+ except ValueError:
+ gi.require_version("Notify", "0.8")
+-gi.require_version("AppIndicator3", "0.1")
++gi.require_version("AyatanaAppIndicator3", "0.1")
+
+-from gi.repository import AppIndicator3 # noqa: E402
++from gi.repository import AyatanaAppIndicator3 as AppIndicator3 # noqa: E402
+ from gi.repository import GdkPixbuf # noqa: E402
+ from gi.repository import Gtk # noqa: E402
+ from gi.repository.Notify import Notification # noqa: E402
diff --git a/srcpkgs/caffeine-ng/template b/srcpkgs/caffeine-ng/template
index 4f1b6774cdd2..3289bf5bad43 100644
--- a/srcpkgs/caffeine-ng/template
+++ b/srcpkgs/caffeine-ng/template
@@ -1,13 +1,13 @@
# Template file for 'caffeine-ng'
pkgname=caffeine-ng
version=4.0.2
-revision=3
+revision=4
build_style=python3-module
hostmakedepends="python3-setuptools_scm"
depends="desktop-file-utils gtk+3 hicolor-icon-theme libnotify
python3-dbus python3-click python3-ewmh python3-gobject
python3-setproctitle python3-setuptools python3-xdg
- python3-pulsectl libappindicator"
+ python3-pulsectl libayatana-appindicator"
short_desc="Temporarily inhibits the screensaver and sleep mode"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
From 72224a446caf12cd018f81e3eeb80ac80853eee9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 12/14] indicator-doom-cpu: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 13 +++++++++++++
srcpkgs/indicator-doom-cpu/template | 4 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch b/srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..00a185b7d6ed
--- /dev/null
+++ b/srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,13 @@
+diff --git a/indicator-doom-cpu b/indicator-doom-cpu
+index a1528e3..c4ff4d2 100755
+--- a/indicator-doom-cpu
++++ b/indicator-doom-cpu
+@@ -27,7 +27,7 @@ import time
+ from gi.repository import Gtk, GObject, GdkPixbuf
+
+ try:
+- from gi.repository import AppIndicator3 as AppIndicator
++ from gi.repository import AyatanaAppIndicator3 as AppIndicator
+ appindicator_imported = True
+ except ImportError:
+ appindicator_imported = False
diff --git a/srcpkgs/indicator-doom-cpu/template b/srcpkgs/indicator-doom-cpu/template
index eb15aa66335a..75da2d47ae33 100644
--- a/srcpkgs/indicator-doom-cpu/template
+++ b/srcpkgs/indicator-doom-cpu/template
@@ -1,8 +1,8 @@
# Template file for 'indicator-doom-cpu'
pkgname=indicator-doom-cpu
version=1.0.1
-revision=3
-depends="python3-gobject gtk+3 libappindicator"
+revision=4
+depends="python3-gobject gtk+3 libayatana-appindicator"
short_desc="CPU load indicator showing the dying face from the video game DOOM"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-only"
From 3769cd768d16164d79be7681c03c5c00f0482b37 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:43 +0100
Subject: [PATCH 13/14] element-desktop: remove build dependency on
libappindicator-devel
---
srcpkgs/element-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 3bf270cff998..1dd2c8aa8ccc 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -5,7 +5,7 @@ revision=1
create_wrksrc=yes
conf_files="/etc/${pkgname}/config.json"
hostmakedepends="git yarn nodejs rust cargo python3 curl
- sqlcipher-devel libappindicator-devel libnotify-devel pkg-config
+ sqlcipher-devel libnotify-devel pkg-config
app-builder jq moreutils"
makedepends="libsecret-devel"
depends="c-ares ffmpeg gtk+3 http-parser libevent
From 6d3398f119ae3ef68c833a0a4a493aa204b75fcc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:43 +0100
Subject: [PATCH 14/14] safeeyes: replace libappindicator with
libayatana-appindicator
---
srcpkgs/safeeyes/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/safeeyes/template b/srcpkgs/safeeyes/template
index 0011b9c9c07e..ff42de3c805b 100644
--- a/srcpkgs/safeeyes/template
+++ b/srcpkgs/safeeyes/template
@@ -1,11 +1,11 @@
# Template file for 'safeeyes'
pkgname=safeeyes
version=2.1.4
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-pip python3-devel pkg-config"
makedepends="python3-devel cairo-devel libgirepository-devel"
-depends="python3-psutil libappindicator python3-gobject python3-Babel
+depends="python3-psutil libayatana-appindicator python3-gobject python3-Babel
python3-dbus xprop alsa-utils python3-xlib"
checkdepends="$depends"
short_desc="Tool to reduce and prevent repetitive strain injury"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] Ayatana indicators
2022-11-25 18:04 [PR PATCH] Ayatana indicators tibequadorian
` (8 preceding siblings ...)
2022-12-12 9:26 ` tibequadorian
@ 2022-12-12 17:19 ` tibequadorian
2022-12-12 19:00 ` tibequadorian
` (4 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: tibequadorian @ 2022-12-12 17:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2940 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ayatana-indicators
https://github.com/void-linux/void-packages/pull/40761
Ayatana indicators
<!-- Uncomment relevant sections and delete options which are not applicable -->
Continuation of #35135
`libappindicator` hasn't seen a release since 2012 (more than 10 years!)
Debian has removed it in buster and switched to [libayatana-appindicator](https://ayatanaindicators.github.io/).
This PR tries to replace `libappindicator` with `libayatana-appindicator`.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### TODO:
- [x] `droidcam` - only [supported](https://github.com/dev47apps/droidcam/commit/71a74d22ed700650a83b7cb653bd92b0ed3cd01a) in master, patched
- [x] `gromit-mpx` - [supported](https://github.com/bk138/gromit-mpx/commit/2a838303154df4a90495c4f93741846cbd63d37f)
- [x] `network-manager-applet` - supported
- [x] `psensor` - not supported, patched
- [x] `remmina` - [supported](https://github.com/FreeRDP/Remmina/commit/a34133add92c217943acad64bb0e41de0f2f619c)
- [x] `ulauncher` - supported
- [x] `gwe` - [not supported](https://gitlab.com/leinardi/gwe/-/issues/156), [merge request](https://gitlab.com/leinardi/gwe/-/merge_requests/73), patched
- [x] `caffeine-ng` - only [supported](https://codeberg.org/WhyNotHugo/caffeine-ng/commit/d13b2b97160649b465213e691a8df2e958ecf739) in master, patched
- [x] `indicator-doom-cpu` - not supported, patched
- [x] `element-desktop` - [not supported](https://github.com/electron/electron/issues/27527) but works fine without it and uses systray instead, removed dependency,
see https://github.com/vector-im/element-desktop/pull/170
and https://github.com/signalapp/Signal-Desktop/pull/5031#issuecomment-788068627.
_No revbump needed because not the package but only the template required libappindicator._
- [x] `safeeyes` - [supported](https://github.com/slgobinath/SafeEyes/commit/c784000e694f9fa508a2535f5d23d04456b4ff86) in 2.1.4, #40763
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40761.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ayatana-indicators-40761.patch --]
[-- Type: text/x-diff, Size: 25719 bytes --]
From b836fb75d831431d185baf4fcffbd3a2bab59bab Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:41 +0100
Subject: [PATCH 01/14] New package: ayatana-ido-0.9.2
---
common/shlibs | 1 +
srcpkgs/ayatana-ido-devel | 1 +
srcpkgs/ayatana-ido/template | 27 +++++++++++++++++++++++++++
3 files changed, 29 insertions(+)
create mode 120000 srcpkgs/ayatana-ido-devel
create mode 100644 srcpkgs/ayatana-ido/template
diff --git a/common/shlibs b/common/shlibs
index f4b1ffd29dee..e7ed149d82e9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4224,3 +4224,4 @@ libfst.so.25 openfst-1.8.2_1
libvosk.so vosk-api-0.3.43_1
libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
+libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
diff --git a/srcpkgs/ayatana-ido-devel b/srcpkgs/ayatana-ido-devel
new file mode 120000
index 000000000000..2e1aa73a149c
--- /dev/null
+++ b/srcpkgs/ayatana-ido-devel
@@ -0,0 +1 @@
+ayatana-ido
\ No newline at end of file
diff --git a/srcpkgs/ayatana-ido/template b/srcpkgs/ayatana-ido/template
new file mode 100644
index 000000000000..717ad5808405
--- /dev/null
+++ b/srcpkgs/ayatana-ido/template
@@ -0,0 +1,27 @@
+# Template file for 'ayatana-ido'
+pkgname=ayatana-ido
+version=0.9.2
+revision=1
+build_helper="gir"
+build_style=cmake
+hostmakedepends="pkg-config gobject-introspection vala"
+makedepends="gtk+3-devel glib-devel"
+short_desc="Ayatana Indicator Display Objects"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+changelog="https://github.com/AyatanaIndicators/ayatana-ido/raw/main/ChangeLog"
+distfiles="https://github.com/AyatanaIndicators/ayatana-ido/archive/${version}.tar.gz"
+checksum=b166e7a160458e4a71f6086d2e4e97e18cf1ac584231a4b9f1f338914203884c
+
+ayatana-ido-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
+ }
+}
From 2c3556d6af4bd4aa5c40b2710bffac079d023c36 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:41 +0100
Subject: [PATCH 02/14] New package: libayatana-indicator-0.9.3
---
common/shlibs | 1 +
srcpkgs/libayatana-indicator-devel | 1 +
srcpkgs/libayatana-indicator/template | 24 ++++++++++++++++++++++++
3 files changed, 26 insertions(+)
create mode 120000 srcpkgs/libayatana-indicator-devel
create mode 100644 srcpkgs/libayatana-indicator/template
diff --git a/common/shlibs b/common/shlibs
index e7ed149d82e9..19abf4f558dd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4225,3 +4225,4 @@ libvosk.so vosk-api-0.3.43_1
libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
+libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
diff --git a/srcpkgs/libayatana-indicator-devel b/srcpkgs/libayatana-indicator-devel
new file mode 120000
index 000000000000..fdfe7dbb5d64
--- /dev/null
+++ b/srcpkgs/libayatana-indicator-devel
@@ -0,0 +1 @@
+libayatana-indicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-indicator/template b/srcpkgs/libayatana-indicator/template
new file mode 100644
index 000000000000..a780816306c1
--- /dev/null
+++ b/srcpkgs/libayatana-indicator/template
@@ -0,0 +1,24 @@
+# Template file for 'libayatana-indicator'
+pkgname=libayatana-indicator
+version=0.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config python3"
+makedepends="glib-devel gtk+3-devel ayatana-ido-devel"
+short_desc="Ayatana Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="GPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+changelog="https://github.com/AyatanaIndicators/libayatana-indicator/raw/main/ChangeLog"
+distfiles="https://github.com/AyatanaIndicators/libayatana-indicator/archive/${version}.tar.gz"
+checksum=09c5456fcb430b6ee0626fafdf99a32eb8746b267d56ab2bd4c8a8dd6ca731da
+
+libayatana-indicator-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From 9befa881965bc0829f25805cba5f9df79d3de2e8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:41 +0100
Subject: [PATCH 03/14] New package: libayatana-appindicator-0.5.91
---
common/shlibs | 1 +
srcpkgs/libayatana-appindicator-devel | 1 +
srcpkgs/libayatana-appindicator/template | 32 ++++++++++++++++++++++++
3 files changed, 34 insertions(+)
create mode 120000 srcpkgs/libayatana-appindicator-devel
create mode 100644 srcpkgs/libayatana-appindicator/template
diff --git a/common/shlibs b/common/shlibs
index 19abf4f558dd..f4071db983dd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4226,3 +4226,4 @@ libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
+libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
diff --git a/srcpkgs/libayatana-appindicator-devel b/srcpkgs/libayatana-appindicator-devel
new file mode 120000
index 000000000000..a2ff93abbc17
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator-devel
@@ -0,0 +1 @@
+libayatana-appindicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-appindicator/template b/srcpkgs/libayatana-appindicator/template
new file mode 100644
index 000000000000..01b0a341d20a
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator/template
@@ -0,0 +1,32 @@
+# Template file for 'libayatana-appindicator'
+pkgname=libayatana-appindicator
+version=0.5.91
+revision=1
+build_helper="gir"
+build_style=cmake
+configure_args="-DENABLE_BINDINGS_MONO=OFF -DENABLE_BINDINGS_VALA=$(vopt_if vala ON OFF)"
+hostmakedepends="pkg-config gobject-introspection $(vopt_if vala vala)"
+makedepends="glib-devel gtk+3-devel libdbusmenu-gtk3-devel libayatana-indicator-devel"
+short_desc="Ayatana Application Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+distfiles="https://github.com/AyatanaIndicators/libayatana-appindicator/archive/${version}.tar.gz"
+checksum=52eb5d0c0de07177833e50fbaee592dcb3939e96c6b789921e2a8caf40a1ed26
+
+build_options="vala"
+build_options_default="vala"
+
+libayatana-appindicator-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ if [ "$build_option_vala" ]; then
+ vmove usr/share/vala
+ fi
+ }
+}
From 6c05001e13bf88b67778c0c3f1ed7848cf991b39 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:41 +0100
Subject: [PATCH 04/14] droidcam: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 26 +++++++++++++++++++
srcpkgs/droidcam/template | 5 ++--
2 files changed, 29 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..32ab45377152
--- /dev/null
+++ b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,26 @@
+diff --git a/Makefile b/Makefile
+index 7be3c15..b7f16c4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -13,7 +13,7 @@ JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
+ CC = gcc
+ CFLAGS = -Wall -O2
+ GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
+-GTK += `pkg-config --cflags --libs appindicator3-0.1`
++GTK += `pkg-config --cflags --libs ayatana-appindicator3-0.1`
+ LIBAV = `pkg-config --libs --cflags libswscale libavutil`
+ LIBS = -lspeex -lasound -lpthread -lm
+ JPEG = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a
+diff --git a/src/droidcam.c b/src/droidcam.c
+index cad1ee4..28f4000 100644
+--- a/src/droidcam.c
++++ b/src/droidcam.c
+@@ -7,7 +7,7 @@
+ */
+
+ #include <gtk/gtk.h>
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+ #include <X11/Xlib.h>
+ #include <stdint.h>
+
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1207bdec5cea..1c3f1b8b1fc6 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,12 +1,13 @@
# Template file for 'droidcam'
pkgname=droidcam
version=1.8.2
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg"
hostmakedepends="pkg-config"
makedepends="pkg-config libjpeg-turbo-devel ffmpeg-devel alsa-lib-devel
- speex-devel libusbmuxd-devel libplist-devel gtk+3-devel libappindicator-devel"
+ speex-devel libusbmuxd-devel libplist-devel gtk+3-devel
+ libayatana-appindicator-devel"
depends="v4l2loopback"
short_desc="Tool for using your android device as a wireless/usb webcam"
maintainer="ibrokemypie <ibrokemypie@bastardi.net>"
From 8efe9a42fd2763e9d79f751b42a81dda630c935d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 05/14] gromit-mpx: replace libappindicator with
libayatana-appindicator
---
srcpkgs/gromit-mpx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gromit-mpx/template b/srcpkgs/gromit-mpx/template
index 3330ccfeba2b..82d1068872d7 100644
--- a/srcpkgs/gromit-mpx/template
+++ b/srcpkgs/gromit-mpx/template
@@ -1,10 +1,10 @@
# Template file for 'gromit-mpx'
pkgname=gromit-mpx
version=1.4.2
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="gtk+3-devel libappindicator-devel libdbusmenu-glib-devel"
+makedepends="gtk+3-devel libayatana-appindicator-devel libdbusmenu-glib-devel"
short_desc="Multi-pointer annotation tool"
maintainer="Toyam Cox <Vaelatern@gmail.com>"
license="GPL-2.0-only"
From edd72490aed16abff0951dfe2de0bf3347465728 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 06/14] network-manager-applet: replace libappindicator with
libayatana-appindicator
---
srcpkgs/network-manager-applet/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 7bbc7a671da5..ee5e63b467ed 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,12 +1,12 @@
# Template file for 'network-manager-applet'
pkgname=network-manager-applet
version=1.30.0
-revision=1
+revision=2
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
- libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libayatana-appindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
libgudev-devel libnotify-devel libnma-devel libsecret-devel
polkit-devel mobile-broadband-provider-info"
depends="NetworkManager hicolor-icon-theme iso-codes"
From 78061b4310a08c3ac97d68968fc365cdcea42373 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 07/14] psensor: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 53 +++++++++++++++++++
srcpkgs/psensor/template | 6 +--
2 files changed, 56 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/psensor/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/psensor/patches/use-ayatana-appindicator.patch b/srcpkgs/psensor/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..f8350ca6f77f
--- /dev/null
+++ b/srcpkgs/psensor/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,53 @@
+From d84498639263d6a8f8d4b4adddf3dab66631876b Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 22 Jan 2022 00:15:13 +0100
+Subject: [PATCH] Use ayatana appindicator
+
+---
+ configure.ac | 2 +-
+ src/ui.h | 2 +-
+ src/ui_appindicator.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 48b10eb..2ff857d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -117,7 +117,7 @@ AC_SUBST(LIBNOTIFY_LIBS)
+
+ # Checks AppIndicator
+ APPINDICATOR_LIBS=
+-PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1,
++PKG_CHECK_MODULES(APPINDICATOR, ayatana-appindicator3-0.1,
+ [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator3-0.1])],
+ [AC_MSG_WARN(AppIndicator 3-0.1 not present")])
+ AM_CONDITIONAL(APPINDICATOR, test -n "$APPINDICATOR_LIBS")
+diff --git a/src/ui.h b/src/ui.h
+index 426f29c..43ae4be 100644
+--- a/src/ui.h
++++ b/src/ui.h
+@@ -27,7 +27,7 @@
+ #include <gtk/gtk.h>
+
+ #if defined(HAVE_APPINDICATOR)
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+ #endif
+
+ #include "psensor.h"
+diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
+index ed4cc64..b3179c0 100644
+--- a/src/ui_appindicator.c
++++ b/src/ui_appindicator.c
+@@ -21,7 +21,7 @@
+ #include <string.h>
+
+ #include <gtk/gtk.h>
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+
+ #include <cfg.h>
+ #include <psensor.h>
+--
+2.34.1
+
diff --git a/srcpkgs/psensor/template b/srcpkgs/psensor/template
index d21a33c4c695..752e9fe04e7c 100644
--- a/srcpkgs/psensor/template
+++ b/srcpkgs/psensor/template
@@ -1,12 +1,12 @@
# Template file for 'psensor'
pkgname=psensor
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
-hostmakedepends="pkg-config glib-devel"
+hostmakedepends="pkg-config glib-devel automake"
makedepends="gtk+3-devel udisks2-devel libgtop-devel json-c-devel
libsensors-devel libatasmart-devel libcurl-devel libnotify-devel
- libappindicator-devel libmicrohttpd-devel"
+ libayatana-appindicator-devel libmicrohttpd-devel"
depends="lm_sensors"
short_desc="Graphical hardware temperature monitor for Linux"
maintainer="Foxlet <foxlet@furcode.co>"
From cd13925fe1275177a35f80c98cbb7aefc6cb7aec Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 08/14] remmina: replace libappindicator with
libayatana-appindicator
---
srcpkgs/remmina/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 0da8cad6604b..9bf538220fef 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
# Template file for 'remmina'
pkgname=remmina
version=1.4.27
-revision=3
+revision=4
build_style=cmake
configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"
hostmakedepends="glib-devel intltool pkg-config shared-mime-info"
@@ -11,7 +11,7 @@ makedepends="avahi-glib-libs-devel avahi-ui-libs-devel freerdp-devel
libsecret-devel libsodium-devel libsoup3-devel libssh-devel libva-devel
libvncserver-devel libxkbfile-devel opus-devel phodav-devel
spice-gtk-devel spice-protocol telepathy-glib-devel usbredir-devel
- vte3-devel libappindicator-devel libwebkit2gtk41-devel python3-devel"
+ vte3-devel libayatana-appindicator-devel libwebkit2gtk41-devel python3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Remote desktop client written in GTK+"
maintainer="Frank Steinborn <steinex@nognu.de>"
From 361c43c9b7e6291f609689348fa472ebfa88cb68 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 09/14] ulauncher: replace libappindicator with
libayatana-appindicator
---
srcpkgs/ulauncher/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ulauncher/template b/srcpkgs/ulauncher/template
index 0eb497d16e1c..d592930f6d24 100644
--- a/srcpkgs/ulauncher/template
+++ b/srcpkgs/ulauncher/template
@@ -1,12 +1,12 @@
# Template file for 'ulauncher'
pkgname=ulauncher
version=5.14.3
-revision=2
+revision=3
build_style=python3-module
hostmakedepends="python3-distutils-extra intltool python3-Levenshtein
python3-dbus python3-gobject python3-inotify python3-websocket-client
python3-xdg"
-depends="libappindicator>=12.10.0_2 libkeybinder3 python3-Levenshtein python3-dbus
+depends="libayatana-appindicator libkeybinder3 python3-Levenshtein python3-dbus
python3-gobject python3-inotify python3-websocket-client python3-xdg webkit2gtk"
short_desc="Linux application launcher with fuzzy search and extensions"
maintainer="Alberto Pau <me@albertopau.com>"
From 16606d130d19ad5c4106693abdd0e3ee3e721b4b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 10/14] gwe: replace libappindicator with
libayatana-appindicator
---
.../gwe/patches/use-ayatana-appindicator.patch | 15 +++++++++++++++
srcpkgs/gwe/template | 4 ++--
2 files changed, 17 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gwe/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/gwe/patches/use-ayatana-appindicator.patch b/srcpkgs/gwe/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..05029c1c7755
--- /dev/null
+++ b/srcpkgs/gwe/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,15 @@
+diff --git a/gwe/view/main_view.py b/gwe/view/main_view.py
+index 61c891d..6f573c2 100644
+--- a/gwe/view/main_view.py
++++ b/gwe/view/main_view.py
+@@ -31,8 +31,8 @@ from gwe.model.fan_profile import FanProfile
+ try: # AppIndicator3 may not be installed
+ import gi
+
+- gi.require_version('AppIndicator3', '0.1')
+- from gi.repository import AppIndicator3
++ gi.require_version('AyatanaAppIndicator3', '0.1')
++ from gi.repository import AyatanaAppIndicator3 as AppIndicator3
+ except (ImportError, ValueError):
+ AppIndicator3 = None
+ from gwe.di import MainBuilder
diff --git a/srcpkgs/gwe/template b/srcpkgs/gwe/template
index f4473200cd67..ce70ed78573c 100644
--- a/srcpkgs/gwe/template
+++ b/srcpkgs/gwe/template
@@ -1,14 +1,14 @@
# Template file for 'gwe'
pkgname=gwe
version=0.15.2
-revision=3
+revision=4
build_style=meson
hostmakedepends="pkg-config meson ninja glib-devel gtk+3-devel python3 python3-devel
python3-matplotlib python3-peewee python3-gobject python3-xlib python3-xdg
python3-requests python3-rx python3-nvml python3-injector python3-urllib3 python3-six
python3-chardet python3-idna python3-xlib python3-numpy python3-parsing python3-cycler python3-dateutil python3-Pillow"
makedepends="gobject-introspection appstream-glib"
-depends="python3 gobject-introspection libappindicator libdazzle python3-matplotlib
+depends="python3 gobject-introspection libayatana-appindicator libdazzle python3-matplotlib
python3-peewee python3-gobject python3-xlib python3-xdg python3-requests python3-rx
python3-nvml python3-injector python3-urllib3 python3-six python3-chardet python3-idna
python3-xlib python3-numpy python3-parsing python3-cycler python3-dateutil python3-Pillow"
From 2248bf414fa53769af6dd13d693517617145986c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 11/14] caffeine-ng: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 16 ++++++++++++++++
srcpkgs/caffeine-ng/template | 4 ++--
2 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch b/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..925dad3e0410
--- /dev/null
+++ b/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,16 @@
+diff --git a/caffeine/main.py b/caffeine/main.py
+index 516a138..f48653b 100644
+--- a/caffeine/main.py
++++ b/caffeine/main.py
+@@ -32,9 +32,9 @@ try:
+ gi.require_version("Notify", "0.7")
+ except ValueError:
+ gi.require_version("Notify", "0.8")
+-gi.require_version("AppIndicator3", "0.1")
++gi.require_version("AyatanaAppIndicator3", "0.1")
+
+-from gi.repository import AppIndicator3 # noqa: E402
++from gi.repository import AyatanaAppIndicator3 as AppIndicator3 # noqa: E402
+ from gi.repository import GdkPixbuf # noqa: E402
+ from gi.repository import Gtk # noqa: E402
+ from gi.repository.Notify import Notification # noqa: E402
diff --git a/srcpkgs/caffeine-ng/template b/srcpkgs/caffeine-ng/template
index 4f1b6774cdd2..3289bf5bad43 100644
--- a/srcpkgs/caffeine-ng/template
+++ b/srcpkgs/caffeine-ng/template
@@ -1,13 +1,13 @@
# Template file for 'caffeine-ng'
pkgname=caffeine-ng
version=4.0.2
-revision=3
+revision=4
build_style=python3-module
hostmakedepends="python3-setuptools_scm"
depends="desktop-file-utils gtk+3 hicolor-icon-theme libnotify
python3-dbus python3-click python3-ewmh python3-gobject
python3-setproctitle python3-setuptools python3-xdg
- python3-pulsectl libappindicator"
+ python3-pulsectl libayatana-appindicator"
short_desc="Temporarily inhibits the screensaver and sleep mode"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
From 72224a446caf12cd018f81e3eeb80ac80853eee9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 12/14] indicator-doom-cpu: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 13 +++++++++++++
srcpkgs/indicator-doom-cpu/template | 4 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch b/srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..00a185b7d6ed
--- /dev/null
+++ b/srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,13 @@
+diff --git a/indicator-doom-cpu b/indicator-doom-cpu
+index a1528e3..c4ff4d2 100755
+--- a/indicator-doom-cpu
++++ b/indicator-doom-cpu
+@@ -27,7 +27,7 @@ import time
+ from gi.repository import Gtk, GObject, GdkPixbuf
+
+ try:
+- from gi.repository import AppIndicator3 as AppIndicator
++ from gi.repository import AyatanaAppIndicator3 as AppIndicator
+ appindicator_imported = True
+ except ImportError:
+ appindicator_imported = False
diff --git a/srcpkgs/indicator-doom-cpu/template b/srcpkgs/indicator-doom-cpu/template
index eb15aa66335a..75da2d47ae33 100644
--- a/srcpkgs/indicator-doom-cpu/template
+++ b/srcpkgs/indicator-doom-cpu/template
@@ -1,8 +1,8 @@
# Template file for 'indicator-doom-cpu'
pkgname=indicator-doom-cpu
version=1.0.1
-revision=3
-depends="python3-gobject gtk+3 libappindicator"
+revision=4
+depends="python3-gobject gtk+3 libayatana-appindicator"
short_desc="CPU load indicator showing the dying face from the video game DOOM"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-only"
From 3769cd768d16164d79be7681c03c5c00f0482b37 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:43 +0100
Subject: [PATCH 13/14] element-desktop: remove build dependency on
libappindicator-devel
---
srcpkgs/element-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 3bf270cff998..1dd2c8aa8ccc 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -5,7 +5,7 @@ revision=1
create_wrksrc=yes
conf_files="/etc/${pkgname}/config.json"
hostmakedepends="git yarn nodejs rust cargo python3 curl
- sqlcipher-devel libappindicator-devel libnotify-devel pkg-config
+ sqlcipher-devel libnotify-devel pkg-config
app-builder jq moreutils"
makedepends="libsecret-devel"
depends="c-ares ffmpeg gtk+3 http-parser libevent
From b92a681283abe4dd2ae7186bac7fe5ba4c9d8164 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:43 +0100
Subject: [PATCH 14/14] safeeyes: replace libappindicator with
libayatana-appindicator
---
srcpkgs/safeeyes/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/safeeyes/template b/srcpkgs/safeeyes/template
index 0011b9c9c07e..ff42de3c805b 100644
--- a/srcpkgs/safeeyes/template
+++ b/srcpkgs/safeeyes/template
@@ -1,11 +1,11 @@
# Template file for 'safeeyes'
pkgname=safeeyes
version=2.1.4
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-pip python3-devel pkg-config"
makedepends="python3-devel cairo-devel libgirepository-devel"
-depends="python3-psutil libappindicator python3-gobject python3-Babel
+depends="python3-psutil libayatana-appindicator python3-gobject python3-Babel
python3-dbus xprop alsa-utils python3-xlib"
checkdepends="$depends"
short_desc="Tool to reduce and prevent repetitive strain injury"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] Ayatana indicators
2022-11-25 18:04 [PR PATCH] Ayatana indicators tibequadorian
` (9 preceding siblings ...)
2022-12-12 17:19 ` tibequadorian
@ 2022-12-12 19:00 ` tibequadorian
2023-02-06 21:50 ` kruceter
` (3 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: tibequadorian @ 2022-12-12 19:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2940 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ayatana-indicators
https://github.com/void-linux/void-packages/pull/40761
Ayatana indicators
<!-- Uncomment relevant sections and delete options which are not applicable -->
Continuation of #35135
`libappindicator` hasn't seen a release since 2012 (more than 10 years!)
Debian has removed it in buster and switched to [libayatana-appindicator](https://ayatanaindicators.github.io/).
This PR tries to replace `libappindicator` with `libayatana-appindicator`.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### TODO:
- [x] `droidcam` - only [supported](https://github.com/dev47apps/droidcam/commit/71a74d22ed700650a83b7cb653bd92b0ed3cd01a) in master, patched
- [x] `gromit-mpx` - [supported](https://github.com/bk138/gromit-mpx/commit/2a838303154df4a90495c4f93741846cbd63d37f)
- [x] `network-manager-applet` - supported
- [x] `psensor` - not supported, patched
- [x] `remmina` - [supported](https://github.com/FreeRDP/Remmina/commit/a34133add92c217943acad64bb0e41de0f2f619c)
- [x] `ulauncher` - supported
- [x] `gwe` - [not supported](https://gitlab.com/leinardi/gwe/-/issues/156), [merge request](https://gitlab.com/leinardi/gwe/-/merge_requests/73), patched
- [x] `caffeine-ng` - only [supported](https://codeberg.org/WhyNotHugo/caffeine-ng/commit/d13b2b97160649b465213e691a8df2e958ecf739) in master, patched
- [x] `indicator-doom-cpu` - not supported, patched
- [x] `element-desktop` - [not supported](https://github.com/electron/electron/issues/27527) but works fine without it and uses systray instead, removed dependency,
see https://github.com/vector-im/element-desktop/pull/170
and https://github.com/signalapp/Signal-Desktop/pull/5031#issuecomment-788068627.
_No revbump needed because not the package but only the template required libappindicator._
- [x] `safeeyes` - [supported](https://github.com/slgobinath/SafeEyes/commit/c784000e694f9fa508a2535f5d23d04456b4ff86) in 2.1.4, #40763
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40761.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ayatana-indicators-40761.patch --]
[-- Type: text/x-diff, Size: 25719 bytes --]
From c3ad5134e2bff40b6ff7a1b358d74a2ef20d1d91 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:41 +0100
Subject: [PATCH 01/14] New package: ayatana-ido-0.9.2
---
common/shlibs | 1 +
srcpkgs/ayatana-ido-devel | 1 +
srcpkgs/ayatana-ido/template | 27 +++++++++++++++++++++++++++
3 files changed, 29 insertions(+)
create mode 120000 srcpkgs/ayatana-ido-devel
create mode 100644 srcpkgs/ayatana-ido/template
diff --git a/common/shlibs b/common/shlibs
index f4b1ffd29dee..e7ed149d82e9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4224,3 +4224,4 @@ libfst.so.25 openfst-1.8.2_1
libvosk.so vosk-api-0.3.43_1
libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
+libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
diff --git a/srcpkgs/ayatana-ido-devel b/srcpkgs/ayatana-ido-devel
new file mode 120000
index 000000000000..2e1aa73a149c
--- /dev/null
+++ b/srcpkgs/ayatana-ido-devel
@@ -0,0 +1 @@
+ayatana-ido
\ No newline at end of file
diff --git a/srcpkgs/ayatana-ido/template b/srcpkgs/ayatana-ido/template
new file mode 100644
index 000000000000..717ad5808405
--- /dev/null
+++ b/srcpkgs/ayatana-ido/template
@@ -0,0 +1,27 @@
+# Template file for 'ayatana-ido'
+pkgname=ayatana-ido
+version=0.9.2
+revision=1
+build_helper="gir"
+build_style=cmake
+hostmakedepends="pkg-config gobject-introspection vala"
+makedepends="gtk+3-devel glib-devel"
+short_desc="Ayatana Indicator Display Objects"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+changelog="https://github.com/AyatanaIndicators/ayatana-ido/raw/main/ChangeLog"
+distfiles="https://github.com/AyatanaIndicators/ayatana-ido/archive/${version}.tar.gz"
+checksum=b166e7a160458e4a71f6086d2e4e97e18cf1ac584231a4b9f1f338914203884c
+
+ayatana-ido-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
+ }
+}
From f0b7c01c99fc168009a5f819f9e8e431de2f81cd Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:41 +0100
Subject: [PATCH 02/14] New package: libayatana-indicator-0.9.3
---
common/shlibs | 1 +
srcpkgs/libayatana-indicator-devel | 1 +
srcpkgs/libayatana-indicator/template | 24 ++++++++++++++++++++++++
3 files changed, 26 insertions(+)
create mode 120000 srcpkgs/libayatana-indicator-devel
create mode 100644 srcpkgs/libayatana-indicator/template
diff --git a/common/shlibs b/common/shlibs
index e7ed149d82e9..19abf4f558dd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4225,3 +4225,4 @@ libvosk.so vosk-api-0.3.43_1
libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
+libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
diff --git a/srcpkgs/libayatana-indicator-devel b/srcpkgs/libayatana-indicator-devel
new file mode 120000
index 000000000000..fdfe7dbb5d64
--- /dev/null
+++ b/srcpkgs/libayatana-indicator-devel
@@ -0,0 +1 @@
+libayatana-indicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-indicator/template b/srcpkgs/libayatana-indicator/template
new file mode 100644
index 000000000000..a780816306c1
--- /dev/null
+++ b/srcpkgs/libayatana-indicator/template
@@ -0,0 +1,24 @@
+# Template file for 'libayatana-indicator'
+pkgname=libayatana-indicator
+version=0.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config python3"
+makedepends="glib-devel gtk+3-devel ayatana-ido-devel"
+short_desc="Ayatana Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="GPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+changelog="https://github.com/AyatanaIndicators/libayatana-indicator/raw/main/ChangeLog"
+distfiles="https://github.com/AyatanaIndicators/libayatana-indicator/archive/${version}.tar.gz"
+checksum=09c5456fcb430b6ee0626fafdf99a32eb8746b267d56ab2bd4c8a8dd6ca731da
+
+libayatana-indicator-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From c4727cbd151c672cfe14d0bd667c76e47141b2b3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:41 +0100
Subject: [PATCH 03/14] New package: libayatana-appindicator-0.5.91
---
common/shlibs | 1 +
srcpkgs/libayatana-appindicator-devel | 1 +
srcpkgs/libayatana-appindicator/template | 32 ++++++++++++++++++++++++
3 files changed, 34 insertions(+)
create mode 120000 srcpkgs/libayatana-appindicator-devel
create mode 100644 srcpkgs/libayatana-appindicator/template
diff --git a/common/shlibs b/common/shlibs
index 19abf4f558dd..f4071db983dd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4226,3 +4226,4 @@ libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
+libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
diff --git a/srcpkgs/libayatana-appindicator-devel b/srcpkgs/libayatana-appindicator-devel
new file mode 120000
index 000000000000..a2ff93abbc17
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator-devel
@@ -0,0 +1 @@
+libayatana-appindicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-appindicator/template b/srcpkgs/libayatana-appindicator/template
new file mode 100644
index 000000000000..01b0a341d20a
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator/template
@@ -0,0 +1,32 @@
+# Template file for 'libayatana-appindicator'
+pkgname=libayatana-appindicator
+version=0.5.91
+revision=1
+build_helper="gir"
+build_style=cmake
+configure_args="-DENABLE_BINDINGS_MONO=OFF -DENABLE_BINDINGS_VALA=$(vopt_if vala ON OFF)"
+hostmakedepends="pkg-config gobject-introspection $(vopt_if vala vala)"
+makedepends="glib-devel gtk+3-devel libdbusmenu-gtk3-devel libayatana-indicator-devel"
+short_desc="Ayatana Application Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+distfiles="https://github.com/AyatanaIndicators/libayatana-appindicator/archive/${version}.tar.gz"
+checksum=52eb5d0c0de07177833e50fbaee592dcb3939e96c6b789921e2a8caf40a1ed26
+
+build_options="vala"
+build_options_default="vala"
+
+libayatana-appindicator-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ if [ "$build_option_vala" ]; then
+ vmove usr/share/vala
+ fi
+ }
+}
From bd5908a743d1d4142f2c039108d7f08366a3c7c4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:41 +0100
Subject: [PATCH 04/14] droidcam: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 26 +++++++++++++++++++
srcpkgs/droidcam/template | 5 ++--
2 files changed, 29 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..32ab45377152
--- /dev/null
+++ b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,26 @@
+diff --git a/Makefile b/Makefile
+index 7be3c15..b7f16c4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -13,7 +13,7 @@ JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
+ CC = gcc
+ CFLAGS = -Wall -O2
+ GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
+-GTK += `pkg-config --cflags --libs appindicator3-0.1`
++GTK += `pkg-config --cflags --libs ayatana-appindicator3-0.1`
+ LIBAV = `pkg-config --libs --cflags libswscale libavutil`
+ LIBS = -lspeex -lasound -lpthread -lm
+ JPEG = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a
+diff --git a/src/droidcam.c b/src/droidcam.c
+index cad1ee4..28f4000 100644
+--- a/src/droidcam.c
++++ b/src/droidcam.c
+@@ -7,7 +7,7 @@
+ */
+
+ #include <gtk/gtk.h>
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+ #include <X11/Xlib.h>
+ #include <stdint.h>
+
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1207bdec5cea..1c3f1b8b1fc6 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,12 +1,13 @@
# Template file for 'droidcam'
pkgname=droidcam
version=1.8.2
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg"
hostmakedepends="pkg-config"
makedepends="pkg-config libjpeg-turbo-devel ffmpeg-devel alsa-lib-devel
- speex-devel libusbmuxd-devel libplist-devel gtk+3-devel libappindicator-devel"
+ speex-devel libusbmuxd-devel libplist-devel gtk+3-devel
+ libayatana-appindicator-devel"
depends="v4l2loopback"
short_desc="Tool for using your android device as a wireless/usb webcam"
maintainer="ibrokemypie <ibrokemypie@bastardi.net>"
From ab9059ea0ccfc17184ec74ebc95f8c5f19e6af49 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 05/14] gromit-mpx: replace libappindicator with
libayatana-appindicator
---
srcpkgs/gromit-mpx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gromit-mpx/template b/srcpkgs/gromit-mpx/template
index 3330ccfeba2b..82d1068872d7 100644
--- a/srcpkgs/gromit-mpx/template
+++ b/srcpkgs/gromit-mpx/template
@@ -1,10 +1,10 @@
# Template file for 'gromit-mpx'
pkgname=gromit-mpx
version=1.4.2
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="gtk+3-devel libappindicator-devel libdbusmenu-glib-devel"
+makedepends="gtk+3-devel libayatana-appindicator-devel libdbusmenu-glib-devel"
short_desc="Multi-pointer annotation tool"
maintainer="Toyam Cox <Vaelatern@gmail.com>"
license="GPL-2.0-only"
From 60575b64aa0c60d58fee4bc708f2ffc57d9442d8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 06/14] network-manager-applet: replace libappindicator with
libayatana-appindicator
---
srcpkgs/network-manager-applet/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 7bbc7a671da5..ee5e63b467ed 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,12 +1,12 @@
# Template file for 'network-manager-applet'
pkgname=network-manager-applet
version=1.30.0
-revision=1
+revision=2
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
- libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libayatana-appindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
libgudev-devel libnotify-devel libnma-devel libsecret-devel
polkit-devel mobile-broadband-provider-info"
depends="NetworkManager hicolor-icon-theme iso-codes"
From 6b50d6dfa68451b7191879206670cc77dcde9fe4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 07/14] psensor: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 53 +++++++++++++++++++
srcpkgs/psensor/template | 6 +--
2 files changed, 56 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/psensor/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/psensor/patches/use-ayatana-appindicator.patch b/srcpkgs/psensor/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..f8350ca6f77f
--- /dev/null
+++ b/srcpkgs/psensor/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,53 @@
+From d84498639263d6a8f8d4b4adddf3dab66631876b Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 22 Jan 2022 00:15:13 +0100
+Subject: [PATCH] Use ayatana appindicator
+
+---
+ configure.ac | 2 +-
+ src/ui.h | 2 +-
+ src/ui_appindicator.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 48b10eb..2ff857d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -117,7 +117,7 @@ AC_SUBST(LIBNOTIFY_LIBS)
+
+ # Checks AppIndicator
+ APPINDICATOR_LIBS=
+-PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1,
++PKG_CHECK_MODULES(APPINDICATOR, ayatana-appindicator3-0.1,
+ [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator3-0.1])],
+ [AC_MSG_WARN(AppIndicator 3-0.1 not present")])
+ AM_CONDITIONAL(APPINDICATOR, test -n "$APPINDICATOR_LIBS")
+diff --git a/src/ui.h b/src/ui.h
+index 426f29c..43ae4be 100644
+--- a/src/ui.h
++++ b/src/ui.h
+@@ -27,7 +27,7 @@
+ #include <gtk/gtk.h>
+
+ #if defined(HAVE_APPINDICATOR)
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+ #endif
+
+ #include "psensor.h"
+diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
+index ed4cc64..b3179c0 100644
+--- a/src/ui_appindicator.c
++++ b/src/ui_appindicator.c
+@@ -21,7 +21,7 @@
+ #include <string.h>
+
+ #include <gtk/gtk.h>
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+
+ #include <cfg.h>
+ #include <psensor.h>
+--
+2.34.1
+
diff --git a/srcpkgs/psensor/template b/srcpkgs/psensor/template
index d21a33c4c695..752e9fe04e7c 100644
--- a/srcpkgs/psensor/template
+++ b/srcpkgs/psensor/template
@@ -1,12 +1,12 @@
# Template file for 'psensor'
pkgname=psensor
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
-hostmakedepends="pkg-config glib-devel"
+hostmakedepends="pkg-config glib-devel automake"
makedepends="gtk+3-devel udisks2-devel libgtop-devel json-c-devel
libsensors-devel libatasmart-devel libcurl-devel libnotify-devel
- libappindicator-devel libmicrohttpd-devel"
+ libayatana-appindicator-devel libmicrohttpd-devel"
depends="lm_sensors"
short_desc="Graphical hardware temperature monitor for Linux"
maintainer="Foxlet <foxlet@furcode.co>"
From e88d3bb0fd7a2382b81f655f8c106fa800bdab34 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 08/14] remmina: replace libappindicator with
libayatana-appindicator
---
srcpkgs/remmina/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 0da8cad6604b..9bf538220fef 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
# Template file for 'remmina'
pkgname=remmina
version=1.4.27
-revision=3
+revision=4
build_style=cmake
configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"
hostmakedepends="glib-devel intltool pkg-config shared-mime-info"
@@ -11,7 +11,7 @@ makedepends="avahi-glib-libs-devel avahi-ui-libs-devel freerdp-devel
libsecret-devel libsodium-devel libsoup3-devel libssh-devel libva-devel
libvncserver-devel libxkbfile-devel opus-devel phodav-devel
spice-gtk-devel spice-protocol telepathy-glib-devel usbredir-devel
- vte3-devel libappindicator-devel libwebkit2gtk41-devel python3-devel"
+ vte3-devel libayatana-appindicator-devel libwebkit2gtk41-devel python3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Remote desktop client written in GTK+"
maintainer="Frank Steinborn <steinex@nognu.de>"
From b91937a628657f3e6481f2a39577b16879767ec7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 09/14] ulauncher: replace libappindicator with
libayatana-appindicator
---
srcpkgs/ulauncher/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ulauncher/template b/srcpkgs/ulauncher/template
index 0eb497d16e1c..d592930f6d24 100644
--- a/srcpkgs/ulauncher/template
+++ b/srcpkgs/ulauncher/template
@@ -1,12 +1,12 @@
# Template file for 'ulauncher'
pkgname=ulauncher
version=5.14.3
-revision=2
+revision=3
build_style=python3-module
hostmakedepends="python3-distutils-extra intltool python3-Levenshtein
python3-dbus python3-gobject python3-inotify python3-websocket-client
python3-xdg"
-depends="libappindicator>=12.10.0_2 libkeybinder3 python3-Levenshtein python3-dbus
+depends="libayatana-appindicator libkeybinder3 python3-Levenshtein python3-dbus
python3-gobject python3-inotify python3-websocket-client python3-xdg webkit2gtk"
short_desc="Linux application launcher with fuzzy search and extensions"
maintainer="Alberto Pau <me@albertopau.com>"
From f4002cb1709d4c8a230b3dd54c4ce1a43f3b7426 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 10/14] gwe: replace libappindicator with
libayatana-appindicator
---
.../gwe/patches/use-ayatana-appindicator.patch | 15 +++++++++++++++
srcpkgs/gwe/template | 4 ++--
2 files changed, 17 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gwe/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/gwe/patches/use-ayatana-appindicator.patch b/srcpkgs/gwe/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..05029c1c7755
--- /dev/null
+++ b/srcpkgs/gwe/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,15 @@
+diff --git a/gwe/view/main_view.py b/gwe/view/main_view.py
+index 61c891d..6f573c2 100644
+--- a/gwe/view/main_view.py
++++ b/gwe/view/main_view.py
+@@ -31,8 +31,8 @@ from gwe.model.fan_profile import FanProfile
+ try: # AppIndicator3 may not be installed
+ import gi
+
+- gi.require_version('AppIndicator3', '0.1')
+- from gi.repository import AppIndicator3
++ gi.require_version('AyatanaAppIndicator3', '0.1')
++ from gi.repository import AyatanaAppIndicator3 as AppIndicator3
+ except (ImportError, ValueError):
+ AppIndicator3 = None
+ from gwe.di import MainBuilder
diff --git a/srcpkgs/gwe/template b/srcpkgs/gwe/template
index f4473200cd67..ce70ed78573c 100644
--- a/srcpkgs/gwe/template
+++ b/srcpkgs/gwe/template
@@ -1,14 +1,14 @@
# Template file for 'gwe'
pkgname=gwe
version=0.15.2
-revision=3
+revision=4
build_style=meson
hostmakedepends="pkg-config meson ninja glib-devel gtk+3-devel python3 python3-devel
python3-matplotlib python3-peewee python3-gobject python3-xlib python3-xdg
python3-requests python3-rx python3-nvml python3-injector python3-urllib3 python3-six
python3-chardet python3-idna python3-xlib python3-numpy python3-parsing python3-cycler python3-dateutil python3-Pillow"
makedepends="gobject-introspection appstream-glib"
-depends="python3 gobject-introspection libappindicator libdazzle python3-matplotlib
+depends="python3 gobject-introspection libayatana-appindicator libdazzle python3-matplotlib
python3-peewee python3-gobject python3-xlib python3-xdg python3-requests python3-rx
python3-nvml python3-injector python3-urllib3 python3-six python3-chardet python3-idna
python3-xlib python3-numpy python3-parsing python3-cycler python3-dateutil python3-Pillow"
From 266e9abfd174cbe13a39b77f2ea2883d7aae453d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 11/14] caffeine-ng: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 16 ++++++++++++++++
srcpkgs/caffeine-ng/template | 4 ++--
2 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch b/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..925dad3e0410
--- /dev/null
+++ b/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,16 @@
+diff --git a/caffeine/main.py b/caffeine/main.py
+index 516a138..f48653b 100644
+--- a/caffeine/main.py
++++ b/caffeine/main.py
+@@ -32,9 +32,9 @@ try:
+ gi.require_version("Notify", "0.7")
+ except ValueError:
+ gi.require_version("Notify", "0.8")
+-gi.require_version("AppIndicator3", "0.1")
++gi.require_version("AyatanaAppIndicator3", "0.1")
+
+-from gi.repository import AppIndicator3 # noqa: E402
++from gi.repository import AyatanaAppIndicator3 as AppIndicator3 # noqa: E402
+ from gi.repository import GdkPixbuf # noqa: E402
+ from gi.repository import Gtk # noqa: E402
+ from gi.repository.Notify import Notification # noqa: E402
diff --git a/srcpkgs/caffeine-ng/template b/srcpkgs/caffeine-ng/template
index 4f1b6774cdd2..3289bf5bad43 100644
--- a/srcpkgs/caffeine-ng/template
+++ b/srcpkgs/caffeine-ng/template
@@ -1,13 +1,13 @@
# Template file for 'caffeine-ng'
pkgname=caffeine-ng
version=4.0.2
-revision=3
+revision=4
build_style=python3-module
hostmakedepends="python3-setuptools_scm"
depends="desktop-file-utils gtk+3 hicolor-icon-theme libnotify
python3-dbus python3-click python3-ewmh python3-gobject
python3-setproctitle python3-setuptools python3-xdg
- python3-pulsectl libappindicator"
+ python3-pulsectl libayatana-appindicator"
short_desc="Temporarily inhibits the screensaver and sleep mode"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
From 0b535eb5d1f719f0687ab14e27b8e51f04775227 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 12/14] indicator-doom-cpu: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 13 +++++++++++++
srcpkgs/indicator-doom-cpu/template | 4 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch b/srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..00a185b7d6ed
--- /dev/null
+++ b/srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,13 @@
+diff --git a/indicator-doom-cpu b/indicator-doom-cpu
+index a1528e3..c4ff4d2 100755
+--- a/indicator-doom-cpu
++++ b/indicator-doom-cpu
+@@ -27,7 +27,7 @@ import time
+ from gi.repository import Gtk, GObject, GdkPixbuf
+
+ try:
+- from gi.repository import AppIndicator3 as AppIndicator
++ from gi.repository import AyatanaAppIndicator3 as AppIndicator
+ appindicator_imported = True
+ except ImportError:
+ appindicator_imported = False
diff --git a/srcpkgs/indicator-doom-cpu/template b/srcpkgs/indicator-doom-cpu/template
index eb15aa66335a..75da2d47ae33 100644
--- a/srcpkgs/indicator-doom-cpu/template
+++ b/srcpkgs/indicator-doom-cpu/template
@@ -1,8 +1,8 @@
# Template file for 'indicator-doom-cpu'
pkgname=indicator-doom-cpu
version=1.0.1
-revision=3
-depends="python3-gobject gtk+3 libappindicator"
+revision=4
+depends="python3-gobject gtk+3 libayatana-appindicator"
short_desc="CPU load indicator showing the dying face from the video game DOOM"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-only"
From 56d8381af4091571b27f84006020f4f84a5b58e4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:43 +0100
Subject: [PATCH 13/14] element-desktop: remove build dependency on
libappindicator-devel
---
srcpkgs/element-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 3bf270cff998..1dd2c8aa8ccc 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -5,7 +5,7 @@ revision=1
create_wrksrc=yes
conf_files="/etc/${pkgname}/config.json"
hostmakedepends="git yarn nodejs rust cargo python3 curl
- sqlcipher-devel libappindicator-devel libnotify-devel pkg-config
+ sqlcipher-devel libnotify-devel pkg-config
app-builder jq moreutils"
makedepends="libsecret-devel"
depends="c-ares ffmpeg gtk+3 http-parser libevent
From 9cdef623fe6fb433cd722308349395f4d26d08b5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:43 +0100
Subject: [PATCH 14/14] safeeyes: replace libappindicator with
libayatana-appindicator
---
srcpkgs/safeeyes/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/safeeyes/template b/srcpkgs/safeeyes/template
index 0011b9c9c07e..ff42de3c805b 100644
--- a/srcpkgs/safeeyes/template
+++ b/srcpkgs/safeeyes/template
@@ -1,11 +1,11 @@
# Template file for 'safeeyes'
pkgname=safeeyes
version=2.1.4
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-pip python3-devel pkg-config"
makedepends="python3-devel cairo-devel libgirepository-devel"
-depends="python3-psutil libappindicator python3-gobject python3-Babel
+depends="python3-psutil libayatana-appindicator python3-gobject python3-Babel
python3-dbus xprop alsa-utils python3-xlib"
checkdepends="$depends"
short_desc="Tool to reduce and prevent repetitive strain injury"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: Ayatana indicators
2022-11-25 18:04 [PR PATCH] Ayatana indicators tibequadorian
` (10 preceding siblings ...)
2022-12-12 19:00 ` tibequadorian
@ 2023-02-06 21:50 ` kruceter
2023-02-14 17:10 ` [PR PATCH] [Updated] " paper42
` (2 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: kruceter @ 2023-02-06 21:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 201 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40761#issuecomment-1419818746
Comment:
Is there anything I can help with to make it move forward?
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] Ayatana indicators
2022-11-25 18:04 [PR PATCH] Ayatana indicators tibequadorian
` (11 preceding siblings ...)
2023-02-06 21:50 ` kruceter
@ 2023-02-14 17:10 ` paper42
2023-02-14 18:52 ` paper42
2023-02-14 18:52 ` [PR PATCH] [Closed]: " paper42
14 siblings, 0 replies; 17+ messages in thread
From: paper42 @ 2023-02-14 17:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2934 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/tibequadorian/void-packages ayatana-indicators
https://github.com/void-linux/void-packages/pull/40761
Ayatana indicators
<!-- Uncomment relevant sections and delete options which are not applicable -->
Continuation of #35135
`libappindicator` hasn't seen a release since 2012 (more than 10 years!)
Debian has removed it in buster and switched to [libayatana-appindicator](https://ayatanaindicators.github.io/).
This PR tries to replace `libappindicator` with `libayatana-appindicator`.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### TODO:
- [x] `droidcam` - only [supported](https://github.com/dev47apps/droidcam/commit/71a74d22ed700650a83b7cb653bd92b0ed3cd01a) in master, patched
- [x] `gromit-mpx` - [supported](https://github.com/bk138/gromit-mpx/commit/2a838303154df4a90495c4f93741846cbd63d37f)
- [x] `network-manager-applet` - supported
- [x] `psensor` - not supported, patched
- [x] `remmina` - [supported](https://github.com/FreeRDP/Remmina/commit/a34133add92c217943acad64bb0e41de0f2f619c)
- [x] `ulauncher` - supported
- [x] `gwe` - [not supported](https://gitlab.com/leinardi/gwe/-/issues/156), [merge request](https://gitlab.com/leinardi/gwe/-/merge_requests/73), patched
- [x] `caffeine-ng` - only [supported](https://codeberg.org/WhyNotHugo/caffeine-ng/commit/d13b2b97160649b465213e691a8df2e958ecf739) in master, patched
- [x] `indicator-doom-cpu` - not supported, patched
- [x] `element-desktop` - [not supported](https://github.com/electron/electron/issues/27527) but works fine without it and uses systray instead, removed dependency,
see https://github.com/vector-im/element-desktop/pull/170
and https://github.com/signalapp/Signal-Desktop/pull/5031#issuecomment-788068627.
_No revbump needed because not the package but only the template required libappindicator._
- [x] `safeeyes` - [supported](https://github.com/slgobinath/SafeEyes/commit/c784000e694f9fa508a2535f5d23d04456b4ff86) in 2.1.4, #40763
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40761.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ayatana-indicators-40761.patch --]
[-- Type: text/x-diff, Size: 25991 bytes --]
From 6a9f2541faddf01474506b652540382a17c2a1db Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:41 +0100
Subject: [PATCH 01/14] New package: ayatana-ido-0.9.2
---
common/shlibs | 1 +
srcpkgs/ayatana-ido-devel | 1 +
srcpkgs/ayatana-ido/template | 27 +++++++++++++++++++++++++++
3 files changed, 29 insertions(+)
create mode 120000 srcpkgs/ayatana-ido-devel
create mode 100644 srcpkgs/ayatana-ido/template
diff --git a/common/shlibs b/common/shlibs
index d441c901f619..06f43fe44449 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4224,3 +4224,4 @@ libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
libdate-tz.so.3 chrono-date-3.0.1_1
+libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
diff --git a/srcpkgs/ayatana-ido-devel b/srcpkgs/ayatana-ido-devel
new file mode 120000
index 000000000000..2e1aa73a149c
--- /dev/null
+++ b/srcpkgs/ayatana-ido-devel
@@ -0,0 +1 @@
+ayatana-ido
\ No newline at end of file
diff --git a/srcpkgs/ayatana-ido/template b/srcpkgs/ayatana-ido/template
new file mode 100644
index 000000000000..717ad5808405
--- /dev/null
+++ b/srcpkgs/ayatana-ido/template
@@ -0,0 +1,27 @@
+# Template file for 'ayatana-ido'
+pkgname=ayatana-ido
+version=0.9.2
+revision=1
+build_helper="gir"
+build_style=cmake
+hostmakedepends="pkg-config gobject-introspection vala"
+makedepends="gtk+3-devel glib-devel"
+short_desc="Ayatana Indicator Display Objects"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+changelog="https://github.com/AyatanaIndicators/ayatana-ido/raw/main/ChangeLog"
+distfiles="https://github.com/AyatanaIndicators/ayatana-ido/archive/${version}.tar.gz"
+checksum=b166e7a160458e4a71f6086d2e4e97e18cf1ac584231a4b9f1f338914203884c
+
+ayatana-ido-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
+ }
+}
From 352dab220c485d7bd44ff5e612d78caaf71dd8c9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:41 +0100
Subject: [PATCH 02/14] New package: libayatana-indicator-0.9.3
---
common/shlibs | 1 +
srcpkgs/libayatana-indicator-devel | 1 +
srcpkgs/libayatana-indicator/template | 24 ++++++++++++++++++++++++
3 files changed, 26 insertions(+)
create mode 120000 srcpkgs/libayatana-indicator-devel
create mode 100644 srcpkgs/libayatana-indicator/template
diff --git a/common/shlibs b/common/shlibs
index 06f43fe44449..8e3e9a8175bc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4225,3 +4225,4 @@ libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
libdate-tz.so.3 chrono-date-3.0.1_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
+libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
diff --git a/srcpkgs/libayatana-indicator-devel b/srcpkgs/libayatana-indicator-devel
new file mode 120000
index 000000000000..fdfe7dbb5d64
--- /dev/null
+++ b/srcpkgs/libayatana-indicator-devel
@@ -0,0 +1 @@
+libayatana-indicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-indicator/template b/srcpkgs/libayatana-indicator/template
new file mode 100644
index 000000000000..a780816306c1
--- /dev/null
+++ b/srcpkgs/libayatana-indicator/template
@@ -0,0 +1,24 @@
+# Template file for 'libayatana-indicator'
+pkgname=libayatana-indicator
+version=0.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config python3"
+makedepends="glib-devel gtk+3-devel ayatana-ido-devel"
+short_desc="Ayatana Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="GPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+changelog="https://github.com/AyatanaIndicators/libayatana-indicator/raw/main/ChangeLog"
+distfiles="https://github.com/AyatanaIndicators/libayatana-indicator/archive/${version}.tar.gz"
+checksum=09c5456fcb430b6ee0626fafdf99a32eb8746b267d56ab2bd4c8a8dd6ca731da
+
+libayatana-indicator-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From ab6f9c328c8d1cd27b0e5ec7895d26a61bf97647 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:41 +0100
Subject: [PATCH 03/14] New package: libayatana-appindicator-0.5.91
---
common/shlibs | 1 +
srcpkgs/libayatana-appindicator-devel | 1 +
srcpkgs/libayatana-appindicator/template | 32 ++++++++++++++++++++++++
3 files changed, 34 insertions(+)
create mode 120000 srcpkgs/libayatana-appindicator-devel
create mode 100644 srcpkgs/libayatana-appindicator/template
diff --git a/common/shlibs b/common/shlibs
index 8e3e9a8175bc..6d01ee351af6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4226,3 +4226,4 @@ libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
libdate-tz.so.3 chrono-date-3.0.1_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
+libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
diff --git a/srcpkgs/libayatana-appindicator-devel b/srcpkgs/libayatana-appindicator-devel
new file mode 120000
index 000000000000..a2ff93abbc17
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator-devel
@@ -0,0 +1 @@
+libayatana-appindicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-appindicator/template b/srcpkgs/libayatana-appindicator/template
new file mode 100644
index 000000000000..01b0a341d20a
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator/template
@@ -0,0 +1,32 @@
+# Template file for 'libayatana-appindicator'
+pkgname=libayatana-appindicator
+version=0.5.91
+revision=1
+build_helper="gir"
+build_style=cmake
+configure_args="-DENABLE_BINDINGS_MONO=OFF -DENABLE_BINDINGS_VALA=$(vopt_if vala ON OFF)"
+hostmakedepends="pkg-config gobject-introspection $(vopt_if vala vala)"
+makedepends="glib-devel gtk+3-devel libdbusmenu-gtk3-devel libayatana-indicator-devel"
+short_desc="Ayatana Application Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+distfiles="https://github.com/AyatanaIndicators/libayatana-appindicator/archive/${version}.tar.gz"
+checksum=52eb5d0c0de07177833e50fbaee592dcb3939e96c6b789921e2a8caf40a1ed26
+
+build_options="vala"
+build_options_default="vala"
+
+libayatana-appindicator-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ if [ "$build_option_vala" ]; then
+ vmove usr/share/vala
+ fi
+ }
+}
From 5e1051063e522e62f5491ed3e400c9ac0958763c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:41 +0100
Subject: [PATCH 04/14] droidcam: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 26 +++++++++++++++++++
srcpkgs/droidcam/template | 5 ++--
2 files changed, 29 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..32ab45377152
--- /dev/null
+++ b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,26 @@
+diff --git a/Makefile b/Makefile
+index 7be3c15..b7f16c4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -13,7 +13,7 @@ JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
+ CC = gcc
+ CFLAGS = -Wall -O2
+ GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
+-GTK += `pkg-config --cflags --libs appindicator3-0.1`
++GTK += `pkg-config --cflags --libs ayatana-appindicator3-0.1`
+ LIBAV = `pkg-config --libs --cflags libswscale libavutil`
+ LIBS = -lspeex -lasound -lpthread -lm
+ JPEG = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a
+diff --git a/src/droidcam.c b/src/droidcam.c
+index cad1ee4..28f4000 100644
+--- a/src/droidcam.c
++++ b/src/droidcam.c
+@@ -7,7 +7,7 @@
+ */
+
+ #include <gtk/gtk.h>
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+ #include <X11/Xlib.h>
+ #include <stdint.h>
+
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1207bdec5cea..1c3f1b8b1fc6 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,12 +1,13 @@
# Template file for 'droidcam'
pkgname=droidcam
version=1.8.2
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg"
hostmakedepends="pkg-config"
makedepends="pkg-config libjpeg-turbo-devel ffmpeg-devel alsa-lib-devel
- speex-devel libusbmuxd-devel libplist-devel gtk+3-devel libappindicator-devel"
+ speex-devel libusbmuxd-devel libplist-devel gtk+3-devel
+ libayatana-appindicator-devel"
depends="v4l2loopback"
short_desc="Tool for using your android device as a wireless/usb webcam"
maintainer="ibrokemypie <ibrokemypie@bastardi.net>"
From dfde5943e93778d3577eab5bd1b4b2fe9076b393 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 05/14] gromit-mpx: replace libappindicator with
libayatana-appindicator
---
srcpkgs/gromit-mpx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gromit-mpx/template b/srcpkgs/gromit-mpx/template
index 431d0f9bebe7..1a5e7c78707b 100644
--- a/srcpkgs/gromit-mpx/template
+++ b/srcpkgs/gromit-mpx/template
@@ -1,10 +1,10 @@
# Template file for 'gromit-mpx'
pkgname=gromit-mpx
version=1.4.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="gtk+3-devel libappindicator-devel libdbusmenu-glib-devel"
+makedepends="gtk+3-devel libayatana-appindicator-devel libdbusmenu-glib-devel"
short_desc="Multi-pointer annotation tool"
maintainer="Toyam Cox <Vaelatern@gmail.com>"
license="GPL-2.0-only"
From fad87ff6631e7756434aea6ed300cdf0743bc3be Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 06/14] network-manager-applet: replace libappindicator with
libayatana-appindicator
---
srcpkgs/network-manager-applet/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 7bbc7a671da5..ee5e63b467ed 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,12 +1,12 @@
# Template file for 'network-manager-applet'
pkgname=network-manager-applet
version=1.30.0
-revision=1
+revision=2
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
- libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libayatana-appindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
libgudev-devel libnotify-devel libnma-devel libsecret-devel
polkit-devel mobile-broadband-provider-info"
depends="NetworkManager hicolor-icon-theme iso-codes"
From fdc9643549ef370a8a8223b1c81b7242d103b0c2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 07/14] psensor: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 53 +++++++++++++++++++
srcpkgs/psensor/template | 6 +--
2 files changed, 56 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/psensor/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/psensor/patches/use-ayatana-appindicator.patch b/srcpkgs/psensor/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..f8350ca6f77f
--- /dev/null
+++ b/srcpkgs/psensor/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,53 @@
+From d84498639263d6a8f8d4b4adddf3dab66631876b Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 22 Jan 2022 00:15:13 +0100
+Subject: [PATCH] Use ayatana appindicator
+
+---
+ configure.ac | 2 +-
+ src/ui.h | 2 +-
+ src/ui_appindicator.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 48b10eb..2ff857d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -117,7 +117,7 @@ AC_SUBST(LIBNOTIFY_LIBS)
+
+ # Checks AppIndicator
+ APPINDICATOR_LIBS=
+-PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1,
++PKG_CHECK_MODULES(APPINDICATOR, ayatana-appindicator3-0.1,
+ [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator3-0.1])],
+ [AC_MSG_WARN(AppIndicator 3-0.1 not present")])
+ AM_CONDITIONAL(APPINDICATOR, test -n "$APPINDICATOR_LIBS")
+diff --git a/src/ui.h b/src/ui.h
+index 426f29c..43ae4be 100644
+--- a/src/ui.h
++++ b/src/ui.h
+@@ -27,7 +27,7 @@
+ #include <gtk/gtk.h>
+
+ #if defined(HAVE_APPINDICATOR)
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+ #endif
+
+ #include "psensor.h"
+diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
+index ed4cc64..b3179c0 100644
+--- a/src/ui_appindicator.c
++++ b/src/ui_appindicator.c
+@@ -21,7 +21,7 @@
+ #include <string.h>
+
+ #include <gtk/gtk.h>
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+
+ #include <cfg.h>
+ #include <psensor.h>
+--
+2.34.1
+
diff --git a/srcpkgs/psensor/template b/srcpkgs/psensor/template
index d21a33c4c695..752e9fe04e7c 100644
--- a/srcpkgs/psensor/template
+++ b/srcpkgs/psensor/template
@@ -1,12 +1,12 @@
# Template file for 'psensor'
pkgname=psensor
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
-hostmakedepends="pkg-config glib-devel"
+hostmakedepends="pkg-config glib-devel automake"
makedepends="gtk+3-devel udisks2-devel libgtop-devel json-c-devel
libsensors-devel libatasmart-devel libcurl-devel libnotify-devel
- libappindicator-devel libmicrohttpd-devel"
+ libayatana-appindicator-devel libmicrohttpd-devel"
depends="lm_sensors"
short_desc="Graphical hardware temperature monitor for Linux"
maintainer="Foxlet <foxlet@furcode.co>"
From 2686eaf2ae979af929e6ca356e7438b3f226c2c4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 08/14] remmina: replace libappindicator with
libayatana-appindicator
---
srcpkgs/remmina/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index f4c126e12f68..a27d96914755 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,9 +1,9 @@
# Template file for 'remmina'
pkgname=remmina
version=1.4.29
-revision=1
+revision=2
build_style=cmake
-configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"
+configure_args="-DCMAKE_USE_PTHREADS_INIT=ON"
hostmakedepends="glib-devel intltool pkg-config shared-mime-info"
makedepends="avahi-glib-libs-devel avahi-ui-libs-devel freerdp-devel
gobject-introspection gstreamermm-devel json-glib-devel
@@ -11,7 +11,7 @@ makedepends="avahi-glib-libs-devel avahi-ui-libs-devel freerdp-devel
libsecret-devel libsodium-devel libsoup3-devel libssh-devel libva-devel
libvncserver-devel libxkbfile-devel opus-devel phodav-devel
spice-gtk-devel spice-protocol telepathy-glib-devel usbredir-devel
- vte3-devel libappindicator-devel libwebkit2gtk41-devel python3-devel"
+ vte3-devel libayatana-appindicator-devel libwebkit2gtk41-devel python3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Remote desktop client written in GTK+"
maintainer="Frank Steinborn <steinex@nognu.de>"
From c6da9add37e0ccacdb1495fe058364c056fd112e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 09/14] ulauncher: replace libappindicator with
libayatana-appindicator
---
srcpkgs/ulauncher/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ulauncher/template b/srcpkgs/ulauncher/template
index 0eb497d16e1c..d592930f6d24 100644
--- a/srcpkgs/ulauncher/template
+++ b/srcpkgs/ulauncher/template
@@ -1,12 +1,12 @@
# Template file for 'ulauncher'
pkgname=ulauncher
version=5.14.3
-revision=2
+revision=3
build_style=python3-module
hostmakedepends="python3-distutils-extra intltool python3-Levenshtein
python3-dbus python3-gobject python3-inotify python3-websocket-client
python3-xdg"
-depends="libappindicator>=12.10.0_2 libkeybinder3 python3-Levenshtein python3-dbus
+depends="libayatana-appindicator libkeybinder3 python3-Levenshtein python3-dbus
python3-gobject python3-inotify python3-websocket-client python3-xdg webkit2gtk"
short_desc="Linux application launcher with fuzzy search and extensions"
maintainer="Alberto Pau <me@albertopau.com>"
From 77ec3af8807e202e42742b46edd2014c268a3b0b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 10/14] gwe: replace libappindicator with
libayatana-appindicator
---
.../gwe/patches/use-ayatana-appindicator.patch | 15 +++++++++++++++
srcpkgs/gwe/template | 4 ++--
2 files changed, 17 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gwe/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/gwe/patches/use-ayatana-appindicator.patch b/srcpkgs/gwe/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..05029c1c7755
--- /dev/null
+++ b/srcpkgs/gwe/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,15 @@
+diff --git a/gwe/view/main_view.py b/gwe/view/main_view.py
+index 61c891d..6f573c2 100644
+--- a/gwe/view/main_view.py
++++ b/gwe/view/main_view.py
+@@ -31,8 +31,8 @@ from gwe.model.fan_profile import FanProfile
+ try: # AppIndicator3 may not be installed
+ import gi
+
+- gi.require_version('AppIndicator3', '0.1')
+- from gi.repository import AppIndicator3
++ gi.require_version('AyatanaAppIndicator3', '0.1')
++ from gi.repository import AyatanaAppIndicator3 as AppIndicator3
+ except (ImportError, ValueError):
+ AppIndicator3 = None
+ from gwe.di import MainBuilder
diff --git a/srcpkgs/gwe/template b/srcpkgs/gwe/template
index f4473200cd67..ce70ed78573c 100644
--- a/srcpkgs/gwe/template
+++ b/srcpkgs/gwe/template
@@ -1,14 +1,14 @@
# Template file for 'gwe'
pkgname=gwe
version=0.15.2
-revision=3
+revision=4
build_style=meson
hostmakedepends="pkg-config meson ninja glib-devel gtk+3-devel python3 python3-devel
python3-matplotlib python3-peewee python3-gobject python3-xlib python3-xdg
python3-requests python3-rx python3-nvml python3-injector python3-urllib3 python3-six
python3-chardet python3-idna python3-xlib python3-numpy python3-parsing python3-cycler python3-dateutil python3-Pillow"
makedepends="gobject-introspection appstream-glib"
-depends="python3 gobject-introspection libappindicator libdazzle python3-matplotlib
+depends="python3 gobject-introspection libayatana-appindicator libdazzle python3-matplotlib
python3-peewee python3-gobject python3-xlib python3-xdg python3-requests python3-rx
python3-nvml python3-injector python3-urllib3 python3-six python3-chardet python3-idna
python3-xlib python3-numpy python3-parsing python3-cycler python3-dateutil python3-Pillow"
From 03e6cfbfbc14f8a3a287a6f66e63c1809ca657d9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 11/14] caffeine-ng: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 16 ++++++++++++++++
srcpkgs/caffeine-ng/template | 4 ++--
2 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch b/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..925dad3e0410
--- /dev/null
+++ b/srcpkgs/caffeine-ng/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,16 @@
+diff --git a/caffeine/main.py b/caffeine/main.py
+index 516a138..f48653b 100644
+--- a/caffeine/main.py
++++ b/caffeine/main.py
+@@ -32,9 +32,9 @@ try:
+ gi.require_version("Notify", "0.7")
+ except ValueError:
+ gi.require_version("Notify", "0.8")
+-gi.require_version("AppIndicator3", "0.1")
++gi.require_version("AyatanaAppIndicator3", "0.1")
+
+-from gi.repository import AppIndicator3 # noqa: E402
++from gi.repository import AyatanaAppIndicator3 as AppIndicator3 # noqa: E402
+ from gi.repository import GdkPixbuf # noqa: E402
+ from gi.repository import Gtk # noqa: E402
+ from gi.repository.Notify import Notification # noqa: E402
diff --git a/srcpkgs/caffeine-ng/template b/srcpkgs/caffeine-ng/template
index 4f1b6774cdd2..3289bf5bad43 100644
--- a/srcpkgs/caffeine-ng/template
+++ b/srcpkgs/caffeine-ng/template
@@ -1,13 +1,13 @@
# Template file for 'caffeine-ng'
pkgname=caffeine-ng
version=4.0.2
-revision=3
+revision=4
build_style=python3-module
hostmakedepends="python3-setuptools_scm"
depends="desktop-file-utils gtk+3 hicolor-icon-theme libnotify
python3-dbus python3-click python3-ewmh python3-gobject
python3-setproctitle python3-setuptools python3-xdg
- python3-pulsectl libappindicator"
+ python3-pulsectl libayatana-appindicator"
short_desc="Temporarily inhibits the screensaver and sleep mode"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
From af758d34dc2d6e34d46703d4c53c6a0a921cdef9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:42 +0100
Subject: [PATCH 12/14] indicator-doom-cpu: replace libappindicator with
libayatana-appindicator
---
.../patches/use-ayatana-appindicator.patch | 13 +++++++++++++
srcpkgs/indicator-doom-cpu/template | 4 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch b/srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch
new file mode 100644
index 000000000000..00a185b7d6ed
--- /dev/null
+++ b/srcpkgs/indicator-doom-cpu/patches/use-ayatana-appindicator.patch
@@ -0,0 +1,13 @@
+diff --git a/indicator-doom-cpu b/indicator-doom-cpu
+index a1528e3..c4ff4d2 100755
+--- a/indicator-doom-cpu
++++ b/indicator-doom-cpu
+@@ -27,7 +27,7 @@ import time
+ from gi.repository import Gtk, GObject, GdkPixbuf
+
+ try:
+- from gi.repository import AppIndicator3 as AppIndicator
++ from gi.repository import AyatanaAppIndicator3 as AppIndicator
+ appindicator_imported = True
+ except ImportError:
+ appindicator_imported = False
diff --git a/srcpkgs/indicator-doom-cpu/template b/srcpkgs/indicator-doom-cpu/template
index eb15aa66335a..75da2d47ae33 100644
--- a/srcpkgs/indicator-doom-cpu/template
+++ b/srcpkgs/indicator-doom-cpu/template
@@ -1,8 +1,8 @@
# Template file for 'indicator-doom-cpu'
pkgname=indicator-doom-cpu
version=1.0.1
-revision=3
-depends="python3-gobject gtk+3 libappindicator"
+revision=4
+depends="python3-gobject gtk+3 libayatana-appindicator"
short_desc="CPU load indicator showing the dying face from the video game DOOM"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-only"
From d69160e8594d74b135948763c478d84c8cdcbf9e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:43 +0100
Subject: [PATCH 13/14] element-desktop: remove build dependency on
libappindicator-devel
---
srcpkgs/element-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 715cc1c76570..60853a40b739 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -5,7 +5,7 @@ revision=1
create_wrksrc=yes
conf_files="/etc/${pkgname}/config.json"
hostmakedepends="git yarn nodejs rust cargo python3 curl
- sqlcipher-devel libappindicator-devel libnotify-devel pkg-config
+ sqlcipher-devel libnotify-devel pkg-config
app-builder jq moreutils"
makedepends="libsecret-devel"
depends="c-ares ffmpeg gtk+3 http-parser libevent
From 3575c2d824bacc525b9c0b9d65e80d0c77fe395d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Nov 2022 10:53:43 +0100
Subject: [PATCH 14/14] safeeyes: replace libappindicator with
libayatana-appindicator
---
srcpkgs/safeeyes/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/safeeyes/template b/srcpkgs/safeeyes/template
index 0011b9c9c07e..ff42de3c805b 100644
--- a/srcpkgs/safeeyes/template
+++ b/srcpkgs/safeeyes/template
@@ -1,11 +1,11 @@
# Template file for 'safeeyes'
pkgname=safeeyes
version=2.1.4
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-pip python3-devel pkg-config"
makedepends="python3-devel cairo-devel libgirepository-devel"
-depends="python3-psutil libappindicator python3-gobject python3-Babel
+depends="python3-psutil libayatana-appindicator python3-gobject python3-Babel
python3-dbus xprop alsa-utils python3-xlib"
checkdepends="$depends"
short_desc="Tool to reduce and prevent repetitive strain injury"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: Ayatana indicators
2022-11-25 18:04 [PR PATCH] Ayatana indicators tibequadorian
` (12 preceding siblings ...)
2023-02-14 17:10 ` [PR PATCH] [Updated] " paper42
@ 2023-02-14 18:52 ` paper42
2023-02-14 18:52 ` [PR PATCH] [Closed]: " paper42
14 siblings, 0 replies; 17+ messages in thread
From: paper42 @ 2023-02-14 18:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 157 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/40761#issuecomment-1430226130
Comment:
merged manually
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Closed]: Ayatana indicators
2022-11-25 18:04 [PR PATCH] Ayatana indicators tibequadorian
` (13 preceding siblings ...)
2023-02-14 18:52 ` paper42
@ 2023-02-14 18:52 ` paper42
14 siblings, 0 replies; 17+ messages in thread
From: paper42 @ 2023-02-14 18:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2761 bytes --]
There's a closed pull request on the void-packages repository
Ayatana indicators
https://github.com/void-linux/void-packages/pull/40761
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
Continuation of #35135
`libappindicator` hasn't seen a release since 2012 (more than 10 years!)
Debian has removed it in buster and switched to [libayatana-appindicator](https://ayatanaindicators.github.io/).
This PR tries to replace `libappindicator` with `libayatana-appindicator`.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### TODO:
- [x] `droidcam` - only [supported](https://github.com/dev47apps/droidcam/commit/71a74d22ed700650a83b7cb653bd92b0ed3cd01a) in master, patched
- [x] `gromit-mpx` - [supported](https://github.com/bk138/gromit-mpx/commit/2a838303154df4a90495c4f93741846cbd63d37f)
- [x] `network-manager-applet` - supported
- [x] `psensor` - not supported, patched
- [x] `remmina` - [supported](https://github.com/FreeRDP/Remmina/commit/a34133add92c217943acad64bb0e41de0f2f619c)
- [x] `ulauncher` - supported
- [x] `gwe` - [not supported](https://gitlab.com/leinardi/gwe/-/issues/156), [merge request](https://gitlab.com/leinardi/gwe/-/merge_requests/73), patched
- [x] `caffeine-ng` - only [supported](https://codeberg.org/WhyNotHugo/caffeine-ng/commit/d13b2b97160649b465213e691a8df2e958ecf739) in master, patched
- [x] `indicator-doom-cpu` - not supported, patched
- [x] `element-desktop` - [not supported](https://github.com/electron/electron/issues/27527) but works fine without it and uses systray instead, removed dependency,
see https://github.com/vector-im/element-desktop/pull/170
and https://github.com/signalapp/Signal-Desktop/pull/5031#issuecomment-788068627.
_No revbump needed because not the package but only the template required libappindicator._
- [x] `safeeyes` - [supported](https://github.com/slgobinath/SafeEyes/commit/c784000e694f9fa508a2535f5d23d04456b4ff86) in 2.1.4, #40763
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PR PATCH] Ayatana indicators
@ 2022-01-20 15:34 tibequadorian
0 siblings, 0 replies; 17+ messages in thread
From: tibequadorian @ 2022-01-20 15:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1494 bytes --]
There is a new pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ayatana-indicators
https://github.com/void-linux/void-packages/pull/35135
Ayatana indicators
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
`libappindicator` hasn't seen a release since 2012 (almost 10 years!)
Debian has removed it in buster and switched to [libayatana-appindicator](https://ayatanaindicators.github.io/).
This PR is intended to prepare void linux for it. Let me know what you think...
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35135.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ayatana-indicators-35135.patch --]
[-- Type: text/x-diff, Size: 8265 bytes --]
From df8ad2c170e29b8cc28bddf0c34b6ba162858dfb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:37:25 +0100
Subject: [PATCH 1/3] New package: ayatana-ido-0.9.0
---
common/shlibs | 1 +
srcpkgs/ayatana-ido-devel | 1 +
srcpkgs/ayatana-ido/template | 26 ++++++++++++++++++++++++++
3 files changed, 28 insertions(+)
create mode 120000 srcpkgs/ayatana-ido-devel
create mode 100644 srcpkgs/ayatana-ido/template
diff --git a/common/shlibs b/common/shlibs
index b07e14379e28..c008858e9469 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4098,3 +4098,4 @@ libkmailconfirmbeforedeleting.so.5 kdepim-addons-21.08.3_1
libkaddressbookprivate.so.5 kaddressbook-21.08.3_1
libcodec2.so.1.0 codec2-1.0.1_1
libx86emu.so.3 libx86emu-3.4_1
+libayatana-ido3-0.4.so.0 ayatana-ido-0.9.0_1
diff --git a/srcpkgs/ayatana-ido-devel b/srcpkgs/ayatana-ido-devel
new file mode 120000
index 000000000000..2e1aa73a149c
--- /dev/null
+++ b/srcpkgs/ayatana-ido-devel
@@ -0,0 +1 @@
+ayatana-ido
\ No newline at end of file
diff --git a/srcpkgs/ayatana-ido/template b/srcpkgs/ayatana-ido/template
new file mode 100644
index 000000000000..cf14fea35aba
--- /dev/null
+++ b/srcpkgs/ayatana-ido/template
@@ -0,0 +1,26 @@
+# Template file for 'ayatana-ido'
+pkgname=ayatana-ido
+version=0.9.0
+revision=1
+build_helper="gir"
+build_style=cmake
+hostmakedepends="pkg-config gobject-introspection vala"
+makedepends="gtk+3-devel glib-devel"
+short_desc="Ayatana Indicator Display Objects"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+distfiles="https://github.com/AyatanaIndicators/${pkgname}/archive/${version}.tar.gz"
+checksum=e09b182a67ea65e188a689a2ff792c9a3830740f1aec6679bbd6021235402b4b
+
+ayatana-ido-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
+ }
+}
From 3aa37b7a2417507538c4a9fc484c9c07abee50c9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:38:40 +0100
Subject: [PATCH 2/3] New package: libayatana-indicator-0.9.0
---
common/shlibs | 1 +
srcpkgs/libayatana-indicator-devel | 1 +
srcpkgs/libayatana-indicator/template | 23 +++++++++++++++++++++++
3 files changed, 25 insertions(+)
create mode 120000 srcpkgs/libayatana-indicator-devel
create mode 100644 srcpkgs/libayatana-indicator/template
diff --git a/common/shlibs b/common/shlibs
index c008858e9469..78465d5620c9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4099,3 +4099,4 @@ libkaddressbookprivate.so.5 kaddressbook-21.08.3_1
libcodec2.so.1.0 codec2-1.0.1_1
libx86emu.so.3 libx86emu-3.4_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.0_1
+libayatana-indicator3.so.7 libayatana-indicator-0.9.0_1
diff --git a/srcpkgs/libayatana-indicator-devel b/srcpkgs/libayatana-indicator-devel
new file mode 120000
index 000000000000..fdfe7dbb5d64
--- /dev/null
+++ b/srcpkgs/libayatana-indicator-devel
@@ -0,0 +1 @@
+libayatana-indicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-indicator/template b/srcpkgs/libayatana-indicator/template
new file mode 100644
index 000000000000..64063481858d
--- /dev/null
+++ b/srcpkgs/libayatana-indicator/template
@@ -0,0 +1,23 @@
+# Template file for 'libayatana-indicator'
+pkgname=libayatana-indicator
+version=0.9.0
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config python3"
+makedepends="glib-devel gtk+3-devel ayatana-ido-devel"
+short_desc="Ayatana Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="GPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+distfiles="https://github.com/AyatanaIndicators/${pkgname}/archive/${version}.tar.gz"
+checksum=b72c31e64f2a6a7d8f8a35a725d02416cfae7c35e0d42f5664792f7d22d465a4
+
+libayatana-indicator-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From 2d4e020212216083751898e714cd58e96feffe6d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:44:14 +0100
Subject: [PATCH 3/3] New package: libayatana-appindicator-0.5.90
---
common/shlibs | 1 +
srcpkgs/libayatana-appindicator-devel | 1 +
.../0001-Fix-build-with-musl-libc.patch | 27 ++++++++++++++++
srcpkgs/libayatana-appindicator/template | 32 +++++++++++++++++++
4 files changed, 61 insertions(+)
create mode 120000 srcpkgs/libayatana-appindicator-devel
create mode 100644 srcpkgs/libayatana-appindicator/patches/0001-Fix-build-with-musl-libc.patch
create mode 100644 srcpkgs/libayatana-appindicator/template
diff --git a/common/shlibs b/common/shlibs
index 78465d5620c9..73f33485bf19 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4100,3 +4100,4 @@ libcodec2.so.1.0 codec2-1.0.1_1
libx86emu.so.3 libx86emu-3.4_1
libayatana-ido3-0.4.so.0 ayatana-ido-0.9.0_1
libayatana-indicator3.so.7 libayatana-indicator-0.9.0_1
+libayatana-appindicator3.so.1 libayatana-appindicator-0.5.90_1
diff --git a/srcpkgs/libayatana-appindicator-devel b/srcpkgs/libayatana-appindicator-devel
new file mode 120000
index 000000000000..a2ff93abbc17
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator-devel
@@ -0,0 +1 @@
+libayatana-appindicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-appindicator/patches/0001-Fix-build-with-musl-libc.patch b/srcpkgs/libayatana-appindicator/patches/0001-Fix-build-with-musl-libc.patch
new file mode 100644
index 000000000000..cc3d59650d34
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator/patches/0001-Fix-build-with-musl-libc.patch
@@ -0,0 +1,27 @@
+From 89415c01b730e3a1f6f66402b5c439fb04bda201 Mon Sep 17 00:00:00 2001
+From: Luca Weiss <luca@z3ntu.xyz>
+Date: Tue, 7 Dec 2021 22:22:53 +0100
+Subject: [PATCH] Fix build with musl libc
+
+canonicalize_file_name() is a GNU extension not supported by musl libc.
+Use realpath() from POSIX instead.
+---
+ src/app-indicator.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/app-indicator.c b/src/app-indicator.c
+index a0e1553..cb0086f 100644
+--- a/src/app-indicator.c
++++ b/src/app-indicator.c
+@@ -2081,7 +2081,7 @@ append_snap_prefix (const gchar *path)
+ g_autofree gchar *canon_path = NULL;
+
+ if (snap != NULL && path != NULL) {
+- canon_path = canonicalize_file_name(path);
++ canon_path = realpath(path, NULL);
+
+ if (g_str_has_prefix (canon_path, "/tmp/")) {
+ g_warning ("Using '/tmp' paths in SNAP environment will lead to unreadable resources");
+--
+2.34.1
+
diff --git a/srcpkgs/libayatana-appindicator/template b/srcpkgs/libayatana-appindicator/template
new file mode 100644
index 000000000000..3a807f987592
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator/template
@@ -0,0 +1,32 @@
+# Template file for 'libayatana-appindicator'
+pkgname=libayatana-appindicator
+version=0.5.90
+revision=1
+build_helper="gir"
+build_style=cmake
+configure_args="-DENABLE_BINDINGS_MONO=OFF -DENABLE_BINDINGS_VALA=$(vopt_if vala ON OFF)"
+hostmakedepends="pkg-config gobject-introspection $(vopt_if vala vala)"
+makedepends="glib-devel gtk+3-devel libdbusmenu-gtk3-devel libayatana-indicator-devel"
+short_desc="Ayatana Application Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+distfiles="https://github.com/AyatanaIndicators/${pkgname}/archive/${version}.tar.gz"
+checksum=15319ca7fda90c6bd85311bbe83eefe1e322de32df2c7f5174b0d5a7537c27b4
+
+build_options="vala"
+build_options_default="vala"
+
+libayatana-appindicator-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ if [ "$build_option_vala" ]; then
+ vmove usr/share/vala
+ fi
+ }
+}
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2023-02-14 18:52 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-25 18:04 [PR PATCH] Ayatana indicators tibequadorian
2022-11-25 19:05 ` [PR PATCH] [Updated] " tibequadorian
2022-11-25 21:27 ` tibequadorian
2022-11-26 10:49 ` tibequadorian
2022-11-26 11:01 ` tibequadorian
2022-11-26 12:17 ` tibequadorian
2022-11-27 17:35 ` tibequadorian
2022-11-29 11:11 ` tibequadorian
2022-11-30 9:53 ` tibequadorian
2022-12-12 9:26 ` tibequadorian
2022-12-12 17:19 ` tibequadorian
2022-12-12 19:00 ` tibequadorian
2023-02-06 21:50 ` kruceter
2023-02-14 17:10 ` [PR PATCH] [Updated] " paper42
2023-02-14 18:52 ` paper42
2023-02-14 18:52 ` [PR PATCH] [Closed]: " paper42
-- strict thread matches above, loose matches on Subject: below --
2022-01-20 15:34 [PR PATCH] " tibequadorian
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).