Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors
In directory 
sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv21236/10.4/unstable/main/finkinfo/editors

Modified Files:
        abiword.info abiword.patch 
Log Message:
Fix build error related to libiconv. ICONV_CONST is defined in wv/config.h.

Index: abiword.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/abiword.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- abiword.patch       15 Jul 2008 01:40:49 -0000      1.2
+++ abiword.patch       20 Aug 2008 10:46:17 -0000      1.3
@@ -190,3 +190,24 @@
 -trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
 -uncompr.o: zlib.h zconf.h
 -zutil.o: zutil.h zlib.h zconf.h
+diff -uNr abiword-2.4.6/abi/src/af/util/xp/ut_iconv.cpp 
abiword-2.4.6-new/abi/src/af/util/xp/ut_iconv.cpp
+--- abiword-2.4.6/abi/src/af/util/xp/ut_iconv.cpp      2005-10-08 
19:53:33.000000000 +0900
++++ abiword-2.4.6-new/abi/src/af/util/xp/ut_iconv.cpp  2008-08-20 
19:04:47.000000000 +0900
+@@ -64,16 +64,7 @@
+    else who will look into it.  Enjoy your afterlife, sam. - MG - jun 2002
+ */
+ 
+-#if defined (WIN32) || defined(__QNXNTO__) || defined(__CYGWIN__) ||  \
+-(defined (__MACH__) && defined (__APPLE__)) || \
+-(defined(TARGET_OS_MAC) && TARGET_OS_MAC) || \
+-defined (__AIX__) || defined(__OpenBSD__) || \
+-(defined(__linux__) && defined(__powerpc__) && (__GLIBC__ <= 2) && 
(__GLIBC_MINOR__ <= 1))
+-
+-#define ICONV_CONST const
+-#else
+-#define ICONV_CONST
+-#endif
++#include "config.h"
+ 
+ /*
+  * This file represents my own personal assault on iconv, the most horrid

Index: abiword.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/abiword.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- abiword.info        29 Jul 2008 00:53:45 -0000      1.7
+++ abiword.info        20 Aug 2008 10:46:17 -0000      1.8
@@ -1,6 +1,6 @@
 Package: abiword
 Version: 2.4.6
-Revision: 2
+Revision: 3
 Depends: <<
        applesystemfonts,
        atk1-shlibs (>= 1.20.0-1),
@@ -68,7 +68,7 @@
        xft2-dev
 <<
 PatchFile: %n.patch
-PatchFile-MD5: 562b8701913509f3dc8b32cb85df9b06
+PatchFile-MD5: f0c4afeb036e939ca1b16cf11c7333ca
 PatchScript: <<
        cd .. && sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
 <<


-------------------------------------------------------------------------
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

Reply via email to