| 1 |
ssuominen 11/04/27 14:08:25 |
| 2 |
|
| 3 |
Modified: xxdiff-4.0_beta1_p20110426.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix last commit differently, see ChangeLog for details |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 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.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild?rev=1.3&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.2&r2=1.3 |
| 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.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- xxdiff-4.0_beta1_p20110426.ebuild 27 Apr 2011 13:38:56 -0000 1.2 |
| 23 |
+++ xxdiff-4.0_beta1_p20110426.ebuild 27 Apr 2011 14:08:25 -0000 1.3 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2011 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild,v 1.2 2011/04/27 13:38:56 ssuominen Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild,v 1.3 2011/04/27 14:08:25 ssuominen Exp $ |
| 29 |
|
| 30 |
EAPI=3 |
| 31 |
|
| 32 |
@@ -19,13 +19,12 @@ |
| 33 |
KEYWORDS="~amd64 ~x86" |
| 34 |
IUSE="" |
| 35 |
|
| 36 |
-# qt-qt3support wrt buggy .ui files #365019 |
| 37 |
-RDEPEND="x11-libs/qt-gui:4 |
| 38 |
- x11-libs/qt-qt3support:4" |
| 39 |
+RDEPEND="x11-libs/qt-gui:4" |
| 40 |
DEPEND="${RDEPEND}" |
| 41 |
|
| 42 |
src_prepare() { |
| 43 |
pushd src >/dev/null |
| 44 |
+ sed -i -e '/qPixmapFromMimeSource/d' *.ui || die #365019 |
| 45 |
qt4-r2_src_prepare |
| 46 |
popd |
| 47 |
|
| 48 |
|
| 49 |
|
| 50 |
|
| 51 |
1.54 dev-util/xxdiff/ChangeLog |
| 52 |
|
| 53 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/ChangeLog?rev=1.54&view=markup |
| 54 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/ChangeLog?rev=1.54&content-type=text/plain |
| 55 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/ChangeLog?r1=1.53&r2=1.54 |
| 56 |
|
| 57 |
Index: ChangeLog |
| 58 |
=================================================================== |
| 59 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v |
| 60 |
retrieving revision 1.53 |
| 61 |
retrieving revision 1.54 |
| 62 |
diff -u -r1.53 -r1.54 |
| 63 |
--- ChangeLog 27 Apr 2011 13:38:56 -0000 1.53 |
| 64 |
+++ ChangeLog 27 Apr 2011 14:08:25 -0000 1.54 |
| 65 |
@@ -1,10 +1,11 @@ |
| 66 |
# ChangeLog for dev-util/xxdiff |
| 67 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 68 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.53 2011/04/27 13:38:56 ssuominen Exp $ |
| 69 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.54 2011/04/27 14:08:25 ssuominen Exp $ |
| 70 |
|
| 71 |
27 Apr 2011; Samuli Suominen <ssuominen@g.o> |
| 72 |
xxdiff-4.0_beta1_p20110426.ebuild: |
| 73 |
- Missing x11-libs/qt-qt3support:4 wrt #365019. |
| 74 |
+ Remove usage of qPixmapFromMimeSource to avoid x11-libs/qt-qt3support:4 wrt |
| 75 |
+ #365019 by Rafał Mużyło |
| 76 |
|
| 77 |
*xxdiff-4.0_beta1_p20110426 (26 Apr 2011) |
Archives