Attachment 105713 Details for Bug 146226 – fontforge-20100501.patch

[patch] fontforge-20100501.patch

fontforge-20100501.patch (text/plain), 12.46 KB, created by Naram Qashat on 2010-05-02 03:10:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Naram Qashat

Created: 2010-05-02 03:10:13 UTC

Size: 12.46 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/print/fontforge/Makefile /kirby/shared/ports/fontforge/Makefile
>--- /usr/ports/print/fontforge/Makefile	2010-04-16 17:50:41.000000000 -0400
>+++ /kirby/shared/ports/fontforge/Makefile	2010-05-01 21:31:54.000000000 -0400
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	fontforge
>-PORTVERSION=	20090923
>-PORTREVISION=	4
>+PORTVERSION=	20100501
> CATEGORIES=	print
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-source
> DISTFILES=	${EXTRACT_ONLY}
>@@ -33,7 +32,7 @@
> .if !defined(NOPORTDOCS)
> #DOC_VERSION=	${PORTVERSION}
> # This version of Fontforge has a different version number for the docs as opposed to the actual source
>-DOC_VERSION=	20090914
>+DOC_VERSION=	20100429
> MASTER_SITES+=	SF/${PORTNAME}/${PORTNAME}-docs:docs
> DOCFILES=	${PORTNAME}_htdocs-${DOC_VERSION}.tar.bz2
> DISTFILES+=	${DOCFILES:C/$/:docs/}
>diff -ruN --exclude=CVS /usr/ports/print/fontforge/distinfo /kirby/shared/ports/fontforge/distinfo
>--- /usr/ports/print/fontforge/distinfo	2010-04-16 17:50:41.000000000 -0400
>+++ /kirby/shared/ports/fontforge/distinfo	2010-05-01 15:34:14.000000000 -0400
>@@ -1,9 +1,9 @@
>-MD5 (fontforge_full-20090923.tar.bz2) = ea9d8dc38de79235fbe6add725b38ffe
>-SHA256 (fontforge_full-20090923.tar.bz2) = 43bbad49796a93dac3eac6f97e79d882b34fb0835ee3645c2408b402fdd01baa
>-SIZE (fontforge_full-20090923.tar.bz2) = 5492119
>+MD5 (fontforge_full-20100501.tar.bz2) = 5f3d20d645ec1aa2b7b4876386df8717
>+SHA256 (fontforge_full-20100501.tar.bz2) = ee4928b0df7480c31a422645854d9f3f4f6718dd423b6885bd33e87a8a6edd79
>+SIZE (fontforge_full-20100501.tar.bz2) = 6666386
> MD5 (freetype-2.3.11.tar.bz2) = 519c7cbf5cbd72ffa822c66844d3114c
> SHA256 (freetype-2.3.11.tar.bz2) = 8a033b1e6018a1e9ea381b09b2347b02c6686bdf7e4ee86a6714b6b90f1e2ec9
> SIZE (freetype-2.3.11.tar.bz2) = 1446474
>-MD5 (fontforge_htdocs-20090914.tar.bz2) = 8979b8b38e3653c452dbe310f17a996d
>-SHA256 (fontforge_htdocs-20090914.tar.bz2) = 3f9e6ed8dfb9d1a67c1311289bbe6538b8f20439cbe8bb6e56de6c688ad5ab57
>-SIZE (fontforge_htdocs-20090914.tar.bz2) = 2828545
>+MD5 (fontforge_htdocs-20100429.tar.bz2) = 7ff67bcb694b673dbe0b8ca3dfd4675e
>+SHA256 (fontforge_htdocs-20100429.tar.bz2) = 842a5e675341578aacdd2614ec416719eba51826749d73b2044731335d1a1883
>+SIZE (fontforge_htdocs-20100429.tar.bz2) = 3115782
>diff -ruN --exclude=CVS /usr/ports/print/fontforge/files/patch-configure /kirby/shared/ports/fontforge/files/patch-configure
>--- /usr/ports/print/fontforge/files/patch-configure	2009-10-01 09:24:08.000000000 -0400
>+++ /kirby/shared/ports/fontforge/files/patch-configure	2010-05-01 15:37:01.000000000 -0400
>@@ -1,10 +1,10 @@
>---- configure.orig	2009-09-23 19:55:22.000000000 -0400
>-+++ configure	2009-09-28 18:28:15.000000000 -0400
>-@@ -22843,7 +22843,7 @@
>+--- configure.orig	2010-04-29 13:53:45.000000000 -0400
>++++ configure	2010-05-01 15:36:49.000000000 -0400
>+@@ -23014,7 +23014,7 @@
>    LDFLAGS="$LDFLAGS $gww_archlist"
>  fi
>  
>--CFLAGS_NOOPT=`echo $CFLAGS | sed -e s/-O2// | sed -e s/-O//`
>+-CFLAGS_NOOPT=`echo $CFLAGS | sed -e s/-O.//g | sed -e s/-O//g`
> +CFLAGS_NOOPT=`echo $CFLAGS | sed -e s/-O[0-9]*//g`
>  
>  cp $ac_confdir/Makefile.dynamic.in $ac_confdir/Makefile.in
>diff -ruN --exclude=CVS /usr/ports/print/fontforge/files/patch-gutils-gimagereadpng.c /kirby/shared/ports/fontforge/files/patch-gutils-gimagereadpng.c
>--- /usr/ports/print/fontforge/files/patch-gutils-gimagereadpng.c	2010-03-29 04:08:39.000000000 -0400
>+++ /kirby/shared/ports/fontforge/files/patch-gutils-gimagereadpng.c	1969-12-31 19:00:00.000000000 -0500
>@@ -1,21 +0,0 @@
>---- gutils/gimagereadpng.c.orig	2009-02-22 18:26:06.000000000 +0100
>-+++ gutils/gimagereadpng.c	2010-03-29 09:15:26.000000000 +0200
>-@@ -220,13 +220,13 @@
>-     if ( (info_ptr->valid&PNG_INFO_tRNS) && info_ptr->num_trans>0 ) {
>- 	if ( info_ptr->color_type==PNG_COLOR_TYPE_RGB || info_ptr->color_type==PNG_COLOR_TYPE_RGB_ALPHA )
>- 	    base->trans = COLOR_CREATE(
>--		    (info_ptr->trans_values.red>>8),
>--		    (info_ptr->trans_values.green>>8),
>--		    (info_ptr->trans_values.blue>>8));
>-+		    (info_ptr->trans_color.red>>8),
>-+		    (info_ptr->trans_color.green>>8),
>-+		    (info_ptr->trans_color.blue>>8));
>- 	else if ( base->image_type == it_mono )
>--	    base->trans = info_ptr->trans[0];
>-+	    base->trans = info_ptr->trans_alpha[0];
>- 	else
>--	    base->clut->trans_index = base->trans = info_ptr->trans[0];
>-+	    base->clut->trans_index = base->trans = info_ptr->trans_alpha[0];
>-     }
>- 
>-     row_pointers = galloc(info_ptr->height*sizeof(png_bytep));
>diff -ruN --exclude=CVS /usr/ports/print/fontforge/files/patch-gutils-gimagewritepng.c /kirby/shared/ports/fontforge/files/patch-gutils-gimagewritepng.c
>--- /usr/ports/print/fontforge/files/patch-gutils-gimagewritepng.c	2010-03-29 04:08:39.000000000 -0400
>+++ /kirby/shared/ports/fontforge/files/patch-gutils-gimagewritepng.c	1969-12-31 19:00:00.000000000 -0500
>@@ -1,65 +0,0 @@
>---- gutils/gimagewritepng.c.orig	2009-02-22 18:26:06.000000000 +0100
>-+++ gutils/gimagewritepng.c	2010-03-29 09:59:24.000000000 +0200
>-@@ -183,8 +183,8 @@
>-        if ( info_ptr->num_palette<=16 )
>- 	   _png_set_packing(png_ptr);
>-        if ( base->trans!=-1 ) {
>--	   info_ptr->trans = galloc(1);
>--	   info_ptr->trans[0] = base->trans;
>-+	   info_ptr->trans_alpha = galloc(1);
>-+	   info_ptr->trans_alpha[0] = base->trans;
>-        }
>-    } else {
>-        info_ptr->color_type = PNG_COLOR_TYPE_RGB;
>-@@ -192,9 +192,9 @@
>- 	   info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
>- 
>-        if ( base->trans!=-1 ) {
>--	   info_ptr->trans_values.red = COLOR_RED(base->trans);
>--	   info_ptr->trans_values.green = COLOR_GREEN(base->trans);
>--	   info_ptr->trans_values.blue = COLOR_BLUE(base->trans);
>-+	   info_ptr->trans_color.red = COLOR_RED(base->trans);
>-+	   info_ptr->trans_color.green = COLOR_GREEN(base->trans);
>-+	   info_ptr->trans_color.blue = COLOR_BLUE(base->trans);
>-        }
>-    }
>-    _png_write_info(png_ptr, info_ptr);
>-@@ -210,7 +210,7 @@
>- 
>-     _png_write_end(png_ptr, info_ptr);
>- 
>--    if ( info_ptr->trans!=NULL ) gfree(info_ptr->trans);
>-+    if ( info_ptr->trans_alpha!=NULL ) gfree(info_ptr->trans_alpha);
>-     if ( info_ptr->palette!=NULL ) gfree(info_ptr->palette);
>-     _png_destroy_write_struct(&png_ptr, &info_ptr);
>-     gfree(rows);
>-@@ -314,15 +314,15 @@
>-        if ( info_ptr->num_palette<=16 )
>- 	   png_set_packing(png_ptr);
>-        if ( base->trans!=-1 ) {
>--	   info_ptr->trans = galloc(1);
>--	   info_ptr->trans[0] = base->trans;
>-+	   info_ptr->trans_alpha = galloc(1);
>-+	   info_ptr->trans_alpha[0] = base->trans;
>-        }
>-    } else {
>-        info_ptr->color_type = PNG_COLOR_TYPE_RGB;
>-        if ( base->trans!=-1 ) {
>--	   info_ptr->trans_values.red = COLOR_RED(base->trans);
>--	   info_ptr->trans_values.green = COLOR_GREEN(base->trans);
>--	   info_ptr->trans_values.blue = COLOR_BLUE(base->trans);
>-+	   info_ptr->trans_color.red = COLOR_RED(base->trans);
>-+	   info_ptr->trans_color.green = COLOR_GREEN(base->trans);
>-+	   info_ptr->trans_color.blue = COLOR_BLUE(base->trans);
>-        }
>-    }
>-    png_write_info(png_ptr, info_ptr);
>-@@ -338,7 +338,7 @@
>- 
>-     png_write_end(png_ptr, info_ptr);
>- 
>--    if ( info_ptr->trans!=NULL ) gfree(info_ptr->trans);
>-+    if ( info_ptr->trans_alpha!=NULL ) gfree(info_ptr->trans_alpha);
>-     if ( info_ptr->palette!=NULL ) gfree(info_ptr->palette);
>-     png_destroy_write_struct(&png_ptr, &info_ptr);
>-     gfree(rows);
>diff -ruN --exclude=CVS /usr/ports/print/fontforge/pkg-plist /kirby/shared/ports/fontforge/pkg-plist
>--- /usr/ports/print/fontforge/pkg-plist	2009-09-25 15:14:57.000000000 -0400
>+++ /kirby/shared/ports/fontforge/pkg-plist	2010-05-01 20:53:48.000000000 -0400
>@@ -4,6 +4,7 @@
> bin/sfddiff
> include/fontforge/PfEd.h
> include/fontforge/autowidth.h
>+include/fontforge/autowidth2.h
> include/fontforge/baseviews.h
> include/fontforge/basics.h
> include/fontforge/bezctx_ff.h
>@@ -181,6 +182,8 @@
> %%PORTDOCS%%%%DOCSDIR%%/GenerateTTC.png
> %%PORTDOCS%%%%DOCSDIR%%/GlossaryFS.html
> %%PORTDOCS%%%%DOCSDIR%%/GlossaryFrame.html
>+%%PORTDOCS%%%%DOCSDIR%%/GlyphSep-To.png
>+%%PORTDOCS%%%%DOCSDIR%%/GlyphSep-rectangles.png
> %%PORTDOCS%%%%DOCSDIR%%/GradientDlg.png
> %%PORTDOCS%%%%DOCSDIR%%/GridFit.png
> %%PORTDOCS%%%%DOCSDIR%%/GridFitM.png
>@@ -254,22 +257,15 @@
> %%PORTDOCS%%%%DOCSDIR%%/Shades4.png
> %%PORTDOCS%%%%DOCSDIR%%/ShadowWireframe.png
> %%PORTDOCS%%%%DOCSDIR%%/ShowGridFit.png
>+%%PORTDOCS%%%%DOCSDIR%%/Sigma13x16.png
>+%%PORTDOCS%%%%DOCSDIR%%/Sigma28x33.png
>+%%PORTDOCS%%%%DOCSDIR%%/Sigma54x64.png
> %%PORTDOCS%%%%DOCSDIR%%/SmallcapsDlg.png
> %%PORTDOCS%%%%DOCSDIR%%/Spacem_1.png
> %%PORTDOCS%%%%DOCSDIR%%/Spacem_2.png
>-%%PORTDOCS%%%%DOCSDIR%%/Sti.png
>-%%PORTDOCS%%%%DOCSDIR%%/Sti2.png
>-%%PORTDOCS%%%%DOCSDIR%%/Sti3.png
>-%%PORTDOCS%%%%DOCSDIR%%/Sti4.png
>-%%PORTDOCS%%%%DOCSDIR%%/Sti5.png
>-%%PORTDOCS%%%%DOCSDIR%%/Sti6.png
> %%PORTDOCS%%%%DOCSDIR%%/Styles.html
> %%PORTDOCS%%%%DOCSDIR%%/SubSuperDlg.png
> %%PORTDOCS%%%%DOCSDIR%%/SuggestDeltas.html
>-%%PORTDOCS%%%%DOCSDIR%%/Sxi.png
>-%%PORTDOCS%%%%DOCSDIR%%/Sxiti.png
>-%%PORTDOCS%%%%DOCSDIR%%/Sxiti2.png
>-%%PORTDOCS%%%%DOCSDIR%%/Sxiti3.png
> %%PORTDOCS%%%%DOCSDIR%%/TTCvt.png
> %%PORTDOCS%%%%DOCSDIR%%/TTPoints.png
> %%PORTDOCS%%%%DOCSDIR%%/TTRaster.png
>@@ -317,11 +313,9 @@
> %%PORTDOCS%%%%DOCSDIR%%/asm2.png
> %%PORTDOCS%%%%DOCSDIR%%/asm3.png
> %%PORTDOCS%%%%DOCSDIR%%/asm4.png
>-%%PORTDOCS%%%%DOCSDIR%%/autokern.png
> %%PORTDOCS%%%%DOCSDIR%%/autotrace.html
> %%PORTDOCS%%%%DOCSDIR%%/autowidth.html
> %%PORTDOCS%%%%DOCSDIR%%/autowidth.png
>-%%PORTDOCS%%%%DOCSDIR%%/autowidthmenu.png
> %%PORTDOCS%%%%DOCSDIR%%/baseline.html
> %%PORTDOCS%%%%DOCSDIR%%/bdfinfo.html
> %%PORTDOCS%%%%DOCSDIR%%/bdfinfo.png
>@@ -363,12 +357,10 @@
> %%PORTDOCS%%%%DOCSDIR%%/contextchain-class.png
> %%PORTDOCS%%%%DOCSDIR%%/contextchain-classlist.png
> %%PORTDOCS%%%%DOCSDIR%%/contextchain-coverage.png
>-%%PORTDOCS%%%%DOCSDIR%%/contextchain-cselect.png
> %%PORTDOCS%%%%DOCSDIR%%/contextchain-format.png
> %%PORTDOCS%%%%DOCSDIR%%/contextchain-glyphlists.png
> %%PORTDOCS%%%%DOCSDIR%%/contextchain-pickglyph.png
> %%PORTDOCS%%%%DOCSDIR%%/contextchain-rcover.png
>-%%PORTDOCS%%%%DOCSDIR%%/contextchain-seqlookup.png
> %%PORTDOCS%%%%DOCSDIR%%/contextchain.html
> %%PORTDOCS%%%%DOCSDIR%%/copyfeatures.png
> %%PORTDOCS%%%%DOCSDIR%%/corpchar.html
>@@ -406,6 +398,8 @@
> %%PORTDOCS%%%%DOCSDIR%%/cvt-to-mac.png
> %%PORTDOCS%%%%DOCSDIR%%/cvtangenticon.png
> %%PORTDOCS%%%%DOCSDIR%%/definegroups.png
>+%%PORTDOCS%%%%DOCSDIR%%/delta0.png
>+%%PORTDOCS%%%%DOCSDIR%%/delta1.png
> %%PORTDOCS%%%%DOCSDIR%%/devaBaseline.png
> %%PORTDOCS%%%%DOCSDIR%%/devaHangBaseline.png
> %%PORTDOCS%%%%DOCSDIR%%/devaLatinBaseline.png
>@@ -505,6 +499,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/fontinfo-ttfname.png
> %%PORTDOCS%%%%DOCSDIR%%/fontinfo-ttfvals.png
> %%PORTDOCS%%%%DOCSDIR%%/fontinfo-unicode.png
>+%%PORTDOCS%%%%DOCSDIR%%/fontinfo-woff.png
> %%PORTDOCS%%%%DOCSDIR%%/fontinfo.html
> %%PORTDOCS%%%%DOCSDIR%%/fontinfo.png
> %%PORTDOCS%%%%DOCSDIR%%/fontlint.html
>@@ -586,8 +581,8 @@
> %%PORTDOCS%%%%DOCSDIR%%/kern-We-12.png
> %%PORTDOCS%%%%DOCSDIR%%/kern-We-150.png
> %%PORTDOCS%%%%DOCSDIR%%/kernbyclasses.png
>-%%PORTDOCS%%%%DOCSDIR%%/kerningclass-kern.png
> %%PORTDOCS%%%%DOCSDIR%%/kerningclass.png
>+%%PORTDOCS%%%%DOCSDIR%%/kerningformat.png
> %%PORTDOCS%%%%DOCSDIR%%/kernpairclose.png
> %%PORTDOCS%%%%DOCSDIR%%/kernpairs.html
> %%PORTDOCS%%%%DOCSDIR%%/l1.png
>@@ -613,7 +608,6 @@
> %%PORTDOCS%%%%DOCSDIR%%/lookup-metadata.png
> %%PORTDOCS%%%%DOCSDIR%%/lookups.html
> %%PORTDOCS%%%%DOCSDIR%%/lparen-108.png
>-%%PORTDOCS%%%%DOCSDIR%%/lparen-174.png
> %%PORTDOCS%%%%DOCSDIR%%/mac-install.html
> %%PORTDOCS%%%%DOCSDIR%%/mItalic.png
> %%PORTDOCS%%%%DOCSDIR%%/macFeatureSetting.png
>@@ -622,7 +616,6 @@
> %%PORTDOCS%%%%DOCSDIR%%/mad.html
> %%PORTDOCS%%%%DOCSDIR%%/manual-ja-hover.png
> %%PORTDOCS%%%%DOCSDIR%%/manual-ja.png
>-%%PORTDOCS%%%%DOCSDIR%%/markclass.png
> %%PORTDOCS%%%%DOCSDIR%%/math.html
> %%PORTDOCS%%%%DOCSDIR%%/menu_down.png
> %%PORTDOCS%%%%DOCSDIR%%/mergepost.png
>@@ -665,7 +658,6 @@
> %%PORTDOCS%%%%DOCSDIR%%/ott2.png
> %%PORTDOCS%%%%DOCSDIR%%/ott2_5.png
> %%PORTDOCS%%%%DOCSDIR%%/ott3.png
>-%%PORTDOCS%%%%DOCSDIR%%/ott4.png
> %%PORTDOCS%%%%DOCSDIR%%/ott5.png
> %%PORTDOCS%%%%DOCSDIR%%/outlinechar.png
> %%PORTDOCS%%%%DOCSDIR%%/overlappedlines.png
>@@ -719,7 +711,6 @@
> %%PORTDOCS%%%%DOCSDIR%%/retagfeature.png
> %%PORTDOCS%%%%DOCSDIR%%/rgetinfo.png
> %%PORTDOCS%%%%DOCSDIR%%/rparen-108.png
>-%%PORTDOCS%%%%DOCSDIR%%/rparen-174.png
> %%PORTDOCS%%%%DOCSDIR%%/rplprocess.png
> %%PORTDOCS%%%%DOCSDIR%%/rplref.png
> %%PORTDOCS%%%%DOCSDIR%%/rplsansserifs.png
>@@ -758,7 +749,6 @@
> %%PORTDOCS%%%%DOCSDIR%%/splinefont.html
> %%PORTDOCS%%%%DOCSDIR%%/splines.gif
> %%PORTDOCS%%%%DOCSDIR%%/src.html
>-%%PORTDOCS%%%%DOCSDIR%%/statemachine-class.png
> %%PORTDOCS%%%%DOCSDIR%%/statemachine-context.png
> %%PORTDOCS%%%%DOCSDIR%%/statemachine-indic.png
> %%PORTDOCS%%%%DOCSDIR%%/statemachine-insert.png

Actions: View | Diff

Attachments on bug 146226: 105713