summaryrefslogtreecommitdiff
path: root/editors/abiword/patches
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2008-03-02 13:13:48 +0000
committerdrochner <drochner@pkgsrc.org>2008-03-02 13:13:48 +0000
commit84ac12e874d6f5e98e476c7fe4f59af61897ad49 (patch)
tree5ac4b7b728372b27984062542b58308d20b3b5d1 /editors/abiword/patches
parente54eaafed82354d585724ed4525a1bee323ff94a (diff)
downloadpkgsrc-84ac12e874d6f5e98e476c7fe4f59af61897ad49.tar.gz
NetBSD's iconv(3) doesn't understand "UCS4", so use "UCS-4",
should fix copy-and-paste, reported by Andreas Burghardt in PR pkg/38133, bump PKGREVISION
Diffstat (limited to 'editors/abiword/patches')
-rw-r--r--editors/abiword/patches/patch-ab15
1 files changed, 14 insertions, 1 deletions
diff --git a/editors/abiword/patches/patch-ab b/editors/abiword/patches/patch-ab
index 3bca3ce2ac0..5fc639247c8 100644
--- a/editors/abiword/patches/patch-ab
+++ b/editors/abiword/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.14 2006/01/17 08:07:38 adam Exp $
+$NetBSD: patch-ab,v 1.15 2008/03/02 13:13:48 drochner Exp $
--- src/af/util/xp/ut_iconv.cpp.orig 2005-10-08 12:53:33.000000000 +0200
+++ src/af/util/xp/ut_iconv.cpp
@@ -12,3 +12,16 @@ $NetBSD: patch-ab,v 1.14 2006/01/17 08:07:38 adam Exp $
#define ICONV_CONST const
#else
+@@ -290,9 +291,11 @@ const char * ucs4Internal ()
+ #elif defined(_LIBICONV_H)
+ // libiconv seems to prefer UCS-4-INTERNAL to UCS-4BE and UCS-4LE
+ return "UCS-4-INTERNAL";
+-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#elif defined(__FreeBSD__) || defined(__OpenBSD__)
+ // we special case the BSDs since spelling just doesn't work
+ return "UCS4";
++#elif defined(__NetBSD__)
++ return "UCS-4";
+ #else
+ // general case, found by hub and dom
+ if (s_ucs4_internal == 0)