summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2010-10-15 10:56:01 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2010-10-15 10:56:01 +0000
commit16c7c9125ffd540ae67e82058502cc49af315768 (patch)
tree3e3c0ad57955d3c4ad887f1fc61fa7a255e9ea9e /x11-misc/shutter
parentRespect LDFLAGS. Bug #335136 (diff)
downloadgentoo-2-16c7c9125ffd540ae67e82058502cc49af315768.tar.gz
gentoo-2-16c7c9125ffd540ae67e82058502cc49af315768.tar.bz2
gentoo-2-16c7c9125ffd540ae67e82058502cc49af315768.zip
Do not pick trayicon from icon theme but use hardcoded path to filename. Bug #340813
(Portage version: 2.2_rc96/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/shutter')
-rw-r--r--x11-misc/shutter/ChangeLog9
-rw-r--r--x11-misc/shutter/shutter-0.86.4-r1.ebuild (renamed from x11-misc/shutter/shutter-0.86.4.ebuild)8
2 files changed, 15 insertions, 2 deletions
diff --git a/x11-misc/shutter/ChangeLog b/x11-misc/shutter/ChangeLog
index 16a9c97bf8d0..1f7c2b14c8ca 100644
--- a/x11-misc/shutter/ChangeLog
+++ b/x11-misc/shutter/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for x11-misc/shutter
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/shutter/ChangeLog,v 1.14 2010/10/10 10:36:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shutter/ChangeLog,v 1.15 2010/10/15 10:56:01 hwoarang Exp $
+
+*shutter-0.86.4-r1 (15 Oct 2010)
+
+ 15 Oct 2010; Markos Chandras <hwoarang@gentoo.org> -shutter-0.86.4.ebuild,
+ +shutter-0.86.4-r1.ebuild:
+ Do not pick trayicon from icon theme but use hardcoded path to filename.
+ Bug #340813
*shutter-0.86.4 (10 Oct 2010)
diff --git a/x11-misc/shutter/shutter-0.86.4.ebuild b/x11-misc/shutter/shutter-0.86.4-r1.ebuild
index a4e4786c9f58..19902df5bf81 100644
--- a/x11-misc/shutter/shutter-0.86.4.ebuild
+++ b/x11-misc/shutter/shutter-0.86.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/shutter/shutter-0.86.4.ebuild,v 1.1 2010/10/10 10:36:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shutter/shutter-0.86.4-r1.ebuild,v 1.1 2010/10/15 10:56:01 hwoarang Exp $
EAPI="2"
@@ -43,6 +43,10 @@ RDEPEND="dev-lang/perl
src_prepare() {
use webphoto || epatch "${FILESDIR}"/disable_webphoto.patch
use drawing || epatch "${FILESDIR}"/${PV}-disable-goocanvas.patch
+ #Fix tray icon because it doesn't pick the right icon using various themes
+ sed -i -e "/\$tray->set_from_icon_name/s:set_from_icon_name:set_from_file:" \
+ -e "s:shutter-panel:/usr/share/icons/hicolor/scalable/apps/&.svg:" \
+ bin/shutter || die "failed to fix trayicon"
}
src_install() {
@@ -54,6 +58,8 @@ src_install() {
doman share/man/man1/${PN}.1.gz || die "doman failed"
doicon share/pixmaps/${PN}.png
doins -r share/locale || die "doins failed"
+ insinto /usr/share/icons/hicolor
+ doins -r share/icons/hicolor/* || die "doins failed"
find "${D}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \
|| die "failed to make plugins executables"
}