Gentoo Archives: gentoo-commits

From: "Davide Pesavento (pesa)" <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/qt-gui: qt-gui-4.7.4.ebuild ChangeLog qt-gui-4.7.4-r1.ebuild
Date: Mon, 28 Nov 2011 22:52:12
Message-Id: 20111128225202.1420A2004B@flycatcher.gentoo.org
1 pesa 11/11/28 22:52:02
2
3 Modified: qt-gui-4.7.4.ebuild ChangeLog
4 qt-gui-4.7.4-r1.ebuild
5 Log:
6 Fix bug #368515.
7
8 (Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.4 x11-libs/qt-gui/qt-gui-4.7.4.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.4.ebuild?rev=1.4&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.4.ebuild?rev=1.4&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.4.ebuild?r1=1.3&r2=1.4
16
17 Index: qt-gui-4.7.4.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.4.ebuild,v
20 retrieving revision 1.3
21 retrieving revision 1.4
22 diff -u -r1.3 -r1.4
23 --- qt-gui-4.7.4.ebuild 20 Nov 2011 20:23:41 -0000 1.3
24 +++ qt-gui-4.7.4.ebuild 28 Nov 2011 22:52:01 -0000 1.4
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2011 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.4.ebuild,v 1.3 2011/11/20 20:23:41 pesa Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.4.ebuild,v 1.4 2011/11/28 22:52:01 pesa Exp $
30
31 EAPI="3"
32 inherit confutils qt4-build
33 @@ -141,13 +141,6 @@
34
35 qt4-build_src_install
36
37 - # remove unnecessary Windows headers
38 - rm -f "${D}${QTHEADERDIR}"/{Qt,QtGui}/qwindowdefs_win.h
39 - # remove Mac OS X headers
40 - use aqua || rm -f \
41 - "${D}${QTHEADERDIR}"/{Qt,QtGui}/qmacstyle_mac.h \
42 - "${D}${QTHEADERDIR}"/QtGui/QMacStyle
43 -
44 # qt-creator
45 # some qt-creator headers are located
46 # under /usr/include/qt4/QtDesigner/private.
47
48
49
50 1.156 x11-libs/qt-gui/ChangeLog
51
52 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?rev=1.156&view=markup
53 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?rev=1.156&content-type=text/plain
54 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?r1=1.155&r2=1.156
55
56 Index: ChangeLog
57 ===================================================================
58 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v
59 retrieving revision 1.155
60 retrieving revision 1.156
61 diff -u -r1.155 -r1.156
62 --- ChangeLog 28 Nov 2011 21:01:19 -0000 1.155
63 +++ ChangeLog 28 Nov 2011 22:52:01 -0000 1.156
64 @@ -1,6 +1,10 @@
65 # ChangeLog for x11-libs/qt-gui
66 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
67 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.155 2011/11/28 21:01:19 tampakrap Exp $
68 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.156 2011/11/28 22:52:01 pesa Exp $
69 +
70 + 28 Nov 2011; Davide Pesavento <pesa@g.o> qt-gui-4.7.4.ebuild,
71 + qt-gui-4.7.4-r1.ebuild:
72 + Fix bug #368515.
73
74 *qt-gui-4.7.4-r1 (28 Nov 2011)
75
76
77
78
79 1.2 x11-libs/qt-gui/qt-gui-4.7.4-r1.ebuild
80
81 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.4-r1.ebuild?rev=1.2&view=markup
82 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.4-r1.ebuild?rev=1.2&content-type=text/plain
83 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.4-r1.ebuild?r1=1.1&r2=1.2
84
85 Index: qt-gui-4.7.4-r1.ebuild
86 ===================================================================
87 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.4-r1.ebuild,v
88 retrieving revision 1.1
89 retrieving revision 1.2
90 diff -u -r1.1 -r1.2
91 --- qt-gui-4.7.4-r1.ebuild 28 Nov 2011 21:01:19 -0000 1.1
92 +++ qt-gui-4.7.4-r1.ebuild 28 Nov 2011 22:52:01 -0000 1.2
93 @@ -1,6 +1,6 @@
94 # Copyright 1999-2011 Gentoo Foundation
95 # Distributed under the terms of the GNU General Public License v2
96 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.4-r1.ebuild,v 1.1 2011/11/28 21:01:19 tampakrap Exp $
97 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.4-r1.ebuild,v 1.2 2011/11/28 22:52:01 pesa Exp $
98
99 EAPI="3"
100 inherit confutils qt4-build
101 @@ -43,7 +43,7 @@
102 !~x11-themes/qgtkstyle-4.7.2"
103 PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )"
104
105 -PATCHES=(
106 +PATCHES=(
107 "${FILESDIR}/${PN}-4.7.3-cups.patch"
108 "${FILESDIR}/${P}-fix-libreoffice-crash.patch"
109 )
110 @@ -144,13 +144,6 @@
111
112 qt4-build_src_install
113
114 - # remove unnecessary Windows headers
115 - rm -f "${D}${QTHEADERDIR}"/{Qt,QtGui}/qwindowdefs_win.h
116 - # remove Mac OS X headers
117 - use aqua || rm -f \
118 - "${D}${QTHEADERDIR}"/{Qt,QtGui}/qmacstyle_mac.h \
119 - "${D}${QTHEADERDIR}"/QtGui/QMacStyle
120 -
121 # qt-creator
122 # some qt-creator headers are located
123 # under /usr/include/qt4/QtDesigner/private.