The following commit has been merged in the debian-experimental-3.5 branch:
commit a08c499acf24b8ce1b04961df1efb794102dd7a9
Author: Rene Engelhard <r...@debian.org>
Date: Fri May 11 21:25:49 2012 +0200
remove patches integrated into 3.5.4
diff --git a/changelog b/changelog
index 759c98e..dc7d119 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:3.5.4~rc1~git20120511-1) UNRELEASED; urgency=low
+
+ * new upstream release candidate snapshot
+
+ -- Rene Engelhard <r...@debian.org> Tue, 08 May 2012 11:37:43 +0200
+
libreoffice (1:3.5.3-3) UNRELEASED; urgency=low
[ Rene Engelhard ]
diff --git a/patches/fix-bean.diff b/patches/fix-bean.diff
deleted file mode 100644
index 218ef30..0000000
--- a/patches/fix-bean.diff
+++ /dev/null
@@ -1,180 +0,0 @@
- Repository.mk | 2 +-
- bean/com/sun/star/comp/beans/LocalOfficeConnection.java | 2 +-
- bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c | 10 ++++++----
- bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c | 7 +++++--
- scp2/source/ooo/file_library_ooo.scp | 11
++++++++++-
- 5 files changed, 23 insertions(+), 9 deletions(-)
-
-New commits:
-commit 708229dc96533b6f165b82ce4d9e07537d1ce8b1
-Author: Stephan Bergmann <sberg...@redhat.com>
-Date: Mon May 7 16:54:43 2012 +0200
-
- fdo#49580: Fix bean after gbuild'ification
-
- 4478b739ddade09425d496cbddee1542fdfd5e9b "convert bean to gbuild and add to
- tail_build" broke the following:
- * The name of the officebean dynamic library must not be changed (by
adding the
- "lo" extension), as code in officebean.jar uses it in
NativeLibraryLoader.
- * With gbuild's per-default hidden visibility, JNIEXPORT functions must
instead
- use SAL_DLLPUBLIC_EXPORT. (Windows-only code in bean/native/win32/
should be
- safe to continue using JNIEXPORT.)
-
- Change-Id: I I3c312dd05c90421ba0c726496b7149a26d155604
-
-diff --git a/Repository.mk b/Repository.mk
-index 68a8890..900b538 100644
---- a/Repository.mk
-+++ b/Repository.mk
-@@ -114,7 +114,6 @@
- forui \
- odbc \
- odbcbase \
-- officebean \
- oox \
- ooxml \
- sdbc \
-@@ -276,6 +275,7 @@
- localedata_euro \
- localedata_others \
- mcnttype \
-+ officebean \
- neon \
- package2 \
- reg \
-diff --git a/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c
b/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c
-index a45b49e..cc35283 100644
---- a/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c
-+++ b/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c
-@@ -26,6 +26,8 @@
- *
- ************************************************************************/
-
-+#include "sal/config.h"
-+
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #include <X11/Intrinsic.h>
-@@ -40,7 +42,7 @@
- #include "jawt_md.h"
- #include "jawt.h"
-
--/*#include "../inc/com_sun_star_comp_beans_LocalOfficeWindow.h"*/
-+#include "sal/types.h"
-
- #if defined assert
- #undef assert
-@@ -55,7 +57,7 @@
- #define SYSTEM_MAC 5
- #define SYSTEM_XWINDOW 6
-
--JNIEXPORT jlong JNICALL
Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindow
-+SAL_DLLPUBLIC_EXPORT jlong JNICALL
Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindow
- (JNIEnv * env, jobject obj_this);
-
-
/*****************************************************************************/
-@@ -64,7 +66,7 @@ JNIEXPORT jlong JNICALL
Java_com_sun_star_comp_beans_LocalOfficeWindow_getNative
- * Method: getNativeWindowSystemType
- * Signature: ()I
- */
--JNIEXPORT jint JNICALL
Java_com_sun_star_beans_LocalOfficeWindow_getNativeWindowSystemType
-+SAL_DLLPUBLIC_EXPORT jint JNICALL
Java_com_sun_star_beans_LocalOfficeWindow_getNativeWindowSystemType
- (JNIEnv * env, jobject obj_this)
- {
- (void) env; /* avoid warning about unused parameter */
-@@ -79,7 +81,7 @@ JNIEXPORT jint JNICALL
Java_com_sun_star_beans_LocalOfficeWindow_getNativeWindow
- * Method: getNativeWindow
- * Signature: ()J
- */
--JNIEXPORT jlong JNICALL
Java_com_sun_star_beans_LocalOfficeWindow_getNativeWindow
-+SAL_DLLPUBLIC_EXPORT jlong JNICALL
Java_com_sun_star_beans_LocalOfficeWindow_getNativeWindow
- (JNIEnv * env, jobject obj_this)
- {
- (void) env; /* avoid warning about unused parameter */
-diff --git a/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
b/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
-index 5b36110..8510dc3 100644
---- a/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
-+++ b/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
-@@ -26,6 +26,8 @@
- *
- ************************************************************************/
-
-+#include "sal/config.h"
-+
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #include <X11/Intrinsic.h>
-@@ -40,6 +42,7 @@
- #include "jawt_md.h"
- #include "jawt.h"
-
-+#include "sal/types.h"
-
- #define SYSTEM_WIN32 1
- #define SYSTEM_WIN16 2
-@@ -71,7 +74,7 @@ static void ThrowException(JNIEnv * env, char const * type,
char const * msg) {
- * Method: getNativeWindowSystemType
- * Signature: ()I
- */
--JNIEXPORT jint JNICALL
Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindowSystemType
-+SAL_DLLPUBLIC_EXPORT jint JNICALL
Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindowSystemType
- (JNIEnv * env, jobject obj_this)
- {
- (void) env; /* avoid warning about unused parameter */
-@@ -86,7 +89,7 @@ JNIEXPORT jint JNICALL
Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeW
- * Method: getNativeWindow
- * Signature: ()J
- */
--JNIEXPORT jlong JNICALL
Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindow
-+SAL_DLLPUBLIC_EXPORT jlong JNICALL
Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindow
- (JNIEnv * env, jobject obj_this)
- {
- jboolean result;
-diff --git a/scp2/source/ooo/file_library_ooo.scp
b/scp2/source/ooo/file_library_ooo.scp
-index 63b2f8f..83f125e 100644
---- a/scp2/source/ooo/file_library_ooo.scp
-+++ b/scp2/source/ooo/file_library_ooo.scp
-@@ -914,7 +914,16 @@ STD_LIB_FILE( gid_File_Lib_Offacc, offacc)
- #ifdef SOLAR_JAVA
- #ifndef MACOSX
-
--STD_LIB_FILE(gid_File_Lib_Officebean, officebean)
-+File gid_File_Lib_Officebean
-+ TXT_FILE_BODY;
-+ Styles = (PACKED);
-+ Dir = SCP2_OOO_BIN_DIR;
-+ #ifdef UNX
-+ Name = STRING(CONCAT2(libofficebean,UNXSUFFIX));
-+ #else
-+ Name = "officebean.dll";
-+ #endif
-+End
-
- #endif
- #endif
-commit 6752930497d1c9d0d1ebb29113e89bdaf9e53aaa
-Author: Stephan Bergmann <sberg...@redhat.com>
-Date: Mon May 7 16:49:54 2012 +0200
-
- LocalOfficeConnection description must end in ServiceManager
-
- ...instead of NamingService. Even though current
-
<http://wiki.services.openoffice.org/w/index.php?title=Documentation/DevGuide/JavaBean/Customized_Configuration&oldid=127145>
- documents using the latter, it leads to NullPointerException, as connect()
- expects aInitialObject to be an XPropertySet.
-
- Change-Id: Ia8445bed5307bf440d078a8b96200e3b7fa38706
-
-diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
-index bb6abdd..4b5f4fc 100644
---- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
-+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
-@@ -531,7 +531,7 @@ public class LocalOfficeConnection
- throws java.net.MalformedURLException
- {
- // Extruct parameters.
-- int idx = url.indexOf(";urp;StarOffice.NamingService");
-+ int idx = url.indexOf(";urp;StarOffice.ServiceManager");
- if (idx < 0)
- throw new java.net.MalformedURLException(
- "Invalid UNO connection URL.");
diff --git a/patches/more-robust-nss-initialization.diff
b/patches/more-robust-nss-initialization.diff
deleted file mode 100644
index 9a59f77..0000000
--- a/patches/more-robust-nss-initialization.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-From 7ead068be9f865327da7aef1cdc01614f25fc4a6 Mon Sep 17 00:00:00 2001
-From: Markus Mohrhard <markus.mohrh...@googlemail.com>
-Date: Fri, 04 May 2012 13:12:21 +0000
-Subject: more robust nss initialization, related fdo#45171
-
-fall back to without profile if path is invalid or profile does not
-exist
-
-Change-Id: Ic9a73fbaaa288f8bc99dab2b1d679c2cbe6baa89
----
-diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
-index 531d716..1ed0b70 100644
---- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
-+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
-@@ -261,6 +261,7 @@
-
- PR_Init( PR_USER_THREAD, PR_PRIORITY_NORMAL, 1 ) ;
-
-+ bool bSuccess = true;
- // there might be no profile
- if ( sCertDir.getLength() > 0 )
- {
-@@ -280,10 +281,11 @@ bool nsscrypto_initialize( const css::uno::Reference<
css::lang::XMultiServiceFa
- PR_GetErrorText(error);
- if (error)
- xmlsec_trace("%s",error);
-- return false ;
-+ bSuccess = false;
- }
- }
-- else
-+
-+ if( sCertDir.isEmpty() || !bSuccess )
- {
- xmlsec_trace("Initializing NSS without profile.");
- if ( NSS_NoDB_Init(NULL) != SECSuccess )
---
-cgit v0.9.0.2-2-gbebe
diff --git a/patches/mozilla-profile-absolute-paths.diff
b/patches/mozilla-profile-absolute-paths.diff
deleted file mode 100644
index 8bca6a4..0000000
--- a/patches/mozilla-profile-absolute-paths.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-From 3ee18325cf8c06c04296173619f4535671e391e9 Mon Sep 17 00:00:00 2001
-From: Markus Mohrhard <markus.mohrh...@googlemail.com>
-Date: Thu, 03 May 2012 21:03:50 +0000
-Subject: respect absolute paths for mozilla profile, fdo#45171, lp#919659
-
-Change-Id: I536238f1f3b05e0a942caa1f65444688d4d36704
-(cherry picked from commit fff2d18a08a37c0fa6a370e56591117fc08664d2)
-
-Signed-off-by: Michael Stahl <mst...@redhat.com>
----
-diff --git
a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
-index be2eb8c..5e8fecb 100644
---- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
-+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
-@@ -202,13 +202,13 @@ namespace connectivity
- }
- if (profileName.getLength() != 0 || profilePath.getLength()
!= 0)
- {
--#ifndef MINIMAL_PROFILEDISCOVER
- sal_Int32 isRelative = 0;
- if (sIsRelative.getLength() != 0)
- {
- isRelative = sIsRelative.toInt32();
- }
-
-+#ifndef MINIMAL_PROFILEDISCOVER
- nsCOMPtr<nsILocalFile> rootDir;
- rv = NS_NewLocalFile(EmptyString(), PR_TRUE,
- getter_AddRefs(rootDir));
-@@ -229,11 +229,21 @@ namespace connectivity
- rv = rootDir->SetPersistentDescriptor(filePath);
- }
- if (NS_FAILED(rv)) continue;
-+#else
-+ rtl::OUString fullProfilePath;
-+ if(isRelative)
-+ {
-+ fullProfilePath = regDir + profilePath;
-+ }
-+ else
-+ {
-+ fullProfilePath = profilePath;
-+ }
- #endif
-
- ProfileStruct* profileItem = new
ProfileStruct(product,profileName,
- #ifdef MINIMAL_PROFILEDISCOVER
-- regDir + profilePath
-+ fullProfilePath
- #else
- rootDir
- #endif
---
-cgit v0.9.0.2-2-gbebe
diff --git a/patches/series b/patches/series
index 8e7c80c..e119fd1 100644
--- a/patches/series
+++ b/patches/series
@@ -35,7 +35,4 @@ lp-926940-visio-mime-for-draw.diff
gcc-4.4.diff
lp-904212-add-missing-mimetypes-to-impress.desktop.diff
ignore-sc_cellrangesbase-fails.diff
-mozilla-profile-absolute-paths.diff
-more-robust-nss-initialization.diff
-fix-bean.diff
wiki-publisher-add-missing-xsls.diff
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ssvv7-0001eb...@vasks.debian.org
