Changes 20081224:

* Check for a buggy system on Apple 10.5 with X11.
* Fix more memory problems in Merge Fonts.
* If a font were missing a .notdef glyph. If the user tried to display
  a font sample of text which included a character not in the font.
  Then (after the recent patches for grid-fit metrics in Print dlg)
  fontforge would crash.
* Fix a bug in old cubic to quadratic conversion.
* Lots of changes to extrema code.
* Initializing the font info dialog crashed on the mac when -O2 was
  specified during configure (the default situation).
* After adding an Apply button the Transform dlg would crash if invoked
  in a glyph with no undoes.

3 files changed, 8 insertions, 29 deletions

diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile
index 59a86880b6b..e3343367dfe 100644
--- a/fonts/fontforge/Makefile
+++ b/fonts/fontforge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2008/12/16 08:56:18 adam Exp $
+# $NetBSD: Makefile,v 1.56 2009/01/03 19:45:29 adam Exp $
 
 DISTNAME=	fontforge_full-${VERSION}
 PKGNAME=	fontforge-${VERSION}
@@ -10,7 +10,7 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://fontforge.sourceforge.net/
 COMMENT=	Postscript font editor
 
-VERSION=	20081215
+VERSION=	20081224
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo
index 8ac54f5b177..ed7e3734dec 100644
--- a/fonts/fontforge/distinfo
+++ b/fonts/fontforge/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.46 2008/12/16 08:56:18 adam Exp $
+$NetBSD: distinfo,v 1.47 2009/01/03 19:45:29 adam Exp $
 
-SHA1 (fontforge_full-20081215.tar.bz2) = 96b03ce3277ee2d219c119d54ec45023c590079c
-RMD160 (fontforge_full-20081215.tar.bz2) = bf1c2048521d95c0552e3eadcebe36daa0914fdb
-Size (fontforge_full-20081215.tar.bz2) = 5188193 bytes
+SHA1 (fontforge_full-20081224.tar.bz2) = be6863a96cadaae419a14fb055b7e6b5cb20af9e
+RMD160 (fontforge_full-20081224.tar.bz2) = c62db87e24e709734dff1b45c97c9b43b27c2e15
+Size (fontforge_full-20081224.tar.bz2) = 5236663 bytes
 SHA1 (patch-aa) = bb06cfc2ba3a6310a1d423166613140def0a06ea
 SHA1 (patch-ab) = ec93a47051186bcb901fd145edffad7c457c33fd
-SHA1 (patch-ae) = 2eef8b3678c3eb750c005d06e81306757812f3b4
+SHA1 (patch-ae) = 64a289cc5b921d54a6785e71338de45737b8a01c
 SHA1 (patch-af) = b71942feaf59b69d02782679219dd694e1054b3d
diff --git a/fonts/fontforge/patches/patch-ae b/fonts/fontforge/patches/patch-ae
index 1d803d28efd..521f998d089 100644
--- a/fonts/fontforge/patches/patch-ae
+++ b/fonts/fontforge/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.18 2008/12/16 08:56:18 adam Exp $
+$NetBSD: patch-ae,v 1.19 2009/01/03 19:45:29 adam Exp $
 
 --- configure.orig	2008-12-15 20:38:07.000000000 +0100
 +++ configure
@@ -31,27 +31,6 @@ $NetBSD: patch-ae,v 1.18 2008/12/16 08:56:18 adam Exp $
  else
    cat >>confdefs.h <<\_ACEOF
  #define _NO_LIBXML 1
-@@ -24103,9 +24103,9 @@ else
-   :
- fi
- 
--  if test "$pan_headers" != "" >& /dev/null ; then
-+  if test "$pan_headers" != "" 2> /dev/null ; then
-     gww_haspango="done"
--  elif pkg-config --libs pangoxft >& /dev/null ; then
-+  elif pkg-config --libs pangoxft 2> /dev/null ; then
-     gww_CFLAGS="$CFLAGS"
-     CFLAGS="$CFLAGS $X_CFLAGS"
-     { echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
-@@ -24173,7 +24173,7 @@ if test "$gww_haspango" = "yes" ; then
-  CFLAGS="$CFLAGS `pkg-config --cflags pangoxft`"
- fi
- if test "$gww_haspango" = "yes" -a "$gww_hascairo" = "yes" ; then
--  if pkg-config --libs pangocairo >& /dev/null ; then
-+  if pkg-config --libs pangocairo 2> /dev/null ; then
-     gww_haspangocairo="yes"
-     CFLAGS="$CFLAGS `pkg-config --cflags pangocairo`"
-   fi
 @@ -26606,7 +26606,7 @@ if test "$gww_has_gettext" = "yes" >/dev
  
   cat </dev/null >$ac_confdir/po/Makefile.in