From a878919cae22fc49963d474e52ec168fbd9cd589 Mon Sep 17 00:00:00 2001 From: Martin von Gagern Date: Fri, 8 Apr 2011 08:10:56 +0200 Subject: move x11-libs/qt x11-libs/qt-meta This commit honours the package move from r1.2 of 2Q-2011: http://sources.gentoo.org/profiles/updates/2Q-2011?revision=1.2&view=markup It renames the qt:3 ebuild to qt-meta and adjusts all deps. Of course, our qt-meta:3 is not really a meta ebuild, but who cares? --- x11-libs/qscintilla/Manifest | 8 +- x11-libs/qscintilla/qscintilla-1.5.1.ebuild | 2 +- x11-libs/qscintilla/qscintilla-1.7.1.ebuild | 2 +- x11-libs/qscintilla/qscintilla-2.3.2.ebuild | 2 +- x11-libs/qscintilla/qscintilla-2.4.ebuild | 2 +- x11-libs/qt-meta/ChangeLog | 1376 ++++++++++++++++++++ x11-libs/qt-meta/Manifest | 21 + x11-libs/qt-meta/files/0001-dnd_optimization.patch | 187 +++ .../qt-meta/files/0002-dnd_active_window_fix.patch | 189 +++ .../0038-dragobject-dont-prefer-unknown.patch | 57 + .../files/0044-qscrollview-windowactivate-fix.diff | 38 + x11-libs/qt-meta/files/0047-fix-kmenu-widget.diff | 25 + .../qt-meta/files/0048-qclipboard_hack_80072.patch | 48 + .../files/qt-3.3.8-fix-compiler-detection.patch | 22 + .../qt-meta/files/qt-3.3.8-immqt+gcc-4.3.patch | 20 + x11-libs/qt-meta/files/qt-3.3.8-libpng14.patch | 42 + x11-libs/qt-meta/files/qt-3.3.8-mips.patch | 39 + .../qt-meta/files/qt-3.3.8-seli-xinerama.patch | 49 + x11-libs/qt-meta/files/qt-3.3.8-uic-fix.patch | 18 + x11-libs/qt-meta/files/qt-3.3.8-visibility.patch | 159 +++ x11-libs/qt-meta/files/qt-3.3.8b-cjk-fix.patch | 32 + x11-libs/qt-meta/files/qt-ulibc.patch | 13 + x11-libs/qt-meta/metadata.xml | 11 + x11-libs/qt-meta/qt-meta-3.3.8b-r1.ebuild | 372 ++++++ x11-libs/qt-meta/qt-meta-3.3.8b-r2.ebuild | 374 ++++++ x11-libs/qt/ChangeLog | 1376 -------------------- x11-libs/qt/Manifest | 21 - x11-libs/qt/files/0001-dnd_optimization.patch | 187 --- x11-libs/qt/files/0002-dnd_active_window_fix.patch | 189 --- .../0038-dragobject-dont-prefer-unknown.patch | 57 - .../files/0044-qscrollview-windowactivate-fix.diff | 38 - x11-libs/qt/files/0047-fix-kmenu-widget.diff | 25 - x11-libs/qt/files/0048-qclipboard_hack_80072.patch | 48 - .../qt/files/qt-3.3.8-fix-compiler-detection.patch | 22 - x11-libs/qt/files/qt-3.3.8-immqt+gcc-4.3.patch | 20 - x11-libs/qt/files/qt-3.3.8-libpng14.patch | 42 - x11-libs/qt/files/qt-3.3.8-mips.patch | 39 - x11-libs/qt/files/qt-3.3.8-seli-xinerama.patch | 49 - x11-libs/qt/files/qt-3.3.8-uic-fix.patch | 18 - x11-libs/qt/files/qt-3.3.8-visibility.patch | 159 --- x11-libs/qt/files/qt-3.3.8b-cjk-fix.patch | 32 - x11-libs/qt/files/qt-ulibc.patch | 13 - x11-libs/qt/metadata.xml | 11 - x11-libs/qt/qt-3.3.8b-r1.ebuild | 372 ------ x11-libs/qt/qt-3.3.8b-r2.ebuild | 374 ------ 45 files changed, 3100 insertions(+), 3100 deletions(-) create mode 100644 x11-libs/qt-meta/ChangeLog create mode 100644 x11-libs/qt-meta/Manifest create mode 100644 x11-libs/qt-meta/files/0001-dnd_optimization.patch create mode 100644 x11-libs/qt-meta/files/0002-dnd_active_window_fix.patch create mode 100644 x11-libs/qt-meta/files/0038-dragobject-dont-prefer-unknown.patch create mode 100644 x11-libs/qt-meta/files/0044-qscrollview-windowactivate-fix.diff create mode 100644 x11-libs/qt-meta/files/0047-fix-kmenu-widget.diff create mode 100644 x11-libs/qt-meta/files/0048-qclipboard_hack_80072.patch create mode 100644 x11-libs/qt-meta/files/qt-3.3.8-fix-compiler-detection.patch create mode 100644 x11-libs/qt-meta/files/qt-3.3.8-immqt+gcc-4.3.patch create mode 100644 x11-libs/qt-meta/files/qt-3.3.8-libpng14.patch create mode 100644 x11-libs/qt-meta/files/qt-3.3.8-mips.patch create mode 100644 x11-libs/qt-meta/files/qt-3.3.8-seli-xinerama.patch create mode 100644 x11-libs/qt-meta/files/qt-3.3.8-uic-fix.patch create mode 100644 x11-libs/qt-meta/files/qt-3.3.8-visibility.patch create mode 100644 x11-libs/qt-meta/files/qt-3.3.8b-cjk-fix.patch create mode 100644 x11-libs/qt-meta/files/qt-ulibc.patch create mode 100644 x11-libs/qt-meta/metadata.xml create mode 100644 x11-libs/qt-meta/qt-meta-3.3.8b-r1.ebuild create mode 100644 x11-libs/qt-meta/qt-meta-3.3.8b-r2.ebuild delete mode 100644 x11-libs/qt/ChangeLog delete mode 100644 x11-libs/qt/Manifest delete mode 100644 x11-libs/qt/files/0001-dnd_optimization.patch delete mode 100644 x11-libs/qt/files/0002-dnd_active_window_fix.patch delete mode 100644 x11-libs/qt/files/0038-dragobject-dont-prefer-unknown.patch delete mode 100644 x11-libs/qt/files/0044-qscrollview-windowactivate-fix.diff delete mode 100644 x11-libs/qt/files/0047-fix-kmenu-widget.diff delete mode 100644 x11-libs/qt/files/0048-qclipboard_hack_80072.patch delete mode 100644 x11-libs/qt/files/qt-3.3.8-fix-compiler-detection.patch delete mode 100644 x11-libs/qt/files/qt-3.3.8-immqt+gcc-4.3.patch delete mode 100644 x11-libs/qt/files/qt-3.3.8-libpng14.patch delete mode 100644 x11-libs/qt/files/qt-3.3.8-mips.patch delete mode 100644 x11-libs/qt/files/qt-3.3.8-seli-xinerama.patch delete mode 100644 x11-libs/qt/files/qt-3.3.8-uic-fix.patch delete mode 100644 x11-libs/qt/files/qt-3.3.8-visibility.patch delete mode 100644 x11-libs/qt/files/qt-3.3.8b-cjk-fix.patch delete mode 100644 x11-libs/qt/files/qt-ulibc.patch delete mode 100644 x11-libs/qt/metadata.xml delete mode 100644 x11-libs/qt/qt-3.3.8b-r1.ebuild delete mode 100644 x11-libs/qt/qt-3.3.8b-r2.ebuild (limited to 'x11-libs') diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest index 656b7bc5..9e8e4e75 100644 --- a/x11-libs/qscintilla/Manifest +++ b/x11-libs/qscintilla/Manifest @@ -7,9 +7,9 @@ DIST QScintilla-1.71-gpl-1.7.1.tar.gz 1060119 RMD160 ba85db98e552b388510df5d1f7e DIST QScintilla-gpl-2.3.2.tar.gz 2146902 RMD160 de7828d4b965156771034eb622ee9614b2aea9be SHA1 d34ae9907e6221d221c5b5c1324e9b263553d2cb SHA256 01318dd7745cf8d756683a60acf0f17f6c5c63edec0818f90c1c432d1bc27749 DIST QScintilla-gpl-2.4.tar.gz 2304554 RMD160 19e5d5c331705c217c5192b1fcac5d298942db69 SHA1 17962bb64d2641f9e181b39fdca39228170488a3 SHA256 0497fef84763c6d8cbce570401f7ca38e439a76ee358e3050f8dada85adfb213 DIST qscintilla-1.62-gpl-1.5.1.tar.gz 727606 RMD160 fe7fa31ec1ecbc7f4bbf887817830630dfbd5d88 SHA1 240bafd43f3f1f7c73f76daf98b23da3f071bc43 SHA256 5dfc860a8d91c15775ae03f40a57f0c26f51f90b8266236e457cb8cbb3f6e30e -EBUILD qscintilla-1.5.1.ebuild 2091 RMD160 f48f849c1043e9470dc43a2cb498aab30946878a SHA1 8304a674335395d99a363b02171d231cc2385e5d SHA256 8f56f9326603792e052b3b3e7bf0d443d3a53d890e54dc955e42a52eebfddc21 -EBUILD qscintilla-1.7.1.ebuild 2336 RMD160 7692789a3d2e75b075ead47a9324e20f1407ed53 SHA1 10d383e861705bd63db202627c6fe69b97a9dee1 SHA256 34b0be744098acdcdcaa85007090c202372df4bfae4bf98c3465872120fcb98b -EBUILD qscintilla-2.3.2.ebuild 3841 RMD160 40900b295237906ce7953dee2abcab85daf52180 SHA1 17549339d0f8242c1c015e0d06b8a66ca8d2be56 SHA256 ca91e11c73ad4fc1814d5d5cc526de4f7b6e1ec2562501214064f6a882ed09c5 -EBUILD qscintilla-2.4.ebuild 2449 RMD160 2251f0de7a656825cbb4e2c73317b522059925e1 SHA1 16c96621c8ff591d921549f8d3f7cccbe600d9b7 SHA256 32d2b34cfeac4043e2c4dac3da12bf7b9bab07ce4c455fab7ca56d17e791834a +EBUILD qscintilla-1.5.1.ebuild 2096 RMD160 968f9c8a9e4b210c2b762391d54fe7d11e6d62e4 SHA1 fc661c4804c6b0ff1c12616202ab0d94feb3bc54 SHA256 d204fbdfdcb9ef0d93bcdd58c50cddd76214782f5423960e57d1e6d2856f6210 +EBUILD qscintilla-1.7.1.ebuild 2341 RMD160 8fe61a29e75bf0c3fbcca592f7c34b6384a1d28e SHA1 853c95148b731bb6decdc53a26b7b99ac3bcd024 SHA256 af99b1ff05f0094064a84a9deafe2c186d13a8149f278a085a03546e3d7e7dfc +EBUILD qscintilla-2.3.2.ebuild 3846 RMD160 c01c929b71a4eefb5aad510b9b8d91db83e6d267 SHA1 c62103f283e79f1ccd221a9133c800e381d93d92 SHA256 a829b8c8a4cb097ab26060bd729f20d92ffc105adb5501171c67d63fbea540f0 +EBUILD qscintilla-2.4.ebuild 2454 RMD160 3bc3e463e8618a2217091a35a9858fb0de4feb82 SHA1 42b4d8c797377942de0d95dab344c5d2614b62d4 SHA256 51998f98f2ac813a66b8e34d87f460740e63e1ebdd62076667784d08861d885d MISC ChangeLog 15433 RMD160 a667d01548295249ef80e909fd58b9c923fb64d2 SHA1 91e1826e2160b54d31d15dbb700b8b34d09b1fce SHA256 46013869299746b02444cbd63c6a599c88ce7de8e6ddded86c38b19571ea51fc MISC metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 SHA1 ec86e15b85c2bc4429ad67bb52238b44f2b16cbd SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d diff --git a/x11-libs/qscintilla/qscintilla-1.5.1.ebuild b/x11-libs/qscintilla/qscintilla-1.5.1.ebuild index 2e2b1409..ad20cf07 100644 --- a/x11-libs/qscintilla/qscintilla-1.5.1.ebuild +++ b/x11-libs/qscintilla/qscintilla-1.5.1.ebuild @@ -20,7 +20,7 @@ LICENSE="GPL-2" KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86" IUSE="doc" -RDEPEND="=x11-libs/qt-3*" +RDEPEND="=x11-libs/qt-meta-3*" DEPEND="${RDEPEND} sys-apps/sed" diff --git a/x11-libs/qscintilla/qscintilla-1.7.1.ebuild b/x11-libs/qscintilla/qscintilla-1.7.1.ebuild index f18673bd..533d0537 100644 --- a/x11-libs/qscintilla/qscintilla-1.7.1.ebuild +++ b/x11-libs/qscintilla/qscintilla-1.7.1.ebuild @@ -19,7 +19,7 @@ LICENSE="GPL-2" KEYWORDS="alpha ~amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE="doc" -DEPEND="x11-libs/qt:3" +DEPEND="x11-libs/qt-meta:3" RDEPEND="${DEPEND}" S=${WORKDIR}/${MY_P} diff --git a/x11-libs/qscintilla/qscintilla-2.3.2.ebuild b/x11-libs/qscintilla/qscintilla-2.3.2.ebuild index 01129480..91e396c6 100644 --- a/x11-libs/qscintilla/qscintilla-2.3.2.ebuild +++ b/x11-libs/qscintilla/qscintilla-2.3.2.ebuild @@ -18,7 +18,7 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE="qt4 +python doc examples debug" RDEPEND="qt4? ( x11-libs/qt-gui:4 ) - !qt4? ( x11-libs/qt:3 )" + !qt4? ( x11-libs/qt-meta:3 )" DEPEND="${RDEPEND}" # dev-python/PyQt needs qscintilla to build and qscintilla's python bindings # need dev-python/PyQt, bug 199543 diff --git a/x11-libs/qscintilla/qscintilla-2.4.ebuild b/x11-libs/qscintilla/qscintilla-2.4.ebuild index 00c38ebc..caccffe8 100644 --- a/x11-libs/qscintilla/qscintilla-2.4.ebuild +++ b/x11-libs/qscintilla/qscintilla-2.4.ebuild @@ -18,7 +18,7 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd" IUSE="doc python +qt4" RDEPEND="qt4? ( x11-libs/qt-gui:4 ) - !qt4? ( x11-libs/qt:3 )" + !qt4? ( x11-libs/qt-meta:3 )" DEPEND="${RDEPEND}" # dev-python/PyQt needs qscintilla to build and qscintilla's python bindings # need dev-python/PyQt, bug 199543 diff --git a/x11-libs/qt-meta/ChangeLog b/x11-libs/qt-meta/ChangeLog new file mode 100644 index 00000000..1f51c66f --- /dev/null +++ b/x11-libs/qt-meta/ChangeLog @@ -0,0 +1,1376 @@ +# ChangeLog for x11-libs/qt +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.586 2009/08/02 21:54:28 tommy Exp $ + + 28 Feb 2011; Hanno Boeck qt-3.3.8b-r1.ebuild, + qt-3.3.8b-r2.ebuild: + Change dependency from media-libs/jpeg to virtual/jpeg. + + 04 Sep 2010; Ladislav Láska qt-3.3.8b-r1.ebuild, + qt-3.3.8b-r2.ebuild: + Changed dependency from virtual/postgresql-base to dev-db/postgresql-base, + since the former no longer exists. + + 10 Dec 2009; Petr Morávek [Xificurk] + qt-3.3.8b-r1.ebuild, qt-3.3.8b-r2.ebuild: Sync from portage tree. + Remove unused USE flags from metadata. + + 14 Nov 2009; Jonathan Callen qt-3.3.8b-r1.ebuild, + qt-3.3.8b-r2.ebuild: + Remove mention of monolithic kde pkg + + 03 Nov 2009; Ben de Groot -qt-3.3.8b-r1.ebuild: + Remove -r1 ebuild. Everybody should use -r2. + + 02 Aug 2009; Thomas Sachau (Tommy[D]) + qt-3.3.8b-r1.ebuild, qt-3.3.8b-r2.ebuild: + Enable multilib support for qt-3.3.8b-r{1,2} + +*qt-4.5.2 (27 Jun 2009) + + 27 Jun 2009; Ben de Groot +qt-4.5.2.ebuild: + Qt 4.5.2 release version bump + +*qt-3.3.8b-r2 (11 Jun 2009) + + 11 Jun 2009; Ben de Groot + -files/0081-format-string-fixes.diff, + -files/qt-3.3.4-0047-fix-kmenu-widget.diff, + -files/qt-3.3.4-gcc4-volatile.patch, + -files/qt-3.3.8-unicode-off-by-one.patch, + -files/0185-fix-format-strings.diff, -files/qt4/Assistant.desktop, + -files/qt-3.3.4-0051-qtoolbar_77047.patch, -files/qt-3.3.4-gcc4.patch, + -files/qt-3.3.4-immodule-focus.patch, + -files/qt-3.3.4-qclipboard-hack.patch, + -files/qt-4.2.3-hppa-ldcw-fix.patch, -files/qt4/Designer.desktop, + -files/qt-4.3.1-unicode-off-by-one.patch, -files/qt4/Linguist.desktop, + -files/utf8-bug-qt3.diff, +qt-3.3.8b-r2.ebuild: + Adding fix for pkgconfig issue in bug 185925. Removing no longer used + patches from FILESDIR. + + 06 Jun 2009; Markus Meier qt-4.5.1.ebuild: + amd64 stable, bug #266201 + + 05 Jun 2009; Ben de Groot qt-4.5.1.ebuild: + Specify !kde for qt-phonon dep + + 03 Jun 2009; Ben de Groot qt-4.5.1.ebuild, + metadata.xml: + Add kde useflag again, for selecting media-sound/phonon, now that that + package is stable on the needed arches + + 02 Jun 2009; Christian Faulhammer qt-4.5.1.ebuild: + stable x86, bug 266201 + + 30 May 2009; Ben de Groot qt-4.5.1.ebuild: + Revert kde useflag addition, as it breaks stable + + 29 May 2009; Ben de Groot qt-4.5.1.ebuild: + Add kde useflag to make dependency calculation easier, bug 270188 + + 28 May 2009; Robert Piasek qt-4.5.1.ebuild: + stable on arm (bug #266201) + + 24 May 2009; Tobias Klausmann qt-4.5.1.ebuild: + Keyworded on alpha, bug #266201 + + 15 May 2009; Tobias Klausmann qt-4.5.1.ebuild: + x11-libs/qt-webkit-4.5.1 does not compile on alpha (bug 269739), the meta + ebuild depends on that, so dropping keyword + + 14 May 2009; Ben de Groot -qt-4.5.0.ebuild: + Remove old + + 13 May 2009; Brent Baude qt-4.5.1.ebuild: + Marking qt-4.5.1 ppc stable for bug 266201 + + 27 Apr 2009; Markos Chandras -qt-3.3.8-r4.ebuild: + Remove masked ebuild + +*qt-4.5.1 (27 Apr 2009) + + 27 Apr 2009; Markos Chandras +qt-4.5.1.ebuild: + Version bump to 4.5.1 + + 18 Mar 2009; Markos Chandras metadata.xml: + Removing obsolete use flag definitions from metadata.xml + + 18 Mar 2009; Markos Chandras -qt-4.3.3.ebuild, + -qt-4.3.4-r1.ebuild, -qt-4.3.5.ebuild: + Dropping 4.3* packages and 4.5.0_rc1 + + 18 Mar 2009; Raúl Porcel qt-4.5.0.ebuild: + Add ~arm wrt #262462, re-add ~alpha/~ia64, add -sparc + +*qt-4.5.0 (04 Mar 2009) + + 04 Mar 2009; Ben de Groot +qt-4.5.0.ebuild: + Version bump + + 20 Feb 2009; Jeroen Roovers qt-4.4.2.ebuild: + Stable for HPPA (bug #248083). + +*qt-4.5.0_rc1 (13 Feb 2009) + + 13 Feb 2009; Ben de Groot +qt-4.5.0_rc1.ebuild: + Add meta ebuild, on popular request, see bug 258712. + + 11 Feb 2009; Markos Chandras qt-4.4.2.ebuild: + Remove duplicate x11-libs/qt-test RDEPEND ( see bug #258533 ) + + 06 Feb 2009; Raúl Porcel qt-4.4.2.ebuild: + ia64/sparc stable wrt #248038 + + 04 Feb 2009; Brent Baude qt-4.4.2.ebuild: + Marking qt-4.4.2 ppc64 stable for bug 248038 + + 31 Jan 2009; Tobias Klausmann qt-4.4.2.ebuild: + Stable on alpha, bug #248038 + + 29 Jan 2009; Alexis Ballier qt-4.4.2.ebuild: + keyword ~x86-fbsd + + 18 Jan 2009; Markus Meier qt-4.4.2.ebuild: + amd64/x86 stable, bug #248038 + + 17 Jan 2009; nixnut qt-3.3.8b-r1.ebuild: + ppc stable #253978 + + 17 Jan 2009; nixnut qt-4.4.2.ebuild: + ppc stable #248038 + + 10 Jan 2009; Raúl Porcel qt-3.3.8b-r1.ebuild: + alpha/ia64/sparc/x86 stable wrt #253978 + + 09 Jan 2009; Guy Martin qt-3.3.8b-r1.ebuild: + hppa stable, #253978 + + 09 Jan 2009; Rémi Cardona qt-3.3.8-r4.ebuild, + qt-3.3.8b-r1.ebuild: + Change virtual/xft dependency to x11-libs/libXft, bug 253771. + + 07 Jan 2009; Thomas Anderson qt-3.3.8b-r1.ebuild: + stable amd64, bug 253978 + + 07 Jan 2009; Brent Baude qt-3.3.8b-r1.ebuild: + stable ppc64, bug 253978 + + 06 Jan 2009; Ben de Groot -qt-3.3.8b.ebuild, + -qt-4.4.0.ebuild, -qt-4.4.1.ebuild, -qt-4.4.1-r1.ebuild: + Remove 3.3.8b in preparation of stabling 3.3.8b-r1. Removing old 4.4.{0,1} + meta ebuilds. + +*qt-3.3.8b-r1 (02 Jan 2009) + + 02 Jan 2009; Ben de Groot +qt-3.3.8b-r1.ebuild: + Revbump to fix bug 244732 + + 28 Oct 2008; Ben de Groot + +files/qt-3.3.8-fix-compiler-detection.patch, + +files/qt-3.3.8b-cjk-fix.patch, qt-3.3.8-r4.ebuild, qt-3.3.8b.ebuild: + Add patches/fixes for bugs 172219, 229567 and 244732 + +*qt-4.4.2 (18 Sep 2008) + + 18 Sep 2008; Ben de Groot +qt-4.4.2.ebuild: + Version bump + +*qt-4.4.1-r1 (04 Sep 2008) + + 04 Sep 2008; Ben de Groot +qt-4.4.1-r1.ebuild: + Make deps more complete with webkit and qt-script, and dbus useflag. + Leaving phonon out to give users the choice for hardmasked phonon from + kde4. + + 16 Aug 2008; Doug Goldstein metadata.xml: + add GLEP 56 USE flag desc from use.local.desc + +*qt-4.4.1 (11 Aug 2008) + + 11 Aug 2008; Ben de Groot +qt-4.4.1.ebuild: + Version bump + +*qt-4.3.5 (26 Jul 2008) + + 26 Jul 2008; Carsten Lohrke +qt-4.3.5.ebuild: + Version bump. + +*qt-3.3.8b (26 Jul 2008) + + 26 Jul 2008; Carsten Lohrke +qt-3.3.8b.ebuild: + Version bump. License change, quoting issues and other minor cleaning. + + 30 May 2008; Jeroen Roovers qt-4.4.0.ebuild: + Marked ~hppa (bug #223557). + + 27 May 2008; Raúl Porcel qt-4.4.0.ebuild: + Add ~alpha/~ia64/~sparc wrt #223557 + + 25 May 2008; Markus Rothe qt-4.4.0.ebuild: + Added ~ppc/~ppc64 + + 19 May 2008; Tiziano Müller qt-3.3.8-r4.ebuild, + qt-4.3.3.ebuild, qt-4.3.4-r1.ebuild: + Changed dependency for postgresql to virtual/postgresql-base + + 16 May 2008; Ingmar Vanhassel -qt-3.3.4-r8.ebuild, + -qt-4.3.2-r1.ebuild, -qt-4.4.0_rc1.ebuild: + Old. + +*qt-4.4.0 (15 May 2008) + + 15 May 2008; Ingmar Vanhassel qt-4.4.0_rc1.ebuild, + +qt-4.4.0.ebuild: + Version bump to Qt-4.4.0. + + 11 May 2008; Diego Pettenò + +files/qt-3.3.8-immqt+gcc-4.3.patch, qt-3.3.8-r4.ebuild: + Add patch to build with gcc-4.3 and immqt-bc USE flag enabled. Thanks to + Matsuu for linking the Debian patch in bug #218447. + + 18 Apr 2008; Markus Meier qt-4.3.3.ebuild: + amd64 stable, bug #217529 + + 18 Apr 2008; Raúl Porcel qt-4.3.3.ebuild: + x86 stable wrt #217529 + + 17 Apr 2008; nixnut qt-4.3.3.ebuild: + Stable on ppc wrt bug 217529 + + 14 Apr 2008; Markus Rothe qt-4.3.3.ebuild: + Stable on ppc64; bug #217529 + + 14 Apr 2008; Raúl Porcel qt-4.3.3.ebuild: + alpha/ia64 stable wrt #217529 + + 13 Apr 2008; Ferris McCormick qt-4.3.3.ebuild: + Sparc stable --- Bug #217529 --- Good since 2007-12-06. + + 13 Apr 2008; Jeroen Roovers qt-4.3.3.ebuild: + Stable for HPPA (bug #217529). + + 13 Apr 2008; Ingmar Vanhassel qt-4.3.3.ebuild, + -qt-4.3.4.ebuild, qt-4.3.4-r1.ebuild: + Make USE="accessibility qt3support" default through IUSE defaults, bug + 217400. Remove old. + + 10 Apr 2008; Ingmar Vanhassel -qt-4.4.0_beta1.ebuild, + +qt-4.4.0_rc1.ebuild: + Version bump qt to 4.4.0_rc1. Thanks to Bo Andresen and Bernd Steinhauser. + + 19 Mar 2008; Ingmar Vanhassel ChangeLog: + Anti-aliasing rules are broken in qt-4.3*, causing random runtime failures + in Qt programs. bug 213411. Fixed by appending -fno-strict-aliasing. + + 16 Mar 2008; Bo Ørsted Andresen qt-4.4.0_beta1.ebuild: + The qt meta ebuild needs to block previous versions of qt:4 too. + + 11 Mar 2008; Ingmar Vanhassel qt-4.3.2-r1.ebuild, + qt-4.3.4.ebuild: + "append-flags -fno-gcse" on amd64 with gcc 3, bug 178652. + + 09 Mar 2008; Bo Ørsted Andresen qt-4.4.0_beta1.ebuild: + Revert last commit. + + 09 Mar 2008; Bo Ørsted Andresen -qt-4.4.0_beta1.ebuild: + Removing the qt-4.4 meta ebuild. Packages are not supposed to DEPEND on meta + ebuilds and this causes pain without ranged dependencies. If a meta ebuild + is needed it should be added as qt-meta-4.4.0_beta1 instead. + + 05 Mar 2008; Ingmar Vanhassel -qt-4.4.0_rc1.ebuild: + Old. + + 05 Mar 2008; Jeroen Roovers qt-4.4.0_rc1.ebuild: + Remove ~hppa again. + + 05 Mar 2008; Ingmar Vanhassel qt-4.3.2-r1.ebuild, + qt-4.3.3.ebuild, qt-4.3.4.ebuild: + =x11-libs/qt-4.3*:4 needs to block split Qt ebuilds. + + 04 Mar 2008; Jeroen Roovers qt-4.4.0_rc1.ebuild: + Marked ~hppa for no good reason. + + 03 Mar 2008; Ingmar Vanhassel qt-3.3.8-r4.ebuild: + Drop ppc-macos patches, they're patiently awaiting you in prefix. + + 03 Mar 2008; Ingmar Vanhassel + +files/qt-3.3.8-mips.patch, qt-3.3.8-r4.ebuild: + Added a patch for ~x11-libs/qt-3.3.8 to fix compilation on ~mips, thanks to + Ryan Hill in bug 210551. + + 25 Feb 2008; Caleb Tennis + -files/qt-4.3.1-powerpc64.patch, -qt-4.3.1-r1.ebuild, -qt-4.3.2.ebuild: + remove older versions + +*qt-4.3.4 (25 Feb 2008) + + 25 Feb 2008; Caleb Tennis +qt-4.3.4.ebuild: + 4.3.4 version bump + + 23 Feb 2008; Ingmar Vanhassel qt-3.3.4-r8.ebuild, + qt-3.3.8-r4.ebuild: + Move x11-proto/* out of RDEPEND, bug 204781. mips -> ~mips to fix deps. + + 07 Jan 2008; Caleb Tennis qt-4.3.3.ebuild: + PV -> P + + 05 Jan 2008; Caleb Tennis qt-4.3.3.ebuild: + PF -> PV for docs + + 21 Dec 2007; Caleb Tennis qt-4.4.0_rc1.ebuild: + I've completely changed this. Now it's a meta-ebuild that pulls in all of + the smaller package deps. + +*qt-4.4.0_rc1 (19 Dec 2007) + + 19 Dec 2007; Caleb Tennis +qt-4.4.0_rc1.ebuild: + version bump + + 10 Dec 2007; Robert Buchholz qt-4.3.2-r1.ebuild: + amd64 stable (bug #201296) + + 07 Dec 2007; Jeroen Roovers qt-4.3.2-r1.ebuild: + Stable for HPPA. + + 07 Dec 2007; Tobias Scherbaum qt-4.3.2-r1.ebuild: + ppc stable, bug #201296 + + 07 Dec 2007; Markus Rothe qt-4.3.2-r1.ebuild: + Stable on ppc64 + + 06 Dec 2007; Raúl Porcel qt-4.3.2-r1.ebuild: + alpha/ia64/sparc stable + + 06 Dec 2007; Christian Faulhammer qt-4.3.2-r1.ebuild: + stable x86 + +*qt-4.3.3 (06 Dec 2007) + + 06 Dec 2007; Caleb Tennis +qt-4.3.3.ebuild: + version bump. Remove QMAKESPEC as it's redundant and mmight conflict with + other system settings (Qtopia). #201239 + +*qt-4.3.2-r1 (05 Dec 2007) + + 05 Dec 2007; Caleb Tennis +files/qsslsocket-fix.patch, + +qt-4.3.2-r1.ebuild: + Add qsslsocket patch, bug #201296 + + 14 Nov 2007; Samuli Suominen qt-4.3.2.ebuild: + amd64 stable wrt #198454, thanks to Thomas A. for testing. + + 12 Nov 2007; Caleb Tennis -qt-3.3.8-r3.ebuild: + remove old version + + 10 Nov 2007; Markus Rothe qt-4.3.2.ebuild: + Stable on ppc64; bug #198454 + + 10 Nov 2007; Christian Heim qt-3.3.4-r8.ebuild, + qt-3.3.8-r3.ebuild, qt-3.3.8-r4.ebuild, qt-4.3.1-r1.ebuild, + qt-4.3.2.ebuild: + Workaround the hardened issues with SSP in QT by adding -fno-stack-protector + to CFLAGS/CXXFLAGS. + + 09 Nov 2007; nixnut qt-4.3.2.ebuild: + Stable on ppc wrt bug 198454 + + 08 Nov 2007; Raúl Porcel qt-4.3.2.ebuild: + alpha/ia64/x86 stable wrt #198454 + + 08 Nov 2007; Jeroen Roovers qt-4.3.2.ebuild: + Stable for HPPA (bug #198454). + + 08 Nov 2007; Ferris McCormick qt-4.3.2.ebuild: + Sparc stable --- Bug #198454 --- Good for me since 10 Oct., designer works, ... + + 23 Oct 2007; Caleb Tennis -files/qt-4.1.4-sparc.patch, + -files/qt4-parisc-linux.diff, -files/utf8-bug-qt4-2.diff, + -files/qt-4.3.0-alpha-threading.patch, -files/qt4-sqlite-configure.patch, + -files/qt4-nomkdir.patch, -qt-4.3.0-r2.ebuild, -qt-4.3.1.ebuild, + qt-4.3.2.ebuild: + remove old versions + + 03 Oct 2007; Caleb Tennis qt-4.3.2.ebuild: + Fix some quoting issues + +*qt-4.3.2 (03 Oct 2007) + + 03 Oct 2007; Caleb Tennis +qt-4.3.2.ebuild: + Version bump + + 25 Sep 2007; Caleb Tennis qt-4.3.1-r1.ebuild: + This guy is required whether we have a wacom tablet or not + + 15 Sep 2007; Tobias Scherbaum qt-4.3.1-r1.ebuild: + ppc stable, bug #192134 + +*qt-4.3.1-r1 (14 Sep 2007) +*qt-3.3.8-r4 (14 Sep 2007) + + 14 Sep 2007; Caleb Tennis + +files/qt-3.3.8-unicode-off-by-one.patch, + +files/qt-4.3.1-unicode-off-by-one.patch, +qt-3.3.8-r4.ebuild, + +qt-4.3.1-r1.ebuild: + Bump for security bug #192472 + + 13 Sep 2007; Markus Rothe qt-4.3.1.ebuild: + Stable on ppc64; bug #192134 + + 13 Sep 2007; Markus Ullmann qt-4.3.1.ebuild: + Stable on sparc wrt bug #192134 + + 12 Sep 2007; Chris Gianelloni qt-4.3.1.ebuild: + Stable on amd64 wrt bug #192134. + + 12 Sep 2007; Jeroen Roovers qt-4.3.1.ebuild: + Stable for HPPA (bug #192134). + + 11 Sep 2007; Raúl Porcel qt-4.3.1.ebuild: + alpha/ia64/x86 stable wrt #192134 + + 07 Sep 2007; Caleb Tennis qt-3.3.8-r3.ebuild: + Fix xineramaproto dep for immqt users, bug #189703 + + 23 Aug 2007; Caleb Tennis -qt-4.2.3-r1.ebuild: + remove last of 4.2 series + + 23 Aug 2007; Markus Rothe + +files/qt-4.3.1-powerpc64.patch, qt-4.3.1.ebuild: + Added patch for ppc64 and mark ebuild ~ppc64; bug #178779 + + 23 Aug 2007; Caleb Tennis -qt-3.3.8-r2.ebuild, + -qt-4.3.0.ebuild, -qt-4.3.0-r1.ebuild: + remove some older versions + + 15 Aug 2007; Jeroen Roovers qt-4.3.0-r2.ebuild: + Stable for HPPA (bug #185446). + + 12 Aug 2007; Caleb Tennis qt-4.3.1.ebuild: + Fix pkgconfig dir, per bug #188397 + + 12 Aug 2007; Steve Dibb qt-3.3.8-r3.ebuild, + qt-4.3.0-r2.ebuild: + amd64 stable, security bug 185446 + + 09 Aug 2007; Gustavo Zacarias qt-4.3.1.ebuild: + Keyworded ~sparc wrt #188103 + + 08 Aug 2007; Raúl Porcel qt-4.3.1.ebuild: + Re-add ~alpha wrt #188103 + +*qt-4.3.1 (08 Aug 2007) + + 08 Aug 2007; Caleb Tennis +qt-4.3.1.ebuild: + Version bump + + 08 Aug 2007; Jeroen Roovers qt-3.3.8-r3.ebuild: + Stable for HPPA (bug #185446). + + 06 Aug 2007; Gustavo Zacarias qt-4.3.0-r2.ebuild: + Stable on sparc wrt security #185446 + + 05 Aug 2007; Raúl Porcel qt-3.3.8-r3.ebuild, + qt-4.3.0-r2.ebuild: + alpha/ia64/x86 stable wrt security #185446 + + 04 Aug 2007; Tobias Scherbaum qt-3.3.8-r3.ebuild, + qt-4.3.0-r2.ebuild: + ppc stable, bug #185446 + +*qt-4.3.0-r2 (03 Aug 2007) + + 03 Aug 2007; Carsten Lohrke +qt-4.3.0-r2.ebuild: + Patch wasn't applied in previous ebuild revision due to a typo. + + 03 Aug 2007; Gustavo Zacarias qt-3.3.8-r3.ebuild, + qt-4.3.0-r1.ebuild: + Stable on sparc wrt security #185446 + + 02 Aug 2007; Christian Faulhammer qt-3.3.8-r3.ebuild, + qt-4.3.0-r1.ebuild: + stable x86, security bug 185446 + + 02 Aug 2007; Markus Rothe qt-3.3.8-r3.ebuild: + Stable on ppc64; bug #185446 + +*qt-4.3.0-r1 (02 Aug 2007) +*qt-3.3.8-r3 (02 Aug 2007) + + 02 Aug 2007; Carsten Lohrke + +files/0081-format-string-fixes.diff, +files/0185-fix-format-strings.diff, + +qt-3.3.8-r3.ebuild, +qt-4.3.0-r1.ebuild: + Possible remote code execution, CVE-2007-3388, bug #187465. + + 01 Aug 2007; Christoph Mende qt-4.3.0.ebuild: + Stable on amd64 wrt bug #186670 + + 31 Jul 2007; Caleb Tennis qt-4.3.0.ebuild: + Incorporate dep changes from flameeyes at bug #181199 + + 26 Jul 2007; Jeroen Roovers qt-4.3.0.ebuild: + Stable for HPPA (bug #186670). + + 26 Jul 2007; Gustavo Zacarias qt-4.3.0.ebuild: + Stable on sparc wrt #186670 + + 26 Jul 2007; Raúl Porcel qt-4.3.0.ebuild: + ia64/x86 stable wrt #186670 + + 22 Jul 2007; Donnie Berkholz ; qt-3.3.4-r8.ebuild, + qt-3.3.8-r2.ebuild: + Drop virtual/x11 references. + + 20 Jul 2007; Raúl Porcel + +files/qt-4.3.0-alpha-threading.patch, qt-4.3.0.ebuild: + Add ~alpha to 4.3.0 and add a patch from upstream to make it work on alpha + + 10 Jul 2007; Markus Rothe qt-4.3.0.ebuild: + Added ~ppc + + 20 Jun 2007; Caleb Tennis qt-4.3.0.ebuild: + Add -reduce-relocations switch, from bug #178535 + + 08 Jun 2007; Caleb Tennis -qt-4.3.0_beta1.ebuild, + -qt-4.3.0_rc1.ebuild: + remove beta and rc ebuilds + + 04 Jun 2007; Diego Pettenò qt-4.3.0.ebuild: + Make png, jpeg, zlib and mng turn off the relative support from Qt 4.3, see + bug #180835. + + 04 Jun 2007; Diego Pettenò qt-4.3.0.ebuild: + Add ~x86-fbsd keyword. + + 04 Jun 2007; Diego Pettenò qt-4.3.0.ebuild: + Always avoid stripping during build, fixes bug #138215. + + 02 Jun 2007; Raúl Porcel qt-4.3.0.ebuild: + Add ~ia64 wrt #180444 + + 01 Jun 2007; Jeroen Roovers qt-4.3.0.ebuild: + Marked ~hppa (bug #180444). + + 01 Jun 2007; Jeroen Roovers qt-4.3.0.ebuild: + Return of the hppa-ldcw-fix patch. + + 01 Jun 2007; Gustavo Zacarias qt-4.3.0.ebuild: + Keyworded ~sparc wrt #180444 + +*qt-4.3.0 (31 May 2007) + + 31 May 2007; Caleb Tennis +qt-4.3.0.ebuild: + Adding 4.3.0 final + + 30 May 2007; Caleb Tennis qt-3.3.8-r2.ebuild: + Add firebird include dir + + 17 May 2007; Caleb Tennis qt-4.3.0_rc1.ebuild: + explicitly disable pch here, from bug #178843 + + 14 May 2007; Caleb Tennis qt-4.3.0_rc1.ebuild: + Some sed foo to change CFLAG stuff, from bug #172219 + + 13 May 2007; Marcus D. Hanwell qt-4.3.0_rc1.ebuild: + Marked ~amd64. + +*qt-4.3.0_rc1 (10 May 2007) + + 10 May 2007; Caleb Tennis +qt-4.3.0_rc1.ebuild: + bump + + 03 May 2007; Caleb Tennis qt-3.3.4-r8.ebuild: + readd amd64 as it likes this version for hardened as well + +*qt-4.3.0_beta1 (01 May 2007) + + 01 May 2007; Caleb Tennis +qt-4.3.0_beta1.ebuild: + Bump for new beta + + 28 Apr 2007; Sven Wegener qt-3.3.4-r8.ebuild, + qt-3.3.8-r2.ebuild: + Fix *initd, *confd and *envd calls (#17388, #174266) + + 20 Apr 2007; Caleb Tennis qt-3.3.4-r8.ebuild: + re-add x86 because this is the preferred hardened version for x86 + + 18 Apr 2007; Caleb Tennis + -files/qt-3.3.5-immodule.patch, -files/qt-3.3.6-CVE-2006-4811-bis.patch, + -files/qt-3.3.6-CVE-2006-4811.patch, -files/qt-3.3.6-seli-xinerama.patch, + -files/qt-3.3.6-uic-fix.patch, -files/qt-3.3.6-visibility.patch, + -files/qt-4.1.4-CVE-2006-4811-bis.patch, + -files/qt-4.1.4-CVE-2006-4811.patch, qt-3.3.4-r8.ebuild, + -qt-3.3.6-r4.ebuild, -qt-3.3.6-r5.ebuild, -qt-4.1.4-r2.ebuild, + -qt-4.2.2.ebuild: + remove lots of old security ridden versions. Removing arches on 3.3.4-r8 + except for mips which hasn't stabilized 3.3.8-r2 yet + + 18 Apr 2007; Jose Luis Rivero qt-3.3.8-r2.ebuild, + qt-4.2.3-r1.ebuild: + Stable on alpha wrt security #172746 + + 17 Apr 2007; Gustavo Zacarias qt-4.2.3-r1.ebuild: + Stable on sparc wrt security #172746 + + 13 Apr 2007; Gustavo Zacarias qt-3.3.8-r2.ebuild: + Stable on sparc wrt security #172746 + + 13 Apr 2007; Caleb Tennis -qt-3.3.8.ebuild, + -qt-3.3.8-r1.ebuild, -qt-4.2.3.ebuild: + Removing old versions + + 13 Apr 2007; Caleb Tennis +files/qt4/Assistant.desktop, + +files/qt4/Designer.desktop, +files/qt4/Linguist.desktop, + qt-4.2.3-r1.ebuild: + This change just installs .desktop files for the Qt desktop applications so + that they can be used from the menus of the desktops. From bug #174033 + + 12 Apr 2007; Jeroen Roovers qt-4.2.3-r1.ebuild: + W00t! Back to stable (bug #172746, comment #23). + + 12 Apr 2007; Jeroen Roovers qt-3.3.8-r2.ebuild: + Stable for HPPA (bug #172746). + + 12 Apr 2007; Jeroen Roovers qt-4.2.3-r1.ebuild: + Revert to ~hppa (bug #172746, comment #16). + + 12 Apr 2007; Jeroen Roovers + +files/qt-4.2.3-hppa-ldcw-fix.patch, qt-4.2.3-r1.ebuild: + Stable for HPPA (bug #172746). + + 11 Apr 2007; Tobias Scherbaum qt-3.3.8-r2.ebuild, + qt-4.2.3-r1.ebuild: + ppc stable, bug #172746 + + 11 Apr 2007; Markus Rothe qt-3.3.8-r2.ebuild, + qt-4.2.3-r1.ebuild: + Stable on ppc64; bug #172746 + + 11 Apr 2007; Raúl Porcel qt-3.3.8-r2.ebuild, + qt-4.2.3-r1.ebuild: + ia64 + x86 stable wrt security bug 172746 + + 11 Apr 2007; Marcus D. Hanwell qt-3.3.8-r2.ebuild, + qt-4.2.3-r1.ebuild: + Stable on amd64, bug 172746. + +*qt-4.2.3-r1 (30 Mar 2007) +*qt-3.3.8-r2 (30 Mar 2007) + + 30 Mar 2007; Caleb Tennis +files/utf8-bug-qt3.diff, + +files/utf8-bug-qt4-2.diff, +qt-3.3.8-r2.ebuild, +qt-4.2.3-r1.ebuild: + Add a patch that fixes a a XSS error in the UTF8 decoder (from kde-packager) + + 27 Mar 2007; Raúl Porcel qt-4.2.2.ebuild: + ia64 stable wrt bug 164699 + + 26 Mar 2007; Charlie Shepherd + qt-3.3.8-r1.ebuild: + Add note about updating the qt3 eclass + +*qt-3.3.8-r1 (26 Mar 2007) + + 26 Mar 2007; Caleb Tennis + +files/qt-3.3.8-mysql-unload-crash.diff, +qt-3.3.8-r1.ebuild: + Revbump to include a crash patch (Bug #171883) + + 21 Mar 2007; Caleb Tennis qt-3.3.8.ebuild: + Update to the latest immqt patch from bug #169852 + +*qt-4.2.3 (08 Mar 2007) + + 08 Mar 2007; Caleb Tennis +qt-4.2.3.ebuild: + Version bump. Also, don't use the Qt built in split debug option as portage + now supports it via make.conf + + 22 Feb 2007; Caleb Tennis -qt-4.2.1.ebuild: + remove old version + +*qt-3.3.8 (22 Feb 2007) + + 22 Feb 2007; Caleb Tennis + +files/qt-3.3.8-seli-xinerama.patch, +files/qt-3.3.8-uic-fix.patch, + +files/qt-3.3.8-visibility.patch, +qt-3.3.8.ebuild: + Bump to latest version + + 18 Feb 2007; Fabian Groffen + -files/qt-3.3.4-macos.patch, -files/qt-3.3.5-macos.patch, + qt-3.3.4-r8.ebuild, qt-3.3.6-r4.ebuild, qt-3.3.6-r5.ebuild: + Dropped ppc-macos keyword, see you in prefix + + 14 Feb 2007; Christian Faulhammer qt-4.2.2.ebuild: + stable x86; bug 164699 + + 12 Feb 2007; Simon Stelling qt-4.2.2.ebuild: + stable on amd64; bug 166478 + + 06 Feb 2007; Roy Marples qt-4.2.2.ebuild: + Add ~x86-fbsd keyword. + + 04 Feb 2007; nixnut qt-4.2.2.ebuild: + Stable on ppc wrt bug 164699 + + 01 Feb 2007; Markus Rothe qt-4.2.2.ebuild: + Stable on ppc64; bug #164699 + + 01 Feb 2007; Gustavo Zacarias qt-4.2.2.ebuild: + Stable on sparc wrt #164699 + + 05 Jan 2007; Diego Pettenò qt-3.3.4-r8.ebuild, + qt-3.3.6-r4.ebuild, qt-3.3.6-r5.ebuild: + Convert to use elog. + + 21 Dec 2006; Caleb Tennis qt-4.2.2.ebuild: + change install targets to simply subtargets, per bug #157997 + + 19 Dec 2006; Caleb Tennis qt-4.1.4-r2.ebuild, + qt-4.2.1.ebuild, qt-4.2.2.ebuild: + This change was wrong. Qt is still dual licensed GPL/QPL, so revert this back + + 19 Dec 2006; Caleb Tennis qt-4.2.2.ebuild: + Make sure we catch sed the proper stuff + + 19 Dec 2006; Caleb Tennis qt-4.2.2.ebuild: + Make symbol export and examples handling part of configure options instead + of seds, now that Qt supports them (thanks to bug #157997) + + 05 Dec 2006; Caleb Tennis + +files/qt4-sqlite-configure.patch, qt-4.2.2.ebuild: + A configure patch to ensure usage of system sqlite (bug #156123) + + 05 Dec 2006; Caleb Tennis qt-4.2.2.ebuild: + Can just use -confirm-license now instead of saying yes to the prompt + + 04 Dec 2006; Caleb Tennis qt-4.2.2.ebuild: + Qt configuration seems to do a lot with pkgconfig, so we need to dep on it + + 04 Dec 2006; Caleb Tennis qt-4.2.2.ebuild: + make the qt3 use flag into qt3support (for qt4 only) + + 04 Dec 2006; Caleb Tennis qt-4.2.2.ebuild: + Fix up sqlite and sqlite3 use flags to pull in proper dependencies and use + proper config options to build proper plugins (from bug #156123) + + 04 Dec 2006; Caleb Tennis -qt-3.3.6-r1.ebuild, + -qt-3.3.6-r2.ebuild, -qt-3.3.6-r3.ebuild: + remove some stale versions + +*qt-4.2.2 (04 Dec 2006) + + 04 Dec 2006; Caleb Tennis +qt-4.2.2.ebuild: + Adding new 4.2.2 version + + 29 Nov 2006; Bryan Østergaard qt-4.1.4-r2.ebuild: + Stable on Alpha. + + 25 Nov 2006; Bryan Østergaard qt-4.1.4-r2.ebuild, + qt-4.2.1-r1.ebuild: + Add ~alpha and ~ia64 keywords. + + 25 Nov 2006; Diego Pettenò files/digest-qt-4.2.1, + files/digest-qt-4.2.1-r1, Manifest: + Fix digests (hopefully). + + 24 Nov 2006; Diego Pettenò qt-3.3.6-r5.ebuild: + Fix keywording. + +*qt-3.3.6-r5 (24 Nov 2006) + + 24 Nov 2006; Diego Pettenò + +files/qt-3.3.6-seli-xinerama.patch, +qt-3.3.6-r5.ebuild: + Add a patch to improve xinerama support, by Lubos Lunak. + + 23 Nov 2006; Francesco Riosa qt-3.3.4-r8.ebuild, + qt-3.3.6-r1.ebuild, qt-3.3.6-r2.ebuild, qt-3.3.6-r3.ebuild, + qt-3.3.6-r4.ebuild, qt-4.1.4-r2.ebuild, qt-4.2.1.ebuild, + qt-4.2.1-r1.ebuild: + dev-db/mysql => virtual/mysql + + 10 Nov 2006; Caleb Tennis qt-4.1.4-r2.ebuild, + qt-4.2.1.ebuild, qt-4.2.1-r1.ebuild: + Qt4 is GPL-2 only, not QPL (as far as I can tell), so remove that from the + license option + +*qt-4.2.1-r1 (09 Nov 2006) + + 09 Nov 2006; Caleb Tennis +qt-4.2.1-r1.ebuild: + Readding a masked 4.2.1 version that support dbus, since it will be unmasked + somewhat soon + + 07 Nov 2006; Caleb Tennis qt-4.2.1.ebuild: + Fix pkgconfig files + + 06 Nov 2006; Caleb Tennis qt-4.2.1.ebuild: + update the check for the qt4 bindings based on comments from bug #150888 + + 06 Nov 2006; Alexander H. Færøy qt-3.3.6-r4.ebuild: + Stable on Alpha. Bug #151838 + + 03 Nov 2006; Caleb Tennis qt-4.2.1.ebuild: + Add a dbus build error for people who have the qt4 bindings already on their + system + + 02 Nov 2006; Caleb Tennis qt-4.2.1.ebuild: + removing dbus flag from Qt until the dbus herd unmasks it + + 30 Oct 2006; Caleb Tennis qt-4.2.1.ebuild: + dbus-core -> dbus + + 30 Oct 2006; Caleb Tennis qt-3.3.6-r4.ebuild: + Fix icc detection per bug #152366 + + 30 Oct 2006; Caleb Tennis qt-4.1.4-r2.ebuild, + qt-4.2.1.ebuild: + Fix icc compiler detection per bug #152385 and add checking into the 4.2 + series that is in the 4.1 series + + 30 Oct 2006; Caleb Tennis -qt-4.0.1.ebuild: + Remove 4.0 series that was put back for sparc reasons. Now have a 4.1 stable + +*qt-4.2.1 (30 Oct 2006) + + 30 Oct 2006; Caleb Tennis + -files/qt-4.2.0-CVE-2006-4811-bis.patch, + -files/qt-4.2.0-CVE-2006-4811.patch, -qt-4.2.0.ebuild, + -qt-4.2.0-r1.ebuild, -qt-4.2.0-r2.ebuild, +qt-4.2.1.ebuild: + Bump to qt-4.2.1 which has the security fixes as 4.2.0-r2, and fixes the + dbus dep + + 29 Oct 2006; Bryan Østergaard qt-3.3.6-r4.ebuild, + qt-4.1.4-r2.ebuild: + Stable on ia64, bug 151838. + + 27 Oct 2006; René Nussbaumer qt-3.3.6-r4.ebuild, + qt-4.1.4-r2.ebuild: + Stable on hppa. See bug #151838. + + 25 Oct 2006; Diego Pettenò files/digest-qt-4.1.4, + files/digest-qt-4.1.4-r1, files/digest-qt-4.1.4-r2, Manifest: + Fix digest, close bug #149809. + + 24 Oct 2006; Tobias Scherbaum qt-3.3.6-r4.ebuild, + qt-4.1.4-r2.ebuild: + ppc stable, bug #151838 + + 24 Oct 2006; Simon Stelling qt-3.3.6-r4.ebuild, + qt-4.1.4-r2.ebuild: + stable on amd64 wrt bug 151838 + + 24 Oct 2006; Joshua Jackson qt-3.3.6-r4.ebuild, + qt-4.1.4-r2.ebuild: + Stable x86; security bug #151838 + + 23 Oct 2006; Gustavo Zacarias qt-3.3.6-r4.ebuild, + qt-4.1.4-r2.ebuild: + Stable on sparc wrt security #151838 + + 22 Oct 2006; Markus Rothe qt-3.3.6-r4.ebuild, + qt-4.1.4-r2.ebuild: + Stable on ppc64; bug #151838 + + 20 Oct 2006; qt-4.2.0-r1.ebuild, qt-4.2.0-r2.ebuild: + Added ~ppc wrt bug 150888 + + 20 Oct 2006; Marcus D. Hanwell qt-4.2.0.ebuild, + qt-4.2.0-r1.ebuild, qt-4.2.0-r2.ebuild: + Marked ~amd64, bug 150888. + +*qt-4.2.0-r2 (20 Oct 2006) +*qt-4.1.4-r2 (20 Oct 2006) +*qt-3.3.6-r4 (20 Oct 2006) + + 20 Oct 2006; Diego Pettenò + +files/qt-3.3.6-CVE-2006-4811-bis.patch, + +files/qt-4.1.4-CVE-2006-4811-bis.patch, + +files/qt-4.2.0-CVE-2006-4811-bis.patch, +qt-3.3.6-r4.ebuild, + +qt-4.1.4-r2.ebuild, +qt-4.2.0-r2.ebuild: + Add new version of the patches for CVE-2006-4811 directly from Trolltech, + hopefully fixing the problems for good. + + 20 Oct 2006; Bryan Østergaard qt-3.3.6-r3.ebuild: + Stable on Alpha, bug 151838. + + 20 Oct 2006; Joshua Jackson qt-4.2.0.ebuild, + qt-4.2.0-r1.ebuild: + Adding ~x86; bug #150888 + + 19 Oct 2006; Aron Griffis qt-3.3.6-r3.ebuild, + qt-4.1.4-r1.ebuild: + Mark 4.1.4-r1 3.3.6-r3 stable on ia64. #151838 + +*qt-4.2.0-r1 (19 Oct 2006) +*qt-4.1.4-r1 (19 Oct 2006) + + 19 Oct 2006; Diego Pettenò + +files/qt-4.1.4-CVE-2006-4811.patch, +files/qt-4.2.0-CVE-2006-4811.patch, + +qt-4.1.4-r1.ebuild, +qt-4.2.0-r1.ebuild: + Add patches for Qt 4.x for the vulnerability reported lately. + + 19 Oct 2006; Joshua Jackson qt-3.3.6-r3.ebuild: + Stable x86; Diego told me to do it, but I choose security as the reason + + 18 Oct 2006; Markus Rothe qt-3.3.6-r3.ebuild: + Stable on ppc64; bug #151838 + + 17 Oct 2006; Gustavo Zacarias qt-4.2.0.ebuild: + Fixed up and keyworded ~sparc wrt #150888 + +*qt-3.3.6-r3 (18 Oct 2006) + + 18 Oct 2006; Diego Pettenò + +files/qt-3.3.6-CVE-2006-4811.patch, +qt-3.3.6-r3.ebuild: + Add patch from RedHat to try fixing security bug #151838. + + 15 Oct 2006; Bryan Østergaard qt-3.3.6-r1.ebuild: + Stable on ia64, bug 132887. + + 11 Oct 2006; Markus Rothe qt-4.2.0.ebuild: + Added ~ppc64; bug #150888 + + 10 Oct 2006; Gustavo Zacarias qt-4.1.4.ebuild: + Stable on sparc wrt #134341 + + 06 Oct 2006; Caleb Tennis + qt-3.3.6-r2.ebuild, qt-4.2.0.ebuild: + Set minimum mng version to 1.0.9, per bug #148687 + + 05 Oct 2006; Caleb Tennis -qt-4.2.0_rc1.ebuild: + remove _rc1 + +*qt-4.2.0 (04 Oct 2006) + + 04 Oct 2006; Caleb Tennis +qt-4.2.0.ebuild: + Version bump + + 29 Sep 2006; Caleb Tennis +files/qt-4.1.4-sparc.patch, + qt-4.1.4.ebuild: + Add a patch which detects Sparc for Linux, from bug #134341 + +*qt-4.0.1 (22 Sep 2006) + + 22 Sep 2006; Caleb Tennis qt-3.3.6-r1.ebuild, + qt-3.3.6-r2.ebuild, +qt-4.0.1.ebuild: + Readding 4.0.1 so sparc will be happy :) + + 22 Sep 2006; Caleb Tennis qt-3.3.6-r1.ebuild, + qt-3.3.6-r2.ebuild: + Fix icc compiler, bug #148211 + +*qt-3.3.6-r2 (20 Sep 2006) + + 20 Sep 2006; Diego Pettenò +qt-3.3.6-r2.ebuild: + Revision bump so that the pkg-config change is applied to everyone. + + 14 Sep 2006; Caleb Tennis qt-3.3.4-r8.ebuild: + Changing 3.3.4 dep to freetype-2.1* because it doesn't work with freetype + 2.2 (per bug #145641) and the patch is way too big for me to comfortably + introduce here. + + 14 Sep 2006; Caleb Tennis + -files/qt-4.1.3-mysql4-support.diff, -qt-4.1.2.ebuild, -qt-4.1.3.ebuild: + Remove stale ebuilds + + 14 Sep 2006; Caleb Tennis qt-4.1.4.ebuild, + qt-4.2.0_rc1.ebuild: + Remove monolithic qt deps from 4.1.4 and 4.2.0; must use modular from now on + + 07 Sep 2006; Diego Pettenò qt-4.1.4.ebuild: + Add support again for different mkspecs and add ~x86-fbsd keyword to version + 4.1.4. + +*qt-4.2.0_rc1 (06 Sep 2006) + + 06 Sep 2006; Caleb Tennis -qt-4.2.0_pre1.ebuild, + +qt-4.2.0_rc1.ebuild: + add in 4.2.0_rc1, remove 4.2.0_pre1 + + 02 Sep 2006; Bryan Østergaard qt-4.1.4.ebuild: + Stable on ia64. + + 23 Aug 2006; Caleb Tennis qt-3.3.6-r1.ebuild: + Add PKG_CONFIG_PATH to the environment of Qt so the pkgconfig files are + properly found, per bug #144140 + + 19 Aug 2006; Tobias Scherbaum qt-4.1.4.ebuild: + ppc stable, bug #134341 + + 19 Aug 2006; Jeroen Roovers qt-4.1.4.ebuild: + Stable for HPPA (bug #134341). + + 14 Aug 2006; Jeroen Roovers files/qt4-parisc-linux.diff, + qt-4.1.3.ebuild, qt-4.1.4.ebuild: + Fixed HPPA patching. + + 11 Aug 2006; Markus Rothe qt-4.1.4.ebuild: + Stable on ppc64; bug #134341 + + 08 Aug 2006; Simon Stelling qt-4.1.4.ebuild: + stable on amd64 + + 07 Aug 2006; Andrej Kacian qt-4.1.4.ebuild, + qt-4.2.0_pre1.ebuild: + Stable on x86. Bug #134341. Fix leading spaces in the 4.2.0_pre1 ebuild. + + 31 Jul 2006; Caleb Tennis qt-4.2.0_pre1.ebuild: + Add pch support for qt-4.2 + + 28 Jul 2006; Caleb Tennis qt-4.1.4.ebuild, + qt-4.2.0_pre1.ebuild: + Install the translations + + 28 Jul 2006; Caleb Tennis -qt-3.3.4-r9.ebuild, + -qt-3.3.6.ebuild, -qt-4.1.1.ebuild: + Remove a few old stale versions + + 11 Jul 2006; Caleb Tennis qt-4.2.0_pre1.ebuild: + require a specific version of dbus + + 09 Jul 2006; Diego Pettenò qt-3.3.4-r8.ebuild, + qt-3.3.4-r9.ebuild, qt-3.3.6.ebuild, qt-3.3.6-r1.ebuild, qt-4.1.1.ebuild, + qt-4.1.2.ebuild, qt-4.1.3.ebuild, qt-4.1.4.ebuild, qt-4.2.0_pre1.ebuild: + Pinpoint virtual/x11 version to less than 7. + + 05 Jul 2006; Michael Sterrett qt-4.2.0_pre1.ebuild: + typo: sys-libs/glib -> dev-libs/glib + +*qt-4.2.0_pre1 (30 Jun 2006) + + 30 Jun 2006; Caleb Tennis +qt-4.2.0_pre1.ebuild: + New technology preview. Keyworded -* until it has a bit more testing and the + ebuild gets happier + +*qt-4.1.4 (22 Jun 2006) + + 22 Jun 2006; Caleb Tennis +qt-4.1.4.ebuild: + Qt 4.1.4 + + 03 Jun 2006; Guy Martin qt-4.1.3.ebuild: + Stable on hppa. + + 02 Jun 2006; Guy Martin +files/qt4-parisc-linux.diff, + qt-4.1.3.ebuild: + Fixed parisc asm to build on linux. + + 30 May 2006; Caleb Tennis qt-4.1.3.ebuild: + Don't warn about nodoc anymore + + 30 May 2006; Joseph Jezak qt-4.1.2.ebuild: + Marked ppc stable for bug #134341. + + 28 May 2006; Mark Loeser Manifest: + Fix digest + + 28 May 2006; Carsten Lohrke + +files/qt-4.1.3-mysql4-support.diff, qt-4.1.3.ebuild: + Build against MySQL 4.0. + + 26 May 2006; Chris Gianelloni qt-3.3.6-r1.ebuild: + Stable on amd64 wrt bug #132887. + + 26 May 2006; Chris Gianelloni qt-4.1.2.ebuild: + Stable on amd64 wrt bug #132349 + + 25 May 2006; Guy Martin qt-3.3.6-r1.ebuild: + Stable on hppa. + + 25 May 2006; Chris Gianelloni qt-4.1.2.ebuild: + Stable on x86 wrt bug #132349. + +*qt-4.1.3 (25 May 2006) + + 25 May 2006; Caleb Tennis +qt-4.1.3.ebuild: + Bump for a new version + + 24 May 2006; Diego Pettenò ChangeLog: + Force digest regen. + + 24 May 2006; Diego Pettenò + +files/qt-3.3.6-visibility.patch, qt-3.3.6-r1.ebuild: + Add visibility patch to enable KDE hidden visibility. Enable only in + presence of GCC 4.1 or later, so that we play it safe. No visibility flags + are enabled or it would break Qt! + + 23 May 2006; Markus Rothe qt-4.1.2.ebuild: + Stable on ppc64; bug #132349 + + 12 May 2006; Thomas Cort qt-3.3.6-r1.ebuild: + Stable on alpha wrt Bug #132887. + + 12 May 2006; Chris Gianelloni qt-3.3.6-r1.ebuild: + Stable on x86 wrt bug #132887. + + 12 May 2006; Luca Barbato qt-3.3.6-r1.ebuild: + Marked ppc + + 12 May 2006; Jason Wever qt-3.3.6-r1.ebuild: + Stable on SPARC wrt bug #132887. + + 11 May 2006; Markus Rothe qt-3.3.6-r1.ebuild: + Stable on ppc64; bug #132887 + + 05 May 2006; Diego Pettenò qt-3.3.6-r1.ebuild: + Make use the proper gcc/g++ executables so that it can be crosscompiled with + distcc. + + 05 May 2006; Caleb Tennis qt-4.1.2.ebuild: + Change qt's DATADIR back to /usr/share/qt4, and leave DOCDIR as + /usr/share/doc/qt-4.x.x. The reasoning is that we need a defined places to + keep the mkspecs files that doesn't change with each new emerge + +*qt-3.3.6-r1 (05 May 2006) + + 05 May 2006; Caleb Tennis + +files/0044-qscrollview-windowactivate-fix.diff, + +files/0047-fix-kmenu-widget.diff, + +files/0048-qclipboard_hack_80072.patch, +qt-3.3.6-r1.ebuild: + Fix some patches that were dropped when moving to 3.3.6. This should make a + lot of people happy + + 05 May 2006; Caleb Tennis qt-3.3.6.ebuild: + Add nis support, from bug #131303 + + 28 Apr 2006; Alec Warner files/digest-qt-4.1.1, + Manifest: + Fixing SHA256 digest, pass four + + 19 Apr 2006; Caleb Tennis qt-4.1.2.ebuild: + Add a die to the ebuild if using nodoc feature + + 13 Apr 2006; Caleb Tennis qt-3.3.6.ebuild: + Fix CHOST naming scheme from bug #128528 + + 11 Apr 2006; Diego Pettenò qt-3.3.4-r8.ebuild, + qt-3.3.4-r9.ebuild, qt-3.3.6.ebuild: + Replace dolib with dolib.so to ensure executable bit is set. + + 07 Apr 2006; Caleb Tennis + -files/qt-3.3.5-uic-fix.patch, -qt-3.3.5.ebuild, -qt-3.3.5-r1.ebuild: + remove some more older versions + + 06 Apr 2006; Caleb Tennis qt-4.1.2.ebuild: + remove implicit PATH and ROOTPATH from env.d file per bug #128655 + + 06 Apr 2006; Caleb Tennis + -files/qt-4.1.0-configure-no-mysql.diff, + -files/qt-4.1.0-debug-and-release.diff, -qt-4.1.0-r1.ebuild, + -qt-4.1.0-r2.ebuild: + remove stale versions + + 01 Apr 2006; Diego Pettenò qt-3.3.6.ebuild: + Add ~x86-fbsd keyword. + +*qt-4.1.2 (30 Mar 2006) + + 30 Mar 2006; Caleb Tennis +qt-4.1.2.ebuild: + version bump + + 18 Mar 2006; Mike Frysinger qt-3.3.6.ebuild: + Fix typo (pv -> PV) for libqt-mt.so symlink. + + 17 Mar 2006; Diego Pettenò qt-3.3.6.ebuild: + Fix installation of libraries (3.3.5 -> ${PV}). Forward port immodule patch + to Qt 3.3.6. + + 17 Mar 2006; Fabian Groffen qt-3.3.6.ebuild: + Marked ~ppc-macos, used old 3.3.5 patch to get it compiling (bug #126553) + +*qt-3.3.6 (17 Mar 2006) + + 17 Mar 2006; Caleb Tennis + +files/qt-3.3.6-uic-fix.patch, +qt-3.3.6.ebuild: + Adding Qt 3.3.6 + +*qt-3.3.5-r1 (09 Mar 2006) +*qt-3.3.4-r9 (09 Mar 2006) + + 09 Mar 2006; Diego Pettenò + +files/qt-3.3.5-immodule.patch, +qt-3.3.4-r9.ebuild, +qt-3.3.5-r1.ebuild: + Add patch for Qt's immodule, bug #124033. Thanks to Martin Meredith + for reporting. + + 09 Mar 2006; Aron Griffis qt-4.1.1.ebuild: + Mark 4.1.1 ~ia64 + + 23 Feb 2006; Caleb Tennis qt-3.3.4-r8.ebuild, + qt-3.3.5.ebuild: + Add QTBASE dir to revdep-rebuild search paths so plugins (like mysql) get + picked up + + 22 Feb 2006; Caleb Tennis -qt-4.0.1.ebuild, + -qt-4.1.0.ebuild: + remove old versions + +*qt-4.1.1 (22 Feb 2006) + + 22 Feb 2006; Caleb Tennis +qt-4.1.1.ebuild: + Version bump + + 08 Feb 2006; Diego Pettenò qt-3.3.5.ebuild: + Append -fno-strict-aliasing as it dereferences type punned pointers (better + be safe). + + 19 Jan 2006; Caleb Tennis +files/qt-ulibc.patch, + qt-3.3.4-r8.ebuild, qt-3.3.5.ebuild: + Add a uclibc patch to allow Qt to compile with ulibc (bug #100246) + + 18 Jan 2006; Joseph Jezak qt-4.1.0-r2.ebuild: + Marked ~ppc for bug #112811. + + 14 Jan 2006; Fabian Groffen qt-3.3.4-r8.ebuild: + Marked ppc-macos stable + + 13 Jan 2006; Caleb Tennis qt-3.3.4-r8.ebuild, + qt-3.3.5.ebuild, qt-4.0.1.ebuild, qt-4.1.0-r2.ebuild: + Add x11-libs/libSM as a modular X dep per bug #118420 + +*qt-4.1.0-r2 (13 Jan 2006) + + 13 Jan 2006; Caleb Tennis +qt-4.1.0-r2.ebuild: + Due to the requirement of private headers, QtTestlib is unusable without + this fix (fixed in Qt 4.1.1, I'm told) + + 11 Jan 2006; Jason Wever qt-4.1.0-r1.ebuild: + Added ~sparc keyword wrt bug #112811. + + 04 Jan 2006; Luis Medinas qt-4.1.0-r1.ebuild: + Added ~amd64 keyword. For bug #112811. + + 04 Jan 2006; Markus Rothe qt-4.1.0-r1.ebuild: + Added ~ppc64; bug #112811 + + 04 Jan 2006; Caleb Tennis qt-4.1.0-r1.ebuild: + bump to ~x86 + +*qt-4.1.0-r1 (04 Jan 2006) + + 04 Jan 2006; Caleb Tennis +qt-4.1.0-r1.ebuild: + Revbump to change prefix to /usr, fixes pkgconfig files + + 03 Jan 2006; Caleb Tennis + +files/qt-4.1.0-debug-and-release.diff, qt-3.3.4-r8.ebuild, + qt-3.3.5.ebuild, qt-4.1.0.ebuild: + Add a patch which fixes qt build in -debug-and-release mode, from Trolltech + (bug #117127) + + 03 Jan 2006; Caleb Tennis qt-3.3.4-r8.ebuild, + qt-3.3.5.ebuild: + build qembed tool by default + + 20 Dec 2005; Caleb Tennis qt-4.1.0.ebuild: + Remove QtAssistant manual installation (it looks to me like it's handled + now), and move the pkg-config files into /usr/_libdir_/pkgconfig + +*qt-4.1.0 (20 Dec 2005) + + 20 Dec 2005; Caleb Tennis +qt-4.1.0.ebuild: + Bump from _rc1 + + 16 Dec 2005; Diego Pettenò qt-3.3.5.ebuild: + Use ${CHOST} selection instead of checking for kernel/elibc pairs. Added + support for DragonFly, OpenBSD and NetBSD. + + 14 Dec 2005; Donnie Berkholz ; qt-3.3.4-r8.ebuild, + qt-3.3.5.ebuild, qt-4.0.1.ebuild, qt-4.1.0_rc1.ebuild: + Add modular X dependencies to qt-3. Remove redundant modular deps from qt-4. + + 13 Dec 2005; Donnie Berkholz ; qt-4.0.1.ebuild, + qt-4.1.0_rc1.ebuild: + Clean up xinerama modular deps, based on how enlightenment did it. + + 13 Dec 2005; Donnie Berkholz ; qt-4.0.1.ebuild, + qt-4.1.0_rc1.ebuild: + Fix modular X xinerama. + + 11 Dec 2005; Donnie Berkholz ; qt-4.0.1.ebuild, + qt-4.1.0_rc1.ebuild: + Add modular X dependencies. + + 08 Dec 2005; Caleb Tennis qt-4.1.0_rc1.ebuild: + Add a sed statement to make Qt use /usr/XXX instead of /usr/X11R6/XXX + + 04 Dec 2005; Mamoru KOMACHI qt-3.3.5.ebuild: + Updated immodule patch. This closes bug #106386. + + 28 Nov 2005; Caleb Tennis + +files/qt-4.1.0-configure-no-mysql.diff, qt-4.1.0_rc1.ebuild: + add a patch from Trolltech to fix mysql compilation support + +*qt-4.1.0_rc1 (21 Nov 2005) + + 21 Nov 2005; Caleb Tennis -qt-4.1.0_pre20051028.ebuild, + +qt-4.1.0_rc1.ebuild: + Bumping up to _rc1, removing snapshot + + 20 Nov 2005; Herbie Hopkins qt-4.0.1.ebuild, + qt-4.1.0_pre20051028.ebuild: + Small multilib fix + + 19 Nov 2005; Joseph Jezak qt-4.0.1.ebuild: + Marked ~ppc for bug #112811. + + 19 Nov 2005; Markus Rothe qt-4.0.1.ebuild: + Added ~ppc64 + + 19 Nov 2005; Jason Wever qt-4.0.1.ebuild: + Added ~sparc keyword wrt bug #112811. + + 18 Nov 2005; Marcus D. Hanwell qt-4.0.1.ebuild: + Marked ~amd64, bug 112811. + + 17 Nov 2005; Caleb Tennis qt-4.0.1.ebuild: + Moving to ~x86 + +*qt-4.1.0_pre20051028 (28 Oct 2005) + + 28 Oct 2005; Caleb Tennis +qt-4.1.0_pre20051028.ebuild: + Adding a 4.1.0 snapshot to track its progress upstream + + 09 Oct 2005; +files/qt-3.3.5-macos.patch, + qt-3.3.5.ebuild: + macos patch fixes for qt-3.3.5 + + 02 Oct 2005; Aron Griffis qt-3.3.4-r8.ebuild: + Mark 3.3.4-r8 stable on ia64 + + 29 Sep 2005; Hardave Riar qt-3.3.4-r8.ebuild: + Stable on mips, bug #105695. + + 22 Sep 2005; Mark Loeser qt-3.3.4-r8.ebuild: + Stable on x86; bug #105695 + + 21 Sep 2005; Fernando J. Pereda qt-3.3.4-r8.ebuild: + stable on alpha wrt bug #105695 + + 20 Sep 2005; Marcus D. Hanwell qt-3.3.4-r8.ebuild: + Stable on amd64, bug 105695. + + 20 Sep 2005; Michael Hanselmann qt-3.3.4-r8.ebuild: + Stable on hppa, ppc. + + 20 Sep 2005; Gustavo Zacarias qt-3.3.4-r8.ebuild: + Stable on sparc wrt #105695 + + 20 Sep 2005; Markus Rothe qt-3.3.4-r8.ebuild: + Stable on ppc64 (bug #105695) + +*qt-3.3.4-r8 (19 Sep 2005) + + 19 Sep 2005; Caleb Tennis +qt-3.3.4-r8.ebuild, + qt-4.0.1.ebuild: + Adding 3.3.4-r8 which is the same as -r7 except we force the build to use + the system zlib instead of allowing the option via the use flag, as this + gets us past the zlib error, which is fixed in 3.3.5 but which isn't ready + to go stable yet (see bug #105695) + +*qt-3.3.5 (17 Sep 2005) + + 17 Sep 2005; Caleb Tennis + +files/qt-3.3.5-uic-fix.patch, +qt-3.3.5.ebuild: + Version bump to 3.3.5 + + 17 Sep 2005; Aron Griffis qt-3.3.4-r3.ebuild: + Mark 3.3.4-r3 stable on alpha + + 02 Sep 2005; files/qt-3.3.4-macos.patch: + Fix for Mac OS X library install names. Libraries now reference each other + in /usr/qt/3/lib. Thanks j4rg0n for catching where the error was. + diff --git a/x11-libs/qt-meta/Manifest b/x11-libs/qt-meta/Manifest new file mode 100644 index 00000000..5a288025 --- /dev/null +++ b/x11-libs/qt-meta/Manifest @@ -0,0 +1,21 @@ +AUX 0001-dnd_optimization.patch 5623 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 SHA1 4f3416c3a7e44d52c1088c52256decb384e4b1bc SHA256 8e138a2fdd053ec81522df19ce30f7e4c05838dfd8e0c8069ffb793ba45d7439 +AUX 0002-dnd_active_window_fix.patch 7289 RMD160 b355f5fd028d35d88ca15bf9ce8da41bd365f12d SHA1 5b16995f072cbde80f000967aa11d8a88ed34e23 SHA256 e36383b43a53b815f3958608275c60299a0638b6b3201c3a3d9318ee2ead26d1 +AUX 0038-dragobject-dont-prefer-unknown.patch 2551 RMD160 0a89aec1a6f9672a927029ca01a1bd8573552745 SHA1 3a2371a520d800904350bb9e6e445d6b3092bb88 SHA256 b5c0d00d1ac84302bc2123ccdfdab473cd0daf12f4ba70d6318084d9f744242c +AUX 0044-qscrollview-windowactivate-fix.diff 1584 RMD160 978cc6c473b668e1bfd5969cce9307719baecf0a SHA1 657ff8ab47aafbd6469688f489fd3788ccb98907 SHA256 f73798b72251d6fe97ed8e661719ba29983c087587ed952618ec4a97bf1816d5 +AUX 0047-fix-kmenu-widget.diff 992 RMD160 bada5e23043d314b15f3af1eda70c8833112ebce SHA1 d67e34b540c2f19e7e3e3715535a6732f447b22c SHA256 0dadffc3218b04eb327baf51c1f681843046cdf07a52b943f46373cd8384c275 +AUX 0048-qclipboard_hack_80072.patch 1662 RMD160 ebfba0d27c03dcceeac7ad64650d5f6d7039ecdb SHA1 5c174acaf3b148f8d70345f68c7f22352450d582 SHA256 e47a1af0272e952cefacd30d466861b40d9bc969f6e5bc5cb32b878140af1d3c +AUX qt-3.3.8-fix-compiler-detection.patch 637 RMD160 08b7151a83031f0c268da2899d800742a5ed63cf SHA1 7c571a1c98bd29acf4e32fd15b1c9188b7d69bec SHA256 639cd7fb8548f67a51065efba8bb2deecd4778b451855bf28dac1bd9701cd9d5 +AUX qt-3.3.8-immqt+gcc-4.3.patch 756 RMD160 b4379b8c66b2708301f9883ecc1be55ae916a20f SHA1 179825f382fab2cadd097f7597292a69ef71d575 SHA256 d281c1e1f20cdc4f3351eede25287ba3b6bd80cbb0e6f5a9f997394521feb6bd +AUX qt-3.3.8-libpng14.patch 1680 RMD160 922a2ff3c98eb871e860ddd09b4ef2fe291f1687 SHA1 6532104043beef4ef57981dd1598aa0ffc0c2b73 SHA256 d4b63e1d2df1cf15e30f611fe04de1e1ad4ec48e2fce609f18797534f808da30 +AUX qt-3.3.8-mips.patch 1326 RMD160 0fd662a36c2fe0013e7204218ddfc8c604467269 SHA1 a8d1cf81f4b2c35c46b1d0efacd5e5ad7811ec49 SHA256 982a92c010df448cb83c2e6a8f46a4f8979d8b5708b2942485cca962621f0caf +AUX qt-3.3.8-seli-xinerama.patch 1960 RMD160 ce0163c9a47f5417f957e1d1ad0c574357c01cc7 SHA1 60b9c0a323d598aacca089d677c4b1c9709e70db SHA256 ec72679b69148af1b687a9cf7992e20ee85f4a0f3a33f3c05c8d2174f6f43503 +AUX qt-3.3.8-uic-fix.patch 711 RMD160 19964cfc6714e2ad38659e268ef248501db606aa SHA1 38bd5da513a2c28f3d941ba5644024643d835676 SHA256 e6a4e789c6c0da5542cad71057d1817e1976d005a52e1e4ef9bcf9914c37fcf3 +AUX qt-3.3.8-visibility.patch 5554 RMD160 db15a594a913fd1c1837a731e168b1197d19da62 SHA1 692ada218ed717b8b2fc5f5f67cf747bb50f59e4 SHA256 b33b2415f280ef25f070bbe7308659ee3e5a5c1999e2ef419271f11e59160407 +AUX qt-3.3.8b-cjk-fix.patch 1191 RMD160 62cc0a9db2ab42b9081967033ae75b0a0eed9e93 SHA1 24bf196b466f4b3956149b29830b158944b6a545 SHA256 94369e7cca8531ed89370480c2d5f3a0e99dbb49640df715ef33711b9d1cae4b +AUX qt-ulibc.patch 355 RMD160 9a7a01b248b7b646316cef550783569f8bdc89e2 SHA1 2f09deb7e354797ee72aa65a35c882a5ed5fd86c SHA256 6b57b1e25c1e2cebd51b8279fbcadb5e2d9bb77d19b10ea51a4f74c64bd65e2d +DIST qt-x11-free-3.3.8b.tar.gz 17313883 RMD160 4e3cbd9c5d4719b5d33e961e6595d7b215788c8b SHA1 745def6250dc7f337dbb265e20bf38dcb41fd854 SHA256 1b7a1ff62ec5a9cb7a388e2ba28fda6f960b27f27999482ebeceeadb72ac9f6e +DIST qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387 RMD160 7f4f79c95faa2b8e71a78308af8feae5f6a6b06a SHA1 230cc532f1a3023967c5aee4cce87d1b9351b73d SHA256 06994304d2b7c699c4b6ea4183877652e261170f74282e89a3700ce6d4a98918 +EBUILD qt-meta-3.3.8b-r1.ebuild 10834 RMD160 f9469dfa04cccc3313d83d595ec1f7c230b21204 SHA1 c61d32bf049ed7d4d3726920c4457395bf856a7d SHA256 be77144868df6737bb87d66997cde870169536b62d6cafa25fc9a2aee59ad58c +EBUILD qt-meta-3.3.8b-r2.ebuild 10852 RMD160 33f807231b2e1bf0bc212f9186230a2f15d6a188 SHA1 6c168b4fdf20a7499d6f7dc1609a9f30548d487e SHA256 0b61d43e09ae880ca572a8761eef8cffef14147704653fa2e6bb40bf69150cf0 +MISC ChangeLog 48679 RMD160 59534c174e15ab89e54ed7c273c4ff354eee6ba1 SHA1 4dce695f24a52831deea66fe4cf4d667f1fc56e2 SHA256 0cbe4374e69e5188074f086c4ef3e71f43f12e9b43dd712b9c9af8311b5379bc +MISC metadata.xml 335 RMD160 76be6bdf3a132836b4cf22c0a8a45f29efe4af83 SHA1 5f6aa35732fc54d6b10f9dc113b07e26b0513159 SHA256 53934f5173007d42204665e1561d36656c6ecf587162b8eb4e289fcfa88c577a diff --git a/x11-libs/qt-meta/files/0001-dnd_optimization.patch b/x11-libs/qt-meta/files/0001-dnd_optimization.patch new file mode 100644 index 00000000..d9de2846 --- /dev/null +++ b/x11-libs/qt-meta/files/0001-dnd_optimization.patch @@ -0,0 +1,187 @@ +qt-bugs@ issue : 16115 +applied: no +author: Lubos Lunak + +See http://lists.kde.org/?t=104388858900001&r=1&w=2 + + +--- src/kernel/qdnd_x11.cpp.sav 2003-02-05 16:09:45.000000000 +0100 ++++ src/kernel/qdnd_x11.cpp 2003-02-07 16:14:49.000000000 +0100 +@@ -49,13 +49,15 @@ + #include "qdragobject.h" + #include "qobjectlist.h" + #include "qcursor.h" ++#include "qbitmap.h" ++#include "qpainter.h" + + #include "qt_x11_p.h" + + // conflict resolution + +-// unused, may be used again later: const int XKeyPress = KeyPress; +-// unused, may be used again later: const int XKeyRelease = KeyRelease; ++const int XKeyPress = KeyPress; ++const int XKeyRelease = KeyRelease; + #undef KeyPress + #undef KeyRelease + +@@ -249,20 +251,47 @@ class QShapedPixmapWidget : public QWidg + public: + QShapedPixmapWidget(int screen = -1) : + QWidget(QApplication::desktop()->screen( screen ), +- 0, WStyle_Customize | WStyle_Tool | WStyle_NoBorder | WX11BypassWM ) ++ 0, WStyle_Customize | WStyle_Tool | WStyle_NoBorder | WX11BypassWM ), oldpmser( 0 ), oldbmser( 0 ) + { + } + +- void setPixmap(QPixmap pm) ++ void setPixmap(QPixmap pm, QPoint hot) + { +- if ( pm.mask() ) { ++ int bmser = pm.mask() ? pm.mask()->serialNumber() : 0; ++ if( oldpmser == pm.serialNumber() && oldbmser == bmser ++ && oldhot == hot ) ++ return; ++ oldpmser = pm.serialNumber(); ++ oldbmser = bmser; ++ oldhot = hot; ++ bool hotspot_in = !(hot.x() < 0 || hot.y() < 0 || hot.x() >= pm.width() || hot.y() >= pm.height()); ++// if the pixmap has hotspot in its area, make a "hole" in it at that position ++// this will allow XTranslateCoordinates() to find directly the window below the cursor instead ++// of finding this pixmap, and therefore there won't be needed any (slow) search for the window ++// using findRealWindow() ++ if( hotspot_in ) { ++ QBitmap mask = pm.mask() ? *pm.mask() : QBitmap( pm.width(), pm.height()); ++ if( !pm.mask()) ++ mask.fill( Qt::color1 ); ++ QPainter p( &mask ); ++ p.setPen( Qt::color0 ); ++ p.drawPoint( hot.x(), hot.y()); ++ p.end(); ++ pm.setMask( mask ); ++ setMask( mask ); ++ } else if ( pm.mask() ) { + setMask( *pm.mask() ); + } else { + clearMask(); + } + resize(pm.width(),pm.height()); + setErasePixmap(pm); ++ erase(); + } ++private: ++ int oldpmser; ++ int oldbmser; ++ QPoint oldhot; + }; + + QShapedPixmapWidget * qt_xdnd_deco = 0; +@@ -859,6 +888,45 @@ void QDragManager::timerEvent( QTimerEve + move( QCursor::pos() ); + } + ++static bool qt_xdnd_was_move = false; ++static bool qt_xdnd_found = false; ++// check whole incoming X queue for move events ++// checking whole queue is done by always returning False in the predicate ++// if there's another move event in the queue, and there's not a mouse button ++// or keyboard or ClientMessage event before it, the current move event ++// may be safely discarded ++// this helps avoiding being overloaded by being flooded from many events ++// from the XServer ++static ++Bool qt_xdnd_predicate( Display*, XEvent* ev, XPointer ) ++{ ++ if( qt_xdnd_found ) ++ return False; ++ if( ev->type == MotionNotify ) ++ { ++ qt_xdnd_was_move = true; ++ qt_xdnd_found = true; ++ } ++ if( ev->type == ButtonPress || ev->type == ButtonRelease ++ || ev->type == XKeyPress || ev->type == XKeyRelease ++ || ev->type == ClientMessage ) ++ { ++ qt_xdnd_was_move = false; ++ qt_xdnd_found = true; ++ } ++ return False; ++} ++ ++static ++bool qt_xdnd_another_movement() ++{ ++ qt_xdnd_was_move = false; ++ qt_xdnd_found = false; ++ XEvent dummy; ++ XCheckIfEvent( qt_xdisplay(), &dummy, qt_xdnd_predicate, NULL ); ++ return qt_xdnd_was_move; ++} ++ + bool QDragManager::eventFilter( QObject * o, QEvent * e) + { + if ( beingCancelled ) { +@@ -881,8 +949,10 @@ bool QDragManager::eventFilter( QObject + + if ( e->type() == QEvent::MouseMove ) { + QMouseEvent* me = (QMouseEvent *)e; +- updateMode(me->stateAfter()); +- move( me->globalPos() ); ++ if( !qt_xdnd_another_movement()) { ++ updateMode(me->stateAfter()); ++ move( me->globalPos() ); ++ } + return TRUE; + } else if ( e->type() == QEvent::MouseButtonRelease ) { + qApp->removeEventFilter( this ); +@@ -1106,7 +1176,7 @@ void QDragManager::move( const QPoint & + delete qt_xdnd_deco; + qt_xdnd_deco = new QShapedPixmapWidget( screen ); + } +- updatePixmap(); ++ updatePixmap( globalPos ); + + if ( qt_xdnd_source_sameanswer.contains( globalPos ) && + qt_xdnd_source_sameanswer.isValid() ) { +@@ -1679,7 +1749,7 @@ bool QDragManager::drag( QDragObject * o + // qt_xdnd_source_object persists until we get an xdnd_finish message + } + +-void QDragManager::updatePixmap() ++void QDragManager::updatePixmap( const QPoint& cursorPos ) + { + if ( qt_xdnd_deco ) { + QPixmap pm; +@@ -1694,9 +1764,8 @@ void QDragManager::updatePixmap() + defaultPm = new QPixmap(default_pm); + pm = *defaultPm; + } +- qt_xdnd_deco->setPixmap(pm); +- qt_xdnd_deco->move(QCursor::pos()-pm_hot); +- qt_xdnd_deco->repaint(FALSE); ++ qt_xdnd_deco->setPixmap(pm, pm_hot); ++ qt_xdnd_deco->move(cursorPos-pm_hot); + //if ( willDrop ) { + qt_xdnd_deco->show(); + //} else { +@@ -1705,4 +1774,9 @@ void QDragManager::updatePixmap() + } + } + ++void QDragManager::updatePixmap() ++{ ++ updatePixmap( QCursor::pos()); ++} ++ + #endif // QT_NO_DRAGANDDROP +--- src/kernel/qdragobject.h.sav 2002-11-01 19:25:07.000000000 +0100 ++++ src/kernel/qdragobject.h 2001-01-01 01:01:00.000000000 +0100 +@@ -245,6 +245,7 @@ private: + void move( const QPoint & ); + void drop(); + void updatePixmap(); ++ void updatePixmap( const QPoint& cursorPos ); + + private: + QDragObject * object; diff --git a/x11-libs/qt-meta/files/0002-dnd_active_window_fix.patch b/x11-libs/qt-meta/files/0002-dnd_active_window_fix.patch new file mode 100644 index 00000000..4b497d64 --- /dev/null +++ b/x11-libs/qt-meta/files/0002-dnd_active_window_fix.patch @@ -0,0 +1,189 @@ +qt-bugs@ issue : 25122 +applied: no +author: Lubos Lunak + + Hello, + + for example: Open Konqueror window, showing some files. Start dragging one + desktop icon. If you press/release Ctrl, there'll be a '+' attached to the + icon, showing the DND operation. Now, while still doing DND, make the + Konqueror window active (Alt+Tab with KDE-3.1.2+, hover over its taskbar + entry, Ctrl+Fn to switch to a different virtual desktop, etc.). As soon as + the app performing DND is not the active application, and the mouse is not + moving, pressing/releasing Ctrl doesn't do anything, the state only updates + when the mouse is moved. + + This is caused by the fact that Qt has only pointer grab when doing DND, but + doesn't have keyboard grab. I actually consider this a good thing, because + the only keys important for DND are modifiers, and they come together with + pointer events, and not having keyboard grab allows using keyboard shortcuts + like Alt+Tab while DND. However, when the mouse is not moved, and only a + modifier key is pressed/released, the app won't get any mouse event, and + won't also get the keyboard event. + + The attached patch changes Qt to explicitly check the modifiers state using + XQueryPointer() if there's wasn't recently any mouse/keyboard event, which + ensures the state is updated even in the situation described above. + +--- src/kernel/qapplication_x11.cpp.sav 2003-06-21 12:31:35.000000000 +0200 ++++ src/kernel/qapplication_x11.cpp 2003-06-21 12:35:44.000000000 +0200 +@@ -4053,7 +4053,7 @@ void QApplication::closePopup( QWidget * + // Keyboard event translation + // + +-static int translateButtonState( int s ) ++int qt_x11_translateButtonState( int s ) + { + int bst = 0; + if ( s & Button1Mask ) +@@ -4119,7 +4119,7 @@ bool QETWidget::translateMouseEvent( con + pos.ry() = lastMotion.y; + globalPos.rx() = lastMotion.x_root; + globalPos.ry() = lastMotion.y_root; +- state = translateButtonState( lastMotion.state ); ++ state = qt_x11_translateButtonState( lastMotion.state ); + if ( qt_button_down && (state & (LeftButton | + MidButton | + RightButton ) ) == 0 ) +@@ -4143,7 +4143,7 @@ bool QETWidget::translateMouseEvent( con + pos.ry() = xevent->xcrossing.y; + globalPos.rx() = xevent->xcrossing.x_root; + globalPos.ry() = xevent->xcrossing.y_root; +- state = translateButtonState( xevent->xcrossing.state ); ++ state = qt_x11_translateButtonState( xevent->xcrossing.state ); + if ( qt_button_down && (state & (LeftButton | + MidButton | + RightButton ) ) == 0 ) +@@ -4155,7 +4155,7 @@ bool QETWidget::translateMouseEvent( con + pos.ry() = event->xbutton.y; + globalPos.rx() = event->xbutton.x_root; + globalPos.ry() = event->xbutton.y_root; +- state = translateButtonState( event->xbutton.state ); ++ state = qt_x11_translateButtonState( event->xbutton.state ); + switch ( event->xbutton.button ) { + case Button1: button = LeftButton; break; + case Button2: button = MidButton; break; +@@ -4950,7 +4950,7 @@ bool QETWidget::translateKeyEventInterna + XKeyEvent xkeyevent = event->xkey; + + // save the modifier state, we will use the keystate uint later by passing +- // it to translateButtonState ++ // it to qt_x11_translateButtonState + uint keystate = event->xkey.state; + // remove the modifiers where mode_switch exists... HPUX machines seem + // to have alt *AND* mode_switch both in Mod1Mask, which causes +@@ -5064,7 +5064,7 @@ bool QETWidget::translateKeyEventInterna + } + #endif // !QT_NO_XIM + +- state = translateButtonState( keystate ); ++ state = qt_x11_translateButtonState( keystate ); + + static int directionKeyEvent = 0; + if ( qt_use_rtl_extensions && type == QEvent::KeyRelease ) { +--- src/kernel/qdnd_x11.cpp.sav 2003-06-30 15:26:42.000000000 +0200 ++++ src/kernel/qdnd_x11.cpp 2003-06-30 15:32:23.000000000 +0200 +@@ -114,6 +114,8 @@ Atom qt_xdnd_finished; + Atom qt_xdnd_type_list; + const int qt_xdnd_version = 4; + ++extern int qt_x11_translateButtonState( int s ); ++ + // Actions + // + // The Xdnd spec allows for user-defined actions. This could be implemented +@@ -198,6 +200,8 @@ static Atom qt_xdnd_source_current_time; + static int qt_xdnd_current_screen = -1; + // state of dragging... true if dragging, false if not + bool qt_xdnd_dragging = FALSE; ++// need to check state of keyboard modifiers ++static bool need_modifiers_check = FALSE; + + // dict of payload data, sorted by type atom + static QIntDict * qt_xdnd_target_data = 0; +@@ -879,8 +883,20 @@ void qt_handle_xdnd_finished( QWidget *, + + void QDragManager::timerEvent( QTimerEvent* e ) + { +- if ( e->timerId() == heartbeat && qt_xdnd_source_sameanswer.isNull() ) +- move( QCursor::pos() ); ++ if ( e->timerId() == heartbeat ) { ++ if( need_modifiers_check ) { ++ Window root, child; ++ int root_x, root_y, win_x, win_y; ++ unsigned int mask; ++ XQueryPointer( qt_xdisplay(), qt_xrootwin( qt_xdnd_current_screen ), ++ &root, &child, &root_x, &root_y, &win_x, &win_y, &mask ); ++ if( updateMode( (ButtonState)qt_x11_translateButtonState( mask ))) ++ qt_xdnd_source_sameanswer = QRect(); // force move ++ } ++ need_modifiers_check = TRUE; ++ if( qt_xdnd_source_sameanswer.isNull() ) ++ move( QCursor::pos() ); ++ } + } + + static bool qt_xdnd_was_move = false; +@@ -948,6 +964,7 @@ bool QDragManager::eventFilter( QObject + updateMode(me->stateAfter()); + move( me->globalPos() ); + } ++ need_modifiers_check = FALSE; + return TRUE; + } else if ( e->type() == QEvent::MouseButtonRelease ) { + qApp->removeEventFilter( this ); +@@ -986,9 +1003,11 @@ bool QDragManager::eventFilter( QObject + beingCancelled = FALSE; + qApp->exit_loop(); + } else { +- updateMode(ke->stateAfter()); +- qt_xdnd_source_sameanswer = QRect(); // force move +- move( QCursor::pos() ); ++ if( updateMode(ke->stateAfter())) { ++ qt_xdnd_source_sameanswer = QRect(); // force move ++ move( QCursor::pos() ); ++ } ++ need_modifiers_check = FALSE; + } + return TRUE; // Eat all key events + } +@@ -1014,10 +1033,10 @@ bool QDragManager::eventFilter( QObject + + + static Qt::ButtonState oldstate; +-void QDragManager::updateMode( ButtonState newstate ) ++bool QDragManager::updateMode( ButtonState newstate ) + { + if ( newstate == oldstate ) +- return; ++ return false; + const int both = ShiftButton|ControlButton; + if ( (newstate & both) == both ) { + global_requested_action = QDropEvent::Link; +@@ -1041,6 +1060,7 @@ void QDragManager::updateMode( ButtonSta + } + } + oldstate = newstate; ++ return true; + } + + +@@ -1707,6 +1727,7 @@ bool QDragManager::drag( QDragObject * o + qt_xdnd_source_sameanswer = QRect(); + move(QCursor::pos()); + heartbeat = startTimer(200); ++ need_modifiers_check = FALSE; + + #ifndef QT_NO_CURSOR + qApp->setOverrideCursor( arrowCursor ); +--- src/kernel/qdragobject.h.sav 2003-05-19 22:34:43.000000000 +0200 ++++ src/kernel/qdragobject.h 2001-01-01 01:01:00.000000000 +0100 +@@ -248,7 +248,7 @@ private: + + private: + QDragObject * object; +- void updateMode( ButtonState newstate ); ++ bool updateMode( ButtonState newstate ); + void updateCursor(); + + QWidget * dragSource; diff --git a/x11-libs/qt-meta/files/0038-dragobject-dont-prefer-unknown.patch b/x11-libs/qt-meta/files/0038-dragobject-dont-prefer-unknown.patch new file mode 100644 index 00000000..ae4163ae --- /dev/null +++ b/x11-libs/qt-meta/files/0038-dragobject-dont-prefer-unknown.patch @@ -0,0 +1,57 @@ +qt-bugs@ issue : 38642 +bugs.kde.org number : 71084 +applied: no +author: Lubos Lunak + +Hello, + + start Mozilla, go e.g. to http://kde.org, start KWrite (or basically any Qt +app that accepts text drops), select 'Conquer your Desktop!', and try to +drag&drop it onto KWrite. The only text pasted should be 'm'. + + I don't know much the related mimetype and encoding stuff, so I'm unsure +whose fault this actually is. The text drag is provided as a lot of +text/something targets, to list some text/_moz_htmlinfo, text/x-moz-url, +text/unicode and similar. The problem is, Kate uses QTextDrag::decode() with +no subtype specified, probably with the intention that as Kate is a text +editor, it can accept any text pasted. And since the first target provided by +mozilla is text/x-moz-url, (which moreover seems to be encoded as 16bit +unicode), the text dropped is completely wrong. You can easily see all +targets provided by Mozilla with see_mime.patch applied. + + Solution #1: Say that Kate (any pretty much everybody else expecting text) +should say "plain" as the subtype. In such case, I suggest you drop the +QTextDrag::decode() variant with no subtype specified, and stress more the +fact that not specifying a subtype can result in a lot of rubbish. It's +simply too tempting to leave the subtype empty and try to accept anything. + + Solution #2: When trying to accept anything, try to get useful data. Which +means either sorting the subtypes available somehow, checking only the ones +Qt knows. + + To me, #1 seems to be a better choice, or possibly at least something like +the attached QTextDrag patch, which simply always tries first "plain" subtype +if none is specified. With this patch, Mozilla even works (that's irony, of +course, Mozilla still pastes the text/plain text as HTML, but at least now it +pastes something where it's easy to point at the offender). + + +--- src/kernel/qdragobject.cpp.sav 2004-01-06 19:24:35.000000000 +0100 ++++ src/kernel/qdragobject.cpp 2004-01-06 19:47:01.000000000 +0100 +@@ -844,6 +844,16 @@ bool QTextDrag::decode( const QMimeSourc + { + if(!e) + return FALSE; ++ ++ // when subtype is not specified, try text/plain first, otherwise this may read ++ // things like text/x-moz-url even though better targets are available ++ if( subtype.isNull()) { ++ QCString subtmp = "plain"; ++ if( decode( e, str, subtmp )) { ++ subtype = subtmp; ++ return true; ++ } ++ } + + if ( e->cacheType == QMimeSource::Text ) { + str = *e->cache.txt.str; diff --git a/x11-libs/qt-meta/files/0044-qscrollview-windowactivate-fix.diff b/x11-libs/qt-meta/files/0044-qscrollview-windowactivate-fix.diff new file mode 100644 index 00000000..9a6df32a --- /dev/null +++ b/x11-libs/qt-meta/files/0044-qscrollview-windowactivate-fix.diff @@ -0,0 +1,38 @@ +qt-bugs@ issue : N45716 +applied: no +author: Enrico Ros + +QScrollView unwanted repaint fix. + +This fixes the 'flashing' konqueror window on activation / deactivation by +saving 1 unwanted repaint (when konqueror window has background). +I tracked down to the problem to the internal QViewportWidget of the +QScrollView class. + +When a window is activated the activation event is recursively propagated +to all childs triggering the windowActivationChange() functions in the +widget it passes by. +What happens when the event gets to the Viewport? +At this point the event has already been handled by windowActivationChange() +of the parent widget (a QIconView for example) and has then been propagated +to the Viewport that will handle it with the default +QWidget::windowActivationChange implementation, maybe raising an unwanted +update(); so here we stop the event. +As an addition: if the parent reimplements the windowActivationChange() +function, mainly to block the update, it won't be happy if the child will +trigger the update. If the parent do not reimplement the function il will +inherits the default implementation and there is no need for the viewport's +one. + +--- src/widgets/qscrollview.cpp.orig 2004-03-29 10:17:04.000000000 +0000 ++++ src/widgets/qscrollview.cpp 2004-03-30 16:40:07.599978320 +0000 +@@ -1551,6 +1551,9 @@ + case QEvent::LayoutHint: + d->autoResizeHint(this); + break; ++ case QEvent::WindowActivate: ++ case QEvent::WindowDeactivate: ++ return TRUE; + default: + break; + } diff --git a/x11-libs/qt-meta/files/0047-fix-kmenu-widget.diff b/x11-libs/qt-meta/files/0047-fix-kmenu-widget.diff new file mode 100644 index 00000000..fb0bb167 --- /dev/null +++ b/x11-libs/qt-meta/files/0047-fix-kmenu-widget.diff @@ -0,0 +1,25 @@ +qt-bugs@ issue: N46882 +bugs.kde.org number: 77545 +applied: no +author: Stephan Binner + +Fix wrong K menu width for the case of enabled side pixmap and a menu title +(like "Recently Used Applications") being longer than every other entry. + +Solution: Respect PanelKMenu::setMaximumSize() as up to Qt 3.2.3 + +Index: src/widgets/qpopupmenu.cpp +=================================================================== +RCS file: /home/kde/qt-copy/src/widgets/qpopupmenu.cpp,v +retrieving revision 1.60 +diff -u -3 -p -b -r1.60 qpopupmenu.cpp +--- src/widgets/qpopupmenu.cpp 29 Apr 2004 22:31:28 -0000 1.60 ++++ src/widgets/qpopupmenu.cpp 30 Apr 2004 01:11:59 -0000 +@@ -2531,7 +2531,7 @@ QSize QPopupMenu::sizeHint() const + + QPopupMenu* that = (QPopupMenu*) this; + //We do not need a resize here, just the sizeHint.. +- return that->updateSize(FALSE, FALSE).expandedTo( QApplication::globalStrut() ); ++ return that->updateSize(FALSE).expandedTo( QApplication::globalStrut() ); + } + diff --git a/x11-libs/qt-meta/files/0048-qclipboard_hack_80072.patch b/x11-libs/qt-meta/files/0048-qclipboard_hack_80072.patch new file mode 100644 index 00000000..74c60fb2 --- /dev/null +++ b/x11-libs/qt-meta/files/0048-qclipboard_hack_80072.patch @@ -0,0 +1,48 @@ +qt-bugs@ issue : none, probably even won't be +bugs.kde.org number : 80072 +applied: no +author: Lubos Lunak + +A crude hack for KDE #80072. No good idea how to fix it properly yet :(. + +--- src/kernel/qclipboard_x11.cpp.sav 2004-04-30 12:00:06.000000000 +0200 ++++ src/kernel/qclipboard_x11.cpp 2004-05-09 21:18:10.269264304 +0200 +@@ -109,6 +109,7 @@ static int pending_timer_id = 0; + static bool pending_clipboard_changed = FALSE; + static bool pending_selection_changed = FALSE; + ++Q_EXPORT bool qt_qclipboard_bailout_hack = false; + + // event capture mechanism for qt_xclb_wait_for_event + static bool waiting_for_data = FALSE; +@@ -453,6 +454,15 @@ static int qt_xclb_event_filter(XEvent * + return 0; + } + ++static bool selection_request_pending = false; ++ ++static Bool check_selection_request_pending( Display*, XEvent* e, XPointer ) ++ { ++ if( e->type == SelectionRequest && e->xselectionrequest.owner == owner->winId()) ++ selection_request_pending = true; ++ return False; ++ } ++ + bool qt_xclb_wait_for_event( Display *dpy, Window win, int type, XEvent *event, + int timeout ) + { +@@ -504,6 +514,14 @@ bool qt_xclb_wait_for_event( Display *dp + do { + if ( XCheckTypedWindowEvent(dpy,win,type,event) ) + return TRUE; ++ if( qt_qclipboard_bailout_hack ) { ++ XEvent dummy; ++ selection_request_pending = false; ++ if ( owner != NULL ) ++ XCheckIfEvent(dpy,&dummy,check_selection_request_pending,NULL); ++ if( selection_request_pending ) ++ return TRUE; ++ } + + now = QTime::currentTime(); + if ( started > now ) // crossed midnight diff --git a/x11-libs/qt-meta/files/qt-3.3.8-fix-compiler-detection.patch b/x11-libs/qt-meta/files/qt-3.3.8-fix-compiler-detection.patch new file mode 100644 index 00000000..203b71e6 --- /dev/null +++ b/x11-libs/qt-meta/files/qt-3.3.8-fix-compiler-detection.patch @@ -0,0 +1,22 @@ +--- qt-x11-free-3.3.8-orig/configure 2008-10-28 15:43:35.000000000 +0100 ++++ qt-x11-free-3.3.8/configure 2008-10-28 15:45:48.000000000 +0100 +@@ -3079,15 +3079,15 @@ + g++*) + # GNU C++ + QMAKE_CONF_COMPILER=`grep "QMAKE_CXX[^_A-Z0-9a-z]" $QMAKESPEC/qmake.conf | sed "s,.* *= *\(.*\)$,\1,"` +- COMPILER_VERSION=`${QMAKE_CONF_COMPILER} --version 2>/dev/null` ++ COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -dumpversion 2>/dev/null` + case "$COMPILER_VERSION" in +- *2.95.*) ++ 2.95.*) + COMPILER_VERSION="2.95.*" + ;; +- *3.*) ++ 3.*) + COMPILER_VERSION="3.*" + ;; +- *4.*) ++ 4.*) + COMPILER_VERSION="4" + ;; + *) diff --git a/x11-libs/qt-meta/files/qt-3.3.8-immqt+gcc-4.3.patch b/x11-libs/qt-meta/files/qt-3.3.8-immqt+gcc-4.3.patch new file mode 100644 index 00000000..65610e37 --- /dev/null +++ b/x11-libs/qt-meta/files/qt-3.3.8-immqt+gcc-4.3.patch @@ -0,0 +1,20 @@ +--- plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp~ 2007-04-05 09:47:44.000000000 +0000 ++++ plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp 2007-04-05 09:48:08.000000000 +0000 +@@ -44,6 +44,7 @@ + #include "qnoneinputcontextplugin.h" + #include + #include ++#include + + + QNoneInputContextPlugin::QNoneInputContextPlugin() +--- plugins/src/inputmethods/simple/qsimpleinputcontext.cpp~ 2007-04-05 09:48:46.000000000 +0000 ++++ plugins/src/inputmethods/simple/qsimpleinputcontext.cpp 2007-04-05 09:48:54.000000000 +0000 +@@ -45,6 +45,7 @@ + #include + #include + #include ++#include + + static const int ignoreKeys[] = { + Qt::Key_Shift, diff --git a/x11-libs/qt-meta/files/qt-3.3.8-libpng14.patch b/x11-libs/qt-meta/files/qt-3.3.8-libpng14.patch new file mode 100644 index 00000000..8906e6f5 --- /dev/null +++ b/x11-libs/qt-meta/files/qt-3.3.8-libpng14.patch @@ -0,0 +1,42 @@ +--- qt-x11-free-3.3.8b-x/src/kernel/qpngio.cpp 2008-01-15 20:09:13.000000000 +0100 ++++ qt-x11-free-3.3.8b/src/kernel/qpngio.cpp 2010-02-16 00:13:11.000000000 +0100 +@@ -162,7 +162,11 @@ + image.setColor( i, qRgba(c,c,c,0xff) ); + } + if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { ++#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4 ) ++ const int g = info_ptr->trans_color.gray; ++#else + const int g = info_ptr->trans_values.gray; ++#endif + if (g < ncols) { + image.setAlphaBuffer(TRUE); + image.setColor(g, image.color(g) & RGB_MASK); +@@ -190,7 +194,11 @@ + info_ptr->palette[i].red, + info_ptr->palette[i].green, + info_ptr->palette[i].blue, ++#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4 ) ++ info_ptr->trans_alpha[i] ++#else + info_ptr->trans[i] ++#endif + ) + ); + i++; +@@ -324,9 +332,15 @@ + png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) + if (image.depth()==32 && png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { + QRgb trans = 0xFF000000 | qRgb( ++#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4 ) ++ (info_ptr->trans_color.red << 8 >> bit_depth)&0xff, ++ (info_ptr->trans_color.green << 8 >> bit_depth)&0xff, ++ (info_ptr->trans_color.blue << 8 >> bit_depth)&0xff); ++#else + (info_ptr->trans_values.red << 8 >> bit_depth)&0xff, + (info_ptr->trans_values.green << 8 >> bit_depth)&0xff, + (info_ptr->trans_values.blue << 8 >> bit_depth)&0xff); ++#endif + for (uint y=0; ywidth; x++) { + if (((uint**)jt)[y][x] == trans) { diff --git a/x11-libs/qt-meta/files/qt-3.3.8-mips.patch b/x11-libs/qt-meta/files/qt-3.3.8-mips.patch new file mode 100644 index 00000000..1f70900f --- /dev/null +++ b/x11-libs/qt-meta/files/qt-3.3.8-mips.patch @@ -0,0 +1,39 @@ +Bug 210551. +Fix compilation on mips + +Original commit message by Christopher Martin, debian bug 342545. + + * Add a patch, courtesy of Steve Langasek, that fixes + qt-x11-free's longstanding intermittent FTBFS on hppa, caused + by "the bogus assumption in src/tools/qlocale.cpp that a + char[] can be cast to a double *." (Closes: #342545) + +--- qt-x11-free-3.3.6.orig/src/tools/qlocale.cpp ++++ qt-x11-free-3.3.6/src/tools/qlocale.cpp +@@ -122,13 +122,24 @@ + #endif + + // We can't rely on -NAN, since all operations on a NAN should return a NAN. ++static double be_neg_nan; ++static double le_neg_nan; + static const unsigned char be_neg_nan_bytes[] = { 0xff, 0xf8, 0, 0, 0, 0, 0, 0 }; + static const unsigned char le_neg_nan_bytes[] = { 0, 0, 0, 0, 0, 0, 0xf8, 0xff }; ++static bool neg_nan_init = false; ++ + static inline double negNan() + { ++ if (!neg_nan_init) ++ { ++ memcpy(&be_neg_nan,be_neg_nan_bytes,sizeof(be_neg_nan_bytes)); ++ memcpy(&le_neg_nan,le_neg_nan_bytes,sizeof(le_neg_nan_bytes)); ++ neg_nan_init = true; ++ } + return (ByteOrder == BigEndian ? +- *((const double *) be_neg_nan_bytes) : +- *((const double *) le_neg_nan_bytes)); ++ be_neg_nan : ++ le_neg_nan); ++ + } + + // Sizes as defined by the ISO C99 standard - fallback diff --git a/x11-libs/qt-meta/files/qt-3.3.8-seli-xinerama.patch b/x11-libs/qt-meta/files/qt-3.3.8-seli-xinerama.patch new file mode 100644 index 00000000..9fdd97a3 --- /dev/null +++ b/x11-libs/qt-meta/files/qt-3.3.8-seli-xinerama.patch @@ -0,0 +1,49 @@ +--- src/kernel/qapplication_x11.cpp.sav 2006-06-01 13:31:04.000000000 +0200 ++++ src/kernel/qapplication_x11.cpp 2006-06-01 13:33:07.000000000 +0200 +@@ -271,6 +271,7 @@ Atom qt_net_wm_frame_strut = 0; // KDE + Atom qt_net_wm_state_stays_on_top = 0; // KDE extension + Atom qt_net_wm_pid = 0; + Atom qt_net_wm_user_time = 0; ++Atom qt_net_wm_full_placement = 0; // KDE extension + // Enlightenment support + Atom qt_enlightenment_desktop = 0; + +@@ -1922,6 +1923,7 @@ void qt_init_internal( int *argcptr, cha + &qt_net_wm_state_stays_on_top ); + qt_x11_intern_atom( "_NET_WM_PID", &qt_net_wm_pid ); + qt_x11_intern_atom( "_NET_WM_USER_TIME", &qt_net_wm_user_time ); ++ qt_x11_intern_atom( "_NET_WM_FULL_PLACEMENT", &qt_net_wm_full_placement ); + qt_x11_intern_atom( "ENLIGHTENMENT_DESKTOP", &qt_enlightenment_desktop ); + qt_x11_intern_atom( "_NET_WM_NAME", &qt_net_wm_name ); + qt_x11_intern_atom( "_NET_WM_ICON_NAME", &qt_net_wm_icon_name ); +--- src/dialogs/qdialog.cpp.sav 2006-03-17 14:33:44.000000000 +0100 ++++ src/dialogs/qdialog.cpp 2006-06-01 13:38:00.000000000 +0200 +@@ -670,6 +670,11 @@ bool QDialog::event( QEvent *e ) + + #if defined(Q_WS_X11) + extern "C" { int XSetTransientForHint( Display *, unsigned long, unsigned long ); } ++#include ++#undef FocusIn ++// defined in qapplication_x11.cpp ++extern Atom qt_net_wm_full_placement; ++extern bool qt_net_supports(Atom atom); + #endif // Q_WS_X11 + + /*! +@@ -691,10 +696,12 @@ void QDialog::show() + + if ( !did_resize ) + adjustSize(); +- if ( has_relpos && !did_move ) { +- adjustPositionInternal( parentWidget(), TRUE ); +- } else if ( !did_move ) { +- adjustPositionInternal( parentWidget() ); ++ if( !qt_net_supports( qt_net_wm_full_placement )) { ++ if ( has_relpos && !did_move ) { ++ adjustPositionInternal( parentWidget(), TRUE ); ++ } else if ( !did_move ) { ++ adjustPositionInternal( parentWidget() ); ++ } + } + + if (windowState() != state) diff --git a/x11-libs/qt-meta/files/qt-3.3.8-uic-fix.patch b/x11-libs/qt-meta/files/qt-3.3.8-uic-fix.patch new file mode 100644 index 00000000..8e5bd559 --- /dev/null +++ b/x11-libs/qt-meta/files/qt-3.3.8-uic-fix.patch @@ -0,0 +1,18 @@ +Index: tools/designer/uic/form.cpp +=================================================================== +--- tools/designer/uic/form.cpp (revision 460038) ++++ tools/designer/uic/form.cpp (working copy) +@@ -731,6 +731,13 @@ + while ( !n2.isNull() ) { + if ( n2.tagName() == "includehint" ) { + QString file = n2.firstChild().toText().data(); ++ int colons = file.find("::"); ++ ++ if (colons != -1) ++ { ++ file = file.right(file.length() - colons - 2); ++ } ++ + localIncludes += file; + } + n2 = n2.nextSibling().toElement(); diff --git a/x11-libs/qt-meta/files/qt-3.3.8-visibility.patch b/x11-libs/qt-meta/files/qt-3.3.8-visibility.patch new file mode 100644 index 00000000..a5246b9f --- /dev/null +++ b/x11-libs/qt-meta/files/qt-3.3.8-visibility.patch @@ -0,0 +1,159 @@ +Index: configure +=================================================================== +--- configure (revision 471775) ++++ configure (working copy) +@@ -1053,6 +1053,7 @@ + [ -d $outpath/src/tools ] || mkdir -p $outpath/src/tools + cat > $outpath/src/tools/qconfig.cpp.new <iface(); \ + } + +-# ifdef Q_WS_WIN +-# ifdef Q_CC_BOR +-# define Q_EXPORT_PLUGIN(PLUGIN) \ +- Q_PLUGIN_VERIFICATION_DATA \ +- Q_EXTERN_C __declspec(dllexport) \ +- const char * __stdcall qt_ucm_query_verification_data() \ +- { return qt_ucm_verification_data; } \ +- Q_EXTERN_C __declspec(dllexport) QUnknownInterface* \ +- __stdcall ucm_instantiate() \ +- Q_PLUGIN_INSTANTIATE( PLUGIN ) +-# else +-# define Q_EXPORT_PLUGIN(PLUGIN) \ +- Q_PLUGIN_VERIFICATION_DATA \ +- Q_EXTERN_C __declspec(dllexport) \ +- const char *qt_ucm_query_verification_data() \ +- { return qt_ucm_verification_data; } \ +- Q_EXTERN_C __declspec(dllexport) QUnknownInterface* ucm_instantiate() \ +- Q_PLUGIN_INSTANTIATE( PLUGIN ) +-# endif +-# else +-# define Q_EXPORT_PLUGIN(PLUGIN) \ ++#if defined(Q_WS_WIN) && defined(Q_CC_BOR) ++# define Q_STDCALL __stdcall ++#else ++# define Q_STDCALL ++#endif ++ ++#define Q_EXPORT_PLUGIN(PLUGIN) \ + Q_PLUGIN_VERIFICATION_DATA \ +- Q_EXTERN_C \ +- const char *qt_ucm_query_verification_data() \ ++ Q_EXTERN_C Q_EXPORT \ ++ const char * Q_STDCALL qt_ucm_query_verification_data() \ + { return qt_ucm_verification_data; } \ +- Q_EXTERN_C QUnknownInterface* ucm_instantiate() \ ++ Q_EXTERN_C Q_EXPORT QUnknownInterface* Q_STDCALL ucm_instantiate() \ + Q_PLUGIN_INSTANTIATE( PLUGIN ) +-# endif +- + #endif + + struct QUnknownInterface; +Index: src/kernel/qapplication_x11.cpp +=================================================================== +--- src/kernel/qapplication_x11.cpp (revision 471775) ++++ src/kernel/qapplication_x11.cpp (working copy) +@@ -314,7 +314,7 @@ + + // flags for extensions for special Languages, currently only for RTL languages + static bool qt_use_rtl_extensions = FALSE; +-bool qt_hebrew_keyboard_hack = FALSE; ++Q_EXPORT bool qt_hebrew_keyboard_hack = FALSE; + + static Window mouseActWindow = 0; // window where mouse is + static int mouseButtonPressed = 0; // last mouse button pressed +@@ -3800,7 +3800,7 @@ + } + + +-bool qt_try_modal( QWidget *widget, XEvent *event ) ++Q_EXPORT bool qt_try_modal( QWidget *widget, XEvent *event ) + { + if (qt_xdnd_dragging) { + // allow mouse events while DnD is active +Index: src/kernel/qtextengine_p.h +=================================================================== +--- src/kernel/qtextengine_p.h (revision 471775) ++++ src/kernel/qtextengine_p.h (working copy) +@@ -280,7 +280,7 @@ + + class QFontPrivate; + +-class QTextEngine { ++class Q_EXPORT QTextEngine { + public: + QTextEngine( const QString &str, QFontPrivate *f ); + ~QTextEngine(); +Index: src/tools/qglobal.h +=================================================================== +--- src/tools/qglobal.h (revision 471775) ++++ src/tools/qglobal.h (working copy) +@@ -865,6 +865,10 @@ + # define Q_TEMPLATE_EXTERN + # undef Q_DISABLE_COPY /* avoid unresolved externals */ + # endif ++#elif defined(Q_CC_GNU) && __GNUC__ - 0 >= 4 ++# define Q_EXPORT __attribute__((visibility("default"))) ++# undef QT_MAKEDLL /* ignore these for other platforms */ ++# undef QT_DLL + #else + # undef QT_MAKEDLL /* ignore these for other platforms */ + # undef QT_DLL +Index: tools/designer/uilib/qwidgetfactory.h +=================================================================== +--- tools/designer/uilib/qwidgetfactory.h (revision 471775) ++++ tools/designer/uilib/qwidgetfactory.h (working copy) +@@ -48,7 +48,7 @@ + class QWidgetFactoryPrivate; + class UibStrTable; + +-class QWidgetFactory ++class Q_EXPORT QWidgetFactory + { + public: + QWidgetFactory(); +Index: tools/designer/uilib/qwidgetfactory.cpp +=================================================================== +--- tools/designer/uilib/qwidgetfactory.cpp (revision 471775) ++++ tools/designer/uilib/qwidgetfactory.cpp (working copy) +@@ -113,13 +113,13 @@ + static QMap *availableWidgetMap = 0; + static QStringList *availableWidgetList = 0; + +-QMap *qwf_forms = 0; ++Q_EXPORT QMap *qwf_forms = 0; + QString *qwf_language = 0; +-bool qwf_execute_code = TRUE; ++Q_EXPORT bool qwf_execute_code = TRUE; + bool qwf_stays_on_top = FALSE; + QString qwf_currFileName = ""; + QObject *qwf_form_object = 0; +-QString *qwf_plugin_dir = 0; ++Q_EXPORT QString *qwf_plugin_dir = 0; + + static void setupPluginDir() + { +Index: tools/designer/shared/domtool.h +=================================================================== +--- tools/designer/shared/domtool.h (revision 471775) ++++ tools/designer/shared/domtool.h (working copy) +@@ -33,7 +33,7 @@ + class QDomElement; + class QDomDocument; + +-class DomTool : public Qt ++class Q_EXPORT DomTool : public Qt + { + public: + static QVariant readProperty( const QDomElement& e, const QString& name, const QVariant& defValue ); diff --git a/x11-libs/qt-meta/files/qt-3.3.8b-cjk-fix.patch b/x11-libs/qt-meta/files/qt-3.3.8b-cjk-fix.patch new file mode 100644 index 00000000..5372bdb8 --- /dev/null +++ b/x11-libs/qt-meta/files/qt-3.3.8b-cjk-fix.patch @@ -0,0 +1,32 @@ +--- src/kernel/qfontdatabase.cpp 2008-07-10 06:17:31.000000000 +0800 ++++ src/kernel/qfontdatabase.cpp 2008-07-10 06:27:53.000000000 +0800 +@@ -960,19 +960,17 @@ + #ifdef Q_WS_X11 + if (script == QFont::Han) { + // modify script according to locale +- static QFont::Script defaultHan = QFont::UnknownScript; +- if (defaultHan == QFont::UnknownScript) { +- QCString locale = setlocale(LC_ALL, NULL); +- if (locale.contains("ko")) +- defaultHan = QFont::Han_Korean; +- else if (locale.contains("zh_TW") || locale.contains("zh_HK")) +- defaultHan = QFont::Han_TraditionalChinese; +- else if (locale.contains("zh")) +- defaultHan = QFont::Han_SimplifiedChinese; +- else +- defaultHan = QFont::Han_Japanese; ++ static QFont::Script defaultHan = QFont::Han; ++ QCString locale = setlocale(LC_ALL, NULL); ++ if (locale.contains("ko")) ++ defaultHan = QFont::Han_Korean; ++ else if (locale.contains("zh_TW") || locale.contains("zh_HK")) ++ defaultHan = QFont::Han_TraditionalChinese; ++ else if (locale.contains("zh")) ++ defaultHan = QFont::Han_SimplifiedChinese; ++ else if (locale.contains("jp")) ++ defaultHan = QFont::Han_Japanese; +- } + script = defaultHan; + } + #endif + diff --git a/x11-libs/qt-meta/files/qt-ulibc.patch b/x11-libs/qt-meta/files/qt-ulibc.patch new file mode 100644 index 00000000..f188778e --- /dev/null +++ b/x11-libs/qt-meta/files/qt-ulibc.patch @@ -0,0 +1,13 @@ +--- qt-x11-free-3.3.4.orig/src/tools/qlocale.cpp 2005-01-21 17:16:05.000000000 +0000 ++++ qt-x11-free-3.3.4/src/tools/qlocale.cpp 2005-02-18 13:36:59.000000000 +0000 +@@ -55,6 +55,10 @@ + # undef INFINITY + #endif + ++#if defined(Q_OS_LINUX) && defined(__UCLIBC__) ++# undef Q_OS_LINUX ++#endif ++ + #ifdef Q_OS_LINUX + # include + #endif diff --git a/x11-libs/qt-meta/metadata.xml b/x11-libs/qt-meta/metadata.xml new file mode 100644 index 00000000..30c31e9b --- /dev/null +++ b/x11-libs/qt-meta/metadata.xml @@ -0,0 +1,11 @@ + + + +qt + + Enable binary compatible version of immodule for + Qt + Enable binary incompatible version of immodule for + Qt + + diff --git a/x11-libs/qt-meta/qt-meta-3.3.8b-r1.ebuild b/x11-libs/qt-meta/qt-meta-3.3.8b-r1.ebuild new file mode 100644 index 00000000..5cfa95ad --- /dev/null +++ b/x11-libs/qt-meta/qt-meta-3.3.8b-r1.ebuild @@ -0,0 +1,372 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8b-r1.ebuild,v 1.9 2009/12/03 18:25:47 yngwin Exp $ + +# *** Please remember to update qt3.eclass when revbumping this *** + +inherit eutils flag-o-matic toolchain-funcs + +SRCTYPE="free" +DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework." +HOMEPAGE="http://qt.nokia.com/" + +IMMQT_P="qt-x11-immodule-unified-qt3.3.8-20070321-gentoo" + +SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz + immqt? ( mirror://gentoo/${IMMQT_P}.diff.bz2 ) + immqt-bc? ( mirror://gentoo/${IMMQT_P}.diff.bz2 )" +LICENSE="|| ( QPL-1.0 GPL-2 GPL-3 )" + +SLOT="3" +KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" +IUSE="cups debug doc examples firebird ipv6 mysql nas nis odbc opengl postgres sqlite xinerama immqt immqt-bc" + +RDEPEND=" + virtual/jpeg + >=media-libs/freetype-2 + >=media-libs/libmng-1.0.9 + media-libs/libpng + sys-libs/zlib + x11-libs/libXft + x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libSM + cups? ( net-print/cups ) + firebird? ( dev-db/firebird ) + mysql? ( virtual/mysql ) + nas? ( >=media-libs/nas-1.5 ) + opengl? ( virtual/opengl virtual/glu ) + postgres? ( dev-db/postgresql-base ) + xinerama? ( x11-libs/libXinerama )" +DEPEND="${RDEPEND} + x11-proto/inputproto + x11-proto/xextproto + xinerama? ( x11-proto/xineramaproto ) + immqt? ( x11-proto/xineramaproto ) + immqt-bc? ( x11-proto/xineramaproto )" +PDEPEND="odbc? ( ~dev-db/qt-unixODBC-$PV )" + +S="${WORKDIR}/qt-x11-${SRCTYPE}-${PV}" + +QTBASE="/usr/qt/3" + +pkg_setup() { + if use immqt && use immqt-bc ; then + ewarn + ewarn "immqt and immqt-bc are exclusive. You cannot set both." + ewarn "Please specify either immqt or immqt-bc." + ewarn + die + elif use immqt ; then + ewarn + ewarn "You are going to compile binary imcompatible immodule for Qt. This means" + ewarn "you have to recompile everything depending on Qt after you install it." + ewarn "Be aware." + ewarn + fi + + export QTDIR="${S}" + + CXX=$(tc-getCXX) + if [[ ${CXX/g++/} != ${CXX} ]]; then + PLATCXX="g++" + elif [[ ${CXX/icpc/} != ${CXX} ]]; then + PLATCXX="icc" + else + die "Unknown compiler ${CXX}." + fi + + case ${CHOST} in + *-freebsd*|*-dragonfly*) + PLATNAME="freebsd" ;; + *-openbsd*) + PLATNAME="openbsd" ;; + *-netbsd*) + PLATNAME="netbsd" ;; + *-darwin*) + PLATNAME="darwin" ;; + *-linux-*|*-linux) + PLATNAME="linux" ;; + *) + die "Unknown CHOST, no platform choosed." + esac + + # probably this should be '*-64' for 64bit archs + # in a fully multilib environment (no compatibility symlinks) + export PLATFORM="${PLATNAME}-${PLATCXX}" +} + +src_unpack() { + unpack ${A} + cd "${S}" + + sed -i -e 's:read acceptance:acceptance=yes:' configure + + # Do not link with -rpath. See bug #75181. + find "${S}"/mkspecs -name qmake.conf | xargs \ + sed -i -e 's:QMAKE_RPATH.*:QMAKE_RPATH =:' + + # Patch for uic includehint errors (aseigo patch) + epatch "${FILESDIR}"/qt-3.3.8-uic-fix.patch + + # KDE related patches + epatch "${FILESDIR}"/0001-dnd_optimization.patch + epatch "${FILESDIR}"/0002-dnd_active_window_fix.patch + epatch "${FILESDIR}"/0038-dragobject-dont-prefer-unknown.patch + epatch "${FILESDIR}"/0044-qscrollview-windowactivate-fix.diff + epatch "${FILESDIR}"/0047-fix-kmenu-widget.diff + epatch "${FILESDIR}"/0048-qclipboard_hack_80072.patch + + # ulibc patch (bug #100246) + epatch "${FILESDIR}"/qt-ulibc.patch + + # xinerama patch: http://ktown.kde.org/~seli/xinerama/ + epatch "${FILESDIR}"/qt-3.3.8-seli-xinerama.patch + + # Visibility patch, apply only on GCC 4.1 and later for safety + # [[ $(gcc-major-version)$(gcc-minor-version) -ge 41 ]] && \ + epatch "${FILESDIR}"/qt-3.3.8-visibility.patch + + # Fix configure to correctly pick up gcc version, bug 244732 + epatch "${FILESDIR}"/qt-3.3.8-fix-compiler-detection.patch + + # Fix CJK script rendering, bug 229567 + epatch "${FILESDIR}"/qt-3.3.8b-cjk-fix.patch + + if use immqt || use immqt-bc ; then + epatch ../${IMMQT_P}.diff + sh make-symlinks.sh || die "make symlinks failed" + + epatch "${FILESDIR}"/qt-3.3.8-immqt+gcc-4.3.patch + fi + + if use mips; then + epatch "${FILESDIR}"/qt-3.3.8-mips.patch + fi + + # known working flags wrt #77623 + use sparc && export CFLAGS="-O1" && export CXXFLAGS="${CFLAGS}" + # set c/xxflags and ldflags + strip-flags + append-flags -fno-strict-aliasing + + if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then + ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS" + append-flags -fno-stack-protector + fi + + sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ + -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ + -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ + -e "s:\.*=.*:QMAKE_CC=$(tc-getCC):" \ + -e "s:\.*=.*:QMAKE_CXX=$(tc-getCXX):" \ + -e "s:\.*=.*:QMAKE_LINK=$(tc-getCXX):" \ + -e "s:\.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \ + "${S}"/mkspecs/${PLATFORM}/qmake.conf || die + + if [ $(get_libdir) != "lib" ] ; then + sed -i -e "s:/lib$:/$(get_libdir):" \ + "${S}"/mkspecs/${PLATFORM}/qmake.conf || die + fi + + sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ + -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ + "${S}"/qmake/Makefile.unix || die +} + +src_compile() { + export SYSCONF="${D}${QTBASE}"/etc/settings + + # Let's just allow writing to these directories during Qt emerge + # as it makes Qt much happier. + addwrite "${QTBASE}/etc/settings" + addwrite "${HOME}/.qt" + + [ "$(get_libdir)" != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)" + + # unixODBC support is now a PDEPEND on dev-db/qt-unixODBC; see bug 14178. + use nas && myconf+=" -system-nas-sound" + use nis && myconf+=" -nis" || myconf+=" -no-nis" + use mysql && myconf+=" -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf+=" -no-sql-mysql" + use postgres && myconf+=" -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf+=" -no-sql-psql" + use firebird && myconf+=" -plugin-sql-ibase -I/opt/firebird/include" || myconf+=" -no-sql-ibase" + use sqlite && myconf+=" -plugin-sql-sqlite" || myconf+=" -no-sql-sqlite" + use cups && myconf+=" -cups" || myconf+=" -no-cups" + use opengl && myconf+=" -enable-module=opengl" || myconf+=" -disable-opengl" + use debug && myconf+=" -debug" || myconf+=" -release -no-g++-exceptions" + use xinerama && myconf+=" -xinerama" || myconf+=" -no-xinerama" + + myconf="${myconf} -system-zlib -qt-gif" + + use ipv6 && myconf+=" -ipv6" || myconf+=" -no-ipv6" + use immqt-bc && myconf+=" -inputmethod" + use immqt && myconf+=" -inputmethod -inputmethod-ext" + + export YACC='byacc -d' + tc-export CC CXX + export LINK="$(tc-getCXX)" + + ./configure -sm -thread -stl -system-libjpeg -verbose -largefile \ + -qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \ + -system-libpng -xft -platform ${PLATFORM} -xplatform \ + ${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \ + -fast -no-sql-odbc ${myconf} -dlopen-opengl || die + + emake src-qmake src-moc sub-src || die + + export DYLD_LIBRARY_PATH="${S}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}" + export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" + + emake sub-tools || die + + if use examples; then + emake sub-tutorial sub-examples || die + fi + + # Make the msg2qm utility (not made by default) + cd "${S}"/tools/msg2qm + ../../bin/qmake + emake + + # Make the qembed utility (not made by default) + cd "${S}"/tools/qembed + ../../bin/qmake + emake + +} + +src_install() { + # binaries + into ${QTBASE} + dobin bin/* + dobin tools/msg2qm/msg2qm + dobin tools/qembed/qembed + + # libraries + dolib.so lib/lib{editor,qassistantclient,designercore}.a + dolib.so lib/libqt-mt.la + dolib.so lib/libqt-mt.so.${PV/b} lib/libqui.so.1.0.0 + cd "${D}"/${QTBASE}/$(get_libdir) + + for x in libqui.so ; do + ln -s $x.1.0.0 $x.1.0 + ln -s $x.1.0 $x.1 + ln -s $x.1 $x + done + + # version symlinks - 3.3.5->3.3->3->.so + ln -s libqt-mt.so.${PV/b} libqt-mt.so.3.3 + ln -s libqt-mt.so.3.3 libqt-mt.so.3 + ln -s libqt-mt.so.3 libqt-mt.so + + # libqt -> libqt-mt symlinks + ln -s libqt-mt.so.${PV/b} libqt.so.${PV/b} + ln -s libqt-mt.so.3.3 libqt.so.3.3 + ln -s libqt-mt.so.3 libqt.so.3 + ln -s libqt-mt.so libqt.so + + # plugins + cd "${S}" + local plugins=$(find plugins -name "lib*.so" -print) + for x in ${plugins}; do + exeinto ${QTBASE}/$(dirname ${x}) + doexe ${x} + done + + # Past this point just needs to be done once + is_final_abi || return 0 + + # includes + cd "${S}" + dodir ${QTBASE}/include/private + cp include/*\.h "${D}"/${QTBASE}/include/ + cp include/private/*\.h "${D}"/${QTBASE}/include/private/ + + # prl files + sed -i -e "s:${S}:${QTBASE}:g" "${S}"/lib/*.prl + insinto ${QTBASE}/$(get_libdir) + doins "${S}"/lib/*.prl + + # pkg-config file + insinto ${QTBASE}/$(get_libdir)/pkgconfig + doins "${S}"/lib/*.pc + + # List all the multilib libdirs + local libdirs + for alibdir in $(get_all_libdirs); do + libdirs="${libdirs}:${QTBASE}/${alibdir}" + done + + # environment variables + cat < "${T}"/45qt3 +PATH=${QTBASE}/bin +ROOTPATH=${QTBASE}/bin +LDPATH=${libdirs:1} +QMAKESPEC=${PLATFORM} +MANPATH=${QTBASE}/doc/man +PKG_CONFIG_PATH=${QTBASE}/$(get_libdir)/pkgconfig +EOF + + cat < "${T}"/50qtdir3 +QTDIR=${QTBASE} +EOF + + cat < "${T}"/50-qt3-revdep +SEARCH_DIRS="${QTBASE}" +EOF + + insinto /etc/revdep-rebuild + doins "${T}"/50-qt3-revdep + + doenvd "${T}"/45qt3 "${T}"/50qtdir3 + + if [ "${SYMLINK_LIB}" = "yes" ]; then + dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${QTBASE}/lib + fi + + insinto ${QTBASE}/tools/designer + doins -r tools/designer/templates + + insinto ${QTBASE} + doins -r translations + + keepdir ${QTBASE}/etc/settings + + if use doc; then + insinto ${QTBASE} + doins -r "${S}"/doc + fi + + if use examples; then + find "${S}"/examples "${S}"/tutorial -name Makefile | \ + xargs sed -i -e "s:${S}:${QTBASE}:g" + + cp -r "${S}"/examples "${D}"${QTBASE}/ + cp -r "${S}"/tutorial "${D}"${QTBASE}/ + fi + + # misc build reqs + insinto ${QTBASE}/mkspecs + doins -r "${S}"/mkspecs/${PLATFORM} + + sed -e "s:${S}:${QTBASE}:g" \ + "${S}"/.qmake.cache > "${D}"${QTBASE}/.qmake.cache + + dodoc FAQ README README-QT.TXT changes* + if use immqt || use immqt-bc ; then + dodoc "${S}"/README.immodule + fi +} + +pkg_postinst() { + echo + elog "After a rebuild of Qt, it can happen that Qt plugins (such as Qt/KDE styles," + elog "or widgets for the Qt designer) are no longer recognized. If this situation" + elog "occurs you should recompile the packages providing these plugins," + elog "and you should also make sure that Qt and its plugins were compiled with the" + elog "same version of GCC. Packages that may need to be rebuilt are, for instance," + elog "kde-base/kdelibs, kde-base/kdeartwork and kde-base/kdeartwork-styles." + elog "See http://doc.trolltech.com/3.3/plugins-howto.html for more infos." + echo +} diff --git a/x11-libs/qt-meta/qt-meta-3.3.8b-r2.ebuild b/x11-libs/qt-meta/qt-meta-3.3.8b-r2.ebuild new file mode 100644 index 00000000..233884d5 --- /dev/null +++ b/x11-libs/qt-meta/qt-meta-3.3.8b-r2.ebuild @@ -0,0 +1,374 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8b-r2.ebuild,v 1.7 2009/12/03 18:25:47 yngwin Exp $ + +# *** Please remember to update qt3.eclass when revbumping this *** + +inherit eutils flag-o-matic toolchain-funcs + +SRCTYPE="free" +DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework." +HOMEPAGE="http://qt.nokia.com/" + +IMMQT_P="qt-x11-immodule-unified-qt3.3.8-20070321-gentoo" + +SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz + immqt? ( mirror://gentoo/${IMMQT_P}.diff.bz2 ) + immqt-bc? ( mirror://gentoo/${IMMQT_P}.diff.bz2 )" +LICENSE="|| ( QPL-1.0 GPL-2 GPL-3 )" + +SLOT="3" +KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd" +IUSE="cups debug doc examples firebird ipv6 mysql nas nis odbc opengl postgres sqlite xinerama immqt immqt-bc" + +RDEPEND=" + virtual/jpeg + >=media-libs/freetype-2 + >=media-libs/libmng-1.0.9 + media-libs/libpng + sys-libs/zlib + x11-libs/libXft + x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libSM + cups? ( net-print/cups ) + firebird? ( dev-db/firebird ) + mysql? ( virtual/mysql ) + nas? ( >=media-libs/nas-1.5 ) + opengl? ( virtual/opengl virtual/glu ) + postgres? ( dev-db/postgresql-base ) + xinerama? ( x11-libs/libXinerama )" +DEPEND="${RDEPEND} + x11-proto/inputproto + x11-proto/xextproto + xinerama? ( x11-proto/xineramaproto ) + immqt? ( x11-proto/xineramaproto ) + immqt-bc? ( x11-proto/xineramaproto )" +PDEPEND="odbc? ( ~dev-db/qt-unixODBC-$PV )" + +S="${WORKDIR}/qt-x11-${SRCTYPE}-${PV}" + +QTBASE="/usr/qt/3" + +pkg_setup() { + if use immqt && use immqt-bc ; then + ewarn + ewarn "immqt and immqt-bc are exclusive. You cannot set both." + ewarn "Please specify either immqt or immqt-bc." + ewarn + die + elif use immqt ; then + ewarn + ewarn "You are going to compile binary imcompatible immodule for Qt. This means" + ewarn "you have to recompile everything depending on Qt after you install it." + ewarn "Be aware." + ewarn + fi + + export QTDIR="${S}" + + CXX=$(tc-getCXX) + if [[ ${CXX/g++/} != ${CXX} ]]; then + PLATCXX="g++" + elif [[ ${CXX/icpc/} != ${CXX} ]]; then + PLATCXX="icc" + else + die "Unknown compiler ${CXX}." + fi + + case ${CHOST} in + *-freebsd*|*-dragonfly*) + PLATNAME="freebsd" ;; + *-openbsd*) + PLATNAME="openbsd" ;; + *-netbsd*) + PLATNAME="netbsd" ;; + *-darwin*) + PLATNAME="darwin" ;; + *-linux-*|*-linux) + PLATNAME="linux" ;; + *) + die "Unknown CHOST, no platform choosed." + esac + + # probably this should be '*-64' for 64bit archs + # in a fully multilib environment (no compatibility symlinks) + export PLATFORM="${PLATNAME}-${PLATCXX}" +} + +src_unpack() { + unpack ${A} + cd "${S}" + + sed -i -e 's:read acceptance:acceptance=yes:' configure + + # Do not link with -rpath. See bug #75181. + find "${S}"/mkspecs -name qmake.conf | xargs \ + sed -i -e 's:QMAKE_RPATH.*:QMAKE_RPATH =:' + + # Patch for uic includehint errors (aseigo patch) + epatch "${FILESDIR}"/qt-3.3.8-uic-fix.patch + + # KDE related patches + epatch "${FILESDIR}"/0001-dnd_optimization.patch + epatch "${FILESDIR}"/0002-dnd_active_window_fix.patch + epatch "${FILESDIR}"/0038-dragobject-dont-prefer-unknown.patch + epatch "${FILESDIR}"/0044-qscrollview-windowactivate-fix.diff + epatch "${FILESDIR}"/0047-fix-kmenu-widget.diff + epatch "${FILESDIR}"/0048-qclipboard_hack_80072.patch + + # ulibc patch (bug #100246) + epatch "${FILESDIR}"/qt-ulibc.patch + + # xinerama patch: http://ktown.kde.org/~seli/xinerama/ + epatch "${FILESDIR}"/qt-3.3.8-seli-xinerama.patch + + # Visibility patch, apply only on GCC 4.1 and later for safety + # [[ $(gcc-major-version)$(gcc-minor-version) -ge 41 ]] && \ + epatch "${FILESDIR}"/qt-3.3.8-visibility.patch + + # Fix configure to correctly pick up gcc version, bug 244732 + epatch "${FILESDIR}"/qt-3.3.8-fix-compiler-detection.patch + + # Fix CJK script rendering, bug 229567 + epatch "${FILESDIR}"/qt-3.3.8b-cjk-fix.patch + + # Fix libpng-1.4 issues + epatch "${FILESDIR}"/qt-3.3.8-libpng14.patch + + if use immqt || use immqt-bc ; then + epatch ../${IMMQT_P}.diff + sh make-symlinks.sh || die "make symlinks failed" + + epatch "${FILESDIR}"/qt-3.3.8-immqt+gcc-4.3.patch + fi + + if use mips; then + epatch "${FILESDIR}"/qt-3.3.8-mips.patch + fi + + # known working flags wrt #77623 + use sparc && export CFLAGS="-O1" && export CXXFLAGS="${CFLAGS}" + # set c/xxflags and ldflags + strip-flags + append-flags -fno-strict-aliasing + + if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then + ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS" + append-flags -fno-stack-protector + fi + + sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ + -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ + -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ + -e "s:\.*=.*:QMAKE_CC=$(tc-getCC):" \ + -e "s:\.*=.*:QMAKE_CXX=$(tc-getCXX):" \ + -e "s:\.*=.*:QMAKE_LINK=$(tc-getCXX):" \ + -e "s:\.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \ + "${S}"/mkspecs/${PLATFORM}/qmake.conf || die + + if [ $(get_libdir) != "lib" ] ; then + sed -i -e "s:/lib$:/$(get_libdir):" \ + "${S}"/mkspecs/${PLATFORM}/qmake.conf || die + fi + + sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ + -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ + "${S}"/qmake/Makefile.unix || die +} + +src_compile() { + export SYSCONF="${D}${QTBASE}"/etc/settings + + # Let's just allow writing to these directories during Qt emerge + # as it makes Qt much happier. + addwrite "${QTBASE}/etc/settings" + addwrite "${HOME}/.qt" + + [ "$(get_libdir)" != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)" + + # unixODBC support is now a PDEPEND on dev-db/qt-unixODBC; see bug 14178. + use nas && myconf+=" -system-nas-sound" + use nis && myconf+=" -nis" || myconf+=" -no-nis" + use mysql && myconf+=" -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf+=" -no-sql-mysql" + use postgres && myconf+=" -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf+=" -no-sql-psql" + use firebird && myconf+=" -plugin-sql-ibase -I/opt/firebird/include" || myconf+=" -no-sql-ibase" + use sqlite && myconf+=" -plugin-sql-sqlite" || myconf+=" -no-sql-sqlite" + use cups && myconf+=" -cups" || myconf+=" -no-cups" + use opengl && myconf+=" -enable-module=opengl" || myconf+=" -disable-opengl" + use debug && myconf+=" -debug" || myconf+=" -release -no-g++-exceptions" + use xinerama && myconf+=" -xinerama" || myconf+=" -no-xinerama" + + myconf="${myconf} -system-zlib -qt-gif" + + use ipv6 && myconf+=" -ipv6" || myconf+=" -no-ipv6" + use immqt-bc && myconf+=" -inputmethod" + use immqt && myconf+=" -inputmethod -inputmethod-ext" + + export YACC='byacc -d' + tc-export CC CXX + export LINK="$(tc-getCXX)" + + ./configure -sm -thread -stl -system-libjpeg -verbose -largefile \ + -qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \ + -system-libpng -xft -platform ${PLATFORM} -xplatform \ + ${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \ + -fast -no-sql-odbc ${myconf} -dlopen-opengl || die + + emake src-qmake src-moc sub-src || die + + export DYLD_LIBRARY_PATH="${S}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}" + export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" + + emake sub-tools || die + + if use examples; then + emake sub-tutorial sub-examples || die + fi + + # Make the msg2qm utility (not made by default) + cd "${S}"/tools/msg2qm + ../../bin/qmake + emake + + # Make the qembed utility (not made by default) + cd "${S}"/tools/qembed + ../../bin/qmake + emake + +} + +src_install() { + # binaries + into ${QTBASE} + dobin bin/* + dobin tools/msg2qm/msg2qm + dobin tools/qembed/qembed + + # libraries + dolib.so lib/lib{editor,qassistantclient,designercore}.a + dolib.so lib/libqt-mt.la + dolib.so lib/libqt-mt.so.${PV/b} lib/libqui.so.1.0.0 + cd "${D}"/${QTBASE}/$(get_libdir) + + for x in libqui.so ; do + ln -s $x.1.0.0 $x.1.0 + ln -s $x.1.0 $x.1 + ln -s $x.1 $x + done + + # version symlinks - 3.3.5->3.3->3->.so + ln -s libqt-mt.so.${PV/b} libqt-mt.so.3.3 + ln -s libqt-mt.so.3.3 libqt-mt.so.3 + ln -s libqt-mt.so.3 libqt-mt.so + + # libqt -> libqt-mt symlinks + ln -s libqt-mt.so.${PV/b} libqt.so.${PV/b} + ln -s libqt-mt.so.3.3 libqt.so.3.3 + ln -s libqt-mt.so.3 libqt.so.3 + ln -s libqt-mt.so libqt.so + + # plugins + cd "${S}" + local plugins=$(find plugins -name "lib*.so" -print) + for x in ${plugins}; do + exeinto ${QTBASE}/$(dirname ${x}) + doexe ${x} + done + + # Past this point just needs to be done once + is_final_abi || return 0 + + # includes + cd "${S}" + dodir ${QTBASE}/include/private + cp include/*\.h "${D}"/${QTBASE}/include/ + cp include/private/*\.h "${D}"/${QTBASE}/include/private/ + + # prl files + sed -i -e "s:${S}:${QTBASE}:g" "${S}"/lib/*.prl + insinto ${QTBASE}/$(get_libdir) + doins "${S}"/lib/*.prl + + # pkg-config file + insinto /usr/$(get_libdir)/pkgconfig + doins "${S}"/lib/*.pc + + # List all the multilib libdirs + local libdirs + for alibdir in $(get_all_libdirs); do + libdirs="${libdirs}:${QTBASE}/${alibdir}" + done + + # environment variables + cat < "${T}"/45qt3 +PATH=${QTBASE}/bin +ROOTPATH=${QTBASE}/bin +LDPATH=${libdirs:1} +QMAKESPEC=${PLATFORM} +MANPATH=${QTBASE}/doc/man +EOF + + cat < "${T}"/50qtdir3 +QTDIR=${QTBASE} +EOF + + cat < "${T}"/50-qt3-revdep +SEARCH_DIRS="${QTBASE}" +EOF + + insinto /etc/revdep-rebuild + doins "${T}"/50-qt3-revdep + + doenvd "${T}"/45qt3 "${T}"/50qtdir3 + + if [ "${SYMLINK_LIB}" = "yes" ]; then + dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${QTBASE}/lib + fi + + insinto ${QTBASE}/tools/designer + doins -r tools/designer/templates + + insinto ${QTBASE} + doins -r translations + + keepdir ${QTBASE}/etc/settings + + if use doc; then + insinto ${QTBASE} + doins -r "${S}"/doc + fi + + if use examples; then + find "${S}"/examples "${S}"/tutorial -name Makefile | \ + xargs sed -i -e "s:${S}:${QTBASE}:g" + + cp -r "${S}"/examples "${D}"${QTBASE}/ + cp -r "${S}"/tutorial "${D}"${QTBASE}/ + fi + + # misc build reqs + insinto ${QTBASE}/mkspecs + doins -r "${S}"/mkspecs/${PLATFORM} + + sed -e "s:${S}:${QTBASE}:g" \ + "${S}"/.qmake.cache > "${D}"${QTBASE}/.qmake.cache + + dodoc FAQ README README-QT.TXT changes* + if use immqt || use immqt-bc ; then + dodoc "${S}"/README.immodule + fi +} + +pkg_postinst() { + echo + elog "After a rebuild of Qt, it can happen that Qt plugins (such as Qt/KDE styles," + elog "or widgets for the Qt designer) are no longer recognized. If this situation" + elog "occurs you should recompile the packages providing these plugins," + elog "and you should also make sure that Qt and its plugins were compiled with the" + elog "same version of GCC. Packages that may need to be rebuilt are, for instance," + elog "kde-base/kdelibs, kde-base/kdeartwork and kde-base/kdeartwork-styles." + elog "See http://doc.trolltech.com/3.3/plugins-howto.html for more infos." + echo +} diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog deleted file mode 100644 index 1f51c66f..00000000 --- a/x11-libs/qt/ChangeLog +++ /dev/null @@ -1,1376 +0,0 @@ -# ChangeLog for x11-libs/qt -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.586 2009/08/02 21:54:28 tommy Exp $ - - 28 Feb 2011; Hanno Boeck qt-3.3.8b-r1.ebuild, - qt-3.3.8b-r2.ebuild: - Change dependency from media-libs/jpeg to virtual/jpeg. - - 04 Sep 2010; Ladislav Láska qt-3.3.8b-r1.ebuild, - qt-3.3.8b-r2.ebuild: - Changed dependency from virtual/postgresql-base to dev-db/postgresql-base, - since the former no longer exists. - - 10 Dec 2009; Petr Morávek [Xificurk] - qt-3.3.8b-r1.ebuild, qt-3.3.8b-r2.ebuild: Sync from portage tree. - Remove unused USE flags from metadata. - - 14 Nov 2009; Jonathan Callen qt-3.3.8b-r1.ebuild, - qt-3.3.8b-r2.ebuild: - Remove mention of monolithic kde pkg - - 03 Nov 2009; Ben de Groot -qt-3.3.8b-r1.ebuild: - Remove -r1 ebuild. Everybody should use -r2. - - 02 Aug 2009; Thomas Sachau (Tommy[D]) - qt-3.3.8b-r1.ebuild, qt-3.3.8b-r2.ebuild: - Enable multilib support for qt-3.3.8b-r{1,2} - -*qt-4.5.2 (27 Jun 2009) - - 27 Jun 2009; Ben de Groot +qt-4.5.2.ebuild: - Qt 4.5.2 release version bump - -*qt-3.3.8b-r2 (11 Jun 2009) - - 11 Jun 2009; Ben de Groot - -files/0081-format-string-fixes.diff, - -files/qt-3.3.4-0047-fix-kmenu-widget.diff, - -files/qt-3.3.4-gcc4-volatile.patch, - -files/qt-3.3.8-unicode-off-by-one.patch, - -files/0185-fix-format-strings.diff, -files/qt4/Assistant.desktop, - -files/qt-3.3.4-0051-qtoolbar_77047.patch, -files/qt-3.3.4-gcc4.patch, - -files/qt-3.3.4-immodule-focus.patch, - -files/qt-3.3.4-qclipboard-hack.patch, - -files/qt-4.2.3-hppa-ldcw-fix.patch, -files/qt4/Designer.desktop, - -files/qt-4.3.1-unicode-off-by-one.patch, -files/qt4/Linguist.desktop, - -files/utf8-bug-qt3.diff, +qt-3.3.8b-r2.ebuild: - Adding fix for pkgconfig issue in bug 185925. Removing no longer used - patches from FILESDIR. - - 06 Jun 2009; Markus Meier qt-4.5.1.ebuild: - amd64 stable, bug #266201 - - 05 Jun 2009; Ben de Groot qt-4.5.1.ebuild: - Specify !kde for qt-phonon dep - - 03 Jun 2009; Ben de Groot qt-4.5.1.ebuild, - metadata.xml: - Add kde useflag again, for selecting media-sound/phonon, now that that - package is stable on the needed arches - - 02 Jun 2009; Christian Faulhammer qt-4.5.1.ebuild: - stable x86, bug 266201 - - 30 May 2009; Ben de Groot qt-4.5.1.ebuild: - Revert kde useflag addition, as it breaks stable - - 29 May 2009; Ben de Groot qt-4.5.1.ebuild: - Add kde useflag to make dependency calculation easier, bug 270188 - - 28 May 2009; Robert Piasek qt-4.5.1.ebuild: - stable on arm (bug #266201) - - 24 May 2009; Tobias Klausmann qt-4.5.1.ebuild: - Keyworded on alpha, bug #266201 - - 15 May 2009; Tobias Klausmann qt-4.5.1.ebuild: - x11-libs/qt-webkit-4.5.1 does not compile on alpha (bug 269739), the meta - ebuild depends on that, so dropping keyword - - 14 May 2009; Ben de Groot -qt-4.5.0.ebuild: - Remove old - - 13 May 2009; Brent Baude qt-4.5.1.ebuild: - Marking qt-4.5.1 ppc stable for bug 266201 - - 27 Apr 2009; Markos Chandras -qt-3.3.8-r4.ebuild: - Remove masked ebuild - -*qt-4.5.1 (27 Apr 2009) - - 27 Apr 2009; Markos Chandras +qt-4.5.1.ebuild: - Version bump to 4.5.1 - - 18 Mar 2009; Markos Chandras metadata.xml: - Removing obsolete use flag definitions from metadata.xml - - 18 Mar 2009; Markos Chandras -qt-4.3.3.ebuild, - -qt-4.3.4-r1.ebuild, -qt-4.3.5.ebuild: - Dropping 4.3* packages and 4.5.0_rc1 - - 18 Mar 2009; Raúl Porcel qt-4.5.0.ebuild: - Add ~arm wrt #262462, re-add ~alpha/~ia64, add -sparc - -*qt-4.5.0 (04 Mar 2009) - - 04 Mar 2009; Ben de Groot +qt-4.5.0.ebuild: - Version bump - - 20 Feb 2009; Jeroen Roovers qt-4.4.2.ebuild: - Stable for HPPA (bug #248083). - -*qt-4.5.0_rc1 (13 Feb 2009) - - 13 Feb 2009; Ben de Groot +qt-4.5.0_rc1.ebuild: - Add meta ebuild, on popular request, see bug 258712. - - 11 Feb 2009; Markos Chandras qt-4.4.2.ebuild: - Remove duplicate x11-libs/qt-test RDEPEND ( see bug #258533 ) - - 06 Feb 2009; Raúl Porcel qt-4.4.2.ebuild: - ia64/sparc stable wrt #248038 - - 04 Feb 2009; Brent Baude qt-4.4.2.ebuild: - Marking qt-4.4.2 ppc64 stable for bug 248038 - - 31 Jan 2009; Tobias Klausmann qt-4.4.2.ebuild: - Stable on alpha, bug #248038 - - 29 Jan 2009; Alexis Ballier qt-4.4.2.ebuild: - keyword ~x86-fbsd - - 18 Jan 2009; Markus Meier qt-4.4.2.ebuild: - amd64/x86 stable, bug #248038 - - 17 Jan 2009; nixnut qt-3.3.8b-r1.ebuild: - ppc stable #253978 - - 17 Jan 2009; nixnut qt-4.4.2.ebuild: - ppc stable #248038 - - 10 Jan 2009; Raúl Porcel qt-3.3.8b-r1.ebuild: - alpha/ia64/sparc/x86 stable wrt #253978 - - 09 Jan 2009; Guy Martin qt-3.3.8b-r1.ebuild: - hppa stable, #253978 - - 09 Jan 2009; Rémi Cardona qt-3.3.8-r4.ebuild, - qt-3.3.8b-r1.ebuild: - Change virtual/xft dependency to x11-libs/libXft, bug 253771. - - 07 Jan 2009; Thomas Anderson qt-3.3.8b-r1.ebuild: - stable amd64, bug 253978 - - 07 Jan 2009; Brent Baude qt-3.3.8b-r1.ebuild: - stable ppc64, bug 253978 - - 06 Jan 2009; Ben de Groot -qt-3.3.8b.ebuild, - -qt-4.4.0.ebuild, -qt-4.4.1.ebuild, -qt-4.4.1-r1.ebuild: - Remove 3.3.8b in preparation of stabling 3.3.8b-r1. Removing old 4.4.{0,1} - meta ebuilds. - -*qt-3.3.8b-r1 (02 Jan 2009) - - 02 Jan 2009; Ben de Groot +qt-3.3.8b-r1.ebuild: - Revbump to fix bug 244732 - - 28 Oct 2008; Ben de Groot - +files/qt-3.3.8-fix-compiler-detection.patch, - +files/qt-3.3.8b-cjk-fix.patch, qt-3.3.8-r4.ebuild, qt-3.3.8b.ebuild: - Add patches/fixes for bugs 172219, 229567 and 244732 - -*qt-4.4.2 (18 Sep 2008) - - 18 Sep 2008; Ben de Groot +qt-4.4.2.ebuild: - Version bump - -*qt-4.4.1-r1 (04 Sep 2008) - - 04 Sep 2008; Ben de Groot +qt-4.4.1-r1.ebuild: - Make deps more complete with webkit and qt-script, and dbus useflag. - Leaving phonon out to give users the choice for hardmasked phonon from - kde4. - - 16 Aug 2008; Doug Goldstein metadata.xml: - add GLEP 56 USE flag desc from use.local.desc - -*qt-4.4.1 (11 Aug 2008) - - 11 Aug 2008; Ben de Groot +qt-4.4.1.ebuild: - Version bump - -*qt-4.3.5 (26 Jul 2008) - - 26 Jul 2008; Carsten Lohrke +qt-4.3.5.ebuild: - Version bump. - -*qt-3.3.8b (26 Jul 2008) - - 26 Jul 2008; Carsten Lohrke +qt-3.3.8b.ebuild: - Version bump. License change, quoting issues and other minor cleaning. - - 30 May 2008; Jeroen Roovers qt-4.4.0.ebuild: - Marked ~hppa (bug #223557). - - 27 May 2008; Raúl Porcel qt-4.4.0.ebuild: - Add ~alpha/~ia64/~sparc wrt #223557 - - 25 May 2008; Markus Rothe qt-4.4.0.ebuild: - Added ~ppc/~ppc64 - - 19 May 2008; Tiziano Müller qt-3.3.8-r4.ebuild, - qt-4.3.3.ebuild, qt-4.3.4-r1.ebuild: - Changed dependency for postgresql to virtual/postgresql-base - - 16 May 2008; Ingmar Vanhassel -qt-3.3.4-r8.ebuild, - -qt-4.3.2-r1.ebuild, -qt-4.4.0_rc1.ebuild: - Old. - -*qt-4.4.0 (15 May 2008) - - 15 May 2008; Ingmar Vanhassel qt-4.4.0_rc1.ebuild, - +qt-4.4.0.ebuild: - Version bump to Qt-4.4.0. - - 11 May 2008; Diego Pettenò - +files/qt-3.3.8-immqt+gcc-4.3.patch, qt-3.3.8-r4.ebuild: - Add patch to build with gcc-4.3 and immqt-bc USE flag enabled. Thanks to - Matsuu for linking the Debian patch in bug #218447. - - 18 Apr 2008; Markus Meier qt-4.3.3.ebuild: - amd64 stable, bug #217529 - - 18 Apr 2008; Raúl Porcel qt-4.3.3.ebuild: - x86 stable wrt #217529 - - 17 Apr 2008; nixnut qt-4.3.3.ebuild: - Stable on ppc wrt bug 217529 - - 14 Apr 2008; Markus Rothe qt-4.3.3.ebuild: - Stable on ppc64; bug #217529 - - 14 Apr 2008; Raúl Porcel qt-4.3.3.ebuild: - alpha/ia64 stable wrt #217529 - - 13 Apr 2008; Ferris McCormick qt-4.3.3.ebuild: - Sparc stable --- Bug #217529 --- Good since 2007-12-06. - - 13 Apr 2008; Jeroen Roovers qt-4.3.3.ebuild: - Stable for HPPA (bug #217529). - - 13 Apr 2008; Ingmar Vanhassel qt-4.3.3.ebuild, - -qt-4.3.4.ebuild, qt-4.3.4-r1.ebuild: - Make USE="accessibility qt3support" default through IUSE defaults, bug - 217400. Remove old. - - 10 Apr 2008; Ingmar Vanhassel -qt-4.4.0_beta1.ebuild, - +qt-4.4.0_rc1.ebuild: - Version bump qt to 4.4.0_rc1. Thanks to Bo Andresen and Bernd Steinhauser. - - 19 Mar 2008; Ingmar Vanhassel ChangeLog: - Anti-aliasing rules are broken in qt-4.3*, causing random runtime failures - in Qt programs. bug 213411. Fixed by appending -fno-strict-aliasing. - - 16 Mar 2008; Bo Ørsted Andresen qt-4.4.0_beta1.ebuild: - The qt meta ebuild needs to block previous versions of qt:4 too. - - 11 Mar 2008; Ingmar Vanhassel qt-4.3.2-r1.ebuild, - qt-4.3.4.ebuild: - "append-flags -fno-gcse" on amd64 with gcc 3, bug 178652. - - 09 Mar 2008; Bo Ørsted Andresen qt-4.4.0_beta1.ebuild: - Revert last commit. - - 09 Mar 2008; Bo Ørsted Andresen -qt-4.4.0_beta1.ebuild: - Removing the qt-4.4 meta ebuild. Packages are not supposed to DEPEND on meta - ebuilds and this causes pain without ranged dependencies. If a meta ebuild - is needed it should be added as qt-meta-4.4.0_beta1 instead. - - 05 Mar 2008; Ingmar Vanhassel -qt-4.4.0_rc1.ebuild: - Old. - - 05 Mar 2008; Jeroen Roovers qt-4.4.0_rc1.ebuild: - Remove ~hppa again. - - 05 Mar 2008; Ingmar Vanhassel qt-4.3.2-r1.ebuild, - qt-4.3.3.ebuild, qt-4.3.4.ebuild: - =x11-libs/qt-4.3*:4 needs to block split Qt ebuilds. - - 04 Mar 2008; Jeroen Roovers qt-4.4.0_rc1.ebuild: - Marked ~hppa for no good reason. - - 03 Mar 2008; Ingmar Vanhassel qt-3.3.8-r4.ebuild: - Drop ppc-macos patches, they're patiently awaiting you in prefix. - - 03 Mar 2008; Ingmar Vanhassel - +files/qt-3.3.8-mips.patch, qt-3.3.8-r4.ebuild: - Added a patch for ~x11-libs/qt-3.3.8 to fix compilation on ~mips, thanks to - Ryan Hill in bug 210551. - - 25 Feb 2008; Caleb Tennis - -files/qt-4.3.1-powerpc64.patch, -qt-4.3.1-r1.ebuild, -qt-4.3.2.ebuild: - remove older versions - -*qt-4.3.4 (25 Feb 2008) - - 25 Feb 2008; Caleb Tennis +qt-4.3.4.ebuild: - 4.3.4 version bump - - 23 Feb 2008; Ingmar Vanhassel qt-3.3.4-r8.ebuild, - qt-3.3.8-r4.ebuild: - Move x11-proto/* out of RDEPEND, bug 204781. mips -> ~mips to fix deps. - - 07 Jan 2008; Caleb Tennis qt-4.3.3.ebuild: - PV -> P - - 05 Jan 2008; Caleb Tennis qt-4.3.3.ebuild: - PF -> PV for docs - - 21 Dec 2007; Caleb Tennis qt-4.4.0_rc1.ebuild: - I've completely changed this. Now it's a meta-ebuild that pulls in all of - the smaller package deps. - -*qt-4.4.0_rc1 (19 Dec 2007) - - 19 Dec 2007; Caleb Tennis +qt-4.4.0_rc1.ebuild: - version bump - - 10 Dec 2007; Robert Buchholz qt-4.3.2-r1.ebuild: - amd64 stable (bug #201296) - - 07 Dec 2007; Jeroen Roovers qt-4.3.2-r1.ebuild: - Stable for HPPA. - - 07 Dec 2007; Tobias Scherbaum qt-4.3.2-r1.ebuild: - ppc stable, bug #201296 - - 07 Dec 2007; Markus Rothe qt-4.3.2-r1.ebuild: - Stable on ppc64 - - 06 Dec 2007; Raúl Porcel qt-4.3.2-r1.ebuild: - alpha/ia64/sparc stable - - 06 Dec 2007; Christian Faulhammer qt-4.3.2-r1.ebuild: - stable x86 - -*qt-4.3.3 (06 Dec 2007) - - 06 Dec 2007; Caleb Tennis +qt-4.3.3.ebuild: - version bump. Remove QMAKESPEC as it's redundant and mmight conflict with - other system settings (Qtopia). #201239 - -*qt-4.3.2-r1 (05 Dec 2007) - - 05 Dec 2007; Caleb Tennis +files/qsslsocket-fix.patch, - +qt-4.3.2-r1.ebuild: - Add qsslsocket patch, bug #201296 - - 14 Nov 2007; Samuli Suominen qt-4.3.2.ebuild: - amd64 stable wrt #198454, thanks to Thomas A. for testing. - - 12 Nov 2007; Caleb Tennis -qt-3.3.8-r3.ebuild: - remove old version - - 10 Nov 2007; Markus Rothe qt-4.3.2.ebuild: - Stable on ppc64; bug #198454 - - 10 Nov 2007; Christian Heim qt-3.3.4-r8.ebuild, - qt-3.3.8-r3.ebuild, qt-3.3.8-r4.ebuild, qt-4.3.1-r1.ebuild, - qt-4.3.2.ebuild: - Workaround the hardened issues with SSP in QT by adding -fno-stack-protector - to CFLAGS/CXXFLAGS. - - 09 Nov 2007; nixnut qt-4.3.2.ebuild: - Stable on ppc wrt bug 198454 - - 08 Nov 2007; Raúl Porcel qt-4.3.2.ebuild: - alpha/ia64/x86 stable wrt #198454 - - 08 Nov 2007; Jeroen Roovers qt-4.3.2.ebuild: - Stable for HPPA (bug #198454). - - 08 Nov 2007; Ferris McCormick qt-4.3.2.ebuild: - Sparc stable --- Bug #198454 --- Good for me since 10 Oct., designer works, ... - - 23 Oct 2007; Caleb Tennis -files/qt-4.1.4-sparc.patch, - -files/qt4-parisc-linux.diff, -files/utf8-bug-qt4-2.diff, - -files/qt-4.3.0-alpha-threading.patch, -files/qt4-sqlite-configure.patch, - -files/qt4-nomkdir.patch, -qt-4.3.0-r2.ebuild, -qt-4.3.1.ebuild, - qt-4.3.2.ebuild: - remove old versions - - 03 Oct 2007; Caleb Tennis qt-4.3.2.ebuild: - Fix some quoting issues - -*qt-4.3.2 (03 Oct 2007) - - 03 Oct 2007; Caleb Tennis +qt-4.3.2.ebuild: - Version bump - - 25 Sep 2007; Caleb Tennis qt-4.3.1-r1.ebuild: - This guy is required whether we have a wacom tablet or not - - 15 Sep 2007; Tobias Scherbaum qt-4.3.1-r1.ebuild: - ppc stable, bug #192134 - -*qt-4.3.1-r1 (14 Sep 2007) -*qt-3.3.8-r4 (14 Sep 2007) - - 14 Sep 2007; Caleb Tennis - +files/qt-3.3.8-unicode-off-by-one.patch, - +files/qt-4.3.1-unicode-off-by-one.patch, +qt-3.3.8-r4.ebuild, - +qt-4.3.1-r1.ebuild: - Bump for security bug #192472 - - 13 Sep 2007; Markus Rothe qt-4.3.1.ebuild: - Stable on ppc64; bug #192134 - - 13 Sep 2007; Markus Ullmann qt-4.3.1.ebuild: - Stable on sparc wrt bug #192134 - - 12 Sep 2007; Chris Gianelloni qt-4.3.1.ebuild: - Stable on amd64 wrt bug #192134. - - 12 Sep 2007; Jeroen Roovers qt-4.3.1.ebuild: - Stable for HPPA (bug #192134). - - 11 Sep 2007; Raúl Porcel qt-4.3.1.ebuild: - alpha/ia64/x86 stable wrt #192134 - - 07 Sep 2007; Caleb Tennis qt-3.3.8-r3.ebuild: - Fix xineramaproto dep for immqt users, bug #189703 - - 23 Aug 2007; Caleb Tennis -qt-4.2.3-r1.ebuild: - remove last of 4.2 series - - 23 Aug 2007; Markus Rothe - +files/qt-4.3.1-powerpc64.patch, qt-4.3.1.ebuild: - Added patch for ppc64 and mark ebuild ~ppc64; bug #178779 - - 23 Aug 2007; Caleb Tennis -qt-3.3.8-r2.ebuild, - -qt-4.3.0.ebuild, -qt-4.3.0-r1.ebuild: - remove some older versions - - 15 Aug 2007; Jeroen Roovers qt-4.3.0-r2.ebuild: - Stable for HPPA (bug #185446). - - 12 Aug 2007; Caleb Tennis qt-4.3.1.ebuild: - Fix pkgconfig dir, per bug #188397 - - 12 Aug 2007; Steve Dibb qt-3.3.8-r3.ebuild, - qt-4.3.0-r2.ebuild: - amd64 stable, security bug 185446 - - 09 Aug 2007; Gustavo Zacarias qt-4.3.1.ebuild: - Keyworded ~sparc wrt #188103 - - 08 Aug 2007; Raúl Porcel qt-4.3.1.ebuild: - Re-add ~alpha wrt #188103 - -*qt-4.3.1 (08 Aug 2007) - - 08 Aug 2007; Caleb Tennis +qt-4.3.1.ebuild: - Version bump - - 08 Aug 2007; Jeroen Roovers qt-3.3.8-r3.ebuild: - Stable for HPPA (bug #185446). - - 06 Aug 2007; Gustavo Zacarias qt-4.3.0-r2.ebuild: - Stable on sparc wrt security #185446 - - 05 Aug 2007; Raúl Porcel qt-3.3.8-r3.ebuild, - qt-4.3.0-r2.ebuild: - alpha/ia64/x86 stable wrt security #185446 - - 04 Aug 2007; Tobias Scherbaum qt-3.3.8-r3.ebuild, - qt-4.3.0-r2.ebuild: - ppc stable, bug #185446 - -*qt-4.3.0-r2 (03 Aug 2007) - - 03 Aug 2007; Carsten Lohrke +qt-4.3.0-r2.ebuild: - Patch wasn't applied in previous ebuild revision due to a typo. - - 03 Aug 2007; Gustavo Zacarias qt-3.3.8-r3.ebuild, - qt-4.3.0-r1.ebuild: - Stable on sparc wrt security #185446 - - 02 Aug 2007; Christian Faulhammer qt-3.3.8-r3.ebuild, - qt-4.3.0-r1.ebuild: - stable x86, security bug 185446 - - 02 Aug 2007; Markus Rothe qt-3.3.8-r3.ebuild: - Stable on ppc64; bug #185446 - -*qt-4.3.0-r1 (02 Aug 2007) -*qt-3.3.8-r3 (02 Aug 2007) - - 02 Aug 2007; Carsten Lohrke - +files/0081-format-string-fixes.diff, +files/0185-fix-format-strings.diff, - +qt-3.3.8-r3.ebuild, +qt-4.3.0-r1.ebuild: - Possible remote code execution, CVE-2007-3388, bug #187465. - - 01 Aug 2007; Christoph Mende qt-4.3.0.ebuild: - Stable on amd64 wrt bug #186670 - - 31 Jul 2007; Caleb Tennis qt-4.3.0.ebuild: - Incorporate dep changes from flameeyes at bug #181199 - - 26 Jul 2007; Jeroen Roovers qt-4.3.0.ebuild: - Stable for HPPA (bug #186670). - - 26 Jul 2007; Gustavo Zacarias qt-4.3.0.ebuild: - Stable on sparc wrt #186670 - - 26 Jul 2007; Raúl Porcel qt-4.3.0.ebuild: - ia64/x86 stable wrt #186670 - - 22 Jul 2007; Donnie Berkholz ; qt-3.3.4-r8.ebuild, - qt-3.3.8-r2.ebuild: - Drop virtual/x11 references. - - 20 Jul 2007; Raúl Porcel - +files/qt-4.3.0-alpha-threading.patch, qt-4.3.0.ebuild: - Add ~alpha to 4.3.0 and add a patch from upstream to make it work on alpha - - 10 Jul 2007; Markus Rothe qt-4.3.0.ebuild: - Added ~ppc - - 20 Jun 2007; Caleb Tennis qt-4.3.0.ebuild: - Add -reduce-relocations switch, from bug #178535 - - 08 Jun 2007; Caleb Tennis -qt-4.3.0_beta1.ebuild, - -qt-4.3.0_rc1.ebuild: - remove beta and rc ebuilds - - 04 Jun 2007; Diego Pettenò qt-4.3.0.ebuild: - Make png, jpeg, zlib and mng turn off the relative support from Qt 4.3, see - bug #180835. - - 04 Jun 2007; Diego Pettenò qt-4.3.0.ebuild: - Add ~x86-fbsd keyword. - - 04 Jun 2007; Diego Pettenò qt-4.3.0.ebuild: - Always avoid stripping during build, fixes bug #138215. - - 02 Jun 2007; Raúl Porcel qt-4.3.0.ebuild: - Add ~ia64 wrt #180444 - - 01 Jun 2007; Jeroen Roovers qt-4.3.0.ebuild: - Marked ~hppa (bug #180444). - - 01 Jun 2007; Jeroen Roovers qt-4.3.0.ebuild: - Return of the hppa-ldcw-fix patch. - - 01 Jun 2007; Gustavo Zacarias qt-4.3.0.ebuild: - Keyworded ~sparc wrt #180444 - -*qt-4.3.0 (31 May 2007) - - 31 May 2007; Caleb Tennis +qt-4.3.0.ebuild: - Adding 4.3.0 final - - 30 May 2007; Caleb Tennis qt-3.3.8-r2.ebuild: - Add firebird include dir - - 17 May 2007; Caleb Tennis qt-4.3.0_rc1.ebuild: - explicitly disable pch here, from bug #178843 - - 14 May 2007; Caleb Tennis qt-4.3.0_rc1.ebuild: - Some sed foo to change CFLAG stuff, from bug #172219 - - 13 May 2007; Marcus D. Hanwell qt-4.3.0_rc1.ebuild: - Marked ~amd64. - -*qt-4.3.0_rc1 (10 May 2007) - - 10 May 2007; Caleb Tennis +qt-4.3.0_rc1.ebuild: - bump - - 03 May 2007; Caleb Tennis qt-3.3.4-r8.ebuild: - readd amd64 as it likes this version for hardened as well - -*qt-4.3.0_beta1 (01 May 2007) - - 01 May 2007; Caleb Tennis +qt-4.3.0_beta1.ebuild: - Bump for new beta - - 28 Apr 2007; Sven Wegener qt-3.3.4-r8.ebuild, - qt-3.3.8-r2.ebuild: - Fix *initd, *confd and *envd calls (#17388, #174266) - - 20 Apr 2007; Caleb Tennis qt-3.3.4-r8.ebuild: - re-add x86 because this is the preferred hardened version for x86 - - 18 Apr 2007; Caleb Tennis - -files/qt-3.3.5-immodule.patch, -files/qt-3.3.6-CVE-2006-4811-bis.patch, - -files/qt-3.3.6-CVE-2006-4811.patch, -files/qt-3.3.6-seli-xinerama.patch, - -files/qt-3.3.6-uic-fix.patch, -files/qt-3.3.6-visibility.patch, - -files/qt-4.1.4-CVE-2006-4811-bis.patch, - -files/qt-4.1.4-CVE-2006-4811.patch, qt-3.3.4-r8.ebuild, - -qt-3.3.6-r4.ebuild, -qt-3.3.6-r5.ebuild, -qt-4.1.4-r2.ebuild, - -qt-4.2.2.ebuild: - remove lots of old security ridden versions. Removing arches on 3.3.4-r8 - except for mips which hasn't stabilized 3.3.8-r2 yet - - 18 Apr 2007; Jose Luis Rivero qt-3.3.8-r2.ebuild, - qt-4.2.3-r1.ebuild: - Stable on alpha wrt security #172746 - - 17 Apr 2007; Gustavo Zacarias qt-4.2.3-r1.ebuild: - Stable on sparc wrt security #172746 - - 13 Apr 2007; Gustavo Zacarias qt-3.3.8-r2.ebuild: - Stable on sparc wrt security #172746 - - 13 Apr 2007; Caleb Tennis -qt-3.3.8.ebuild, - -qt-3.3.8-r1.ebuild, -qt-4.2.3.ebuild: - Removing old versions - - 13 Apr 2007; Caleb Tennis +files/qt4/Assistant.desktop, - +files/qt4/Designer.desktop, +files/qt4/Linguist.desktop, - qt-4.2.3-r1.ebuild: - This change just installs .desktop files for the Qt desktop applications so - that they can be used from the menus of the desktops. From bug #174033 - - 12 Apr 2007; Jeroen Roovers qt-4.2.3-r1.ebuild: - W00t! Back to stable (bug #172746, comment #23). - - 12 Apr 2007; Jeroen Roovers qt-3.3.8-r2.ebuild: - Stable for HPPA (bug #172746). - - 12 Apr 2007; Jeroen Roovers qt-4.2.3-r1.ebuild: - Revert to ~hppa (bug #172746, comment #16). - - 12 Apr 2007; Jeroen Roovers - +files/qt-4.2.3-hppa-ldcw-fix.patch, qt-4.2.3-r1.ebuild: - Stable for HPPA (bug #172746). - - 11 Apr 2007; Tobias Scherbaum qt-3.3.8-r2.ebuild, - qt-4.2.3-r1.ebuild: - ppc stable, bug #172746 - - 11 Apr 2007; Markus Rothe qt-3.3.8-r2.ebuild, - qt-4.2.3-r1.ebuild: - Stable on ppc64; bug #172746 - - 11 Apr 2007; Raúl Porcel qt-3.3.8-r2.ebuild, - qt-4.2.3-r1.ebuild: - ia64 + x86 stable wrt security bug 172746 - - 11 Apr 2007; Marcus D. Hanwell qt-3.3.8-r2.ebuild, - qt-4.2.3-r1.ebuild: - Stable on amd64, bug 172746. - -*qt-4.2.3-r1 (30 Mar 2007) -*qt-3.3.8-r2 (30 Mar 2007) - - 30 Mar 2007; Caleb Tennis +files/utf8-bug-qt3.diff, - +files/utf8-bug-qt4-2.diff, +qt-3.3.8-r2.ebuild, +qt-4.2.3-r1.ebuild: - Add a patch that fixes a a XSS error in the UTF8 decoder (from kde-packager) - - 27 Mar 2007; Raúl Porcel qt-4.2.2.ebuild: - ia64 stable wrt bug 164699 - - 26 Mar 2007; Charlie Shepherd - qt-3.3.8-r1.ebuild: - Add note about updating the qt3 eclass - -*qt-3.3.8-r1 (26 Mar 2007) - - 26 Mar 2007; Caleb Tennis - +files/qt-3.3.8-mysql-unload-crash.diff, +qt-3.3.8-r1.ebuild: - Revbump to include a crash patch (Bug #171883) - - 21 Mar 2007; Caleb Tennis qt-3.3.8.ebuild: - Update to the latest immqt patch from bug #169852 - -*qt-4.2.3 (08 Mar 2007) - - 08 Mar 2007; Caleb Tennis +qt-4.2.3.ebuild: - Version bump. Also, don't use the Qt built in split debug option as portage - now supports it via make.conf - - 22 Feb 2007; Caleb Tennis -qt-4.2.1.ebuild: - remove old version - -*qt-3.3.8 (22 Feb 2007) - - 22 Feb 2007; Caleb Tennis - +files/qt-3.3.8-seli-xinerama.patch, +files/qt-3.3.8-uic-fix.patch, - +files/qt-3.3.8-visibility.patch, +qt-3.3.8.ebuild: - Bump to latest version - - 18 Feb 2007; Fabian Groffen - -files/qt-3.3.4-macos.patch, -files/qt-3.3.5-macos.patch, - qt-3.3.4-r8.ebuild, qt-3.3.6-r4.ebuild, qt-3.3.6-r5.ebuild: - Dropped ppc-macos keyword, see you in prefix - - 14 Feb 2007; Christian Faulhammer qt-4.2.2.ebuild: - stable x86; bug 164699 - - 12 Feb 2007; Simon Stelling qt-4.2.2.ebuild: - stable on amd64; bug 166478 - - 06 Feb 2007; Roy Marples qt-4.2.2.ebuild: - Add ~x86-fbsd keyword. - - 04 Feb 2007; nixnut qt-4.2.2.ebuild: - Stable on ppc wrt bug 164699 - - 01 Feb 2007; Markus Rothe qt-4.2.2.ebuild: - Stable on ppc64; bug #164699 - - 01 Feb 2007; Gustavo Zacarias qt-4.2.2.ebuild: - Stable on sparc wrt #164699 - - 05 Jan 2007; Diego Pettenò qt-3.3.4-r8.ebuild, - qt-3.3.6-r4.ebuild, qt-3.3.6-r5.ebuild: - Convert to use elog. - - 21 Dec 2006; Caleb Tennis qt-4.2.2.ebuild: - change install targets to simply subtargets, per bug #157997 - - 19 Dec 2006; Caleb Tennis qt-4.1.4-r2.ebuild, - qt-4.2.1.ebuild, qt-4.2.2.ebuild: - This change was wrong. Qt is still dual licensed GPL/QPL, so revert this back - - 19 Dec 2006; Caleb Tennis qt-4.2.2.ebuild: - Make sure we catch sed the proper stuff - - 19 Dec 2006; Caleb Tennis qt-4.2.2.ebuild: - Make symbol export and examples handling part of configure options instead - of seds, now that Qt supports them (thanks to bug #157997) - - 05 Dec 2006; Caleb Tennis - +files/qt4-sqlite-configure.patch, qt-4.2.2.ebuild: - A configure patch to ensure usage of system sqlite (bug #156123) - - 05 Dec 2006; Caleb Tennis qt-4.2.2.ebuild: - Can just use -confirm-license now instead of saying yes to the prompt - - 04 Dec 2006; Caleb Tennis qt-4.2.2.ebuild: - Qt configuration seems to do a lot with pkgconfig, so we need to dep on it - - 04 Dec 2006; Caleb Tennis qt-4.2.2.ebuild: - make the qt3 use flag into qt3support (for qt4 only) - - 04 Dec 2006; Caleb Tennis qt-4.2.2.ebuild: - Fix up sqlite and sqlite3 use flags to pull in proper dependencies and use - proper config options to build proper plugins (from bug #156123) - - 04 Dec 2006; Caleb Tennis -qt-3.3.6-r1.ebuild, - -qt-3.3.6-r2.ebuild, -qt-3.3.6-r3.ebuild: - remove some stale versions - -*qt-4.2.2 (04 Dec 2006) - - 04 Dec 2006; Caleb Tennis +qt-4.2.2.ebuild: - Adding new 4.2.2 version - - 29 Nov 2006; Bryan Østergaard qt-4.1.4-r2.ebuild: - Stable on Alpha. - - 25 Nov 2006; Bryan Østergaard qt-4.1.4-r2.ebuild, - qt-4.2.1-r1.ebuild: - Add ~alpha and ~ia64 keywords. - - 25 Nov 2006; Diego Pettenò files/digest-qt-4.2.1, - files/digest-qt-4.2.1-r1, Manifest: - Fix digests (hopefully). - - 24 Nov 2006; Diego Pettenò qt-3.3.6-r5.ebuild: - Fix keywording. - -*qt-3.3.6-r5 (24 Nov 2006) - - 24 Nov 2006; Diego Pettenò - +files/qt-3.3.6-seli-xinerama.patch, +qt-3.3.6-r5.ebuild: - Add a patch to improve xinerama support, by Lubos Lunak. - - 23 Nov 2006; Francesco Riosa qt-3.3.4-r8.ebuild, - qt-3.3.6-r1.ebuild, qt-3.3.6-r2.ebuild, qt-3.3.6-r3.ebuild, - qt-3.3.6-r4.ebuild, qt-4.1.4-r2.ebuild, qt-4.2.1.ebuild, - qt-4.2.1-r1.ebuild: - dev-db/mysql => virtual/mysql - - 10 Nov 2006; Caleb Tennis qt-4.1.4-r2.ebuild, - qt-4.2.1.ebuild, qt-4.2.1-r1.ebuild: - Qt4 is GPL-2 only, not QPL (as far as I can tell), so remove that from the - license option - -*qt-4.2.1-r1 (09 Nov 2006) - - 09 Nov 2006; Caleb Tennis +qt-4.2.1-r1.ebuild: - Readding a masked 4.2.1 version that support dbus, since it will be unmasked - somewhat soon - - 07 Nov 2006; Caleb Tennis qt-4.2.1.ebuild: - Fix pkgconfig files - - 06 Nov 2006; Caleb Tennis qt-4.2.1.ebuild: - update the check for the qt4 bindings based on comments from bug #150888 - - 06 Nov 2006; Alexander H. Færøy qt-3.3.6-r4.ebuild: - Stable on Alpha. Bug #151838 - - 03 Nov 2006; Caleb Tennis qt-4.2.1.ebuild: - Add a dbus build error for people who have the qt4 bindings already on their - system - - 02 Nov 2006; Caleb Tennis qt-4.2.1.ebuild: - removing dbus flag from Qt until the dbus herd unmasks it - - 30 Oct 2006; Caleb Tennis qt-4.2.1.ebuild: - dbus-core -> dbus - - 30 Oct 2006; Caleb Tennis qt-3.3.6-r4.ebuild: - Fix icc detection per bug #152366 - - 30 Oct 2006; Caleb Tennis qt-4.1.4-r2.ebuild, - qt-4.2.1.ebuild: - Fix icc compiler detection per bug #152385 and add checking into the 4.2 - series that is in the 4.1 series - - 30 Oct 2006; Caleb Tennis -qt-4.0.1.ebuild: - Remove 4.0 series that was put back for sparc reasons. Now have a 4.1 stable - -*qt-4.2.1 (30 Oct 2006) - - 30 Oct 2006; Caleb Tennis - -files/qt-4.2.0-CVE-2006-4811-bis.patch, - -files/qt-4.2.0-CVE-2006-4811.patch, -qt-4.2.0.ebuild, - -qt-4.2.0-r1.ebuild, -qt-4.2.0-r2.ebuild, +qt-4.2.1.ebuild: - Bump to qt-4.2.1 which has the security fixes as 4.2.0-r2, and fixes the - dbus dep - - 29 Oct 2006; Bryan Østergaard qt-3.3.6-r4.ebuild, - qt-4.1.4-r2.ebuild: - Stable on ia64, bug 151838. - - 27 Oct 2006; René Nussbaumer qt-3.3.6-r4.ebuild, - qt-4.1.4-r2.ebuild: - Stable on hppa. See bug #151838. - - 25 Oct 2006; Diego Pettenò files/digest-qt-4.1.4, - files/digest-qt-4.1.4-r1, files/digest-qt-4.1.4-r2, Manifest: - Fix digest, close bug #149809. - - 24 Oct 2006; Tobias Scherbaum qt-3.3.6-r4.ebuild, - qt-4.1.4-r2.ebuild: - ppc stable, bug #151838 - - 24 Oct 2006; Simon Stelling qt-3.3.6-r4.ebuild, - qt-4.1.4-r2.ebuild: - stable on amd64 wrt bug 151838 - - 24 Oct 2006; Joshua Jackson qt-3.3.6-r4.ebuild, - qt-4.1.4-r2.ebuild: - Stable x86; security bug #151838 - - 23 Oct 2006; Gustavo Zacarias qt-3.3.6-r4.ebuild, - qt-4.1.4-r2.ebuild: - Stable on sparc wrt security #151838 - - 22 Oct 2006; Markus Rothe qt-3.3.6-r4.ebuild, - qt-4.1.4-r2.ebuild: - Stable on ppc64; bug #151838 - - 20 Oct 2006; qt-4.2.0-r1.ebuild, qt-4.2.0-r2.ebuild: - Added ~ppc wrt bug 150888 - - 20 Oct 2006; Marcus D. Hanwell qt-4.2.0.ebuild, - qt-4.2.0-r1.ebuild, qt-4.2.0-r2.ebuild: - Marked ~amd64, bug 150888. - -*qt-4.2.0-r2 (20 Oct 2006) -*qt-4.1.4-r2 (20 Oct 2006) -*qt-3.3.6-r4 (20 Oct 2006) - - 20 Oct 2006; Diego Pettenò - +files/qt-3.3.6-CVE-2006-4811-bis.patch, - +files/qt-4.1.4-CVE-2006-4811-bis.patch, - +files/qt-4.2.0-CVE-2006-4811-bis.patch, +qt-3.3.6-r4.ebuild, - +qt-4.1.4-r2.ebuild, +qt-4.2.0-r2.ebuild: - Add new version of the patches for CVE-2006-4811 directly from Trolltech, - hopefully fixing the problems for good. - - 20 Oct 2006; Bryan Østergaard qt-3.3.6-r3.ebuild: - Stable on Alpha, bug 151838. - - 20 Oct 2006; Joshua Jackson qt-4.2.0.ebuild, - qt-4.2.0-r1.ebuild: - Adding ~x86; bug #150888 - - 19 Oct 2006; Aron Griffis qt-3.3.6-r3.ebuild, - qt-4.1.4-r1.ebuild: - Mark 4.1.4-r1 3.3.6-r3 stable on ia64. #151838 - -*qt-4.2.0-r1 (19 Oct 2006) -*qt-4.1.4-r1 (19 Oct 2006) - - 19 Oct 2006; Diego Pettenò - +files/qt-4.1.4-CVE-2006-4811.patch, +files/qt-4.2.0-CVE-2006-4811.patch, - +qt-4.1.4-r1.ebuild, +qt-4.2.0-r1.ebuild: - Add patches for Qt 4.x for the vulnerability reported lately. - - 19 Oct 2006; Joshua Jackson qt-3.3.6-r3.ebuild: - Stable x86; Diego told me to do it, but I choose security as the reason - - 18 Oct 2006; Markus Rothe qt-3.3.6-r3.ebuild: - Stable on ppc64; bug #151838 - - 17 Oct 2006; Gustavo Zacarias qt-4.2.0.ebuild: - Fixed up and keyworded ~sparc wrt #150888 - -*qt-3.3.6-r3 (18 Oct 2006) - - 18 Oct 2006; Diego Pettenò - +files/qt-3.3.6-CVE-2006-4811.patch, +qt-3.3.6-r3.ebuild: - Add patch from RedHat to try fixing security bug #151838. - - 15 Oct 2006; Bryan Østergaard qt-3.3.6-r1.ebuild: - Stable on ia64, bug 132887. - - 11 Oct 2006; Markus Rothe qt-4.2.0.ebuild: - Added ~ppc64; bug #150888 - - 10 Oct 2006; Gustavo Zacarias qt-4.1.4.ebuild: - Stable on sparc wrt #134341 - - 06 Oct 2006; Caleb Tennis - qt-3.3.6-r2.ebuild, qt-4.2.0.ebuild: - Set minimum mng version to 1.0.9, per bug #148687 - - 05 Oct 2006; Caleb Tennis -qt-4.2.0_rc1.ebuild: - remove _rc1 - -*qt-4.2.0 (04 Oct 2006) - - 04 Oct 2006; Caleb Tennis +qt-4.2.0.ebuild: - Version bump - - 29 Sep 2006; Caleb Tennis +files/qt-4.1.4-sparc.patch, - qt-4.1.4.ebuild: - Add a patch which detects Sparc for Linux, from bug #134341 - -*qt-4.0.1 (22 Sep 2006) - - 22 Sep 2006; Caleb Tennis qt-3.3.6-r1.ebuild, - qt-3.3.6-r2.ebuild, +qt-4.0.1.ebuild: - Readding 4.0.1 so sparc will be happy :) - - 22 Sep 2006; Caleb Tennis qt-3.3.6-r1.ebuild, - qt-3.3.6-r2.ebuild: - Fix icc compiler, bug #148211 - -*qt-3.3.6-r2 (20 Sep 2006) - - 20 Sep 2006; Diego Pettenò +qt-3.3.6-r2.ebuild: - Revision bump so that the pkg-config change is applied to everyone. - - 14 Sep 2006; Caleb Tennis qt-3.3.4-r8.ebuild: - Changing 3.3.4 dep to freetype-2.1* because it doesn't work with freetype - 2.2 (per bug #145641) and the patch is way too big for me to comfortably - introduce here. - - 14 Sep 2006; Caleb Tennis - -files/qt-4.1.3-mysql4-support.diff, -qt-4.1.2.ebuild, -qt-4.1.3.ebuild: - Remove stale ebuilds - - 14 Sep 2006; Caleb Tennis qt-4.1.4.ebuild, - qt-4.2.0_rc1.ebuild: - Remove monolithic qt deps from 4.1.4 and 4.2.0; must use modular from now on - - 07 Sep 2006; Diego Pettenò qt-4.1.4.ebuild: - Add support again for different mkspecs and add ~x86-fbsd keyword to version - 4.1.4. - -*qt-4.2.0_rc1 (06 Sep 2006) - - 06 Sep 2006; Caleb Tennis -qt-4.2.0_pre1.ebuild, - +qt-4.2.0_rc1.ebuild: - add in 4.2.0_rc1, remove 4.2.0_pre1 - - 02 Sep 2006; Bryan Østergaard qt-4.1.4.ebuild: - Stable on ia64. - - 23 Aug 2006; Caleb Tennis qt-3.3.6-r1.ebuild: - Add PKG_CONFIG_PATH to the environment of Qt so the pkgconfig files are - properly found, per bug #144140 - - 19 Aug 2006; Tobias Scherbaum qt-4.1.4.ebuild: - ppc stable, bug #134341 - - 19 Aug 2006; Jeroen Roovers qt-4.1.4.ebuild: - Stable for HPPA (bug #134341). - - 14 Aug 2006; Jeroen Roovers files/qt4-parisc-linux.diff, - qt-4.1.3.ebuild, qt-4.1.4.ebuild: - Fixed HPPA patching. - - 11 Aug 2006; Markus Rothe qt-4.1.4.ebuild: - Stable on ppc64; bug #134341 - - 08 Aug 2006; Simon Stelling qt-4.1.4.ebuild: - stable on amd64 - - 07 Aug 2006; Andrej Kacian qt-4.1.4.ebuild, - qt-4.2.0_pre1.ebuild: - Stable on x86. Bug #134341. Fix leading spaces in the 4.2.0_pre1 ebuild. - - 31 Jul 2006; Caleb Tennis qt-4.2.0_pre1.ebuild: - Add pch support for qt-4.2 - - 28 Jul 2006; Caleb Tennis qt-4.1.4.ebuild, - qt-4.2.0_pre1.ebuild: - Install the translations - - 28 Jul 2006; Caleb Tennis -qt-3.3.4-r9.ebuild, - -qt-3.3.6.ebuild, -qt-4.1.1.ebuild: - Remove a few old stale versions - - 11 Jul 2006; Caleb Tennis qt-4.2.0_pre1.ebuild: - require a specific version of dbus - - 09 Jul 2006; Diego Pettenò qt-3.3.4-r8.ebuild, - qt-3.3.4-r9.ebuild, qt-3.3.6.ebuild, qt-3.3.6-r1.ebuild, qt-4.1.1.ebuild, - qt-4.1.2.ebuild, qt-4.1.3.ebuild, qt-4.1.4.ebuild, qt-4.2.0_pre1.ebuild: - Pinpoint virtual/x11 version to less than 7. - - 05 Jul 2006; Michael Sterrett qt-4.2.0_pre1.ebuild: - typo: sys-libs/glib -> dev-libs/glib - -*qt-4.2.0_pre1 (30 Jun 2006) - - 30 Jun 2006; Caleb Tennis +qt-4.2.0_pre1.ebuild: - New technology preview. Keyworded -* until it has a bit more testing and the - ebuild gets happier - -*qt-4.1.4 (22 Jun 2006) - - 22 Jun 2006; Caleb Tennis +qt-4.1.4.ebuild: - Qt 4.1.4 - - 03 Jun 2006; Guy Martin qt-4.1.3.ebuild: - Stable on hppa. - - 02 Jun 2006; Guy Martin +files/qt4-parisc-linux.diff, - qt-4.1.3.ebuild: - Fixed parisc asm to build on linux. - - 30 May 2006; Caleb Tennis qt-4.1.3.ebuild: - Don't warn about nodoc anymore - - 30 May 2006; Joseph Jezak qt-4.1.2.ebuild: - Marked ppc stable for bug #134341. - - 28 May 2006; Mark Loeser Manifest: - Fix digest - - 28 May 2006; Carsten Lohrke - +files/qt-4.1.3-mysql4-support.diff, qt-4.1.3.ebuild: - Build against MySQL 4.0. - - 26 May 2006; Chris Gianelloni qt-3.3.6-r1.ebuild: - Stable on amd64 wrt bug #132887. - - 26 May 2006; Chris Gianelloni qt-4.1.2.ebuild: - Stable on amd64 wrt bug #132349 - - 25 May 2006; Guy Martin qt-3.3.6-r1.ebuild: - Stable on hppa. - - 25 May 2006; Chris Gianelloni qt-4.1.2.ebuild: - Stable on x86 wrt bug #132349. - -*qt-4.1.3 (25 May 2006) - - 25 May 2006; Caleb Tennis +qt-4.1.3.ebuild: - Bump for a new version - - 24 May 2006; Diego Pettenò ChangeLog: - Force digest regen. - - 24 May 2006; Diego Pettenò - +files/qt-3.3.6-visibility.patch, qt-3.3.6-r1.ebuild: - Add visibility patch to enable KDE hidden visibility. Enable only in - presence of GCC 4.1 or later, so that we play it safe. No visibility flags - are enabled or it would break Qt! - - 23 May 2006; Markus Rothe qt-4.1.2.ebuild: - Stable on ppc64; bug #132349 - - 12 May 2006; Thomas Cort qt-3.3.6-r1.ebuild: - Stable on alpha wrt Bug #132887. - - 12 May 2006; Chris Gianelloni qt-3.3.6-r1.ebuild: - Stable on x86 wrt bug #132887. - - 12 May 2006; Luca Barbato qt-3.3.6-r1.ebuild: - Marked ppc - - 12 May 2006; Jason Wever qt-3.3.6-r1.ebuild: - Stable on SPARC wrt bug #132887. - - 11 May 2006; Markus Rothe qt-3.3.6-r1.ebuild: - Stable on ppc64; bug #132887 - - 05 May 2006; Diego Pettenò qt-3.3.6-r1.ebuild: - Make use the proper gcc/g++ executables so that it can be crosscompiled with - distcc. - - 05 May 2006; Caleb Tennis qt-4.1.2.ebuild: - Change qt's DATADIR back to /usr/share/qt4, and leave DOCDIR as - /usr/share/doc/qt-4.x.x. The reasoning is that we need a defined places to - keep the mkspecs files that doesn't change with each new emerge - -*qt-3.3.6-r1 (05 May 2006) - - 05 May 2006; Caleb Tennis - +files/0044-qscrollview-windowactivate-fix.diff, - +files/0047-fix-kmenu-widget.diff, - +files/0048-qclipboard_hack_80072.patch, +qt-3.3.6-r1.ebuild: - Fix some patches that were dropped when moving to 3.3.6. This should make a - lot of people happy - - 05 May 2006; Caleb Tennis qt-3.3.6.ebuild: - Add nis support, from bug #131303 - - 28 Apr 2006; Alec Warner files/digest-qt-4.1.1, - Manifest: - Fixing SHA256 digest, pass four - - 19 Apr 2006; Caleb Tennis qt-4.1.2.ebuild: - Add a die to the ebuild if using nodoc feature - - 13 Apr 2006; Caleb Tennis qt-3.3.6.ebuild: - Fix CHOST naming scheme from bug #128528 - - 11 Apr 2006; Diego Pettenò qt-3.3.4-r8.ebuild, - qt-3.3.4-r9.ebuild, qt-3.3.6.ebuild: - Replace dolib with dolib.so to ensure executable bit is set. - - 07 Apr 2006; Caleb Tennis - -files/qt-3.3.5-uic-fix.patch, -qt-3.3.5.ebuild, -qt-3.3.5-r1.ebuild: - remove some more older versions - - 06 Apr 2006; Caleb Tennis qt-4.1.2.ebuild: - remove implicit PATH and ROOTPATH from env.d file per bug #128655 - - 06 Apr 2006; Caleb Tennis - -files/qt-4.1.0-configure-no-mysql.diff, - -files/qt-4.1.0-debug-and-release.diff, -qt-4.1.0-r1.ebuild, - -qt-4.1.0-r2.ebuild: - remove stale versions - - 01 Apr 2006; Diego Pettenò qt-3.3.6.ebuild: - Add ~x86-fbsd keyword. - -*qt-4.1.2 (30 Mar 2006) - - 30 Mar 2006; Caleb Tennis +qt-4.1.2.ebuild: - version bump - - 18 Mar 2006; Mike Frysinger qt-3.3.6.ebuild: - Fix typo (pv -> PV) for libqt-mt.so symlink. - - 17 Mar 2006; Diego Pettenò qt-3.3.6.ebuild: - Fix installation of libraries (3.3.5 -> ${PV}). Forward port immodule patch - to Qt 3.3.6. - - 17 Mar 2006; Fabian Groffen qt-3.3.6.ebuild: - Marked ~ppc-macos, used old 3.3.5 patch to get it compiling (bug #126553) - -*qt-3.3.6 (17 Mar 2006) - - 17 Mar 2006; Caleb Tennis - +files/qt-3.3.6-uic-fix.patch, +qt-3.3.6.ebuild: - Adding Qt 3.3.6 - -*qt-3.3.5-r1 (09 Mar 2006) -*qt-3.3.4-r9 (09 Mar 2006) - - 09 Mar 2006; Diego Pettenò - +files/qt-3.3.5-immodule.patch, +qt-3.3.4-r9.ebuild, +qt-3.3.5-r1.ebuild: - Add patch for Qt's immodule, bug #124033. Thanks to Martin Meredith - for reporting. - - 09 Mar 2006; Aron Griffis qt-4.1.1.ebuild: - Mark 4.1.1 ~ia64 - - 23 Feb 2006; Caleb Tennis qt-3.3.4-r8.ebuild, - qt-3.3.5.ebuild: - Add QTBASE dir to revdep-rebuild search paths so plugins (like mysql) get - picked up - - 22 Feb 2006; Caleb Tennis -qt-4.0.1.ebuild, - -qt-4.1.0.ebuild: - remove old versions - -*qt-4.1.1 (22 Feb 2006) - - 22 Feb 2006; Caleb Tennis +qt-4.1.1.ebuild: - Version bump - - 08 Feb 2006; Diego Pettenò qt-3.3.5.ebuild: - Append -fno-strict-aliasing as it dereferences type punned pointers (better - be safe). - - 19 Jan 2006; Caleb Tennis +files/qt-ulibc.patch, - qt-3.3.4-r8.ebuild, qt-3.3.5.ebuild: - Add a uclibc patch to allow Qt to compile with ulibc (bug #100246) - - 18 Jan 2006; Joseph Jezak qt-4.1.0-r2.ebuild: - Marked ~ppc for bug #112811. - - 14 Jan 2006; Fabian Groffen qt-3.3.4-r8.ebuild: - Marked ppc-macos stable - - 13 Jan 2006; Caleb Tennis qt-3.3.4-r8.ebuild, - qt-3.3.5.ebuild, qt-4.0.1.ebuild, qt-4.1.0-r2.ebuild: - Add x11-libs/libSM as a modular X dep per bug #118420 - -*qt-4.1.0-r2 (13 Jan 2006) - - 13 Jan 2006; Caleb Tennis +qt-4.1.0-r2.ebuild: - Due to the requirement of private headers, QtTestlib is unusable without - this fix (fixed in Qt 4.1.1, I'm told) - - 11 Jan 2006; Jason Wever qt-4.1.0-r1.ebuild: - Added ~sparc keyword wrt bug #112811. - - 04 Jan 2006; Luis Medinas qt-4.1.0-r1.ebuild: - Added ~amd64 keyword. For bug #112811. - - 04 Jan 2006; Markus Rothe qt-4.1.0-r1.ebuild: - Added ~ppc64; bug #112811 - - 04 Jan 2006; Caleb Tennis qt-4.1.0-r1.ebuild: - bump to ~x86 - -*qt-4.1.0-r1 (04 Jan 2006) - - 04 Jan 2006; Caleb Tennis +qt-4.1.0-r1.ebuild: - Revbump to change prefix to /usr, fixes pkgconfig files - - 03 Jan 2006; Caleb Tennis - +files/qt-4.1.0-debug-and-release.diff, qt-3.3.4-r8.ebuild, - qt-3.3.5.ebuild, qt-4.1.0.ebuild: - Add a patch which fixes qt build in -debug-and-release mode, from Trolltech - (bug #117127) - - 03 Jan 2006; Caleb Tennis qt-3.3.4-r8.ebuild, - qt-3.3.5.ebuild: - build qembed tool by default - - 20 Dec 2005; Caleb Tennis qt-4.1.0.ebuild: - Remove QtAssistant manual installation (it looks to me like it's handled - now), and move the pkg-config files into /usr/_libdir_/pkgconfig - -*qt-4.1.0 (20 Dec 2005) - - 20 Dec 2005; Caleb Tennis +qt-4.1.0.ebuild: - Bump from _rc1 - - 16 Dec 2005; Diego Pettenò qt-3.3.5.ebuild: - Use ${CHOST} selection instead of checking for kernel/elibc pairs. Added - support for DragonFly, OpenBSD and NetBSD. - - 14 Dec 2005; Donnie Berkholz ; qt-3.3.4-r8.ebuild, - qt-3.3.5.ebuild, qt-4.0.1.ebuild, qt-4.1.0_rc1.ebuild: - Add modular X dependencies to qt-3. Remove redundant modular deps from qt-4. - - 13 Dec 2005; Donnie Berkholz ; qt-4.0.1.ebuild, - qt-4.1.0_rc1.ebuild: - Clean up xinerama modular deps, based on how enlightenment did it. - - 13 Dec 2005; Donnie Berkholz ; qt-4.0.1.ebuild, - qt-4.1.0_rc1.ebuild: - Fix modular X xinerama. - - 11 Dec 2005; Donnie Berkholz ; qt-4.0.1.ebuild, - qt-4.1.0_rc1.ebuild: - Add modular X dependencies. - - 08 Dec 2005; Caleb Tennis qt-4.1.0_rc1.ebuild: - Add a sed statement to make Qt use /usr/XXX instead of /usr/X11R6/XXX - - 04 Dec 2005; Mamoru KOMACHI qt-3.3.5.ebuild: - Updated immodule patch. This closes bug #106386. - - 28 Nov 2005; Caleb Tennis - +files/qt-4.1.0-configure-no-mysql.diff, qt-4.1.0_rc1.ebuild: - add a patch from Trolltech to fix mysql compilation support - -*qt-4.1.0_rc1 (21 Nov 2005) - - 21 Nov 2005; Caleb Tennis -qt-4.1.0_pre20051028.ebuild, - +qt-4.1.0_rc1.ebuild: - Bumping up to _rc1, removing snapshot - - 20 Nov 2005; Herbie Hopkins qt-4.0.1.ebuild, - qt-4.1.0_pre20051028.ebuild: - Small multilib fix - - 19 Nov 2005; Joseph Jezak qt-4.0.1.ebuild: - Marked ~ppc for bug #112811. - - 19 Nov 2005; Markus Rothe qt-4.0.1.ebuild: - Added ~ppc64 - - 19 Nov 2005; Jason Wever qt-4.0.1.ebuild: - Added ~sparc keyword wrt bug #112811. - - 18 Nov 2005; Marcus D. Hanwell qt-4.0.1.ebuild: - Marked ~amd64, bug 112811. - - 17 Nov 2005; Caleb Tennis qt-4.0.1.ebuild: - Moving to ~x86 - -*qt-4.1.0_pre20051028 (28 Oct 2005) - - 28 Oct 2005; Caleb Tennis +qt-4.1.0_pre20051028.ebuild: - Adding a 4.1.0 snapshot to track its progress upstream - - 09 Oct 2005; +files/qt-3.3.5-macos.patch, - qt-3.3.5.ebuild: - macos patch fixes for qt-3.3.5 - - 02 Oct 2005; Aron Griffis qt-3.3.4-r8.ebuild: - Mark 3.3.4-r8 stable on ia64 - - 29 Sep 2005; Hardave Riar qt-3.3.4-r8.ebuild: - Stable on mips, bug #105695. - - 22 Sep 2005; Mark Loeser qt-3.3.4-r8.ebuild: - Stable on x86; bug #105695 - - 21 Sep 2005; Fernando J. Pereda qt-3.3.4-r8.ebuild: - stable on alpha wrt bug #105695 - - 20 Sep 2005; Marcus D. Hanwell qt-3.3.4-r8.ebuild: - Stable on amd64, bug 105695. - - 20 Sep 2005; Michael Hanselmann qt-3.3.4-r8.ebuild: - Stable on hppa, ppc. - - 20 Sep 2005; Gustavo Zacarias qt-3.3.4-r8.ebuild: - Stable on sparc wrt #105695 - - 20 Sep 2005; Markus Rothe qt-3.3.4-r8.ebuild: - Stable on ppc64 (bug #105695) - -*qt-3.3.4-r8 (19 Sep 2005) - - 19 Sep 2005; Caleb Tennis +qt-3.3.4-r8.ebuild, - qt-4.0.1.ebuild: - Adding 3.3.4-r8 which is the same as -r7 except we force the build to use - the system zlib instead of allowing the option via the use flag, as this - gets us past the zlib error, which is fixed in 3.3.5 but which isn't ready - to go stable yet (see bug #105695) - -*qt-3.3.5 (17 Sep 2005) - - 17 Sep 2005; Caleb Tennis - +files/qt-3.3.5-uic-fix.patch, +qt-3.3.5.ebuild: - Version bump to 3.3.5 - - 17 Sep 2005; Aron Griffis qt-3.3.4-r3.ebuild: - Mark 3.3.4-r3 stable on alpha - - 02 Sep 2005; files/qt-3.3.4-macos.patch: - Fix for Mac OS X library install names. Libraries now reference each other - in /usr/qt/3/lib. Thanks j4rg0n for catching where the error was. - diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest deleted file mode 100644 index 0087f784..00000000 --- a/x11-libs/qt/Manifest +++ /dev/null @@ -1,21 +0,0 @@ -AUX 0001-dnd_optimization.patch 5623 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 SHA1 4f3416c3a7e44d52c1088c52256decb384e4b1bc SHA256 8e138a2fdd053ec81522df19ce30f7e4c05838dfd8e0c8069ffb793ba45d7439 -AUX 0002-dnd_active_window_fix.patch 7289 RMD160 b355f5fd028d35d88ca15bf9ce8da41bd365f12d SHA1 5b16995f072cbde80f000967aa11d8a88ed34e23 SHA256 e36383b43a53b815f3958608275c60299a0638b6b3201c3a3d9318ee2ead26d1 -AUX 0038-dragobject-dont-prefer-unknown.patch 2551 RMD160 0a89aec1a6f9672a927029ca01a1bd8573552745 SHA1 3a2371a520d800904350bb9e6e445d6b3092bb88 SHA256 b5c0d00d1ac84302bc2123ccdfdab473cd0daf12f4ba70d6318084d9f744242c -AUX 0044-qscrollview-windowactivate-fix.diff 1584 RMD160 978cc6c473b668e1bfd5969cce9307719baecf0a SHA1 657ff8ab47aafbd6469688f489fd3788ccb98907 SHA256 f73798b72251d6fe97ed8e661719ba29983c087587ed952618ec4a97bf1816d5 -AUX 0047-fix-kmenu-widget.diff 992 RMD160 bada5e23043d314b15f3af1eda70c8833112ebce SHA1 d67e34b540c2f19e7e3e3715535a6732f447b22c SHA256 0dadffc3218b04eb327baf51c1f681843046cdf07a52b943f46373cd8384c275 -AUX 0048-qclipboard_hack_80072.patch 1662 RMD160 ebfba0d27c03dcceeac7ad64650d5f6d7039ecdb SHA1 5c174acaf3b148f8d70345f68c7f22352450d582 SHA256 e47a1af0272e952cefacd30d466861b40d9bc969f6e5bc5cb32b878140af1d3c -AUX qt-3.3.8-fix-compiler-detection.patch 637 RMD160 08b7151a83031f0c268da2899d800742a5ed63cf SHA1 7c571a1c98bd29acf4e32fd15b1c9188b7d69bec SHA256 639cd7fb8548f67a51065efba8bb2deecd4778b451855bf28dac1bd9701cd9d5 -AUX qt-3.3.8-immqt+gcc-4.3.patch 756 RMD160 b4379b8c66b2708301f9883ecc1be55ae916a20f SHA1 179825f382fab2cadd097f7597292a69ef71d575 SHA256 d281c1e1f20cdc4f3351eede25287ba3b6bd80cbb0e6f5a9f997394521feb6bd -AUX qt-3.3.8-libpng14.patch 1680 RMD160 922a2ff3c98eb871e860ddd09b4ef2fe291f1687 SHA1 6532104043beef4ef57981dd1598aa0ffc0c2b73 SHA256 d4b63e1d2df1cf15e30f611fe04de1e1ad4ec48e2fce609f18797534f808da30 -AUX qt-3.3.8-mips.patch 1326 RMD160 0fd662a36c2fe0013e7204218ddfc8c604467269 SHA1 a8d1cf81f4b2c35c46b1d0efacd5e5ad7811ec49 SHA256 982a92c010df448cb83c2e6a8f46a4f8979d8b5708b2942485cca962621f0caf -AUX qt-3.3.8-seli-xinerama.patch 1960 RMD160 ce0163c9a47f5417f957e1d1ad0c574357c01cc7 SHA1 60b9c0a323d598aacca089d677c4b1c9709e70db SHA256 ec72679b69148af1b687a9cf7992e20ee85f4a0f3a33f3c05c8d2174f6f43503 -AUX qt-3.3.8-uic-fix.patch 711 RMD160 19964cfc6714e2ad38659e268ef248501db606aa SHA1 38bd5da513a2c28f3d941ba5644024643d835676 SHA256 e6a4e789c6c0da5542cad71057d1817e1976d005a52e1e4ef9bcf9914c37fcf3 -AUX qt-3.3.8-visibility.patch 5554 RMD160 db15a594a913fd1c1837a731e168b1197d19da62 SHA1 692ada218ed717b8b2fc5f5f67cf747bb50f59e4 SHA256 b33b2415f280ef25f070bbe7308659ee3e5a5c1999e2ef419271f11e59160407 -AUX qt-3.3.8b-cjk-fix.patch 1191 RMD160 62cc0a9db2ab42b9081967033ae75b0a0eed9e93 SHA1 24bf196b466f4b3956149b29830b158944b6a545 SHA256 94369e7cca8531ed89370480c2d5f3a0e99dbb49640df715ef33711b9d1cae4b -AUX qt-ulibc.patch 355 RMD160 9a7a01b248b7b646316cef550783569f8bdc89e2 SHA1 2f09deb7e354797ee72aa65a35c882a5ed5fd86c SHA256 6b57b1e25c1e2cebd51b8279fbcadb5e2d9bb77d19b10ea51a4f74c64bd65e2d -DIST qt-x11-free-3.3.8b.tar.gz 17313883 RMD160 4e3cbd9c5d4719b5d33e961e6595d7b215788c8b SHA1 745def6250dc7f337dbb265e20bf38dcb41fd854 SHA256 1b7a1ff62ec5a9cb7a388e2ba28fda6f960b27f27999482ebeceeadb72ac9f6e -DIST qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387 RMD160 7f4f79c95faa2b8e71a78308af8feae5f6a6b06a SHA1 230cc532f1a3023967c5aee4cce87d1b9351b73d SHA256 06994304d2b7c699c4b6ea4183877652e261170f74282e89a3700ce6d4a98918 -EBUILD qt-3.3.8b-r1.ebuild 10834 RMD160 f9469dfa04cccc3313d83d595ec1f7c230b21204 SHA1 c61d32bf049ed7d4d3726920c4457395bf856a7d SHA256 be77144868df6737bb87d66997cde870169536b62d6cafa25fc9a2aee59ad58c -EBUILD qt-3.3.8b-r2.ebuild 10852 RMD160 33f807231b2e1bf0bc212f9186230a2f15d6a188 SHA1 6c168b4fdf20a7499d6f7dc1609a9f30548d487e SHA256 0b61d43e09ae880ca572a8761eef8cffef14147704653fa2e6bb40bf69150cf0 -MISC ChangeLog 48679 RMD160 59534c174e15ab89e54ed7c273c4ff354eee6ba1 SHA1 4dce695f24a52831deea66fe4cf4d667f1fc56e2 SHA256 0cbe4374e69e5188074f086c4ef3e71f43f12e9b43dd712b9c9af8311b5379bc -MISC metadata.xml 335 RMD160 76be6bdf3a132836b4cf22c0a8a45f29efe4af83 SHA1 5f6aa35732fc54d6b10f9dc113b07e26b0513159 SHA256 53934f5173007d42204665e1561d36656c6ecf587162b8eb4e289fcfa88c577a diff --git a/x11-libs/qt/files/0001-dnd_optimization.patch b/x11-libs/qt/files/0001-dnd_optimization.patch deleted file mode 100644 index d9de2846..00000000 --- a/x11-libs/qt/files/0001-dnd_optimization.patch +++ /dev/null @@ -1,187 +0,0 @@ -qt-bugs@ issue : 16115 -applied: no -author: Lubos Lunak - -See http://lists.kde.org/?t=104388858900001&r=1&w=2 - - ---- src/kernel/qdnd_x11.cpp.sav 2003-02-05 16:09:45.000000000 +0100 -+++ src/kernel/qdnd_x11.cpp 2003-02-07 16:14:49.000000000 +0100 -@@ -49,13 +49,15 @@ - #include "qdragobject.h" - #include "qobjectlist.h" - #include "qcursor.h" -+#include "qbitmap.h" -+#include "qpainter.h" - - #include "qt_x11_p.h" - - // conflict resolution - --// unused, may be used again later: const int XKeyPress = KeyPress; --// unused, may be used again later: const int XKeyRelease = KeyRelease; -+const int XKeyPress = KeyPress; -+const int XKeyRelease = KeyRelease; - #undef KeyPress - #undef KeyRelease - -@@ -249,20 +251,47 @@ class QShapedPixmapWidget : public QWidg - public: - QShapedPixmapWidget(int screen = -1) : - QWidget(QApplication::desktop()->screen( screen ), -- 0, WStyle_Customize | WStyle_Tool | WStyle_NoBorder | WX11BypassWM ) -+ 0, WStyle_Customize | WStyle_Tool | WStyle_NoBorder | WX11BypassWM ), oldpmser( 0 ), oldbmser( 0 ) - { - } - -- void setPixmap(QPixmap pm) -+ void setPixmap(QPixmap pm, QPoint hot) - { -- if ( pm.mask() ) { -+ int bmser = pm.mask() ? pm.mask()->serialNumber() : 0; -+ if( oldpmser == pm.serialNumber() && oldbmser == bmser -+ && oldhot == hot ) -+ return; -+ oldpmser = pm.serialNumber(); -+ oldbmser = bmser; -+ oldhot = hot; -+ bool hotspot_in = !(hot.x() < 0 || hot.y() < 0 || hot.x() >= pm.width() || hot.y() >= pm.height()); -+// if the pixmap has hotspot in its area, make a "hole" in it at that position -+// this will allow XTranslateCoordinates() to find directly the window below the cursor instead -+// of finding this pixmap, and therefore there won't be needed any (slow) search for the window -+// using findRealWindow() -+ if( hotspot_in ) { -+ QBitmap mask = pm.mask() ? *pm.mask() : QBitmap( pm.width(), pm.height()); -+ if( !pm.mask()) -+ mask.fill( Qt::color1 ); -+ QPainter p( &mask ); -+ p.setPen( Qt::color0 ); -+ p.drawPoint( hot.x(), hot.y()); -+ p.end(); -+ pm.setMask( mask ); -+ setMask( mask ); -+ } else if ( pm.mask() ) { - setMask( *pm.mask() ); - } else { - clearMask(); - } - resize(pm.width(),pm.height()); - setErasePixmap(pm); -+ erase(); - } -+private: -+ int oldpmser; -+ int oldbmser; -+ QPoint oldhot; - }; - - QShapedPixmapWidget * qt_xdnd_deco = 0; -@@ -859,6 +888,45 @@ void QDragManager::timerEvent( QTimerEve - move( QCursor::pos() ); - } - -+static bool qt_xdnd_was_move = false; -+static bool qt_xdnd_found = false; -+// check whole incoming X queue for move events -+// checking whole queue is done by always returning False in the predicate -+// if there's another move event in the queue, and there's not a mouse button -+// or keyboard or ClientMessage event before it, the current move event -+// may be safely discarded -+// this helps avoiding being overloaded by being flooded from many events -+// from the XServer -+static -+Bool qt_xdnd_predicate( Display*, XEvent* ev, XPointer ) -+{ -+ if( qt_xdnd_found ) -+ return False; -+ if( ev->type == MotionNotify ) -+ { -+ qt_xdnd_was_move = true; -+ qt_xdnd_found = true; -+ } -+ if( ev->type == ButtonPress || ev->type == ButtonRelease -+ || ev->type == XKeyPress || ev->type == XKeyRelease -+ || ev->type == ClientMessage ) -+ { -+ qt_xdnd_was_move = false; -+ qt_xdnd_found = true; -+ } -+ return False; -+} -+ -+static -+bool qt_xdnd_another_movement() -+{ -+ qt_xdnd_was_move = false; -+ qt_xdnd_found = false; -+ XEvent dummy; -+ XCheckIfEvent( qt_xdisplay(), &dummy, qt_xdnd_predicate, NULL ); -+ return qt_xdnd_was_move; -+} -+ - bool QDragManager::eventFilter( QObject * o, QEvent * e) - { - if ( beingCancelled ) { -@@ -881,8 +949,10 @@ bool QDragManager::eventFilter( QObject - - if ( e->type() == QEvent::MouseMove ) { - QMouseEvent* me = (QMouseEvent *)e; -- updateMode(me->stateAfter()); -- move( me->globalPos() ); -+ if( !qt_xdnd_another_movement()) { -+ updateMode(me->stateAfter()); -+ move( me->globalPos() ); -+ } - return TRUE; - } else if ( e->type() == QEvent::MouseButtonRelease ) { - qApp->removeEventFilter( this ); -@@ -1106,7 +1176,7 @@ void QDragManager::move( const QPoint & - delete qt_xdnd_deco; - qt_xdnd_deco = new QShapedPixmapWidget( screen ); - } -- updatePixmap(); -+ updatePixmap( globalPos ); - - if ( qt_xdnd_source_sameanswer.contains( globalPos ) && - qt_xdnd_source_sameanswer.isValid() ) { -@@ -1679,7 +1749,7 @@ bool QDragManager::drag( QDragObject * o - // qt_xdnd_source_object persists until we get an xdnd_finish message - } - --void QDragManager::updatePixmap() -+void QDragManager::updatePixmap( const QPoint& cursorPos ) - { - if ( qt_xdnd_deco ) { - QPixmap pm; -@@ -1694,9 +1764,8 @@ void QDragManager::updatePixmap() - defaultPm = new QPixmap(default_pm); - pm = *defaultPm; - } -- qt_xdnd_deco->setPixmap(pm); -- qt_xdnd_deco->move(QCursor::pos()-pm_hot); -- qt_xdnd_deco->repaint(FALSE); -+ qt_xdnd_deco->setPixmap(pm, pm_hot); -+ qt_xdnd_deco->move(cursorPos-pm_hot); - //if ( willDrop ) { - qt_xdnd_deco->show(); - //} else { -@@ -1705,4 +1774,9 @@ void QDragManager::updatePixmap() - } - } - -+void QDragManager::updatePixmap() -+{ -+ updatePixmap( QCursor::pos()); -+} -+ - #endif // QT_NO_DRAGANDDROP ---- src/kernel/qdragobject.h.sav 2002-11-01 19:25:07.000000000 +0100 -+++ src/kernel/qdragobject.h 2001-01-01 01:01:00.000000000 +0100 -@@ -245,6 +245,7 @@ private: - void move( const QPoint & ); - void drop(); - void updatePixmap(); -+ void updatePixmap( const QPoint& cursorPos ); - - private: - QDragObject * object; diff --git a/x11-libs/qt/files/0002-dnd_active_window_fix.patch b/x11-libs/qt/files/0002-dnd_active_window_fix.patch deleted file mode 100644 index 4b497d64..00000000 --- a/x11-libs/qt/files/0002-dnd_active_window_fix.patch +++ /dev/null @@ -1,189 +0,0 @@ -qt-bugs@ issue : 25122 -applied: no -author: Lubos Lunak - - Hello, - - for example: Open Konqueror window, showing some files. Start dragging one - desktop icon. If you press/release Ctrl, there'll be a '+' attached to the - icon, showing the DND operation. Now, while still doing DND, make the - Konqueror window active (Alt+Tab with KDE-3.1.2+, hover over its taskbar - entry, Ctrl+Fn to switch to a different virtual desktop, etc.). As soon as - the app performing DND is not the active application, and the mouse is not - moving, pressing/releasing Ctrl doesn't do anything, the state only updates - when the mouse is moved. - - This is caused by the fact that Qt has only pointer grab when doing DND, but - doesn't have keyboard grab. I actually consider this a good thing, because - the only keys important for DND are modifiers, and they come together with - pointer events, and not having keyboard grab allows using keyboard shortcuts - like Alt+Tab while DND. However, when the mouse is not moved, and only a - modifier key is pressed/released, the app won't get any mouse event, and - won't also get the keyboard event. - - The attached patch changes Qt to explicitly check the modifiers state using - XQueryPointer() if there's wasn't recently any mouse/keyboard event, which - ensures the state is updated even in the situation described above. - ---- src/kernel/qapplication_x11.cpp.sav 2003-06-21 12:31:35.000000000 +0200 -+++ src/kernel/qapplication_x11.cpp 2003-06-21 12:35:44.000000000 +0200 -@@ -4053,7 +4053,7 @@ void QApplication::closePopup( QWidget * - // Keyboard event translation - // - --static int translateButtonState( int s ) -+int qt_x11_translateButtonState( int s ) - { - int bst = 0; - if ( s & Button1Mask ) -@@ -4119,7 +4119,7 @@ bool QETWidget::translateMouseEvent( con - pos.ry() = lastMotion.y; - globalPos.rx() = lastMotion.x_root; - globalPos.ry() = lastMotion.y_root; -- state = translateButtonState( lastMotion.state ); -+ state = qt_x11_translateButtonState( lastMotion.state ); - if ( qt_button_down && (state & (LeftButton | - MidButton | - RightButton ) ) == 0 ) -@@ -4143,7 +4143,7 @@ bool QETWidget::translateMouseEvent( con - pos.ry() = xevent->xcrossing.y; - globalPos.rx() = xevent->xcrossing.x_root; - globalPos.ry() = xevent->xcrossing.y_root; -- state = translateButtonState( xevent->xcrossing.state ); -+ state = qt_x11_translateButtonState( xevent->xcrossing.state ); - if ( qt_button_down && (state & (LeftButton | - MidButton | - RightButton ) ) == 0 ) -@@ -4155,7 +4155,7 @@ bool QETWidget::translateMouseEvent( con - pos.ry() = event->xbutton.y; - globalPos.rx() = event->xbutton.x_root; - globalPos.ry() = event->xbutton.y_root; -- state = translateButtonState( event->xbutton.state ); -+ state = qt_x11_translateButtonState( event->xbutton.state ); - switch ( event->xbutton.button ) { - case Button1: button = LeftButton; break; - case Button2: button = MidButton; break; -@@ -4950,7 +4950,7 @@ bool QETWidget::translateKeyEventInterna - XKeyEvent xkeyevent = event->xkey; - - // save the modifier state, we will use the keystate uint later by passing -- // it to translateButtonState -+ // it to qt_x11_translateButtonState - uint keystate = event->xkey.state; - // remove the modifiers where mode_switch exists... HPUX machines seem - // to have alt *AND* mode_switch both in Mod1Mask, which causes -@@ -5064,7 +5064,7 @@ bool QETWidget::translateKeyEventInterna - } - #endif // !QT_NO_XIM - -- state = translateButtonState( keystate ); -+ state = qt_x11_translateButtonState( keystate ); - - static int directionKeyEvent = 0; - if ( qt_use_rtl_extensions && type == QEvent::KeyRelease ) { ---- src/kernel/qdnd_x11.cpp.sav 2003-06-30 15:26:42.000000000 +0200 -+++ src/kernel/qdnd_x11.cpp 2003-06-30 15:32:23.000000000 +0200 -@@ -114,6 +114,8 @@ Atom qt_xdnd_finished; - Atom qt_xdnd_type_list; - const int qt_xdnd_version = 4; - -+extern int qt_x11_translateButtonState( int s ); -+ - // Actions - // - // The Xdnd spec allows for user-defined actions. This could be implemented -@@ -198,6 +200,8 @@ static Atom qt_xdnd_source_current_time; - static int qt_xdnd_current_screen = -1; - // state of dragging... true if dragging, false if not - bool qt_xdnd_dragging = FALSE; -+// need to check state of keyboard modifiers -+static bool need_modifiers_check = FALSE; - - // dict of payload data, sorted by type atom - static QIntDict * qt_xdnd_target_data = 0; -@@ -879,8 +883,20 @@ void qt_handle_xdnd_finished( QWidget *, - - void QDragManager::timerEvent( QTimerEvent* e ) - { -- if ( e->timerId() == heartbeat && qt_xdnd_source_sameanswer.isNull() ) -- move( QCursor::pos() ); -+ if ( e->timerId() == heartbeat ) { -+ if( need_modifiers_check ) { -+ Window root, child; -+ int root_x, root_y, win_x, win_y; -+ unsigned int mask; -+ XQueryPointer( qt_xdisplay(), qt_xrootwin( qt_xdnd_current_screen ), -+ &root, &child, &root_x, &root_y, &win_x, &win_y, &mask ); -+ if( updateMode( (ButtonState)qt_x11_translateButtonState( mask ))) -+ qt_xdnd_source_sameanswer = QRect(); // force move -+ } -+ need_modifiers_check = TRUE; -+ if( qt_xdnd_source_sameanswer.isNull() ) -+ move( QCursor::pos() ); -+ } - } - - static bool qt_xdnd_was_move = false; -@@ -948,6 +964,7 @@ bool QDragManager::eventFilter( QObject - updateMode(me->stateAfter()); - move( me->globalPos() ); - } -+ need_modifiers_check = FALSE; - return TRUE; - } else if ( e->type() == QEvent::MouseButtonRelease ) { - qApp->removeEventFilter( this ); -@@ -986,9 +1003,11 @@ bool QDragManager::eventFilter( QObject - beingCancelled = FALSE; - qApp->exit_loop(); - } else { -- updateMode(ke->stateAfter()); -- qt_xdnd_source_sameanswer = QRect(); // force move -- move( QCursor::pos() ); -+ if( updateMode(ke->stateAfter())) { -+ qt_xdnd_source_sameanswer = QRect(); // force move -+ move( QCursor::pos() ); -+ } -+ need_modifiers_check = FALSE; - } - return TRUE; // Eat all key events - } -@@ -1014,10 +1033,10 @@ bool QDragManager::eventFilter( QObject - - - static Qt::ButtonState oldstate; --void QDragManager::updateMode( ButtonState newstate ) -+bool QDragManager::updateMode( ButtonState newstate ) - { - if ( newstate == oldstate ) -- return; -+ return false; - const int both = ShiftButton|ControlButton; - if ( (newstate & both) == both ) { - global_requested_action = QDropEvent::Link; -@@ -1041,6 +1060,7 @@ void QDragManager::updateMode( ButtonSta - } - } - oldstate = newstate; -+ return true; - } - - -@@ -1707,6 +1727,7 @@ bool QDragManager::drag( QDragObject * o - qt_xdnd_source_sameanswer = QRect(); - move(QCursor::pos()); - heartbeat = startTimer(200); -+ need_modifiers_check = FALSE; - - #ifndef QT_NO_CURSOR - qApp->setOverrideCursor( arrowCursor ); ---- src/kernel/qdragobject.h.sav 2003-05-19 22:34:43.000000000 +0200 -+++ src/kernel/qdragobject.h 2001-01-01 01:01:00.000000000 +0100 -@@ -248,7 +248,7 @@ private: - - private: - QDragObject * object; -- void updateMode( ButtonState newstate ); -+ bool updateMode( ButtonState newstate ); - void updateCursor(); - - QWidget * dragSource; diff --git a/x11-libs/qt/files/0038-dragobject-dont-prefer-unknown.patch b/x11-libs/qt/files/0038-dragobject-dont-prefer-unknown.patch deleted file mode 100644 index ae4163ae..00000000 --- a/x11-libs/qt/files/0038-dragobject-dont-prefer-unknown.patch +++ /dev/null @@ -1,57 +0,0 @@ -qt-bugs@ issue : 38642 -bugs.kde.org number : 71084 -applied: no -author: Lubos Lunak - -Hello, - - start Mozilla, go e.g. to http://kde.org, start KWrite (or basically any Qt -app that accepts text drops), select 'Conquer your Desktop!', and try to -drag&drop it onto KWrite. The only text pasted should be 'm'. - - I don't know much the related mimetype and encoding stuff, so I'm unsure -whose fault this actually is. The text drag is provided as a lot of -text/something targets, to list some text/_moz_htmlinfo, text/x-moz-url, -text/unicode and similar. The problem is, Kate uses QTextDrag::decode() with -no subtype specified, probably with the intention that as Kate is a text -editor, it can accept any text pasted. And since the first target provided by -mozilla is text/x-moz-url, (which moreover seems to be encoded as 16bit -unicode), the text dropped is completely wrong. You can easily see all -targets provided by Mozilla with see_mime.patch applied. - - Solution #1: Say that Kate (any pretty much everybody else expecting text) -should say "plain" as the subtype. In such case, I suggest you drop the -QTextDrag::decode() variant with no subtype specified, and stress more the -fact that not specifying a subtype can result in a lot of rubbish. It's -simply too tempting to leave the subtype empty and try to accept anything. - - Solution #2: When trying to accept anything, try to get useful data. Which -means either sorting the subtypes available somehow, checking only the ones -Qt knows. - - To me, #1 seems to be a better choice, or possibly at least something like -the attached QTextDrag patch, which simply always tries first "plain" subtype -if none is specified. With this patch, Mozilla even works (that's irony, of -course, Mozilla still pastes the text/plain text as HTML, but at least now it -pastes something where it's easy to point at the offender). - - ---- src/kernel/qdragobject.cpp.sav 2004-01-06 19:24:35.000000000 +0100 -+++ src/kernel/qdragobject.cpp 2004-01-06 19:47:01.000000000 +0100 -@@ -844,6 +844,16 @@ bool QTextDrag::decode( const QMimeSourc - { - if(!e) - return FALSE; -+ -+ // when subtype is not specified, try text/plain first, otherwise this may read -+ // things like text/x-moz-url even though better targets are available -+ if( subtype.isNull()) { -+ QCString subtmp = "plain"; -+ if( decode( e, str, subtmp )) { -+ subtype = subtmp; -+ return true; -+ } -+ } - - if ( e->cacheType == QMimeSource::Text ) { - str = *e->cache.txt.str; diff --git a/x11-libs/qt/files/0044-qscrollview-windowactivate-fix.diff b/x11-libs/qt/files/0044-qscrollview-windowactivate-fix.diff deleted file mode 100644 index 9a6df32a..00000000 --- a/x11-libs/qt/files/0044-qscrollview-windowactivate-fix.diff +++ /dev/null @@ -1,38 +0,0 @@ -qt-bugs@ issue : N45716 -applied: no -author: Enrico Ros - -QScrollView unwanted repaint fix. - -This fixes the 'flashing' konqueror window on activation / deactivation by -saving 1 unwanted repaint (when konqueror window has background). -I tracked down to the problem to the internal QViewportWidget of the -QScrollView class. - -When a window is activated the activation event is recursively propagated -to all childs triggering the windowActivationChange() functions in the -widget it passes by. -What happens when the event gets to the Viewport? -At this point the event has already been handled by windowActivationChange() -of the parent widget (a QIconView for example) and has then been propagated -to the Viewport that will handle it with the default -QWidget::windowActivationChange implementation, maybe raising an unwanted -update(); so here we stop the event. -As an addition: if the parent reimplements the windowActivationChange() -function, mainly to block the update, it won't be happy if the child will -trigger the update. If the parent do not reimplement the function il will -inherits the default implementation and there is no need for the viewport's -one. - ---- src/widgets/qscrollview.cpp.orig 2004-03-29 10:17:04.000000000 +0000 -+++ src/widgets/qscrollview.cpp 2004-03-30 16:40:07.599978320 +0000 -@@ -1551,6 +1551,9 @@ - case QEvent::LayoutHint: - d->autoResizeHint(this); - break; -+ case QEvent::WindowActivate: -+ case QEvent::WindowDeactivate: -+ return TRUE; - default: - break; - } diff --git a/x11-libs/qt/files/0047-fix-kmenu-widget.diff b/x11-libs/qt/files/0047-fix-kmenu-widget.diff deleted file mode 100644 index fb0bb167..00000000 --- a/x11-libs/qt/files/0047-fix-kmenu-widget.diff +++ /dev/null @@ -1,25 +0,0 @@ -qt-bugs@ issue: N46882 -bugs.kde.org number: 77545 -applied: no -author: Stephan Binner - -Fix wrong K menu width for the case of enabled side pixmap and a menu title -(like "Recently Used Applications") being longer than every other entry. - -Solution: Respect PanelKMenu::setMaximumSize() as up to Qt 3.2.3 - -Index: src/widgets/qpopupmenu.cpp -=================================================================== -RCS file: /home/kde/qt-copy/src/widgets/qpopupmenu.cpp,v -retrieving revision 1.60 -diff -u -3 -p -b -r1.60 qpopupmenu.cpp ---- src/widgets/qpopupmenu.cpp 29 Apr 2004 22:31:28 -0000 1.60 -+++ src/widgets/qpopupmenu.cpp 30 Apr 2004 01:11:59 -0000 -@@ -2531,7 +2531,7 @@ QSize QPopupMenu::sizeHint() const - - QPopupMenu* that = (QPopupMenu*) this; - //We do not need a resize here, just the sizeHint.. -- return that->updateSize(FALSE, FALSE).expandedTo( QApplication::globalStrut() ); -+ return that->updateSize(FALSE).expandedTo( QApplication::globalStrut() ); - } - diff --git a/x11-libs/qt/files/0048-qclipboard_hack_80072.patch b/x11-libs/qt/files/0048-qclipboard_hack_80072.patch deleted file mode 100644 index 74c60fb2..00000000 --- a/x11-libs/qt/files/0048-qclipboard_hack_80072.patch +++ /dev/null @@ -1,48 +0,0 @@ -qt-bugs@ issue : none, probably even won't be -bugs.kde.org number : 80072 -applied: no -author: Lubos Lunak - -A crude hack for KDE #80072. No good idea how to fix it properly yet :(. - ---- src/kernel/qclipboard_x11.cpp.sav 2004-04-30 12:00:06.000000000 +0200 -+++ src/kernel/qclipboard_x11.cpp 2004-05-09 21:18:10.269264304 +0200 -@@ -109,6 +109,7 @@ static int pending_timer_id = 0; - static bool pending_clipboard_changed = FALSE; - static bool pending_selection_changed = FALSE; - -+Q_EXPORT bool qt_qclipboard_bailout_hack = false; - - // event capture mechanism for qt_xclb_wait_for_event - static bool waiting_for_data = FALSE; -@@ -453,6 +454,15 @@ static int qt_xclb_event_filter(XEvent * - return 0; - } - -+static bool selection_request_pending = false; -+ -+static Bool check_selection_request_pending( Display*, XEvent* e, XPointer ) -+ { -+ if( e->type == SelectionRequest && e->xselectionrequest.owner == owner->winId()) -+ selection_request_pending = true; -+ return False; -+ } -+ - bool qt_xclb_wait_for_event( Display *dpy, Window win, int type, XEvent *event, - int timeout ) - { -@@ -504,6 +514,14 @@ bool qt_xclb_wait_for_event( Display *dp - do { - if ( XCheckTypedWindowEvent(dpy,win,type,event) ) - return TRUE; -+ if( qt_qclipboard_bailout_hack ) { -+ XEvent dummy; -+ selection_request_pending = false; -+ if ( owner != NULL ) -+ XCheckIfEvent(dpy,&dummy,check_selection_request_pending,NULL); -+ if( selection_request_pending ) -+ return TRUE; -+ } - - now = QTime::currentTime(); - if ( started > now ) // crossed midnight diff --git a/x11-libs/qt/files/qt-3.3.8-fix-compiler-detection.patch b/x11-libs/qt/files/qt-3.3.8-fix-compiler-detection.patch deleted file mode 100644 index 203b71e6..00000000 --- a/x11-libs/qt/files/qt-3.3.8-fix-compiler-detection.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- qt-x11-free-3.3.8-orig/configure 2008-10-28 15:43:35.000000000 +0100 -+++ qt-x11-free-3.3.8/configure 2008-10-28 15:45:48.000000000 +0100 -@@ -3079,15 +3079,15 @@ - g++*) - # GNU C++ - QMAKE_CONF_COMPILER=`grep "QMAKE_CXX[^_A-Z0-9a-z]" $QMAKESPEC/qmake.conf | sed "s,.* *= *\(.*\)$,\1,"` -- COMPILER_VERSION=`${QMAKE_CONF_COMPILER} --version 2>/dev/null` -+ COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -dumpversion 2>/dev/null` - case "$COMPILER_VERSION" in -- *2.95.*) -+ 2.95.*) - COMPILER_VERSION="2.95.*" - ;; -- *3.*) -+ 3.*) - COMPILER_VERSION="3.*" - ;; -- *4.*) -+ 4.*) - COMPILER_VERSION="4" - ;; - *) diff --git a/x11-libs/qt/files/qt-3.3.8-immqt+gcc-4.3.patch b/x11-libs/qt/files/qt-3.3.8-immqt+gcc-4.3.patch deleted file mode 100644 index 65610e37..00000000 --- a/x11-libs/qt/files/qt-3.3.8-immqt+gcc-4.3.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp~ 2007-04-05 09:47:44.000000000 +0000 -+++ plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp 2007-04-05 09:48:08.000000000 +0000 -@@ -44,6 +44,7 @@ - #include "qnoneinputcontextplugin.h" - #include - #include -+#include - - - QNoneInputContextPlugin::QNoneInputContextPlugin() ---- plugins/src/inputmethods/simple/qsimpleinputcontext.cpp~ 2007-04-05 09:48:46.000000000 +0000 -+++ plugins/src/inputmethods/simple/qsimpleinputcontext.cpp 2007-04-05 09:48:54.000000000 +0000 -@@ -45,6 +45,7 @@ - #include - #include - #include -+#include - - static const int ignoreKeys[] = { - Qt::Key_Shift, diff --git a/x11-libs/qt/files/qt-3.3.8-libpng14.patch b/x11-libs/qt/files/qt-3.3.8-libpng14.patch deleted file mode 100644 index 8906e6f5..00000000 --- a/x11-libs/qt/files/qt-3.3.8-libpng14.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- qt-x11-free-3.3.8b-x/src/kernel/qpngio.cpp 2008-01-15 20:09:13.000000000 +0100 -+++ qt-x11-free-3.3.8b/src/kernel/qpngio.cpp 2010-02-16 00:13:11.000000000 +0100 -@@ -162,7 +162,11 @@ - image.setColor( i, qRgba(c,c,c,0xff) ); - } - if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { -+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4 ) -+ const int g = info_ptr->trans_color.gray; -+#else - const int g = info_ptr->trans_values.gray; -+#endif - if (g < ncols) { - image.setAlphaBuffer(TRUE); - image.setColor(g, image.color(g) & RGB_MASK); -@@ -190,7 +194,11 @@ - info_ptr->palette[i].red, - info_ptr->palette[i].green, - info_ptr->palette[i].blue, -+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4 ) -+ info_ptr->trans_alpha[i] -+#else - info_ptr->trans[i] -+#endif - ) - ); - i++; -@@ -324,9 +332,15 @@ - png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) - if (image.depth()==32 && png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { - QRgb trans = 0xFF000000 | qRgb( -+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4 ) -+ (info_ptr->trans_color.red << 8 >> bit_depth)&0xff, -+ (info_ptr->trans_color.green << 8 >> bit_depth)&0xff, -+ (info_ptr->trans_color.blue << 8 >> bit_depth)&0xff); -+#else - (info_ptr->trans_values.red << 8 >> bit_depth)&0xff, - (info_ptr->trans_values.green << 8 >> bit_depth)&0xff, - (info_ptr->trans_values.blue << 8 >> bit_depth)&0xff); -+#endif - for (uint y=0; ywidth; x++) { - if (((uint**)jt)[y][x] == trans) { diff --git a/x11-libs/qt/files/qt-3.3.8-mips.patch b/x11-libs/qt/files/qt-3.3.8-mips.patch deleted file mode 100644 index 1f70900f..00000000 --- a/x11-libs/qt/files/qt-3.3.8-mips.patch +++ /dev/null @@ -1,39 +0,0 @@ -Bug 210551. -Fix compilation on mips - -Original commit message by Christopher Martin, debian bug 342545. - - * Add a patch, courtesy of Steve Langasek, that fixes - qt-x11-free's longstanding intermittent FTBFS on hppa, caused - by "the bogus assumption in src/tools/qlocale.cpp that a - char[] can be cast to a double *." (Closes: #342545) - ---- qt-x11-free-3.3.6.orig/src/tools/qlocale.cpp -+++ qt-x11-free-3.3.6/src/tools/qlocale.cpp -@@ -122,13 +122,24 @@ - #endif - - // We can't rely on -NAN, since all operations on a NAN should return a NAN. -+static double be_neg_nan; -+static double le_neg_nan; - static const unsigned char be_neg_nan_bytes[] = { 0xff, 0xf8, 0, 0, 0, 0, 0, 0 }; - static const unsigned char le_neg_nan_bytes[] = { 0, 0, 0, 0, 0, 0, 0xf8, 0xff }; -+static bool neg_nan_init = false; -+ - static inline double negNan() - { -+ if (!neg_nan_init) -+ { -+ memcpy(&be_neg_nan,be_neg_nan_bytes,sizeof(be_neg_nan_bytes)); -+ memcpy(&le_neg_nan,le_neg_nan_bytes,sizeof(le_neg_nan_bytes)); -+ neg_nan_init = true; -+ } - return (ByteOrder == BigEndian ? -- *((const double *) be_neg_nan_bytes) : -- *((const double *) le_neg_nan_bytes)); -+ be_neg_nan : -+ le_neg_nan); -+ - } - - // Sizes as defined by the ISO C99 standard - fallback diff --git a/x11-libs/qt/files/qt-3.3.8-seli-xinerama.patch b/x11-libs/qt/files/qt-3.3.8-seli-xinerama.patch deleted file mode 100644 index 9fdd97a3..00000000 --- a/x11-libs/qt/files/qt-3.3.8-seli-xinerama.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- src/kernel/qapplication_x11.cpp.sav 2006-06-01 13:31:04.000000000 +0200 -+++ src/kernel/qapplication_x11.cpp 2006-06-01 13:33:07.000000000 +0200 -@@ -271,6 +271,7 @@ Atom qt_net_wm_frame_strut = 0; // KDE - Atom qt_net_wm_state_stays_on_top = 0; // KDE extension - Atom qt_net_wm_pid = 0; - Atom qt_net_wm_user_time = 0; -+Atom qt_net_wm_full_placement = 0; // KDE extension - // Enlightenment support - Atom qt_enlightenment_desktop = 0; - -@@ -1922,6 +1923,7 @@ void qt_init_internal( int *argcptr, cha - &qt_net_wm_state_stays_on_top ); - qt_x11_intern_atom( "_NET_WM_PID", &qt_net_wm_pid ); - qt_x11_intern_atom( "_NET_WM_USER_TIME", &qt_net_wm_user_time ); -+ qt_x11_intern_atom( "_NET_WM_FULL_PLACEMENT", &qt_net_wm_full_placement ); - qt_x11_intern_atom( "ENLIGHTENMENT_DESKTOP", &qt_enlightenment_desktop ); - qt_x11_intern_atom( "_NET_WM_NAME", &qt_net_wm_name ); - qt_x11_intern_atom( "_NET_WM_ICON_NAME", &qt_net_wm_icon_name ); ---- src/dialogs/qdialog.cpp.sav 2006-03-17 14:33:44.000000000 +0100 -+++ src/dialogs/qdialog.cpp 2006-06-01 13:38:00.000000000 +0200 -@@ -670,6 +670,11 @@ bool QDialog::event( QEvent *e ) - - #if defined(Q_WS_X11) - extern "C" { int XSetTransientForHint( Display *, unsigned long, unsigned long ); } -+#include -+#undef FocusIn -+// defined in qapplication_x11.cpp -+extern Atom qt_net_wm_full_placement; -+extern bool qt_net_supports(Atom atom); - #endif // Q_WS_X11 - - /*! -@@ -691,10 +696,12 @@ void QDialog::show() - - if ( !did_resize ) - adjustSize(); -- if ( has_relpos && !did_move ) { -- adjustPositionInternal( parentWidget(), TRUE ); -- } else if ( !did_move ) { -- adjustPositionInternal( parentWidget() ); -+ if( !qt_net_supports( qt_net_wm_full_placement )) { -+ if ( has_relpos && !did_move ) { -+ adjustPositionInternal( parentWidget(), TRUE ); -+ } else if ( !did_move ) { -+ adjustPositionInternal( parentWidget() ); -+ } - } - - if (windowState() != state) diff --git a/x11-libs/qt/files/qt-3.3.8-uic-fix.patch b/x11-libs/qt/files/qt-3.3.8-uic-fix.patch deleted file mode 100644 index 8e5bd559..00000000 --- a/x11-libs/qt/files/qt-3.3.8-uic-fix.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: tools/designer/uic/form.cpp -=================================================================== ---- tools/designer/uic/form.cpp (revision 460038) -+++ tools/designer/uic/form.cpp (working copy) -@@ -731,6 +731,13 @@ - while ( !n2.isNull() ) { - if ( n2.tagName() == "includehint" ) { - QString file = n2.firstChild().toText().data(); -+ int colons = file.find("::"); -+ -+ if (colons != -1) -+ { -+ file = file.right(file.length() - colons - 2); -+ } -+ - localIncludes += file; - } - n2 = n2.nextSibling().toElement(); diff --git a/x11-libs/qt/files/qt-3.3.8-visibility.patch b/x11-libs/qt/files/qt-3.3.8-visibility.patch deleted file mode 100644 index a5246b9f..00000000 --- a/x11-libs/qt/files/qt-3.3.8-visibility.patch +++ /dev/null @@ -1,159 +0,0 @@ -Index: configure -=================================================================== ---- configure (revision 471775) -+++ configure (working copy) -@@ -1053,6 +1053,7 @@ - [ -d $outpath/src/tools ] || mkdir -p $outpath/src/tools - cat > $outpath/src/tools/qconfig.cpp.new <iface(); \ - } - --# ifdef Q_WS_WIN --# ifdef Q_CC_BOR --# define Q_EXPORT_PLUGIN(PLUGIN) \ -- Q_PLUGIN_VERIFICATION_DATA \ -- Q_EXTERN_C __declspec(dllexport) \ -- const char * __stdcall qt_ucm_query_verification_data() \ -- { return qt_ucm_verification_data; } \ -- Q_EXTERN_C __declspec(dllexport) QUnknownInterface* \ -- __stdcall ucm_instantiate() \ -- Q_PLUGIN_INSTANTIATE( PLUGIN ) --# else --# define Q_EXPORT_PLUGIN(PLUGIN) \ -- Q_PLUGIN_VERIFICATION_DATA \ -- Q_EXTERN_C __declspec(dllexport) \ -- const char *qt_ucm_query_verification_data() \ -- { return qt_ucm_verification_data; } \ -- Q_EXTERN_C __declspec(dllexport) QUnknownInterface* ucm_instantiate() \ -- Q_PLUGIN_INSTANTIATE( PLUGIN ) --# endif --# else --# define Q_EXPORT_PLUGIN(PLUGIN) \ -+#if defined(Q_WS_WIN) && defined(Q_CC_BOR) -+# define Q_STDCALL __stdcall -+#else -+# define Q_STDCALL -+#endif -+ -+#define Q_EXPORT_PLUGIN(PLUGIN) \ - Q_PLUGIN_VERIFICATION_DATA \ -- Q_EXTERN_C \ -- const char *qt_ucm_query_verification_data() \ -+ Q_EXTERN_C Q_EXPORT \ -+ const char * Q_STDCALL qt_ucm_query_verification_data() \ - { return qt_ucm_verification_data; } \ -- Q_EXTERN_C QUnknownInterface* ucm_instantiate() \ -+ Q_EXTERN_C Q_EXPORT QUnknownInterface* Q_STDCALL ucm_instantiate() \ - Q_PLUGIN_INSTANTIATE( PLUGIN ) --# endif -- - #endif - - struct QUnknownInterface; -Index: src/kernel/qapplication_x11.cpp -=================================================================== ---- src/kernel/qapplication_x11.cpp (revision 471775) -+++ src/kernel/qapplication_x11.cpp (working copy) -@@ -314,7 +314,7 @@ - - // flags for extensions for special Languages, currently only for RTL languages - static bool qt_use_rtl_extensions = FALSE; --bool qt_hebrew_keyboard_hack = FALSE; -+Q_EXPORT bool qt_hebrew_keyboard_hack = FALSE; - - static Window mouseActWindow = 0; // window where mouse is - static int mouseButtonPressed = 0; // last mouse button pressed -@@ -3800,7 +3800,7 @@ - } - - --bool qt_try_modal( QWidget *widget, XEvent *event ) -+Q_EXPORT bool qt_try_modal( QWidget *widget, XEvent *event ) - { - if (qt_xdnd_dragging) { - // allow mouse events while DnD is active -Index: src/kernel/qtextengine_p.h -=================================================================== ---- src/kernel/qtextengine_p.h (revision 471775) -+++ src/kernel/qtextengine_p.h (working copy) -@@ -280,7 +280,7 @@ - - class QFontPrivate; - --class QTextEngine { -+class Q_EXPORT QTextEngine { - public: - QTextEngine( const QString &str, QFontPrivate *f ); - ~QTextEngine(); -Index: src/tools/qglobal.h -=================================================================== ---- src/tools/qglobal.h (revision 471775) -+++ src/tools/qglobal.h (working copy) -@@ -865,6 +865,10 @@ - # define Q_TEMPLATE_EXTERN - # undef Q_DISABLE_COPY /* avoid unresolved externals */ - # endif -+#elif defined(Q_CC_GNU) && __GNUC__ - 0 >= 4 -+# define Q_EXPORT __attribute__((visibility("default"))) -+# undef QT_MAKEDLL /* ignore these for other platforms */ -+# undef QT_DLL - #else - # undef QT_MAKEDLL /* ignore these for other platforms */ - # undef QT_DLL -Index: tools/designer/uilib/qwidgetfactory.h -=================================================================== ---- tools/designer/uilib/qwidgetfactory.h (revision 471775) -+++ tools/designer/uilib/qwidgetfactory.h (working copy) -@@ -48,7 +48,7 @@ - class QWidgetFactoryPrivate; - class UibStrTable; - --class QWidgetFactory -+class Q_EXPORT QWidgetFactory - { - public: - QWidgetFactory(); -Index: tools/designer/uilib/qwidgetfactory.cpp -=================================================================== ---- tools/designer/uilib/qwidgetfactory.cpp (revision 471775) -+++ tools/designer/uilib/qwidgetfactory.cpp (working copy) -@@ -113,13 +113,13 @@ - static QMap *availableWidgetMap = 0; - static QStringList *availableWidgetList = 0; - --QMap *qwf_forms = 0; -+Q_EXPORT QMap *qwf_forms = 0; - QString *qwf_language = 0; --bool qwf_execute_code = TRUE; -+Q_EXPORT bool qwf_execute_code = TRUE; - bool qwf_stays_on_top = FALSE; - QString qwf_currFileName = ""; - QObject *qwf_form_object = 0; --QString *qwf_plugin_dir = 0; -+Q_EXPORT QString *qwf_plugin_dir = 0; - - static void setupPluginDir() - { -Index: tools/designer/shared/domtool.h -=================================================================== ---- tools/designer/shared/domtool.h (revision 471775) -+++ tools/designer/shared/domtool.h (working copy) -@@ -33,7 +33,7 @@ - class QDomElement; - class QDomDocument; - --class DomTool : public Qt -+class Q_EXPORT DomTool : public Qt - { - public: - static QVariant readProperty( const QDomElement& e, const QString& name, const QVariant& defValue ); diff --git a/x11-libs/qt/files/qt-3.3.8b-cjk-fix.patch b/x11-libs/qt/files/qt-3.3.8b-cjk-fix.patch deleted file mode 100644 index 5372bdb8..00000000 --- a/x11-libs/qt/files/qt-3.3.8b-cjk-fix.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- src/kernel/qfontdatabase.cpp 2008-07-10 06:17:31.000000000 +0800 -+++ src/kernel/qfontdatabase.cpp 2008-07-10 06:27:53.000000000 +0800 -@@ -960,19 +960,17 @@ - #ifdef Q_WS_X11 - if (script == QFont::Han) { - // modify script according to locale -- static QFont::Script defaultHan = QFont::UnknownScript; -- if (defaultHan == QFont::UnknownScript) { -- QCString locale = setlocale(LC_ALL, NULL); -- if (locale.contains("ko")) -- defaultHan = QFont::Han_Korean; -- else if (locale.contains("zh_TW") || locale.contains("zh_HK")) -- defaultHan = QFont::Han_TraditionalChinese; -- else if (locale.contains("zh")) -- defaultHan = QFont::Han_SimplifiedChinese; -- else -- defaultHan = QFont::Han_Japanese; -+ static QFont::Script defaultHan = QFont::Han; -+ QCString locale = setlocale(LC_ALL, NULL); -+ if (locale.contains("ko")) -+ defaultHan = QFont::Han_Korean; -+ else if (locale.contains("zh_TW") || locale.contains("zh_HK")) -+ defaultHan = QFont::Han_TraditionalChinese; -+ else if (locale.contains("zh")) -+ defaultHan = QFont::Han_SimplifiedChinese; -+ else if (locale.contains("jp")) -+ defaultHan = QFont::Han_Japanese; -- } - script = defaultHan; - } - #endif - diff --git a/x11-libs/qt/files/qt-ulibc.patch b/x11-libs/qt/files/qt-ulibc.patch deleted file mode 100644 index f188778e..00000000 --- a/x11-libs/qt/files/qt-ulibc.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- qt-x11-free-3.3.4.orig/src/tools/qlocale.cpp 2005-01-21 17:16:05.000000000 +0000 -+++ qt-x11-free-3.3.4/src/tools/qlocale.cpp 2005-02-18 13:36:59.000000000 +0000 -@@ -55,6 +55,10 @@ - # undef INFINITY - #endif - -+#if defined(Q_OS_LINUX) && defined(__UCLIBC__) -+# undef Q_OS_LINUX -+#endif -+ - #ifdef Q_OS_LINUX - # include - #endif diff --git a/x11-libs/qt/metadata.xml b/x11-libs/qt/metadata.xml deleted file mode 100644 index 30c31e9b..00000000 --- a/x11-libs/qt/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - -qt - - Enable binary compatible version of immodule for - Qt - Enable binary incompatible version of immodule for - Qt - - diff --git a/x11-libs/qt/qt-3.3.8b-r1.ebuild b/x11-libs/qt/qt-3.3.8b-r1.ebuild deleted file mode 100644 index 5cfa95ad..00000000 --- a/x11-libs/qt/qt-3.3.8b-r1.ebuild +++ /dev/null @@ -1,372 +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/qt-3.3.8b-r1.ebuild,v 1.9 2009/12/03 18:25:47 yngwin Exp $ - -# *** Please remember to update qt3.eclass when revbumping this *** - -inherit eutils flag-o-matic toolchain-funcs - -SRCTYPE="free" -DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework." -HOMEPAGE="http://qt.nokia.com/" - -IMMQT_P="qt-x11-immodule-unified-qt3.3.8-20070321-gentoo" - -SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz - immqt? ( mirror://gentoo/${IMMQT_P}.diff.bz2 ) - immqt-bc? ( mirror://gentoo/${IMMQT_P}.diff.bz2 )" -LICENSE="|| ( QPL-1.0 GPL-2 GPL-3 )" - -SLOT="3" -KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="cups debug doc examples firebird ipv6 mysql nas nis odbc opengl postgres sqlite xinerama immqt immqt-bc" - -RDEPEND=" - virtual/jpeg - >=media-libs/freetype-2 - >=media-libs/libmng-1.0.9 - media-libs/libpng - sys-libs/zlib - x11-libs/libXft - x11-libs/libXcursor - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libSM - cups? ( net-print/cups ) - firebird? ( dev-db/firebird ) - mysql? ( virtual/mysql ) - nas? ( >=media-libs/nas-1.5 ) - opengl? ( virtual/opengl virtual/glu ) - postgres? ( dev-db/postgresql-base ) - xinerama? ( x11-libs/libXinerama )" -DEPEND="${RDEPEND} - x11-proto/inputproto - x11-proto/xextproto - xinerama? ( x11-proto/xineramaproto ) - immqt? ( x11-proto/xineramaproto ) - immqt-bc? ( x11-proto/xineramaproto )" -PDEPEND="odbc? ( ~dev-db/qt-unixODBC-$PV )" - -S="${WORKDIR}/qt-x11-${SRCTYPE}-${PV}" - -QTBASE="/usr/qt/3" - -pkg_setup() { - if use immqt && use immqt-bc ; then - ewarn - ewarn "immqt and immqt-bc are exclusive. You cannot set both." - ewarn "Please specify either immqt or immqt-bc." - ewarn - die - elif use immqt ; then - ewarn - ewarn "You are going to compile binary imcompatible immodule for Qt. This means" - ewarn "you have to recompile everything depending on Qt after you install it." - ewarn "Be aware." - ewarn - fi - - export QTDIR="${S}" - - CXX=$(tc-getCXX) - if [[ ${CXX/g++/} != ${CXX} ]]; then - PLATCXX="g++" - elif [[ ${CXX/icpc/} != ${CXX} ]]; then - PLATCXX="icc" - else - die "Unknown compiler ${CXX}." - fi - - case ${CHOST} in - *-freebsd*|*-dragonfly*) - PLATNAME="freebsd" ;; - *-openbsd*) - PLATNAME="openbsd" ;; - *-netbsd*) - PLATNAME="netbsd" ;; - *-darwin*) - PLATNAME="darwin" ;; - *-linux-*|*-linux) - PLATNAME="linux" ;; - *) - die "Unknown CHOST, no platform choosed." - esac - - # probably this should be '*-64' for 64bit archs - # in a fully multilib environment (no compatibility symlinks) - export PLATFORM="${PLATNAME}-${PLATCXX}" -} - -src_unpack() { - unpack ${A} - cd "${S}" - - sed -i -e 's:read acceptance:acceptance=yes:' configure - - # Do not link with -rpath. See bug #75181. - find "${S}"/mkspecs -name qmake.conf | xargs \ - sed -i -e 's:QMAKE_RPATH.*:QMAKE_RPATH =:' - - # Patch for uic includehint errors (aseigo patch) - epatch "${FILESDIR}"/qt-3.3.8-uic-fix.patch - - # KDE related patches - epatch "${FILESDIR}"/0001-dnd_optimization.patch - epatch "${FILESDIR}"/0002-dnd_active_window_fix.patch - epatch "${FILESDIR}"/0038-dragobject-dont-prefer-unknown.patch - epatch "${FILESDIR}"/0044-qscrollview-windowactivate-fix.diff - epatch "${FILESDIR}"/0047-fix-kmenu-widget.diff - epatch "${FILESDIR}"/0048-qclipboard_hack_80072.patch - - # ulibc patch (bug #100246) - epatch "${FILESDIR}"/qt-ulibc.patch - - # xinerama patch: http://ktown.kde.org/~seli/xinerama/ - epatch "${FILESDIR}"/qt-3.3.8-seli-xinerama.patch - - # Visibility patch, apply only on GCC 4.1 and later for safety - # [[ $(gcc-major-version)$(gcc-minor-version) -ge 41 ]] && \ - epatch "${FILESDIR}"/qt-3.3.8-visibility.patch - - # Fix configure to correctly pick up gcc version, bug 244732 - epatch "${FILESDIR}"/qt-3.3.8-fix-compiler-detection.patch - - # Fix CJK script rendering, bug 229567 - epatch "${FILESDIR}"/qt-3.3.8b-cjk-fix.patch - - if use immqt || use immqt-bc ; then - epatch ../${IMMQT_P}.diff - sh make-symlinks.sh || die "make symlinks failed" - - epatch "${FILESDIR}"/qt-3.3.8-immqt+gcc-4.3.patch - fi - - if use mips; then - epatch "${FILESDIR}"/qt-3.3.8-mips.patch - fi - - # known working flags wrt #77623 - use sparc && export CFLAGS="-O1" && export CXXFLAGS="${CFLAGS}" - # set c/xxflags and ldflags - strip-flags - append-flags -fno-strict-aliasing - - if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then - ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS" - append-flags -fno-stack-protector - fi - - sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ - -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ - -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ - -e "s:\.*=.*:QMAKE_CC=$(tc-getCC):" \ - -e "s:\.*=.*:QMAKE_CXX=$(tc-getCXX):" \ - -e "s:\.*=.*:QMAKE_LINK=$(tc-getCXX):" \ - -e "s:\.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \ - "${S}"/mkspecs/${PLATFORM}/qmake.conf || die - - if [ $(get_libdir) != "lib" ] ; then - sed -i -e "s:/lib$:/$(get_libdir):" \ - "${S}"/mkspecs/${PLATFORM}/qmake.conf || die - fi - - sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ - -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ - "${S}"/qmake/Makefile.unix || die -} - -src_compile() { - export SYSCONF="${D}${QTBASE}"/etc/settings - - # Let's just allow writing to these directories during Qt emerge - # as it makes Qt much happier. - addwrite "${QTBASE}/etc/settings" - addwrite "${HOME}/.qt" - - [ "$(get_libdir)" != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)" - - # unixODBC support is now a PDEPEND on dev-db/qt-unixODBC; see bug 14178. - use nas && myconf+=" -system-nas-sound" - use nis && myconf+=" -nis" || myconf+=" -no-nis" - use mysql && myconf+=" -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf+=" -no-sql-mysql" - use postgres && myconf+=" -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf+=" -no-sql-psql" - use firebird && myconf+=" -plugin-sql-ibase -I/opt/firebird/include" || myconf+=" -no-sql-ibase" - use sqlite && myconf+=" -plugin-sql-sqlite" || myconf+=" -no-sql-sqlite" - use cups && myconf+=" -cups" || myconf+=" -no-cups" - use opengl && myconf+=" -enable-module=opengl" || myconf+=" -disable-opengl" - use debug && myconf+=" -debug" || myconf+=" -release -no-g++-exceptions" - use xinerama && myconf+=" -xinerama" || myconf+=" -no-xinerama" - - myconf="${myconf} -system-zlib -qt-gif" - - use ipv6 && myconf+=" -ipv6" || myconf+=" -no-ipv6" - use immqt-bc && myconf+=" -inputmethod" - use immqt && myconf+=" -inputmethod -inputmethod-ext" - - export YACC='byacc -d' - tc-export CC CXX - export LINK="$(tc-getCXX)" - - ./configure -sm -thread -stl -system-libjpeg -verbose -largefile \ - -qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \ - -system-libpng -xft -platform ${PLATFORM} -xplatform \ - ${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \ - -fast -no-sql-odbc ${myconf} -dlopen-opengl || die - - emake src-qmake src-moc sub-src || die - - export DYLD_LIBRARY_PATH="${S}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}" - export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" - - emake sub-tools || die - - if use examples; then - emake sub-tutorial sub-examples || die - fi - - # Make the msg2qm utility (not made by default) - cd "${S}"/tools/msg2qm - ../../bin/qmake - emake - - # Make the qembed utility (not made by default) - cd "${S}"/tools/qembed - ../../bin/qmake - emake - -} - -src_install() { - # binaries - into ${QTBASE} - dobin bin/* - dobin tools/msg2qm/msg2qm - dobin tools/qembed/qembed - - # libraries - dolib.so lib/lib{editor,qassistantclient,designercore}.a - dolib.so lib/libqt-mt.la - dolib.so lib/libqt-mt.so.${PV/b} lib/libqui.so.1.0.0 - cd "${D}"/${QTBASE}/$(get_libdir) - - for x in libqui.so ; do - ln -s $x.1.0.0 $x.1.0 - ln -s $x.1.0 $x.1 - ln -s $x.1 $x - done - - # version symlinks - 3.3.5->3.3->3->.so - ln -s libqt-mt.so.${PV/b} libqt-mt.so.3.3 - ln -s libqt-mt.so.3.3 libqt-mt.so.3 - ln -s libqt-mt.so.3 libqt-mt.so - - # libqt -> libqt-mt symlinks - ln -s libqt-mt.so.${PV/b} libqt.so.${PV/b} - ln -s libqt-mt.so.3.3 libqt.so.3.3 - ln -s libqt-mt.so.3 libqt.so.3 - ln -s libqt-mt.so libqt.so - - # plugins - cd "${S}" - local plugins=$(find plugins -name "lib*.so" -print) - for x in ${plugins}; do - exeinto ${QTBASE}/$(dirname ${x}) - doexe ${x} - done - - # Past this point just needs to be done once - is_final_abi || return 0 - - # includes - cd "${S}" - dodir ${QTBASE}/include/private - cp include/*\.h "${D}"/${QTBASE}/include/ - cp include/private/*\.h "${D}"/${QTBASE}/include/private/ - - # prl files - sed -i -e "s:${S}:${QTBASE}:g" "${S}"/lib/*.prl - insinto ${QTBASE}/$(get_libdir) - doins "${S}"/lib/*.prl - - # pkg-config file - insinto ${QTBASE}/$(get_libdir)/pkgconfig - doins "${S}"/lib/*.pc - - # List all the multilib libdirs - local libdirs - for alibdir in $(get_all_libdirs); do - libdirs="${libdirs}:${QTBASE}/${alibdir}" - done - - # environment variables - cat < "${T}"/45qt3 -PATH=${QTBASE}/bin -ROOTPATH=${QTBASE}/bin -LDPATH=${libdirs:1} -QMAKESPEC=${PLATFORM} -MANPATH=${QTBASE}/doc/man -PKG_CONFIG_PATH=${QTBASE}/$(get_libdir)/pkgconfig -EOF - - cat < "${T}"/50qtdir3 -QTDIR=${QTBASE} -EOF - - cat < "${T}"/50-qt3-revdep -SEARCH_DIRS="${QTBASE}" -EOF - - insinto /etc/revdep-rebuild - doins "${T}"/50-qt3-revdep - - doenvd "${T}"/45qt3 "${T}"/50qtdir3 - - if [ "${SYMLINK_LIB}" = "yes" ]; then - dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${QTBASE}/lib - fi - - insinto ${QTBASE}/tools/designer - doins -r tools/designer/templates - - insinto ${QTBASE} - doins -r translations - - keepdir ${QTBASE}/etc/settings - - if use doc; then - insinto ${QTBASE} - doins -r "${S}"/doc - fi - - if use examples; then - find "${S}"/examples "${S}"/tutorial -name Makefile | \ - xargs sed -i -e "s:${S}:${QTBASE}:g" - - cp -r "${S}"/examples "${D}"${QTBASE}/ - cp -r "${S}"/tutorial "${D}"${QTBASE}/ - fi - - # misc build reqs - insinto ${QTBASE}/mkspecs - doins -r "${S}"/mkspecs/${PLATFORM} - - sed -e "s:${S}:${QTBASE}:g" \ - "${S}"/.qmake.cache > "${D}"${QTBASE}/.qmake.cache - - dodoc FAQ README README-QT.TXT changes* - if use immqt || use immqt-bc ; then - dodoc "${S}"/README.immodule - fi -} - -pkg_postinst() { - echo - elog "After a rebuild of Qt, it can happen that Qt plugins (such as Qt/KDE styles," - elog "or widgets for the Qt designer) are no longer recognized. If this situation" - elog "occurs you should recompile the packages providing these plugins," - elog "and you should also make sure that Qt and its plugins were compiled with the" - elog "same version of GCC. Packages that may need to be rebuilt are, for instance," - elog "kde-base/kdelibs, kde-base/kdeartwork and kde-base/kdeartwork-styles." - elog "See http://doc.trolltech.com/3.3/plugins-howto.html for more infos." - echo -} diff --git a/x11-libs/qt/qt-3.3.8b-r2.ebuild b/x11-libs/qt/qt-3.3.8b-r2.ebuild deleted file mode 100644 index 233884d5..00000000 --- a/x11-libs/qt/qt-3.3.8b-r2.ebuild +++ /dev/null @@ -1,374 +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/qt-3.3.8b-r2.ebuild,v 1.7 2009/12/03 18:25:47 yngwin Exp $ - -# *** Please remember to update qt3.eclass when revbumping this *** - -inherit eutils flag-o-matic toolchain-funcs - -SRCTYPE="free" -DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework." -HOMEPAGE="http://qt.nokia.com/" - -IMMQT_P="qt-x11-immodule-unified-qt3.3.8-20070321-gentoo" - -SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz - immqt? ( mirror://gentoo/${IMMQT_P}.diff.bz2 ) - immqt-bc? ( mirror://gentoo/${IMMQT_P}.diff.bz2 )" -LICENSE="|| ( QPL-1.0 GPL-2 GPL-3 )" - -SLOT="3" -KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd" -IUSE="cups debug doc examples firebird ipv6 mysql nas nis odbc opengl postgres sqlite xinerama immqt immqt-bc" - -RDEPEND=" - virtual/jpeg - >=media-libs/freetype-2 - >=media-libs/libmng-1.0.9 - media-libs/libpng - sys-libs/zlib - x11-libs/libXft - x11-libs/libXcursor - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libSM - cups? ( net-print/cups ) - firebird? ( dev-db/firebird ) - mysql? ( virtual/mysql ) - nas? ( >=media-libs/nas-1.5 ) - opengl? ( virtual/opengl virtual/glu ) - postgres? ( dev-db/postgresql-base ) - xinerama? ( x11-libs/libXinerama )" -DEPEND="${RDEPEND} - x11-proto/inputproto - x11-proto/xextproto - xinerama? ( x11-proto/xineramaproto ) - immqt? ( x11-proto/xineramaproto ) - immqt-bc? ( x11-proto/xineramaproto )" -PDEPEND="odbc? ( ~dev-db/qt-unixODBC-$PV )" - -S="${WORKDIR}/qt-x11-${SRCTYPE}-${PV}" - -QTBASE="/usr/qt/3" - -pkg_setup() { - if use immqt && use immqt-bc ; then - ewarn - ewarn "immqt and immqt-bc are exclusive. You cannot set both." - ewarn "Please specify either immqt or immqt-bc." - ewarn - die - elif use immqt ; then - ewarn - ewarn "You are going to compile binary imcompatible immodule for Qt. This means" - ewarn "you have to recompile everything depending on Qt after you install it." - ewarn "Be aware." - ewarn - fi - - export QTDIR="${S}" - - CXX=$(tc-getCXX) - if [[ ${CXX/g++/} != ${CXX} ]]; then - PLATCXX="g++" - elif [[ ${CXX/icpc/} != ${CXX} ]]; then - PLATCXX="icc" - else - die "Unknown compiler ${CXX}." - fi - - case ${CHOST} in - *-freebsd*|*-dragonfly*) - PLATNAME="freebsd" ;; - *-openbsd*) - PLATNAME="openbsd" ;; - *-netbsd*) - PLATNAME="netbsd" ;; - *-darwin*) - PLATNAME="darwin" ;; - *-linux-*|*-linux) - PLATNAME="linux" ;; - *) - die "Unknown CHOST, no platform choosed." - esac - - # probably this should be '*-64' for 64bit archs - # in a fully multilib environment (no compatibility symlinks) - export PLATFORM="${PLATNAME}-${PLATCXX}" -} - -src_unpack() { - unpack ${A} - cd "${S}" - - sed -i -e 's:read acceptance:acceptance=yes:' configure - - # Do not link with -rpath. See bug #75181. - find "${S}"/mkspecs -name qmake.conf | xargs \ - sed -i -e 's:QMAKE_RPATH.*:QMAKE_RPATH =:' - - # Patch for uic includehint errors (aseigo patch) - epatch "${FILESDIR}"/qt-3.3.8-uic-fix.patch - - # KDE related patches - epatch "${FILESDIR}"/0001-dnd_optimization.patch - epatch "${FILESDIR}"/0002-dnd_active_window_fix.patch - epatch "${FILESDIR}"/0038-dragobject-dont-prefer-unknown.patch - epatch "${FILESDIR}"/0044-qscrollview-windowactivate-fix.diff - epatch "${FILESDIR}"/0047-fix-kmenu-widget.diff - epatch "${FILESDIR}"/0048-qclipboard_hack_80072.patch - - # ulibc patch (bug #100246) - epatch "${FILESDIR}"/qt-ulibc.patch - - # xinerama patch: http://ktown.kde.org/~seli/xinerama/ - epatch "${FILESDIR}"/qt-3.3.8-seli-xinerama.patch - - # Visibility patch, apply only on GCC 4.1 and later for safety - # [[ $(gcc-major-version)$(gcc-minor-version) -ge 41 ]] && \ - epatch "${FILESDIR}"/qt-3.3.8-visibility.patch - - # Fix configure to correctly pick up gcc version, bug 244732 - epatch "${FILESDIR}"/qt-3.3.8-fix-compiler-detection.patch - - # Fix CJK script rendering, bug 229567 - epatch "${FILESDIR}"/qt-3.3.8b-cjk-fix.patch - - # Fix libpng-1.4 issues - epatch "${FILESDIR}"/qt-3.3.8-libpng14.patch - - if use immqt || use immqt-bc ; then - epatch ../${IMMQT_P}.diff - sh make-symlinks.sh || die "make symlinks failed" - - epatch "${FILESDIR}"/qt-3.3.8-immqt+gcc-4.3.patch - fi - - if use mips; then - epatch "${FILESDIR}"/qt-3.3.8-mips.patch - fi - - # known working flags wrt #77623 - use sparc && export CFLAGS="-O1" && export CXXFLAGS="${CFLAGS}" - # set c/xxflags and ldflags - strip-flags - append-flags -fno-strict-aliasing - - if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then - ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS" - append-flags -fno-stack-protector - fi - - sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ - -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ - -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ - -e "s:\.*=.*:QMAKE_CC=$(tc-getCC):" \ - -e "s:\.*=.*:QMAKE_CXX=$(tc-getCXX):" \ - -e "s:\.*=.*:QMAKE_LINK=$(tc-getCXX):" \ - -e "s:\.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \ - "${S}"/mkspecs/${PLATFORM}/qmake.conf || die - - if [ $(get_libdir) != "lib" ] ; then - sed -i -e "s:/lib$:/$(get_libdir):" \ - "${S}"/mkspecs/${PLATFORM}/qmake.conf || die - fi - - sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ - -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ - "${S}"/qmake/Makefile.unix || die -} - -src_compile() { - export SYSCONF="${D}${QTBASE}"/etc/settings - - # Let's just allow writing to these directories during Qt emerge - # as it makes Qt much happier. - addwrite "${QTBASE}/etc/settings" - addwrite "${HOME}/.qt" - - [ "$(get_libdir)" != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)" - - # unixODBC support is now a PDEPEND on dev-db/qt-unixODBC; see bug 14178. - use nas && myconf+=" -system-nas-sound" - use nis && myconf+=" -nis" || myconf+=" -no-nis" - use mysql && myconf+=" -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf+=" -no-sql-mysql" - use postgres && myconf+=" -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf+=" -no-sql-psql" - use firebird && myconf+=" -plugin-sql-ibase -I/opt/firebird/include" || myconf+=" -no-sql-ibase" - use sqlite && myconf+=" -plugin-sql-sqlite" || myconf+=" -no-sql-sqlite" - use cups && myconf+=" -cups" || myconf+=" -no-cups" - use opengl && myconf+=" -enable-module=opengl" || myconf+=" -disable-opengl" - use debug && myconf+=" -debug" || myconf+=" -release -no-g++-exceptions" - use xinerama && myconf+=" -xinerama" || myconf+=" -no-xinerama" - - myconf="${myconf} -system-zlib -qt-gif" - - use ipv6 && myconf+=" -ipv6" || myconf+=" -no-ipv6" - use immqt-bc && myconf+=" -inputmethod" - use immqt && myconf+=" -inputmethod -inputmethod-ext" - - export YACC='byacc -d' - tc-export CC CXX - export LINK="$(tc-getCXX)" - - ./configure -sm -thread -stl -system-libjpeg -verbose -largefile \ - -qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \ - -system-libpng -xft -platform ${PLATFORM} -xplatform \ - ${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \ - -fast -no-sql-odbc ${myconf} -dlopen-opengl || die - - emake src-qmake src-moc sub-src || die - - export DYLD_LIBRARY_PATH="${S}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}" - export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" - - emake sub-tools || die - - if use examples; then - emake sub-tutorial sub-examples || die - fi - - # Make the msg2qm utility (not made by default) - cd "${S}"/tools/msg2qm - ../../bin/qmake - emake - - # Make the qembed utility (not made by default) - cd "${S}"/tools/qembed - ../../bin/qmake - emake - -} - -src_install() { - # binaries - into ${QTBASE} - dobin bin/* - dobin tools/msg2qm/msg2qm - dobin tools/qembed/qembed - - # libraries - dolib.so lib/lib{editor,qassistantclient,designercore}.a - dolib.so lib/libqt-mt.la - dolib.so lib/libqt-mt.so.${PV/b} lib/libqui.so.1.0.0 - cd "${D}"/${QTBASE}/$(get_libdir) - - for x in libqui.so ; do - ln -s $x.1.0.0 $x.1.0 - ln -s $x.1.0 $x.1 - ln -s $x.1 $x - done - - # version symlinks - 3.3.5->3.3->3->.so - ln -s libqt-mt.so.${PV/b} libqt-mt.so.3.3 - ln -s libqt-mt.so.3.3 libqt-mt.so.3 - ln -s libqt-mt.so.3 libqt-mt.so - - # libqt -> libqt-mt symlinks - ln -s libqt-mt.so.${PV/b} libqt.so.${PV/b} - ln -s libqt-mt.so.3.3 libqt.so.3.3 - ln -s libqt-mt.so.3 libqt.so.3 - ln -s libqt-mt.so libqt.so - - # plugins - cd "${S}" - local plugins=$(find plugins -name "lib*.so" -print) - for x in ${plugins}; do - exeinto ${QTBASE}/$(dirname ${x}) - doexe ${x} - done - - # Past this point just needs to be done once - is_final_abi || return 0 - - # includes - cd "${S}" - dodir ${QTBASE}/include/private - cp include/*\.h "${D}"/${QTBASE}/include/ - cp include/private/*\.h "${D}"/${QTBASE}/include/private/ - - # prl files - sed -i -e "s:${S}:${QTBASE}:g" "${S}"/lib/*.prl - insinto ${QTBASE}/$(get_libdir) - doins "${S}"/lib/*.prl - - # pkg-config file - insinto /usr/$(get_libdir)/pkgconfig - doins "${S}"/lib/*.pc - - # List all the multilib libdirs - local libdirs - for alibdir in $(get_all_libdirs); do - libdirs="${libdirs}:${QTBASE}/${alibdir}" - done - - # environment variables - cat < "${T}"/45qt3 -PATH=${QTBASE}/bin -ROOTPATH=${QTBASE}/bin -LDPATH=${libdirs:1} -QMAKESPEC=${PLATFORM} -MANPATH=${QTBASE}/doc/man -EOF - - cat < "${T}"/50qtdir3 -QTDIR=${QTBASE} -EOF - - cat < "${T}"/50-qt3-revdep -SEARCH_DIRS="${QTBASE}" -EOF - - insinto /etc/revdep-rebuild - doins "${T}"/50-qt3-revdep - - doenvd "${T}"/45qt3 "${T}"/50qtdir3 - - if [ "${SYMLINK_LIB}" = "yes" ]; then - dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${QTBASE}/lib - fi - - insinto ${QTBASE}/tools/designer - doins -r tools/designer/templates - - insinto ${QTBASE} - doins -r translations - - keepdir ${QTBASE}/etc/settings - - if use doc; then - insinto ${QTBASE} - doins -r "${S}"/doc - fi - - if use examples; then - find "${S}"/examples "${S}"/tutorial -name Makefile | \ - xargs sed -i -e "s:${S}:${QTBASE}:g" - - cp -r "${S}"/examples "${D}"${QTBASE}/ - cp -r "${S}"/tutorial "${D}"${QTBASE}/ - fi - - # misc build reqs - insinto ${QTBASE}/mkspecs - doins -r "${S}"/mkspecs/${PLATFORM} - - sed -e "s:${S}:${QTBASE}:g" \ - "${S}"/.qmake.cache > "${D}"${QTBASE}/.qmake.cache - - dodoc FAQ README README-QT.TXT changes* - if use immqt || use immqt-bc ; then - dodoc "${S}"/README.immodule - fi -} - -pkg_postinst() { - echo - elog "After a rebuild of Qt, it can happen that Qt plugins (such as Qt/KDE styles," - elog "or widgets for the Qt designer) are no longer recognized. If this situation" - elog "occurs you should recompile the packages providing these plugins," - elog "and you should also make sure that Qt and its plugins were compiled with the" - elog "same version of GCC. Packages that may need to be rebuilt are, for instance," - elog "kde-base/kdelibs, kde-base/kdeartwork and kde-base/kdeartwork-styles." - elog "See http://doc.trolltech.com/3.3/plugins-howto.html for more infos." - echo -} -- cgit v1.2.3-65-gdbad