The following commit has been merged in the master branch:
commit 30611f85d3bdf2805f527ef619c72f80c230bad4
Author: Rene Engelhard <r...@debian.org>
Date: Wed Feb 23 09:10:16 2011 +0100
add disable-impress-media-embedding.diff
diff --git a/changelog b/changelog
index 9172691..7cc5294 100644
--- a/changelog
+++ b/changelog
@@ -6,6 +6,9 @@ libreoffice (1:3.3.1~rc2-2) UNRELEASED; urgency=low
for javaldx (closes: #614103)
* debian/patches/alpha-no-relax.diff: use -Wl,--no-relax on alpha
(https://bugs.freedesktop.org/show_bug.cgi?id=32224)
+ * debian/patches/disable-impress-media-embedding.diff: temp fix for upstream;
+ disable impress media embedding patches so that avmedia gets file urls
passed
+ correct again (closes: #612940)
* debian/rules:
- --with-arm-target=7 on armhf, explicit --with-arm-target=4
@@ -13,7 +16,7 @@ libreoffice (1:3.3.1~rc2-2) UNRELEASED; urgency=low
* debian/libreoffice-common.links: s/openofficeorg3/libreoffice/
(closes: #614100)
- -- Rene Engelhard <r...@debian.org> Mon, 21 Feb 2011 20:42:51 +0100
+ -- Rene Engelhard <r...@debian.org> Wed, 23 Feb 2011 09:07:55 +0100
libreoffice (1:3.3.1~rc2-1) unstable; urgency=low
diff --git a/patches/disable-impress-media-embedding.diff
b/patches/disable-impress-media-embedding.diff
new file mode 100644
index 0000000..6449fe1
--- /dev/null
+++ b/patches/disable-impress-media-embedding.diff
@@ -0,0 +1,29 @@
+From 99f78609e2b81169e1ed4aa9ffa31aeadeb4ca52 Mon Sep 17 00:00:00 2001
+From: Thorsten Behrens <tbehr...@novell.com>
+Date: Wed, 23 Feb 2011 07:44:17 +0100
+Subject: [PATCH] Temp fix for slideshow media playback bug.
+
+Fixes deb#612940 and n#651250 by disabling the impress media
+embedding patches. Those don't pass on proper temporary file system
+urls to avmedia, during slideshow.
+---
+ patches/dev300/apply | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/patches/dev300/apply b/patches/dev300/apply
+index c60565e..4df4ea2 100644
+--- libreoffice-3.3.1/libreoffice-build/patches/dev300/apply
++++ libreoffice-3.3.1/libreoffice-build/patches/dev300/apply
+@@ -2279,8 +2279,8 @@ transogl-crossplatform.diff, ericb
+ [ Features ]
+ # embed generic media files inside odf docs, plus various related
+ # sound fixes from rodo
+-impressmedia-features.diff, i#83753, n#515553, thorsten
+-slideshow-sound.diff, n#515553, rodo
++#impressmedia-features.diff, i#83753, n#515553, thorsten
++#slideshow-sound.diff, n#515553, rodo
+
+ [ Fixes ]
+ vcl-gtk-process-events-on-exit.diff, rodo
+--
+1.6.4.2
diff --git a/patches/series b/patches/series
index ffa6e14..f520609 100644
--- a/patches/series
+++ b/patches/series
@@ -8,3 +8,4 @@ pyuno-demo-fix-PYTHONPATH.diff
arm-optimization.diff
javaldx-LibreOffice.diff
alpha-no-relax.diff
+disable-impress-media-embedding.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/e1psgbh-0001rj...@alioth.debian.org
