1 |
hwoarang 12/11/30 20:39:15 |
2 |
|
3 |
Modified: xxdiff-4.0_beta1_p20110426.ebuild ChangeLog |
4 |
Log: |
5 |
Apply upstream patch to fix building with gcc-4.7. Bug #442302 |
6 |
|
7 |
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key B4AFF2C2) |
8 |
|
9 |
Revision Changes Path |
10 |
1.6 dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild?rev=1.6&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild?rev=1.6&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild?r1=1.5&r2=1.6 |
15 |
|
16 |
Index: xxdiff-4.0_beta1_p20110426.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild,v |
19 |
retrieving revision 1.5 |
20 |
retrieving revision 1.6 |
21 |
diff -u -r1.5 -r1.6 |
22 |
--- xxdiff-4.0_beta1_p20110426.ebuild 14 Dec 2011 15:10:59 -0000 1.5 |
23 |
+++ xxdiff-4.0_beta1_p20110426.ebuild 30 Nov 2012 20:39:15 -0000 1.6 |
24 |
@@ -1,6 +1,6 @@ |
25 |
-# Copyright 1999-2011 Gentoo Foundation |
26 |
+# Copyright 1999-2012 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild,v 1.5 2011/12/14 15:10:59 ssuominen Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild,v 1.6 2012/11/30 20:39:15 hwoarang Exp $ |
30 |
|
31 |
EAPI=3 |
32 |
|
33 |
@@ -22,6 +22,8 @@ |
34 |
RDEPEND="x11-libs/qt-gui:4" |
35 |
DEPEND="${RDEPEND}" |
36 |
|
37 |
+PATCHES=( "${FILESDIR}"/${P}-gcc47.patch ) |
38 |
+ |
39 |
src_prepare() { |
40 |
pushd src >/dev/null |
41 |
sed -i -e '/qPixmapFromMimeSource/d' *.ui || die #365019 |
42 |
|
43 |
|
44 |
|
45 |
1.58 dev-util/xxdiff/ChangeLog |
46 |
|
47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/ChangeLog?rev=1.58&view=markup |
48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/ChangeLog?rev=1.58&content-type=text/plain |
49 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/ChangeLog?r1=1.57&r2=1.58 |
50 |
|
51 |
Index: ChangeLog |
52 |
=================================================================== |
53 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v |
54 |
retrieving revision 1.57 |
55 |
retrieving revision 1.58 |
56 |
diff -u -r1.57 -r1.58 |
57 |
--- ChangeLog 5 Oct 2012 20:34:06 -0000 1.57 |
58 |
+++ ChangeLog 30 Nov 2012 20:39:15 -0000 1.58 |
59 |
@@ -1,6 +1,11 @@ |
60 |
# ChangeLog for dev-util/xxdiff |
61 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
62 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.57 2012/10/05 20:34:06 hwoarang Exp $ |
63 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.58 2012/11/30 20:39:15 hwoarang Exp $ |
64 |
+ |
65 |
+ 30 Nov 2012; Markos Chandras <hwoarang@g.o> |
66 |
+ +files/xxdiff-4.0_beta1_p20110426-gcc47.patch, |
67 |
+ xxdiff-4.0_beta1_p20110426.ebuild: |
68 |
+ Apply upstream patch to fix building with gcc-4.7. Bug #442302 |
69 |
|
70 |
05 Oct 2012; Markos Chandras <hwoarang@g.o> metadata.xml: |
71 |
Taking over package. Adding qt@ as backup herd |