Update of /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6130/crypto/finkinfo
Modified Files:
Tag: pangocairo-branch
evolution-data-server.patch openoffice.org.patch
Log Message:
bugfixes from buildfink
Index: evolution-data-server.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/evolution-data-server.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- evolution-data-server.patch 20 Jan 2006 20:16:55 -0000 1.1
+++ evolution-data-server.patch 20 Apr 2007 16:25:27 -0000 1.1.2.1
@@ -19,3 +19,24 @@
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
+diff -uNr evolution-data-server-1.10.1/configure
evolution-data-server-1.10.1-new/configure
+--- evolution-data-server-1.10.1/configure 2007-04-09 08:48:16.000000000
-0400
++++ evolution-data-server-1.10.1-new/configure 2007-04-14 16:52:12.000000000
-0400
+@@ -25645,7 +25645,7 @@
+ #include <iconv.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#ifdef HAVE_GNU_GET_LIBC_VERSION
++#if 0
+ #include <gnu/libc-version.h>
+ #endif
+
+@@ -25658,7 +25658,7 @@
+ size_t from_len = strlen (from), utf8_len = 20;
+ size_t utf8_real_len = strlen (utf8);
+
+-#ifdef HAVE_GNU_GET_LIBC_VERSION
++#if 0
+ /* glibc 2.1.2's iconv is broken in hard to test ways. */
+ if (!strcmp (gnu_get_libc_version (), "2.1.2"))
+ exit (1);
Index: openoffice.org.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/openoffice.org.patch,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- openoffice.org.patch 24 Mar 2006 16:57:06 -0000 1.5
+++ openoffice.org.patch 20 Apr 2007 16:25:27 -0000 1.5.2.1
@@ -798,3 +798,87 @@
ALL: $(MOZFILES)
+diff -uNr vcl/source/glyphs/gcach_ftyp.cxx vcl-new/source/glyphs/gcach_ftyp.cxx
+--- vcl/source/glyphs/gcach_ftyp.cxx 2006-01-25 06:39:36.000000000 -0500
++++ vcl-new/source/glyphs/gcach_ftyp.cxx 2007-04-14 16:29:43.000000000
-0400
+@@ -90,21 +90,25 @@
+ #define strncasecmp strnicmp
+ #endif
+
+-#include "freetype/internal/ftobjs.h"
+-#include "freetype/internal/sfnt.h"
+-#include "freetype/internal/ftstream.h"
+-
+ #include <svapp.hxx>
+ #include <settings.hxx>
+ #include <tools/lang.hxx>
+
+-#if defined( FT_NEXT_SHORT ) && !defined( NEXT_Short )
+-// Account for differing versions of freetype...
+-#define NEXT_Short( x ) FT_NEXT_SHORT( x )
+-#define NEXT_UShort( x ) FT_NEXT_USHORT( x )
+-#define NEXT_Long( x ) FT_NEXT_LONG( x )
+-#define NEXT_ULong( x ) FT_NEXT_ULONG( x )
+-#endif
++#define NEXT_Short( x ) \
++ ( x += 2, \
++ ( (short)( (signed char)x[-2] << 8 ) | \
++ (unsigned char)x[-1] ) )
++
++#define NEXT_UShort( x ) ( (unsigned short)NEXT_Short( x ) )
++
++#define NEXT_Long( x ) \
++ ( x += 4, \
++ ( ( (long)(signed char)x[-4] << 24 ) | \
++ ( (long)(unsigned char)x[-3] << 16 ) | \
++ ( (long)(unsigned char)x[-2] << 8 ) | \
++ (long)(unsigned char)x[-1] ) )
++
++#define NEXT_ULong( x ) ( (unsigned long)NEXT_Long( x ) )
+
+ // -----------------------------------------------------------------------
+
+@@ -2070,7 +2074,16 @@
+ // TODO: wait till all compilers accept that calling conventions
+ // for functions are the same independent of implementation constness,
+ // then uncomment the const-tokens in the function interfaces below
+-static int FT_move_to( FT_Vector* /*const*/ p0, void* vpPolyArgs )
++//
++// Starting with FreeType 2.2, the const-ness is actually needed - it has
++// been added to the function definitions and a cast from const to non-const
++// is never explicit.
++#if FTVERSION >= 2200
++#define FT_CONST const
++#else
++#define FT_CONST
++#endif
++static int FT_move_to( FT_Vector FT_CONST* p0, void* vpPolyArgs )
+ {
+ PolyArgs& rA = *reinterpret_cast<PolyArgs*>(vpPolyArgs);
+
+@@ -2081,14 +2094,14 @@
+ return 0;
+ }
+
+-static int FT_line_to( FT_Vector* /*const*/ p1, void* vpPolyArgs )
++static int FT_line_to( FT_Vector FT_CONST* p1, void* vpPolyArgs )
+ {
+ PolyArgs& rA = *reinterpret_cast<PolyArgs*>(vpPolyArgs);
+ rA.AddPoint( p1->x, p1->y, POLY_NORMAL );
+ return 0;
+ }
+
+-static int FT_conic_to( FT_Vector* /*const*/ p1, FT_Vector* /*const*/ p2,
void* vpPolyArgs )
++static int FT_conic_to( FT_Vector FT_CONST* p1, FT_Vector FT_CONST* p2, void*
vpPolyArgs )
+ {
+ PolyArgs& rA = *reinterpret_cast<PolyArgs*>(vpPolyArgs);
+
+@@ -2105,7 +2118,7 @@
+ return 0;
+ }
+
+-static int FT_cubic_to( FT_Vector* /*const*/ p1, FT_Vector* /*const*/ p2,
FT_Vector* /*const*/ p3, void* vpPolyArgs )
++static int FT_cubic_to( FT_Vector FT_CONST* p1, FT_Vector FT_CONST* p2,
FT_Vector FT_CONST* p3, void* vpPolyArgs )
+ {
+ PolyArgs& rA = *reinterpret_cast<PolyArgs*>(vpPolyArgs);
+ rA.AddPoint( p1->x, p1->y, POLY_CONTROL );
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
