summaryrefslogtreecommitdiff
path: root/editors/abiword/patches
diff options
context:
space:
mode:
authoradam <adam>2006-01-17 08:07:38 +0000
committeradam <adam>2006-01-17 08:07:38 +0000
commit6d63491ebddafdce6a91df59be3bb92826771730 (patch)
tree795e5d93ce9559019846d9e69bda371350244b11 /editors/abiword/patches
parentcf060063435639c6e9badbb4ceab517528dbc054 (diff)
downloadpkgsrc-6d63491ebddafdce6a91df59be3bb92826771730.tar.gz
Changes 2.4.2:
* Added an OpenDocument exportes, and substantially updated the OpenDocument importer * Greatly improved the print quality of images (Unix) * Fixed a substantial number of memory leaks
Diffstat (limited to 'editors/abiword/patches')
-rw-r--r--editors/abiword/patches/patch-ab6
-rw-r--r--editors/abiword/patches/patch-ae28
2 files changed, 17 insertions, 17 deletions
diff --git a/editors/abiword/patches/patch-ab b/editors/abiword/patches/patch-ab
index a1c19884a0e..3bca3ce2ac0 100644
--- a/editors/abiword/patches/patch-ab
+++ b/editors/abiword/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.13 2005/12/07 16:45:47 joerg Exp $
+$NetBSD: patch-ab,v 1.14 2006/01/17 08:07:38 adam Exp $
---- src/af/util/xp/ut_iconv.cpp.orig 2005-07-08 16:22:11.000000000 +0000
+--- src/af/util/xp/ut_iconv.cpp.orig 2005-10-08 12:53:33.000000000 +0200
+++ src/af/util/xp/ut_iconv.cpp
@@ -68,7 +68,8 @@ extern "C" {
(defined (__MACH__) && defined (__APPLE__)) || \
(defined(TARGET_OS_MAC) && TARGET_OS_MAC) || \
- defined (__AIX__) || \
+ defined (__AIX__) || defined(__OpenBSD__) || \
-(defined(__linux__) && defined(__powerpc__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1))
+(defined(__linux__) && defined(__powerpc__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1)) || \
+defined(__NetBSD__) || (defined(_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x0109 && !defined(__DragonFly__))
diff --git a/editors/abiword/patches/patch-ae b/editors/abiword/patches/patch-ae
index 33f574a0c40..c85a627f867 100644
--- a/editors/abiword/patches/patch-ae
+++ b/editors/abiword/patches/patch-ae
@@ -1,22 +1,22 @@
-$NetBSD: patch-ae,v 1.15 2005/03/07 10:16:43 adam Exp $
+$NetBSD: patch-ae,v 1.16 2006/01/17 08:07:38 adam Exp $
---- src/af/xap/unix/xap_UnixEncodingManager.cpp.orig 2005-03-01 00:14:21.000000000 +0000
+--- src/af/xap/unix/xap_UnixEncodingManager.cpp.orig 2005-10-16 04:50:52.000000000 +0200
+++ src/af/xap/unix/xap_UnixEncodingManager.cpp
@@ -546,7 +546,7 @@ void XAP_UnixEncodingManager::initializ
- MYLANG += LanguageISOName;
- MYLANG += "_";
- MYLANG += LanguageISOTerritory;
-- putenv(MYLANG.utf8_str());
-+ putenv(const_cast<char*>MYLANG.utf8_str());
+ MYLANG += LanguageISOName;
+ MYLANG += "_";
+ MYLANG += LanguageISOTerritory;
+- putenv(MYLANG.utf8_str());
++ putenv(const_cast<char*>MYLANG.utf8_str());
#else
- UT_UTF8String MYLANG (LanguageISOName);
- MYLANG += "_";
+ UT_UTF8String MYLANG (LanguageISOName);
+ MYLANG += "_";
@@ -569,7 +569,7 @@ void XAP_UnixEncodingManager::initializ
#if defined(SETENV_MISSING)
- MYLANG = "LANG=";
- MYLANG += OLDLANG;
-- putenv(MYLANG.utf8_str());
-+ putenv(const_cast<char*>MYLANG.utf8_str());
+ MYLANG = "LANG=";
+ MYLANG += OLDLANG;
+- putenv(MYLANG.utf8_str());
++ putenv(const_cast<char*>MYLANG.utf8_str());
#else
- setenv("LANG", OLDLANG.utf8_str(), 1);
+ setenv("LANG", OLDLANG.utf8_str(), 1);
#endif