[packages/blueman] patch to prefer maintained ayatana indicators; rel 2

atler atler at pld-linux.org
Wed Nov 24 17:30:44 CET 2021


commit 3264904fdfd7594067717b348bfae631801c2573
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Nov 24 17:29:56 2021 +0100

    patch to prefer maintained ayatana indicators; rel 2

 ayatana-indicator.patch | 36 ++++++++++++++++++++++++++++++++++++
 blueman.spec            |  6 ++++--
 2 files changed, 40 insertions(+), 2 deletions(-)
---
diff --git a/blueman.spec b/blueman.spec
index 78c6321..52b9011 100644
--- a/blueman.spec
+++ b/blueman.spec
@@ -7,11 +7,12 @@
 Summary:	Blueman - bluetooth management utility for GNOME
 Name:		blueman
 Version:	2.2.3
-Release:	1
+Release:	2
 License:	GPL v3+
 Group:		X11/Applications
 Source0:	https://github.com/blueman-project/blueman/releases/download/%{version}/%{name}-%{version}.tar.xz
 # Source0-md5:	ccdb860090a751312e841538606b4393
+Patch0:		ayatana-indicator.patch
 URL:		https://github.com/blueman-project/blueman
 BuildRequires:	bluez-libs-devel >= 5.48
 %{?with_mate:BuildRequires:	caja-python-devel}
@@ -43,7 +44,7 @@ Requires:	python3-pycairo
 Requires:	python3-pygobject3 >= 3.27.2
 Suggests:	NetworkManager-libs
 Suggests:	iproute2
-Suggests:	libappindicator-gtk3
+Suggests:	libayatana-appindicator-gtk3
 Suggests:	pulseaudio-bluetooth
 Suggests:	pulseaudio-hal
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -122,6 +123,7 @@ Wtyczka Blueman-a dla Thunar-a.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \
diff --git a/ayatana-indicator.patch b/ayatana-indicator.patch
new file mode 100644
index 0000000..52501b3
--- /dev/null
+++ b/ayatana-indicator.patch
@@ -0,0 +1,36 @@
+diff --color -ur blueman-2.2.3.orig/blueman/main/indicators/AppIndicator.py blueman-2.2.3/blueman/main/indicators/AppIndicator.py
+--- blueman-2.2.3.orig/blueman/main/indicators/AppIndicator.py	2021-10-27 23:53:20.000000000 +0200
++++ blueman-2.2.3/blueman/main/indicators/AppIndicator.py	2021-11-24 17:27:22.156528203 +0100
+@@ -2,8 +2,12 @@
+ 
+ import gi
+ 
+-gi.require_version('AppIndicator3', '0.1')
+-from gi.repository import AppIndicator3
++try:
++    gi.require_version('AyatanaAppIndicator3', '0.1')
++    from gi.repository import AyatanaAppIndicator3 as AppIndicator3
++except ValueError:
++    gi.require_version('AppIndicator3', '0.1')
++    from gi.repository import AppIndicator3
+ from blueman.main.indicators.GtkStatusIcon import build_menu
+ 
+ if TYPE_CHECKING:
+diff --color -ur blueman-2.2.3.orig/blueman/plugins/applet/AppIndicator.py blueman-2.2.3/blueman/plugins/applet/AppIndicator.py
+--- blueman-2.2.3.orig/blueman/plugins/applet/AppIndicator.py	2021-10-27 23:53:20.000000000 +0200
++++ blueman-2.2.3/blueman/plugins/applet/AppIndicator.py	2021-11-24 17:26:51.113366220 +0100
+@@ -8,9 +8,12 @@
+ from blueman.plugins.applet.StatusIcon import StatusIconImplementationProvider
+ 
+ try:
+-    require_version('AppIndicator3', '0.1')
++    require_version('AyatanaAppIndicator3', '0.1')
+ except ValueError:
+-    raise ImportError("AppIndicator3 not found")
++    try:
++        require_version('AppIndicator3', '0.1')
++    except ValueError:
++        raise ImportError("AppIndicator3 not found")
+ 
+ 
+ class AppIndicator(AppletPlugin, StatusIconImplementationProvider):
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/blueman.git/commitdiff/3264904fdfd7594067717b348bfae631801c2573



More information about the pld-cvs-commit mailing list