added fix for qtreeview regression

Package-Manager: portage-2.2.0_alpha3/cvs/Linux x86_64

4 files changed, 214 insertions, 2 deletions

diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index 701f3c8f5068..cee6bb15bcf2 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt-gui
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.121 2010/11/05 18:16:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.122 2010/11/06 09:19:59 wired Exp $
+
+*qt-gui-4.7.0-r1 (06 Nov 2010)
+
+  06 Nov 2010; Alex Alexander <wired@gentoo.org> +qt-gui-4.7.0-r1.ebuild,
+  +files/qt-gui-4.7.0-qtreeview-regression-fix.patch:
+  added fix for qtreeview regression
 
   05 Nov 2010; Jeroen Roovers <jer@gentoo.org> qt-gui-4.6.3.ebuild:
   Stable for HPPA (bug #341703).
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest
index bed17f69b8d0..d07cf5659338 100644
--- a/x11-libs/qt-gui/Manifest
+++ b/x11-libs/qt-gui/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX hardcoded_fonts.patch 520 RMD160 cdc8f5b4db20b4eede5eabad61ea7893e7b2fc8f SHA1 e23e2731074170585165d89822b83215ba0e3bea SHA256 0d428c620f995d1e96e649b3e49e9ce591b2882a38e600b485c6c8b509504c51
 AUX qt-4.5.3-glib-event-loop.patch 770 RMD160 0b854962f1b46958e8b969f949fe5e0d6e66b5ff SHA1 26543a05f894678fd1357d7b0fca217dac6b1a0c SHA256 83f010690d3a7220f5bd559b2aa82d9135d31a2c04bf9d6b12ed78a2dd3da6bb
 AUX qt-4.5.3-libpng14.patch 1545 RMD160 1bfc03a474c3ff5f55144fece013031dc2425b1b SHA1 e95e1100ba939a3a58858d5a439b5ce4a64a7d1d SHA256 c1428a4ba11fd25bc6bbc9f6a8b0e4db24b58c2bc8d6b5ccc7a1b5d7e0b66aa7
+AUX qt-gui-4.7.0-qtreeview-regression-fix.patch 490 RMD160 b3b5e806d6662c1216ca739c5f4c9655508e4811 SHA1 45a3cab07b1ba8a267efd9c7984d69e080798905 SHA256 aa1b9ac7ad0ff9b6bf715507dbf8bcf15cec1ed1e2f4da893598553de3f34340
 DIST qt-everywhere-opensource-src-4.6.2.tar.gz 160601949 RMD160 5f3fea120f2dba274c4150b02162bba40b65a872 SHA1 977c10b88a2230e96868edc78a9e3789c0fcbf70 SHA256 176f51ddb06dce67ab4b2efc6b327dc21ed8f764c5d97acc15ff1f907c2affae
 DIST qt-everywhere-opensource-src-4.6.3.tar.gz 160993454 RMD160 ceb3ca78263d0d9cdf92fef903e30c0026db6bff SHA1 1c18a564df9296c7cb0e0dedde40b9843e1b30e8 SHA256 f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768
 DIST qt-everywhere-opensource-src-4.7.0.tar.gz 208320257 RMD160 3e9c0f0d9843b5c03ad4bd6193aff98531ee0746 SHA1 a5796c8f468c8f59249e5c696f913864c979f411 SHA256 e05256d560ca7d674cd4310bb791748900ad14ad662cbfe22b6d72ada43e7955
@@ -9,6 +13,24 @@ EBUILD qt-gui-4.5.3-r2.ebuild 6122 RMD160 a6bcdfad1c798a825075c98416e3092af01271
 EBUILD qt-gui-4.6.2-r1.ebuild 5409 RMD160 4e9d8d5ae98fef42b7914c7abdc87ecfaa8ca03b SHA1 202e0f73b0000d9d3c3bbbafe6343157619f1ad6 SHA256 385223882f26bc78431c139690f987d4da4442eed35f9c1ee9f58c52df63934e
 EBUILD qt-gui-4.6.2.ebuild 5280 RMD160 17821f4f0d6e0603f049d40ae84b982cc26ed751 SHA1 85467ac3da1d4ba31139fffe73995c80c61a0376 SHA256 aa01b0ce88f29c1675cb549895b6431390a5e06a952e00ab324e561d9d7d0f07
 EBUILD qt-gui-4.6.3.ebuild 5383 RMD160 509c738771c1942c33bfe1807b201b2885003fef SHA1 81ee7cd0dcf8b3ddd07343567b8c0e82f65cc9dc SHA256 ff8258103b4deb9dff3fc04d33bc4bf15b691ed4e79e127ab04c1cbf3afb313b
+EBUILD qt-gui-4.7.0-r1.ebuild 5765 RMD160 7e6aeabaf70f7c8dc2bed188de7eaf7121eef5de SHA1 e91d07bc1a4fa4ad3e3daa000240b1b4c3d605f4 SHA256 eec2d8e1a95112088d20ab4397155023e077f1a5d0220b55037eda715043d1fa
 EBUILD qt-gui-4.7.0.ebuild 5650 RMD160 e607057a80ecb4d8e8b512d4b1ab0926adefebee SHA1 510f57bf2dedf2714b4c5e1e552f6f2006f17809 SHA256 3fc25a3c405640493870780c3e10ecd59c8e661257df85d4899c7a49431d8507
-MISC ChangeLog 18416 RMD160 19c6c5e67bc33b268ebe06bcfac073d46bb4f54a SHA1 de3df83f6b565d11506a14e3b4048d57d83c2a32 SHA256 c5c12de2c47791de628096e3ccc45cdd2f961e260f196fdce2ac98ce94f5badd
+MISC ChangeLog 18616 RMD160 3b72fbb0b14c7f58d8d24fd6ff532302a87ece87 SHA1 8c0b37dc00f18d6d646f275a4d25bf9f4f167ea0 SHA256 630cc7eeab57b7e3456b77979391df4a46b63f3859f745fc55fd491cdd632385
 MISC metadata.xml 1084 RMD160 bc1dd67f584f23b4dd4e5529f38b5f20921076f9 SHA1 c80b810f2a6aac61175e55274f9791439b48a1b4 SHA256 d96e2b40aa3339e1366105deb89479864167e3ce72f94d0aa907a07861abad4c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.12 (GNU/Linux)
+
+iQIcBAEBCAAGBQJM1R3LAAoJEDZF8K7rm0r6k0sP/jKDCPSt2yNMGoogfeRWpjSK
+PimZoI3QfB+7iaY0fiLU6ypMtoWDYP1SKL2H1DjuNdend6/pSKUKZoPxvqoJthVI
+HfxSx/AIj6KL0FfrTALcOcGqJq/KTF80bquIusWPtHTiYCbboOI1tO8Bk7GAiDab
+r4VQ5ZzE+1+Qr85tp5WBMKAcm27fvDwDpxpRCLw0I8V2C8ss/w4n5qDirMe+VU2q
+VIsD0Bep0rKKXVQq93fDM00tH+0yt0GDM5vB+79UbIzi2Y+Wpb7KbvEohYtyPQwf
+8Z3tj1NU5ohy23iTlMZ3P618YO8W8VDpdJ/zlDk9R68Cf3vmRBZa7OhV87lLJN81
+NuOM6R3t5ksQ3RopDJYrWebQGqDjscNfJKoVOgCxK9QLv70Os0DR9t2qSZZ2eiDw
+uqKBzr4SZFkYm+2/0pEbo3GLn6H/Bt0rHNLyNBR5TPcyt6E5fnRkseg3XUI983Ix
+pQvkpI5g8vst5uLEsI62WWOBYxJS4LyOH5Zm6+0UBTfC41vp0669+9oqLqRdH5c9
+dOXsr+o6QdlG+ywfttO6T4Fe+7mPZzVw5WstPtRqAg5D2LfxBDgv2MixMq1e28PO
+gjDJzERQfwKcw4Ze1eyb00/FCQy2Bnn5oNndgZftiSz/mT1AwgOD+7C7qxKtTNcD
+E4dYBjMsxY7ukFAsGVG/
+=La0x
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-gui/files/qt-gui-4.7.0-qtreeview-regression-fix.patch b/x11-libs/qt-gui/files/qt-gui-4.7.0-qtreeview-regression-fix.patch
new file mode 100644
index 000000000000..711850aba8ea
--- /dev/null
+++ b/x11-libs/qt-gui/files/qt-gui-4.7.0-qtreeview-regression-fix.patch
@@ -0,0 +1,15 @@
+diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp
+index b797776..40b51fe 100644
+--- a/src/gui/itemviews/qtreeview.cpp
++++ b/src/gui/itemviews/qtreeview.cpp
+@@ -3435,6 +3435,10 @@ void QTreeViewPrivate::updateScrollBars()
+     if (!viewportSize.isValid())
+         viewportSize = QSize(0, 0);
+ 
++    if (viewItems.isEmpty()) {
++        q->doItemsLayout();
++    }
++
+     int itemsInViewport = 0;
+     if (uniformRowHeights) {
+         if (defaultItemHeight <= 0)
diff --git a/x11-libs/qt-gui/qt-gui-4.7.0-r1.ebuild b/x11-libs/qt-gui/qt-gui-4.7.0-r1.ebuild
new file mode 100644
index 000000000000..e50172455fa3
--- /dev/null
+++ b/x11-libs/qt-gui/qt-gui-4.7.0-r1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.0-r1.ebuild,v 1.1 2010/11/06 09:19:59 wired Exp $
+
+EAPI="3"
+inherit confutils qt4-build
+
+DESCRIPTION="The GUI module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="+accessibility cups dbus egl +glib gtk mng nas nis private-headers qt3support +raster tiff trace xinerama"
+
+RDEPEND="media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/jpeg:0
+	media-libs/libpng
+	sys-libs/zlib
+	~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
+	~x11-libs/qt-script-${PV}[aqua=,debug=]
+	!aqua? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXcursor
+		x11-libs/libXfont
+		x11-libs/libSM
+		x11-libs/libXi
+	)
+	cups? ( net-print/cups )
+	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
+	gtk? ( x11-libs/gtk+:2[aqua=] )
+	mng? ( >=media-libs/libmng-1.0.9 )
+	nas? ( >=media-libs/nas-1.5 )
+	tiff? ( media-libs/tiff )
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	!aqua? (
+		x11-proto/xextproto
+		x11-proto/inputproto
+	)
+	gtk? ( || ( >=x11-libs/cairo-1.10.0[-qt4] <x11-libs/cairo-1.10.0 ) )
+	xinerama? ( x11-proto/xineramaproto )"
+PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )"
+
+pkg_setup() {
+	if ! use qt3support; then
+		ewarn "WARNING: if you need 'qtconfig', you _must_ enable qt3support."
+	fi
+
+	confutils_use_depend_all gtk glib
+
+	QT4_TARGET_DIRECTORIES="
+		src/gui
+		src/scripttools
+		tools/designer
+		tools/linguist/linguist
+		src/plugins/imageformats/gif
+		src/plugins/imageformats/ico
+		src/plugins/imageformats/jpeg
+		src/plugins/inputmethods"
+
+	QT4_EXTRACT_DIRECTORIES="
+		include
+		src
+		tools/linguist/phrasebooks
+		tools/linguist/shared
+		tools/shared"
+
+	use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer"
+	use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng"
+	use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff"
+	use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets"
+	use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}	src/plugins/graphicssystems/trace"
+
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
+
+	qt4-build_pkg_setup
+}
+
+src_prepare() {
+	qt4-build_src_prepare
+
+	# Don't build plugins this go around, because they depend on qt3support lib
+	sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro
+
+	# http://bugreports.qt.nokia.com/browse/QTBUG-13567
+	epatch "${FILESDIR}"/"${P}"-qtreeview-regression-fix.patch
+}
+
+src_configure() {
+	export PATH="${S}/bin:${PATH}"
+	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+
+	myconf="$(qt_use accessibility)
+		$(qt_use cups)
+		$(qt_use glib)
+		$(qt_use mng libmng system)
+		$(qt_use nis)
+		$(qt_use tiff libtiff system)
+		$(qt_use dbus qdbus)
+		$(qt_use dbus)
+		$(qt_use egl)
+		$(qt_use qt3support)
+		$(qt_use gtk gtkstyle)
+		$(qt_use xinerama)"
+
+	use nas	&& myconf="${myconf} -system-nas-sound"
+	use raster && myconf="${myconf} -graphicssystem raster"
+
+	myconf="${myconf} -qt-gif -system-libpng -system-libjpeg
+		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2
+		-no-sql-odbc -xrender -xrandr -xkb -xshape -sm -no-svg -no-webkit
+		-no-phonon -no-opengl"
+
+	qt4-build_src_configure
+}
+
+src_install() {
+	QCONFIG_ADD="x11sm xshape xcursor xfixes xrandr xrender xkb fontconfig
+		$(usev accessibility) $(usev xinerama) $(usev cups) $(usev nas)
+		gif png system-png system-jpeg
+		$(use mng && echo system-mng)
+		$(use tiff && echo system-tiff)"
+	QCONFIG_REMOVE="no-gif no-png"
+	QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
+			$(use cups && echo QT_CUPS) QT_FONTCONFIG QT_IMAGEFORMAT_JPEG
+			$(use mng && echo QT_IMAGEFORMAT_MNG)
+			$(use nas && echo QT_NAS)
+			$(use nis && echo QT_NIS) QT_IMAGEFORMAT_PNG QT_SESSIONMANAGER QT_SHAPE
+			$(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR
+			$(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER"
+
+	qt4-build_src_install
+
+	# remove some unnecessary headers
+	rm -f "${D}${QTHEADERDIR}"/{Qt,QtGui}/{qmacstyle_mac.h,qwindowdefs_win.h} \
+		"${D}${QTHEADERDIR}"/QtGui/QMacStyle
+
+	# qt-creator
+	# some qt-creator headers are located
+	# under /usr/include/qt4/QtDesigner/private.
+	# those headers are just includes of the headers
+	# which are located under tools/designer/src/lib/*
+	# So instead of installing both, we create the private folder
+	# and drop tools/designer/src/lib/* headers in it.
+	dodir /usr/include/qt4/QtDesigner/private/ || die
+	insinto /usr/include/qt4/QtDesigner/private/
+	doins "${S}"/tools/designer/src/lib/shared/* || die
+	doins "${S}"/tools/designer/src/lib/sdk/* || die
+	#install private headers
+	if use private-headers; then
+		insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private
+		find "${S}"/src/gui -type f -name "*_p.h" -exec doins {} \;
+	fi
+
+	# install correct designer and linguist icons, bug 241208
+	doicon tools/linguist/linguist/images/icons/linguist-128-32.png \
+		tools/designer/src/designer/images/designer.png \
+		|| die "doicon failed"
+	# Note: absolute image path required here!
+	make_desktop_entry "${EPREFIX}"/usr/bin/linguist Linguist \
+			"${EPREFIX}"/usr/share/pixmaps/linguist-128-32.png \
+			'Qt;Development;GUIDesigner' \
+			|| die "linguist make_desktop_entry failed"
+	make_desktop_entry "${EPREFIX}"/usr/bin/designer Designer \
+			"${EPREFIX}"/usr/share/pixmaps/designer.png \
+			'Qt;Development;GUIDesigner' \
+			|| die "designer make_desktop_entry failed"
+}