| 1 |
tetromino 12/01/30 22:33:08 |
| 2 |
|
| 3 |
Modified: ChangeLog cinnamon-1.2-r1.ebuild |
| 4 |
Log: |
| 5 |
Fix building on x86 (bug #401223, thanks to Adrian Bassett and Lucian Muresan). |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.5 gnome-extra/cinnamon/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/ChangeLog?rev=1.5&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/ChangeLog?rev=1.5&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/ChangeLog?r1=1.4&r2=1.5 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v |
| 19 |
retrieving revision 1.4 |
| 20 |
retrieving revision 1.5 |
| 21 |
diff -u -r1.4 -r1.5 |
| 22 |
--- ChangeLog 27 Jan 2012 21:54:26 -0000 1.4 |
| 23 |
+++ ChangeLog 30 Jan 2012 22:33:08 -0000 1.5 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for gnome-extra/cinnamon |
| 26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.4 2012/01/27 21:54:26 tetromino Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.5 2012/01/30 22:33:08 tetromino Exp $ |
| 29 |
+ |
| 30 |
+ 30 Jan 2012; Alexandre Rostovtsev <tetromino@g.o> |
| 31 |
+ cinnamon-1.2-r1.ebuild: |
| 32 |
+ Fix building on x86 (bug #401223, thanks to Adrian Bassett and Lucian |
| 33 |
+ Muresan). |
| 34 |
|
| 35 |
*cinnamon-1.2-r1 (27 Jan 2012) |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.2 gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild?rev=1.2&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild?rev=1.2&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild?r1=1.1&r2=1.2 |
| 45 |
|
| 46 |
Index: cinnamon-1.2-r1.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild,v |
| 49 |
retrieving revision 1.1 |
| 50 |
retrieving revision 1.2 |
| 51 |
diff -u -r1.1 -r1.2 |
| 52 |
--- cinnamon-1.2-r1.ebuild 27 Jan 2012 21:54:26 -0000 1.1 |
| 53 |
+++ cinnamon-1.2-r1.ebuild 30 Jan 2012 22:33:08 -0000 1.2 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
# Copyright 1999-2012 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild,v 1.1 2012/01/27 21:54:26 tetromino Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild,v 1.2 2012/01/30 22:33:08 tetromino Exp $ |
| 59 |
|
| 60 |
EAPI="4" |
| 61 |
GCONF_DEBUG="no" |
| 62 |
@@ -142,7 +142,9 @@ |
| 63 |
files/usr/bin/cinnamon-settings \ |
| 64 |
files/cinnamon-settings.pot \ |
| 65 |
files/makepot || die "sed 2 failed" |
| 66 |
- mv files/usr/lib files/usr/$(get_libdir) || die "mv failed" |
| 67 |
+ if [[ "$(get_libdir)" != lib ]]; then |
| 68 |
+ mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed" |
| 69 |
+ fi |
| 70 |
|
| 71 |
eautoreconf |
| 72 |
gnome2_src_prepare |
Archives