Bump to 2.22.2-r1

	- Fix horrible font rendering of dvi files with t1lib.  Bug #158172
Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 x86_64

4 files changed, 134 insertions, 4 deletions

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index 7f566fe1a272..b9afc17bd290 100644
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.143 2008/07/06 15:36:43 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.144 2008/07/07 15:15:36 dang Exp $
+
+*evince-2.22.2-r1 (07 Jul 2008)
+
+  07 Jul 2008; Daniel Gryniewicz <dang@gentoo.org>
+  +files/evince-2.22.2-t1lib-fonts.patch, -evince-2.22.2.ebuild,
+  +evince-2.22.2-r1.ebuild:
+  Bump to 2.22.2-r1
+
+  - Fix horrible font rendering of dvi files with t1lib. Bug #158172
 
   06 Jul 2008; Peter Alfredsen <loki_val@gentoo.org> evince-2.20.1.ebuild,
   evince-2.20.2.ebuild:
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index de7b1a38addc..54bf5e930106 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX evince-0.6.1-dbus-switch.patch 974 RMD160 85726bcd9000ebde631d8102a0f79aa6d6df8de1 SHA1 246f5c18ba30de97922af003757283179134c7bf SHA256 1fe375cf561b215a9d25482b7e74ee254cf3f052a7a77a7ac7b71fa0e872fd49
 AUX evince-0.7.1-display-menu.patch 476 RMD160 a16a5e1f32490a7db219442b23cbcf77773e6bdd SHA1 73a97e83b12ad80f6645339978717bcf8c7da575 SHA256 1f450dfe57ef3325cb4642141d76fc8e7bf837c221d81a2593214913af058f4d
+AUX evince-2.22.2-t1lib-fonts.patch 4136 RMD160 7ae4bda31cf8b5326d986401009d1a32ea1cebae SHA1 b5cc6657739847de7ceef851db4bf98002c83e2a SHA256 36db5a32b2ee7bb35ca4a580a5cad13ab7c60b61653b050aca27c4ebaf33f411
 DIST evince-2.20.1.tar.bz2 1613601 RMD160 30e93bedf50ea968fea917f439bdd061203ba3d0 SHA1 785813845e30794c31a688507d1628067241d5d1 SHA256 9435c67974b59979b8d84224ed63128cd428fc9bb746f6b333c400619c7f182e
 DIST evince-2.20.2.tar.bz2 1614179 RMD160 25daf214a29a2ead7161574852fd89c5bb6a848b SHA1 9d8d847314d728e579009eae76f2a84e17c9c893 SHA256 c6e9f2d8a90f95bc235b21ffb5be0d183ce2bfaaea84a4eafdb2449a2349129c
 DIST evince-2.22.0.tar.bz2 1618429 RMD160 5f54c3e8f7a980f35af2d2480f2f56971ffd6c95 SHA1 7c9fcc1fde30e673f7f5c96502ddf4dad6635cf4 SHA256 293778da77d42d8474bb401dc1a50d8e7d67b40b84ddce5fd39f871fef06a7ca
@@ -9,6 +13,13 @@ EBUILD evince-2.20.1.ebuild 2028 RMD160 3390ac90154cf0ffc608145f09a542712f92e7e0
 EBUILD evince-2.20.2.ebuild 2013 RMD160 e6ee8c1e8c8a8cec592684de8ca2e46c68e00f70 SHA1 d2da778571c2de97a5a16037f39e7107c946a3a2 SHA256 99593640d4db83aa2f232da7ca33d3b32615b45c080e63eb6a59628c4393b778
 EBUILD evince-2.22.0.ebuild 2061 RMD160 69027aa9c66bb6f98beaf718b0d7f3caacfb9cea SHA1 9ad52a321dfcbb45d2b3ae3013a8ae74043b6b32 SHA256 bc48b1d26384a3ba58d8628dc93f1025800d92187d098d54fa39825ca89a3858
 EBUILD evince-2.22.1.1.ebuild 1966 RMD160 4ad499b70859efbede61b11753bcc3345fd3a064 SHA1 274933b449987df3d7cc2e45de9239b10adc6a0c SHA256 473872a1d979dfd32147b112c088ecd6ef876bc9068a05ff0285372419b0c908
-EBUILD evince-2.22.2.ebuild 1964 RMD160 d3e8da4891dc2e4c835c6e709d22d827d632c471 SHA1 d93fb9c80746d3536f54da421f8a5447c1a108f4 SHA256 5758e0547b14a4197863cf37b03654a832a139d24465e5140508622fae1172f3
-MISC ChangeLog 20340 RMD160 afd02ab94a899e14087d90b264b04994361bdf7c SHA1 30afb8db00a3b5d516e20c0b780aadb1778e4112 SHA256 34e07228325deefbd9d11a3a7a74a2d81b8ccaf10c081e8685e59b4118ddd33a
+EBUILD evince-2.22.2-r1.ebuild 2056 RMD160 093a770f3389c2f55819c77ad6e9e17706e8a6ab SHA1 23263bca25a2e415f6273d91dd080c92da24fc6f SHA256 5ecd93912cc77a5bbe3279ef5e0aa615189cebd5365b72b1e92abc973c602317
+MISC ChangeLog 20604 RMD160 99c0e9d76067b530e2967bab9271f406781ccd96 SHA1 4f9b30650b0f9ff218bcf74bd18f2c6b0a2f8ccf SHA256 325b72e43c1ac754bc0ec879307bc4f610b4c9bd9becc268ed04365407aef930
 MISC metadata.xml 218 RMD160 356edd8735bce3bdded1992ed1e01831af9f1f60 SHA1 bb11546aaa0d850f95621d0a9c291bf447697982 SHA256 b53b06e28caff7a3a8fdd06a56946440e889e56ba1e3627dee44e02707cd1a52
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iD8DBQFIcjNGomPajV0RnrERAmkyAJ9uORfl5Ai9XXhLFqAV4lSvEp0i7QCdEULc
+vipmKz69pTAiDF22mG5FhS8=
+=Axo1
+-----END PGP SIGNATURE-----
diff --git a/app-text/evince/evince-2.22.2.ebuild b/app-text/evince/evince-2.22.2-r1.ebuild
index a1ecdb458d5d..73dcda329d72 100644
--- a/app-text/evince/evince-2.22.2.ebuild
+++ b/app-text/evince/evince-2.22.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.22.2.ebuild,v 1.2 2008/07/01 21:33:05 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.22.2-r1.ebuild,v 1.1 2008/07/07 15:15:36 dang Exp $
 
 inherit eutils gnome2 autotools
 
@@ -70,4 +70,7 @@ src_unpack() {
 
 	# Fix .desktop file so menu item shows up
 	epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
+
+	# Fix t1lib font rendering.  Bug #158172
+	epatch "${FILESDIR}"/${P}-t1lib-fonts.patch
 }
diff --git a/app-text/evince/files/evince-2.22.2-t1lib-fonts.patch b/app-text/evince/files/evince-2.22.2-t1lib-fonts.patch
new file mode 100644
index 000000000000..39613743d46d
--- /dev/null
+++ b/app-text/evince/files/evince-2.22.2-t1lib-fonts.patch
@@ -0,0 +1,107 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evince-2.22.2.orig/backend/dvi/mdvi-lib/bitmap.c evince-2.22.2/backend/dvi/mdvi-lib/bitmap.c
+--- evince-2.22.2.orig/backend/dvi/mdvi-lib/bitmap.c	2008-05-28 17:13:57.000000000 -0400
++++ evince-2.22.2/backend/dvi/mdvi-lib/bitmap.c	2008-07-07 10:54:03.000000000 -0400
+@@ -125,7 +125,7 @@ static Uchar bit_swap[] = {
+  * hopelessly slow.
+  */
+ 
+-BITMAP	*bitmap_convert_lsb8(Uchar *bits, int w, int h)
++BITMAP	*bitmap_convert_lsb8(Uchar *bits, int w, int h, int stride)
+ {
+ 	BITMAP	*bm;
+ 	int	i;
+@@ -147,12 +147,13 @@ BITMAP	*bitmap_convert_lsb8(Uchar *bits,
+ 	for(i = 0; i < h; i++) {
+ #ifdef WORD_LITTLE_ENDIAN
+ 		memcpy(unit, curr, bytes);
+-		curr += bytes;
++		curr += stride;
+ #else
+ 		int	j;
+ 		
+ 		for(j = 0; j < bytes; curr++, j++)
+ 			unit[j] = bit_swap[*curr];
++		cur += stride - bytes;
+ #endif
+ 		memzero(unit + bytes, bm->stride - bytes);
+ 		unit  += bm->stride;
+@@ -162,7 +163,7 @@ BITMAP	*bitmap_convert_lsb8(Uchar *bits,
+ 	return bm;
+ }
+ 
+-BITMAP	*bitmap_convert_msb8(Uchar *data, int w, int h)
++BITMAP	*bitmap_convert_msb8(Uchar *data, int w, int h, int stride)
+ {
+ 	BITMAP	*bm;
+ 	Uchar	*unit;
+@@ -180,9 +181,10 @@ BITMAP	*bitmap_convert_msb8(Uchar *data,
+ 		
+ 		for(j = 0; j < bytes; curr++, j++)
+ 			unit[j] = bit_swap[*curr];
++		curr += stride - bytes;
+ #else
+ 		memcpy(unit, curr, bytes);
+-		curr += bytes;
++		curr += stride;
+ #endif
+ 		memzero(unit + bytes, bm->stride - bytes);
+ 		unit += bm->stride;
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evince-2.22.2.orig/backend/dvi/mdvi-lib/bitmap.h evince-2.22.2/backend/dvi/mdvi-lib/bitmap.h
+--- evince-2.22.2.orig/backend/dvi/mdvi-lib/bitmap.h	2008-05-28 17:13:57.000000000 -0400
++++ evince-2.22.2/backend/dvi/mdvi-lib/bitmap.h	2008-07-07 10:54:03.000000000 -0400
+@@ -136,8 +136,8 @@ extern void bitmap_rotate_clockwise __PR
+ extern void bitmap_rotate_counter_clockwise __PROTO((BITMAP *));
+ extern void bitmap_flip_rotate_clockwise __PROTO((BITMAP *));
+ extern void bitmap_flip_rotate_counter_clockwise __PROTO((BITMAP *));
+-extern BITMAP *bitmap_convert_lsb8 __PROTO((Uchar *, int, int));
+-extern BITMAP *bitmap_convert_msb8 __PROTO((Uchar *, int, int));
++extern BITMAP *bitmap_convert_lsb8 __PROTO((Uchar *, int, int, int));
++extern BITMAP *bitmap_convert_msb8 __PROTO((Uchar *, int, int, int));
+ 
+ #include <stdio.h>
+ extern void	bitmap_print __PROTO((FILE *, BITMAP *));
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evince-2.22.2.orig/backend/dvi/mdvi-lib/t1.c evince-2.22.2/backend/dvi/mdvi-lib/t1.c
+--- evince-2.22.2.orig/backend/dvi/mdvi-lib/t1.c	2008-05-28 17:13:57.000000000 -0400
++++ evince-2.22.2/backend/dvi/mdvi-lib/t1.c	2008-07-07 10:54:03.000000000 -0400
+@@ -437,25 +437,16 @@ static int t1_load_font(DviParams *param
+ 
+ static inline BITMAP *t1_glyph_bitmap(GLYPH *glyph)
+ {
+-	BITMAP	*bm;
+-	int	w, h;
++	int	w, h, pad;
+ 	
+ 	w = GLYPH_WIDTH(glyph);
+ 	h = GLYPH_HEIGHT(glyph);
+ 
+ 	if(!w || !h)
+ 		return MDVI_GLYPH_EMPTY;
+-	switch(glyph->bpp << 3) {
+-		case 8: 
+-			bm = bitmap_convert_lsb8((unsigned char *)glyph->bits, w, h);
+-			break;
+-		default:
+-			warning(_("(t1) unsupported bitmap pad size %d\n"),
+-				glyph->bpp);
+-			bm = MDVI_GLYPH_EMPTY;
+-			break;
+-	}
+-	return bm;
++
++	pad = T1_GetBitmapPad();
++	return bitmap_convert_lsb8((unsigned char *)glyph->bits, w, h, ROUND(w, pad) * (pad >> 3));
+ }
+ 
+ static void t1_font_shrink_glyph(DviContext *dvi, DviFont *font, DviFontChar *ch, DviGlyph *dest)
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evince-2.22.2.orig/backend/dvi/mdvi-lib/tt.c evince-2.22.2/backend/dvi/mdvi-lib/tt.c
+--- evince-2.22.2.orig/backend/dvi/mdvi-lib/tt.c	2008-05-28 17:13:57.000000000 -0400
++++ evince-2.22.2/backend/dvi/mdvi-lib/tt.c	2008-07-07 10:54:03.000000000 -0400
+@@ -382,7 +382,7 @@ static int tt_get_bitmap(DviParams *para
+ 	
+ 	TT_Translate_Outline(&outline, -bbox.xMin, -bbox.yMin);
+ 	TT_Get_Outline_Bitmap(tt_handle, &outline, &raster);
+-	glyph->data = bitmap_convert_msb8(raster.bitmap, w, h);
++	glyph->data = bitmap_convert_msb8(raster.bitmap, w, h, ROUND(w, 8));
+ 	TT_Done_Outline(&outline);
+ 	mdvi_free(raster.bitmap);
+