From: "Christoph Mende" <angelos@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/xfce:master commit in: xfce-base/xfce4-settings/
Date: Sun, 18 Dec 2011 19:58:58 +0000 (UTC) [thread overview]
Message-ID: <e89723dc1bf21252ab2bb3cc419176cba241a47b.angelos@gentoo> (raw)
commit: e89723dc1bf21252ab2bb3cc419176cba241a47b
Author: Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 19:51:11 2011 +0000
Commit: Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 19:51:11 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/xfce.git;a=commit;h=e89723dc
xfce4-settings: Sync with gentoo-x86
(Portage version: 2.2.0_alpha81/git/Linux x86_64, signed Manifest commit with key 84F20B43)
---
.../xfce4-settings/xfce4-settings-9999.ebuild | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild b/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild
index 063b9ff..aeecff4 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.8.2.ebuild,v 1.2 2011/05/19 19:25:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.8.3.ebuild,v 1.7 2011/11/29 00:07:15 ssuominen Exp $
EAPI=4
inherit xfconf
@@ -13,11 +13,10 @@ SLOT="0"
KEYWORDS=""
IUSE="debug libcanberra libnotify +xklavier"
-RDEPEND=">=dev-libs/glib-2.24:2
+RDEPEND=">=dev-libs/glib-2.16:2
>=dev-libs/dbus-glib-0.88
- gnome-base/libglade:2.0
- media-libs/fontconfig:1.0
- >=x11-libs/gtk+-2.20:2
+ >=gnome-base/libglade-2
+ >=x11-libs/gtk+-2.14:2
x11-libs/libX11
>=x11-libs/libXcursor-1.1
>=x11-libs/libXi-1.3
@@ -49,6 +48,11 @@ pkg_setup() {
}
src_prepare() {
- sed -i -e '/IconThemeName/s:Rodent:Tango:' xfsettingsd/xsettings.xml || die
+ local theme=Hicolor
+ has_version x11-themes/tango-icon-theme && theme=Tango
+ has_version x11-themes/gnome-icon-theme && theme=GNOME
+ has_version x11-themes/faenza-icon-theme && theme=Faenza
+ sed -i -e "/IconThemeName/s:Rodent:${theme}:" xfsettingsd/xsettings.xml || die
+
xfconf_src_prepare
}
next reply other threads:[~2011-12-18 20:08 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-18 19:58 Christoph Mende [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-10-10 6:25 [gentoo-commits] proj/xfce:master commit in: xfce-base/xfce4-settings/ Christoph Mende
2015-04-12 14:56 Christoph Mende
2014-09-18 18:46 Christoph Mende
2014-09-03 20:08 Christoph Mende
2014-06-25 20:15 Christoph Mende
2014-03-25 17:57 Christoph Mende
2013-10-31 14:33 Christoph Mende
2013-01-02 18:16 Christoph Mende
2012-09-14 16:36 Christoph Mende
2012-05-27 10:46 Christoph Mende
2012-04-02 15:34 Christoph Mende
2012-03-23 21:40 Christoph Mende
2011-07-05 6:30 Christoph Mende
2011-06-13 18:54 Christoph Mende
2011-05-23 16:40 Christoph Mende
2011-04-09 7:48 Christoph Mende
2011-03-19 18:06 Christoph Mende
2011-03-18 14:57 Christoph Mende
2011-02-20 20:14 Christoph Mende
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e89723dc1bf21252ab2bb3cc419176cba241a47b.angelos@gentoo \
--to=angelos@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox