From: Marcelo Góes Date: Sun, 3 Dec 2006 13:36:36 +0000 (+0000) Subject: Add patch by Phillip Berndt for bug 79694... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=88234e13d9c0f0348f06da0ee13a61ccb7bc304b;p=gentoo.git Add patch by Phillip Berndt for bug 79694. This works around the Gdk-ERROR - BadMatch issues when using the composite extension. Package-Manager: portage-2.1.1-r2 --- diff --git a/media-gfx/qiv/ChangeLog b/media-gfx/qiv/ChangeLog index d5c54dc841e8..d4ff27ebf388 100644 --- a/media-gfx/qiv/ChangeLog +++ b/media-gfx/qiv/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-gfx/qiv # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/qiv/ChangeLog,v 1.24 2006/10/20 21:30:52 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/qiv/ChangeLog,v 1.25 2006/12/03 13:36:36 vanquirius Exp $ + +*qiv-2.0-r1 (03 Dec 2006) + + 03 Dec 2006; Marcelo Goes + +files/qiv-2.0-composite.patch, +qiv-2.0-r1.ebuild: + Add patch by Phillip Berndt for bug + 79694. This works around the Gdk-ERROR - BadMatch issues when using the + composite extension. 20 Oct 2006; Bryan Østergaard qiv-2.0.ebuild: Stable on Alpha. diff --git a/media-gfx/qiv/Manifest b/media-gfx/qiv/Manifest index 94c953487419..a138309012fa 100644 --- a/media-gfx/qiv/Manifest +++ b/media-gfx/qiv/Manifest @@ -1,12 +1,20 @@ +AUX qiv-2.0-composite.patch 339 RMD160 5b5df832af0c816cd3e03691bab9c21e544fdb9e SHA1 92df07e6ef3d775faf1adecefefca943bbe10d0e SHA256 da6ce368ed778a94cd012c6cbd2552d9d3e1fa1db4c83777d311bbd5f88026f8 +MD5 f7024503cd3f6a5e83e5f7577fac71c8 files/qiv-2.0-composite.patch 339 +RMD160 5b5df832af0c816cd3e03691bab9c21e544fdb9e files/qiv-2.0-composite.patch 339 +SHA256 da6ce368ed778a94cd012c6cbd2552d9d3e1fa1db4c83777d311bbd5f88026f8 files/qiv-2.0-composite.patch 339 DIST qiv-2.0-src.tgz 76561 RMD160 82b17c20468228258f7c1e7c61588c80e1c40107 SHA1 46eef04c492b9f01d79eab7c2fec78b4edd13550 SHA256 2f0c03ee7e79c9210f060c87d51811e4540f126d8c3d751b31aab69160b3d091 +EBUILD qiv-2.0-r1.ebuild 958 RMD160 6775f86446829e96cc45acb577c08525402e3b6d SHA1 e83462104e59d9a86914fbc2c0b4ad13f1ea502c SHA256 97996f6a4dd15be98a8c533934d08b4ce6cea51d0ca300ce2faaa35c7077657b +MD5 1cf65b4a55d7b8d2c47dd490b519c1a2 qiv-2.0-r1.ebuild 958 +RMD160 6775f86446829e96cc45acb577c08525402e3b6d qiv-2.0-r1.ebuild 958 +SHA256 97996f6a4dd15be98a8c533934d08b4ce6cea51d0ca300ce2faaa35c7077657b qiv-2.0-r1.ebuild 958 EBUILD qiv-2.0.ebuild 845 RMD160 efd899d66cf309a432e005e40343c7dd2da1e962 SHA1 230b792fae8f636ca5c3777a7fff95b412304775 SHA256 3f804b1c8348a8e49d9f545617c098a98fcfeebd58b6f69ff5cefe87355ec2c9 MD5 a613068d8b557e35a7da30cc789c0eb5 qiv-2.0.ebuild 845 RMD160 efd899d66cf309a432e005e40343c7dd2da1e962 qiv-2.0.ebuild 845 SHA256 3f804b1c8348a8e49d9f545617c098a98fcfeebd58b6f69ff5cefe87355ec2c9 qiv-2.0.ebuild 845 -MISC ChangeLog 2970 RMD160 fa057d658f28cfdbf17aa8a498c068513a17bbbc SHA1 bf26268ead58be1635035282b9f4518a1e469715 SHA256 8e2b87eb254dd2a3a747f7f03e0a2298b98ca7e8fc6945ad7f2bf26d8caf7d74 -MD5 2f918630d7d0d3844bdb68e110da656f ChangeLog 2970 -RMD160 fa057d658f28cfdbf17aa8a498c068513a17bbbc ChangeLog 2970 -SHA256 8e2b87eb254dd2a3a747f7f03e0a2298b98ca7e8fc6945ad7f2bf26d8caf7d74 ChangeLog 2970 +MISC ChangeLog 3282 RMD160 803741c1582e0e4aec2f5aa7fa1134a136fe48d8 SHA1 88a6bc3baa20a2ff651762cc10c52efb11abc78f SHA256 47d842121aaec8f138d52e8c8f71eb41368196aad7beffb77d4053566ab16864 +MD5 01c1cc3cebac8541735346026f2ff6a4 ChangeLog 3282 +RMD160 803741c1582e0e4aec2f5aa7fa1134a136fe48d8 ChangeLog 3282 +SHA256 47d842121aaec8f138d52e8c8f71eb41368196aad7beffb77d4053566ab16864 ChangeLog 3282 MISC metadata.xml 223 RMD160 06142079e0afba051758f76a7ef850183217e8a4 SHA1 2dd01d07170c2cf8b971ff1c98060ed021f11abb SHA256 ecc20432f840921089d1c6864654a3261d6adde50362eee5fc4208b18042c576 MD5 94328d8f5876abf1b939df3dc0b22c14 metadata.xml 223 RMD160 06142079e0afba051758f76a7ef850183217e8a4 metadata.xml 223 @@ -14,3 +22,6 @@ SHA256 ecc20432f840921089d1c6864654a3261d6adde50362eee5fc4208b18042c576 metadata MD5 eaaff620a5319374210af79d2b6aa16f files/digest-qiv-2.0 223 RMD160 2743b0dca8712399ddcd059010d4125957f9e087 files/digest-qiv-2.0 223 SHA256 2e4555c41a0ad97d663d9517b75f79a052665b1a443cea4a649aeff696d17348 files/digest-qiv-2.0 223 +MD5 eaaff620a5319374210af79d2b6aa16f files/digest-qiv-2.0-r1 223 +RMD160 2743b0dca8712399ddcd059010d4125957f9e087 files/digest-qiv-2.0-r1 223 +SHA256 2e4555c41a0ad97d663d9517b75f79a052665b1a443cea4a649aeff696d17348 files/digest-qiv-2.0-r1 223 diff --git a/media-gfx/qiv/files/digest-qiv-2.0-r1 b/media-gfx/qiv/files/digest-qiv-2.0-r1 new file mode 100644 index 000000000000..58a67da927f1 --- /dev/null +++ b/media-gfx/qiv/files/digest-qiv-2.0-r1 @@ -0,0 +1,3 @@ +MD5 165d0c2f264718821f94732196b7f9e1 qiv-2.0-src.tgz 76561 +RMD160 82b17c20468228258f7c1e7c61588c80e1c40107 qiv-2.0-src.tgz 76561 +SHA256 2f0c03ee7e79c9210f060c87d51811e4540f126d8c3d751b31aab69160b3d091 qiv-2.0-src.tgz 76561 diff --git a/media-gfx/qiv/files/qiv-2.0-composite.patch b/media-gfx/qiv/files/qiv-2.0-composite.patch new file mode 100644 index 000000000000..34a05c228d8c --- /dev/null +++ b/media-gfx/qiv/files/qiv-2.0-composite.patch @@ -0,0 +1,12 @@ +diff -Nru qiv-2.0/main.c qiv-2.0/main.c +--- qiv-2.0/main.c 2006-10-18 16:35:42.184652947 +0200 ++++ qiv-2.0/main.c 2006-10-18 16:36:48.260782447 +0200 +@@ -41,6 +41,7 @@ + + /* Initialize GDK and Imlib */ + ++ putenv("XLIB_SKIP_ARGB_VISUALS=1"); + gdk_init(&argc,&argv); + gdk_imlib_init(); + +Files qiv-2.0.old/qiv and qiv-2.0/qiv differ diff --git a/media-gfx/qiv/qiv-2.0-r1.ebuild b/media-gfx/qiv/qiv-2.0-r1.ebuild new file mode 100644 index 000000000000..7fe4a72b9e4d --- /dev/null +++ b/media-gfx/qiv/qiv-2.0-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/qiv/qiv-2.0-r1.ebuild,v 1.1 2006/12/03 13:36:36 vanquirius Exp $ + +inherit eutils + +MY_P="${P/_/-}" +S="${WORKDIR}/${P%%_*}" +DESCRIPTION="Quick Image Viewer" +SRC_URI="http://www.kdown1.de/files/${MY_P}-src.tgz" +HOMEPAGE="http://www.klografx.net/qiv/" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="xinerama" + +DEPEND="media-libs/libpng + >=media-libs/tiff-3.5.5 + >=media-libs/imlib-1.9.10 + || ( + ( >=x11-libs/libX11-1.0.0 + >=x11-proto/xineramaproto-1.1.2 ) + virtual/x11 )" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-composite.patch +} + +src_compile() { + use xinerama && sed -i "s:# GTD_XINERAMA = -DGTD_XINERAMA:GTD_XINERAMA = -DGTD_XINERAMA:" Makefile + emake || die +} + +src_install () { + into /usr + dobin qiv + doman qiv.1 + dodoc README{,.TODO,.CHANGES} +}