Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/qt-gui: ChangeLog qt-gui-4.5.3-r2.ebuild
Date: Sun, 04 Jul 2010 11:52:00
Message-Id: 20100704115156.67E902CE14@corvid.gentoo.org
1 ssuominen 10/07/04 11:51:56
2
3 Modified: ChangeLog qt-gui-4.5.3-r2.ebuild
4 Log:
5 Backport libpng14 patch from Qt 4.6.3.
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.106 x11-libs/qt-gui/ChangeLog
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?rev=1.106&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?rev=1.106&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?r1=1.105&r2=1.106
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v
18 retrieving revision 1.105
19 retrieving revision 1.106
20 diff -u -r1.105 -r1.106
21 --- ChangeLog 24 Jun 2010 17:33:40 -0000 1.105
22 +++ ChangeLog 4 Jul 2010 11:51:56 -0000 1.106
23 @@ -1,6 +1,10 @@
24 # ChangeLog for x11-libs/qt-gui
25 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.105 2010/06/24 17:33:40 hwoarang Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.106 2010/07/04 11:51:56 ssuominen Exp $
28 +
29 + 04 Jul 2010; Samuli Suominen <ssuominen@g.o>
30 + qt-gui-4.5.3-r2.ebuild, +files/qt-4.5.3-libpng14.patch:
31 + Backport libpng14 patch from Qt 4.6.3.
32
33 24 Jun 2010; Markos Chandras <hwoarang@g.o> -qt-gui-4.6.1.ebuild:
34 Drop Qt-4.6.1
35
36
37
38 1.8 x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild
39
40 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild?rev=1.8&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild?rev=1.8&content-type=text/plain
42 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild?r1=1.7&r2=1.8
43
44 Index: qt-gui-4.5.3-r2.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild,v
47 retrieving revision 1.7
48 retrieving revision 1.8
49 diff -u -r1.7 -r1.8
50 --- qt-gui-4.5.3-r2.ebuild 10 Nov 2009 22:38:04 -0000 1.7
51 +++ qt-gui-4.5.3-r2.ebuild 4 Jul 2010 11:51:56 -0000 1.8
52 @@ -1,6 +1,6 @@
53 -# Copyright 1999-2009 Gentoo Foundation
54 +# Copyright 1999-2010 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild,v 1.7 2009/11/10 22:38:04 jer Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild,v 1.8 2010/07/04 11:51:56 ssuominen Exp $
58
59 EAPI="2"
60 inherit eutils qt4-build
61 @@ -90,6 +90,9 @@
62 # fixing hardcoded fonts, bug #252312
63 EPATCH_OPTS="--ignore-whitespace"
64 epatch "${FILESDIR}"/hardcoded_fonts.patch
65 +
66 + has_version ">=media-libs/libpng-1.4" && epatch \
67 + "${FILESDIR}"/${P}-libpng14.patch
68 }
69
70 src_configure() {