rpms/MagicPoint/devel MagicPoint.spec, 1.8, 1.9 magicpoint-1.10a-longline.patch, 1.3, 1.4

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/pkgs/rpms/MagicPoint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2829

Modified Files:
	MagicPoint.spec magicpoint-1.10a-longline.patch 
Log Message:
* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 1.11b-7
- Fix patch fuzz build failure



Index: MagicPoint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/MagicPoint/devel/MagicPoint.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MagicPoint.spec	30 Mar 2008 20:19:52 -0000	1.8
+++ MagicPoint.spec	7 Sep 2008 12:27:10 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           MagicPoint
 Version:        1.11b
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        X based presentation software
 Group:          Applications/Productivity
 License:        BSD
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 1.11b-7
+- Fix patch fuzz build failure
+
 * Sun Mar 30 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.11b-6
 - Fix missing prototype compiler warnings
 

magicpoint-1.10a-longline.patch:

Index: magicpoint-1.10a-longline.patch
===================================================================
RCS file: /cvs/pkgs/rpms/MagicPoint/devel/magicpoint-1.10a-longline.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- magicpoint-1.10a-longline.patch	21 Oct 2006 14:39:38 -0000	1.3
+++ magicpoint-1.10a-longline.patch	7 Sep 2008 12:27:10 -0000	1.4
@@ -1,7 +1,7 @@
-diff -ruN magicpoint-1.10a.orig/draw.c magicpoint-1.10a/draw.c
---- magicpoint-1.10a.orig/draw.c	2003-05-14 16:45:35.000000000 +0900
-+++ magicpoint-1.10a/draw.c	2003-08-20 19:02:19.000000000 +0900
-@@ -4504,6 +4504,7 @@
+diff -up magicpoint-1.11b/draw.c.foo magicpoint-1.11b/draw.c
+--- magicpoint-1.11b/draw.c.foo	2008-09-07 14:22:22.000000000 +0200
++++ magicpoint-1.11b/draw.c	2008-09-07 14:22:33.000000000 +0200
+@@ -4691,6 +4691,7 @@ xft_draw_fragment(state, p, len, registr
  	char buf16[1024], *p16;
  	char out16[1024], *o16;
  	int ileft, oleft;
@@ -9,7 +9,7 @@
  #ifdef HAVE_ICONV
  	static iconv_t icv[3];
  #endif
-@@ -4569,6 +4570,29 @@
+@@ -4759,6 +4760,29 @@ xft_draw_fragment(state, p, len, registr
  		if (isspace(*(p + len -1))) {
  		    XftTextExtents8(display, xft_font, (XftChar8 *)p, len -1, &extents);
  			if (state->width - state->leftfillpos / 2 - state->linewidth >= extents.xOff) goto nofolding;
@@ -39,9 +39,9 @@
  		}
  
  		draw_line_end(state); 
-@@ -4588,9 +4612,20 @@
- 	if (obj_new_xftfont(state, state->linewidth, 0, p, len, 
- 				fontname, registry, char_size[caching], charset16, xft_font)){
+@@ -4778,9 +4802,20 @@ nofolding:
+ 	if (obj_new_xftfont(state, state->linewidth, state->charoff, p, len, fontname,
+ 	    registry, char_size[caching], charset16, xft_font)) {
  		state->linewidth += extents.xOff;
 +		if (forcefolding == 1) {
 +			draw_line_end (state);
@@ -59,5 +59,5 @@
  		return NULL; 
 +	}
  }
+ 
  static int
- obj_new_xftfont(state, x, y, p, len, fontname, registry, size, charset16, xft_font)