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

Gentoo Archives: gentoo-commits

From: "Theo Chatzimichos (tampakrap)" <tampakrap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/qt-gui: ChangeLog qt-gui-4.7.2.ebuild
Date: Tue, 01 Mar 2011 19:08:17
Message-Id: 20110301190807.7D14F20054@flycatcher.gentoo.org
1 tampakrap 11/03/01 19:08:07
2
3 Modified: ChangeLog
4 Added: qt-gui-4.7.2.ebuild
5 Log:
6 Version bump Qt 4.7.2
7
8 (Portage version: 2.2.0_alpha25/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.137 x11-libs/qt-gui/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?rev=1.137&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?rev=1.137&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?r1=1.136&r2=1.137
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v
20 retrieving revision 1.136
21 retrieving revision 1.137
22 diff -u -r1.136 -r1.137
23 --- ChangeLog 23 Dec 2010 07:55:31 -0000 1.136
24 +++ ChangeLog 1 Mar 2011 19:08:07 -0000 1.137
25 @@ -1,6 +1,11 @@
26 # ChangeLog for x11-libs/qt-gui
27 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.136 2010/12/23 07:55:31 ssuominen Exp $
29 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
30 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.137 2011/03/01 19:08:07 tampakrap Exp $
31 +
32 +*qt-gui-4.7.2 (01 Mar 2011)
33 +
34 + 01 Mar 2011; Theo Chatzimichos <tampakrap@g.o> +qt-gui-4.7.2.ebuild:
35 + Version bump Qt 4.7.2
36
37 23 Dec 2010; Samuli Suominen <ssuominen@g.o> qt-gui-4.6.3.ebuild:
38 ppc64 stable wrt #341703
39
40
41
42 1.1 x11-libs/qt-gui/qt-gui-4.7.2.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.2.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.2.ebuild?rev=1.1&content-type=text/plain
46
47 Index: qt-gui-4.7.2.ebuild
48 ===================================================================
49 # Copyright 1999-2011 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.2.ebuild,v 1.1 2011/03/01 19:08:07 tampakrap Exp $
52
53 EAPI="3"
54 inherit confutils qt4-build
55
56 DESCRIPTION="The GUI module for the Qt toolkit"
57 SLOT="4"
58 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"
59 IUSE="+accessibility cups dbus egl +glib mng nas nis private-headers qt3support +raster tiff trace xinerama"
60
61 RDEPEND="media-libs/fontconfig
62 media-libs/freetype:2
63 virtual/jpeg
64 media-libs/libpng
65 sys-libs/zlib
66 ~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
67 ~x11-libs/qt-script-${PV}[aqua=,debug=]
68 !aqua? (
69 x11-libs/libX11
70 x11-libs/libXext
71 x11-libs/libXrandr
72 x11-libs/libXcursor
73 x11-libs/libXfont
74 x11-libs/libSM
75 x11-libs/libXi
76 )
77 cups? ( net-print/cups )
78 dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
79 mng? ( >=media-libs/libmng-1.0.9 )
80 nas? ( >=media-libs/nas-1.5 )
81 tiff? ( media-libs/tiff )
82 xinerama? ( x11-libs/libXinerama )"
83 DEPEND="${RDEPEND}
84 dev-util/pkgconfig
85 !aqua? (
86 x11-proto/xextproto
87 x11-proto/inputproto
88 )
89 xinerama? ( x11-proto/xineramaproto )"
90 PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )"
91
92 pkg_setup() {
93 echo
94 einfo "Qt's GTK style was moved to x11-themes/qgtkstyle to fix bug #336801"
95 echo
96
97 if ! use qt3support; then
98 ewarn "WARNING: if you need 'qtconfig', you _must_ enable qt3support."
99 fi
100
101 QT4_TARGET_DIRECTORIES="
102 src/gui
103 src/scripttools
104 tools/designer
105 tools/linguist/linguist
106 src/plugins/imageformats/gif
107 src/plugins/imageformats/ico
108 src/plugins/imageformats/jpeg
109 src/plugins/inputmethods"
110
111 QT4_EXTRACT_DIRECTORIES="
112 include
113 src
114 tools/linguist/phrasebooks
115 tools/linguist/shared
116 tools/shared"
117
118 use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer"
119 use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng"
120 use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff"
121 use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets"
122 use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/graphicssystems/trace"
123
124 QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
125
126 qt4-build_pkg_setup
127 }
128
129 src_prepare() {
130 qt4-build_src_prepare
131
132 # Don't build plugins this go around, because they depend on qt3support lib
133 sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro
134 }
135
136 src_configure() {
137 export PATH="${S}/bin:${PATH}"
138 export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
139
140 myconf="$(qt_use accessibility)
141 $(qt_use cups)
142 $(qt_use glib)
143 $(qt_use mng libmng system)
144 $(qt_use nis)
145 $(qt_use tiff libtiff system)
146 $(qt_use dbus qdbus)
147 $(qt_use dbus)
148 $(qt_use egl)
149 $(qt_use qt3support)
150 $(qt_use xinerama)"
151
152 use nas && myconf="${myconf} -system-nas-sound"
153 use raster && myconf="${myconf} -graphicssystem raster"
154
155 myconf="${myconf} -qt-gif -system-libpng -system-libjpeg
156 -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2
157 -no-sql-odbc -xrender -xrandr -xkb -xshape -sm -no-svg -no-webkit
158 -no-phonon -no-opengl -no-gtkstyle"
159
160 qt4-build_src_configure
161 }
162
163 src_install() {
164 QCONFIG_ADD="x11sm xshape xcursor xfixes xrandr xrender xkb fontconfig
165 $(usev accessibility) $(usev xinerama) $(usev cups) $(usev nas)
166 gif png system-png system-jpeg
167 $(use mng && echo system-mng)
168 $(use tiff && echo system-tiff)"
169 QCONFIG_REMOVE="no-gif no-png"
170 QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
171 $(use cups && echo QT_CUPS) QT_FONTCONFIG QT_IMAGEFORMAT_JPEG
172 $(use mng && echo QT_IMAGEFORMAT_MNG)
173 $(use nas && echo QT_NAS)
174 $(use nis && echo QT_NIS) QT_IMAGEFORMAT_PNG QT_SESSIONMANAGER QT_SHAPE
175 $(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR
176 $(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER"
177
178 qt4-build_src_install
179
180 # remove unnecessary Windows headers
181 rm -f "${D}${QTHEADERDIR}"/{Qt,QtGui}/qwindowdefs_win.h
182 # remove Mac OS X headers
183 use aqua || rm -f \
184 "${D}${QTHEADERDIR}"/{Qt,QtGui}/qmacstyle_mac.h \
185 "${D}${QTHEADERDIR}"/QtGui/QMacStyle
186
187 # qt-creator
188 # some qt-creator headers are located
189 # under /usr/include/qt4/QtDesigner/private.
190 # those headers are just includes of the headers
191 # which are located under tools/designer/src/lib/*
192 # So instead of installing both, we create the private folder
193 # and drop tools/designer/src/lib/* headers in it.
194 if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
195 insinto "${QTLIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/
196 else
197 insinto "${QTHEADERDIR#${EPREFIX}}"/QtDesigner/private/
198 fi
199 doins "${S}"/tools/designer/src/lib/shared/* || die
200 doins "${S}"/tools/designer/src/lib/sdk/* || die
201 #install private headers
202 if use private-headers; then
203 if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
204 insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/
205 else
206 insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private
207 fi
208 find "${S}"/src/gui -type f -name "*_p.h" -exec doins {} \;
209 fi
210 if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
211 # rerun to get links to headers right
212 fix_includes
213 fi
214
215 # install correct designer and linguist icons, bug 241208
216 doicon tools/linguist/linguist/images/icons/linguist-128-32.png \
217 tools/designer/src/designer/images/designer.png \
218 || die "doicon failed"
219 # Note: absolute image path required here!
220 make_desktop_entry "${EPREFIX}"/usr/bin/linguist Linguist \
221 "${EPREFIX}"/usr/share/pixmaps/linguist-128-32.png \
222 'Qt;Development;GUIDesigner' \
223 || die "linguist make_desktop_entry failed"
224 make_desktop_entry "${EPREFIX}"/usr/bin/designer Designer \
225 "${EPREFIX}"/usr/share/pixmaps/designer.png \
226 'Qt;Development;GUIDesigner' \
227 || die "designer make_desktop_entry failed"
228 }
Report Message
Find on MARC Find on Google Groups