[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.5-1-2-g3ff99e0
The following commit has been merged in the master branch:
commit 3ff99e06bfbae1dadc53b3c161def97752793185
Author: Rene Engelhard <rene@debian.org>
Date: Sun Jan 15 23:30:05 2012 +0100
make jdbc-driver-threading.diff apply on 3.4.5
diff --git a/patches/jdbc-driver-threading.diff b/patches/jdbc-driver-threading.diff
index 20f1efd..38ff506 100644
--- a/patches/jdbc-driver-threading.diff
+++ b/patches/jdbc-driver-threading.diff
@@ -1,6 +1,6 @@
--- /dev/null 2012-01-12 01:26:03.031969178 +0100
+++ libreoffice-3.4.5/libreoffice-build/patches/hotfixes/jdbc-driver-threading.diff 2012-01-15 23:08:55.000000000 +0100
-@@ -0,0 +1,62 @@
+@@ -0,0 +1,55 @@
+From cbc1ddba1bbe8843e0b31d39cb5c04f7b6518925 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Fri, 13 Jan 2012 08:38:07 +0000
@@ -14,20 +14,13 @@
+
+(cherry picked from commit bb59742bcf4883af5876a2ffadcc4a689e414b60)
+---
-+diff --git a/connectivity/source/drivers/jdbc/exports.dxp b/connectivity/source/drivers/jdbc/exports.dxp
-+index 7003307..f0e1c69 100755
-+--- connectivity/source/drivers/jdbc/exports.dxp
-++++ connectivity/source/drivers/jdbc/exports.dxp
-+@@ -1 +1,2 @@
-++component_getImplementationEnvironment
-+ component_getFactory
+diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx
+index 59c73ff..85df771 100644
+--- connectivity/source/drivers/jdbc/jservices.cxx
++++ connectivity/source/drivers/jdbc/jservices.cxx
+@@ -83,7 +83,21 @@ struct ProviderRequest
-+ void* getProvider() const { return xRet.get(); }
-+ };
++ *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
++ }
+
+-//---------------------------------------------------------------------------------------
++extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
--
LibreOffice packaging repository
Reply to: