[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0-1-18-g2fc115d
The following commit has been merged in the debian-experimental-3.5 branch:
commit 2fc115df1abfbba66361f1fd8bd0c796e1ce5ea8
Author: Rene Engelhard <rene@debian.org>
Date: Tue Feb 21 17:11:12 2012 +0000
update getMIMEDescription-mismatch.diffwith proper ./configure check, thanks Lubok Lunak
diff --git a/changelog b/changelog
index e294004..876a124 100644
--- a/changelog
+++ b/changelog
@@ -10,6 +10,8 @@ libreoffice (1:3.5.0-2) UNRELEASED; urgency=low
as name says; imported from Fedora
* 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...
* debian/rules:
- remove obsolete (and buggy) conditional icu-on-arm-fails breaking
@@ -23,7 +25,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> Sun, 19 Feb 2012 23:03:52 +0000
+ -- Rene Engelhard <rene@debian.org> Tue, 21 Feb 2012 17:10:12 +0000
libreoffice (1:3.5.0-1) experimental; urgency=low
diff --git a/patches/getMIMEDescription-mismatch.diff b/patches/getMIMEDescription-mismatch.diff
index 9924877..b3b2d8b 100644
--- a/patches/getMIMEDescription-mismatch.diff
+++ b/patches/getMIMEDescription-mismatch.diff
@@ -1,13 +1,87 @@
+diff --git a/configure.in b/configure.in
+index 4667f0b..28c8790 100644
+--- a/configure.in
++++ b/configure.in
+@@ -6089,6 +6089,7 @@ AC_SUBST(NSS_LIBS)
+ dnl ===================================================================
+ dnl Check for system mozilla headers
+ dnl ===================================================================
++HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=
+ AC_MSG_CHECKING([which mozilla headers to use])
+ if test "$with_system_mozilla_headers" = "yes"; then
+ AC_MSG_RESULT([external])
+@@ -6103,12 +6104,31 @@ if test "$with_system_mozilla_headers" = "yes"; then
+ if test "x$LOCATED" != "xyes"; then
+ AC_MSG_ERROR([npapi.h header file not found])
+ fi
++
++ AC_LANG_PUSH([C])
++ save_CFLAGS=$CFLAGS
++ CFLAGS="$CFLAGS $MOZILLA_HEADERS_CFLAGS"
++ AC_MSG_CHECKING([for NPP_GetMIMEDescription return type])
++ AC_COMPILE_IFELSE(
++ [AC_LANG_SOURCE([[
++ #define XP_UNIX
++ #include <npapi.h>
++ const char* NPP_GetMIMEDescription(void) { return "foo"; }
++ ]])],
++ [AC_MSG_RESULT([const char*])],
++ [
++ AC_MSG_RESULT([char*])
++ HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=TRUE
++ ])
++ CFLAGS=$save_CFLAGS
++ AC_LANG_POP([C])
+ else
+ AC_MSG_RESULT([internal])
+ SYSTEM_MOZILLA_HEADERS=NO
+ fi
+ AC_SUBST(MOZILLA_HEADERS_CFLAGS)
+ AC_SUBST(SYSTEM_MOZILLA_HEADERS)
++AC_SUBST(HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION)
+
+ dnl ===================================================================
+ dnl Check for system sane
+diff --git a/extensions/source/nsplugin/source/makefile.mk b/extensions/source/nsplugin/source/makefile.mk
+index 5b74764..d3c6fb1 100644
+--- a/extensions/source/nsplugin/source/makefile.mk
++++ b/extensions/source/nsplugin/source/makefile.mk
+@@ -42,6 +42,10 @@ INCPRE+=$(MOZILLA_HEADERS_CFLAGS)
+ INCPRE=$(SOLARINCDIR)$/npsdk
+ .ENDIF
+
++.IF "$(HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION)" "TRUE"
++CXXFLAGS += -DHAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=1
++.ENDIF
++
+ .IF "$(GUI)"=="UNX"
+
+ # not sure about -DMOZ_X11 but otheriwse some struct member don't exist...
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;"
+index e25326f..be8ea84 100644
+--- a/extensions/source/nsplugin/source/npshell.cxx
++++ b/extensions/source/nsplugin/source/npshell.cxx
+@@ -361,7 +361,10 @@ 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*
++#ifndef HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION
++const
++#endif
++char*
NPP_GetMIMEDescription(void)
{
debug_fprintf(NSP_LOG_APPEND, "print by Netscape Plugin, NPP_GetMIMEDescription:%s.\n", pMimeTypes);
+diff --git a/set_soenv.in b/set_soenv.in
+index 817693e..3dc9cfa 100755
+--- a/set_soenv.in
++++ b/set_soenv.in
+@@ -1777,6 +1777,7 @@ ToFile( "HAVE_GCC_VISIBILITY_FEATURE",
+ ToFile( "HAVE_GCC_VISIBILITY_BROKEN",
+ "@HAVE_GCC_VISIBILITY_BROKEN@", "e" );
+ ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" );
++ToFile( "HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION","@HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION@","e" );
+ ToFile( "WITH_LINKER_HASH_STYLE","@WITH_LINKER_HASH_STYLE@","e" );
+ ToFile( "HAVE_LD_BSYMBOLIC_FUNCTIONS",
+ "@HAVE_LD_BSYMBOLIC_FUNCTIONS@","e" );
--
LibreOffice packaging repository
Reply to: