Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory sc8-pr-cvs17:/tmp/cvs-serv11363/main/finkinfo/x11

Modified Files:
      Tag: pangocairo-branch
        fontconfig2-dev.info fontconfig2-dev.patch gerbv-gtk2.info 
        gpsdrive.info hotbabe.info mlterm.info 
        openoffice.org-nocrypto.info pcb.info wxgtk.info wxgtk2.8.info 
        xpad.info xscreensaver.info 
Log Message:
more fixups, new fontconfig2

Index: fontconfig2-dev.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/fontconfig2-dev.patch,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- fontconfig2-dev.patch       7 Aug 2006 19:11:26 -0000       1.4
+++ fontconfig2-dev.patch       28 Sep 2007 16:15:28 -0000      1.4.2.1
@@ -1,701 +1,48 @@
-diff -uNr fontconfig-2.3.2/src/Makefile.am fontconfig-2.3.2-new/src/Makefile.am
---- fontconfig-2.3.2/src/Makefile.am   2004-12-05 00:49:20.000000000 -0500
-+++ fontconfig-2.3.2-new/src/Makefile.am       2006-08-05 19:47:47.000000000 
-0400
-@@ -86,6 +86,7 @@
-       fcdefault.c \
-       fcdir.c \
-       fcfreetype.c \
-+      fcftglue.c \
-       fcfs.c \
-       fcinit.c \
-       fclang.c \
-diff -uNr fontconfig-2.3.2/src/Makefile.in fontconfig-2.3.2-new/src/Makefile.in
---- fontconfig-2.3.2/src/Makefile.in   2005-04-27 15:08:51.000000000 -0400
-+++ fontconfig-2.3.2-new/src/Makefile.in       2006-08-05 19:47:47.000000000 
-0400
-@@ -228,6 +228,7 @@
-       fcdefault.c \
-       fcdir.c \
-       fcfreetype.c \
-+      fcftglue.c \
-       fcfs.c \
-       fcinit.c \
-       fclang.c \
-@@ -257,7 +258,7 @@
- libfontconfig_la_DEPENDENCIES =
- am_libfontconfig_la_OBJECTS = fcatomic.lo fcblanks.lo fccache.lo \
-       fccfg.lo fccharset.lo fcdbg.lo fcdefault.lo fcdir.lo \
--      fcfreetype.lo fcfs.lo fcinit.lo fclang.lo fclist.lo fcmatch.lo \
-+      fcfreetype.lo fcftglue.lo fcfs.lo fcinit.lo fclang.lo fclist.lo 
fcmatch.lo \
-       fcmatrix.lo fcname.lo fcpat.lo fcstr.lo fcxml.lo
- libfontconfig_la_OBJECTS = $(am_libfontconfig_la_OBJECTS)
- 
-diff -uNr fontconfig-2.3.2/src/fcfreetype.c 
fontconfig-2.3.2-new/src/fcfreetype.c
---- fontconfig-2.3.2/src/fcfreetype.c  2005-04-21 08:37:43.000000000 -0400
-+++ fontconfig-2.3.2-new/src/fcfreetype.c      2006-08-05 19:47:47.000000000 
-0400
-@@ -50,14 +50,11 @@
- #include "fcint.h"
- #include <ft2build.h>
- #include FT_FREETYPE_H
--#include FT_INTERNAL_OBJECTS_H
- #include FT_TRUETYPE_TABLES_H
- #include FT_SFNT_NAMES_H
- #include FT_TRUETYPE_IDS_H
- #include FT_TYPE1_TABLES_H
--#include FT_INTERNAL_STREAM_H
--#include FT_INTERNAL_SFNT_H
--#include FT_INTERNAL_TRUETYPE_TYPES_H
-+#include "fcftglue.h"
- #if HAVE_FT_GET_X11_FONT_FORMAT
- #include FT_XFREE86_H
- #endif
-@@ -65,8 +62,7 @@
- #if HAVE_FT_GET_BDF_PROPERTY
- #include FT_BDF_H
- #include FT_MODULE_H
--#define HAS_BDF_PROPERTY(f) ((f) && (f)->driver && \
--                           (f)->driver->root.clazz->get_interface)
-+#define HAS_BDF_PROPERTY(f) ((f))
- #define MY_Get_BDF_Property(f,n,p) (HAS_BDF_PROPERTY(f) ? \
-                                   FT_Get_BDF_Property(f,n,p) : \
-                                   FT_Err_Invalid_Argument)
-@@ -1559,7 +1555,7 @@
-      */
-     if (FcCharSetCount (cs) == 0)
-     {
--      if (!strcmp(FT_MODULE_CLASS(&face->driver->root)->module_name, "pcf"))
-+      if (!strcmp(FT_Get_X11_Font_Format(face),"PCF"))
-           goto bail2;
-     }
- 
-@@ -2706,8 +2702,7 @@
- static FT_Error
- GetScriptTags(FT_Face face, FT_ULong tabletag, FT_ULong **stags, FT_UShort 
*script_count)
- {
--    FT_ULong         cur_offset, new_offset, base_offset;
--    TT_Face          tt_face = (TT_Face)face;
-+    FT_ULong   cur_offset, new_offset, base_offset;
-     FT_Stream  stream = face->stream;
-     FT_Error   error;
-     FT_UShort          n, p;
-@@ -2716,51 +2711,43 @@
-     if ( !stream )
-       return TT_Err_Invalid_Face_Handle;
- 
--    if (( error = tt_face->goto_table( tt_face, tabletag, stream, 0 ) ))
-+    if ( (error = fcft_face_goto_table( face, tabletag, stream )) != 0 )
-       return error;
- 
--    base_offset = FT_STREAM_POS();
-+    base_offset = FCFT_STREAM_POS();
- 
-     /* skip version */
- 
--    if ( FT_STREAM_SEEK( base_offset + 4L ) || FT_FRAME_ENTER( 2L ) )
--      return error;
--
--    new_offset = FT_GET_USHORT() + base_offset;
--
--    FT_FRAME_EXIT();
--
--    cur_offset = FT_STREAM_POS();
--
--    if ( FT_STREAM_SEEK( new_offset ) != TT_Err_Ok )
--      return error;
--
--    base_offset = FT_STREAM_POS();
-+    if ( FCFT_STREAM_SEEK( base_offset + 4L ) ||
-+         FCFT_READ_USHORT( new_offset )       ) 
-+      return error;
-+    
-+    new_offset += base_offset;
-+    cur_offset  = FCFT_STREAM_POS();
- 
--    if ( FT_FRAME_ENTER( 2L ) )
-+    if ( FCFT_STREAM_SEEK( new_offset ) != TT_Err_Ok )
-       return error;
- 
--    *script_count = FT_GET_USHORT();
-+    base_offset = FCFT_STREAM_POS();
- 
--    FT_FRAME_EXIT();
--
--    if ( FT_SET_ERROR (FT_MEM_ALLOC_ARRAY( *stags, *script_count, FT_ULong )) 
)
--      return error;
-+    if ( FCFT_READ_USHORT(*script_count)                         ||
-+         FCFT_MEM_ALLOC_ARRAY( *stags, *script_count, FT_ULong ) )
-+      return error;
- 
-     p = 0;
-     for ( n = 0; n < *script_count; n++ )
-     {
--      if ( FT_FRAME_ENTER( 6L ) )
-+      if ( FCFT_FRAME_ENTER( 6L ) )
-           goto Fail;
- 
--      (*stags)[p] = FT_GET_ULONG();
--      new_offset = FT_GET_USHORT() + base_offset;
-+      (*stags)[p] = FCFT_GET_ULONG();
-+      new_offset  = FCFT_GET_USHORT() + base_offset;
- 
--      FT_FRAME_EXIT();
-+      FCFT_FRAME_EXIT();
- 
--      cur_offset = FT_STREAM_POS();
-+      cur_offset = FCFT_STREAM_POS();
- 
--      if ( FT_STREAM_SEEK( new_offset ) )
-+      if ( FCFT_STREAM_SEEK( new_offset ) )
-           goto Fail;
- 
-       if ( error == TT_Err_Ok )
-@@ -2768,7 +2755,7 @@
-       else if ( error != TTO_Err_Empty_Script )
-           goto Fail;
- 
--      (void)FT_STREAM_SEEK( cur_offset );
-+      (void)FCFT_STREAM_SEEK( cur_offset );
-     }
+diff -uNr fontconfig-2.4.2/fonts.conf.in fontconfig-2.4.2-new/fonts.conf.in
+--- fontconfig-2.4.2/fonts.conf.in     2006-09-09 23:36:02.000000000 -0400
++++ fontconfig-2.4.2-new/fonts.conf.in 2007-09-28 11:28:09.000000000 -0400
+@@ -30,7 +30,7 @@
+ <!-- Font cache directory list -->
  
-     if (!p)
-@@ -2784,7 +2771,7 @@
+       <cachedir>@FC_CACHEDIR@</cachedir>
+-      <cachedir>~/.fontconfig</cachedir>
++      <cachedir>~/.fontconfig-2.4</cachedir>
  
- Fail:
-     *script_count = 0;
--    FT_FREE( *stags );
-+    FCFT_FREE( *stags );
-     return error;
- }
+ <!--
+   Accept deprecated 'mono' alias, replacing it with 'monospace'
+@@ -69,10 +69,20 @@
+       </match>
  
-@@ -2841,7 +2828,7 @@
-     if (FcDebug () & FC_DBG_SCANV)
-       printf("complex features in this font: %s\n", complex);
- bail:
--    FT_FREE(gsubtags);
--    FT_FREE(gpostags);
-+    FCFT_FREE(gsubtags);
-+    FCFT_FREE(gpostags);
-     return complex;
- }
-diff -uNr fontconfig-2.3.2/src/fcftglue.c fontconfig-2.3.2-new/src/fcftglue.c
---- fontconfig-2.3.2/src/fcftglue.c    1969-12-31 19:00:00.000000000 -0500
-+++ fontconfig-2.3.2-new/src/fcftglue.c        2006-08-05 19:47:47.000000000 
-0400
-@@ -0,0 +1,380 @@
-+#include "fcftglue.h"
-+
-+/***************************************************************************/
-+/***************************************************************************/
-+/*****                                                                 *****/
-+/*****                                                                 *****/
-+/*****                                                                 *****/
-+/***************************************************************************/
-+/***************************************************************************/
-+
-+/* only used internall */
-+static FT_Pointer
-+fcft_qalloc( FT_Memory  memory,
-+             FT_ULong   size,
-+             FT_Error  *perror )
-+{
-+  FT_Error    error = 0;
-+  FT_Pointer  block = NULL;
-+
-+  if ( size > 0 )
-+  {
-+    block = memory->alloc( memory, size );
-+    if ( !block )
-+      error = FT_Err_Out_Of_Memory;
-+  }
-+
-+  *perror = error;
-+  return block;
-+}
-+
-+#define  FCFT_QALLOC(ptr,size)    ( (ptr) = fcft_qalloc( memory, (size), 
&error ), error != 0 )
-+
-+
-+FCFT_APIDEF( FT_Pointer )
-+fcft_alloc( FT_Memory  memory,
-+            FT_ULong   size,
-+            FT_Error  *perror )
-+{
-+  FT_Error    error = 0;
-+  FT_Pointer  block = NULL;
-+
-+  if ( size > 0 )
-+  {
-+    block = memory->alloc( memory, size );
-+    if ( !block )
-+      error = FT_Err_Out_Of_Memory;
-+    else
-+      memset( (char*)block, 0, (size_t)size );
-+  }
-+
-+  *perror = error;
-+  return block;
-+}
-+
-+
-+FCFT_APIDEF( FT_Pointer )
-+fcft_realloc( FT_Memory   memory,
-+              FT_Pointer  block,
-+              FT_ULong    old_size,
-+              FT_ULong    new_size,
-+              FT_Error   *perror )
-+{
-+  FT_Pointer  block2 = NULL;
-+  FT_Error    error  = 0;
-+
-+  if ( block == NULL )
-+  {
-+    block2 = fcft_alloc( memory, new_size, &error );
-+  }
-+  else if ( new_size <= 0 )
-+  {
-+    fcft_free( memory, block );
-+  }
-+  else
-+  {
-+    block2 = fcft_alloc( memory, new_size, &error );
-+    if ( !error )
-+    {
-+      memcpy( (char*)block2, (const char*)block, (size_t)old_size );
-+      if ( new_size > old_size )
-+        memset( (char*)block2 + old_size, 0, (size_t)(new_size - old_size) );
-+    }
-+  }
-+
-+  if ( !error )
-+    block = block2;
-+
-+  *perror = error;
-+  return block;
-+}
-+
-+
-+FCFT_APIDEF( void )
-+fcft_free( FT_Memory   memory,
-+           FT_Pointer  block )
-+{
-+  if ( block )
-+    memory->free( memory, block );
-+}
-+
-+
-+FCFT_APIDEF( FT_Long )
-+fcft_stream_pos( FT_Stream   stream )
-+{
-+  return stream->pos;
-+}
-+
-+
-+FCFT_APIDEF( FT_Error )
-+fcft_stream_seek( FT_Stream   stream,
-+                  FT_Long     pos )
-+{
-+  FT_Error  error = 0;
-+
-+  stream->pos = pos;
-+  if ( stream->read )
-+  {
-+    if ( stream->read( stream, pos, 0, 0 ) )
-+      error = FT_Err_Invalid_Stream_Operation;
-+  }
-+  else if ( pos > stream->size )
-+    error = FT_Err_Invalid_Stream_Operation;
-+
-+  return error;
-+}
-+
-+
-+FCFT_APIDEF( FT_Error )
-+fcft_stream_frame_enter( FT_Stream   stream,
-+                         FT_ULong    count )
-+{
-+  FT_Error  error = FT_Err_Ok;
-+  FT_ULong  read_bytes;
-+
-+  if ( stream->read )
-+  {
-+    /* allocate the frame in memory */
-+    FT_Memory  memory = stream->memory;
-+
-+
-+    if ( FCFT_QALLOC( stream->base, count ) )
-+      goto Exit;
-+
-+    /* read it */
-+    read_bytes = stream->read( stream, stream->pos,
-+                               stream->base, count );
-+    if ( read_bytes < count )
-+    {
-+      FCFT_FREE( stream->base );
-+      error = FT_Err_Invalid_Stream_Operation;
-+    }
-+    stream->cursor = stream->base;
-+    stream->limit  = stream->cursor + count;
-+    stream->pos   += read_bytes;
-+  }
-+  else
-+  {
-+    /* check current and new position */
-+    if ( stream->pos >= stream->size        ||
-+         stream->pos + count > stream->size )
-+    {
-+      error = FT_Err_Invalid_Stream_Operation;
-+      goto Exit;
-+    }
-+
-+    /* set cursor */
-+    stream->cursor = stream->base + stream->pos;
-+    stream->limit  = stream->cursor + count;
-+    stream->pos   += count;
-+  }
-+
-+Exit:
-+  return error;
-+}
-+
-+
-+FCFT_APIDEF( void )
-+fcft_stream_frame_exit( FT_Stream  stream )
-+{
-+  if ( stream->read )
-+  {
-+    FT_Memory  memory = stream->memory;
-+
-+    FCFT_FREE( stream->base );
-+  }
-+  stream->cursor = 0;
-+  stream->limit  = 0;
-+}
-+
-+
-+FCFT_APIDEF( FT_Byte )
-+fcft_stream_get_byte( FT_Stream  stream )
-+{
-+  FT_Byte  result = 0;
-+
-+  if ( stream->cursor < stream->limit )
-+    result = *stream->cursor++;
-+
-+  return result;
-+}
-+
-+
-+FCFT_APIDEF( FT_Short )
-+fcft_stream_get_short( FT_Stream  stream )
-+{
-+  FT_Byte*  p;
-+  FT_Short  result = 0;
-+
-+  p = stream->cursor;
-+  if ( p + 2 <= stream->limit )
-+  {
-+    result         = (FT_Short)((p[0] << 8) | p[1]);
-+    stream->cursor = p+2;
-+  }
-+  return result;
-+}
-+
-+
-+FCFT_APIDEF( FT_Long )
-+fcft_stream_get_long( FT_Stream   stream )
-+{
-+  FT_Byte*  p;
-+  FT_Long   result = 0;
-+
-+  p = stream->cursor;
-+  if ( p + 4 <= stream->limit )
-+  {
-+    result         = (FT_Long)(((FT_Long)p[0] << 24) |
-+                               ((FT_Long)p[1] << 16) |
-+                               ((FT_Long)p[2] << 8)  |
-+                                         p[3]        );
-+    stream->cursor = p+4;
-+  }
-+  return result;
-+}
-+
-+
-+static FT_Error
-+fcft_stream_readp( FT_Stream   stream,
-+                   FT_Byte*   *pbuffer,
-+                   FT_ULong    count )
-+{
-+  FT_Error  error = 0;
-+
-+  if ( stream->read )
-+  {
-+    FT_ULong  read_bytes = stream->read( stream, stream->pos, *pbuffer, count 
);
-+
-+    if ( read_bytes != count )
-+      goto Fail;
-+
-+    stream->pos += count;
-+  }
-+  else
-+  {
-+    if ( stream->pos >= stream->size        ||
-+         stream->pos + count > stream->size )
-+      goto Fail;
-+
-+    *pbuffer     = stream->base + stream->pos;
-+    stream->pos += count;
-+  }
-+
-+Exit:
-+  return error;
-+
-+Fail:
-+  error = FT_Err_Invalid_Stream_Operation;
-+  goto Exit;
-+}
-+
-+
-+FCFT_API( FT_Byte )
-+fcft_stream_read_byte( FT_Stream   stream,
-+                       FT_Error   *perror )
-+{
-+  FT_Byte   temp[1], *p = temp, result = 0;
-+  FT_Error  error = fcft_stream_readp( stream, &p, 1 );
-+
-+  if ( !error )
-+    result = *p;
-+
-+  return error;
-+}
-+
-+FCFT_API( FT_Short )
-+fcft_stream_read_short( FT_Stream  stream,
-+                        FT_Error  *perror )
-+{
-+  FT_Byte   temp[2], *p = temp;
-+  FT_Short  result = 0;
-+  FT_Error  error  = fcft_stream_readp( stream, &p, 2 );
-+
-+  if ( !error )
-+    result = (FT_Short)((p[0] << 8) | p[1]);
-+
-+  return error;
-+}
-+
-+FCFT_API( FT_Long )
-+fcft_stream_read_long( FT_Stream  stream,
-+                       FT_Error  *perror )
-+{
-+  FT_Byte   temp[4], *p = temp;
-+  FT_Long   result = 0;
-+  FT_Error  error  = fcft_stream_readp( stream, &p, 4 );
-+
-+  if ( !error )
-+    result = (FT_Long)((FT_Long)(p[0] << 24) |
-+                       (FT_Long)(p[1] << 16) |
-+                                (p[2] << 8)  |
-+                                 p[3]        );
-+
-+  return error;
-+}
-+
-+
-+FCFT_APIDEF( FT_Error )
-+fcft_face_goto_table( FT_Face    face,
-+                      FT_ULong   the_tag,
-+                      FT_Stream  stream )
-+{
-+  FT_Error  error;
-+
-+  if ( !FT_IS_SFNT(face) )
-+    error = FT_Err_Invalid_Face_Handle;
-+  else
-+  {
-+   /* parse the directory table directly, without using
-+    * FreeType's built-in data structures
-+    */
-+    FT_UInt   count, nn;
-+    FT_ULong  offset = 0;
-+
-+    if ( face->num_faces > 1 )
-+    {
-+      /* deal with TrueType collections */
-+      FT_ULong  offset;
-+
-+      if ( FCFT_STREAM_SEEK( 12 + face->face_index*4 ) ||
-+           FCFT_READ_ULONG(offset)                     )
-+        goto Exit;
-+    }
-+
-+    if ( FCFT_STREAM_SEEK( offset+4 ) ||
-+         FCFT_READ_USHORT(count)      )
-+      goto Exit;
-+
-+
-+    if ( FCFT_STREAM_SEEK( offset+12 ) ||
-+         FCFT_FRAME_ENTER( count*16 )  )
-+      goto Exit;
-+
-+    for ( nn = 0; nn < count; nn++ )
-+    {
-+      FT_ULong  tag      = FCFT_GET_TAG();
-+      FT_ULong  checksum = FCFT_GET_ULONG();
-+      FT_ULong  start    = FCFT_GET_ULONG();
-+      FT_ULong  size     = FCFT_GET_ULONG();
-+
-+      FT_UNUSED(checksum);
-+      FT_UNUSED(size);
-+
-+      if ( tag == the_tag )
-+      {
-+        error = fcft_stream_seek( stream, offset+start );
-+        goto FoundIt;
-+      }
-+    }
-+    error = FT_Err_Table_Missing;
-+
-+  FoundIt:
-+    FCFT_FRAME_EXIT();
-+  }
-+
-+Exit:
-+  return error;
-+}
-+
-+#undef FCFT_QALLOC
-diff -uNr fontconfig-2.3.2/src/fcftglue.h fontconfig-2.3.2-new/src/fcftglue.h
---- fontconfig-2.3.2/src/fcftglue.h    1969-12-31 19:00:00.000000000 -0500
-+++ fontconfig-2.3.2-new/src/fcftglue.h        2006-08-05 19:47:47.000000000 
-0400
-@@ -0,0 +1,135 @@
-+/* the following contains code used to prevent FontConfig from
-+ * abusing FreeType internals. We simply duplicate some of the FreeType
-+ * functionality using only publicly defined APIs and structures
-+ */
-+#ifndef __FONTCONFIG_FTGLUE_H__
-+#define __FONTCONFIG_FTGLUE_H__
-+
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
-+
-+FT_BEGIN_HEADER
-+
-+
-+/* utility macros */
-+#define  FCFT_SET_ERR(c)   ( (error = (c)) != 0 )
-+
-+#ifndef FCFT_API
-+#define FCFT_API(x)  extern x
-+#endif
-+
-+#ifndef FCFT_APIDEF
-+#define FCFT_APIDEF(x)  x
-+#endif
-+
-+/* stream macros used by the OpenType parser */
-+#define  FCFT_STREAM_POS()       fcft_stream_pos( stream )
-+#define  FCFT_STREAM_SEEK(pos)   FCFT_SET_ERR( fcft_stream_seek( stream, pos 
) )
-+#define  FCFT_FRAME_ENTER(size)  FCFT_SET_ERR( fcft_stream_frame_enter( 
stream, size ) )
-+#define  FCFT_FRAME_EXIT()       fcft_stream_frame_exit( stream )
-+
-+#define  FCFT_GET_BYTE()         fcft_stream_get_byte( stream )
-+#define  FCFT_GET_SHORT()        fcft_stream_get_short( stream )
-+#define  FCFT_GET_LONG()         fcft_stream_get_long( stream )
-+
-+#define  FCFT_GET_CHAR()        ((FT_Char)FCFT_GET_BYTE())
-+#define  FCFT_GET_USHORT()      ((FT_UShort)FCFT_GET_SHORT())
-+#define  FCFT_GET_ULONG()       ((FT_ULong)FCFT_GET_LONG())
-+#define  FCFT_GET_TAG()         FCFT_GET_ULONG()
-+
-+#define  FCFT_READ_(val,type,suffix)   \
-+   ( (val) = (type) fcft_stream_read_##suffix (stream, &error), error != 0 )
-+
-+#define  FCFT_READ_BYTE(val)    FCFT_READ_(val,FT_Byte,byte)
-+#define  FCFT_READ_SHORT(val)   FCFT_READ_(val,FT_Short,short)
-+#define  FCFT_READ_LONG(val)    FCFT_READ_(val,FT_Long,long)
-+
-+#define  FCFT_READ_CHAR(val)    FCFT_READ_(val,FT_Char,byte)
-+#define  FCFT_READ_USHORT(val)  FCFT_READ_(val,FT_UShort,short)
-+#define  FCFT_READ_ULONG(val)   FCFT_READ_(val,FT_ULong,long)
-+
-+
-+FCFT_API( FT_Long )
-+fcft_stream_pos( FT_Stream   stream );
-+
-+FCFT_API( FT_Error )
-+fcft_stream_seek( FT_Stream   stream,
-+                  FT_Long     pos );
-+
-+FCFT_API( FT_Error )
-+fcft_stream_frame_enter( FT_Stream   stream,
-+                         FT_ULong    size );
-+
-+FCFT_API( void )
-+fcft_stream_frame_exit( FT_Stream  stream );
-+
-+FCFT_API( FT_Byte )
-+fcft_stream_get_byte( FT_Stream  stream );
-+
-+FCFT_API( FT_Short )
-+fcft_stream_get_short( FT_Stream  stream );
-+
-+FCFT_API( FT_Long )
-+fcft_stream_get_long( FT_Stream   stream );
-+
-+FCFT_API( FT_Byte )
-+fcft_stream_read_byte( FT_Stream   stream,
-+                       FT_Error   *perror );
-+
-+FCFT_API( FT_Short )
-+fcft_stream_read_short( FT_Stream  stream,
-+                        FT_Error  *perror );
-+
-+FCFT_API( FT_Long )
-+fcft_stream_read_long( FT_Stream  stream,
-+                       FT_Error  *perror );
-+
-+FCFT_API( FT_Error )
-+fcft_face_goto_table( FT_Face    face,
-+                      FT_ULong   tag,
-+                      FT_Stream  stream );
-+
-+/* memory macros used by the OpenType parser */
-+#define  FCFT_MEM_ALLOC(_ptr,_size)   \
-+           ( (_ptr) = fcft_alloc( memory, _size, &error ), error != 0 )
-+
-+#define  FCFT_MEM_REALLOC(_ptr,_oldsz,_newsz)  \
-+           ( (_ptr) = fcft_realloc( memory, (_ptr), (_oldsz), (_newsz), 
&error ), error != 0 )
-+
-+#define  FCFT_FREE(_ptr)               \
-+  FT_BEGIN_STMNT                       \
-+    if ( (_ptr) )                      \
-+    {                                  \
-+      fcft_free( memory, _ptr );       \
-+      _ptr = NULL;                     \
-+    }                                  \
-+  FT_END_STMNT
-+
-+#define  FCFT_MEM_ALLOC_ARRAY(_ptr,_count,_type)   \
-+           FCFT_MEM_ALLOC(_ptr,(_count)*sizeof(_type))
-+
-+#define  FCFT_MEM_REALLOC_ARRAY(_ptr,_oldcnt,_newcnt,_type) \
-+           
FCFT_MEM_REALLOC(_ptr,(_oldcnt)*sizeof(_type),(_newcnt)*sizeof(_type))
-+
-+
-+FCFT_API( FT_Pointer )
-+fcft_alloc( FT_Memory  memory,
-+            FT_ULong   size,
-+            FT_Error  *perror );
-+
-+FCFT_API( FT_Pointer )
-+fcft_realloc( FT_Memory   memory,
-+              FT_Pointer  block,
-+              FT_ULong    old_size,
-+              FT_ULong    new_size,
-+              FT_Error   *perror );
-+
-+FCFT_API( void )
-+fcft_free( FT_Memory   memory,
-+           FT_Pointer  block );
-+
-+/* */
+ <!--
++  Load per-user customization file
++-->
++      <include ignore_missing="yes">~/.fonts.conf</include>
 +
-+FT_END_HEADER
++<!--
+   Load local system customization file
+ -->
+       <include ignore_missing="yes">conf.d</include>
+ 
++<!--
++  Load local (apple) system customization file
++-->
++      <include ignore_missing="yes">/etc/fonts/local.conf</include>
 +
-+#endif /* __OPENTYPE_FCFT_H__ */
+       <config>
+ <!--
+   These are the default Unicode chars that are expected to be blank
+diff -uNr fontconfig-2.4.2/src/fcinit.c fontconfig-2.4.2-new/src/fcinit.c
+--- fontconfig-2.4.2/src/fcinit.c      2006-12-02 15:10:30.000000000 -0500
++++ fontconfig-2.4.2-new/src/fcinit.c  2007-09-28 11:19:26.000000000 -0400
+@@ -78,9 +78,9 @@
+                "Fontconfig warning: adding <cachedir>%s</cachedir>\n",
+                FC_CACHEDIR);
+       fprintf (stderr,
+-               "Fontconfig warning: adding 
<cachedir>~/.fontconfig</cachedir>\n");
++               "Fontconfig warning: adding 
<cachedir>~/.fontconfig-2.4</cachedir>\n");
+       if (!FcConfigAddCacheDir (config, (FcChar8 *) FC_CACHEDIR) ||
+-          !FcConfigAddCacheDir (config, (FcChar8 *) "~/.fontconfig"))
++          !FcConfigAddCacheDir (config, (FcChar8 *) "~/.fontconfig-2.4"))
+       {
+           fprintf (stderr,
+                    "Fontconfig error: out of memory");

Index: wxgtk2.8.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/wxgtk2.8.info,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -d -r1.1.2.18 -r1.1.2.19
--- wxgtk2.8.info       21 Sep 2007 00:24:40 -0000      1.1.2.18
+++ wxgtk2.8.info       28 Sep 2007 16:15:29 -0000      1.1.2.19
@@ -9,7 +9,7 @@
        cairo (>= 1.2-1),
        dbus-dev (>= 1.0-1),
        expat1,
-       fontconfig2-dev (>= 2.3.2-13),
+       fontconfig2-dev (>= 2.4.2-1),
        freetype219 (>= 2.3.5-1),
        gconf2-dev (>= 2.20.0-1),
        glib2-dev (>= 2.14.0-1),

Index: fontconfig2-dev.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/fontconfig2-dev.info,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -d -r1.8.2.1 -r1.8.2.2
--- fontconfig2-dev.info        25 Jun 2007 18:33:17 -0000      1.8.2.1
+++ fontconfig2-dev.info        28 Sep 2007 16:15:28 -0000      1.8.2.2
@@ -1,48 +1,96 @@
 Package: fontconfig2-dev
-Version: 2.3.2
-Revision: 14
+Version: 2.4.2
+Revision: 1
 Maintainer: Alexander Strange <[EMAIL PROTECTED]>
 BuildDependsOnly: true
-Source-MD5: 7354f9f125ea78a8f2851cb9c31d4866
+Source-MD5: f035852f521b54677f2b5c9e2f6d54a4
 Source: http://www.fontconfig.org/release/fontconfig-%v.tar.gz
 Patch: %n.patch
 BuildDepends: expat1, x11-dev, freetype219
-Depends: expat1-shlibs, fontconfig1-shlibs, fontconfig2-shlibs
+Depends: expat1-shlibs, fontconfig2-shlibs
 SetCFLAGS: -fno-common -g
-ConfigureParams: 
--with-freetype-config="%p/lib/freetype219/bin/freetype-config" 
--prefix=%p/lib/fontconfig2 --with-confdir=/etc/fonts --disable-docs 
--disable-dependency-tracking
-CompileScript: <<
-#export FREETYPE_CONFIG="%p/lib/freetype219/bin/freetype-config"
-./configure %c
-(cd src && make)
-<<
-InstallScript: <<
-(cd fontconfig && make install DESTDIR=%d)
-(cd src && make install DESTDIR=%d)
-make install-pkgconfigDATA DESTDIR=%d
-(cd %i/lib/fontconfig2/lib; ar x libfontconfig.a; rm libfontconfig.a; touch 
blah; ld -r -all_load -exported_symbols_list blah -o fontconfig.o fc*.o; printf 
"_FcIdentityMatrix\n__fcConfig" > blah; nmedit -R blah fontconfig.o; nmedit -p 
fontconfig.o; ar cqv libfontconfig.a fontconfig.o; rm *.o "__.SYMDEF SORTED" 
blah; ranlib libfontconfig.a)
-<<
+ConfigureParams: 
--with-freetype-config="%p/lib/freetype219/bin/freetype-config" 
--prefix=%p/lib/fontconfig2 --with-confdir=%p/etc/fonts --disable-docs 
--disable-dependency-tracking --with-cache-dir=%p/cache/fontconfig-2.4 
--with-default-fonts=/Library/Fonts,/Network/Library/Fonts,/System/Library/Fonts,/usr/X11R6/lib/X11/fonts,/usr/share/fonts,/var/root/Library/Fonts
+InstallScript: make -j1 install DESTDIR=%d
 SplitOff: <<
        Package: fontconfig2-shlibs
-       Depends: expat1-shlibs, freetype219-shlibs
+       Depends: fontconfig-config, expat1-shlibs, freetype219-shlibs
        Files: lib/fontconfig2/lib/libfontconfig.1*dylib
-       Shlibs: %p/lib/fontconfig2/lib/libfontconfig.1.dylib 1.0.0 %n (>= 
2.2.3-10)
+       Shlibs: %p/lib/fontconfig2/lib/libfontconfig.1.dylib 4.0.0 %n (>= 
2.4.2-1)
        DocFiles: README 
        Description: Fontconfig 2, shared libs
 <<
+SplitOff2: <<
+       Package: fontconfig-config
+       Description: configuration files for fontconfig
+       Files: %p/etc/fonts
+       ConfFiles: <<
+               %p/etc/fonts/fonts.conf
+               %p/etc/fonts/fonts.dtd
+               %p/etc/fonts/conf.avail/10-autohint.conf
+               %p/etc/fonts/conf.avail/10-no-sub-pixel.conf
+               %p/etc/fonts/conf.avail/10-sub-pixel-bgr.conf
+               %p/etc/fonts/conf.avail/10-sub-pixel-rgb.conf
+               %p/etc/fonts/conf.avail/10-sub-pixel-vbgr.conf
+               %p/etc/fonts/conf.avail/10-sub-pixel-vrgb.conf
+               %p/etc/fonts/conf.avail/10-unhinted.conf
+               %p/etc/fonts/conf.avail/20-fix-globaladvance.conf
+               %p/etc/fonts/conf.avail/20-lohit-gujarati.conf
+               %p/etc/fonts/conf.avail/20-unhint-small-vera.conf
+               %p/etc/fonts/conf.avail/30-amt-aliases.conf
+               %p/etc/fonts/conf.avail/30-urw-aliases.conf
+               %p/etc/fonts/conf.avail/40-generic.conf
+               %p/etc/fonts/conf.avail/49-sansserif.conf
+               %p/etc/fonts/conf.avail/50-user.conf
+               %p/etc/fonts/conf.avail/51-local.conf
+               %p/etc/fonts/conf.avail/60-latin.conf
+               %p/etc/fonts/conf.avail/65-fonts-persian.conf
+               %p/etc/fonts/conf.avail/65-nonlatin.conf
+               %p/etc/fonts/conf.avail/69-unifont.conf
+               %p/etc/fonts/conf.avail/70-no-bitmaps.conf
+               %p/etc/fonts/conf.avail/70-yes-bitmaps.conf
+               %p/etc/fonts/conf.avail/80-delicious.conf
+               %p/etc/fonts/conf.avail/90-synthetic.conf
+               %p/etc/fonts/conf.avail/README
+               %p/etc/fonts/conf.d/20-fix-globaladvance.conf
+               %p/etc/fonts/conf.d/20-lohit-gujarati.conf
+               %p/etc/fonts/conf.d/20-unhint-small-vera.conf
+               %p/etc/fonts/conf.d/30-amt-aliases.conf
+               %p/etc/fonts/conf.d/30-urw-aliases.conf
+               %p/etc/fonts/conf.d/40-generic.conf
+               %p/etc/fonts/conf.d/49-sansserif.conf
+               %p/etc/fonts/conf.d/50-user.conf
+               %p/etc/fonts/conf.d/51-local.conf
+               %p/etc/fonts/conf.d/60-latin.conf
+               %p/etc/fonts/conf.d/65-fonts-persian.conf
+               %p/etc/fonts/conf.d/65-nonlatin.conf
+               %p/etc/fonts/conf.d/69-unifont.conf
+               %p/etc/fonts/conf.d/80-delicious.conf
+               %p/etc/fonts/conf.d/90-synthetic.conf
+       <<
+<<
 DocFiles:  README NEWS
 Description: Fontconfig 2 for Gimp
 DescDetail: <<
 A library for font customization and configuration.
 <<
 DescPackaging: <<
-We do NOT want this to replace the system fontconfig.
-
 The .pc file is missing -lexpat in its Libs field.
 Adding it after having it absent for a long time is
 likely to propagate into packages that didn't have
 it before and create linking noise or failures, so
 we'll just let other packages add the flag manually
 on the rare occasion it is needed.
+
+This package is not intended to replace the system
+fontconfig.  It is, however, patched to use it's
+own cache and configuration directories, but to
+still be capable of loading the user font
+configuration, as well as /etc/fonts/local.conf
+(which is the accepted way of modifying the
+behavior of /etc/fonts/fonts.conf) -- if a user
+has edited /etc/fonts/fonts.conf (which they
+really shouldn't) that edit will not affect any
+Fink apps using this fontconfig package.
 <<
 DescUsage: <<
        You may need to pass -lexpat manually when linking

Index: mlterm.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/mlterm.info,v
retrieving revision 1.4.2.20
retrieving revision 1.4.2.21
diff -u -d -r1.4.2.20 -r1.4.2.21
--- mlterm.info 18 Sep 2007 14:43:21 -0000      1.4.2.20
+++ mlterm.info 28 Sep 2007 16:15:29 -0000      1.4.2.21
@@ -5,7 +5,7 @@
 Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
 Description: Multilingual terminal emulator on X11
 BuildDepends: <<
-  glitz, expat1, cairo (>= 1.2-1), fontconfig2-dev (>= 2.3.2-13), freetype219 
(>= 2.3.5-1),
+  glitz, expat1, cairo (>= 1.2-1), fontconfig2-dev (>= 2.4.2-1), freetype219 
(>= 2.3.5-1),
   fribidi-dev, libjpeg, libpng3, libtiff, giflib,
   x11-dev, xft2-dev,
   gtk+2-dev (>= 2.12.0-1), atk1 (>= 1.20.0-1), glib2-dev (>= 2.14.0-1), 
pango1-xft2-ft219-dev (>= 1.18.2-1),

Index: gerbv-gtk2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/gerbv-gtk2.info,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -d -r1.1.2.9 -r1.1.2.10
--- gerbv-gtk2.info     18 Sep 2007 14:43:21 -0000      1.1.2.9
+++ gerbv-gtk2.info     28 Sep 2007 16:15:28 -0000      1.1.2.10
@@ -17,7 +17,7 @@
   atk1 (>= 1.20.0-1),
   cairo (>= 1.2-1),
   expat1,
-  fontconfig2-dev (>= 2.3.2-13),
+  fontconfig2-dev (>= 2.4.2-1),
   freetype219 (>= 2.3.5-1),
   glib2-dev (>= 2.14.0-1), 
   glitz,

Index: openoffice.org-nocrypto.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/openoffice.org-nocrypto.info,v
retrieving revision 1.7.2.21
retrieving revision 1.7.2.22
diff -u -d -r1.7.2.21 -r1.7.2.22
--- openoffice.org-nocrypto.info        18 Sep 2007 14:43:21 -0000      1.7.2.21
+++ openoffice.org-nocrypto.info        28 Sep 2007 16:15:29 -0000      1.7.2.22
@@ -12,7 +12,7 @@
 BuildConflicts: libicu32-dev
 BuildDepends: <<
   x11-dev, ant, bison, fileutils, system-java14-dev,
-  archive-zip-pm586, glitz, libpng3, cairo (>= 1.2-1), fontconfig2-dev (>= 
2.3.2-13),
+  archive-zip-pm586, glitz, libpng3, cairo (>= 1.2-1), fontconfig2-dev (>= 
2.4.2-1),
   libjpeg, expat1, flac, freetype219 (>= 2.3.5-1), libxml2 (>= 2.6.30-1),
   sane-backends-dev, libcurl3-unified, libsndfile1-dev,
   portaudio (>= 18.1-1), neon24-ssl | neon24,

Index: xpad.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/xpad.info,v
retrieving revision 1.2.2.16
retrieving revision 1.2.2.17
diff -u -d -r1.2.2.16 -r1.2.2.17
--- xpad.info   18 Sep 2007 14:43:22 -0000      1.2.2.16
+++ xpad.info   28 Sep 2007 16:15:29 -0000      1.2.2.17
@@ -25,7 +25,7 @@
        atk1 (>= 1.20.0-1),
        cairo (>= 1.2-1),
        expat1,
-       fontconfig2-dev (>= 2.3.2-13),
+       fontconfig2-dev (>= 2.4.2-1),
        freetype219 (>= 2.3.5-1),
        gettext-bin,
        gettext-tools,

Index: hotbabe.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/hotbabe.info,v
retrieving revision 1.3.2.14
retrieving revision 1.3.2.15
diff -u -d -r1.3.2.14 -r1.3.2.15
--- hotbabe.info        18 Sep 2007 14:43:21 -0000      1.3.2.14
+++ hotbabe.info        28 Sep 2007 16:15:28 -0000      1.3.2.15
@@ -6,7 +6,7 @@
 Maintainer: Todai Fink Team <[EMAIL PROTECTED]> 
 
 Depends: gtk+2-shlibs (>= 2.12.0-1), glib2-shlibs (>= 2.14.0-1), 
pango1-xft2-ft219-shlibs (>= 1.18.2-1), libgettext3-shlibs, libiconv, x11
-BuildDepends: atk1 (>= 1.20.0-1), glitz, expat1, libpng3, cairo (>= 1.2-1), 
fontconfig2-dev (>= 2.3.2-13), freetype219 (>= 2.3.5-1), gtk+2-dev (>= 
2.12.0-1), glib2-dev (>= 2.14.0-1), pango1-xft2-ft219-dev (>= 1.18.2-1), 
pkgconfig (>= 0.21-1), libgettext3-dev, libiconv-dev, x11-dev, xft2-dev
+BuildDepends: atk1 (>= 1.20.0-1), glitz, expat1, libpng3, cairo (>= 1.2-1), 
fontconfig2-dev (>= 2.4.2-1), freetype219 (>= 2.3.5-1), gtk+2-dev (>= 
2.12.0-1), glib2-dev (>= 2.14.0-1), pango1-xft2-ft219-dev (>= 1.18.2-1), 
pkgconfig (>= 0.21-1), libgettext3-dev, libiconv-dev, x11-dev, xft2-dev
 
 Source: http://dindinx.net/%n/downloads/hot-babe-%v.tar.bz2
 Source-MD5: 482a9496b493d2394601689659971042

Index: pcb.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/pcb.info,v
retrieving revision 1.6.2.15
retrieving revision 1.6.2.16
diff -u -d -r1.6.2.15 -r1.6.2.16
--- pcb.info    18 Sep 2007 14:43:21 -0000      1.6.2.15
+++ pcb.info    28 Sep 2007 16:15:29 -0000      1.6.2.16
@@ -4,7 +4,7 @@
 Revision: 2
 
 Depends: libstroke-shlibs, app-defaults, tcltk, gtk+2-shlibs (>= 2.12.0-1), 
glib2-shlibs (>= 2.14.0-1), x11-shlibs, gd2-shlibs, libjpeg-shlibs, 
libpng3-shlibs, libgettext3-shlibs
-BuildDepends: glitz, expat1, cairo (>= 1.2-1), fontconfig2-dev (>= 2.3.2-13), 
freetype219 (>= 2.3.5-1), xft2-dev, libstroke, gawk, gtk+2-dev (>= 2.12.0-1), 
x11-dev, atk1 (>= 1.20.0-1), glib2-dev (>= 2.14.0-1), pango1-xft2-ft219-dev (>= 
1.18.2-1), gd2 (>= 2.0.33-3), libjpeg, libpng3, netpbm-bin, libgettext3-dev, 
libiconv-dev
+BuildDepends: glitz, expat1, cairo (>= 1.2-1), fontconfig2-dev (>= 2.4.2-1), 
freetype219 (>= 2.3.5-1), xft2-dev, libstroke, gawk, gtk+2-dev (>= 2.12.0-1), 
x11-dev, atk1 (>= 1.20.0-1), glib2-dev (>= 2.14.0-1), pango1-xft2-ft219-dev (>= 
1.18.2-1), gd2 (>= 2.0.33-3), libjpeg, libpng3, netpbm-bin, libgettext3-dev, 
libiconv-dev
 
 ### For documentation:
 # Bdep: tetex-base, texinfo 

Index: wxgtk.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/wxgtk.info,v
retrieving revision 1.5.2.19
retrieving revision 1.5.2.20
diff -u -d -r1.5.2.19 -r1.5.2.20
--- wxgtk.info  18 Sep 2007 14:43:21 -0000      1.5.2.19
+++ wxgtk.info  28 Sep 2007 16:15:29 -0000      1.5.2.20
@@ -6,7 +6,7 @@
 
 Maintainer: None <[EMAIL PROTECTED]>
 GCC: 4.0
-BuildDepends: glitz, cairo (>= 1.2-1), fontconfig2-dev (>= 2.3.2-13), 
freetype219 (>= 2.3.5-1), xft2-dev, atk1 (>= 1.20.0-1), expat1, gettext-bin, 
libgettext3-dev, gettext-tools, glib2-dev (>= 2.14.0-1), gtk+2-dev (>= 
2.12.0-1), libgl, libiconv-dev, libjpeg, libpng3, libtiff, 
pango1-xft2-ft219-dev (>= 1.18.2-1)
+BuildDepends: glitz, cairo (>= 1.2-1), fontconfig2-dev (>= 2.4.2-1), 
freetype219 (>= 2.3.5-1), xft2-dev, atk1 (>= 1.20.0-1), expat1, gettext-bin, 
libgettext3-dev, gettext-tools, glib2-dev (>= 2.14.0-1), gtk+2-dev (>= 
2.12.0-1), libgl, libiconv-dev, libjpeg, libpng3, libtiff, 
pango1-xft2-ft219-dev (>= 1.18.2-1)
 Depends: %N-shlibs (= %v-%r), expat1-shlibs, gtk+2-shlibs (>= 2.12.0-1), 
libjpeg-shlibs, libpng3-shlibs, libtiff-shlibs
 Conflicts: wxmac, wxgtk2.8
 Replaces: wxmac, wxgtk2.8

Index: xscreensaver.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/xscreensaver.info,v
retrieving revision 1.4.2.17
retrieving revision 1.4.2.18
diff -u -d -r1.4.2.17 -r1.4.2.18
--- xscreensaver.info   18 Sep 2007 14:43:22 -0000      1.4.2.17
+++ xscreensaver.info   28 Sep 2007 16:15:29 -0000      1.4.2.18
@@ -2,7 +2,7 @@
 Version: 4.21
 Revision: 1006
 Depends: x11-shlibs, gtk+2-shlibs (>= 2.12.0-1), atk1-shlibs (>= 1.20.0-1), 
pango1-xft2-ft219 (>= 1.18.2-1), glib2-shlibs (>= 2.14.0-1), libxml2-shlibs (>= 
2.6.30-1), libgl-shlibs, libglade2-shlibs (>= 2.6.2-1), netpbm-shlibs | 
netpbm10-shlibs, libjpeg-shlibs, libgettext3-shlibs
-BuildDepends: glitz, expat1, libpng3, cairo (>= 1.2-1), fontconfig2-dev (>= 
2.3.2-13), freetype219 (>= 2.3.5-1), xft2-dev, x11-dev, gtk+2-dev (>= 
2.12.0-1), atk1 (>= 1.20.0-1), pango1-xft2-ft219-dev (>= 1.18.2-1),  glib2-dev 
(>= 2.14.0-1), gettext-bin, libgettext3-dev, libxml2 (>= 2.6.30-1), libglade2 
(>= 2.6.2-1), netpbm | netpbm10, libjpeg, pkgconfig (>= 0.21-1)
+BuildDepends: glitz, expat1, libpng3, cairo (>= 1.2-1), fontconfig2-dev (>= 
2.4.2-1), freetype219 (>= 2.3.5-1), xft2-dev, x11-dev, gtk+2-dev (>= 2.12.0-1), 
atk1 (>= 1.20.0-1), pango1-xft2-ft219-dev (>= 1.18.2-1),  glib2-dev (>= 
2.14.0-1), gettext-bin, libgettext3-dev, libxml2 (>= 2.6.30-1), libglade2 (>= 
2.6.2-1), netpbm | netpbm10, libjpeg, pkgconfig (>= 0.21-1)
 Source: http://www.jwz.org/xscreensaver/xscreensaver-%v.tar.gz
 Source-MD5: 3ea7d0bc9b7159523855296e175d7ac7
 ConfigureParams: --mandir=%p/share/man --libexecdir=%p/lib --without-pam 
--disable-dependency-tracking 
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config

Index: gpsdrive.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/gpsdrive.info,v
retrieving revision 1.7.2.15
retrieving revision 1.7.2.16
diff -u -d -r1.7.2.15 -r1.7.2.16
--- gpsdrive.info       18 Sep 2007 14:43:21 -0000      1.7.2.15
+++ gpsdrive.info       28 Sep 2007 16:15:28 -0000      1.7.2.16
@@ -125,7 +125,7 @@
        expat1,
        autoconf (>= 2.60-1),
        automake1.7,
-       fontconfig2-dev (>= 2.3.2-13),
+       fontconfig2-dev (>= 2.4.2-1),
        freetype219 (>= 2.3.5-1),
        glib2-dev (>= 2.14.0-1),
        glitz,


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to