From nobody@FreeBSD.ORG  Sun Nov 12 00:00:19 2000
Return-Path: <nobody@FreeBSD.ORG>
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8AA7F37B479; Sun, 12 Nov 2000 00:00:19 -0800 (PST)
Message-Id: <20001112080019.8AA7F37B479@hub.freebsd.org>
Date: Sun, 12 Nov 2000 00:00:19 -0800 (PST)
From: mzaki@e-mail.ne.jp
Sender: nobody@FreeBSD.ORG
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update port: textproc/mswordview workaround for updating graphics/libwmf
X-Send-Pr-Version: www-1.0

>Number:         22782
>Category:       ports
>Synopsis:       Update port: textproc/mswordview workaround for updating graphics/libwmf
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 12 00:10:01 PST 2000
>Closed-Date:    Mon Nov 13 02:38:22 JST 2000
>Last-Modified:  Mon Nov 13 02:38:46 JST 2000
>Originator:     Motomichi Matsuzaki
>Release:        -current
>Organization:
>Environment:
>Description:
workaround for updating graphics/libwmf

updating graphics/libwmf to 0.1.20 breaks
building textproc/mswordview

this patch is for it
>How-To-Repeat:

>Fix:
--- mswordview.old/files/patch-aa	Sun Nov 12 16:33:48 2000
+++ mswordview/files/patch-aa	Sun Nov 12 16:27:31 2000
@@ -1,5 +1,5 @@
---- support.c	Mon May 17 15:27:00 1999
-+++ support.c.new	Sun Jul  2 22:24:08 2000
+--- support.c.orig	Tue May 18 07:27:00 1999
++++ support.c	Sun Nov 12 16:26:39 2000
 @@ -36,6 +36,7 @@
  #include "utf.h"
  #ifdef HAVE_WMF
@@ -26,7 +26,7 @@
  	wmfinit(cstruct);
  
      wmffunctions = &gd_wmffunctions;
-@@ -1252,7 +1253,7 @@
+@@ -1252,18 +1253,18 @@
          return;
          }
  
@@ -34,10 +34,15 @@
 +	error(erroroutput,"3 converting wmf to png, via libwmf\n");
  
      cstruct->preparse = 1;
-     PlayMetaFile((void *)cstruct,file);
-@@ -1263,7 +1264,7 @@
+-    PlayMetaFile((void *)cstruct,file);
++    PlayMetaFile((void *)cstruct,file,!0,NULL);
+ 
+     gdstruct.im_out = gdImageCreate(cstruct->realwidth, cstruct->realheight);
+     gdImageColorResolve(gdstruct.im_out, 0xff, 0xff, 0xff);
+ 
      cstruct->preparse = 0;
-     PlayMetaFile((void *)cstruct,file);
+-    PlayMetaFile((void *)cstruct,file);
++    PlayMetaFile((void *)cstruct,file,!0,NULL);
  
 -	strcat(filename,".gif");
 +	strcat(filename,".png");


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: sumikawa 
State-Changed-When: Mon Nov 13 02:38:22 JST 2000 
State-Changed-Why:  
commited, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=22782 
>Unformatted:
