[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0-1-32-gaee2889
The following commit has been merged in the debian-experimental-3.5 branch:
commit 9ee643f21d96762e6f37f5be0ad66cafe576405d
Author: Rene Engelhard <rene@debian.org>
Date: Wed Feb 22 08:35:33 2012 +0100
also update internal npapi.h for char* -> const char*
diff --git a/changelog b/changelog
index 6679b0f..60ca5a7 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.5.0-2) UNRELEASED; urgency=low
+libreoffice (1:3.5.0-2) experimental; urgency=low
[ Rene Engelhard ]
* debian/patches/armhf-bridges*.diff: add armhf bridges fixes from
@@ -11,7 +11,7 @@ libreoffice (1:3.5.0-2) UNRELEASED; urgency=low
* debian/patches/passwordTest-test-old-password-algorith-too.diff: as name
says (see fdo#45171 and #659733/#659720)
* debian/patches/getMIMEDescription-mismatch.diff: update with proper
- ./configure check, thanks Lubok Lunak...
+ ./configure check, thanks Lubok Lunak...; also update internal header
* debian/rules:
- remove obsolete (and buggy) conditional icu-on-arm-fails breaking
@@ -28,7 +28,7 @@ libreoffice (1:3.5.0-2) UNRELEASED; urgency=low
* debian/libreoffice-common.postrm.in: remove mismerged superfluous fi
(closes: #660580)
- -- Rene Engelhard <rene@debian.org> Tue, 21 Feb 2012 19:47:58 +0000
+ -- Rene Engelhard <rene@debian.org> Wed, 22 Feb 2012 08:34:06 +0100
libreoffice (1:3.5.0-1) experimental; urgency=low
diff --git a/patches/getMIMEDescription-mismatch.diff b/patches/getMIMEDescription-mismatch.diff
index b3b2d8b..d1b4037 100644
--- a/patches/getMIMEDescription-mismatch.diff
+++ b/patches/getMIMEDescription-mismatch.diff
@@ -85,3 +85,14 @@ index 817693e..3dc9cfa 100755
ToFile( "WITH_LINKER_HASH_STYLE","@WITH_LINKER_HASH_STYLE@","e" );
ToFile( "HAVE_LD_BSYMBOLIC_FUNCTIONS",
"@HAVE_LD_BSYMBOLIC_FUNCTIONS@","e" );
+--- a/np_sdk/inc/npapi.h-old 2012-02-22 07:32:09.000000000 +0000
++++ a/np_sdk/inc/npapi.h 2012-02-22 07:32:26.000000000 +0000
+@@ -784,7 +784,7 @@
+
+ /* NPP_* functions are provided by the plugin and called by the navigator. */
+
+-char* NPP_GetMIMEDescription(void);
++const char* NPP_GetMIMEDescription(void);
+ NPError NP_LOADDS NPP_New(NPMIMEType pluginType, NPP instance,
+ uint16_t mode, int16_t argc, char* argn[],
+ char* argv[], NPSavedData* saved);
--
LibreOffice packaging repository
Reply to: