diff options
| -rw-r--r-- | x11-misc/redshift/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-misc/redshift/files/redshift-1.9-toggle.patch | 37 | ||||
| -rw-r--r-- | x11-misc/redshift/redshift-1.9-r1.ebuild (renamed from x11-misc/redshift/redshift-1.9.ebuild) | 3 |
3 files changed, 46 insertions, 2 deletions
diff --git a/x11-misc/redshift/ChangeLog b/x11-misc/redshift/ChangeLog index 70afedd88cd4..a579bef3704a 100644 --- a/x11-misc/redshift/ChangeLog +++ b/x11-misc/redshift/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-misc/redshift # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/redshift/ChangeLog,v 1.22 2014/04/13 15:09:40 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/redshift/ChangeLog,v 1.23 2014/04/13 17:51:26 sping Exp $ + +*redshift-1.9-r1 (13 Apr 2014) + + 13 Apr 2014; Sebastian Pipping <sping@gentoo.org> -redshift-1.9.ebuild, + +redshift-1.9-r1.ebuild, +files/redshift-1.9-toggle.patch: + Apply upstream patch for upstream bug #68 *redshift-1.9 (13 Apr 2014) diff --git a/x11-misc/redshift/files/redshift-1.9-toggle.patch b/x11-misc/redshift/files/redshift-1.9-toggle.patch new file mode 100644 index 000000000000..b28a11be2b52 --- /dev/null +++ b/x11-misc/redshift/files/redshift-1.9-toggle.patch @@ -0,0 +1,37 @@ +From 9426e9fba038a3b5076ed92dbe538451de8725f2 Mon Sep 17 00:00:00 2001 +From: Jon Lund Steffensen <jonlst@gmail.com> +Date: Fri, 11 Apr 2014 00:26:57 +0200 +Subject: [PATCH] redshift-gtk: Fix crash when toggling state using the status + icon + +--- + src/redshift-gtk/statusicon.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/redshift-gtk/statusicon.py b/src/redshift-gtk/statusicon.py +index 5685f08..08f28ef 100644 +--- a/src/redshift-gtk/statusicon.py ++++ b/src/redshift-gtk/statusicon.py +@@ -79,7 +79,7 @@ def __init__(self, args=[]): + + # Add toggle action + self.toggle_item = Gtk.CheckMenuItem.new_with_label(_('Enabled')) +- self.toggle_item.connect('activate', self.toggle_cb) ++ self.toggle_item.connect('activate', self.toggle_item_cb) + self.status_menu.append(self.toggle_item) + + # Add suspend menu +@@ -215,6 +215,10 @@ def popup_menu_cb(self, widget, button, time, data=None): + self.status_icon, button, time) + + def toggle_cb(self, widget, data=None): ++ self.remove_suspend_timer() ++ self.child_toggle_status() ++ ++ def toggle_item_cb(self, widget, data=None): + # Only toggle if a change from current state was requested + if self.is_enabled() != widget.get_active(): + self.remove_suspend_timer() +-- +1.9.1 + diff --git a/x11-misc/redshift/redshift-1.9.ebuild b/x11-misc/redshift/redshift-1.9-r1.ebuild index 5e27c113f2a3..f688a1a6b315 100644 --- a/x11-misc/redshift/redshift-1.9.ebuild +++ b/x11-misc/redshift/redshift-1.9-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/redshift/redshift-1.9.ebuild,v 1.1 2014/04/13 15:09:40 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/redshift/redshift-1.9-r1.ebuild,v 1.1 2014/04/13 17:51:26 sping Exp $ EAPI=5 PYTHON_COMPAT=( python{3_2,3_3} ) @@ -29,6 +29,7 @@ DEPEND="${COMMON_DEPEND} nls? ( sys-devel/gettext )" src_prepare() { + epatch "${FILESDIR}"/${P}-toggle.patch epatch_user eautoreconf } |