Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12887
Modified Files:
fontforge-10.5.info fontforge.info fontforge.patch
Log Message:
New upstream version. Fixed pango support.
Index: fontforge.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/fontforge.info,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- fontforge.info 16 Nov 2008 23:24:58 -0000 1.40
+++ fontforge.info 18 Nov 2008 16:42:34 -0000 1.41
@@ -1,6 +1,6 @@
Info2: <<
Package: fontforge
-Version: 20081115
+Version: 20081117
Revision: 1
Type: python (2.3)
Distribution: 10.4
@@ -38,9 +38,9 @@
Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
Source: mirror:sourceforge:%n/%n_full-%v.tar.bz2
-Source-MD5: 6635efca04fa23e17b594004c5d9bcb7
+Source-MD5: 78ec31431ed9882d7a1337da3ad5691e
SourceDirectory: %n-%v
-Source2: mirror:sourceforge:%n/%n_htdocs-%v.tar.bz2
+Source2: mirror:sourceforge:%n/%n_htdocs-20081115.tar.bz2
Source2-MD5: 4e1e86943aade5010c63216c5e1846a0
Source2ExtractDir: %n-%v/htdocs
Source3: http://fontforge.sourceforge.net/cidmaps.tgz
@@ -55,16 +55,18 @@
fontconfig2-shlibs (>= 2.4.1-1),
freetype219-shlibs (>= 2.3.7-4),
giflib-shlibs,
+ glib2-shlibs (>= 2.18.0-1),
glitz-shlibs,
libgettext3-shlibs,
libiconv,
libjpeg-shlibs,
- libpng3-shlibs,
+ libpng3-shlibs (>= 1.2.5-4),
libspiro0-shlibs,
libtiff-shlibs,
libuninameslist1-shlibs,
libxml2-shlibs,
- pixman-shlibs,
+ pango1-xft2-ft219-shlibs (>= 1.22.0-4),
+ pixman-shlibs (>= 0.12.0-1),
shared-mime-info,
x11
<<
@@ -76,16 +78,19 @@
freetype219 (>= 2.3.7-4),
gettext-tools,
giflib,
+ glib2-dev (>= 2.18.0-1),
glitz,
libgettext3-dev,
libiconv-dev,
libjpeg,
- libpng3,
+ libpng3 (>= 1.2.5-4),
libspiro0,
libtiff,
libuninameslist1,
libxml2,
- pixman,
+ pango1-xft2-ft219-dev (>= 1.22.0-4),
+ pkgconfig (>= 0.23),
+ pixman (>= 0.12.0-1),
x11-dev
<<
Recommends: autotrace-bin | potrace
@@ -95,7 +100,7 @@
DocFiles: AUTHORS INSTALL LICENSE README-Mac.html README-Unix.html VERSION
PatchFile: %n.patch
-PatchFile-MD5: f402c6e653616437ddf63946d38ab482
+PatchFile-MD5: d88b87312685a9fc826c1e7faacd746d
PatchScript: <<
patch -p1 <%{PatchFile}
#Use system's python to build the python extension.
@@ -133,8 +138,7 @@
--enable-double\
--enable-pasteafter\
--enable-tilepath\
- --without-freetype-src\
- --without-pango
+ --without-freetype-src
<<
CompileScript: <<
#!/bin/bash -ev
Index: fontforge-10.5.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/fontforge-10.5.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- fontforge-10.5.info 16 Nov 2008 23:24:58 -0000 1.13
+++ fontforge-10.5.info 18 Nov 2008 16:42:34 -0000 1.14
@@ -1,6 +1,6 @@
Info2: <<
Package: fontforge
-Version: 20081115
+Version: 20081117
Revision: 101
Type: python (2.5)
Distribution: 10.5
@@ -38,9 +38,9 @@
Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
Source: mirror:sourceforge:%n/%n_full-%v.tar.bz2
-Source-MD5: 6635efca04fa23e17b594004c5d9bcb7
+Source-MD5: 78ec31431ed9882d7a1337da3ad5691e
SourceDirectory: %n-%v
-Source2: mirror:sourceforge:%n/%n_htdocs-%v.tar.bz2
+Source2: mirror:sourceforge:%n/%n_htdocs-20081115.tar.bz2
Source2-MD5: 4e1e86943aade5010c63216c5e1846a0
Source2ExtractDir: %n-%v/htdocs
Source3: http://fontforge.sourceforge.net/cidmaps.tgz
@@ -55,16 +55,18 @@
fontconfig2-shlibs (>= 2.4.1-1),
freetype219-shlibs (>= 2.3.7-4),
giflib-shlibs,
+ glib2-shlibs (>= 2.18.0-1),
glitz-shlibs,
libgettext3-shlibs,
libiconv,
libjpeg-shlibs,
- libpng3-shlibs,
+ libpng3-shlibs (>= 1.2.5-4),
libspiro0-shlibs,
libtiff-shlibs,
libuninameslist1-shlibs,
libxml2-shlibs,
- pixman-shlibs,
+ pango1-xft2-ft219-shlibs (>= 1.22.0-4),
+ pixman-shlibs (>= 0.12.0-1),
shared-mime-info,
x11
<<
@@ -76,16 +78,19 @@
freetype219 (>= 2.3.7-4),
gettext-tools,
giflib,
+ glib2-dev (>= 2.18.0-1),
glitz,
libgettext3-dev,
libiconv-dev,
libjpeg,
- libpng3,
+ libpng3 (>= 1.2.5-4),
libspiro0,
libtiff,
libuninameslist1,
libxml2,
- pixman,
+ pango1-xft2-ft219-dev (>= 1.22.0-4),
+ pkgconfig (>= 0.23),
+ pixman (>= 0.12.0-1),
x11-dev
<<
Recommends: autotrace-bin | potrace
@@ -95,7 +100,7 @@
DocFiles: AUTHORS INSTALL LICENSE README-Mac.html README-Unix.html VERSION
PatchFile: %n.patch
-PatchFile-MD5: f402c6e653616437ddf63946d38ab482
+PatchFile-MD5: d88b87312685a9fc826c1e7faacd746d
PatchScript: <<
patch -p1 <%{PatchFile}
#Use system's python to build the python extension.
@@ -133,8 +138,7 @@
--enable-double\
--enable-pasteafter\
--enable-tilepath\
- --without-freetype-src\
- --without-pango
+ --without-freetype-src
<<
CompileScript: <<
#!/bin/bash -ev
Index: fontforge.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/fontforge.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- fontforge.patch 16 Nov 2008 23:24:58 -0000 1.19
+++ fontforge.patch 18 Nov 2008 16:42:34 -0000 1.20
@@ -1,6 +1,6 @@
-diff -ru fontforge-20081115.orig/Makefile.dynamic.in
fontforge-20081115/Makefile.dynamic.in
---- fontforge-20081115.orig/Makefile.dynamic.in 2008-11-11
23:19:05.000000000 -0500
-+++ fontforge-20081115/Makefile.dynamic.in 2008-11-16 16:15:07.000000000
-0500
+diff -ru fontforge-20081117.orig/Makefile.dynamic.in
fontforge-20081117/Makefile.dynamic.in
+--- fontforge-20081117.orig/Makefile.dynamic.in 2008-11-11
23:19:05.000000000 -0500
++++ fontforge-20081117/Makefile.dynamic.in 2008-11-18 11:22:07.000000000
-0500
@@ -127,8 +127,8 @@
# You may need to be root to do the install
#explicit use of sh to make sure we don't invoke csh with different "if"
syntax
@@ -12,9 +12,9 @@
#we don't always create a setup.py
-(cd pyhook ; if test -r setup.py ; then python setup.py install
--prefix=$(prefix) --root=$(DESTDIR); for dir in * ; do if test -d $$dir -a
"$$dir" != "CVS" ; then rm -rf $$dir ; fi; done ; fi )
-diff -ru fontforge-20081115.orig/Packaging/fontforge.desktop
fontforge-20081115/Packaging/fontforge.desktop
---- fontforge-20081115.orig/Packaging/fontforge.desktop 2008-09-05
14:44:21.000000000 -0400
-+++ fontforge-20081115/Packaging/fontforge.desktop 2008-11-16
16:15:08.000000000 -0500
+diff -ru fontforge-20081117.orig/Packaging/fontforge.desktop
fontforge-20081117/Packaging/fontforge.desktop
+--- fontforge-20081117.orig/Packaging/fontforge.desktop 2008-09-05
14:44:21.000000000 -0400
++++ fontforge-20081117/Packaging/fontforge.desktop 2008-11-18
11:22:07.000000000 -0500
@@ -11,6 +11,5 @@
Icon=fontforge.png
Terminal=false
@@ -24,9 +24,9 @@
-MimeType=application/vnd.font-fontforge-sfd;application/x-font-ttf;application/x-font-type1;application/x-font-bdf;application/x-font-pcf;/x-font-tex;
+Categories=Graphics;
+MimeType=application/vnd.font-fontforge-sfd;application/x-font-ttf;application/x-font-type1;application/x-font-bdf;application/x-font-pcf;application/x-font-tex;
-diff -ru fontforge-20081115.orig/Unicode/Makefile.dynamic.in
fontforge-20081115/Unicode/Makefile.dynamic.in
---- fontforge-20081115.orig/Unicode/Makefile.dynamic.in 2008-10-27
23:02:33.000000000 -0400
-+++ fontforge-20081115/Unicode/Makefile.dynamic.in 2008-11-16
16:15:08.000000000 -0500
+diff -ru fontforge-20081117.orig/Unicode/Makefile.dynamic.in
fontforge-20081117/Unicode/Makefile.dynamic.in
+--- fontforge-20081117.orig/Unicode/Makefile.dynamic.in 2008-10-27
23:02:33.000000000 -0400
++++ fontforge-20081117/Unicode/Makefile.dynamic.in 2008-11-18
11:22:07.000000000 -0500
@@ -18,8 +18,8 @@
cjk.lo memory.lo ucharmap.lo unialt.lo ustring.lo utype.lo \
usprintf.lo gwwiconv.lo
@@ -38,9 +38,9 @@
../libgunicode.la: $(libgunicode_OBJECTS)
$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -no-undefined @LDFLAGS@ -o
../libgunicode.la $(libgunicode_OBJECTS) \
-diff -ru fontforge-20081115.orig/Unicode/Makefile.static.in
fontforge-20081115/Unicode/Makefile.static.in
---- fontforge-20081115.orig/Unicode/Makefile.static.in 2007-12-09
15:37:16.000000000 -0500
-+++ fontforge-20081115/Unicode/Makefile.static.in 2008-11-16
16:15:08.000000000 -0500
+diff -ru fontforge-20081117.orig/Unicode/Makefile.static.in
fontforge-20081117/Unicode/Makefile.static.in
+--- fontforge-20081117.orig/Unicode/Makefile.static.in 2007-12-09
15:37:16.000000000 -0500
++++ fontforge-20081117/Unicode/Makefile.static.in 2008-11-18
11:22:07.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
@@ -52,9 +52,9 @@
all: ../libs/libgunicode.a
-diff -ru fontforge-20081115.orig/configure fontforge-20081115/configure
---- fontforge-20081115.orig/configure 2008-11-15 09:16:49.000000000 -0500
-+++ fontforge-20081115/configure 2008-11-16 16:19:53.000000000 -0500
+diff -ru fontforge-20081117.orig/configure fontforge-20081117/configure
+--- fontforge-20081117.orig/configure 2008-11-15 09:16:49.000000000 -0500
++++ fontforge-20081117/configure 2008-11-18 11:22:07.000000000 -0500
@@ -4943,7 +4943,7 @@
@@ -112,9 +112,9 @@
else
cat >>confdefs.h <<\_ACEOF
#define _NO_LIBXML 1
-diff -ru fontforge-20081115.orig/fontforge/Makefile.dynamic.in
fontforge-20081115/fontforge/Makefile.dynamic.in
---- fontforge-20081115.orig/fontforge/Makefile.dynamic.in 2008-11-15
00:36:26.000000000 -0500
-+++ fontforge-20081115/fontforge/Makefile.dynamic.in 2008-11-16
17:28:33.000000000 -0500
+diff -ru fontforge-20081117.orig/fontforge/Makefile.dynamic.in
fontforge-20081117/fontforge/Makefile.dynamic.in
+--- fontforge-20081117.orig/fontforge/Makefile.dynamic.in 2008-11-15
00:36:26.000000000 -0500
++++ fontforge-20081117/fontforge/Makefile.dynamic.in 2008-11-18
11:22:07.000000000 -0500
@@ -66,12 +66,12 @@
#I used to include -L/usr/lib explicitly after static_libs. Not sure why.
Should be implied & breaks 64bit compiles
@@ -134,9 +134,9 @@
all: @FINAL_TARGET@ @MACAPP@ sfddiff fontimage fontlint
-diff -ru fontforge-20081115.orig/fontforge/start.c
fontforge-20081115/fontforge/start.c
---- fontforge-20081115.orig/fontforge/start.c 2008-02-04 08:56:47.000000000
-0500
-+++ fontforge-20081115/fontforge/start.c 2008-11-16 16:15:08.000000000
-0500
+diff -ru fontforge-20081117.orig/fontforge/start.c
fontforge-20081117/fontforge/start.c
+--- fontforge-20081117.orig/fontforge/start.c 2008-02-04 08:56:47.000000000
-0500
++++ fontforge-20081117/fontforge/start.c 2008-11-18 11:22:07.000000000
-0500
@@ -125,7 +125,6 @@
/* install image libs. For some reason fink installs in a place */
/* the dynamic loader doesn't find */
@@ -145,9 +145,9 @@
#endif
}
-diff -ru fontforge-20081115.orig/gdraw/Makefile.dynamic.in
fontforge-20081115/gdraw/Makefile.dynamic.in
---- fontforge-20081115.orig/gdraw/Makefile.dynamic.in 2008-11-01
09:39:39.000000000 -0400
-+++ fontforge-20081115/gdraw/Makefile.dynamic.in 2008-11-16
17:26:36.000000000 -0500
+diff -ru fontforge-20081117.orig/gdraw/Makefile.dynamic.in
fontforge-20081117/gdraw/Makefile.dynamic.in
+--- fontforge-20081117.orig/gdraw/Makefile.dynamic.in 2008-11-01
09:39:39.000000000 -0400
++++ fontforge-20081117/gdraw/Makefile.dynamic.in 2008-11-18
11:22:07.000000000 -0500
@@ -34,12 +34,12 @@
gtextfield.lo gtextinfo.lo gwidgets.lo gxdraw.lo gxcdraw.lo \
ghvbox.lo gmatrixedit.lo gdrawable.lo gspacer.lo xkeysyms_unicode.lo
@@ -164,9 +164,9 @@
$(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-20081115.orig/gdraw/Makefile.static.in
fontforge-20081115/gdraw/Makefile.static.in
---- fontforge-20081115.orig/gdraw/Makefile.static.in 2008-10-13
21:41:11.000000000 -0400
-+++ fontforge-20081115/gdraw/Makefile.static.in 2008-11-16
16:15:08.000000000 -0500
+diff -ru fontforge-20081117.orig/gdraw/Makefile.static.in
fontforge-20081117/gdraw/Makefile.static.in
+--- fontforge-20081117.orig/gdraw/Makefile.static.in 2008-10-13
21:41:11.000000000 -0400
++++ fontforge-20081117/gdraw/Makefile.static.in 2008-11-18
11:22:07.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
@@ -178,9 +178,22 @@
all: ../libs/libgdraw.a
-diff -ru fontforge-20081115.orig/gutils/Makefile.dynamic.in
fontforge-20081115/gutils/Makefile.dynamic.in
---- fontforge-20081115.orig/gutils/Makefile.dynamic.in 2008-11-15
00:36:26.000000000 -0500
-+++ fontforge-20081115/gutils/Makefile.dynamic.in 2008-11-16
16:15:08.000000000 -0500
+diff -ru fontforge-20081117.orig/gdraw/gxcdraw.c
fontforge-20081117/gdraw/gxcdraw.c
+--- fontforge-20081117.orig/gdraw/gxcdraw.c 2008-11-17 11:19:44.000000000
-0500
++++ fontforge-20081117/gdraw/gxcdraw.c 2008-11-18 11:24:26.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-20081117.orig/gutils/Makefile.dynamic.in
fontforge-20081117/gutils/Makefile.dynamic.in
+--- fontforge-20081117.orig/gutils/Makefile.dynamic.in 2008-11-15
00:36:26.000000000 -0500
++++ fontforge-20081117/gutils/Makefile.dynamic.in 2008-11-18
11:22:07.000000000 -0500
@@ -35,21 +35,19 @@
gio.lo giofile.lo giohosts.lo giomime.lo giothread.lo giotrans.lo
libgioftp_OBJECTS = gioftp.lo
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
