The following commit has been merged in the master branch:
commit 0ba8cba376f71ba588aa9f50bab5abcab50a48b9
Author: Rene Engelhard <[email protected]>
Date: Tue Dec 20 20:32:42 2011 +0100
fix patch (overzealous s///)...
diff --git a/patches/fdo43139.diff b/patches/fdo43139.diff
index 9ac98c6..0b78f1c 100644
--- a/patches/fdo43139.diff
+++ b/patches/fdo43139.diff
@@ -1,6 +1,6 @@
--- /dev/null 2011-12-15 01:37:17.931118287 +0100
+++ libreoffice-3.4.4/libreoffice-build/patches/hotfixes/fdo43139.diff
2011-12-20 10:49:37.000000000 +0100
-@@ -0 +1,138 @@
+@@ -0,0 +1,138 @@
+--- framework/source/accelerators/acceleratorcache.cxx.orig 2011-12-15
15:08:41.329168423 -0200
++++ framework/source/accelerators/acceleratorcache.cxx 2011-12-15
15:17:59.473190664 -0200
+@@ -61,7 +61,7 @@ AcceleratorCache::AcceleratorCache()
@@ -13,7 +13,7 @@
+ }
+
+@@ -78,7 +78,7 @@ void AcceleratorCache::takeOver(const Ac
-+ / SAFE -> ----------------------------------
++ // SAFE -> ----------------------------------
+ WriteGuard aWriteLock(m_aLock);
+
+- m_lCommand2Keys = rCopy.m_lCommand2Keys;
@@ -24,7 +24,7 @@
+--- framework/source/loadenv/loadenv.cxx.orig 2011-12-15 15:08:15.771487938
-0200
++++ framework/source/loadenv/loadenv.cxx 2011-12-15 15:19:06.038358483
-0200
+@@ -255,7 +255,8 @@ void LoadEnv::initializeLoading(const ::
-+ / take over all new parameters.
++ // take over all new parameters.
+ m_xTargetFrame.clear();
+ m_xBaseFrame = xBaseFrame ;
+- m_lMediaDescriptor =
impl_mergeMediaDescriptorWithMightExistingModelArgs(lMediaDescriptor);
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
