From b8c4aac2555bfd43dab090f77fb8c7d224a928df Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Wed, 18 Dec 2013 08:36:51 +0100 Subject: [PATCH] - added missing status icons - rel 3 --- blueman-statusicon.patch | 20 -- blueman.spec | 21 +- icon-active.patch | 12 + missing-icons.patch | 555 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 585 insertions(+), 23 deletions(-) delete mode 100644 blueman-statusicon.patch create mode 100644 icon-active.patch create mode 100644 missing-icons.patch diff --git a/blueman-statusicon.patch b/blueman-statusicon.patch deleted file mode 100644 index 1031b62..0000000 --- a/blueman-statusicon.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- blueman-1.23/blueman/plugins/applet/StatusIcon.py.orig 2012-04-26 23:52:01.900955192 +0200 -+++ blueman-1.23/blueman/plugins/applet/StatusIcon.py 2012-04-26 23:52:34.882160450 +0200 -@@ -68,7 +68,7 @@ - entry.connect("changed", self.on_entry_changed, ic, image) - - __options__ = {"icon": {"type": str, -- "default": "blueman-tray", -+ "default": "bluetooth", - "name": _("Icon Name"), - "desc": _("Custom icon to use for the notification area"), - "decorator": widget_decorator -@@ -166,7 +166,7 @@ - self.QueryVisibility() - - def on_status_icon_resized(self): -- self.icon = "blueman-tray" -+ self.icon = "bluetooth" - - #p = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, 22, 22) - #p.fill(0) diff --git a/blueman.spec b/blueman.spec index 87a0873..b760281 100644 --- a/blueman.spec +++ b/blueman.spec @@ -6,17 +6,19 @@ Summary: Blueman - bluetooth management utility for GNOME Name: blueman Version: 1.23 -Release: 2 +Release: 3 License: GPL Group: Applications Source0: http://download.tuxfamily.org/blueman/%{name}-%{version}.tar.gz # Source0-md5: f0bee59589f4c23e35bf08c2ef8acaef -Patch0: %{name}-statusicon.patch +Patch0: missing-icons.patch +Patch1: icon-active.patch URL: http://blueman.tuxfamily.org/ BuildRequires: bluez-libs-devel BuildRequires: gettext-devel BuildRequires: gnome-bluetooth-devel BuildRequires: intltool +BuildRequires: librsvg BuildRequires: pkgconfig BuildRequires: python-Pyrex BuildRequires: python-dbus-devel @@ -61,6 +63,7 @@ Features: %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %configure \ @@ -74,6 +77,18 @@ rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +for s in 16 32 48 ; do + install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${s}x${s}/status + rsvg-convert -w $s -h $s -o $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${s}x${s}/status/blueman-tray.png \ + data/icons/hicolor/scalable/status/blueman-tray.svg + rsvg-convert -w $s -h $s -o $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${s}x${s}/status/blueman-tray-active.png \ + data/icons/hicolor/scalable/status/blueman-tray-active.svg + rsvg-convert -w $s -h $s -o $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${s}x${s}/status/blueman-tray-disabled.png \ + data/icons/hicolor/scalable/status/blueman-tray-disabled.svg +done +install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/scalable/status +install data/icons/hicolor/scalable/status/*.svg $RPM_BUILD_ROOT%{_iconsdir}/hicolor/scalable/status + %find_lang %{name} --with-gnome %clean @@ -94,7 +109,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/%{name} %{_datadir}/dbus-1/system-services/org.blueman.Mechanism.service %{_iconsdir}/hicolor/scalable/*/*.svg -%{_iconsdir}/hicolor/*/apps/*.png +%{_iconsdir}/hicolor/*/*/*.png %{_datadir}/polkit-1/actions/org.blueman.policy %{_desktopdir}/blueman-manager.desktop %{py_sitedir}/*.so diff --git a/icon-active.patch b/icon-active.patch new file mode 100644 index 0000000..0aff7ee --- /dev/null +++ b/icon-active.patch @@ -0,0 +1,12 @@ +Index: blueman-1.23/blueman/plugins/applet/PowerManager.py +=================================================================== +--- blueman-1.23.orig/blueman/plugins/applet/PowerManager.py 2011-10-08 21:09:16.000000000 +0200 ++++ blueman-1.23/blueman/plugins/applet/PowerManager.py 2012-09-27 02:14:10.481892534 +0200 +@@ -243,6 +243,7 @@ + #return pixbuf + if not self.GetBluetoothStatus(): + return ("blueman-tray-disabled", "bluetooth-disabled") ++ return ("blueman-tray-active", "bluetooth-active") + + def on_adapter_added(self, path): + adapter = Bluez.Adapter(path) diff --git a/missing-icons.patch b/missing-icons.patch new file mode 100644 index 0000000..0d2aa6b --- /dev/null +++ b/missing-icons.patch @@ -0,0 +1,555 @@ +commit 9863fb99aa384e42b8349d505af77c071f8cb6e6 +Author: Christopher Schramm +Date: Sun Oct 13 10:01:32 2013 +0200 + + Add missing icons (fixes #2) + +diff --git a/data/icons/hicolor/scalable/status/Makefile.am b/data/icons/hicolor/scalable/status/Makefile.am +index f0ddd52..2082dfc 100644 +--- a/data/icons/hicolor/scalable/status/Makefile.am ++++ b/data/icons/hicolor/scalable/status/Makefile.am +@@ -4,6 +4,6 @@ context = status + + iconsdir = $(themedir)/$(size)/$(context) + +-icons_DATA = blueman-tray-active.svg ++icons_DATA = blueman-tray-active.svg blueman-tray-disabled.svg blueman-tray.svg + + EXTRA_DIST = $(icons_DATA) +diff --git a/data/icons/hicolor/scalable/status/blueman-tray-disabled.svg b/data/icons/hicolor/scalable/status/blueman-tray-disabled.svg +new file mode 100644 +index 0000000..8ee5fe0 +--- /dev/null ++++ b/data/icons/hicolor/scalable/status/blueman-tray-disabled.svg +@@ -0,0 +1,291 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ image/svg+xml ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/data/icons/hicolor/scalable/status/blueman-tray.svg b/data/icons/hicolor/scalable/status/blueman-tray.svg +new file mode 100644 +index 0000000..3624a88 +--- /dev/null ++++ b/data/icons/hicolor/scalable/status/blueman-tray.svg +@@ -0,0 +1,234 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ image/svg+xml ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ -- 2.43.0