Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20814
Modified Files:
fontforge-10.5.info fontforge.info fontforge.patch
Log Message:
New upstream version.
Index: fontforge.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/fontforge.info,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- fontforge.info 21 Dec 2008 18:33:55 -0000 1.44
+++ fontforge.info 27 Dec 2008 23:24:57 -0000 1.45
@@ -1,6 +1,6 @@
Info2: <<
Package: fontforge
-Version: 20081215
+Version: 20081224
Revision: 1
Type: python (2.3)
Distribution: 10.4
@@ -33,17 +33,15 @@
Reenabled building shared libs; put them into %p/lib/%n.
Now installs a .app wrapper bundle at %p/Applications/FontForge.app
Install desktop and mime files for KDE and Gnome.
- Some change starting with 20081215 causes fontforge to crash when
optimized.
- Setting -O0 fixes this.
<<
Homepage: http://fontforge.sourceforge.net/
Maintainer: Daniel Johnson <[email protected]>
Source: mirror:sourceforge:%n/%n_full-%v.tar.bz2
-Source-MD5: fdbca231134755fd0cf20572d955855f
+Source-MD5: eb00467bff69b15a4137595c16cdbff5
SourceDirectory: %n-%v
Source2: mirror:sourceforge:%n/%n_htdocs-%v.tar.bz2
-Source2-MD5: f41861cdef84e282da5a765f644582e8
+Source2-MD5: 476b047dc6cdc36d79ac34da1c3fcb58
Source2ExtractDir: %n-%v/htdocs
Source3: http://fontforge.sourceforge.net/cidmaps.tgz
Source3-MD5: 063691163e592515b31514515bb3ce8c
@@ -102,7 +100,7 @@
DocFiles: AUTHORS INSTALL LICENSE README-Mac.html README-Unix.html VERSION
PatchFile: %n.patch
-PatchFile-MD5: 534fda7042fc6449ca56cbe034bc31fb
+PatchFile-MD5: 98a54081ec66fea534353f6d79bc5c97
PatchScript: <<
%{default_script}
#Use system's python to build the python extension.
@@ -119,7 +117,7 @@
SetMAKEFLAGS: -j1
NoSetCPPFLAGS: True
NoSetLDFLAGS: True
-SetCFLAGS: -O0 -I%p/include/libxml2 -I%p/lib/fontconfig2/include -I%p/include
+SetCFLAGS: -Os -I%p/include/libxml2 -I%p/lib/fontconfig2/include -I%p/include
SetCPPFLAGS: -I%p/lib/fontconfig2/include
SetLIBRARY_PATH: %p/lib/fontconfig2/lib:%p/lib:/usr/X11R6/lib
SetLDFLAGS: -L%p/lib/fontconfig2/lib -L%p/lib -L/usr/X11R6/lib
Index: fontforge-10.5.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/fontforge-10.5.info,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- fontforge-10.5.info 21 Dec 2008 18:33:55 -0000 1.17
+++ fontforge-10.5.info 27 Dec 2008 23:24:57 -0000 1.18
@@ -1,6 +1,6 @@
Info2: <<
Package: fontforge
-Version: 20081215
+Version: 20081224
Revision: 101
Type: python (2.5)
Distribution: 10.5
@@ -33,17 +33,15 @@
Reenabled building shared libs; put them into %p/lib/%n.
Now installs a .app wrapper bundle at %p/Applications/FontForge.app
Install desktop and mime files for KDE and Gnome.
- Some change starting with 20081215 causes fontforge to crash when
optimized.
- Setting -O0 fixes this.
<<
Homepage: http://fontforge.sourceforge.net/
Maintainer: Daniel Johnson <[email protected]>
Source: mirror:sourceforge:%n/%n_full-%v.tar.bz2
-Source-MD5: fdbca231134755fd0cf20572d955855f
+Source-MD5: eb00467bff69b15a4137595c16cdbff5
SourceDirectory: %n-%v
Source2: mirror:sourceforge:%n/%n_htdocs-%v.tar.bz2
-Source2-MD5: f41861cdef84e282da5a765f644582e8
+Source2-MD5: 476b047dc6cdc36d79ac34da1c3fcb58
Source2ExtractDir: %n-%v/htdocs
Source3: http://fontforge.sourceforge.net/cidmaps.tgz
Source3-MD5: 063691163e592515b31514515bb3ce8c
@@ -102,7 +100,7 @@
DocFiles: AUTHORS INSTALL LICENSE README-Mac.html README-Unix.html VERSION
PatchFile: %n.patch
-PatchFile-MD5: 534fda7042fc6449ca56cbe034bc31fb
+PatchFile-MD5: 98a54081ec66fea534353f6d79bc5c97
PatchScript: <<
%{default_script}
#Use system's python to build the python extension.
@@ -119,7 +117,7 @@
SetMAKEFLAGS: -j1
NoSetCPPFLAGS: True
NoSetLDFLAGS: True
-SetCFLAGS: -O0 -I%p/include/libxml2 -I%p/lib/fontconfig2/include -I%p/include
+SetCFLAGS: -Os -I%p/include/libxml2 -I%p/lib/fontconfig2/include -I%p/include
SetCPPFLAGS: -I%p/lib/fontconfig2/include
SetLIBRARY_PATH: %p/lib/fontconfig2/lib:%p/lib:/usr/X11R6/lib
SetLDFLAGS: -L%p/lib/fontconfig2/lib -L%p/lib -L/usr/X11R6/lib
Index: fontforge.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/fontforge.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- fontforge.patch 17 Dec 2008 01:46:16 -0000 1.22
+++ fontforge.patch 27 Dec 2008 23:24:57 -0000 1.23
@@ -30,27 +30,13 @@
cjk.lo memory.lo ucharmap.lo unialt.lo ustring.lo utype.lo \
usprintf.lo gwwiconv.lo
--Incs = -I$(top_srcdir)/inc -I/usr/pkg/include -I/usr/pkg/include/giflib
+-Incs = -I$(top_srcdir)/inc -I../inc -I/usr/pkg/include
-I/usr/pkg/include/giflib
-CFLAGS = @CFLAGS@ @CPPFLAGS@ $(Incs) @WFLAGS@ @DEFS@
-+Incs = -I$(top_srcdir)/inc
++Incs = -I$(top_srcdir)/inc -I../inc
+CFLAGS = $(Incs) @CFLAGS@ @CPPFLAGS@ @WFLAGS@ @DEFS@
../libgunicode.la: $(libgunicode_OBJECTS)
$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -no-undefined @LDFLAGS@ -o
../libgunicode.la $(libgunicode_OBJECTS) \
-diff -ru fontforge-20081215.orig/Unicode/Makefile.static.in
fontforge-20081215/Unicode/Makefile.static.in
---- fontforge-20081215.orig/Unicode/Makefile.static.in 2007-12-09
15:37:16.000000000 -0500
-+++ fontforge-20081215/Unicode/Makefile.static.in 2008-12-16
20:36:02.000000000 -0500
-@@ -12,8 +12,8 @@
- libgunicode_OBJECTS = ArabicForms.o alphabet.o backtrns.o char.o \
- cjk.o memory.o ucharmap.o unialt.o ustring.o utype.o usprintf.o gwwiconv.o
-
--Incs = -I$(top_srcdir)/inc -I/usr/pkg/include -I/usr/pkg/include/giflib
--CFLAGS = @CFLAGS@ @CPPFLAGS@ $(Incs) @WFLAGS@ @DEFS@
-+Incs = -I$(top_srcdir)/inc
-+CFLAGS = $(Incs) @CFLAGS@ @CPPFLAGS@ @WFLAGS@ @DEFS@
-
- all: ../libs/libgunicode.a
-
diff -ru fontforge-20081215.orig/configure fontforge-20081215/configure
--- fontforge-20081215.orig/configure 2008-12-15 14:38:07.000000000 -0500
+++ fontforge-20081215/configure 2008-12-16 20:36:50.000000000 -0500
@@ -101,7 +87,6 @@
else
cat >>confdefs.h <<\_ACEOF
#define _NO_LIBXML 1
-Only in fontforge-20081215: configure.orig
diff -ru fontforge-20081215.orig/fontforge/Makefile.dynamic.in
fontforge-20081215/fontforge/Makefile.dynamic.in
--- fontforge-20081215.orig/fontforge/Makefile.dynamic.in 2008-11-15
00:36:26.000000000 -0500
+++ fontforge-20081215/fontforge/Makefile.dynamic.in 2008-12-16
20:36:02.000000000 -0500
@@ -142,9 +127,9 @@
gtextfield.lo gtextinfo.lo gwidgets.lo gxdraw.lo gxcdraw.lo \
ghvbox.lo gmatrixedit.lo gdrawable.lo gspacer.lo xkeysyms_unicode.lo
--Incs = -I$(top_srcdir)/inc -I/usr/pkg/include -I/usr/pkg/include/giflib
+-Incs = -I$(top_srcdir)/inc -I../inc -I/usr/pkg/include
-I/usr/pkg/include/giflib
-CFLAGS = @CFLAGS@ @CPPFLAGS@ $(Incs) @WFLAGS@ $(X_CFLAGS) -DNOTHREADS @DEFS@
-DLIBDIR='"$(libdir)"'
-+Incs = -I$(top_srcdir)/inc
++Incs = -I$(top_srcdir)/inc -I../inc
+CFLAGS = $(Incs) @CFLAGS@ @CPPFLAGS@ @WFLAGS@ $(X_CFLAGS) -DNOTHREADS @DEFS@
-DLIBDIR='"$(libdir)"'
../libgdraw.la: $(libgdraw_OBJECTS)
@@ -154,33 +139,6 @@
$(STATIC_LIBS) $(X_LIBS) $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) \
-rpath $(libdir) -version-info
$(GD_VERSION):$(GD_REVISION):$(GD_AGE)
-diff -ru fontforge-20081215.orig/gdraw/Makefile.static.in
fontforge-20081215/gdraw/Makefile.static.in
---- fontforge-20081215.orig/gdraw/Makefile.static.in 2008-12-02
11:13:10.000000000 -0500
-+++ fontforge-20081215/gdraw/Makefile.static.in 2008-12-16
20:36:02.000000000 -0500
-@@ -24,8 +24,8 @@
- gtextfield.o gtextinfo.o gwidgets.o gxdraw.o gxcdraw.o \
- ghvbox.o gmatrixedit.o gdrawable.o gspacer.o xkeysyms_unicode.o
-
--Incs = -I$(top_srcdir)/inc -I/usr/pkg/include -I/usr/pkg/include/giflib
--CFLAGS = @CFLAGS@ @CPPFLAGS@ $(Incs) @WFLAGS@ $(X_CFLAGS) -DNOTHREADS @DEFS@
-DLIBDIR='"$(libdir)"'
-+Incs = -I$(top_srcdir)/inc
-+CFLAGS = $(Incs) @CFLAGS@ @CPPFLAGS@ @WFLAGS@ $(X_CFLAGS) -DNOTHREADS @DEFS@
-DLIBDIR='"$(libdir)"'
-
- all: ../libs/libgdraw.a
-
-diff -ru fontforge-20081215.orig/gdraw/gxcdraw.c
fontforge-20081215/gdraw/gxcdraw.c
---- fontforge-20081215.orig/gdraw/gxcdraw.c 2008-11-17 11:19:44.000000000
-0500
-+++ fontforge-20081215/gdraw/gxcdraw.c 2008-12-16 20:36:02.000000000 -0500
-@@ -1785,6 +1785,9 @@
- # define _pango_font_map_create_context pango_font_map_create_context
- # define _pango_cairo_font_map_get_default pango_cairo_font_map_get_default
- # define _pango_cairo_context_set_resolution
_pango_cairo_context_set_resolution
-+# define _pango_cairo_show_glyph_string pango_cairo_show_glyph_string
-+# define _pango_cairo_font_map_create_context
pango_cairo_font_map_create_context
-+# define _pango_cairo_context_set_resolution
pango_cairo_context_set_resolution
- # endif
- # undef GTimer
- # if PANGO_VERSION_MINOR>=8
diff -ru fontforge-20081215.orig/gutils/Makefile.dynamic.in
fontforge-20081215/gutils/Makefile.dynamic.in
--- fontforge-20081215.orig/gutils/Makefile.dynamic.in 2008-11-15
00:36:26.000000000 -0500
+++ fontforge-20081215/gutils/Makefile.dynamic.in 2008-12-16
20:36:02.000000000 -0500
@@ -188,9 +146,9 @@
gio.lo giofile.lo giohosts.lo giomime.lo giothread.lo giotrans.lo
libgioftp_OBJECTS = gioftp.lo
--Incs = -I$(top_srcdir)/inc -I/usr/pkg/include -I/usr/pkg/include/giflib
+-Incs = -I$(top_srcdir)/inc -I../inc -I/usr/pkg/include
-I/usr/pkg/include/giflib
-CFLAGS = @CFLAGS@ @CPPFLAGS@ $(Incs) @WFLAGS@ $(X_CFLAGS) -DNOTHREADS @DEFS@
-DLIBDIR='"$(libdir)"'
-+Incs = -I$(top_srcdir)/inc
++Incs = -I$(top_srcdir)/inc -I../inc
+CFLAGS = $(Incs) @CFLAGS@ @CPPFLAGS@ @WFLAGS@ $(X_CFLAGS) -DNOTHREADS @DEFS@
-DLIBDIR='"$(libdir)"'
both: ../libgutils.la ../libgioftp.la
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
