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