public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Gilles Dartiguelongue" <eva@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: x11-themes/adwaita-icon-theme/
Date: Sun, 12 Oct 2014 23:19:28 +0000 (UTC)	[thread overview]
Message-ID: <1413155939.44846fcd255e3e12f7c4cf87fde7a7508c39c364.eva@gentoo> (raw)

commit:     44846fcd255e3e12f7c4cf87fde7a7508c39c364
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 12 18:39:32 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 12 23:18:59 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=44846fcd

x11-themes/adwaita-icon-theme: cursors moved to adwaita-icon-theme

Also fix blocker dependency.

---
 x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.14.0.ebuild | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.14.0.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.14.0.ebuild
index 164a75f..58f1283 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.14.0.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.14.0.ebuild
@@ -23,7 +23,7 @@ COMMON_DEPEND="
 	>=x11-themes/hicolor-icon-theme-0.10
 "
 RDEPEND="${COMMON_DEPEND}
-	!x11-themes/gnome-themes-standard
+	!<x11-themes/gnome-themes-standard-3.14
 "
 DEPEND="${COMMON_DEPEND}
 	>=x11-misc/icon-naming-utils-0.8.7
@@ -43,6 +43,11 @@ src_prepare() {
 		done
 	fi
 
+	# Install cursors in the right place
+	sed -e 's:^\(cursordir.*\)icons\(.*\):\1cursors/xorg-x11\2:' \
+		-i Adwaita/cursors/Makefile.am \
+		-i Adwaita/cursors/Makefile.in || die
+
 	gnome2_src_prepare
 }
 


             reply	other threads:[~2014-10-12 23:19 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-12 23:19 Gilles Dartiguelongue [this message]
  -- strict thread matches above, loose matches on Subject: below --
2014-10-15 21:58 [gentoo-commits] proj/gnome:master commit in: x11-themes/adwaita-icon-theme/ Gilles Dartiguelongue
2014-11-03 23:24 Gilles Dartiguelongue
2014-12-21 13:28 Gilles Dartiguelongue
2015-05-10 17:20 Gilles Dartiguelongue
2015-05-12 19:31 Gilles Dartiguelongue
2015-05-14 22:50 Gilles Dartiguelongue
2015-10-02 12:50 Ole Reifschneider
2016-03-25  0:56 Ole Reifschneider
2017-08-14 16:11 Gilles Dartiguelongue
2017-12-20 19:28 Sobhan Mohammadpour
2018-02-16 15:32 Sobhan Mohammadpour
2018-08-03  9:06 Mart Raudsepp

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=1413155939.44846fcd255e3e12f7c4cf87fde7a7508c39c364.eva@gentoo \
    --to=eva@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