Github messages for voidlinux
 help / color / mirror / Atom feed
From: tibequadorian <tibequadorian@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] Ayatana indicators
Date: Fri, 25 Nov 2022 19:04:49 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40761@inbox.vuxu.org> (raw)

[-- 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>"

             reply	other threads:[~2022-11-25 18:04 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-25 18:04 tibequadorian [this message]
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

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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40761@inbox.vuxu.org \
    --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).