summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2023-01-22 13:29:47 +0100
committerPacho Ramos <pacho@gentoo.org>2023-01-22 13:45:00 +0100
commit3520984a77497862b87451b979b75007b6d8e303 (patch)
treecb05179817454ee29b77f81a000a623f84a00e2f /x11-plugins/pidgin-indicator
parentgnome-extra/gnome-shell-extension-alphabetical-grid: add 27.0 (diff)
downloadgentoo-3520984a77497862b87451b979b75007b6d8e303.tar.gz
gentoo-3520984a77497862b87451b979b75007b6d8e303.tar.bz2
gentoo-3520984a77497862b87451b979b75007b6d8e303.zip
x11-plugins/pidgin-indicator: Use ayatana indicators
Signed-off-by: Pacho Ramos <pacho@gentoo.org>
Diffstat (limited to 'x11-plugins/pidgin-indicator')
-rw-r--r--x11-plugins/pidgin-indicator/files/pidgin-indicator-1.0.1-ayatana-indicator.patch59
-rw-r--r--x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1-r1.ebuild45
-rw-r--r--x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1.ebuild2
3 files changed, 105 insertions, 1 deletions
diff --git a/x11-plugins/pidgin-indicator/files/pidgin-indicator-1.0.1-ayatana-indicator.patch b/x11-plugins/pidgin-indicator/files/pidgin-indicator-1.0.1-ayatana-indicator.patch
new file mode 100644
index 000000000000..f3061bc8dee1
--- /dev/null
+++ b/x11-plugins/pidgin-indicator/files/pidgin-indicator-1.0.1-ayatana-indicator.patch
@@ -0,0 +1,59 @@
+From 0376453849ca2e7ba5ab1ff7feb7a527ec0b1045 Mon Sep 17 00:00:00 2001
+From: Kevin Locke <kevin@kevinlocke.name>
+Date: Tue, 22 Feb 2022 18:43:11 -0700
+Subject: [PATCH] Support Ayatana AppIndicators
+
+Ubuntu AppIndicator ([libappindicator]) was [removed in Debian Bullseye]
+and has been superseded by Ayatana AppIndicator
+([libayatana-appindicator]) for both [Debian] and [Ubuntu].
+
+Add support for building with libayatana-appindicator instead of
+libappindicator.
+
+[libappindicator]: https://launchpad.net/libappindicator
+[libayatana-appindicator]: https://github.com/AyatanaIndicators/libayatana-appindicator
+[Debian]: https://lists.debian.org/debian-devel/2018/03/msg00506.html
+[Ubuntu]: https://bugs.launchpad.net/ubuntu/+source/libayatana-appindicator/+bug/1915695
+[removed in Debian Bullseye]: https://www.debian.org/releases/bullseye/amd64/release-notes/ch-information.en.html#noteworthy-obsolete-packages
+
+Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
+---
+ configure.ac | 6 +++++-
+ debian/control | 2 +-
+ src/pidgin-indicator.c | 6 +++++-
+ 3 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index fefd90d..195651e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -96,7 +96,11 @@ PKG_CHECK_MODULES(GTK, [gtk+-2.0])
+ AC_SUBST(GTK_LIBS)
+ AC_SUBST(GTK_CFLAGS)
+
+-PKG_CHECK_MODULES(INDICATOR, [appindicator3-0.1])
++PKG_CHECK_MODULES(
++ [INDICATOR],
++ [ayatana-appindicator3-0.1],
++ [AC_DEFINE([HAVE_AYATANA_INDICATOR], [1], [Have Ayatana AppIndicator])],
++ [PKG_CHECK_MODULES([INDICATOR], [appindicator3-0.1])])
+ AC_SUBST(INDICATOR_LIBS)
+ AC_SUBST(INDICATOR_CFLAGS)
+
+diff --git a/src/pidgin-indicator.c b/src/pidgin-indicator.c
+index 9eeb8a4..9382a95 100644
+--- a/src/pidgin-indicator.c
++++ b/src/pidgin-indicator.c
+@@ -41,7 +41,11 @@
+ #include <savedstatuses.h>
+ #include <version.h>
+
+-#include <libappindicator/app-indicator.h>
++#ifdef HAVE_AYATANA_INDICATOR
++# include <libayatana-appindicator/app-indicator.h>
++#else
++# include <libappindicator/app-indicator.h>
++#endif
+
+ #include "docklet.h"
+
diff --git a/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1-r1.ebuild b/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..1d3cef23947e
--- /dev/null
+++ b/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools xdg
+
+DESCRIPTION="AppIndicator/KStatusNotifierItem plugin for Pidgin"
+HOMEPAGE="https://github.com/philipl/pidgin-indicator"
+SRC_URI="https://github.com/philipl/pidgin-indicator/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE=""
+
+# No direct gtk3 until pidgin migrates:
+# https://github.com/philipl/pidgin-indicator/issues/32
+RDEPEND="
+ dev-libs/libayatana-indicator
+ net-im/pidgin[gtk]
+ x11-libs/gtk+:2
+"
+DEPEND="${RDEPEND}
+ dev-perl/XML-Parser
+"
+BDEPEND="
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-appindicator3.patch"
+ "${FILESDIR}/${P}-ayatana-indicator.patch"
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_install() {
+ default
+ find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1.ebuild b/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1.ebuild
index 381a03e9919d..1a903c3269d2 100644
--- a/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1.ebuild
+++ b/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7