summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormrauch <mrauch@pkgsrc.org>2005-02-26 16:07:46 +0000
committermrauch <mrauch@pkgsrc.org>2005-02-26 16:07:46 +0000
commit8fded7edca0d6aa02cd4e134a4402163c3a6645c (patch)
tree98d9b7910f937976a38e1b83faf9cf494cfc2103
parent9936a8c10cc7f5a7d20414a9cbeaff791c3ca567 (diff)
downloadpkgsrc-8fded7edca0d6aa02cd4e134a4402163c3a6645c.tar.gz
Fix bug that japanese fonts can't be displayed.
Patch from Nobuyuki SASAKI in http://mail-index.netbsd.org/tech-pkg/2005/02/22/0005.html.
-rw-r--r--misc/openoffice/Makefile3
-rw-r--r--misc/openoffice/distinfo3
-rw-r--r--misc/openoffice/patches/patch-ay13
3 files changed, 17 insertions, 2 deletions
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile
index 7655c33329d..751e004d749 100644
--- a/misc/openoffice/Makefile
+++ b/misc/openoffice/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.60 2005/02/26 15:52:52 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2005/02/26 16:07:46 mrauch Exp $
DISTNAME= openoffice-1.1.4
+PKGREVISION= 1
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/1.1.4/}
DISTFILES= OOo_1.1.4_source.tar.gz
diff --git a/misc/openoffice/distinfo b/misc/openoffice/distinfo
index 254c0228596..df58eeb6bf6 100644
--- a/misc/openoffice/distinfo
+++ b/misc/openoffice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2005/02/24 11:02:56 agc Exp $
+$NetBSD: distinfo,v 1.29 2005/02/26 16:07:46 mrauch Exp $
SHA1 (openoffice-1.1.4/OOo_1.1.4_source.tar.gz) = 3161dbe53f6ec0b0d5a65790a2b1dd3d7331b430
RMD160 (openoffice-1.1.4/OOo_1.1.4_source.tar.gz) = 0e218792bb72106cd494532de373d0f40a5a9587
@@ -54,3 +54,4 @@ SHA1 (patch-au) = 662e14be36e28aacf0bb3961c194c69d39cef8a8
SHA1 (patch-av) = f6f0aa984f7d975c721d616b348a69cff6173ff8
SHA1 (patch-aw) = 15a27595dbf7599943ff9847e4841b1b62e792a6
SHA1 (patch-ax) = 4a918df6dfd058fd6abecfc4c9b85a21bfc18364
+SHA1 (patch-ay) = f548c8c79d6ef9b1a0d1e521d295bf03cd8f8849
diff --git a/misc/openoffice/patches/patch-ay b/misc/openoffice/patches/patch-ay
new file mode 100644
index 00000000000..de3adca9f14
--- /dev/null
+++ b/misc/openoffice/patches/patch-ay
@@ -0,0 +1,13 @@
+$NetBSD: patch-ay,v 1.3 2005/02/26 16:07:46 mrauch Exp $
+
+--- ../sal/osl/unx/nlsupport.c.orig 28 Jan 2004 10:17:50 -0000
++++ ../sal/osl/unx/nlsupport.c 21 Feb 2005 04:57:37 -0000
+@@ -329,7 +329,7 @@
+ { "sjis", RTL_TEXTENCODING_SHIFT_JIS } /* Japan */
+ };
+
+-#elif defined(LINUX) || defined(NETBSD)
++#elif defined(LINUX)
+
+ const _pair _nl_language_list[] = {
+ { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */