Add pixmap patch for ppc machines. Fixes bug 270769

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 186 insertions, 2 deletions

diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index ccb35df6d41e..d14d308a4c29 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qt-gui
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.53 2009/05/15 18:39:52 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.54 2009/05/21 23:44:23 hwoarang Exp $
+
+*qt-gui-4.5.1-r1 (21 May 2009)
+
+  21 May 2009; Markos Chandras <hwoarang@gentoo.org>
+  +qt-gui-4.5.1-r1.ebuild,
+  +files/qt-gui-4.5.1-ppc-pixmap-fix-backport-196152.patch:
+  Add pixmap patch for ppc machines. Fixes bug 270769
 
   15 May 2009; Tobias Klausmann <klausman@gentoo.org> qt-gui-4.5.1.ebuild:
   Stable on alpha, bug #266201
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest
index 9d86f57256a3..0fa1a0abde0a 100644
--- a/x11-libs/qt-gui/Manifest
+++ b/x11-libs/qt-gui/Manifest
@@ -22,6 +22,7 @@ AUX Designer.desktop 374 RMD160 bdd36d944e2549649cd0a51382296d86d5c2ac37 SHA1 2c
 AUX Linguist.desktop 362 RMD160 ce7f588d57300eb859634cabdccd5331da572c76 SHA1 ba914198e37fbf94a8bcbcbfb33bf0f5b45aec8b SHA256 3c527616f52bf533256150dab7f5f6e94bc4f73e2193fae20314cf3d70c4b1f7
 AUX hardcoded_fonts.patch 520 RMD160 cdc8f5b4db20b4eede5eabad61ea7893e7b2fc8f SHA1 e23e2731074170585165d89822b83215ba0e3bea SHA256 0d428c620f995d1e96e649b3e49e9ce591b2882a38e600b485c6c8b509504c51
 AUX qt-gui-4.4.0-scrollbars.patch 508 RMD160 fc8f3b529f6abf395643f839af91d87654f6de00 SHA1 ef9b3996d7ad046725c7cc4ea5210e83ed0bcbe6 SHA256 55eaa28bfed52326ad116aa95f77bccce8b1702def464c6f9d225764141d6945
+AUX qt-gui-4.5.1-ppc-pixmap-fix-backport-196152.patch 505 RMD160 b68b063ff6a62e06623d7298568c6d8046517cae SHA1 556d0331ed67506aeec1ff7477c65e315119b015 SHA256 de132f66e07ec7439b6897c375c9e3631a2142bf0cb5abadc77997e3cc444694
 AUX qt-gui-designer-4.4.1.patch 531 RMD160 ab7e5f965541ff4e16d3530f55b8fc40cfc6d5a5 SHA1 dba254383e0504e8f4257217e15e201cc5216f9c SHA256 fbc46d38a87ab3ffaec5ac5b58f4a534e1ef3af050f9f68eb6001ddb33920b12
 AUX qt-x11-opensource-src-4.5.0-linguist-crash.patch 1329 RMD160 b3f5a13a6f0af11544543e6c5b684a19dd4f93d3 SHA1 c4f3748cfac5640694772aab817ea6df04e7dd1c SHA256 c309e79e4181f58409a7d567afc1b73beeb7539b0456e87eb1332da744795e00
 AUX qt-x11-opensource-src-4.5.0-lrelease.patch 896 RMD160 98f02d419fcb43e08b0c499b0cdc993216de5f83 SHA1 b78116dd7af72e44472e3faa840fcfcfe7dc9968 SHA256 c9cc5a23034fca0e5440d5f6cdc27903101251956821c398375d679e8774562d
@@ -32,6 +33,7 @@ DIST qt-x11-opensource-src-4.5.1.tar.bz2 114667436 RMD160 702d7c6bb9787cd5602dcb
 EBUILD qt-gui-4.4.2-r1.ebuild 4583 RMD160 b7bad820fd4f8f20b1a5da254f35474348eaf2ab SHA1 69433465c142d9a10b2404eac33c666098e0a9c6 SHA256 0e907e74d2360be7fa22dcf2389ab6209ab58f1e73a7e1e7a09ed8684dce0145
 EBUILD qt-gui-4.4.2-r2.ebuild 4870 RMD160 7bb9cbf0f2990fe4098d2d691e4275745cfe37e3 SHA1 586c4fefd44948a4ae370f64e9ea410241633cfc SHA256 5226ed0dcf8e5d33393ecdd76d6e273c4871ba6c573091b5d1b07d3228a56c35
 EBUILD qt-gui-4.4.2-r3.ebuild 5722 RMD160 79ee98acf0dabc3d6925a277f947e2786d1c209d SHA1 0bc49f5b5e8758594a8f578a3d64078c88b0ddbc SHA256 87195ed3e697f41cadf2afb74e9175f5b58c13f07aaee07b9d652362fe29c728
+EBUILD qt-gui-4.5.1-r1.ebuild 5773 RMD160 bbb88a0c257e5145c1b38741c319ba75a9979150 SHA1 ca8a309982035c902e796019afc9e1eb1e6c6f07 SHA256 a24fab1d4fe78ceaf2e2c23407febf44b73990c3640166d0e069e673d7732874
 EBUILD qt-gui-4.5.1.ebuild 5500 RMD160 19f3cb695eb133767de3e1af43f957ed16e5bf10 SHA1 f8e4763e7f57dc7bb2cafb021f5322c442fb5abd SHA256 bc953f6aa933c9ffcf23af0fe75da6793387d45b527af54a9861ca77e0e2525c
-MISC ChangeLog 8036 RMD160 a1327f899a48b09d0a345aaf27755db439196820 SHA1 681212fafaa12994639d1ef63cb12dafb678c60e SHA256 b038c53eb36ac63b8c299d2716ac0b69d4634478e6d5f9b42e1cdc5b950c5a6d
+MISC ChangeLog 8263 RMD160 1f3cb47032681deb1652e1b1b0f42847d946bab4 SHA1 84f438ff87914539d7431ac91559655ecaba3282 SHA256 124363efb14488a6615a9518f5ca6c65c4c7e8814962f8279d143f135c4eae19
 MISC metadata.xml 636 RMD160 d7e251319271eb08ec8a81f159b788399b72209b SHA1 ee1479223764214d8d9811dc5bc8bf7a1d95cfd7 SHA256 00175a33be6633a0cee53ef22c8db1f3d3e3c3bfddfcbef6cb95ff89065064b3
diff --git a/x11-libs/qt-gui/files/qt-gui-4.5.1-ppc-pixmap-fix-backport-196152.patch b/x11-libs/qt-gui/files/qt-gui-4.5.1-ppc-pixmap-fix-backport-196152.patch
new file mode 100644
index 000000000000..00583c5608a2
--- /dev/null
+++ b/x11-libs/qt-gui/files/qt-gui-4.5.1-ppc-pixmap-fix-backport-196152.patch
@@ -0,0 +1,11 @@
+--- a/src/gui/image/qpixmap_x11.cpp
++++ b/src/gui/image/qpixmap_x11.cpp
+@@ -1437,7 +1437,7 @@
+
+         // we may have to swap the byte order
+         if ((QSysInfo::ByteOrder == QSysInfo::LittleEndian && xi->byte_order == MSBFirst)
+-            || (QSysInfo::ByteOrder == QSysInfo::BigEndian))
++            || (QSysInfo::ByteOrder == QSysInfo::BigEndian && xi->byte_order == LSBFirst))
+         {
+             for (int i=0; i < image.height(); i++) {
+                 uint *p = (uint*)image.scanLine(i);
diff --git a/x11-libs/qt-gui/qt-gui-4.5.1-r1.ebuild b/x11-libs/qt-gui/qt-gui-4.5.1-r1.ebuild
new file mode 100644
index 000000000000..818dc5d60360
--- /dev/null
+++ b/x11-libs/qt-gui/qt-gui-4.5.1-r1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2009 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.5.1-r1.ebuild,v 1.1 2009/05/21 23:44:23 hwoarang Exp $
+
+EAPI="2"
+inherit eutils 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"
+IUSE="+accessibility cups +dbus +glib +gtkstyle mng nas nis raster tiff +qt3support xinerama"
+
+RDEPEND="media-libs/fontconfig
+	>=media-libs/freetype-2
+	media-libs/jpeg
+	media-libs/libpng
+	sys-libs/zlib
+	x11-libs/libXrandr
+	x11-libs/libXcursor
+	x11-libs/libXfont
+	x11-libs/libSM
+	x11-libs/libXi
+	~x11-libs/qt-core-${PV}[debug=,glib=,qt3support=]
+	~x11-libs/qt-script-${PV}[debug=]
+	cups? ( net-print/cups )
+	dbus? ( ~x11-libs/qt-dbus-${PV}[debug=] )
+	gtkstyle? ( x11-libs/gtk+:2 )
+	mng? ( >=media-libs/libmng-1.0.9 )
+	nas? ( >=media-libs/nas-1.5 )
+	tiff? ( media-libs/tiff )
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/xextproto
+	x11-proto/inputproto"
+PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[debug=] )"
+
+QT4_TARGET_DIRECTORIES="
+src/gui
+src/scripttools/
+tools/designer
+tools/linguist
+src/plugins/imageformats/gif
+src/plugins/imageformats/ico
+src/plugins/imageformats/jpeg
+src/plugins/inputmethods"
+
+QT4_EXTRACT_DIRECTORIES="
+include/
+src/
+tools/shared/"
+
+pkg_setup() {
+	if use raster; then
+		ewarn "WARNING: You have enabled raster backend rendering engine."
+		ewarn "This is a new feature and may lead to composite problems"
+		ewarn "screen corruption and broken qt4 or kde4 applications. "
+		ewarn "If you encounter such problems please"
+		ewarn "remove 'raster' use flag and re-compile qt-gui before"
+		ewarn "filling a bug on gentoo bugzilla."
+		ebeep 5
+	fi
+	qt4-build_pkg_setup
+}
+
+src_unpack() {
+	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"
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
+
+	qt4-build_src_unpack
+}
+
+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
+
+	# fixing hardcoded fonts, bug #252312
+	EPATCH_OPTS="--ignore-whitespace"
+	epatch "${FILESDIR}"/hardcoded_fonts.patch
+
+	# ppc fix backported from qt 4.5.2
+	# http://www.qtsoftware.com/developer/task-tracker/index_html?method=entry&id=196152
+	# http://qt.gitorious.org/qt/qt/commit/e018b82432055d9a5f13be7c17e31502830b9fa7
+	epatch "${FILESDIR}"/${P}-ppc-pixmap-fix-backport-196152.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 qt3support)
+		$(qt_use 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"
+
+	# Explictly don't compile these packages.
+	# Emerge "qt-webkit", "qt-phonon", etc for their functionality.
+	myconf="${myconf} -no-webkit -no-phonon -no-dbus -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/
+	insinto /usr/include/qt4/QtDesigner/private/
+	doins "${S}"/tools/designer/src/lib/shared/*
+	doins "${S}"/tools/designer/src/lib/sdk/*
+
+	# install correct designer and linguist icons, bug 241208
+	dodir /usr/share/pixmaps/ || die "dodir failed"
+	insinto /usr/share/pixmaps/ || die "insinto failed"
+	doins tools/linguist/linguist/images/icons/linguist-128-32.png \
+		tools/designer/src/designer/images/designer.png || die "doins failed"
+	# Note: absolute image path required here!
+	make_desktop_entry /usr/bin/linguist Linguist \
+		/usr/share/pixmaps/linguist-128-32.png 'Qt;Development;GUIDesigner' \
+		|| die "make_desktop_entry failed"
+	make_desktop_entry /usr/bin/designer Designer \
+		/usr/share/pixmaps/designer.png 'Qt;Development;GUIDesigner' \
+		|| die "make_desktop_entry failed"
+}