delete old
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@3011 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
parent
1b32950966
commit
8ca237dbd5
@ -1,482 +0,0 @@
|
||||
# ChangeLog for x11-libs/qt-core
|
||||
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.116 2010/12/05 21:45:43 wired Exp $
|
||||
|
||||
*qt-core-4.7.3-r1 (19 May 2011)
|
||||
|
||||
19 May 2011; Mario Fetka <mario.fetka@gmail.com> +qt-core-4.7.3-r1.ebuild,
|
||||
+files/blacklist_ssl.patch:
|
||||
bump hack
|
||||
|
||||
*qt-core-4.7.2-r1 (13 Mar 2011)
|
||||
|
||||
13 Mar 2011; Mario Fetka <mario.fetka@gmail.com> +qt-core-4.7.2-r1.ebuild:
|
||||
bump hack
|
||||
|
||||
05 Dec 2010; Alex Alexander <wired@gentoo.org> -qt-core-4.5.3-r2.ebuild,
|
||||
-files/qt-4.5.3-glib-event-loop.patch:
|
||||
removed 4.5.3
|
||||
|
||||
*qt-core-4.7.1-r1 (19 Nov 2010)
|
||||
|
||||
19 Nov 2010; Tomas Touceda <chiiph@gentoo.org> -qt-core-4.7.1.ebuild,
|
||||
+qt-core-4.7.1-r1.ebuild, metadata.xml:
|
||||
Revbump: Adds jit useflag wrt bug 338245
|
||||
|
||||
*qt-core-4.7.1 (09 Nov 2010)
|
||||
|
||||
09 Nov 2010; Alex Alexander <wired@gentoo.org> +qt-core-4.7.1.ebuild:
|
||||
version bump
|
||||
|
||||
06 Nov 2010; Alex Alexander <wired@gentoo.org> qt-core-4.7.0.ebuild:
|
||||
removed alpha keyword from qt-4.7, bug #338289
|
||||
|
||||
05 Nov 2010; Jeroen Roovers <jer@gentoo.org> qt-core-4.6.3.ebuild:
|
||||
Stable for HPPA (bug #341703).
|
||||
|
||||
23 Oct 2010; Raúl Porcel <armin76@gentoo.org> qt-core-4.6.3.ebuild:
|
||||
alpha/arm/ia64/sparc stable wrt #341703
|
||||
|
||||
22 Oct 2010; Christian Faulhammer <fauli@gentoo.org> qt-core-4.6.3.ebuild:
|
||||
stable x86, bug 341703
|
||||
|
||||
19 Oct 2010; Brent Baude <ranger@gentoo.org> qt-core-4.6.3.ebuild:
|
||||
Marking qt-core-4.6.3 ppc stable for bug 341703
|
||||
|
||||
19 Oct 2010; Markos Chandras <hwoarang@gentoo.org> qt-core-4.6.3.ebuild:
|
||||
Stable on amd64 wrt bug #341703
|
||||
|
||||
10 Oct 2010; Raúl Porcel <armin76@gentoo.org> qt-core-4.7.0.ebuild:
|
||||
Mark -sparc because it sigbuses
|
||||
|
||||
24 Sep 2010; Alex Alexander <wired@gentoo.org> qt-core-4.7.0.ebuild:
|
||||
prefix fix, thanks to heiko_
|
||||
|
||||
23 Sep 2010; Alex Alexander <wired@gentoo.org> qt-core-4.7.0.ebuild:
|
||||
EAPI 3, prefix, other improvements
|
||||
|
||||
*qt-core-4.7.0 (21 Sep 2010)
|
||||
|
||||
21 Sep 2010; Theo Chatzimichos <tampakrap@gentoo.org>
|
||||
+qt-core-4.7.0.ebuild:
|
||||
Version bump
|
||||
|
||||
13 Sep 2010; Tobias Klausmann <klausman@gentoo.org>
|
||||
qt-core-4.6.2-r1.ebuild:
|
||||
Stable on alpha, bug #297299
|
||||
|
||||
18 Aug 2010; Jeroen Roovers <jer@gentoo.org> qt-core-4.6.2-r1.ebuild:
|
||||
Stable for HPPA (bug #297299).
|
||||
|
||||
04 Aug 2010; Markus Meier <maekke@gentoo.org> qt-core-4.6.2-r1.ebuild:
|
||||
arm stable, bug #297299
|
||||
|
||||
11 Jul 2010; Markos Chandras <hwoarang@gentoo.org>
|
||||
qt-core-4.5.3-r2.ebuild, qt-core-4.6.2-r1.ebuild, qt-core-4.6.3.ebuild:
|
||||
Remove .la files from qt-core module
|
||||
|
||||
05 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
|
||||
qt-core-4.6.2-r1.ebuild:
|
||||
ppc64 stable wrt #297299
|
||||
|
||||
24 Jun 2010; Markos Chandras <hwoarang@gentoo.org>
|
||||
-qt-core-4.6.1-r1.ebuild:
|
||||
Drop Qt-4.6.1
|
||||
|
||||
*qt-core-4.6.3 (08 Jun 2010)
|
||||
|
||||
08 Jun 2010; Markos Chandras <hwoarang@gentoo.org> +qt-core-4.6.3.ebuild:
|
||||
Version bump
|
||||
|
||||
22 May 2010; Raúl Porcel <armin76@gentoo.org> qt-core-4.6.2-r1.ebuild,
|
||||
+files/qt-4.6.2-alpha.patch:
|
||||
Add a patch to compile on alpha wrt #318975
|
||||
|
||||
18 Apr 2010; <nixnut@gentoo.org> qt-core-4.6.2-r1.ebuild:
|
||||
ppc stable #297299
|
||||
|
||||
03 Mar 2010; Christian Faulhammer <fauli@gentoo.org>
|
||||
qt-core-4.6.2-r1.ebuild:
|
||||
stable x86, bug 297299
|
||||
|
||||
01 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
|
||||
qt-core-4.6.2-r1.ebuild:
|
||||
amd64 stable wrt #297299
|
||||
|
||||
*qt-core-4.6.2-r1 (20 Feb 2010)
|
||||
*qt-core-4.6.1-r1 (20 Feb 2010)
|
||||
|
||||
20 Feb 2010; Dominik Kapusta <ayoy@gentoo.org>
|
||||
+files/qt-4.6-nox11r6.patch, -qt-core-4.6.1.ebuild,
|
||||
+qt-core-4.6.1-r1.ebuild, -qt-core-4.6.2.ebuild, +qt-core-4.6.2-r1.ebuild:
|
||||
Remove X11R6 from include dirs and libdirs in mkspecs (bug #305001)
|
||||
|
||||
18 Feb 2010; Alex Alexander <wired@gentoo.org> metadata.xml:
|
||||
added exceptions USE flag description
|
||||
|
||||
*qt-core-4.6.2 (15 Feb 2010)
|
||||
|
||||
15 Feb 2010; Dror Levin <spatz@gentoo.org> -files/qt-4.6-nolibx11.diff,
|
||||
-files/qt-core-4.6.0-hebrew.patch, qt-core-4.6.1.ebuild,
|
||||
+files/qt-4.6-nolibx11.patch, -files/qt-core-4.6.1-nolibx11.patch,
|
||||
+qt-core-4.6.2.ebuild:
|
||||
Version bump, rename patch.
|
||||
|
||||
10 Feb 2010; Ben de Groot <yngwin@gentoo.org> qt-core-4.6.1.ebuild:
|
||||
Move QT4_EXTRACT_DIRECTORIES stuff to pkg_setup, to fix compilation on
|
||||
Darwin (bug 302391).
|
||||
|
||||
09 Feb 2010; Dror Levin <spatz@gentoo.org> -qt-core-4.6.0-r1.ebuild:
|
||||
Remove old.
|
||||
|
||||
23 Jan 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
|
||||
qt-core-4.6.1.ebuild:
|
||||
Move vars into src_unpack to work with current multilib-portage with ok
|
||||
from yngwin
|
||||
|
||||
20 Jan 2010; Dror Levin <spatz@gentoo.org> qt-core-4.6.1.ebuild,
|
||||
+files/qt-core-4.6.1-nolibx11.patch:
|
||||
Remake nolibx11 patch for 4.6.1 and remove hebrew patch as it was included
|
||||
upstream.
|
||||
|
||||
*qt-core-4.6.1 (19 Jan 2010)
|
||||
|
||||
19 Jan 2010; Ben de Groot <yngwin@gentoo.org> +qt-core-4.6.1.ebuild:
|
||||
Version bump
|
||||
|
||||
14 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
|
||||
qt-core-4.6.0-r1.ebuild:
|
||||
mark ~x86-freebsd
|
||||
|
||||
*qt-core-4.6.0-r1 (25 Dec 2009)
|
||||
|
||||
25 Dec 2009; Jonathan Callen <abcd@gentoo.org> -qt-core-4.6.0.ebuild,
|
||||
+qt-core-4.6.0-r1.ebuild:
|
||||
Add prefix support, revbump due to otherwise unresolvable USE deps
|
||||
|
||||
23 Dec 2009; Dror Levin <spatz@gentoo.org> qt-core-4.6.0.ebuild,
|
||||
+files/qt-core-4.6.0-hebrew.patch:
|
||||
Apply patch to fix crashing with some Hebrew text, bug 297773.
|
||||
|
||||
03 Dec 2009; Alex Alexander <wired@gentoo.org>
|
||||
+files/qt-4.6-nolibx11.diff, qt-core-4.6.0.ebuild:
|
||||
added qt-4.6-nolibx11.diff patch
|
||||
|
||||
01 Dec 2009; Theo Chatzimichos <tampakrap@gentoo.org>
|
||||
-qt-core-4.6.0_rc1.ebuild:
|
||||
Remove Qt 4.6.0 RC
|
||||
|
||||
*qt-core-4.6.0 (01 Dec 2009)
|
||||
|
||||
01 Dec 2009; Theo Chatzimichos <tampakrap@gentoo.org>
|
||||
+qt-core-4.6.0.ebuild:
|
||||
Version Bump to 4.6.0
|
||||
|
||||
20 Nov 2009; Dror Levin <spatz@gentoo.org> qt-core-4.6.0_rc1.ebuild:
|
||||
Revert /etc/env.d/44qt4 removal, seems like it's still needed.
|
||||
|
||||
18 Nov 2009; Dror Levin <spatz@gentoo.org> qt-core-4.6.0_rc1.ebuild:
|
||||
Don't install /etc/env.d/44qt4 anymore.
|
||||
|
||||
*qt-core-4.6.0_rc1 (18 Nov 2009)
|
||||
|
||||
18 Nov 2009; Alex Alexander <wired@gentoo.org>
|
||||
-qt-core-4.6.0_beta1.ebuild, +qt-core-4.6.0_rc1.ebuild:
|
||||
added 4.6.0_rc1, removed 4.6.0_beta1
|
||||
|
||||
16 Nov 2009; Jonathan Callen <abcd@gentoo.org>
|
||||
-files/0167-fix-group-reading.diff,
|
||||
-files/0253-qmake_correct_path_separators.diff,
|
||||
-files/0257-qurl-validate-speedup.diff,
|
||||
-files/qt-core-4.5-boilerplate.diff:
|
||||
Drop unused files
|
||||
|
||||
11 Nov 2009; Ben de Groot <yngwin@gentoo.org> -qt-core-4.4.2.ebuild,
|
||||
-qt-core-4.4.2-r2.ebuild, -qt-core-4.5.1.ebuild, -qt-core-4.5.2.ebuild,
|
||||
-qt-core-4.5.3-r1.ebuild:
|
||||
Remove obsolete versions
|
||||
|
||||
10 Nov 2009; Jeroen Roovers <jer@gentoo.org> qt-core-4.5.3-r2.ebuild:
|
||||
Stable for HPPA (bug #290922).
|
||||
|
||||
09 Nov 2009; Raúl Porcel <armin76@gentoo.org> qt-core-4.5.3-r2.ebuild:
|
||||
alpha/ia64/sparc stable wrt #290922
|
||||
|
||||
09 Nov 2009; Joseph Jezak <josejx@gentoo.org> qt-core-4.5.3-r2.ebuild:
|
||||
Marked ppc/ppc64 stable for bug #290922.
|
||||
|
||||
09 Nov 2009; Markus Meier <maekke@gentoo.org> qt-core-4.5.3-r2.ebuild:
|
||||
arm stable, bug #290922
|
||||
|
||||
31 Oct 2009; Markus Meier <maekke@gentoo.org> qt-core-4.5.3-r2.ebuild:
|
||||
amd64 stable, bug #290922
|
||||
|
||||
31 Oct 2009; Markus Meier <maekke@gentoo.org> qt-core-4.5.3-r2.ebuild:
|
||||
x86 stable, bug #290922
|
||||
|
||||
*qt-core-4.5.3-r2 (29 Oct 2009)
|
||||
|
||||
29 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> +qt-core-4.5.3-r2.ebuild,
|
||||
+files/qt-4.5.3-glib-event-loop.patch:
|
||||
Adding a patch to fix regression in event loop. Thanks to scarabeus@g.o
|
||||
for pointing this out
|
||||
|
||||
29 Oct 2009; Christian Faulhammer <fauli@gentoo.org>
|
||||
qt-core-4.5.3-r1.ebuild:
|
||||
stable x86, bug 290922
|
||||
|
||||
17 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> qt-core-4.6.0_beta1.ebuild:
|
||||
Removing temporary blocker for <qt-gui-${PVR} from live packages
|
||||
|
||||
16 Oct 2009; Alex Alexander <wired@gentoo.org> qt-core-4.6.0_beta1.ebuild:
|
||||
added keywords: ~alpha ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86-fbsd
|
||||
|
||||
*qt-core-4.6.0_beta1 (16 Oct 2009)
|
||||
|
||||
16 Oct 2009; Alex Alexander <wired@gentoo.org>
|
||||
+qt-core-4.6.0_beta1.ebuild, metadata.xml:
|
||||
added version 4.6.0_beta1
|
||||
|
||||
11 Oct 2009; Raúl Porcel <armin76@gentoo.org> qt-core-4.5.2.ebuild:
|
||||
alpha/ia64/sparc stable wrt #286653
|
||||
|
||||
09 Oct 2009; Markus Meier <maekke@gentoo.org> qt-core-4.5.2.ebuild:
|
||||
amd64/arm/x86 stable, bug #286653
|
||||
|
||||
07 Oct 2009; nixnut <nixnut@gentoo.org> qt-core-4.5.2.ebuild:
|
||||
ppc stable #286653
|
||||
|
||||
*qt-core-4.5.3-r1 (04 Oct 2009)
|
||||
|
||||
04 Oct 2009; Alex Alexander <wired@gentoo.org> +qt-core-4.5.3-r1.ebuild:
|
||||
version bump
|
||||
|
||||
11 Aug 2009; Alex Alexander <wired@gentoo.org> qt-core-4.5.2.ebuild:
|
||||
added setqtenv in src_install, thanks to Tommy
|
||||
|
||||
30 Jun 2009; Raúl Porcel <armin76@gentoo.org> qt-core-4.5.1.ebuild:
|
||||
ia64/sparc stable wrt #266201
|
||||
|
||||
*qt-core-4.5.2 (27 Jun 2009)
|
||||
|
||||
27 Jun 2009; Ben de Groot <yngwin@gentoo.org> +files/qt-4.5-nolibx11.diff,
|
||||
+qt-core-4.5.2.ebuild:
|
||||
Version bump
|
||||
|
||||
08 Jun 2009; Jeroen Roovers <jer@gentoo.org> qt-core-4.5.1.ebuild:
|
||||
Stable for HPPA (bug #266201).
|
||||
|
||||
06 Jun 2009; Markus Meier <maekke@gentoo.org> qt-core-4.5.1.ebuild:
|
||||
amd64 stable, bug #266201
|
||||
|
||||
02 Jun 2009; Christian Faulhammer <fauli@gentoo.org> qt-core-4.5.1.ebuild:
|
||||
stable x86, bug 266201
|
||||
|
||||
29 May 2009; Markos Chandras <hwoarang@gentoo.org> qt-core-4.5.1.ebuild:
|
||||
Apply patch correctly
|
||||
|
||||
28 May 2009; Robert Piasek <dagger@gentoo.org> qt-core-4.5.1.ebuild:
|
||||
stable on arm (bug #266201)
|
||||
|
||||
26 May 2009; Theo Chatzimichos <tampakrap@gentoo.org>
|
||||
qt-core-4.5.1.ebuild, +files/qt-core-4.5-boilerplate.diff:
|
||||
Apply ia64 patch, thanks to armin76
|
||||
|
||||
15 May 2009; Tobias Klausmann <klausman@gentoo.org> qt-core-4.5.1.ebuild:
|
||||
Stable on alpha, bug #266201
|
||||
|
||||
14 May 2009; Ben de Groot <yngwin@gentoo.org> -qt-core-4.5.0.ebuild:
|
||||
Remove old
|
||||
|
||||
13 May 2009; Brent Baude <ranger@gentoo.org> qt-core-4.5.1.ebuild:
|
||||
Marking qt-core-4.5.1 ppc stable for bug 266201
|
||||
|
||||
01 May 2009; Markos Chandras <hwoarang@gentoo.org> qt-core-4.5.0,
|
||||
qt-core-4.5.1:
|
||||
Adding x11-libs/libXext as dependency. Thanks to Christian Ruppert
|
||||
<idl0r@gentoo.org> for reporting.
|
||||
|
||||
30 Apr 2009; Markos Chandras <hwoarang@gentoo.org> qt-core-4.5.0,
|
||||
qt-core-4.5.1:
|
||||
Adding x11-libs/libX11 as dependency. Fixes bug #267967
|
||||
|
||||
28 Apr 2009; Jeroen Roovers <jer@gentoo.org> qt-core-4.4.2-r2.ebuild:
|
||||
Stable for HPPA (bug #263945).
|
||||
|
||||
*qt-core-4.5.1 (27 Apr 2009)
|
||||
|
||||
27 Apr 2009; Markos Chandras <hwoarang@gentoo.org> +qt-core-4.5.1.ebuild:
|
||||
Version bump to 4.5.1
|
||||
|
||||
15 Apr 2009; Brent Baude <ranger@gentoo.org> qt-core-4.4.2-r2.ebuild:
|
||||
Marking qt-core-4.4.2-r2 ppc64 for bug 263945
|
||||
|
||||
11 Apr 2009; nixnut <nixnut@gentoo.org> qt-core-4.4.2-r2.ebuild:
|
||||
ppc stable #263945
|
||||
|
||||
09 Apr 2009; Raúl Porcel <armin76@gentoo.org> qt-core-4.4.2-r2.ebuild:
|
||||
ia64/sparc stable wrt #263945
|
||||
|
||||
05 Apr 2009; Tobias Klausmann <klausman@gentoo.org>
|
||||
qt-core-4.4.2-r2.ebuild:
|
||||
Stable on alpha, bug #263945
|
||||
|
||||
05 Apr 2009; Markus Meier <maekke@gentoo.org> qt-core-4.4.2-r2.ebuild:
|
||||
amd64/x86 stable, bug #263945
|
||||
|
||||
18 Mar 2009; Markos Chandras <hwoarang@gentoo.org>
|
||||
-qt-core-4.5.0_rc1.ebuild:
|
||||
Dropping 4.5.0_rc1
|
||||
|
||||
17 Mar 2009; Raúl Porcel <armin76@gentoo.org> qt-core-4.5.0.ebuild:
|
||||
Add ~arm wrt #262462
|
||||
|
||||
*qt-core-4.5.0 (04 Mar 2009)
|
||||
|
||||
04 Mar 2009; Ben de Groot <yngwin@gentoo.org> +qt-core-4.5.0.ebuild:
|
||||
Version bump
|
||||
|
||||
25 Feb 2009; Markos Chandras <hwoarang@gentoo.org>
|
||||
-qt-core-4.4.2-r1.ebuild, qt-core-4.4.2-r2.ebuild,
|
||||
qt-core-4.5.0_rc1.ebuild:
|
||||
Dropping qt-core-4.4.2-r1 ebuild, added iconv use flag ( bug #260145 )
|
||||
|
||||
21 Feb 2009; Markos Chandras <hwoarang@gentoo.org>
|
||||
qt-core-4.5.0_rc1.ebuild:
|
||||
Fixing bug #259736
|
||||
|
||||
18 Feb 2009; Jeroen Roovers <jer@gentoo.org> qt-core-4.4.2.ebuild:
|
||||
Stable for HPPA (bug #248083).
|
||||
|
||||
14 Feb 2009; Markos Chandras <hwoarang@gentoo.org>
|
||||
qt-core-4.5.0_rc1.ebuild:
|
||||
fixing src_prepare. Thanks to Arfrever
|
||||
|
||||
14 Feb 2009; Markos Chandras <hwoarang@gentoo.org>
|
||||
qt-core-4.5.0_rc1.ebuild:
|
||||
Fixing bug #172219. Thanks to Arfrever Frehtes Taifersar Arahesis
|
||||
<Arfrever.FTA@GMail.Com>
|
||||
|
||||
*qt-core-4.4.2-r2 (14 Feb 2009)
|
||||
|
||||
14 Feb 2009; Markos Chandras <hwoarang@gentoo.org>
|
||||
+files/0167-fix-group-reading.diff,
|
||||
+files/0253-qmake_correct_path_separators.diff,
|
||||
+files/0257-qurl-validate-speedup.diff, +qt-core-4.4.2-r2.ebuild:
|
||||
revbump with a couple of patches from qt-copy
|
||||
|
||||
14 Feb 2009; Ben de Groot <yngwin@gentoo.org> qt-core-4.5.0_rc1:
|
||||
Correct <qt-4.4.0 blocker
|
||||
|
||||
13 Feb 2009; Carsten Lohrke <carlo@gentoo.org> qt-core-4.5.0_rc1.ebuild:
|
||||
Correct Qt 4.4 blocker.
|
||||
|
||||
12 Feb 2009; Markos Chandras <hwoarang@gentoo.org> +files/moc.pro,
|
||||
+files/rcc.pro, +files/uic.pro, qt-core-4.5.0_rc1.ebuild:
|
||||
Add missing files, add bootstrap build target ( see bug #258667 )
|
||||
|
||||
11 Feb 2009; Ben de Groot <yngwin@gentoo.org> ChangeLog:
|
||||
Version bump
|
||||
|
||||
06 Feb 2009; Raúl Porcel <armin76@gentoo.org> qt-core-4.4.2.ebuild:
|
||||
ia64/sparc stable wrt #248038
|
||||
|
||||
04 Feb 2009; Brent Baude <ranger@gentoo.org> qt-core-4.4.2.ebuild:
|
||||
Marking qt-core-4.4.2 ppc64 stable for bug 248038
|
||||
|
||||
04 Feb 2009; Alexey Shvetsov <alexxy@gentoo.org> qt-core-4.4.2.ebuild,
|
||||
qt-core-4.4.2-r1.ebuild:
|
||||
Add ~mips keywords to qt-4.4.2
|
||||
|
||||
31 Jan 2009; Tobias Klausmann <klausman@gentoo.org> qt-core-4.4.2.ebuild:
|
||||
Stable on alpha, bug #248038
|
||||
|
||||
*qt-core-4.4.2-r1 (31 Jan 2009)
|
||||
|
||||
31 Jan 2009; Ben de Groot <yngwin@gentoo.org> qt-core-4.4.2.ebuild,
|
||||
+qt-core-4.4.2-r1.ebuild:
|
||||
Moving over the useflag defaults change to a revbump instead
|
||||
|
||||
31 Jan 2009; Ben de Groot <yngwin@gentoo.org> qt-core-4.4.2.ebuild:
|
||||
Enable glib and ssl useflags by default
|
||||
|
||||
29 Jan 2009; Alexis Ballier <aballier@gentoo.org> qt-core-4.4.2.ebuild:
|
||||
keyword ~x86-fbsd
|
||||
|
||||
18 Jan 2009; Markus Meier <maekke@gentoo.org> qt-core-4.4.2.ebuild:
|
||||
amd64/x86 stable, bug #248038
|
||||
|
||||
17 Jan 2009; nixnut <nixnut@gentoo.org> qt-core-4.4.2.ebuild:
|
||||
ppc stable #248038
|
||||
|
||||
06 Jan 2009; Ben de Groot <yngwin@gentoo.org> -qt-core-4.4.0.ebuild,
|
||||
-qt-core-4.4.1.ebuild, -qt-core-4.4.1-r1.ebuild:
|
||||
Clean out old ebuilds
|
||||
|
||||
05 Jan 2009; Ben de Groot <yngwin@gentoo.org> qt-core-4.4.2.ebuild:
|
||||
Add fix to prevent pre-stripping, bug 235026.
|
||||
|
||||
*qt-core-4.4.2 (18 Sep 2008)
|
||||
|
||||
18 Sep 2008; Ben de Groot <yngwin@gentoo.org> +qt-core-4.4.2.ebuild:
|
||||
Version bump
|
||||
|
||||
16 Aug 2008; Ben de Groot <yngwin@gentoo.org> qt-core-4.4.1.ebuild,
|
||||
qt-core-4.4.1-r1.ebuild:
|
||||
Change pdepend to qt-gui to prevent circular dep
|
||||
|
||||
*qt-core-4.4.1-r1 (13 Aug 2008)
|
||||
|
||||
13 Aug 2008; Ben de Groot <yngwin@gentoo.org> +qt-core-4.4.1-r1.ebuild:
|
||||
Adding PDEPEND on qt-qt3support if the corresponding useflag is enabled.
|
||||
|
||||
*qt-core-4.4.1 (11 Aug 2008)
|
||||
|
||||
11 Aug 2008; Ben de Groot <yngwin@gentoo.org> +qt-core-4.4.1.ebuild:
|
||||
Version bump
|
||||
|
||||
27 May 2008; Raúl Porcel <armin76@gentoo.org> qt-core-4.4.0.ebuild:
|
||||
Add ~alpha/~ia64/~sparc wrt #223557
|
||||
|
||||
26 May 2008; Jeroen Roovers <jer@gentoo.org> qt-core-4.4.0.ebuild:
|
||||
Marked ~hppa (bug #223557).
|
||||
|
||||
25 May 2008; Markus Rothe <corsair@gentoo.org> qt-core-4.4.0.ebuild:
|
||||
Added ~ppc/~ppc64
|
||||
|
||||
16 May 2008; Ingmar Vanhassel <ingmar@gentoo.org>
|
||||
-qt-core-4.4.0_rc1.ebuild:
|
||||
Old.
|
||||
|
||||
*qt-core-4.4.0 (15 May 2008)
|
||||
|
||||
15 May 2008; Ingmar Vanhassel <ingmar@gentoo.org> +qt-core-4.4.0.ebuild:
|
||||
Version bump to Qt-4.4.0.
|
||||
|
||||
10 Apr 2008; Ingmar Vanhassel <ingmar@gentoo.org>
|
||||
-qt-core-4.4.0_beta1.ebuild, +qt-core-4.4.0_rc1.ebuild:
|
||||
Version bump qt-core to 4.4.0_rc1. Thanks to Bo Andresen and Bernd
|
||||
Steinhauser.
|
||||
|
||||
05 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
|
||||
-qt-core-4.4.0_rc1.ebuild:
|
||||
Old.
|
||||
|
||||
*qt-core-4.4.0_beta1 (05 Mar 2008)
|
||||
|
||||
05 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
|
||||
+qt-core-4.4.0_beta1.ebuild:
|
||||
Added Qt-4.4.0_beta, note that the RC1 is an accidentally mislabelled
|
||||
`technical preview`, so this will appear as a downgrade if you installed
|
||||
that version.
|
||||
Thanks to David Leverton, Bo Andresen, Bernd Steinhauser &
|
||||
Arfrever Frehtes Taifersar Arahesis
|
||||
Fixes bugs: 206975, 212086, 172219, 212069, 206976, 212108
|
||||
|
||||
|
||||
*qt-core-4.4.0_rc1 (21 Dec 2007)
|
||||
|
||||
21 Dec 2007; Caleb Tennis <caleb@gentoo.org> +metadata.xml,
|
||||
+qt-core-4.4.0_rc1.ebuild:
|
||||
Initial ebuild
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
AUX blacklist_ssl.patch 3839 RMD160 769b5652df6d626ef4436afcdae8fc6f927c4c47 SHA1 1301a6f353ab1eda382ab9dd3fdc7134a30a1884 SHA256 33800ce89fe0d62ba08a8fad515df048f78f481ebc8726b1244f27895a84193b
|
||||
AUX moc.pro 2769 RMD160 42bd282eb8e24cf291a512766270e7afed6e56be SHA1 941513c6c83813992bb91f4584d3e015295baa07 SHA256 e0898c630e079db9693fe494bf37f6b395c291373ed7edbd0827ed7d1e085a2e
|
||||
AUX qt-4.5-nolibx11.diff 1167 RMD160 da983a70bd436d35e325203dfe9390b2aee925ae SHA1 ee916596e422e91179458778b013fb103dc97cac SHA256 c6c686c1cfc07caefafe697eb8b02b6806f3845f20d3fd3839301d8a94259b0b
|
||||
AUX qt-4.6-nolibx11.patch 1037 RMD160 a32338fa24ca2f99b0f3b679b1fabb88ac9b0ec1 SHA1 b7b2a430147a746a6a52f05a495be6262f2925ef SHA256 2b1d4e7df4918cafa50476e911f4c8e3e79e09fa702d756236ad2308e1c9bc69
|
||||
AUX qt-4.6-nox11r6.patch 5191 RMD160 60bac3e843addd91427ada9e4e4d7a94dc8f0430 SHA1 7534d6838426b86101ac8fc5ced829c5d5035a04 SHA256 b6db19c5b1de5e86628d37ca467f293b3ab3cf48272df93dae7ad5755ffa79cd
|
||||
AUX qt-4.6.2-alpha.patch 2913 RMD160 52ca59388d88c8e0ea2a40fd8d9d6721d324664e SHA1 bb08627e018184d4023c9fabc03adba79a67bcf0 SHA256 042c29d938339dacfb66278f62ce38c8bc597dbc2017e6d5df9397a79ac27dd3
|
||||
AUX rcc.pro 3440 RMD160 42e65efa8dc027f8a2b6c933243a91c1cac96092 SHA1 017ea0aea74a27012608f8be8f301d3cda3dd2b7 SHA256 b09c74046a97ec87b19a05abfe08d959040b737430e498269fb0d0c00bf0a38d
|
||||
AUX uic.pro 3671 RMD160 b6d3c392a67b66f6996134975e99db03a9987baf SHA1 f87fff37256b5c966e4d21b0fb6cb64b717f3d07 SHA256 904084b6d936fb9bab33d3592ec69dc9872708a74834f0cb498e8153f784c7fc
|
||||
DIST qt-everywhere-opensource-src-4.7.1.tar.gz 211768512 RMD160 de6998948eb9f51a9193b9020ba80cfd52d50899 SHA1 fcf764d39d982c7f84703821582bd10c3192e341 SHA256 8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a
|
||||
DIST qt-everywhere-opensource-src-4.7.2.tar.gz 213663032 RMD160 de3d1c172c23c33681a0945c331db179c84cb7b5 SHA1 84414f82bbc9e8d356b986d5d1ebee89d06e4f2e SHA256 d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336
|
||||
DIST qt-everywhere-opensource-src-4.7.3.tar.gz 213659173 RMD160 ab9c11c85898430fa74e5e07894f8da5e5936645 SHA1 765eb70d9779f93fefddddda5e6ddb33f4c0b71e SHA256 d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e
|
||||
EBUILD qt-core-4.7.1-r1.ebuild 5175 RMD160 5b7c3b231ebf316202715e0d2e1586f912dd1f7e SHA1 8f262eeb47049c72f836e93e8455559113de035e SHA256 aac3eb99cc4f8819140ea43dedfd9da0411aa29009a87b748ab880a0d8fea57a
|
||||
EBUILD qt-core-4.7.2-r1.ebuild 5203 RMD160 ef00277f4725f9ff97110b566ee3c26958b9b16a SHA1 edcaf77293beacab174fcc280f5ba75d150f9a31 SHA256 637334415e491866a5f1699dc8da548063a40610f2e1d4f9f62fc1b8d8b68bc3
|
||||
EBUILD qt-core-4.7.3-r1.ebuild 5175 RMD160 6e5a5797db894a5dee3706792db263802181cfe3 SHA1 4b9f3341723e180572d6c9a2d4ae2af0087acf1e SHA256 cb492015eb30f7542fe7452e68199061c146bd04745461788a18e2f30df623de
|
||||
MISC ChangeLog 15898 RMD160 3fe9ca11c8418be30bb0ef8fb5e43ad57f7454f8 SHA1 6a40b154935ae87d1a447ce3751e93ba477fa3c7 SHA256 65f83364e22679f928450ff68af98a41184514f8b7006c543a54e5c71e312967
|
||||
MISC metadata.xml 802 RMD160 0341afae262322299759a5a33bae9a42e5b7801c SHA1 b564551c1b4a7902e09200255c6c0a6ede646a23 SHA256 a84f88402ece782e8ac52ad0b90eea94e5bd563ca0a7956e1d89f1263d7f2925
|
||||
@ -1,89 +0,0 @@
|
||||
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
|
||||
index 618ac79..a5cdf01 100644
|
||||
--- a/src/network/ssl/qsslcertificate.cpp
|
||||
+++ b/src/network/ssl/qsslcertificate.cpp
|
||||
@@ -219,17 +219,19 @@ bool QSslCertificate::isNull() const
|
||||
Returns true if this certificate is valid; otherwise returns
|
||||
false.
|
||||
|
||||
- Note: Currently, this function only checks that the current
|
||||
+ Note: Currently, this function checks that the current
|
||||
data-time is within the date-time range during which the
|
||||
- certificate is considered valid. No other checks are
|
||||
- currently performed.
|
||||
+ certificate is considered valid, and checks that the
|
||||
+ certificate is not in a blacklist of fraudulent certificates.
|
||||
|
||||
\sa isNull()
|
||||
*/
|
||||
bool QSslCertificate::isValid() const
|
||||
{
|
||||
const QDateTime currentTime = QDateTime::currentDateTime();
|
||||
- return currentTime >= d->notValidBefore && currentTime <= d->notValidAfter;
|
||||
+ return currentTime >= d->notValidBefore &&
|
||||
+ currentTime <= d->notValidAfter &&
|
||||
+ ! QSslCertificatePrivate::isBlacklisted(*this);
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -798,6 +800,30 @@ QList<QSslCertificate> QSslCertificatePrivate::certificatesFromDer(const QByteAr
|
||||
return certificates;
|
||||
}
|
||||
|
||||
+// These certificates are known to be fraudulent and were created during the comodo
|
||||
+// compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
|
||||
+static const char *certificate_blacklist[] = {
|
||||
+ "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e",
|
||||
+ "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06",
|
||||
+ "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3",
|
||||
+ "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29",
|
||||
+ "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71",
|
||||
+ "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47",
|
||||
+ "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43",
|
||||
+ "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0",
|
||||
+ "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0",
|
||||
+ 0
|
||||
+};
|
||||
+
|
||||
+bool QSslCertificatePrivate::isBlacklisted(const QSslCertificate &certificate)
|
||||
+{
|
||||
+ for (int a = 0; certificate_blacklist[a] != 0; a++) {
|
||||
+ if (certificate.serialNumber() == certificate_blacklist[a])
|
||||
+ return true;
|
||||
+ }
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
#ifndef QT_NO_DEBUG_STREAM
|
||||
QDebug operator<<(QDebug debug, const QSslCertificate &certificate)
|
||||
{
|
||||
diff --git a/src/network/ssl/qsslcertificate_p.h b/src/network/ssl/qsslcertificate_p.h
|
||||
index cdceb0f..1ce33d3 100644
|
||||
--- a/src/network/ssl/qsslcertificate_p.h
|
||||
+++ b/src/network/ssl/qsslcertificate_p.h
|
||||
@@ -96,6 +96,7 @@ public:
|
||||
static QSslCertificate QSslCertificate_from_X509(X509 *x509);
|
||||
static QList<QSslCertificate> certificatesFromPem(const QByteArray &pem, int count = -1);
|
||||
static QList<QSslCertificate> certificatesFromDer(const QByteArray &der, int count = -1);
|
||||
+ static bool isBlacklisted(const QSslCertificate &certificate);
|
||||
|
||||
friend class QSslSocketBackendPrivate;
|
||||
|
||||
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
|
||||
index 0866534..2427193 100644
|
||||
--- a/src/network/ssl/qsslsocket_openssl.cpp
|
||||
+++ b/src/network/ssl/qsslsocket_openssl.cpp
|
||||
@@ -1193,6 +1193,13 @@ bool QSslSocketBackendPrivate::startHandshake()
|
||||
X509 *x509 = q_SSL_get_peer_certificate(ssl);
|
||||
configuration.peerCertificate = QSslCertificatePrivate::QSslCertificate_from_X509(x509);
|
||||
q_X509_free(x509);
|
||||
+ if (QSslCertificatePrivate::isBlacklisted(configuration.peerCertificate)) {
|
||||
+ q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted"));
|
||||
+ q->setSocketError(QAbstractSocket::SslHandshakeFailedError);
|
||||
+ emit q->error(QAbstractSocket::SslHandshakeFailedError);
|
||||
+ plainSocket->disconnectFromHost();
|
||||
+ return false;
|
||||
+ }
|
||||
|
||||
// Start translating errors.
|
||||
QList<QSslError> errors;
|
||||
@ -1,87 +0,0 @@
|
||||
TEMPLATE = app
|
||||
TARGET = moc
|
||||
|
||||
CONFIG += console qtinc
|
||||
CONFIG -= qt
|
||||
build_all:!build_pass {
|
||||
CONFIG -= build_all
|
||||
CONFIG += release
|
||||
}
|
||||
mac:CONFIG -= app_bundle incremental
|
||||
DEFINES += QT_BOOTSTRAPPED QT_MOC QT_NO_CODECS QT_LITE_UNICODE QT_NO_LIBRARY \
|
||||
QT_NO_STL QT_NO_COMPRESS QT_NO_DATASTREAM QT_NO_TEXTSTREAM \
|
||||
QT_NO_TEXTCODEC QT_NO_UNICODETABLES QT_NO_THREAD \
|
||||
QT_NO_REGEXP QT_NO_QOBJECT QT_NO_SYSTEMLOCALE QT_NO_GEOM_VARIANT
|
||||
DEFINES += QT_NO_USING_NAMESPACE
|
||||
win32:DEFINES += QT_NODLL
|
||||
DESTDIR = ../../../bin
|
||||
|
||||
|
||||
INCLUDEPATH = ../../corelib/arch/generic $$QT_BUILD_TREE/include . \
|
||||
$$QT_BUILD_TREE/include/QtCore
|
||||
DEPENDPATH += $$INCLUDEPATH ../../corelib/base ../../corelib/tools ../../corelib/io
|
||||
LIBS =
|
||||
OBJECTS_DIR = .
|
||||
|
||||
|
||||
include(moc.pri)
|
||||
|
||||
HEADERS += qdatetime_p.h
|
||||
SOURCES += main.cpp
|
||||
|
||||
# Qt tools needed to link moc
|
||||
SOURCES += ../../corelib/global/qglobal.cpp \
|
||||
../../corelib/global/qmalloc.cpp \
|
||||
../../corelib/global/qnumeric.cpp \
|
||||
../../corelib/io/qbuffer.cpp \
|
||||
../../corelib/io/qdir.cpp \
|
||||
../../corelib/io/qdiriterator.cpp \
|
||||
../../corelib/io/qfile.cpp \
|
||||
../../corelib/io/qfileinfo.cpp \
|
||||
../../corelib/io/qfsfileengine.cpp \
|
||||
../../corelib/io/qfsfileengine_iterator.cpp \
|
||||
../../corelib/io/qiodevice.cpp \
|
||||
../../corelib/io/qtemporaryfile.cpp \
|
||||
../../corelib/io/qtextstream.cpp \
|
||||
../../corelib/io/qurl.cpp \
|
||||
../../corelib/kernel/qmetatype.cpp \
|
||||
../../corelib/tools/qbytearraymatcher.cpp \
|
||||
../../corelib/tools/qdatetime.cpp \
|
||||
../../corelib/tools/qhash.cpp \
|
||||
../../corelib/tools/qlistdata.cpp \
|
||||
../../corelib/tools/qlocale.cpp \
|
||||
../../corelib/tools/qmap.cpp \
|
||||
../../corelib/tools/qstring.cpp \
|
||||
../../corelib/tools/qstringlist.cpp \
|
||||
../../corelib/tools/qvector.cpp \
|
||||
../../corelib/kernel/qvariant.cpp \
|
||||
../../corelib/io/qabstractfileengine.cpp \
|
||||
../../corelib/tools/qbytearray.cpp \
|
||||
../../corelib/tools/qvsnprintf.cpp
|
||||
|
||||
unix:SOURCES += ../../corelib/io/qfsfileengine_unix.cpp ../../corelib/io/qfsfileengine_iterator_unix.cpp
|
||||
|
||||
win32:SOURCES += ../../corelib/io/qfsfileengine_win.cpp ../../corelib/io/qfsfileengine_iterator_win.cpp
|
||||
|
||||
macx: {
|
||||
SOURCES += ../../corelib/kernel/qcore_mac.cpp
|
||||
LIBS += -framework CoreServices
|
||||
}
|
||||
|
||||
target.path=$$[QT_INSTALL_BINS]
|
||||
INSTALLS += target
|
||||
|
||||
*-mwerks {
|
||||
TEMPLATE = lib
|
||||
TARGET = McMoc
|
||||
CONFIG -= static
|
||||
CONFIG += shared plugin
|
||||
DEFINES += MOC_MWERKS_PLUGIN
|
||||
MWERKSDIR = $QT_SOURCE_TREE/util/mwerks_plugin
|
||||
INCLUDEPATH += $$MWERKSDIR/Headers
|
||||
LIBS += $$MWERKSDIR/Libraries/PluginLib4.shlb
|
||||
SOURCES += mwerks_mac.cpp
|
||||
}
|
||||
|
||||
include(../../qt_targets.pri)
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
diff -Nur qt-x11-opensource-src-4.5.1-orig/configure qt-x11-opensource-src-4.5.1/configure
|
||||
--- qt-x11-opensource-src-4.5.1-orig/configure 2009-04-22 02:57:35.000000000 +0300
|
||||
+++ qt-x11-opensource-src-4.5.1/configure 2009-06-03 00:59:44.108245373 +0300
|
||||
@@ -4733,14 +4733,6 @@
|
||||
X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
|
||||
fi
|
||||
|
||||
- # Check we actually have X11 :-)
|
||||
- if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
|
||||
- echo "Basic XLib functionality test failed!"
|
||||
- echo " You might need to modify the include and library search paths by editing"
|
||||
- echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
|
||||
- exit 1
|
||||
- fi
|
||||
-
|
||||
# auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
|
||||
if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
|
||||
if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
|
||||
@ -1,18 +0,0 @@
|
||||
--- configure-orig 2010-01-20 14:18:32.466798257 +0200
|
||||
+++ configure 2010-01-20 14:18:58.516799116 +0200
|
||||
@@ -5059,15 +5059,6 @@
|
||||
X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
|
||||
fi
|
||||
|
||||
- # Check we actually have X11 :-)
|
||||
- "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
|
||||
- if [ $? != "0" ]; then
|
||||
- echo "Basic XLib functionality test failed!"
|
||||
- echo " You might need to modify the include and library search paths by editing"
|
||||
- echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
|
||||
- exit 1
|
||||
- fi
|
||||
-
|
||||
# auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
|
||||
if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
|
||||
if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
|
||||
@ -1,152 +0,0 @@
|
||||
diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
|
||||
index 1ae5608..9c603a6 100644
|
||||
--- a/mkspecs/common/linux.conf
|
||||
+++ b/mkspecs/common/linux.conf
|
||||
@@ -7,12 +7,12 @@ QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD
|
||||
|
||||
QMAKE_INCDIR =
|
||||
QMAKE_LIBDIR =
|
||||
-QMAKE_INCDIR_X11 = /usr/X11R6/include
|
||||
-QMAKE_LIBDIR_X11 = /usr/X11R6/lib
|
||||
+QMAKE_INCDIR_X11 = /usr/include
|
||||
+QMAKE_LIBDIR_X11 = /usr/lib
|
||||
QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
|
||||
QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
|
||||
-QMAKE_INCDIR_OPENGL = /usr/X11R6/include
|
||||
-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
|
||||
+QMAKE_INCDIR_OPENGL = /usr/include
|
||||
+QMAKE_LIBDIR_OPENGL = /usr/lib
|
||||
QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
|
||||
QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
|
||||
QMAKE_INCDIR_OPENGL_ES1CL = $$QMAKE_INCDIR_OPENGL
|
||||
diff --git a/mkspecs/linux-cxx/qmake.conf b/mkspecs/linux-cxx/qmake.conf
|
||||
index 633b738..a37c05b 100644
|
||||
--- a/mkspecs/linux-cxx/qmake.conf
|
||||
+++ b/mkspecs/linux-cxx/qmake.conf
|
||||
@@ -37,12 +37,12 @@ QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
|
||||
|
||||
QMAKE_INCDIR =
|
||||
QMAKE_LIBDIR =
|
||||
-QMAKE_INCDIR_X11 = /usr/X11R6/include
|
||||
-QMAKE_LIBDIR_X11 = /usr/X11R6/lib
|
||||
+QMAKE_INCDIR_X11 = /usr/include
|
||||
+QMAKE_LIBDIR_X11 = /usr/lib
|
||||
QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
|
||||
QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
|
||||
-QMAKE_INCDIR_OPENGL = /usr/X11R6/include
|
||||
-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
|
||||
+QMAKE_INCDIR_OPENGL = /usr/include
|
||||
+QMAKE_LIBDIR_OPENGL = /usr/lib
|
||||
|
||||
QMAKE_LINK = cxx
|
||||
QMAKE_LINK_SHLIB = cxx
|
||||
diff --git a/mkspecs/linux-ecc-64/qmake.conf b/mkspecs/linux-ecc-64/qmake.conf
|
||||
index 359d44b..2d3f9a5 100644
|
||||
--- a/mkspecs/linux-ecc-64/qmake.conf
|
||||
+++ b/mkspecs/linux-ecc-64/qmake.conf
|
||||
@@ -39,12 +39,12 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
|
||||
|
||||
QMAKE_INCDIR =
|
||||
QMAKE_LIBDIR =
|
||||
-QMAKE_INCDIR_X11 = /usr/X11R6/include
|
||||
-QMAKE_LIBDIR_X11 = /usr/X11R6/lib
|
||||
+QMAKE_INCDIR_X11 = /usr/include
|
||||
+QMAKE_LIBDIR_X11 = /usr/lib
|
||||
QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
|
||||
QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
|
||||
-QMAKE_INCDIR_OPENGL = /usr/X11R6/include
|
||||
-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
|
||||
+QMAKE_INCDIR_OPENGL = /usr/include
|
||||
+QMAKE_LIBDIR_OPENGL = /usr/lib
|
||||
|
||||
QMAKE_LINK = ecpc
|
||||
QMAKE_LINK_SHLIB = ecpc
|
||||
diff --git a/mkspecs/linux-g++-64/qmake.conf b/mkspecs/linux-g++-64/qmake.conf
|
||||
index 4f8794f..cf7be62 100644
|
||||
--- a/mkspecs/linux-g++-64/qmake.conf
|
||||
+++ b/mkspecs/linux-g++-64/qmake.conf
|
||||
@@ -17,7 +17,7 @@ QMAKE_LFLAGS = -m64
|
||||
include(../common/g++.conf)
|
||||
include(../common/linux.conf)
|
||||
|
||||
-QMAKE_LIBDIR_X11 = /usr/X11R6/lib64
|
||||
-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64
|
||||
+QMAKE_LIBDIR_X11 = /usr/lib64
|
||||
+QMAKE_LIBDIR_OPENGL = /usr/lib64
|
||||
|
||||
load(qt_config)
|
||||
diff --git a/mkspecs/linux-icc-64/qmake.conf b/mkspecs/linux-icc-64/qmake.conf
|
||||
index 7962026..9b4bade 100644
|
||||
--- a/mkspecs/linux-icc-64/qmake.conf
|
||||
+++ b/mkspecs/linux-icc-64/qmake.conf
|
||||
@@ -12,5 +12,5 @@ include(../linux-icc/qmake.conf)
|
||||
|
||||
# Change the all LIBDIR variables to use lib64 instead of lib
|
||||
|
||||
-QMAKE_LIBDIR_X11 = /usr/X11R6/lib64
|
||||
-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64
|
||||
+QMAKE_LIBDIR_X11 = /usr/lib64
|
||||
+QMAKE_LIBDIR_OPENGL = /usr/lib64
|
||||
diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf
|
||||
index 965de0c..b778a89 100644
|
||||
--- a/mkspecs/linux-icc/qmake.conf
|
||||
+++ b/mkspecs/linux-icc/qmake.conf
|
||||
@@ -45,12 +45,12 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
|
||||
|
||||
QMAKE_INCDIR =
|
||||
QMAKE_LIBDIR =
|
||||
-QMAKE_INCDIR_X11 = /usr/X11R6/include
|
||||
-QMAKE_LIBDIR_X11 = /usr/X11R6/lib
|
||||
+QMAKE_INCDIR_X11 = /usr/include
|
||||
+QMAKE_LIBDIR_X11 = /usr/lib
|
||||
QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
|
||||
QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
|
||||
-QMAKE_INCDIR_OPENGL = /usr/X11R6/include
|
||||
-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
|
||||
+QMAKE_INCDIR_OPENGL = /usr/include
|
||||
+QMAKE_LIBDIR_OPENGL = /usr/lib
|
||||
|
||||
QMAKE_LINK = icpc
|
||||
QMAKE_LINK_SHLIB = icpc
|
||||
diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf
|
||||
index 009c486..0e3d301 100644
|
||||
--- a/mkspecs/linux-kcc/qmake.conf
|
||||
+++ b/mkspecs/linux-kcc/qmake.conf
|
||||
@@ -48,12 +48,12 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
|
||||
|
||||
QMAKE_INCDIR =
|
||||
QMAKE_LIBDIR =
|
||||
-QMAKE_INCDIR_X11 = /usr/X11R6/include
|
||||
-QMAKE_LIBDIR_X11 = /usr/X11R6/lib
|
||||
+QMAKE_INCDIR_X11 = /usr/include
|
||||
+QMAKE_LIBDIR_X11 = /usr/lib
|
||||
QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
|
||||
QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
|
||||
-QMAKE_INCDIR_OPENGL = /usr/X11R6/include
|
||||
-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
|
||||
+QMAKE_INCDIR_OPENGL = /usr/include
|
||||
+QMAKE_LIBDIR_OPENGL = /usr/lib
|
||||
|
||||
QMAKE_LINK = KCC
|
||||
QMAKE_LINK_SHLIB = KCC
|
||||
diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf
|
||||
index 756f1af..2c40635 100644
|
||||
--- a/mkspecs/linux-pgcc/qmake.conf
|
||||
+++ b/mkspecs/linux-pgcc/qmake.conf
|
||||
@@ -39,12 +39,12 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
|
||||
|
||||
QMAKE_INCDIR =
|
||||
QMAKE_LIBDIR =
|
||||
-QMAKE_INCDIR_X11 = /usr/X11R6/include
|
||||
-QMAKE_LIBDIR_X11 = /usr/X11R6/lib
|
||||
+QMAKE_INCDIR_X11 = /usr/include
|
||||
+QMAKE_LIBDIR_X11 = /usr/lib
|
||||
QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
|
||||
QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
|
||||
-QMAKE_INCDIR_OPENGL = /usr/X11R6/include
|
||||
-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
|
||||
+QMAKE_INCDIR_OPENGL = /usr/include
|
||||
+QMAKE_LIBDIR_OPENGL = /usr/lib
|
||||
|
||||
QMAKE_LINK = pgCC
|
||||
QMAKE_LINK_SHLIB = pgCC
|
||||
@ -1,62 +0,0 @@
|
||||
Author: Modestas Vainius <modax@debian.org>
|
||||
Description: fix FTBFS on alpha due to invalid type conversions
|
||||
../../include/QtCore/../../src/corelib/arch/qatomic_alpha.h: In member function 'T* QBasicAtomicPointer<T>::fetchAndStoreAcquire(T*) [with T = QMutexPool]':
|
||||
kernel/qobject.cpp:123: instantiated from here
|
||||
../../include/QtCore/../../src/corelib/arch/qatomic_alpha.h:401: error: invalid conversion from 'void*' to 'QMutexPool*'
|
||||
|
||||
--- a/src/corelib/arch/qatomic_alpha.h
|
||||
+++ b/src/corelib/arch/qatomic_alpha.h
|
||||
@@ -367,7 +367,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPoint
|
||||
template <typename T>
|
||||
Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelaxed(T *newValue)
|
||||
{
|
||||
- register void *old, *tmp;
|
||||
+ register T *old, *tmp;
|
||||
asm volatile("1:\n"
|
||||
"ldq_l %0,%2\n" /* old=*ptr; */
|
||||
"mov %3,%1\n" /* tmp=newval; */
|
||||
@@ -385,7 +385,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer
|
||||
template <typename T>
|
||||
Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreAcquire(T *newValue)
|
||||
{
|
||||
- register void *old, *tmp;
|
||||
+ register T *old, *tmp;
|
||||
asm volatile("1:\n"
|
||||
"ldq_l %0,%2\n" /* old=*ptr; */
|
||||
"mov %3,%1\n" /* tmp=newval; */
|
||||
@@ -404,7 +404,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer
|
||||
template <typename T>
|
||||
Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelease(T *newValue)
|
||||
{
|
||||
- register void *old, *tmp;
|
||||
+ register T *old, *tmp;
|
||||
asm volatile("mb\n"
|
||||
"1:\n"
|
||||
"ldq_l %0,%2\n" /* old=*ptr; */
|
||||
@@ -423,7 +423,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer
|
||||
template <typename T>
|
||||
Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelaxed(qptrdiff valueToAdd)
|
||||
{
|
||||
- register void *old, *tmp;
|
||||
+ register T *old, *tmp;
|
||||
asm volatile("1:\n"
|
||||
"ldq_l %0,%2\n" /* old=*ptr; */
|
||||
"addq %0,%3,%1\n"/* tmp=old+value; */
|
||||
@@ -441,7 +441,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer
|
||||
template <typename T>
|
||||
Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddAcquire(qptrdiff valueToAdd)
|
||||
{
|
||||
- register void *old, *tmp;
|
||||
+ register T *old, *tmp;
|
||||
asm volatile("1:\n"
|
||||
"ldq_l %0,%2\n" /* old=*ptr; */
|
||||
"addq %0,%3,%1\n"/* tmp=old+value; */
|
||||
@@ -460,7 +460,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer
|
||||
template <typename T>
|
||||
Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelease(qptrdiff valueToAdd)
|
||||
{
|
||||
- register void *old, *tmp;
|
||||
+ register T *old, *tmp;
|
||||
asm volatile("mb\n"
|
||||
"1:\n"
|
||||
"ldq_l %0,%2\n" /* old=*ptr; */
|
||||
@ -1,102 +0,0 @@
|
||||
TARGET = rcc
|
||||
CONFIG += console
|
||||
mac:CONFIG -= app_bundle
|
||||
build_all:!build_pass {
|
||||
CONFIG -= build_all
|
||||
CONFIG += release
|
||||
}
|
||||
|
||||
DEFINES += QT_BOOTSTRAPPED \
|
||||
QT_RCC QT_LITE_UNICODE QT_NO_DATASTREAM QT_NO_THREAD QT_NO_QOBJECT \
|
||||
QT_NO_UNICODETABLES QT_NO_LIBRARY QT_NO_SYSTEMLOCALE QT_NO_GEOM_VARIANT
|
||||
DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
|
||||
|
||||
|
||||
win32:DEFINES += QT_NODLL
|
||||
win32:LIBS += -luser32
|
||||
|
||||
|
||||
CONFIG -= qt
|
||||
INCLUDEPATH = ../../corelib/arch/generic $$QT_BUILD_TREE/include . \
|
||||
$$QT_BUILD_TREE/include/QtCore $$QT_BUILD_TREE/include/QtXml ../../xml
|
||||
DEPENDPATH += $$INCLUDEPATH ../../corelib/base ../../corelib/tools ../../corelib/io ../../corelib/codecs ../../xml
|
||||
|
||||
include(rcc.pri)
|
||||
HEADERS += ../../corelib/kernel/qcorecmdlineargs_p.h
|
||||
SOURCES += main.cpp
|
||||
|
||||
# Qt tools needed to link rcc
|
||||
SOURCES += ../../corelib/global/qglobal.cpp \
|
||||
../../corelib/global/qmalloc.cpp \
|
||||
../../corelib/global/qnumeric.cpp \
|
||||
../../corelib/io/qbuffer.cpp \
|
||||
../../corelib/io/qdir.cpp \
|
||||
../../corelib/io/qdiriterator.cpp \
|
||||
../../corelib/io/qfile.cpp \
|
||||
../../corelib/io/qfileinfo.cpp \
|
||||
../../corelib/io/qfsfileengine.cpp \
|
||||
../../corelib/io/qfsfileengine_iterator.cpp \
|
||||
../../corelib/io/qiodevice.cpp \
|
||||
../../corelib/io/qtemporaryfile.cpp \
|
||||
../../corelib/io/qtextstream.cpp \
|
||||
../../corelib/tools/qbytearraymatcher.cpp \
|
||||
../../corelib/tools/qdatetime.cpp \
|
||||
../../corelib/tools/qhash.cpp \
|
||||
../../corelib/tools/qlistdata.cpp \
|
||||
../../corelib/tools/qlocale.cpp \
|
||||
../../corelib/tools/qmap.cpp \
|
||||
../../corelib/tools/qstring.cpp \
|
||||
../../corelib/tools/qstringlist.cpp \
|
||||
../../corelib/kernel/qvariant.cpp \
|
||||
../../corelib/kernel/qmetatype.cpp \
|
||||
../../corelib/io/qurl.cpp \
|
||||
../../corelib/tools/qvector.cpp \
|
||||
../../corelib/io/qabstractfileengine.cpp \
|
||||
../../corelib/tools/qbytearray.cpp \
|
||||
../../corelib/tools/qbitarray.cpp \
|
||||
../../corelib/tools/qvsnprintf.cpp \
|
||||
../../corelib/tools/qregexp.cpp \
|
||||
../../corelib/codecs/qtextcodec.cpp \
|
||||
../../corelib/codecs/qutfcodec.cpp \
|
||||
../../corelib/codecs/qisciicodec.cpp \
|
||||
../../corelib/codecs/qtsciicodec.cpp \
|
||||
../../corelib/codecs/qlatincodec.cpp \
|
||||
../../corelib/codecs/qsimplecodec.cpp \
|
||||
../../corelib/xml/qxmlutils.cpp \
|
||||
../../xml/dom/qdom.cpp \
|
||||
../../xml/sax/qxml.cpp
|
||||
|
||||
unix:SOURCES += ../../corelib/io/qfsfileengine_unix.cpp ../../corelib/io/qfsfileengine_iterator_unix.cpp
|
||||
|
||||
win32:SOURCES += ../../corelib/io/qfsfileengine_win.cpp ../../corelib/io/qfsfileengine_iterator_win.cpp
|
||||
|
||||
macx: {
|
||||
SOURCES += ../../corelib/kernel/qcore_mac.cpp
|
||||
LIBS += -framework CoreServices
|
||||
}
|
||||
|
||||
contains(QT_CONFIG, zlib) {
|
||||
INCLUDEPATH += ../../3rdparty/zlib
|
||||
SOURCES+= \
|
||||
../3rdparty/zlib/adler32.c \
|
||||
../3rdparty/zlib/compress.c \
|
||||
../3rdparty/zlib/crc32.c \
|
||||
../3rdparty/zlib/deflate.c \
|
||||
../3rdparty/zlib/gzio.c \
|
||||
../3rdparty/zlib/inffast.c \
|
||||
../3rdparty/zlib/inflate.c \
|
||||
../3rdparty/zlib/inftrees.c \
|
||||
../3rdparty/zlib/trees.c \
|
||||
../3rdparty/zlib/uncompr.c \
|
||||
../3rdparty/zlib/zutil.c
|
||||
} else:!contains(QT_CONFIG, no-zlib) {
|
||||
unix:LIBS += -lz
|
||||
# win32:LIBS += libz.lib
|
||||
}
|
||||
|
||||
|
||||
target.path=$$[QT_INSTALL_BINS]
|
||||
INSTALLS += target
|
||||
|
||||
DESTDIR = ../../../bin
|
||||
include(../../qt_targets.pri)
|
||||
@ -1,114 +0,0 @@
|
||||
TEMPLATE = app
|
||||
QT = xml core
|
||||
CONFIG += warn_on console no_batch
|
||||
CONFIG -= app_bundle
|
||||
build_all:!build_pass {
|
||||
CONFIG -= build_all
|
||||
CONFIG += release
|
||||
}
|
||||
|
||||
unix:!contains(QT_CONFIG, zlib):LIBS += -lz
|
||||
|
||||
TARGET = uic
|
||||
DESTDIR = ../../../bin
|
||||
|
||||
DEFINES += QT_BOOTSTRAPPED QT_UIC QT_LITE_UNICODE QT_NO_DATASTREAM \
|
||||
QT_NO_THREAD QT_NO_QOBJECT QT_NO_UNICODETABLES QT_NO_LIBRARY \
|
||||
QT_NO_SYSTEMLOCALE QT_NO_GEOM_VARIANT
|
||||
DEFINES += QT_NO_USING_NAMESPACE
|
||||
DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
|
||||
|
||||
win32:DEFINES += QT_NODLL
|
||||
win32:LIBS += -luser32
|
||||
|
||||
!contains(QT_CONFIG, qt3support):DEFINES += QT_NO_QT3_SUPPORT
|
||||
|
||||
CONFIG -= qt
|
||||
INCLUDEPATH = ../../corelib/arch/generic $$QT_BUILD_TREE/include . \
|
||||
$$QT_BUILD_TREE/include/QtCore $$QT_BUILD_TREE/include/QtXml ../../xml
|
||||
DEPENDPATH += $$INCLUDEPATH ../../corelib/base ../../corelib/tools ../../corelib/io ../../corelib/codecs ../../xml
|
||||
|
||||
include(uic.pri)
|
||||
include(cpp/cpp.pri)
|
||||
|
||||
HEADERS += uic.h
|
||||
|
||||
SOURCES += main.cpp \
|
||||
uic.cpp
|
||||
|
||||
|
||||
# Qt tools needed to link rcc
|
||||
SOURCES += ../../corelib/global/qglobal.cpp \
|
||||
../../corelib/global/qmalloc.cpp \
|
||||
../../corelib/global/qnumeric.cpp \
|
||||
../../corelib/io/qbuffer.cpp \
|
||||
../../corelib/io/qdir.cpp \
|
||||
../../corelib/io/qdiriterator.cpp \
|
||||
../../corelib/io/qfile.cpp \
|
||||
../../corelib/io/qfileinfo.cpp \
|
||||
../../corelib/io/qfsfileengine.cpp \
|
||||
../../corelib/io/qfsfileengine_iterator.cpp \
|
||||
../../corelib/io/qiodevice.cpp \
|
||||
../../corelib/io/qtemporaryfile.cpp \
|
||||
../../corelib/io/qtextstream.cpp \
|
||||
../../corelib/io/qurl.cpp \
|
||||
../../corelib/tools/qbytearraymatcher.cpp \
|
||||
../../corelib/tools/qdatetime.cpp \
|
||||
../../corelib/tools/qhash.cpp \
|
||||
../../corelib/tools/qlistdata.cpp \
|
||||
../../corelib/tools/qlocale.cpp \
|
||||
../../corelib/tools/qmap.cpp \
|
||||
../../corelib/tools/qstring.cpp \
|
||||
../../corelib/tools/qstringlist.cpp \
|
||||
../../corelib/tools/qvector.cpp \
|
||||
../../corelib/io/qabstractfileengine.cpp \
|
||||
../../corelib/tools/qbytearray.cpp \
|
||||
../../corelib/tools/qbitarray.cpp \
|
||||
../../corelib/tools/qvsnprintf.cpp \
|
||||
../../corelib/tools/qregexp.cpp \
|
||||
../../corelib/kernel/qmetatype.cpp \
|
||||
../../corelib/kernel/qvariant.cpp \
|
||||
../../corelib/codecs/qtextcodec.cpp \
|
||||
../../corelib/codecs/qutfcodec.cpp \
|
||||
../../corelib/codecs/qisciicodec.cpp \
|
||||
../../corelib/codecs/qtsciicodec.cpp \
|
||||
../../corelib/codecs/qlatincodec.cpp \
|
||||
../../corelib/codecs/qsimplecodec.cpp \
|
||||
../../corelib/xml/qxmlutils.cpp \
|
||||
../../corelib/xml/qxmlstream.cpp \
|
||||
../../xml/dom/qdom.cpp \
|
||||
../../xml/sax/qxml.cpp
|
||||
|
||||
unix:SOURCES += ../../corelib/io/qfsfileengine_unix.cpp ../../corelib/io/qfsfileengine_iterator_unix.cpp
|
||||
|
||||
win32:SOURCES += ../../corelib/io/qfsfileengine_win.cpp ../../corelib/io/qfsfileengine_iterator_win.cpp
|
||||
|
||||
macx: {
|
||||
SOURCES += ../../corelib/kernel/qcore_mac.cpp
|
||||
LIBS += -framework CoreServices
|
||||
}
|
||||
|
||||
contains(QT_CONFIG, zlib) {
|
||||
INCLUDEPATH += ../../3rdparty/zlib
|
||||
SOURCES+= \
|
||||
../3rdparty/zlib/adler32.c \
|
||||
../3rdparty/zlib/compress.c \
|
||||
../3rdparty/zlib/crc32.c \
|
||||
../3rdparty/zlib/deflate.c \
|
||||
../3rdparty/zlib/gzio.c \
|
||||
../3rdparty/zlib/inffast.c \
|
||||
../3rdparty/zlib/inflate.c \
|
||||
../3rdparty/zlib/inftrees.c \
|
||||
../3rdparty/zlib/trees.c \
|
||||
../3rdparty/zlib/uncompr.c \
|
||||
../3rdparty/zlib/zutil.c
|
||||
} else:!contains(QT_CONFIG, no-zlib) {
|
||||
unix:LIBS += -lz
|
||||
# win32:LIBS += libz.lib
|
||||
}
|
||||
|
||||
target.path=$$[QT_INSTALL_BINS]
|
||||
INSTALLS += target
|
||||
|
||||
DESTDIR = ../../../bin
|
||||
include(../../qt_targets.pri)
|
||||
@ -1,16 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>qt</herd>
|
||||
<use>
|
||||
<flag name='exceptions'>Add support for exceptions - like catching them
|
||||
inside the event loop (recommended by Nokia)</flag>
|
||||
<flag name='glib'>Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
|
||||
<flag name='optimized-qmake'>Enable qmake optimization</flag>
|
||||
<flag name='qt3support'>Enable the Qt3Support libraries for Qt4. Note that
|
||||
this does not mean you can compile pure Qt3 programs with Qt4.</flag>
|
||||
<flag name="private-headers">Install Qt declarative private headers
|
||||
required by Qt-creator QmlDesigner and QmlInspector plugins"</flag>
|
||||
<flag name="jit">Enables JIT for Javascript usage inside Qt</flag>
|
||||
</use>
|
||||
</pkgmetadata>
|
||||
@ -1,183 +0,0 @@
|
||||
# Copyright 1999-2010 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.7.1-r1.ebuild,v 1.1 2010/11/19 01:27:29 chiiph Exp $
|
||||
|
||||
EAPI="3"
|
||||
inherit qt4-build
|
||||
|
||||
DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
|
||||
SLOT="4"
|
||||
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"
|
||||
IUSE="+glib iconv +jit optimized-qmake private-headers qt3support ssl"
|
||||
|
||||
RDEPEND="sys-libs/zlib
|
||||
glib? ( dev-libs/glib )
|
||||
ssl? ( dev-libs/openssl )
|
||||
!<x11-libs/qt-4.4.0:4"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-util/pkgconfig"
|
||||
PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,glib=,qt3support] )"
|
||||
|
||||
pkg_setup() {
|
||||
QT4_TARGET_DIRECTORIES="
|
||||
src/tools/bootstrap
|
||||
src/tools/moc
|
||||
src/tools/rcc
|
||||
src/tools/uic
|
||||
src/corelib
|
||||
src/xml
|
||||
src/network
|
||||
src/plugins/codecs
|
||||
tools/linguist/lconvert
|
||||
tools/linguist/lrelease
|
||||
tools/linguist/lupdate"
|
||||
|
||||
QT4_EXTRACT_DIRECTORIES="
|
||||
include/Qt
|
||||
include/QtCore
|
||||
include/QtDeclarative
|
||||
include/QtGui
|
||||
include/QtNetwork
|
||||
include/QtScript
|
||||
include/QtXml
|
||||
src/plugins/plugins.pro
|
||||
src/plugins/qpluginbase.pri
|
||||
src/src.pro
|
||||
src/3rdparty/des
|
||||
src/3rdparty/harfbuzz
|
||||
src/3rdparty/md4
|
||||
src/3rdparty/md5
|
||||
src/3rdparty/sha1
|
||||
src/3rdparty/easing
|
||||
src/3rdparty/zlib_dependency.pri
|
||||
src/declarative
|
||||
src/gui
|
||||
src/script
|
||||
tools/shared
|
||||
tools/linguist/shared
|
||||
translations"
|
||||
qt4-build_pkg_setup
|
||||
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
|
||||
${QT4_EXTRACT_DIRECTORIES}"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Don't pre-strip, bug 235026
|
||||
for i in kr jp cn tw ; do
|
||||
echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
|
||||
done
|
||||
|
||||
qt4-build_src_prepare
|
||||
|
||||
# bug 172219
|
||||
sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
|
||||
"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed"
|
||||
sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
|
||||
"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
unset QMAKESPEC
|
||||
|
||||
myconf="${myconf}
|
||||
$(qt_use glib)
|
||||
$(qt_use iconv)
|
||||
$(qt_use optimized-qmake)
|
||||
$(qt_use ssl openssl)
|
||||
$(qt_use qt3support)
|
||||
$(qt_use jit javascript-jit)"
|
||||
|
||||
myconf="${myconf} -no-xkb -no-fontconfig -no-xrender -no-xrandr
|
||||
-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
|
||||
-no-nas-sound -no-dbus -no-cups -no-gif -no-libpng
|
||||
-no-libmng -no-libjpeg -system-zlib -no-webkit -no-phonon -no-xmlpatterns
|
||||
-no-freetype -no-libtiff -no-accessibility -no-fontconfig -no-opengl
|
||||
-no-svg -no-gtkstyle -no-phonon-backend -no-script -no-scripttools
|
||||
-no-cups -no-xsync -no-xinput -no-multimedia"
|
||||
|
||||
if [ "$ABI" = "x86" ] ; then
|
||||
myconf="${myconf} -little-endian -host-little-endian -continue"
|
||||
fi
|
||||
|
||||
qt4-build_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# bug 259736
|
||||
unset QMAKESPEC
|
||||
qt4-build_src_compile
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die "dobin failed"
|
||||
|
||||
install_directories src/{corelib,xml,network,plugins/codecs}
|
||||
|
||||
emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed"
|
||||
|
||||
#install private headers
|
||||
if use private-headers; then
|
||||
insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private
|
||||
find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} \;
|
||||
fi
|
||||
# use freshly built libraries
|
||||
local DYLD_FPATH=
|
||||
[[ -d "${S}"/lib/QtCore.framework ]] \
|
||||
&& DYLD_FPATH=$(for x in "${S}/lib/"*.framework; do echo -n ":$x"; done)
|
||||
DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
|
||||
LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts \
|
||||
|| die "generating translations faied"
|
||||
insinto ${QTTRANSDIR#${EPREFIX}}
|
||||
doins translations/*.qm || die "doins translations failed"
|
||||
|
||||
setqtenv
|
||||
fix_library_files
|
||||
|
||||
# List all the multilib libdirs
|
||||
local libdirs=
|
||||
for libdir in $(get_all_libdirs); do
|
||||
libdirs+=:${EPREFIX}/usr/${libdir}/qt4
|
||||
done
|
||||
|
||||
cat <<-EOF > "${T}/44qt4"
|
||||
LDPATH="${libdirs:1}"
|
||||
EOF
|
||||
doenvd "${T}/44qt4"
|
||||
|
||||
dodir ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo || die "dodir failed"
|
||||
mv "${D}"/${QTDATADIR}/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \
|
||||
|| die "Failed to move qconfig.pri"
|
||||
|
||||
# Framework hacking
|
||||
if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]] ; then
|
||||
#TODO do this better
|
||||
sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
|
||||
"${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \
|
||||
|| die "sed for qconfig.h failed."
|
||||
dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo ||
|
||||
die "dosym failed"
|
||||
else
|
||||
sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
|
||||
"${D}${QTHEADERDIR}"/QtCore/qconfig.h \
|
||||
"${D}${QTHEADERDIR}"/Qt/qconfig.h \
|
||||
|| die "sed for qconfig.h failed"
|
||||
fi
|
||||
|
||||
if use glib; then
|
||||
QCONFIG_DEFINE="$(use glib && echo QT_GLIB)
|
||||
$(use ssl && echo QT_OPENSSL)"
|
||||
install_qconfigs
|
||||
fi
|
||||
# remove .la files
|
||||
find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm
|
||||
# remove some unnecessary headers
|
||||
rm -f "${D}${QTHEADERDIR}"/{Qt,QtCore}/{\
|
||||
qatomic_windows.h,\
|
||||
qatomic_windowsce.h,\
|
||||
qt_windows.h}
|
||||
|
||||
keepdir "${QTSYSCONFDIR#${EPREFIX}}"
|
||||
|
||||
# Framework magic
|
||||
fix_includes
|
||||
}
|
||||
@ -1,183 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.7.2.ebuild,v 1.1 2011/03/01 19:06:22 tampakrap Exp $
|
||||
|
||||
EAPI="3"
|
||||
inherit qt4-build
|
||||
|
||||
DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
|
||||
SLOT="4"
|
||||
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"
|
||||
IUSE="+glib iconv +jit optimized-qmake private-headers qt3support ssl"
|
||||
|
||||
RDEPEND="sys-libs/zlib
|
||||
glib? ( dev-libs/glib )
|
||||
ssl? ( dev-libs/openssl )
|
||||
!<x11-libs/qt-4.4.0:4"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-util/pkgconfig"
|
||||
PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,glib=,qt3support] )"
|
||||
|
||||
pkg_setup() {
|
||||
QT4_TARGET_DIRECTORIES="
|
||||
src/tools/bootstrap
|
||||
src/tools/moc
|
||||
src/tools/rcc
|
||||
src/tools/uic
|
||||
src/corelib
|
||||
src/xml
|
||||
src/network
|
||||
src/plugins/codecs
|
||||
tools/linguist/lconvert
|
||||
tools/linguist/lrelease
|
||||
tools/linguist/lupdate"
|
||||
|
||||
QT4_EXTRACT_DIRECTORIES="
|
||||
include/Qt
|
||||
include/QtCore
|
||||
include/QtDeclarative
|
||||
include/QtGui
|
||||
include/QtNetwork
|
||||
include/QtScript
|
||||
include/QtXml
|
||||
src/plugins/plugins.pro
|
||||
src/plugins/qpluginbase.pri
|
||||
src/src.pro
|
||||
src/3rdparty/des
|
||||
src/3rdparty/harfbuzz
|
||||
src/3rdparty/md4
|
||||
src/3rdparty/md5
|
||||
src/3rdparty/sha1
|
||||
src/3rdparty/easing
|
||||
src/3rdparty/zlib_dependency.pri
|
||||
src/declarative
|
||||
src/gui
|
||||
src/script
|
||||
tools/shared
|
||||
tools/linguist/shared
|
||||
translations"
|
||||
qt4-build_pkg_setup
|
||||
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
|
||||
${QT4_EXTRACT_DIRECTORIES}"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Don't pre-strip, bug 235026
|
||||
for i in kr jp cn tw ; do
|
||||
echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
|
||||
done
|
||||
|
||||
qt4-build_src_prepare
|
||||
|
||||
# bug 172219
|
||||
sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
|
||||
"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed"
|
||||
sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
|
||||
"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
unset QMAKESPEC
|
||||
|
||||
myconf="${myconf}
|
||||
$(qt_use glib)
|
||||
$(qt_use iconv)
|
||||
$(qt_use optimized-qmake)
|
||||
$(qt_use ssl openssl)
|
||||
$(qt_use qt3support)
|
||||
$(qt_use jit javascript-jit)"
|
||||
|
||||
myconf="${myconf} -no-xkb -no-fontconfig -no-xrender -no-xrandr
|
||||
-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
|
||||
-no-nas-sound -no-dbus -no-cups -no-gif -no-libpng
|
||||
-no-libmng -no-libjpeg -system-zlib -no-webkit -no-phonon -no-xmlpatterns
|
||||
-no-freetype -no-libtiff -no-accessibility -no-fontconfig -no-opengl
|
||||
-no-svg -no-gtkstyle -no-phonon-backend -no-script -no-scripttools
|
||||
-no-cups -no-xsync -no-xinput -no-multimedia"
|
||||
|
||||
if [ "$ABI" = "x86" ] ; then
|
||||
myconf="${myconf} -little-endian -host-little-endian -continue"
|
||||
fi
|
||||
|
||||
qt4-build_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# bug 259736
|
||||
unset QMAKESPEC
|
||||
qt4-build_src_compile
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die "dobin failed"
|
||||
|
||||
install_directories src/{corelib,xml,network,plugins/codecs}
|
||||
|
||||
emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed"
|
||||
|
||||
#install private headers
|
||||
if use private-headers; then
|
||||
insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private
|
||||
find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} \;
|
||||
fi
|
||||
# use freshly built libraries
|
||||
local DYLD_FPATH=
|
||||
[[ -d "${S}"/lib/QtCore.framework ]] \
|
||||
&& DYLD_FPATH=$(for x in "${S}/lib/"*.framework; do echo -n ":$x"; done)
|
||||
DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
|
||||
LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts \
|
||||
|| die "generating translations faied"
|
||||
insinto ${QTTRANSDIR#${EPREFIX}}
|
||||
doins translations/*.qm || die "doins translations failed"
|
||||
|
||||
setqtenv
|
||||
fix_library_files
|
||||
|
||||
# List all the multilib libdirs
|
||||
local libdirs=
|
||||
for libdir in $(get_all_libdirs); do
|
||||
libdirs+=:${EPREFIX}/usr/${libdir}/qt4
|
||||
done
|
||||
|
||||
cat <<-EOF > "${T}/44qt4"
|
||||
LDPATH="${libdirs:1}"
|
||||
EOF
|
||||
doenvd "${T}/44qt4"
|
||||
|
||||
dodir ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo || die "dodir failed"
|
||||
mv "${D}"/${QTDATADIR}/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \
|
||||
|| die "Failed to move qconfig.pri"
|
||||
|
||||
# Framework hacking
|
||||
if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]] ; then
|
||||
#TODO do this better
|
||||
sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
|
||||
"${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \
|
||||
|| die "sed for qconfig.h failed."
|
||||
dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo ||
|
||||
die "dosym failed"
|
||||
else
|
||||
sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
|
||||
"${D}${QTHEADERDIR}"/QtCore/qconfig.h \
|
||||
"${D}${QTHEADERDIR}"/Qt/qconfig.h \
|
||||
|| die "sed for qconfig.h failed"
|
||||
fi
|
||||
|
||||
if use glib; then
|
||||
QCONFIG_DEFINE="$(use glib && echo QT_GLIB)
|
||||
$(use ssl && echo QT_OPENSSL)"
|
||||
install_qconfigs
|
||||
fi
|
||||
# remove .la files
|
||||
find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm
|
||||
# remove some unnecessary headers
|
||||
rm -f "${D}${QTHEADERDIR}"/{Qt,QtCore}/{\
|
||||
qatomic_windows.h,\
|
||||
qatomic_windowsce.h,\
|
||||
qt_windows.h}
|
||||
|
||||
keepdir "${QTSYSCONFDIR#${EPREFIX}}"
|
||||
|
||||
# Framework magic
|
||||
fix_includes
|
||||
}
|
||||
@ -1,183 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.7.3.ebuild,v 1.2 2011/05/10 21:40:09 tampakrap Exp $
|
||||
|
||||
EAPI="3"
|
||||
inherit qt4-build
|
||||
|
||||
DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
|
||||
SLOT="4"
|
||||
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"
|
||||
IUSE="+glib iconv +jit optimized-qmake private-headers qt3support ssl"
|
||||
|
||||
RDEPEND="sys-libs/zlib
|
||||
glib? ( dev-libs/glib )
|
||||
ssl? ( dev-libs/openssl )
|
||||
!<x11-libs/qt-4.4.0:4"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-util/pkgconfig"
|
||||
PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,glib=,qt3support] )"
|
||||
|
||||
pkg_setup() {
|
||||
QT4_TARGET_DIRECTORIES="
|
||||
src/tools/bootstrap
|
||||
src/tools/moc
|
||||
src/tools/rcc
|
||||
src/tools/uic
|
||||
src/corelib
|
||||
src/xml
|
||||
src/network
|
||||
src/plugins/codecs
|
||||
tools/linguist/lconvert
|
||||
tools/linguist/lrelease
|
||||
tools/linguist/lupdate"
|
||||
|
||||
QT4_EXTRACT_DIRECTORIES="
|
||||
include/Qt
|
||||
include/QtCore
|
||||
include/QtDeclarative
|
||||
include/QtGui
|
||||
include/QtNetwork
|
||||
include/QtScript
|
||||
include/QtXml
|
||||
src/plugins/plugins.pro
|
||||
src/plugins/qpluginbase.pri
|
||||
src/src.pro
|
||||
src/3rdparty/des
|
||||
src/3rdparty/harfbuzz
|
||||
src/3rdparty/md4
|
||||
src/3rdparty/md5
|
||||
src/3rdparty/sha1
|
||||
src/3rdparty/easing
|
||||
src/3rdparty/zlib_dependency.pri
|
||||
src/declarative
|
||||
src/gui
|
||||
src/script
|
||||
tools/shared
|
||||
tools/linguist/shared
|
||||
translations"
|
||||
qt4-build_pkg_setup
|
||||
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
|
||||
${QT4_EXTRACT_DIRECTORIES}"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Don't pre-strip, bug 235026
|
||||
for i in kr jp cn tw ; do
|
||||
echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
|
||||
done
|
||||
|
||||
qt4-build_src_prepare
|
||||
|
||||
# bug 172219
|
||||
sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
|
||||
"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed"
|
||||
sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
|
||||
"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
unset QMAKESPEC
|
||||
|
||||
myconf="${myconf}
|
||||
$(qt_use glib)
|
||||
$(qt_use iconv)
|
||||
$(qt_use optimized-qmake)
|
||||
$(qt_use ssl openssl)
|
||||
$(qt_use qt3support)
|
||||
$(qt_use jit javascript-jit)"
|
||||
|
||||
myconf="${myconf} -no-xkb -no-fontconfig -no-xrender -no-xrandr
|
||||
-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
|
||||
-no-nas-sound -no-dbus -no-cups -no-gif -no-libpng
|
||||
-no-libmng -no-libjpeg -system-zlib -no-webkit -no-phonon -no-xmlpatterns
|
||||
-no-freetype -no-libtiff -no-accessibility -no-fontconfig -no-opengl
|
||||
-no-svg -no-gtkstyle -no-phonon-backend -no-script -no-scripttools
|
||||
-no-cups -no-xsync -no-xinput -no-multimedia"
|
||||
|
||||
if [ "$ABI" = "x86" ] ; then
|
||||
myconf="${myconf} -little-endian -host-little-endian -continue"
|
||||
fi
|
||||
|
||||
qt4-build_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# bug 259736
|
||||
unset QMAKESPEC
|
||||
qt4-build_src_compile
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die "dobin failed"
|
||||
|
||||
install_directories src/{corelib,xml,network,plugins/codecs}
|
||||
|
||||
emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed"
|
||||
|
||||
#install private headers
|
||||
if use private-headers; then
|
||||
insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private
|
||||
find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} \;
|
||||
fi
|
||||
# use freshly built libraries
|
||||
local DYLD_FPATH=
|
||||
[[ -d "${S}"/lib/QtCore.framework ]] \
|
||||
&& DYLD_FPATH=$(for x in "${S}/lib/"*.framework; do echo -n ":$x"; done)
|
||||
DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
|
||||
LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts \
|
||||
|| die "generating translations faied"
|
||||
insinto ${QTTRANSDIR#${EPREFIX}}
|
||||
doins translations/*.qm || die "doins translations failed"
|
||||
|
||||
setqtenv
|
||||
fix_library_files
|
||||
|
||||
# List all the multilib libdirs
|
||||
local libdirs=
|
||||
for libdir in $(get_all_libdirs); do
|
||||
libdirs+=:${EPREFIX}/usr/${libdir}/qt4
|
||||
done
|
||||
|
||||
cat <<-EOF > "${T}/44qt4"
|
||||
LDPATH="${libdirs:1}"
|
||||
EOF
|
||||
doenvd "${T}/44qt4"
|
||||
|
||||
dodir ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo || die "dodir failed"
|
||||
mv "${D}"/${QTDATADIR}/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \
|
||||
|| die "Failed to move qconfig.pri"
|
||||
|
||||
# Framework hacking
|
||||
if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]] ; then
|
||||
#TODO do this better
|
||||
sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
|
||||
"${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \
|
||||
|| die "sed for qconfig.h failed."
|
||||
dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo ||
|
||||
die "dosym failed"
|
||||
else
|
||||
sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
|
||||
"${D}${QTHEADERDIR}"/QtCore/qconfig.h \
|
||||
"${D}${QTHEADERDIR}"/Qt/qconfig.h \
|
||||
|| die "sed for qconfig.h failed"
|
||||
fi
|
||||
|
||||
if use glib; then
|
||||
QCONFIG_DEFINE="$(use glib && echo QT_GLIB)
|
||||
$(use ssl && echo QT_OPENSSL)"
|
||||
install_qconfigs
|
||||
fi
|
||||
# remove .la files
|
||||
find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm
|
||||
# remove some unnecessary headers
|
||||
rm -f "${D}${QTHEADERDIR}"/{Qt,QtCore}/{\
|
||||
qatomic_windows.h,\
|
||||
qatomic_windowsce.h,\
|
||||
qt_windows.h}
|
||||
|
||||
keepdir "${QTSYSCONFDIR#${EPREFIX}}"
|
||||
|
||||
# Framework magic
|
||||
fix_includes
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user