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