[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-93-ga919bf1



The following commit has been merged in the debian-experimental-3.5 branch:
commit a919bf17f2072c0b076b22ed85b61a58b57f8e09
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Nov 22 07:58:52 2011 +0100

    fix nsplugin build

diff --git a/patches/getMIMEDescription-mismatch.diff b/patches/getMIMEDescription-mismatch.diff
new file mode 100644
index 0000000..9924877
--- /dev/null
+++ b/patches/getMIMEDescription-mismatch.diff
@@ -0,0 +1,13 @@
+diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx
+index fa0e0a2..51ac58b 100644
+--- libreoffice-3.5.0/extensions/source/nsplugin/source/npshell.cxx
++++ libreoffice-3.5.0/extensions/source/nsplugin/source/npshell.cxx
+@@ -363,7 +363,7 @@ MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII ":odp:OpenDocument Presentation;"
+ 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);
diff --git a/patches/series b/patches/series
index ac00b41..38ddb42 100644
--- a/patches/series
+++ b/patches/series
@@ -13,3 +13,4 @@ fix-system-lpsolve-build.diff
 install-no-dependency-on-build.diff
 cleanup-distro-install-file-lists.diff
 smoketest-only-en-US.diff
+getMIMEDescription-mismatch.diff

-- 
LibreOffice packaging repository


Reply to: