From 817f23ccc141f5fd80d9e4ecddc7f43b336af869 Mon Sep 17 00:00:00 2001 From: tibequadorian 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 " +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 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 " +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 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 " +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 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 +-#include ++#include + #include + #include + 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 " @@ -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 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 " license="GPL-2.0-only" From 15ef98b0ddfc074aa3a098e060503c9ea6b46e76 Mon Sep 17 00:00:00 2001 From: tibequadorian 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 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 +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 + + #if defined(HAVE_APPINDICATOR) +-#include ++#include + #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 + + #include +-#include ++#include + + #include + #include +-- +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 " From f6b59d7576701f577b4f7795119e9c67dc36ee5a Mon Sep 17 00:00:00 2001 From: tibequadorian 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 " From a9a47ff775213cc330980db5f8acfbc8cccc74ba Mon Sep 17 00:00:00 2001 From: tibequadorian 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 " From 6ddf4b9acf6717dff63b34ac38f1e2246fedd446 Mon Sep 17 00:00:00 2001 From: tibequadorian 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 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 " license="GPL-3.0-or-later" From bffd9d15d0227237316756843b747621328cd1b5 Mon Sep 17 00:00:00 2001 From: tibequadorian 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 "