[libreoffice] drop 0001-fix-libetonyek-build.patch
Caolán McNamara
caolanm at fedoraproject.org
Fri May 16 19:39:42 UTC 2014
commit ab4c6ab35644ff5fee1c3ff6d62f671f23c43de2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu May 15 10:10:12 2014 +0100
drop 0001-fix-libetonyek-build.patch
...afile-instead-of-PNG-for-diagrams-SmartAr.patch | 73 +++++++++++++++
0001-fix-libetonyek-build.patch | 94 --------------------
libreoffice.spec | 87 +++++++++---------
3 files changed, 115 insertions(+), 139 deletions(-)
---
diff --git a/0001-Use-SVM-metafile-instead-of-PNG-for-diagrams-SmartAr.patch b/0001-Use-SVM-metafile-instead-of-PNG-for-diagrams-SmartAr.patch
new file mode 100644
index 0000000..e1df8c2
--- /dev/null
+++ b/0001-Use-SVM-metafile-instead-of-PNG-for-diagrams-SmartAr.patch
@@ -0,0 +1,73 @@
+From 633003965a4be0c535b43cc3072c5c4a95109d34 Mon Sep 17 00:00:00 2001
+From: Tor Lillqvist <tml at collabora.com>
+Date: Fri, 16 May 2014 16:43:25 +0300
+Subject: [PATCH] Use SVM (metafile) instead of PNG for diagrams (SmartArt)
+
+It seemed a bit pointless to waste CPU cycles on PNG-compressing a
+bitmap image only to later then uncompress it anyway. vcl's PNG
+writing code showed up as 13% on the time profile of TiledLibreOffice
+when displaying a document full of SmartArts.
+
+Miklos suggested I try using SVM (which I guess means "StarView
+Metafile") instead. When using SVM, no rendering of diagrams to
+bitmaps during loading is done, but the diagram stays stored in a
+resolution-independent (vector-ish) form. Which means it will be
+rendered nicely and crisply regardless of the zoom level.
+
+At least, that is my understanding, and experimentation (on OS X and Linux)
+seems to confirm.
+
+ce8c0ff07559ddcc729bffd7a68f4c6f281882e3
+
+Change-Id: Ice8c0ff07559ddcc729bffd7a68f4c6f281882e3
+---
+ oox/source/drawingml/shape.cxx | 26 ++++++++++----------------
+ 1 file changed, 10 insertions(+), 16 deletions(-)
+
+diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
+index b319c38..33c846c 100644
+--- a/oox/source/drawingml/shape.cxx
++++ b/oox/source/drawingml/shape.cxx
+@@ -1088,7 +1088,7 @@ Reference < XShape > Shape::renderDiagramToGraphic( XmlFilterBase& rFilterBase )
+ Reference < io::XOutputStream > xOutputStream( xStream->getOutputStream() );
+
+ // Rendering format
+- OUString sFormat( "PNG" );
++ OUString sFormat( "SVM" );
+
+ // Size of the rendering
+ awt::Size aActualSize = mxShape->getSize();
+@@ -1097,21 +1097,15 @@ Reference < XShape > Shape::renderDiagramToGraphic( XmlFilterBase& rFilterBase )
+ awt::Size aSize = awt::Size( static_cast < sal_Int32 > ( ( fPixelsPer100thmm * aActualSize.Width ) + 0.5 ),
+ static_cast < sal_Int32 > ( ( fPixelsPer100thmm * aActualSize.Height ) + 0.5 ) );
+
+- Sequence< PropertyValue > aFilterData( 7 );
+- aFilterData[ 0 ].Name = "Compression";
+- aFilterData[ 0 ].Value <<= static_cast < sal_Int32 > ( 9 );
+- aFilterData[ 1 ].Name = "Interlaced";
+- aFilterData[ 1 ].Value <<= static_cast < sal_Int32 > ( 1 );
+- aFilterData[ 2 ].Name = "Translucent";
+- aFilterData[ 2 ].Value <<= static_cast < sal_Int32 > ( 1 );
+- aFilterData[ 3 ].Name = "PixelWidth";
+- aFilterData[ 3 ].Value <<= aSize.Width;
+- aFilterData[ 4 ].Name = "PixelHeight";
+- aFilterData[ 4 ].Value <<= aSize.Height;
+- aFilterData[ 5 ].Name = "LogicalWidth";
+- aFilterData[ 5 ].Value <<= aActualSize.Width;
+- aFilterData[ 6 ].Name = "LogicalHeight";
+- aFilterData[ 6 ].Value <<= aActualSize.Height;
++ Sequence< PropertyValue > aFilterData( 4 );
++ aFilterData[ 0 ].Name = "PixelWidth";
++ aFilterData[ 0 ].Value <<= aSize.Width;
++ aFilterData[ 1 ].Name = "PixelHeight";
++ aFilterData[ 1 ].Value <<= aSize.Height;
++ aFilterData[ 2 ].Name = "LogicalWidth";
++ aFilterData[ 2 ].Value <<= aActualSize.Width;
++ aFilterData[ 3 ].Name = "LogicalHeight";
++ aFilterData[ 3 ].Value <<= aActualSize.Height;
+
+ Sequence < PropertyValue > aDescriptor( 3 );
+ aDescriptor[ 0 ].Name = "OutputStream";
+--
+1.9.0
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 8d8badc..897ca91 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -266,51 +266,48 @@ Patch8: libreoffice-rhel6poppler.patch
Patch9: libreoffice-rhel6langs.patch
Patch10: libreoffice-rhel6glib.patch
%endif
-%if 0%{?rhel} && 0%{?rhel} == 7
-Patch11: 0001-fix-libetonyek-build.patch
-%endif
-Patch12: 0001-Related-rhbz-1032774-bodge-around-reported-NULL-valu.patch
-Patch13: 0001-Resolves-rhbz-1035092-no-shortcut-key-for-Italian-To.patch
-Patch14: 0001-Resolves-rhbz-912529-Kerkis-SmallCaps-shown-instead-.patch
-Patch15: 0001-disable-firebird-unit-test.patch
-Patch16: 0001-never-run-autogen.sh.patch
-Patch17: 0001-Related-rhbz-1065807-rework-i66157-for-multiple-writ.patch
-Patch18: 0001-Resolves-rhbz-1065807-use-xdg-Templates-for-default-.patch
-Patch19: 0001-rhbz-1057977-avoid-use-of-invalidated-pointers.patch
-Patch20: 0001-KDE-don-t-throw-on-TemplatePathVariable.patch
-Patch21: 0001-Wizards-should-look-for-templates-in-Template_intern.patch
-Patch22: 0001-actively-search-for-wizards-dir-in-all-internal-temp.patch
-Patch23: 0001-Change-SDK-javaodc-from-static-Package-to-dynamic-Ge.patch
-Patch24: 0001-Package-GeneratedPackage-fixup.patch
-Patch25: 0001-Related-rhbz-1075951-abrt-crash-in-MSWordExportBase-.patch
-Patch26: 0001-drop-OnlyShowIn-from-.desktop-files.patch
-Patch27: 0001-Resolves-rhbz-1081176-don-t-jump-to-cursor-pos-when.patch
-Patch28: 0001-prevent-KDE-Qt-from-interfering-with-the-session-man.patch
-Patch29: 0001-Resolves-fdo-36815-enable-printing-WYSIWYG-sidewindo.patch
-Patch30: 0001-Related-fdo-36815-print-the-text-highlight-range-as-.patch
-Patch31: 0001-Resolves-rhbz-1086714-overlarge-pixmap.patch
-Patch32: 0001-Resolves-rhbz-1089377-crash-on-loading-a-specific-rt.patch
-Patch33: 0001-add-a-format-all-comments-feature.patch
-Patch34: 0001-Resolves-fdo-37130-use-10pt-Default-style-font-for-c.patch
-Patch35: 0001-Related-fdo-36815-center-scaled-comment-page-vertica.patch
-Patch36: 0001-Resolves-fdo-78128-go-back-to-using-an-interim-metaf.patch
-Patch37: 0001-Related-rhbz-1032774-slide-restarter-should-disable-.patch
-Patch38: 0001-add-X-TryExec-entries-to-desktop-files.patch
-Patch39: 0001-resolved-fdo-78294-default-null-date-for-document-im.patch
-Patch40: 0001-Related-fdo-36815-clip-overlarge-comment-contents.patch
-Patch41: 0001-Resolves-rhbz-1092589-Thoroughly-check-whether-JRE-i.patch
-Patch42: 0001-center-slide-after-changing-zoom.patch
-Patch43: 0001-add-a-status-bar-icon-to-fit-slide-to-window.patch
-Patch44: 0001-Related-fdo-50697-reset-the-cache-timeout-on-GetGrap.patch
-Patch45: 0001-resolve-fdo-77509-memory-corruption-crash-in-Consoli.patch
-Patch46: 0001-rhbz-1071604-don-t-crash-if-slide-layout-configs-are.patch
-Patch47: 0001-Related-rhbz-1071604-don-t-paint-anim.-effect-icon.patch
-Patch48: 0001-Resolves-rhbz-1096486-avoid-access-to-nonexisting-pa.patch
-Patch49: 0001-Resolves-rhbz-1096295-hard-to-distinguish-selected-f.patch
-Patch50: 0001-fdo-78119-find-the-longest-match-for-month-name.patch
-Patch51: 0001-fdo-77242-fix-crash.patch
-Patch52: 0001-update-libxmlsec-config.-to-support-ppc64le.patch
-Patch53: 0001-fix-for-doxygen-1.8.7.patch
+Patch11: 0001-Related-rhbz-1032774-bodge-around-reported-NULL-valu.patch
+Patch12: 0001-Resolves-rhbz-1035092-no-shortcut-key-for-Italian-To.patch
+Patch13: 0001-Resolves-rhbz-912529-Kerkis-SmallCaps-shown-instead-.patch
+Patch14: 0001-disable-firebird-unit-test.patch
+Patch15: 0001-never-run-autogen.sh.patch
+Patch16: 0001-Related-rhbz-1065807-rework-i66157-for-multiple-writ.patch
+Patch17: 0001-Resolves-rhbz-1065807-use-xdg-Templates-for-default-.patch
+Patch18: 0001-rhbz-1057977-avoid-use-of-invalidated-pointers.patch
+Patch19: 0001-KDE-don-t-throw-on-TemplatePathVariable.patch
+Patch20: 0001-Wizards-should-look-for-templates-in-Template_intern.patch
+Patch21: 0001-actively-search-for-wizards-dir-in-all-internal-temp.patch
+Patch22: 0001-Change-SDK-javaodc-from-static-Package-to-dynamic-Ge.patch
+Patch23: 0001-Package-GeneratedPackage-fixup.patch
+Patch24: 0001-Related-rhbz-1075951-abrt-crash-in-MSWordExportBase-.patch
+Patch25: 0001-drop-OnlyShowIn-from-.desktop-files.patch
+Patch26: 0001-Resolves-rhbz-1081176-don-t-jump-to-cursor-pos-when.patch
+Patch27: 0001-prevent-KDE-Qt-from-interfering-with-the-session-man.patch
+Patch28: 0001-Resolves-fdo-36815-enable-printing-WYSIWYG-sidewindo.patch
+Patch29 0001-Related-fdo-36815-print-the-text-highlight-range-as-.patch
+Patch30: 0001-Resolves-rhbz-1086714-overlarge-pixmap.patch
+Patch31: 0001-Resolves-rhbz-1089377-crash-on-loading-a-specific-rt.patch
+Patch32: 0001-add-a-format-all-comments-feature.patch
+Patch33: 0001-Resolves-fdo-37130-use-10pt-Default-style-font-for-c.patch
+Patch34: 0001-Related-fdo-36815-center-scaled-comment-page-vertica.patch
+Patch35: 0001-Resolves-fdo-78128-go-back-to-using-an-interim-metaf.patch
+Patch36: 0001-Related-rhbz-1032774-slide-restarter-should-disable-.patch
+Patch37: 0001-add-X-TryExec-entries-to-desktop-files.patch
+Patch38: 0001-resolved-fdo-78294-default-null-date-for-document-im.patch
+Patch39: 0001-Related-fdo-36815-clip-overlarge-comment-contents.patch
+Patch40: 0001-Resolves-rhbz-1092589-Thoroughly-check-whether-JRE-i.patch
+Patch41: 0001-center-slide-after-changing-zoom.patch
+Patch42: 0001-add-a-status-bar-icon-to-fit-slide-to-window.patch
+Patch43: 0001-Related-fdo-50697-reset-the-cache-timeout-on-GetGrap.patch
+Patch44: 0001-resolve-fdo-77509-memory-corruption-crash-in-Consoli.patch
+Patch45: 0001-rhbz-1071604-don-t-crash-if-slide-layout-configs-are.patch
+Patch46: 0001-Related-rhbz-1071604-don-t-paint-anim.-effect-icon.patch
+Patch47: 0001-Resolves-rhbz-1096486-avoid-access-to-nonexisting-pa.patch
+Patch48: 0001-Resolves-rhbz-1096295-hard-to-distinguish-selected-f.patch
+Patch49: 0001-fdo-78119-find-the-longest-match-for-month-name.patch
+Patch50: 0001-fdo-77242-fix-crash.patch
+Patch51: 0001-update-libxmlsec-config.-to-support-ppc64le.patch
+Patch52: 0001-fix-for-doxygen-1.8.7.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice
More information about the scm-commits
mailing list