packages: libreoffice/libreoffice.spec, libreoffice/libreoffice-npshell.cxx...

[blekot]

Author: blekot                       Date: Wed Feb 29 00:24:32 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:


---- Files affected:
packages/libreoffice:
   libreoffice.spec (1.934 -> 1.935) , libreoffice-npshell.cxx.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libreoffice/libreoffice.spec
diff -u packages/libreoffice/libreoffice.spec:1.934 packages/libreoffice/libreoffice.spec:1.935
--- packages/libreoffice/libreoffice.spec:1.934	Sat Feb 25 19:09:23 2012
+++ packages/libreoffice/libreoffice.spec	Wed Feb 29 01:24:27 2012
@@ -81,6 +81,7 @@
 # Source29-md5:	18f577b374d60b3c760a3a3350407632
 Source30:	http://hg.services.openoffice.org/binaries/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 # Source30-md5:	17410483b5b5f267aa18b7e00b65e6e0
+Patch0:		%{name}-npshell.cxx.patch
 Patch1:		%{name}-hamcrest.patch
 URL:		http://www.documentfoundation.org/
 BuildRequires:	/usr/bin/getopt
@@ -2422,6 +2423,7 @@
 %prep
 %setup -q -n %{name}-core-%{version} -a1 -a2 -a3 -a4
 
+%patch0 -p0
 %patch1 -p0
 
 for dir in *-%{version}; do
@@ -3873,6 +3875,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.935  2012/02/29 00:24:27  blekot
+*** empty log message ***
+
 Revision 1.934  2012/02/25 18:09:23  baggins
 - don't let autoreconf to break the build
 - updated files

================================================================
Index: packages/libreoffice/libreoffice-npshell.cxx.patch
diff -u /dev/null packages/libreoffice/libreoffice-npshell.cxx.patch:1.1
--- /dev/null	Wed Feb 29 01:24:32 2012
+++ packages/libreoffice/libreoffice-npshell.cxx.patch	Wed Feb 29 01:24:27 2012
@@ -0,0 +1,11 @@
+--- extensions/source/nsplugin/source/npshell.cxx.old	2012-02-29 00:13:19.000000000 +0000
++++ extensions/source/nsplugin/source/npshell.cxx	2012-02-29 00:18:31.000000000 +0000
+@@ -361,7 +361,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);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libreoffice/libreoffice.spec?r1=1.934&r2=1.935&f=u