diff options
| author | taca <taca> | 2010-12-01 15:55:27 +0000 |
|---|---|---|
| committer | taca <taca> | 2010-12-01 15:55:27 +0000 |
| commit | b70720b8002c4cae6689b0cfdc381be0d06f0f8f (patch) | |
| tree | ece5ea09bb323b577bc2e2b5bede6da046be74f8 /www | |
| parent | b8850791694118792d01ffe7650f48e7b750bdd4 (diff) | |
| download | pkgsrc-b70720b8002c4cae6689b0cfdc381be0d06f0f8f.tar.gz | |
Update patch to EncodingConverter class for better work around
against GNU iconv.
Bump PKGREVISION.
Diffstat (limited to 'www')
| -rw-r--r-- | www/fengoffice/Makefile | 3 | ||||
| -rw-r--r-- | www/fengoffice/distinfo | 4 | ||||
| -rw-r--r-- | www/fengoffice/patches/patch-aa | 30 |
3 files changed, 24 insertions, 13 deletions
diff --git a/www/fengoffice/Makefile b/www/fengoffice/Makefile index eab4aba9c51..7c5116aac3b 100644 --- a/www/fengoffice/Makefile +++ b/www/fengoffice/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2010/09/14 00:57:11 taca Exp $ +# $NetBSD: Makefile,v 1.8 2010/12/01 15:55:27 taca Exp $ # DISTNAME= fengoffice_1.7.2 PKGNAME= ${DISTNAME:S/_/-/:C/.rc$/rc1/} +PKGREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opengoo/} EXTRACT_SUFX= .zip diff --git a/www/fengoffice/distinfo b/www/fengoffice/distinfo index 720da3cf469..45121b50b29 100644 --- a/www/fengoffice/distinfo +++ b/www/fengoffice/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2010/09/14 00:57:11 taca Exp $ +$NetBSD: distinfo,v 1.6 2010/12/01 15:55:27 taca Exp $ SHA1 (fengoffice-20100126/fengoffice_1.7.2.zip) = c7c073873cbdc75457cfd7954ac0f234623d9894 RMD160 (fengoffice-20100126/fengoffice_1.7.2.zip) = 398de30aa621acfd83c705a4249dded44e0113a7 Size (fengoffice-20100126/fengoffice_1.7.2.zip) = 7840400 bytes -SHA1 (patch-aa) = 86232f5272dd900fee0218ec9c0da7fd1c76b160 +SHA1 (patch-aa) = 2a1aad7b4de85ea69a00921f54ddae2b4ebd3060 SHA1 (patch-ac) = 10cdae0fe56a08d0f04e4071ba2eb82112495fe5 diff --git a/www/fengoffice/patches/patch-aa b/www/fengoffice/patches/patch-aa index de638380a12..3a9a5dfe903 100644 --- a/www/fengoffice/patches/patch-aa +++ b/www/fengoffice/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.1 2010/07/05 03:26:46 taca Exp $ +$NetBSD: patch-aa,v 1.2 2010/12/01 15:55:27 taca Exp $ Unofficial patch to avoid iconv(GNU or gnu libc) portability problem. -http://www.fengoffice.com/web/bugs/view.php?id=6 +(mb-iconv.patch from http://www.fengoffice.com/web/bugs/view.php?id=6) ---- environment/classes/encoding/EncodingConverter.class.php.orig 2010-06-28 21:05:03.000000000 +0000 +--- environment/classes/encoding/EncodingConverter.class.php.orig 2010-09-13 20:30:20.000000000 +0000 +++ environment/classes/encoding/EncodingConverter.class.php @@ -6,6 +6,16 @@ class EncodingConverter var $_last_err_filename; @@ -22,11 +22,13 @@ http://www.fengoffice.com/web/bugs/view.php?id=6 function _handleError($err, $msg, $errfile, $errline, $errcontext) { $trace = debug_backtrace(); -@@ -25,10 +35,22 @@ class EncodingConverter +@@ -25,12 +35,29 @@ class EncodingConverter } function convert($in_enc, $out_enc, $str, $return_original_on_error = true, $ignore_non_compatible = true) { -+ if (is_null(self::$gnu_iconv)) { ++ $mbflag = function_exists("mb_convert_encoding"); ++ ++ if (!$mbflag && is_null(self::$gnu_iconv)) { + $dummy = "a"; + $ascii = 'us-ascii'; + $func = set_error_handler("self::iconv_error"); @@ -39,10 +41,18 @@ http://www.fengoffice.com/web/bugs/view.php?id=6 + $this->_last_err = null; set_error_handler(array(&$this, '_handleError')); - +- - if ($ignore_non_compatible) $out_enc .= "//IGNORE"; -+ if (self::$gnu_iconv) -+ if ($ignore_non_compatible) $out_enc .= "//IGNORE"; - - $retval = iconv($in_enc, $out_enc, $str); +- +- $retval = iconv($in_enc, $out_enc, $str); ++ ++ if(!$mbflag) { ++ if (self::$gnu_iconv) ++ if ($ignore_non_compatible) $out_enc .= "//IGNORE"; ++ $retval = iconv($in_enc, $out_enc, $str); ++ } else { ++ $retval = mb_convert_encoding($str, $out_enc, $in_enc); ++ } + restore_error_handler(); + if ($this->hasError()) { |