summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2013-03-30 14:55:10 +0000
committerPacho Ramos <pacho@gentoo.org>2013-03-30 14:55:10 +0000
commite7b9449935a64e5b9f80400a29e5e8a95b880bdf (patch)
treea9f4aa1f9dc5235968d7d41329cf68b2a7412137 /gnome-extra
parentStable for alpha, wrt bug #457358 (diff)
downloadgentoo-2-e7b9449935a64e5b9f80400a29e5e8a95b880bdf.tar.gz
gentoo-2-e7b9449935a64e5b9f80400a29e5e8a95b880bdf.tar.bz2
gentoo-2-e7b9449935a64e5b9f80400a29e5e8a95b880bdf.zip
Use correct patch (#463774 by Harris Landgarten), also drop custom run_in_build_dir as it's now in eclasses.
(Portage version: 2.1.11.58/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/gnome-tweak-tool/ChangeLog8
-rwxr-xr-xgnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.7.4-gentoo-cursor-themes.patch26
-rw-r--r--gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.7.4.ebuild10
3 files changed, 35 insertions, 9 deletions
diff --git a/gnome-extra/gnome-tweak-tool/ChangeLog b/gnome-extra/gnome-tweak-tool/ChangeLog
index ee95a6c08b92..8f9daa42c08b 100644
--- a/gnome-extra/gnome-tweak-tool/ChangeLog
+++ b/gnome-extra/gnome-tweak-tool/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for gnome-extra/gnome-tweak-tool
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/ChangeLog,v 1.18 2013/03/29 22:41:07 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/ChangeLog,v 1.19 2013/03/30 14:55:10 pacho Exp $
+
+ 30 Mar 2013; Pacho Ramos <pacho@gentoo.org>
+ +files/gnome-tweak-tool-3.7.4-gentoo-cursor-themes.patch,
+ gnome-tweak-tool-3.7.4.ebuild:
+ Use correct patch (#463774 by Harris Landgarten), also drop custom
+ run_in_build_dir as it's now in eclasses.
29 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org>
-files/gnome-tweak-tool-3.2.2-gnome-shell-3.2.1-r2.patch,
diff --git a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.7.4-gentoo-cursor-themes.patch b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.7.4-gentoo-cursor-themes.patch
new file mode 100755
index 000000000000..c1dadc756a4d
--- /dev/null
+++ b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.7.4-gentoo-cursor-themes.patch
@@ -0,0 +1,26 @@
+From c848d45b0697a6ac3661dbf3fbd356864e8b4e24 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
+Date: Tue, 15 Jan 2013 17:23:12 +0330
+Subject: [PATCH] gentoo-cursor-themes
+
+---
+ gtweak/tweaks/tweak_interface.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/gtweak/tweaks/tweak_interface.py b/gtweak/tweaks/tweak_interface.py
+index b20a41c..2125d59 100644
+--- a/gtweak/tweaks/tweak_interface.py
++++ b/gtweak/tweaks/tweak_interface.py
+@@ -69,7 +69,8 @@ class CursorThemeSwitcher(GSettingsComboTweak):
+ **options)
+
+ def _get_valid_cursor_themes(self):
+- dirs = ( os.path.join(gtweak.DATA_DIR, "icons"),
++ dirs = ( os.path.join(gtweak.DATA_DIR, "cursors", "xorg-x11"),
++ os.path.join(gtweak.DATA_DIR, "icons"),
+ os.path.join(GLib.get_user_data_dir(), "icons"),
+ os.path.join(os.path.expanduser("~"), ".icons"))
+ valid = walk_directories(dirs, lambda d:
+--
+1.8.1
+
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.7.4.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.7.4.ebuild
index b0d3667ef55c..d41270b79581 100644
--- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.7.4.ebuild
+++ b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.7.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.7.4.ebuild,v 1.1 2013/03/28 22:40:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.7.4.ebuild,v 1.2 2013/03/30 14:55:10 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -41,7 +41,7 @@ DEPEND="${COMMON_DEPEND}
src_prepare() {
# Add contents of Gentoo's cursor theme directory to cursor theme list
- epatch "${FILESDIR}/${PN}-3.0.4-gentoo-cursor-themes.patch"
+ epatch "${FILESDIR}/${PN}-3.7.4-gentoo-cursor-themes.patch"
gnome2_src_prepare
python_copy_sources
@@ -66,9 +66,3 @@ src_install() {
}
python_foreach_impl run_in_build_dir install_python
}
-
-run_in_build_dir() {
- pushd "${BUILD_DIR}" > /dev/null || die
- "$@"
- popd > /dev/null
-}