[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.5.4-5-172-g899d9d2
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 0945cb2dc35f2f7843eadcec5613474227e11eac
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Aug 8 11:11:26 2012 +0200
update patch queue
diff --git a/changelog b/changelog
index f3d9d74..a848297 100644
--- a/changelog
+++ b/changelog
@@ -2,11 +2,17 @@ libreoffice (1:3.6.0~rc4-0ubuntu2) precise; urgency=low
* backport patch to evade fdo#51324 (LP: #1017125)
* pure white progress bar is better for now (LP: #1026059)
- * remove unused unoapi-test disabling patch
- * remove force C++ ABI patch
* reenable subsequentcheck
-
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 08 Aug 2012 09:57:43 +0200
+ * update patch queue:
+ - readd split-binfilters-and-evo.diff from debian
+ - add backported dont-let-autoextension-interfere-with-kfiledialog.diff
+ from debian
+ - remove obsolete force C++ ABI patch
+ - remove obsolete lp-904212-add-missing-mimetypes-to-impress.desktop.diff
+ - remove obsolete remove-broken-mysqlcon-version-check.diff
+ - remove unoapi-test disabling patch, now that we seem to evade lp#1017125
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 08 Aug 2012 11:05:24 +0200
libreoffice (1:3.6.0~rc4-0ubuntu1) quantal-proposed; urgency=low
diff --git a/patches/dont-let-autoextension-interfere-with-kfiledialog.diff b/patches/dont-let-autoextension-interfere-with-kfiledialog.diff
new file mode 100644
index 0000000..9ce7a75
--- /dev/null
+++ b/patches/dont-let-autoextension-interfere-with-kfiledialog.diff
@@ -0,0 +1,30 @@
+From c921fc0ae2b20de1953e7558fce6b9ddb94c56d3 Mon Sep 17 00:00:00 2001
+From: Luboš Luňák <l.lunak@suse.cz>
+Date: Wed, 01 Aug 2012 09:11:44 +0000
+Subject: do not let LO's autoextension handling interfere with KFileDialog's(fdo#52546)
+
+Change-Id: I73263a74d7b9bbf4a99e86773854e69f747e19d5
+Signed-off-by: Tomas Chvatal <tchvatal@suse.cz>
+---
+diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
+index df08ed7..4917bf7 100644
+--- a/vcl/unx/kde4/KDE4FilePicker.cxx
++++ b/vcl/unx/kde4/KDE4FilePicker.cxx
+@@ -398,9 +398,12 @@ uno::Any SAL_CALL KDE4FilePicker::getValue( sal_Int16 controlId, sal_Int16 )
+ switch (controlId)
+ {
+ case ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION:
+- // we ignore this one and rely on KFileDialog to provide the function,
+- // always return true, here meaning "it's been taken care of"
+- res = uno::Any( true );
++ // We ignore this one and rely on KFileDialog to provide the function.
++ // Always return false, to pretend we do not support this, otherwise
++ // LO core would try to be smart and cut the extension in some places,
++ // interfering with KFileDialog's handling of it. KFileDialog also
++ // saves the value of the setting, so LO core is not needed for that either.
++ res = uno::Any( false );
+ break;
+ case ExtendedFilePickerElementIds::CHECKBOX_PASSWORD:
+ case ExtendedFilePickerElementIds::CHECKBOX_FILTEROPTIONS:
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/patches/lp-904212-add-missing-mimetypes-to-impress.desktop.diff b/patches/lp-904212-add-missing-mimetypes-to-impress.desktop.diff
deleted file mode 100644
index 8ff7c19..0000000
--- a/patches/lp-904212-add-missing-mimetypes-to-impress.desktop.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-From 19bb32e40462042b7818383ded15f37ebda4fcbf Mon Sep 17 00:00:00 2001
-From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
-Date: Thu, 26 Apr 2012 02:10:36 +0200
-Subject: [PATCH] lp#904212: add missing mimetypes to impress.desktop
-
-* application/vnd.openxmlformats-officedocument.presentationml.slide
-* application/vnd.openxmlformats-officedocument.presentationml.slideshow
-
-Conflicts:
-
- sysui/desktop/menus/impress.desktop
----
- sysui/desktop/menus/impress.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop
-index 92060e3..e4bb88b 100755
---- a/sysui/desktop/menus/impress.desktop
-+++ b/sysui/desktop/menus/impress.desktop
-@@ -5,7 +5,7 @@ Icon=impress
- Type=Application
- Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Presentations;
- Exec=${UNIXBASISROOTNAME} --impress %U
--MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-flat-xml;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;
-+MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-flat-xml;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.slide;application/vnd.openxmlformats-officedocument.presentationml.slideshow;
- Name=%PRODUCTNAME Impress
- GenericName=Presentation
- Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress.
---
-1.7.9.5
-
diff --git a/patches/series b/patches/series
index 9e1e5ac..5ce7e6a 100644
--- a/patches/series
+++ b/patches/series
@@ -2,6 +2,7 @@ no-minimaltoc.diff
debian-opt.diff
gcj-safe-jni-h-include.diff
jurt-soffice-location.diff
+split-binfilters-and-evo.diff
debian-debug.diff
#rhino-build-optional.diff
disable-dynamic-list-cpp.diff
@@ -23,8 +24,8 @@ gtk3-hack-explicit-gmodule.diff
pyuno-py3-module.diff
ignore-sc_cellrangesbase-fails.diff
build-dont-run-checks.diff
-#lp-904212-add-missing-mimetypes-to-impress.desktop.diff
disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
+dont-let-autoextension-interfere-with-kfiledialog.diff
lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
remove-broken-mysqlcon-version-check.diff
fdo-51324-lp-1017125-rhbz-806236-rhbz-823272-erase-o.diff
--
LibreOffice packaging repository
Reply to: