diff options
| -rw-r--r-- | dev-qt/qtcore/ChangeLog | 852 | ||||
| -rw-r--r-- | dev-qt/qtcore/files/CVE-2013-0254.patch | 66 | ||||
| -rw-r--r-- | dev-qt/qtcore/files/blacklist-mis-issued-Turktrust-certs.patch | 107 | ||||
| -rw-r--r-- | dev-qt/qtcore/files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch | 35 | ||||
| -rw-r--r-- | dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch | 15 | ||||
| -rw-r--r-- | dev-qt/qtcore/files/moc-workaround-for-boost-1.48.patch | 11 | ||||
| -rw-r--r-- | dev-qt/qtcore/files/set-pkg-config-locations-directly-to-install-dir.patch | 60 | ||||
| -rw-r--r-- | dev-qt/qtcore/metadata.xml | 17 | ||||
| -rw-r--r-- | dev-qt/qtcore/qtcore-4.8.4-r2.ebuild | 182 | ||||
| -rw-r--r-- | dev-qt/qtcore/qtcore-4.8.4-r4.ebuild | 184 | ||||
| -rw-r--r-- | dev-qt/qtcore/qtcore-4.8.4.ebuild | 180 |
11 files changed, 1709 insertions, 0 deletions
diff --git a/dev-qt/qtcore/ChangeLog b/dev-qt/qtcore/ChangeLog new file mode 100644 index 000000000000..3c435b98f30a --- /dev/null +++ b/dev-qt/qtcore/ChangeLog @@ -0,0 +1,852 @@ +# ChangeLog for dev-qt/qtcore +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.1 2013/03/02 15:26:01 yngwin Exp $ + +*qt-core-4.8.4-r4 (15 Feb 2013) + + 15 Feb 2013; Davide Pesavento <pesa@gentoo.org> + +files/blacklist-mis-issued-Turktrust-certs.patch, + +files/moc-workaround-for-BOOST_JOIN.patch, +qt-core-4.8.4-r4.ebuild, + -qt-core-4.8.4-r3.ebuild: + Apply workaround for newer boost headers (bug 454080 by Flameeyes). Blacklist + mis-issued Türktrust SSL certs. + +*qt-core-4.8.4-r3 (13 Feb 2013) + + 13 Feb 2013; Davide Pesavento <pesa@gentoo.org> + +files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch, + +qt-core-4.8.4-r3.ebuild: + Fix bug 450818. Patch by David E. Narváez <david.narvaez@computer.org>. + + 12 Feb 2013; Agostino Sarubbo <ago@gentoo.org> qt-core-4.8.4-r2.ebuild: + Stable for alpha, wrt bug #455884 + + 12 Feb 2013; Agostino Sarubbo <ago@gentoo.org> qt-core-4.8.4-r2.ebuild: + Stable for x86, wrt bug #455884 + + 11 Feb 2013; Agostino Sarubbo <ago@gentoo.org> qt-core-4.8.4-r2.ebuild: + Stable for arm, wrt bug #455884 + + 10 Feb 2013; Jeroen Roovers <jer@gentoo.org> qt-core-4.8.4-r2.ebuild: + Stable for HPPA (bug #455884). + + 10 Feb 2013; Agostino Sarubbo <ago@gentoo.org> qt-core-4.8.4-r2.ebuild: + Stable for ppc, wrt bug #455884 + + 10 Feb 2013; Agostino Sarubbo <ago@gentoo.org> qt-core-4.8.4-r2.ebuild: + Stable for ppc64, wrt bug #455884 + + 09 Feb 2013; Agostino Sarubbo <ago@gentoo.org> qt-core-4.8.4-r2.ebuild: + Stable for ia64, wrt bug #455884 + + 09 Feb 2013; Sergey Popov <pinkbyte@gentoo.org> qt-core-4.8.4-r2.ebuild: + Stable on amd64, wrt bug #455884 + +*qt-core-4.8.4-r2 (09 Feb 2013) + + 09 Feb 2013; Davide Pesavento <pesa@gentoo.org> +files/CVE-2013-0254.patch, + +qt-core-4.8.4-r2.ebuild, -qt-core-4.8.4-r1.ebuild: + Apply upstream patch for CVE-2013-0254 (Gentoo bug #455884) + + 26 Jan 2013; Davide Pesavento <pesa@gentoo.org> + +files/set-pkg-config-locations-directly-to-install-dir.patch, + qt-core-4.8.4-r1.ebuild: + Apply upstream patch to solve bug 401025. + +*qt-core-4.8.4-r1 (03 Jan 2013) + + 03 Jan 2013; Michael Palimaka <kensington@gentoo.org> + +qt-core-4.8.4-r1.ebuild: + Revision bump making use of subslots for dev-libs/icu, to solve linkage issues + like in bug #449250. + + 31 Dec 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml: + Cleanup metadata. + + 29 Dec 2012; Michael Palimaka <kensington@gentoo.org> + -files/4.8.2-qatomic-x32.patch, -files/blacklist-diginotar-certs.diff, + -files/qt-core-4.7.4-fix-libreoffice-crash.patch, + -files/qt-core-4.8.1-localized-time.patch, -qt-core-4.7.4-r1.ebuild, + -qt-core-4.8.1-r3.ebuild, -qt-core-4.8.2.ebuild, -qt-core-4.8.3-r1.ebuild: + Remove old. + + 29 Dec 2012; Agostino Sarubbo <ago@gentoo.org> qt-core-4.8.4.ebuild: + Stable for alpha, wrt bug #445956 + + 26 Dec 2012; Agostino Sarubbo <ago@gentoo.org> qt-core-4.8.4.ebuild: + Stable for sparc, wrt bug #445956 + + 25 Dec 2012; Agostino Sarubbo <ago@gentoo.org> qt-core-4.8.4.ebuild: + Stable for arm, wrt bug #445956 + + 25 Dec 2012; Agostino Sarubbo <ago@gentoo.org> qt-core-4.8.4.ebuild: + Stable for x86, wrt bug #445956 + + 25 Dec 2012; Agostino Sarubbo <ago@gentoo.org> qt-core-4.8.4.ebuild: + Stable for ppc64, wrt bug #445956 + + 25 Dec 2012; Agostino Sarubbo <ago@gentoo.org> qt-core-4.8.4.ebuild: + Stable for ppc, wrt bug #445956 + + 25 Dec 2012; Agostino Sarubbo <ago@gentoo.org> qt-core-4.8.4.ebuild: + Stable for ia64, wrt bug #445956 + + 25 Dec 2012; Agostino Sarubbo <ago@gentoo.org> qt-core-4.8.4.ebuild: + Stable for amd64, wrt bug #445956 + + 24 Dec 2012; Jeroen Roovers <jer@gentoo.org> qt-core-4.8.4.ebuild: + Stable for HPPA (bug #445956). + +*qt-core-4.8.4 (05 Dec 2012) + + 05 Dec 2012; Ben de Groot <yngwin@gentoo.org> +qt-core-4.8.4.ebuild: + Qt 4.8.4 version bump + + 14 Oct 2012; Raúl Porcel <armin76@gentoo.org> qt-core-4.8.2.ebuild: + alpha/ia64/sparc stable wrt #424625 + + 18 Sep 2012; Davide Pesavento <pesa@gentoo.org> -qt-core-4.8.3.ebuild, + qt-core-4.8.3-r1.ebuild: + old + +*qt-core-4.8.3-r1 (16 Sep 2012) + + 16 Sep 2012; Ben de Groot <yngwin@gentoo.org> +qt-core-4.8.3-r1.ebuild: + Import updates from live ebuild in overlay + +*qt-core-4.8.3 (14 Sep 2012) + + 14 Sep 2012; Ben de Groot <yngwin@gentoo.org> +qt-core-4.8.3.ebuild: + Version bump. Drop qatomic-x32 patch applied upstream. Drop qpa useflag. + + 19 Jul 2012; Markus Meier <maekke@gentoo.org> qt-core-4.8.2.ebuild: + arm stable, bug #424625 + + 15 Jul 2012; Agostino Sarubbo <ago@gentoo.org> qt-core-4.8.2.ebuild: + Stable for x86, wrt bug #424625 + + 09 Jul 2012; Johannes Huber <johu@gentoo.org> -files/blacklist_ssl.patch, + -files/qt-4.6-nolibx11.patch, -files/qt-4.6-nox11r6.patch: + Remove old. + + 09 Jul 2012; Johannes Huber <johu@gentoo.org> -qt-core-4.6.3-r1.ebuild: + Drop Qt-4.6.3 + + 09 Jul 2012; Joseph Jezak <josejx@gentoo.org> qt-core-4.8.2.ebuild: + Marked ppc/ppc64 for bug #424625. + + 08 Jul 2012; Raúl Porcel <armin76@gentoo.org> qt-core-4.8.1-r3.ebuild, + qt-core-4.8.2.ebuild: + sparc stable, add ~sparc + + 08 Jul 2012; Jeroen Roovers <jer@gentoo.org> qt-core-4.8.2.ebuild: + Stable for HPPA (bug #424625). + + 06 Jul 2012; Michael Weber <xmw@gentoo.org> qt-core-4.8.1-r3.ebuild: + ppc stable (bug 414241) + + 05 Jul 2012; Agostino Sarubbo <ago@gentoo.org> qt-core-4.8.2.ebuild: + Stable for amd64, wrt bug #424625 + + 25 Jun 2012; Raúl Porcel <armin76@gentoo.org> qt-core-4.8.1-r3.ebuild, + qt-core-4.8.2.ebuild: + Add ~alpha, alpha/ia64 stable wrt #414241 + + 19 Jun 2012; Davide Pesavento <pesa@gentoo.org> + +files/4.8.2-qatomic-x32.patch, qt-core-4.8.2.ebuild: + Add patch for x32 support in qatomic asm code (bug 420705). + + 18 Jun 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml: + Cleanup metadata and add upstream info. + + 08 Jun 2012; Davide Pesavento <pesa@gentoo.org> -qt-core-4.8.1-r2.ebuild: + Remove unused revision. + + 08 Jun 2012; Davide Pesavento <pesa@gentoo.org> qt-core-4.8.1-r3.ebuild: + Stable on hppa to force rebuild against icu-49, wrt bug 413541. + + 31 May 2012; Davide Pesavento <pesa@gentoo.org> qt-core-4.8.1-r3.ebuild: + Stable on arm to force rebuild against icu-49, wrt bug 413541. + +*qt-core-4.8.2 (22 May 2012) + + 22 May 2012; Davide Pesavento <pesa@gentoo.org> +qt-core-4.8.2.ebuild: + Version bump. + + 21 May 2012; Davide Pesavento <pesa@gentoo.org> qt-core-4.8.1-r3.ebuild: + amd64/x86 stable to force rebuild against icu-49. + +*qt-core-4.8.1-r3 (20 May 2012) + + 20 May 2012; Davide Pesavento <pesa@gentoo.org> +qt-core-4.8.1-r3.ebuild: + Revbump introducing icu USE flag and forcing >=icu-49 to workaround bug + #413541. + + 20 May 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml: + Remove "jit" USE flag description from metadata, bug 416611. + + 20 May 2012; Agostino Sarubbo <ago@gentoo.org> qt-core-4.8.1-r2.ebuild: + Stable for x86, wrt bug #414241 + + 16 May 2012; Jeroen Roovers <jer@gentoo.org> qt-core-4.8.1-r2.ebuild: + Stable for HPPA (bug #414241). + + 14 May 2012; Johannes Huber <johu@gentoo.org> -qt-core-4.7.2-r2.ebuild: + Drop Qt-4.7.2 + + 13 May 2012; Davide Pesavento <pesa@gentoo.org> -qt-core-4.8.1-r1.ebuild: + Remove unused revision. + + 12 May 2012; Alexis Ballier <aballier@gentoo.org> qt-core-4.8.1-r2.ebuild: + keyword ~amd64-fbsd + + 12 May 2012; Markus Meier <maekke@gentoo.org> qt-core-4.8.1-r2.ebuild: + arm stable, bug #414241 + + 08 May 2012; Markos Chandras <hwoarang@gentoo.org> qt-core-4.8.1-r2.ebuild: + Stable on amd64 wrt bug #414241 + + 06 May 2012; Davide Pesavento <pesa@gentoo.org> qt-core-4.8.1-r1.ebuild, + qt-core-4.8.1-r2.ebuild: + Minor ebuild cleanup. + +*qt-core-4.8.1-r2 (04 May 2012) + + 04 May 2012; Davide Pesavento <pesa@gentoo.org> + +files/moc-workaround-for-boost-1.48.patch, +qt-core-4.8.1-r2.ebuild: + Apply Fedora's workaround to fix bug 401551 (moc fails to parse BOOST_JOIN + macro of dev-libs/boost-1.48). + +*qt-core-4.8.1-r1 (15 Apr 2012) + + 15 Apr 2012; Davide Pesavento <pesa@gentoo.org> + +files/qt-core-4.8.1-localized-time.patch, +qt-core-4.8.1-r1.ebuild, + -qt-core-4.8.1.ebuild: + Fix localization of date/time, bug 411929 by Franz Fellner. Patch has been + merged upstream for Qt 4.8.2 (https://codereview.qt-project.org/20869). + + 12 Apr 2012; Davide Pesavento <pesa@gentoo.org> + -files/qt-core-4.8.0-qurl-regression-fix.patch, -qt-core-4.6.3.ebuild, + -qt-core-4.7.2-r1.ebuild, -qt-core-4.7.4.ebuild: + Remove unused versions. + + 05 Apr 2012; Johannes Huber <johu@gentoo.org> -qt-core-4.8.0-r1.ebuild: + Drop Qt-4.8.0 + + 03 Apr 2012; Jeroen Roovers <jer@gentoo.org> qt-core-4.7.4-r1.ebuild: + Stable for HPPA (bug #390963). + +*qt-core-4.8.1 (29 Mar 2012) + + 29 Mar 2012; Davide Pesavento <pesa@gentoo.org> +qt-core-4.8.1.ebuild: + Version bump. + + 27 Mar 2012; Johannes Huber <johu@gentoo.org> -files/qt-4.6.2-alpha.patch: + Remove unused. + + 27 Mar 2012; Johannes Huber <johu@gentoo.org> -qt-core-4.6.2-r1.ebuild: + Drop Qt-4.6.2 + + 29 Jan 2012; Joseph Jezak <josejx@gentoo.org> qt-core-4.7.4-r1.ebuild: + Marked ppc ppc64 stable for bug #390963. + +*qt-core-4.8.0-r1 (29 Jan 2012) + + 29 Jan 2012; Alex Alexander <wired@gentoo.org> +qt-core-4.8.0-r1.ebuild, + +files/qt-core-4.8.0-qurl-regression-fix.patch, metadata.xml: + version bump + + 27 Dec 2011; Markus Meier <maekke@gentoo.org> qt-core-4.7.4-r1.ebuild: + x86 stable, bug #390963 + + 20 Dec 2011; Agostino Sarubbo <ago@gentoo.org> qt-core-4.7.4-r1.ebuild: + Stable for AMD64, wrt bug #390963 + + 28 Nov 2011; Davide Pesavento <pesa@gentoo.org> -files/qt-4.5-nolibx11.diff, + -qt-core-4.7.3-r1.ebuild, -qt-core-4.7.3.ebuild: + Remove Qt 4.7.3 + +*qt-core-4.7.4-r1 (28 Nov 2011) + + 28 Nov 2011; Theo Chatzimichos <tampakrap@gentoo.org> + +qt-core-4.7.4-r1.ebuild, +files/qt-core-4.7.4-fix-libreoffice-crash.patch: + Backport patch from Qt 4.8 to fix crash in LibreOffice, as pointed out by + scarabeus. FreeDesktop bug 40298 + + 26 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> Manifest: + Bug 385719: upstream altered qt-everywhere-opensource-src-4.7.4.tar.gz, mass + fix for pesa. + + 20 Nov 2011; Davide Pesavento <pesa@gentoo.org> qt-core-4.6.3-r1.ebuild, + qt-core-4.7.2-r2.ebuild, qt-core-4.7.4.ebuild, -files/moc.pro, + -files/rcc.pro, -files/uic.pro: + Drop redundant dep on dev-util/pkgconfig; remove unused files. + + 27 Sep 2011; Kacper Kowalik <xarthisius@gentoo.org> qt-core-4.7.2-r2.ebuild: + ppc/ppc64 stable wrt #382171 + + 13 Sep 2011; Markos Chandras <hwoarang@gentoo.org> qt-core-4.7.2-r2.ebuild: + Stable on amd64 wrt bug #382171 + + 12 Sep 2011; Markus Meier <maekke@gentoo.org> qt-core-4.7.2-r2.ebuild: + arm stable, bug #382171 + + 11 Sep 2011; Markus Meier <maekke@gentoo.org> qt-core-4.7.2-r2.ebuild: + x86 stable, bug #382171 + + 08 Sep 2011; Alex Alexander <wired@gentoo.org> + files/blacklist-diginotar-certs.diff: + updated blacklist patch to work with stable version of sys-devel/patch + (2.5.9) + +*qt-core-4.7.4 (08 Sep 2011) + + 08 Sep 2011; Alex Alexander <wired@gentoo.org> +qt-core-4.7.4.ebuild: + version bump, 4.7.4 + +*qt-core-4.7.3-r1 (08 Sep 2011) +*qt-core-4.7.2-r2 (08 Sep 2011) + + 08 Sep 2011; Alex Alexander <wired@gentoo.org> +qt-core-4.7.2-r2.ebuild, + +qt-core-4.7.3-r1.ebuild, +files/blacklist-diginotar-certs.diff: + security fix: upstream patch that blacklists all DigiNotar intermediates and + root certificates. bug #382171 + + 17 Aug 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + qt-core-4.6.3-r1.ebuild: + keyword ~sparc-solaris + + 13 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> qt-core-4.7.2-r1.ebuild: + ppc64 stable wrt #354033 + + 05 Jun 2011; Markus Meier <maekke@gentoo.org> qt-core-4.7.2-r1.ebuild: + arm stable, bug #354033 + + 01 Jun 2011; Brent Baude <ranger@gentoo.org> qt-core-4.7.2-r1.ebuild: + Marking qt-core-4.7.2-r1 ppc stable for bug 354033 + + 10 May 2011; Theo Chatzimichos <tampakrap@gentoo.org> qt-core-4.7.3.ebuild: + Remove patch, it is applied upstream + +*qt-core-4.7.3 (10 May 2011) + + 10 May 2011; Theo Chatzimichos <tampakrap@gentoo.org> +qt-core-4.7.3.ebuild: + Version bump Qt 4.7.3 + + 09 May 2011; Markos Chandras <hwoarang@gentoo.org> qt-core-4.7.2-r1.ebuild: + Stable on amd64 wrt bug #354033 + + 09 May 2011; Thomas Kahle <tomka@gentoo.org> qt-core-4.7.2-r1.ebuild: + x86 stable per bug 354033 + + 13 Apr 2011; Alex Alexander <wired@gentoo.org> -qt-core-4.7.0.ebuild, + -qt-core-4.7.1-r1.ebuild: + old version cleanup + + 11 Apr 2011; Kacper Kowalik <xarthisius@gentoo.org> qt-core-4.6.3-r1.ebuild: + ppc64 stable wrt #361401 + + 09 Apr 2011; Raúl Porcel <armin76@gentoo.org> qt-core-4.6.3-r1.ebuild: + alpha/ia64/sparc stable wrt #361401 + + 05 Apr 2011; Markus Meier <maekke@gentoo.org> qt-core-4.6.3-r1.ebuild: + arm stable, bug #361401 + + 04 Apr 2011; Jeroen Roovers <jer@gentoo.org> qt-core-4.6.3-r1.ebuild: + Stable for HPPA (bug #361401). + + 04 Apr 2011; Brent Baude <ranger@gentoo.org> qt-core-4.6.3-r1.ebuild: + Marking qt-core-4.6.3-r1 ppc for bug 361401 + + 02 Apr 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> + qt-core-4.6.3-r1.ebuild: + x86 stable wrt security bug #361401 + + 02 Apr 2011; Christoph Mende <angelos@gentoo.org> qt-core-4.6.3-r1.ebuild: + Stable on amd64 wrt bug #361401 + + 31 Mar 2011; Michael Weber <xmw@gentoo.org> files/blacklist_ssl.patch: + Fix line breaks, thanks to all reporters on bug 361415 and tampakrap for + permission + +*qt-core-4.7.2-r1 (31 Mar 2011) +*qt-core-4.6.3-r1 (31 Mar 2011) + + 31 Mar 2011; Tomas Touceda <chiiph@gentoo.org> +qt-core-4.6.3-r1.ebuild, + -qt-core-4.7.2.ebuild, +qt-core-4.7.2-r1.ebuild, +files/blacklist_ssl.patch: + Revbump qt-core: add SSL blacklist patch from upstream + +*qt-core-4.7.2 (01 Mar 2011) + + 01 Mar 2011; Theo Chatzimichos <tampakrap@gentoo.org> +qt-core-4.7.2.ebuild: + Version bump Qt 4.7.2 + + 23 Dec 2010; Samuli Suominen <ssuominen@gentoo.org> qt-core-4.6.3.ebuild: + ppc64 stable wrt #341703 + + 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 diff --git a/dev-qt/qtcore/files/CVE-2013-0254.patch b/dev-qt/qtcore/files/CVE-2013-0254.patch new file mode 100644 index 000000000000..48cc05f1800d --- /dev/null +++ b/dev-qt/qtcore/files/CVE-2013-0254.patch @@ -0,0 +1,66 @@ +From 20b26bdb3dd5e46b01b9a7e1ce8342074df3c89c Mon Sep 17 00:00:00 2001 +From: Thiago Macieira <thiago.macieira@intel.com> +Date: Sat, 22 Dec 2012 08:32:12 -0800 +Subject: [PATCH] Change all shmget calls to user-only memory + +Drop the read and write permissions for group and other users in the +system. + +Change-Id: I8fc753f09126651af3fb82df3049050f0b14e876 +(cherry-picked from Qt 5 commit 856f209fb63ae336bfb389a12d2a75fa886dc1c5) +Reviewed-by: Richard J. Moore <rich@kde.org> +--- + src/corelib/kernel/qsharedmemory_unix.cpp | 6 +++--- + src/corelib/kernel/qsystemsemaphore_unix.cpp | 4 ++-- + +diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp +index 20d76e3..4cf3acf 100644 +--- a/src/corelib/kernel/qsharedmemory_unix.cpp ++++ b/src/corelib/kernel/qsharedmemory_unix.cpp +@@ -238,7 +238,7 @@ bool QSharedMemoryPrivate::create(int size) + } + + // create +- if (-1 == shmget(unix_key, size, 0666 | IPC_CREAT | IPC_EXCL)) { ++ if (-1 == shmget(unix_key, size, 0600 | IPC_CREAT | IPC_EXCL)) { + QString function = QLatin1String("QSharedMemory::create"); + switch (errno) { + case EINVAL: +@@ -293,7 +293,7 @@ bool QSharedMemoryPrivate::attach(QSharedMemory::AccessMode mode) + { + #ifndef QT_POSIX_IPC + // grab the shared memory segment id +- int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0444 : 0660)); ++ int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0400 : 0600)); + if (-1 == id) { + setErrorString(QLatin1String("QSharedMemory::attach (shmget)")); + return false; +@@ -381,7 +381,7 @@ bool QSharedMemoryPrivate::detach() + size = 0; + + // Get the number of current attachments +- int id = shmget(unix_key, 0, 0444); ++ int id = shmget(unix_key, 0, 0400); + cleanHandle(); + + struct shmid_ds shmid_ds; +diff --git a/src/corelib/kernel/qsystemsemaphore_unix.cpp b/src/corelib/kernel/qsystemsemaphore_unix.cpp +index fad9acc..e77456b 100644 +--- a/src/corelib/kernel/qsystemsemaphore_unix.cpp ++++ b/src/corelib/kernel/qsystemsemaphore_unix.cpp +@@ -153,10 +153,10 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode) + } + + // Get semaphore +- semaphore = semget(unix_key, 1, 0666 | IPC_CREAT | IPC_EXCL); ++ semaphore = semget(unix_key, 1, 0600 | IPC_CREAT | IPC_EXCL); + if (-1 == semaphore) { + if (errno == EEXIST) +- semaphore = semget(unix_key, 1, 0666 | IPC_CREAT); ++ semaphore = semget(unix_key, 1, 0600 | IPC_CREAT); + if (-1 == semaphore) { + setErrorString(QLatin1String("QSystemSemaphore::handle")); + cleanHandle(); +-- +1.7.1 + diff --git a/dev-qt/qtcore/files/blacklist-mis-issued-Turktrust-certs.patch b/dev-qt/qtcore/files/blacklist-mis-issued-Turktrust-certs.patch new file mode 100644 index 000000000000..c2245ccce0a0 --- /dev/null +++ b/dev-qt/qtcore/files/blacklist-mis-issued-Turktrust-certs.patch @@ -0,0 +1,107 @@ +From 451462b1e0304e0cb6c2872e4f5688bc2e556dca Mon Sep 17 00:00:00 2001 +From: Peter Hartmann <phartmann@rim.com> +Date: Fri, 4 Jan 2013 11:06:14 +0100 +Subject: [PATCH 80/90] SSL certificates: blacklist mis-issued Turktrust + certificates + +Those certificates have erroneously set the CA attribute to true, +meaning everybody in possesion of their keys can issue certificates on +their own. + +backport of bf5e7fb2652669599a508e049b46ebd5cd3206e5 from qtbase + +Task-number: QTBUG-28937 +Change-Id: Iee57c6f983fee61c13c3b66ed874300ef8e80c23 +Reviewed-by: Richard J. Moore <rich@kde.org> +--- + src/network/ssl/qsslcertificate.cpp | 3 +++ + ...ted-turktrust-e-islem.kktcmerkezbankasi.org.pem | 24 +++++++++++++++++ + .../blacklisted-turktrust-ego.gov.tr.pem | 31 ++++++++++++++++++++++ + 3 files changed, 58 insertions(+) + create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem + create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem + +diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp +index 038187f..37799d1 100644 +--- a/src/network/ssl/qsslcertificate.cpp ++++ b/src/network/ssl/qsslcertificate.cpp +@@ -825,6 +825,9 @@ static const char *certificate_blacklist[] = { + + "120001705", "Digisign Server ID (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Verizon CyberTrust + "1276011370", "Digisign Server ID - (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Entrust ++ ++ "2087", "*.EGO.GOV.TR", // Turktrust mis-issued intermediate certificate ++ "2148", "e-islem.kktcmerkezbankasi.org", // Turktrust mis-issued intermediate certificate + 0 + }; + +diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem +new file mode 100644 +index 0000000..33f2ef4 +--- /dev/null ++++ b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem +@@ -0,0 +1,24 @@ ++-----BEGIN CERTIFICATE----- ++MIID8DCCAtigAwIBAgICCGQwDQYJKoZIhvcNAQEFBQAwgawxPTA7BgNVBAMMNFTD ++nFJLVFJVU1QgRWxla3Ryb25payBTdW51Y3UgU2VydGlmaWthc8SxIEhpem1ldGxl ++cmkxCzAJBgNVBAYTAlRSMV4wXAYDVQQKDFVUw5xSS1RSVVNUIEJpbGdpIMSwbGV0 ++acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAo ++YykgS2FzxLFtICAyMDA1MB4XDTExMDgwODA3MDc1MVoXDTIxMDgwNTA3MDc1MVow ++gaMxCzAJBgNVBAYTAlRSMRAwDgYDVQQIEwdMZWZrb3NhMRAwDgYDVQQHEwdMZWZr ++b3NhMRwwGgYDVQQKExNLS1RDIE1lcmtleiBCYW5rYXNpMSYwJAYDVQQDEx1lLWlz ++bGVtLmtrdGNtZXJrZXpiYW5rYXNpLm9yZzEqMCgGCSqGSIb3DQEJARYbaWxldGlA ++a2t0Y21lcmtlemJhbmthc2kub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB ++CgKCAQEAw1hUpuRFY67NsZ6C9rzRAPCb9RVpi4nZzJIA1TvIfr4hMPM0X5jseMf5 ++GvgJQ+cBMZtooDd7BbZNy2z7O5A+8PYFaMDdokCENx2ePIqAVuO6C5UAqM7J3n6R ++rhjOvqiw6dTQMbtXhjFao+YMuBVvRuuhGHBDK3Je64T/KLzcmAUlRJEuy+ZMe7Aa ++tUaSDr/jy5DMA5xEYOdsnS5Zo30lRG+9vqbxb8CQi+E97sNjY+W4lEgJKQWMNh5r ++Cxo4Hinkm3CKyKX3PAS+DDVI3LQiCiIQUOMA2+1P5aTPTkpqlbjqhbWTWAPWOKCF ++9d83p3RMXOYt5GahS8rg5u6+toEC1QIDAQABoyMwITAOBgNVHQ8BAf8EBAMCAQYw ++DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAwjWz5tsUvYORVW8K ++JSK/biHFrAnFotMtoTKEewRmnYaYjwXIr1IPaBqhjkGGviLN2eOH/v97Uli6HC4l ++zhKHfMQUS9KF/f5nGcH8iQBy/gmFsfJQ1KDC6GNM4CfMGIzyxjYhP0VzdUtKX3PA ++l5EqgMUcdqRDy6Ruz55+JkdvCL1nAC7xH+czJcZVwysTdGfLTCh6VtYPgIkeL6U8 ++3xQAyMuOHm72exJljYFqIsiNvGE0KufCqCuH1PD97IXMrLlwGmKKg5jP349lySBp ++Jjm6RDqCTT+6dUl2jkVbeNmco99Y7AOdtLsOdXBMCo5x8lK8zwQWFrzEms0joHXC ++pWfGWA== ++-----END CERTIFICATE----- +diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem +new file mode 100644 +index 0000000..e9d048f +--- /dev/null ++++ b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem +@@ -0,0 +1,31 @@ ++-----BEGIN CERTIFICATE----- ++MIIFPTCCBCWgAwIBAgICCCcwDQYJKoZIhvcNAQEFBQAwgawxPTA7BgNVBAMMNFTD ++nFJLVFJVU1QgRWxla3Ryb25payBTdW51Y3UgU2VydGlmaWthc8SxIEhpem1ldGxl ++cmkxCzAJBgNVBAYTAlRSMV4wXAYDVQQKDFVUw5xSS1RSVVNUIEJpbGdpIMSwbGV0 ++acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAo ++YykgS2FzxLFtICAyMDA1MB4XDTExMDgwODA3MDc1MVoXDTIxMDcwNjA3MDc1MVow ++bjELMAkGA1UEBhMCVFIxDzANBgNVBAgMBkFOS0FSQTEPMA0GA1UEBwwGQU5LQVJB ++MQwwCgYDVQQKDANFR08xGDAWBgNVBAsMD0VHTyBCSUxHSSBJU0xFTTEVMBMGA1UE ++AwwMKi5FR08uR09WLlRSMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA ++v5zoj2Bpdl7R1M/zF6Qf4su2F8vDqISKvuTuyJhNAHhFGHCsHjaixGMHspuz0l3V ++50kq/ECWbN8kKaeTrB112QOrWTU276iup1Gh+OlEOiR9vlQ4VAP00dWUjD6z9HQF ++Ci8W3EsEtiiHiYOU9BcPpPkaUbECwP4nGVwR8aPwhB5PGBJc98romdvciYkUpSOO ++wkuSRtooA7tRlLFu72QaNpXN1NueB36I3aajPk0YyiXy2w8XlgK7QI4PSSBnSq+Q ++blFocWVmLhF94je7py6lCnllrIFXpR3FWZLD5GcI6HKlBS78AQ+IMBLFHhsEVw5N ++Qj90chSZClfBWBZzIaV9RwIDAQABo4IBpDCCAaAwHwYDVR0jBBgwFoAUq042AzDS ++29UKaL6HpVBs/PZwpSUwHQYDVR0OBBYEFGT7G4Y9uEryRIL5Vj3qJsD047M0MA4G ++A1UdDwEB/wQEAwIBBjBFBgNVHSAEPjA8MDoGCWCGGAMAAwEBATAtMCsGCCsGAQUF ++BwIBFh9odHRwOi8vd3d3LnR1cmt0cnVzdC5jb20udHIvc3VlMA8GA1UdEwEB/wQF ++MAMBAf8wSQYDVR0fBEIwQDA+oDygOoY4aHR0cDovL3d3dy50dXJrdHJ1c3QuY29t ++LnRyL3NpbC9UVVJLVFJVU1RfU1NMX1NJTF9zMi5jcmwwgaoGCCsGAQUFBwEBBIGd ++MIGaMG4GCCsGAQUFBzAChmJodHRwOi8vd3d3LnR1cmt0cnVzdC5jb20udHIvc2Vy ++dGlmaWthbGFyL1RVUktUUlVTVF9FbGVrdHJvbmlrX1N1bnVjdV9TZXJ0aWZpa2Fz ++aV9IaXptZXRsZXJpX3MyLmNydDAoBggrBgEFBQcwAYYcaHR0cDovL29jc3AudHVy ++a3RydXN0LmNvbS50cjANBgkqhkiG9w0BAQUFAAOCAQEAj89QCCyoW0S20EcYDZAn ++vFLFmougK97Bt68iV1OM622+Cyeyf4Sz+1LBk1f9ni3fGT0Q+RWZJYWq5YuSBiLV ++gk3NLcxnwe3wmnvErUgq1QDtAaNlBWMEMklOlWGfJ0eWaillUskJbDd4KwgZHDEj ++7g/jYEQqU1t0zoJdwM/zNsnLHkhwcWZ5PQnnbpff1Ct/1LH/8pdy2eRDmRmqniLU ++h8r2lZfJeudVZG6yIbxsqP3t2JCq5c2P1jDhAGF3g9DiskH0CzsRdbVpoWdr+PY1 ++Xz/19G8XEpX9r+IBJhLdbkpVo0Qh0A10mzFP/GUk5f/8nho2HvLaVMhWv1qKcF8I ++hQ== ++-----END CERTIFICATE----- +-- +1.8.1 + diff --git a/dev-qt/qtcore/files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch b/dev-qt/qtcore/files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch new file mode 100644 index 000000000000..d59ac490785a --- /dev/null +++ b/dev-qt/qtcore/files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch @@ -0,0 +1,35 @@ +From 03e96961b0f4fc2c290271c6e50a11aa334a40ff Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?David=20E=2E=20Narv=C3=A1ez?= <david.narvaez@computer.org> +Date: Sun, 3 Feb 2013 23:07:07 -0500 +Subject: [PATCH] Fix call to QMetaObject::metaCall from updateProperty + +Create an array of arguments in the same way +QMetaObject::write does + +Task-number: QTBUG-29082 +Change-Id: I4ea5ab5dcd6b55cf0a127b855b5aac27a9d4a305 +--- + src/corelib/animation/qpropertyanimation.cpp | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp +index dcf779a..9869d7e 100644 +--- a/src/corelib/animation/qpropertyanimation.cpp ++++ b/src/corelib/animation/qpropertyanimation.cpp +@@ -136,8 +136,11 @@ void QPropertyAnimationPrivate::updateProperty(const QVariant &newValue) + + if (newValue.userType() == propertyType) { + //no conversion is needed, we directly call the QMetaObject::metacall +- void *data = const_cast<void*>(newValue.constData()); +- QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, &data); ++ //check QMetaProperty::write for an explanation of these ++ int status = -1; ++ int flags = 0; ++ void *argv[] = { const_cast<void *>(newValue.constData()), const_cast<QVariant *>(&newValue), &status, &flags }; ++ QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, argv); + } else { + targetValue->setProperty(propertyName.constData(), newValue); + } +-- +1.8.1.2 + diff --git a/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch b/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch new file mode 100644 index 000000000000..fa82334d7d4b --- /dev/null +++ b/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch @@ -0,0 +1,15 @@ +diff -up qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148 qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp +--- qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148 2012-11-23 04:09:53.000000000 -0600 ++++ qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp 2013-02-11 07:07:18.942748176 -0600 +@@ -187,6 +187,11 @@ int runMoc(int _argc, char **_argv) + Moc moc; + pp.macros["Q_MOC_RUN"]; + pp.macros["__cplusplus"]; ++ ++ // Workaround a bugs while parsing some boost headers. See QTBUG-22829 ++ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; ++ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"]; ++ + QByteArray filename; + QByteArray output; + FILE *in = 0; diff --git a/dev-qt/qtcore/files/moc-workaround-for-boost-1.48.patch b/dev-qt/qtcore/files/moc-workaround-for-boost-1.48.patch new file mode 100644 index 000000000000..8d92ca9c283c --- /dev/null +++ b/dev-qt/qtcore/files/moc-workaround-for-boost-1.48.patch @@ -0,0 +1,11 @@ +diff -urN qt-everywhere-opensource-src-4.8.1.orig/src/tools/moc/main.cpp qt-everywhere-opensource-src-4.8.1/src/tools/moc/main.cpp +--- qt-everywhere-opensource-src-4.8.1.orig/src/tools/moc/main.cpp 2012-05-04 18:45:34.122912347 +0200 ++++ qt-everywhere-opensource-src-4.8.1/src/tools/moc/main.cpp 2012-05-04 18:51:28.267484929 +0200 +@@ -187,6 +187,7 @@ + Moc moc; + pp.macros["Q_MOC_RUN"]; + pp.macros["__cplusplus"]; ++ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; // Gentoo bug #401551 + QByteArray filename; + QByteArray output; + FILE *in = 0; diff --git a/dev-qt/qtcore/files/set-pkg-config-locations-directly-to-install-dir.patch b/dev-qt/qtcore/files/set-pkg-config-locations-directly-to-install-dir.patch new file mode 100644 index 000000000000..46b9c28cfde4 --- /dev/null +++ b/dev-qt/qtcore/files/set-pkg-config-locations-directly-to-install-dir.patch @@ -0,0 +1,60 @@ +From 87fa0250081cffb6e413fec7957f5ac4add6cdd1 Mon Sep 17 00:00:00 2001 +From: Oswald Buddenhagen <oswald.buddenhagen@digia.com> +Date: Tue, 8 Jan 2013 16:34:26 +0100 +Subject: [PATCH] set pkg-config *_location directly to install dir + +qmake tries to replace all occurrences of the install prefix with a +literal ${prefix}. of course this would mess up build paths which happen +to live under the prefix (this is untypical, but still), which would +break the sed magic in the subsequent install step. as qmake itself has +no use for the .pc files, it's ok to target them directly for the +install dir. we do the same with the include and lib dirs already. + +qt5 is already doing the right thing. + +Task-number: QTBUG-28807 +Change-Id: I82c17284d1dbac4a96845db2ddec9680e251e7a5 +Reviewed-by: Davide Pesavento <davidepesa@gmail.com> +Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> + +diff --git a/src/qbase.pri b/src/qbase.pri +index 991c888..feec9d6 100644 +--- a/src/qbase.pri ++++ b/src/qbase.pri +@@ -166,23 +166,25 @@ DEFINES *= QT_USE_QSTRINGBUILDER + + TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end + +-qtPrepareTool(QMAKE_LUPDATE, lupdate) +-qtPrepareTool(QMAKE_LRELEASE, lrelease) +- ++QMAKE_MOC_PC = $$[QT_INSTALL_BINS]/moc + moc_dir.name = moc_location +-moc_dir.variable = QMAKE_MOC ++moc_dir.variable = QMAKE_MOC_PC + ++QMAKE_UIC_PC = $$[QT_INSTALL_BINS]/uic + uic_dir.name = uic_location +-uic_dir.variable = QMAKE_UIC ++uic_dir.variable = QMAKE_UIC_PC + ++QMAKE_RCC_PC = $$[QT_INSTALL_BINS]/rcc + rcc_dir.name = rcc_location +-rcc_dir.variable = QMAKE_RCC ++rcc_dir.variable = QMAKE_RCC_PC + ++QMAKE_LUPDATE_PC = $$[QT_INSTALL_BINS]/lupdate + lupdate_dir.name = lupdate_location +-lupdate_dir.variable = QMAKE_LUPDATE ++lupdate_dir.variable = QMAKE_LUPDATE_PC + ++QMAKE_LRELEASE_PC = $$[QT_INSTALL_BINS]/lrelease + lrelease_dir.name = lrelease_location +-lrelease_dir.variable = QMAKE_LRELEASE ++lrelease_dir.variable = QMAKE_LRELEASE_PC + + QMAKE_PKGCONFIG_VARIABLES += moc_dir uic_dir rcc_dir lupdate_dir lrelease_dir + +-- +1.8.1.1 + diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml new file mode 100644 index 000000000000..5e30afebf876 --- /dev/null +++ b/dev-qt/qtcore/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>qt</herd> + <use> + <flag name="c++0x">Build Qt using the C++11 standard</flag> + <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="qt3support">Enable the Qt3Support libraries for Qt4. Note that + this does not mean you can compile pure Qt3 programs with Qt4.</flag> + </use> + <upstream> + <bugs-to>https://bugreports.qt-project.org/</bugs-to> + <doc>http://qt-project.org/doc/</doc> + </upstream> +</pkgmetadata> diff --git a/dev-qt/qtcore/qtcore-4.8.4-r2.ebuild b/dev-qt/qtcore/qtcore-4.8.4-r2.ebuild new file mode 100644 index 000000000000..d96f51da1a60 --- /dev/null +++ b/dev-qt/qtcore/qtcore-4.8.4-r2.ebuild @@ -0,0 +1,182 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.4-r2.ebuild,v 1.1 2013/03/02 15:26:01 yngwin Exp $ + +EAPI=5 + +inherit qt4-build + +DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" +SLOT="4" +if [[ ${QT4_BUILD_TYPE} == live ]]; then + KEYWORDS="" +else + KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +fi +IUSE="+glib iconv icu qt3support ssl" + +DEPEND=" + sys-libs/zlib + glib? ( dev-libs/glib:2 ) + icu? ( >=dev-libs/icu-49:= ) + ssl? ( dev-libs/openssl ) + !<x11-libs/cairo-1.10.2-r2 + !x11-libs/qt:4 +" +RDEPEND="${DEPEND}" +PDEPEND=" + qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] ) +" + +PATCHES=( + "${FILESDIR}/moc-workaround-for-boost-1.48.patch" + "${FILESDIR}/set-pkg-config-locations-directly-to-install-dir.patch" + "${FILESDIR}/CVE-2013-0254.patch" +) + +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="${QT4_TARGET_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 +} + +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" + + # bug 427782 + sed -i -e "/^CPPFLAGS/s/-g//" \ + "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed" + sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \ + -e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \ + "${S}/configure" || die "sed configure setBootstrapVariable failed" +} + +src_configure() { + myconf+=" + -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon + -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative + -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg + -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg + -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes + -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb + $(qt_use glib) + $(qt_use iconv) + $(qt_use icu) + $(use ssl && echo -openssl-linked || echo -no-openssl) + $(qt_use qt3support)" + + qt4-build_src_configure +} + +src_install() { + dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} + + install_directories src/{corelib,xml,network,plugins/codecs} + + emake INSTALL_ROOT="${D}" install_mkspecs + + # install private headers + insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private + find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} + + + # 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 failed" + insinto "${QTTRANSDIR#${EPREFIX}}" + doins translations/*.qm + + 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 + 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 + 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 + + QCONFIG_DEFINE="QT_ZLIB" + install_qconfigs + + # remove .la files + prune_libtool_files + + keepdir "${QTSYSCONFDIR#${EPREFIX}}" + + # Framework magic + fix_includes +} diff --git a/dev-qt/qtcore/qtcore-4.8.4-r4.ebuild b/dev-qt/qtcore/qtcore-4.8.4-r4.ebuild new file mode 100644 index 000000000000..6e4f93d3c9c5 --- /dev/null +++ b/dev-qt/qtcore/qtcore-4.8.4-r4.ebuild @@ -0,0 +1,184 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.4-r4.ebuild,v 1.1 2013/03/02 15:26:01 yngwin Exp $ + +EAPI=5 + +inherit qt4-build + +DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" +SLOT="4" +if [[ ${QT4_BUILD_TYPE} == live ]]; then + KEYWORDS="" +else + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +fi +IUSE="+glib iconv icu qt3support ssl" + +DEPEND=" + sys-libs/zlib + glib? ( dev-libs/glib:2 ) + icu? ( >=dev-libs/icu-49:= ) + ssl? ( dev-libs/openssl ) + !<x11-libs/cairo-1.10.2-r2 + !x11-libs/qt:4 +" +RDEPEND="${DEPEND}" +PDEPEND=" + qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] ) +" + +PATCHES=( + "${FILESDIR}/moc-workaround-for-BOOST_JOIN.patch" + "${FILESDIR}/set-pkg-config-locations-directly-to-install-dir.patch" + "${FILESDIR}/blacklist-mis-issued-Turktrust-certs.patch" + "${FILESDIR}/CVE-2013-0254.patch" + "${FILESDIR}/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch" +) + +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="${QT4_TARGET_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 +} + +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" + + # bug 427782 + sed -i -e "/^CPPFLAGS/s/-g//" \ + "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed" + sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \ + -e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \ + "${S}/configure" || die "sed configure setBootstrapVariable failed" +} + +src_configure() { + myconf+=" + -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon + -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative + -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg + -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg + -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes + -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb + $(qt_use glib) + $(qt_use iconv) + $(qt_use icu) + $(use ssl && echo -openssl-linked || echo -no-openssl) + $(qt_use qt3support)" + + qt4-build_src_configure +} + +src_install() { + dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} + + install_directories src/{corelib,xml,network,plugins/codecs} + + emake INSTALL_ROOT="${D}" install_mkspecs + + # install private headers + insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private + find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} + + + # 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 failed" + insinto "${QTTRANSDIR#${EPREFIX}}" + doins translations/*.qm + + 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 + 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 + 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 + + QCONFIG_DEFINE="QT_ZLIB" + install_qconfigs + + # remove .la files + prune_libtool_files + + keepdir "${QTSYSCONFDIR#${EPREFIX}}" + + # Framework magic + fix_includes +} diff --git a/dev-qt/qtcore/qtcore-4.8.4.ebuild b/dev-qt/qtcore/qtcore-4.8.4.ebuild new file mode 100644 index 000000000000..d739e1a1b2d2 --- /dev/null +++ b/dev-qt/qtcore/qtcore-4.8.4.ebuild @@ -0,0 +1,180 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.4.ebuild,v 1.1 2013/03/02 15:26:01 yngwin Exp $ + +EAPI=4 + +inherit qt4-build + +DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" +SLOT="4" +if [[ ${QT4_BUILD_TYPE} == live ]]; then + KEYWORDS="" +else + KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +fi +IUSE="+glib iconv icu qt3support ssl" + +DEPEND=" + sys-libs/zlib + glib? ( dev-libs/glib:2 ) + icu? ( >=dev-libs/icu-49 ) + ssl? ( dev-libs/openssl ) + !<x11-libs/cairo-1.10.2-r2 + !x11-libs/qt:4 +" +RDEPEND="${DEPEND}" +PDEPEND=" + qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] ) +" + +PATCHES=( + "${FILESDIR}/moc-workaround-for-boost-1.48.patch" +) + +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="${QT4_TARGET_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 +} + +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" + + # bug 427782 + sed -i -e "/^CPPFLAGS/s/-g//" \ + "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed" + sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \ + -e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \ + "${S}/configure" || die "sed configure setBootstrapVariable failed" +} + +src_configure() { + myconf+=" + -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon + -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative + -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg + -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg + -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes + -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb + $(qt_use glib) + $(qt_use iconv) + $(qt_use icu) + $(use ssl && echo -openssl-linked || echo -no-openssl) + $(qt_use qt3support)" + + qt4-build_src_configure +} + +src_install() { + dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} + + install_directories src/{corelib,xml,network,plugins/codecs} + + emake INSTALL_ROOT="${D}" install_mkspecs + + # install private headers + insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private + find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} + + + # 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 failed" + insinto "${QTTRANSDIR#${EPREFIX}}" + doins translations/*.qm + + 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 + 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 + 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 + + QCONFIG_DEFINE="QT_ZLIB" + install_qconfigs + + # remove .la files + prune_libtool_files + + keepdir "${QTSYSCONFDIR#${EPREFIX}}" + + # Framework magic + fix_includes +} |