| 1 |
nirbheek 10/09/29 09:51:35 |
| 2 |
|
| 3 |
Modified: ChangeLog gnome-utils-2.30.0.ebuild |
| 4 |
Log: |
| 5 |
Fix problem with empty backslashes, bug 339074, avoid automake maintainer-mode rebuild |
| 6 |
|
| 7 |
(Portage version: 2.1.9.10/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.204 gnome-extra/gnome-utils/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-utils/ChangeLog?rev=1.204&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-utils/ChangeLog?rev=1.204&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-utils/ChangeLog?r1=1.203&r2=1.204 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v |
| 19 |
retrieving revision 1.203 |
| 20 |
retrieving revision 1.204 |
| 21 |
diff -u -r1.203 -r1.204 |
| 22 |
--- ChangeLog 26 Sep 2010 19:39:24 -0000 1.203 |
| 23 |
+++ ChangeLog 29 Sep 2010 09:51:35 -0000 1.204 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for gnome-extra/gnome-utils |
| 26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.203 2010/09/26 19:39:24 nirbheek Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.204 2010/09/29 09:51:35 nirbheek Exp $ |
| 29 |
+ |
| 30 |
+ 29 Sep 2010; <nirbheek@g.o> gnome-utils-2.30.0.ebuild: |
| 31 |
+ Fix problem with empty backslashes, bug 339074, avoid automake |
| 32 |
+ maintainer-mode rebuild |
| 33 |
|
| 34 |
26 Sep 2010; <nirbheek@g.o> gnome-utils-2.30.0.ebuild: |
| 35 |
Fix build issues with gtk+-2.22 by removing -D*DISABLE_DEPRECATED cflags. |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.8 gnome-extra/gnome-utils/gnome-utils-2.30.0.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.30.0.ebuild?rev=1.8&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.30.0.ebuild?rev=1.8&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.30.0.ebuild?r1=1.7&r2=1.8 |
| 44 |
|
| 45 |
Index: gnome-utils-2.30.0.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.30.0.ebuild,v |
| 48 |
retrieving revision 1.7 |
| 49 |
retrieving revision 1.8 |
| 50 |
diff -u -r1.7 -r1.8 |
| 51 |
--- gnome-utils-2.30.0.ebuild 26 Sep 2010 19:39:24 -0000 1.7 |
| 52 |
+++ gnome-utils-2.30.0.ebuild 29 Sep 2010 09:51:35 -0000 1.8 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2010 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.30.0.ebuild,v 1.7 2010/09/26 19:39:24 nirbheek Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.30.0.ebuild,v 1.8 2010/09/29 09:51:35 nirbheek Exp $ |
| 58 |
|
| 59 |
EAPI="2" |
| 60 |
|
| 61 |
@@ -51,8 +51,13 @@ |
| 62 |
gnome2_src_prepare |
| 63 |
|
| 64 |
# Remove idiotic -D.*DISABLE_DEPRECATED cflags |
| 65 |
- find . -iname 'Makefile.*' -exec \ |
| 66 |
- sed -e 's/-D[A-Z_]*DISABLE_DEPRECATED//g' -i {} + || die "sed 1 failed" |
| 67 |
+ # This method is kinda prone to breakage. Recheck carefully with next bump. |
| 68 |
+ # bug 339074 |
| 69 |
+ find . -iname 'Makefile.am' -exec \ |
| 70 |
+ sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed" |
| 71 |
+ # Do Makefile.in after Makefile.am to avoid automake maintainer-mode |
| 72 |
+ find . -iname 'Makefile.in' -exec \ |
| 73 |
+ sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed" |
| 74 |
|
| 75 |
if ! use test ; then |
| 76 |
sed -e 's/ tests//' -i logview/Makefile.{am,in} || die "sed 2 failed" |
Archives