Apply patch from bug 87218 fixing unaligned access with libX11. Use ecompress to define manpage format for bug 173522.

Package-Manager: portage-2.1.2.7

5 files changed, 176 insertions, 16 deletions

diff --git a/media-gfx/xloadimage/ChangeLog b/media-gfx/xloadimage/ChangeLog
index e60a7715d573..0740809ff755 100644
--- a/media-gfx/xloadimage/ChangeLog
+++ b/media-gfx/xloadimage/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/xloadimage
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/ChangeLog,v 1.38 2006/06/08 13:48:28 flameeyes Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/ChangeLog,v 1.39 2007/05/14 17:29:10 drac Exp $
+
+*xloadimage-4.1-r5 (14 May 2007)
+
+  14 May 2007; Samuli Suominen <drac@gentoo.org>
+  +files/xloadimage-4.1-unaligned-access.patch, +xloadimage-4.1-r5.ebuild:
+  Apply patch from bug 87218 fixing unaligned access with libX11. Use
+  ecompress to define manpage format for bug 173522.
 
   08 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
   xloadimage-4.1-r4.ebuild:
diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest
index d399497d1e89..60328085705e 100644
--- a/media-gfx/xloadimage/Manifest
+++ b/media-gfx/xloadimage/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xloadimage-4.1-endif.patch 321 RMD160 9d65994d8a2090bcf321bc48eaa4028263fe013f SHA1 4b3ed8fedb88c9ec9276a6bf2b48f372193f415c SHA256 a621ead90d893fd5d07d3034adf674d39235484f205198d47092e8e51bd71204
 MD5 fb91a22d37e6c6db534f1dc81add707e files/xloadimage-4.1-endif.patch 321
 RMD160 9d65994d8a2090bcf321bc48eaa4028263fe013f files/xloadimage-4.1-endif.patch 321
@@ -9,6 +6,10 @@ AUX xloadimage-4.1-include-errno_h.patch 303 RMD160 a6125c8e94db89d348a4e358610b
 MD5 c411c977cc7ae79dd96aad933980dbb2 files/xloadimage-4.1-include-errno_h.patch 303
 RMD160 a6125c8e94db89d348a4e358610bd195db044720 files/xloadimage-4.1-include-errno_h.patch 303
 SHA256 705ea25d75585bd763b4330757266ac412ee30562e65b937722dad3e3141c56a files/xloadimage-4.1-include-errno_h.patch 303
+AUX xloadimage-4.1-unaligned-access.patch 1784 RMD160 3d202efa9049d5d8c78f80eaaf61ccb75ad31338 SHA1 0539e95b9ab30c4c11ab9b5cf00d5a0851f8f3a7 SHA256 b61cfcefd43b55888fb8125240fbb02788baa280fbba0c482d0d48802ac6221a
+MD5 cf1cf5f3d3444ae7ed0e48ca30837731 files/xloadimage-4.1-unaligned-access.patch 1784
+RMD160 3d202efa9049d5d8c78f80eaaf61ccb75ad31338 files/xloadimage-4.1-unaligned-access.patch 1784
+SHA256 b61cfcefd43b55888fb8125240fbb02788baa280fbba0c482d0d48802ac6221a files/xloadimage-4.1-unaligned-access.patch 1784
 AUX xloadimage-4.1-zio-shell-meta-char.diff 1372 RMD160 bdff2a42743659179ff9faaf7d2451d3d2c94678 SHA1 4ac943a7b4eb78d65577838b910628fa14fb84e6 SHA256 253064f5eebcd6c1c318b9637f1010657927b5f65be59581ef37523a50f3601e
 MD5 9208b10866e00f1e47bb12a7f8bec04a files/xloadimage-4.1-zio-shell-meta-char.diff 1372
 RMD160 bdff2a42743659179ff9faaf7d2451d3d2c94678 files/xloadimage-4.1-zio-shell-meta-char.diff 1372
@@ -23,10 +24,14 @@ EBUILD xloadimage-4.1-r4.ebuild 2420 RMD160 6221bfaf97eaddfb7b2d7dd70bc5cf74ebe7
 MD5 1d3c7518c43c05015f188698faeae95d xloadimage-4.1-r4.ebuild 2420
 RMD160 6221bfaf97eaddfb7b2d7dd70bc5cf74ebe78240 xloadimage-4.1-r4.ebuild 2420
 SHA256 88934764d764e863520e51a9de24f2f7b17a0cdf3fcc3cbbd8c0b58a848a66cf xloadimage-4.1-r4.ebuild 2420
-MISC ChangeLog 6467 RMD160 401bece9b89c5fd89d8a1bf77361e1d474b47aaf SHA1 9b14ae2e03216e3e350933d6d623f792013c7416 SHA256 8b3f7841719d08e8d253cabf925e8f6278da54b35830eca7a70870428c6d1653
-MD5 ac7d79b44bea6df54982cb4154d04d27 ChangeLog 6467
-RMD160 401bece9b89c5fd89d8a1bf77361e1d474b47aaf ChangeLog 6467
-SHA256 8b3f7841719d08e8d253cabf925e8f6278da54b35830eca7a70870428c6d1653 ChangeLog 6467
+EBUILD xloadimage-4.1-r5.ebuild 2532 RMD160 1cffb510cbe2238d87745606bad694f1655e2588 SHA1 ce78eeb5ecf6169fc1c937ba2a5456b9fea0d784 SHA256 481faa2b6a356f6f5b8d0115be454c38f67e0b3d3dcd422cd179150e9ea25043
+MD5 a3bc5b247f16cb3ee7e7b3ff1b1ec853 xloadimage-4.1-r5.ebuild 2532
+RMD160 1cffb510cbe2238d87745606bad694f1655e2588 xloadimage-4.1-r5.ebuild 2532
+SHA256 481faa2b6a356f6f5b8d0115be454c38f67e0b3d3dcd422cd179150e9ea25043 xloadimage-4.1-r5.ebuild 2532
+MISC ChangeLog 6744 RMD160 44a896b1b3ff3a71b044f4971009bddda42bc0d9 SHA1 cc8d81741901008d07dffe0d554eacbf43ae1860 SHA256 964242852f3059c74f50310cd093bc947a9f1110989ea24a60c83666988a2356
+MD5 371a2b4bf76a83d78e23a13b085b2740 ChangeLog 6744
+RMD160 44a896b1b3ff3a71b044f4971009bddda42bc0d9 ChangeLog 6744
+SHA256 964242852f3059c74f50310cd093bc947a9f1110989ea24a60c83666988a2356 ChangeLog 6744
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
@@ -34,10 +39,6 @@ SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 metadata
 MD5 e9887ef75bc71d534094ad4a9c227086 files/digest-xloadimage-4.1-r4 512
 RMD160 6a8f2b116fd7a1b299dcc788e30c70bdb7b3216f files/digest-xloadimage-4.1-r4 512
 SHA256 424d8d1b9f514d4c25e350dd85d4617854b76d1edce1912aeec1ec9490238d5f files/digest-xloadimage-4.1-r4 512
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEiCqyAiZjviIA2XgRAqrcAKCWyEEU3fjLXi/l4hhO4Fc6n82P/QCfVWv1
-+ZY/rxEPbW7K/L0ZD376G/U=
-=h5JJ
------END PGP SIGNATURE-----
+MD5 e9887ef75bc71d534094ad4a9c227086 files/digest-xloadimage-4.1-r5 512
+RMD160 6a8f2b116fd7a1b299dcc788e30c70bdb7b3216f files/digest-xloadimage-4.1-r5 512
+SHA256 424d8d1b9f514d4c25e350dd85d4617854b76d1edce1912aeec1ec9490238d5f files/digest-xloadimage-4.1-r5 512
diff --git a/media-gfx/xloadimage/files/digest-xloadimage-4.1-r5 b/media-gfx/xloadimage/files/digest-xloadimage-4.1-r5
new file mode 100644
index 000000000000..b84dc40e29b6
--- /dev/null
+++ b/media-gfx/xloadimage/files/digest-xloadimage-4.1-r5
@@ -0,0 +1,6 @@
+MD5 8f5cc72c54ea730ba99026f006e71e10 xloadimage-4.1-gentoo.diff.bz2 41390
+RMD160 63b160b968937d8c580c7876137263bdbaaa575d xloadimage-4.1-gentoo.diff.bz2 41390
+SHA256 dae93c4bd2955810252ff4dd5650386c34f82db8a7a1502c653bf965dad1632a xloadimage-4.1-gentoo.diff.bz2 41390
+MD5 7331850fc04056ab8ae6b5725d1fb3d2 xloadimage.4.1.tar.gz 596021
+RMD160 000271b40f58601cd1057b4e99c31a30da6e10af xloadimage.4.1.tar.gz 596021
+SHA256 400bc7d84dcfb3265a7a1ce51819679dc3adaeda231514bd89b0f932b78ff5c4 xloadimage.4.1.tar.gz 596021
diff --git a/media-gfx/xloadimage/files/xloadimage-4.1-unaligned-access.patch b/media-gfx/xloadimage/files/xloadimage-4.1-unaligned-access.patch
new file mode 100644
index 000000000000..22c716f25f77
--- /dev/null
+++ b/media-gfx/xloadimage/files/xloadimage-4.1-unaligned-access.patch
@@ -0,0 +1,51 @@
+diff -ruN ./cmuwmraster.c /tmp/xloadimage.4.1/cmuwmraster.c
+--- ./cmuwmraster.c	2005-07-23 13:15:50 -0700
++++ /tmp/xloadimage.4.1/cmuwmraster.c	2005-07-23 13:08:36 -0700
+@@ -20,7 +20,7 @@
+ char *name;
+ struct cmuwm_header *headerp;
+ {
+-    printf("%s is a %ldx%ld %ld plane CMU WM raster\n",
++    printf("%s is a %lux%lu %lu plane CMU WM raster\n",
+ 	   name,
+ 	   memToVal(headerp->width, sizeof(long)),
+ 	   memToVal(headerp->height, sizeof(long)),
+diff -ruN ./niff.c /tmp/xloadimage.4.1/niff.c
+--- ./niff.c	2005-07-23 13:15:50 -0700
++++ /tmp/xloadimage.4.1/niff.c	2005-07-23 13:07:55 -0700
+@@ -24,18 +24,18 @@
+ 	 memToVal(header->width, 4),
+ 	 memToVal(header->height, 4));
+   if (memToVal(header->version, 4) != NIFF_VERSION)
+-    printf("version %ld ", memToVal(header->version, 4));
++    printf("version %lu ", memToVal(header->version, 4));
+   printf("NIFF ");
+   switch (header->type) {
+   case NIFF_BITMAP:
+     printf("bitmap image");
+     break;
+   case NIFF_RGB:
+-    printf("%ld-bit RGB image with %ld colors",
++    printf("%lu-bit RGB image with %lu colors",
+ 	   memToVal(header->depth, 4), memToVal(header->cmap_size, 4));
+     break;
+   case NIFF_TRUE:
+-    printf("%ld-bit true color image", memToVal(header->depth, 4));
++    printf("%lu-bit true color image", memToVal(header->depth, 4));
+     break;
+   default:
+     printf("image with an unknown type");
+diff -ruN ./root.c /tmp/xloadimage.4.1/root.c
+--- ./root.c	2005-07-23 13:15:51 -0700
++++ /tmp/xloadimage.4.1/root.c	2005-07-23 13:05:48 -0700
+@@ -68,8 +68,8 @@
+   Pixmap *pm;			
+   Atom	actual_type;		/* NOTUSED */
+   int	format;
+-  int	nitems;
+-  int	bytes_after;
++  unsigned long	nitems;
++  unsigned long	bytes_after;
+ 
+   /* intern the property name */
+   Atom atom = XInternAtom(dpy, RETAIN_PROP_NAME, 0);
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r5.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r5.ebuild
new file mode 100644
index 000000000000..6b4c9ab11b50
--- /dev/null
+++ b/media-gfx/xloadimage/xloadimage-4.1-r5.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/xloadimage-4.1-r5.ebuild,v 1.1 2007/05/14 17:29:10 drac Exp $
+
+inherit alternatives eutils toolchain-funcs
+
+MY_P="${P/-/.}"
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="utility to view many different types of images under X11"
+HOMEPAGE="http://world.std.com/~jimf/xloadimage.html"
+SRC_URI="ftp://ftp.x.org/R5contrib/${MY_P}.tar.gz
+	mirror://gentoo/${P}-gentoo.diff.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="tiff jpeg png"
+
+RDEPEND="x11-libs/libX11
+	tiff? ( media-libs/tiff )
+	png? ( media-libs/libpng )
+	jpeg? ( media-libs/jpeg )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4.0.5"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${WORKDIR}"/${P}-gentoo.diff
+	epatch "${FILESDIR}"/${P}-zio-shell-meta-char.diff
+	epatch "${FILESDIR}"/${P}-endif.patch
+
+	# Do not define errno extern, but rather include errno.h
+	# <azarah@gentoo.org> (1 Jan 2003)
+	epatch "${FILESDIR}"/${P}-include-errno_h.patch
+
+	epatch "${FILESDIR}"/xloadimage-gentoo.patch
+
+	sed -i "s:OPT_FLAGS=:OPT_FLAGS=$CFLAGS:" Make.conf
+	sed -i "s:^#include <varargs.h>:#include <stdarg.h>:" "${S}"/rlelib.c
+
+	# On FreeBSD systems malloc.h is a false header asking for fixes.
+	# On MacOSX it would require malloc/malloc.h
+	# On other systems it's simply unneeded
+	sed -i -e 's,<malloc.h>,<stdlib.h>,' vicar.c
+
+	if use userland_Darwin ; then
+		for f in $(grep zopen * | cut -d':' -f1 | uniq);do
+			sed -i "s:zopen:zloadimage_zopen:g" $f
+		done
+	fi
+
+	epatch "${FILESDIR}"/${P}-unaligned-access.patch
+
+	chmod +x "${S}"/configure
+}
+
+src_compile() {
+	tc-export CC
+	econf || die "econf failed."
+	emake || die "emake failed."
+}
+
+src_install() {
+	dobin xloadimage uufilter
+
+	insinto /etc/X11
+	doins xloadimagerc
+
+	newman xloadimage.man xloadimage.1
+	newman uufilter.man uufilter.1
+
+	dodoc README
+}
+
+update_alternatives() {
+	local mansuffix=$(ecompress --suffix)
+
+	alternatives_makesym /usr/bin/xview \
+		/usr/bin/{xloadimage,xli}
+	alternatives_makesym /usr/bin/xsetbg \
+		/usr/bin/{xloadimage,xli}
+	alternatives_makesym /usr/share/man/man1/xview.1${mansuffix} \
+		/usr/share/man/man1/{xloadimage,xli}.1${mansuffix}
+	alternatives_makesym /usr/share/man/man1/xsetbg.1${mansuffix} \
+		/usr/share/man/man1/{xloadimage,xli}.1${mansuffix}
+}
+
+pkg_postinst() {
+	use ppc-macos || update_alternatives
+}
+
+pkg_postrm() {
+	use ppc-macos || update_alternatives
+}