Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Alex Alexander (wired)" <wired@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/qt-gui: qt-gui-4.8.0-r1.ebuild metadata.xml ChangeLog
Date: Sun, 29 Jan 2012 17:03:08
Message-Id: 20120129170259.1629A20034@flycatcher.gentoo.org
1 wired 12/01/29 17:02:59
2
3 Modified: metadata.xml ChangeLog
4 Added: qt-gui-4.8.0-r1.ebuild
5 Log:
6 version bump
7
8 (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.9 x11-libs/qt-gui/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/metadata.xml?rev=1.9&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/metadata.xml?rev=1.9&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/metadata.xml?r1=1.8&r2=1.9
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/metadata.xml,v
20 retrieving revision 1.8
21 retrieving revision 1.9
22 diff -u -r1.8 -r1.9
23 --- metadata.xml 14 Apr 2011 21:49:23 -0000 1.8
24 +++ metadata.xml 29 Jan 2012 17:02:58 -0000 1.9
25 @@ -21,5 +21,7 @@
26 all drawing operations into a trace buffer. Later it can be replayed
27 with the qttracereplay utility
28 </flag>
29 + <flag name='c++0x'>Build Qt using the C++11 standard</flag>
30 + <flag name='qpa'>Build a window system agnostic implementation of Qt</flag>
31 </use>
32 </pkgmetadata>
33
34
35
36 1.162 x11-libs/qt-gui/ChangeLog
37
38 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?rev=1.162&view=markup
39 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?rev=1.162&content-type=text/plain
40 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?r1=1.161&r2=1.162
41
42 Index: ChangeLog
43 ===================================================================
44 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v
45 retrieving revision 1.161
46 retrieving revision 1.162
47 diff -u -r1.161 -r1.162
48 --- ChangeLog 27 Dec 2011 21:24:55 -0000 1.161
49 +++ ChangeLog 29 Jan 2012 17:02:58 -0000 1.162
50 @@ -1,6 +1,12 @@
51 # ChangeLog for x11-libs/qt-gui
52 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
53 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.161 2011/12/27 21:24:55 maekke Exp $
54 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
55 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.162 2012/01/29 17:02:58 wired Exp $
56 +
57 +*qt-gui-4.8.0-r1 (29 Jan 2012)
58 +
59 + 29 Jan 2012; Alex Alexander <wired@g.o> +qt-gui-4.8.0-r1.ebuild,
60 + metadata.xml:
61 + version bump
62
63 27 Dec 2011; Markus Meier <maekke@g.o> qt-gui-4.7.4-r1.ebuild:
64 x86 stable, bug #390963
65
66
67
68 1.1 x11-libs/qt-gui/qt-gui-4.8.0-r1.ebuild
69
70 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.8.0-r1.ebuild?rev=1.1&view=markup
71 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.8.0-r1.ebuild?rev=1.1&content-type=text/plain
72
73 Index: qt-gui-4.8.0-r1.ebuild
74 ===================================================================
75 # Copyright 1999-2012 Gentoo Foundation
76 # Distributed under the terms of the GNU General Public License v2
77 # $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.8.0-r1.ebuild,v 1.1 2012/01/29 17:02:58 wired Exp $
78
79 EAPI="3"
80 inherit confutils qt4-build
81
82 DESCRIPTION="The GUI module for the Qt toolkit"
83 SLOT="4"
84 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
85 IUSE="+accessibility cups dbus egl gif +glib gtkstyle mng nas nis qt3support tiff trace xinerama"
86
87 RDEPEND="
88 app-admin/eselect-qtgraphicssystem
89 media-libs/fontconfig
90 media-libs/freetype:2
91 media-libs/libpng:0
92 sys-libs/zlib
93 virtual/jpeg
94 ~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support=]
95 ~x11-libs/qt-script-${PV}[aqua=,c++0x=,qpa=,debug=]
96 !aqua? (
97 x11-libs/libX11
98 x11-libs/libXext
99 x11-libs/libXrandr
100 x11-libs/libXcursor
101 x11-libs/libXfont
102 x11-libs/libSM
103 x11-libs/libXi
104 )
105 cups? ( net-print/cups )
106 dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,c++0x=,qpa=,debug=] )
107 gtkstyle? ( x11-libs/gtk+:2[aqua=] )
108 mng? ( >=media-libs/libmng-1.0.9 )
109 nas? ( >=media-libs/nas-1.5 )
110 tiff? ( media-libs/tiff:0 )
111 xinerama? ( x11-libs/libXinerama )"
112 DEPEND="${RDEPEND}
113 !aqua? (
114 x11-proto/xextproto
115 x11-proto/inputproto
116 )
117 xinerama? ( x11-proto/xineramaproto )"
118 RDEPEND="${RDEPEND}
119 !~x11-themes/qgtkstyle-4.7.2"
120 PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,c++0x=,qpa=,debug=] )"
121
122 pkg_setup() {
123 # this belongs to pkg_pretend, we have to upgrade to EAPI 4 :)
124 # was planning to use a dep, but to reproduce this you have to
125 # clean-emerge qt-gui[gtkstyle] while having cairo[qt4] installed.
126 # no need to restrict normal first time users for that :)
127 if use gtkstyle && ! has_version x11-libs/qt-gui && has_version x11-libs/cairo[qt4]; then
128 echo
129 eerror "When building qt-gui[gtkstyle] from scratch with cairo present,"
130 eerror "cairo must have the qt4 use flag disabled, otherwise the gtk"
131 eerror "style cannot be built."
132 ewarn
133 eerror "You have the following options:"
134 eerror " - rebuild cairo with -qt4 USE"
135 eerror " - build qt-gui with -gtkstyle USE"
136 ewarn
137 eerror "After you successfully install qt-gui, you'll be able to"
138 eerror "re-enable the disabled use flag and/or reinstall cairo."
139 ewarn
140 echo
141 die "can't build qt-gui with gtkstyle USE if cairo has qt4 USE enabled"
142 fi
143
144 confutils_use_depend_all gtkstyle glib
145
146 QT4_TARGET_DIRECTORIES="
147 src/gui
148 src/scripttools
149 tools/designer
150 tools/linguist/linguist
151 src/plugins/imageformats/gif
152 src/plugins/imageformats/ico
153 src/plugins/imageformats/jpeg
154 src/plugins/inputmethods"
155
156 QT4_EXTRACT_DIRECTORIES="
157 include
158 src
159 tools"
160
161 use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer"
162 use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng"
163 use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff"
164 use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets"
165 use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/graphicssystems/trace"
166
167 QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
168
169 # mac version does not contain qtconfig?
170 [[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
171
172 qt4-build_pkg_setup
173 }
174
175 src_prepare() {
176 qt4-build_src_prepare
177
178 # Don't build plugins this go around, because they depend on qt3support lib
179 sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro
180 }
181
182 src_configure() {
183 export PATH="${S}/bin:${PATH}"
184 export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
185
186 myconf="$(qt_use accessibility)
187 $(qt_use cups)
188 $(qt_use glib)
189 $(qt_use mng libmng system)
190 $(qt_use nis)
191 $(qt_use tiff libtiff system)
192 $(qt_use dbus qdbus)
193 $(qt_use dbus)
194 $(qt_use egl)
195 $(qt_use qt3support)
196 $(qt_use gtkstyle)
197 $(qt_use xinerama)"
198
199 use gif || myconf="${myconf} -no-gif"
200 use nas && myconf="${myconf} -system-nas-sound"
201
202 [[ x86_64-apple-darwin* ]] && myconf="${myconf} -no-ssse3" #367045
203
204 myconf="${myconf} -system-libpng -system-libjpeg
205 -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2
206 -no-sql-odbc -xrender -xrandr -xkb -xshape -sm -no-svg -no-webkit
207 -no-phonon -no-opengl"
208
209 qt4-build_src_configure
210
211 if use gtkstyle; then
212 einfo "patching the Makefile to fix qgtkstyle compilation"
213 sed "s:-I/usr/include/qt4 ::" -i src/gui/Makefile ||
214 die "sed failed"
215 fi
216 einfo "patching the Makefile to fix bug #361277"
217 sed "s:-I/usr/include/qt4/QtGui ::" -i src/gui/Makefile ||
218 die "sed failed"
219 }
220
221 src_install() {
222 QCONFIG_ADD="x11sm xshape xcursor xfixes xrandr xrender xkb fontconfig
223 $(usev accessibility) $(usev xinerama) $(usev cups) $(usev nas)
224 gif png system-png system-jpeg
225 $(use mng && echo system-mng)
226 $(use tiff && echo system-tiff)"
227 QCONFIG_REMOVE="no-gif no-png"
228 QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
229 $(use cups && echo QT_CUPS) QT_FONTCONFIG QT_IMAGEFORMAT_JPEG
230 $(use mng && echo QT_IMAGEFORMAT_MNG)
231 $(use nas && echo QT_NAS)
232 $(use nis && echo QT_NIS) QT_IMAGEFORMAT_PNG QT_SESSIONMANAGER QT_SHAPE
233 $(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR
234 $(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER"
235
236 qt4-build_src_install
237
238 # qt-creator
239 # some qt-creator headers are located
240 # under /usr/include/qt4/QtDesigner/private.
241 # those headers are just includes of the headers
242 # which are located under tools/designer/src/lib/*
243 # So instead of installing both, we create the private folder
244 # and drop tools/designer/src/lib/* headers in it.
245 if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
246 insinto "${QTLIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/
247 else
248 insinto "${QTHEADERDIR#${EPREFIX}}"/QtDesigner/private/
249 fi
250 doins "${S}"/tools/designer/src/lib/shared/* || die
251 doins "${S}"/tools/designer/src/lib/sdk/* || die
252
253 # touch the available graphics systems
254 mkdir -p "${D}/usr/share/qt4/graphicssystems/" ||
255 die "could not create ${D}/usr/share/qt4/graphicssystems/"
256 touch "${D}/usr/share/qt4/graphicssystems/raster" ||
257 die "could not touch ${D}/usr/share/qt4/graphicssystems/raster"
258 touch "${D}/usr/share/qt4/graphicssystems/native" ||
259 die "could not touch ${D}/usr/share/qt4/graphicssystems/native"
260
261 # install private headers
262 if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
263 insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/
264 else
265 insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private
266 fi
267 find "${S}"/src/gui -type f -name "*_p.h" -exec doins {} \;
268
269 if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
270 # rerun to get links to headers right
271 fix_includes
272 fi
273
274 # install correct designer and linguist icons, bug 241208
275 doicon tools/linguist/linguist/images/icons/linguist-128-32.png \
276 tools/designer/src/designer/images/designer.png \
277 || die "doicon failed"
278 # Note: absolute image path required here!
279 make_desktop_entry linguist Linguist \
280 "${EPREFIX}"/usr/share/pixmaps/linguist-128-32.png \
281 'Qt;Development;GUIDesigner' \
282 || die "linguist make_desktop_entry failed"
283 make_desktop_entry designer Designer \
284 "${EPREFIX}"/usr/share/pixmaps/designer.png \
285 'Qt;Development;GUIDesigner' \
286 || die "designer make_desktop_entry failed"
287 }
288
289 pkg_postinst() {
290 # raster is the default graphicssystems, set it if first install
291 eselect qtgraphicssystem set raster --use-old
292 elog "Starting with Qt 4.8.0, you may choose the active Qt Graphics System"
293 elog "by using a new eselect module called qtgraphicssystem."
294 elog "Run"
295 elog " eselect qtgraphicssystem"
296 elog "for more information"
297 }
Report Message
Find on MARC Find on Google Groups