summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authormrg <mrg@pkgsrc.org>2011-11-24 14:13:26 +0000
committermrg <mrg@pkgsrc.org>2011-11-24 14:13:26 +0000
commiteb7113aa5d75a244389be84eacefa4025120cab6 (patch)
treee58c9d63c7e6419a5cff13efb8268d9bb9a41a90 /misc
parent2935f479eedafd6551c6dfae2dac41f17f3f1c93 (diff)
downloadpkgsrc-eb7113aa5d75a244389be84eacefa4025120cab6.tar.gz
add a missing "const" so this actually compiles.
Diffstat (limited to 'misc')
-rw-r--r--misc/openoffice3/distinfo4
-rw-r--r--misc/openoffice3/patches/patch-ae15
2 files changed, 14 insertions, 5 deletions
diff --git a/misc/openoffice3/distinfo b/misc/openoffice3/distinfo
index 3f3ba5dff5a..058bc93e7f7 100644
--- a/misc/openoffice3/distinfo
+++ b/misc/openoffice3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2011/07/31 22:08:49 tnn Exp $
+$NetBSD: distinfo,v 1.32 2011/11/24 14:13:26 mrg Exp $
SHA1 (openoffice-3.1.1/OOo_3.1.1_src_binfilter.tar.bz2) = 3b4d0d312a1bed9bdb1bbdfb172fa7361533b498
RMD160 (openoffice-3.1.1/OOo_3.1.1_src_binfilter.tar.bz2) = 8caa064f836e531035fd551cf2d7288ca5188da0
@@ -19,7 +19,7 @@ SHA1 (patch-aa) = 8561c34e623a4b97d4e6840d8c2af0483f4e21f3
SHA1 (patch-ab) = 454f3a357a8c16a027858ed5c789d29baa8eafcb
SHA1 (patch-ac) = ed6d84d40c3543eed754d74a5e65caf137f31c3d
SHA1 (patch-ad) = 8f7afec29d927db694bf511ffd615fe903cc46dc
-SHA1 (patch-ae) = 754b79eaca1dc872d61a7f8fd79d7ee8d0a17b39
+SHA1 (patch-ae) = 0ae7bb8536c4617e2bf4d97d0124cce2d6dd23c5
SHA1 (patch-af) = 553e67c7afd8506515ae40a252d4e26dce59fc51
SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4
SHA1 (patch-ah) = e0a7dd2bf36e5009b5b8a5ddc593a5a78c01a012
diff --git a/misc/openoffice3/patches/patch-ae b/misc/openoffice3/patches/patch-ae
index 9d24b04ff68..387ebcc226f 100644
--- a/misc/openoffice3/patches/patch-ae
+++ b/misc/openoffice3/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.1 2009/09/19 11:06:53 tnn Exp $
+$NetBSD: patch-ae,v 1.2 2011/11/24 14:13:26 mrg Exp $
---- extensions/source/nsplugin/source/npshell.cxx.orig 2008-07-16 22:13:01.000000000 +0200
-+++ extensions/source/nsplugin/source/npshell.cxx
+--- extensions/source/nsplugin/source/npshell.cxx.orig 2008-07-16 13:13:01.000000000 -0700
++++ extensions/source/nsplugin/source/npshell.cxx 2011-11-24 04:49:06.000000000 -0800
@@ -79,7 +79,7 @@
//http://qa.openoffice.org/issues/show_bug.cgi?id=82545
@@ -11,3 +11,12 @@ $NetBSD: patch-ae,v 1.1 2009/09/19 11:06:53 tnn Exp $
# ifndef _UINT32
# if defined(__alpha) || defined(__LP64__)
typedef unsigned int uint32;
+@@ -402,7 +402,7 @@
+ MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII ":otp:OpenDocument Presentation Template;"
+ MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII ":odf:OpenDocument Formula;" );
+
+-char*
++const char*
+ NPP_GetMIMEDescription(void)
+ {
+ debug_fprintf(NSP_LOG_APPEND, "print by Netscape Plugin, NPP_GetMIMEDescription:%s.\n", pMimeTypes);