Resolves: rhbz#1054952 bad access of smb URLs on KDE

10 years ago · ba822012ef
parent b67fc84c5c
commit ba822012ef
2 changed files with 155 additions and 9 deletions
--- a/0001-Remove-smb-from-X-KDE-Protocols-lines.patch
+++ b/0001-Remove-smb-from-X-KDE-Protocols-lines.patch
@ -0,0 +1,150 @@
+From f9f9aa9873c5851da86d33ca75e937ac022206a3 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Wed, 8 Oct 2014 09:54:55 +0200
+Subject: [PATCH] Remove smb from X-KDE-Protocols lines
+
+smb was included in the set of supported protocols since those X-KDE-Protocol
+lines got introduced with 673be8e76856c6bc39f448f3374db4ae84258952 "add
+X-KDE-Protocols," but as discussed in the mail thread starting at
+<http://lists.freedesktop.org/archives/libreoffice/2014-September/063621.html>
+"X-KDE-Protocols=...,smb,...," actual support for smb URLs in LO under KDE is
+very fragile and typically requires further steps from the user (which vary
+across the various LO configure options, --enable-gio vs. --enable-gnome-vfs,
+and Linux distros) to work at all.
+
+So it is probably best to not unconditionally claim smb support in those
+X-KDE_Protocols lines at least in the vanilla LO sources (esp. since the TDF
+builds with --enable-gnome-vfs need a really weird OOO_FORCE_DESKTOP=gnome
+workaround to make it work at all, cf.
+<http://lists.freedesktop.org/archives/libreoffice/2014-October/063876.html>
+"Re: X-KDE-Protocols=...,smb,...").  Any Linux distros that are confident that
+smb support in LO under KDE reliably works for them can patch those lines
+locally.
+
+Change-Id: I1c247d85825c96f0d74efcce3003e327a1522fa3
+---
+ sysui/desktop/menus/base.desktop        | 2 +-
+ sysui/desktop/menus/calc.desktop        | 2 +-
+ sysui/desktop/menus/draw.desktop        | 2 +-
+ sysui/desktop/menus/impress.desktop     | 2 +-
+ sysui/desktop/menus/math.desktop        | 2 +-
+ sysui/desktop/menus/qstart.desktop      | 2 +-
+ sysui/desktop/menus/startcenter.desktop | 2 +-
+ sysui/desktop/menus/writer.desktop      | 2 +-
+ sysui/desktop/menus/xsltfilter.desktop  | 2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
+index 26f1c6a..76255fe 100644
+--- a/sysui/desktop/menus/base.desktop
+++ b/sysui/desktop/menus/base.desktop
+@@ -31,7 +31,7 @@ X-GIO-NoFuse=true
+ Keywords=Data;SQL;
+ InitialPreference=5
+ StartupWMClass=libreoffice-base
+-X-KDE-Protocols=file,http,smb,ftp,webdav
+X-KDE-Protocols=file,http,ftp,webdav
+ 
+ Actions=NewDocument;
+ [Desktop Action NewDocument]
+diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
+index fca3fe3..5aa48d2 100644
+--- a/sysui/desktop/menus/calc.desktop
+++ b/sysui/desktop/menus/calc.desktop
+@@ -31,7 +31,7 @@ X-GIO-NoFuse=true
+ Keywords=Accounting;Stats;OpenDocument Spreadsheet;Chart;Microsoft Excel;Microsoft Works;OpenOffice Calc;ods;xls;xlsx;
+ InitialPreference=5
+ StartupWMClass=libreoffice-calc
+-X-KDE-Protocols=file,http,smb,ftp,webdav
+X-KDE-Protocols=file,http,ftp,webdav
+ 
+ Actions=NewDocument;
+ [Desktop Action NewDocument]
+diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
+index ae57504..3e20e8d 100644
+--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
+@@ -31,7 +31,7 @@ X-GIO-NoFuse=true
+ Keywords=Vector;Schema;Diagram;Layout;OpenDocument Graphics;Microsoft Publisher;Corel Draw;cdr;odg;svg;
+ InitialPreference=5
+ StartupWMClass=libreoffice-draw
+-X-KDE-Protocols=file,http,smb,ftp,webdav
+X-KDE-Protocols=file,http,ftp,webdav
+ 
+ Actions=NewDocument;
+ [Desktop Action NewDocument]
+diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop
+index c1f6231..b419593 100644
+--- a/sysui/desktop/menus/impress.desktop
+++ b/sysui/desktop/menus/impress.desktop
+@@ -31,7 +31,7 @@ X-GIO-NoFuse=true
+ Keywords=Slideshow;Slides;OpenDocument Presentation;Microsoft PowerPoint;Microsoft Works;OpenOffice Impress;odp;ppt;pptx;
+ InitialPreference=5
+ StartupWMClass=libreoffice-impress
+-X-KDE-Protocols=file,http,smb,ftp,webdav
+X-KDE-Protocols=file,http,ftp,webdav
+ 
+ Actions=NewDocument;
+ [Desktop Action NewDocument]
+diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
+index b6981f5..e437d26 100644
+--- a/sysui/desktop/menus/math.desktop
+++ b/sysui/desktop/menus/math.desktop
+@@ -32,7 +32,7 @@ X-GIO-NoFuse=true
+ Keywords=Equation;OpenDocument Formula;Formula;odf;MathML;
+ InitialPreference=5
+ StartupWMClass=libreoffice-math
+-X-KDE-Protocols=file,http,smb,ftp,webdav
+X-KDE-Protocols=file,http,ftp,webdav
+ 
+ Actions=NewDocument;
+ [Desktop Action NewDocument]
+diff --git a/sysui/desktop/menus/qstart.desktop b/sysui/desktop/menus/qstart.desktop
+index 2669cc3..ec4e9c2 100644
+--- a/sysui/desktop/menus/qstart.desktop
+++ b/sysui/desktop/menus/qstart.desktop
+@@ -25,4 +25,4 @@ NoDisplay=true
+ Name=%PRODUCTNAME Quickstarter
+ Comment=Hook for quickstarter startup
+ X-GIO-NoFuse=true
+-X-KDE-Protocols=file,http,smb,ftp,webdav
+X-KDE-Protocols=file,http,ftp,webdav
+diff --git a/sysui/desktop/menus/startcenter.desktop b/sysui/desktop/menus/startcenter.desktop
+index 3858c89..08d4a11 100644
+--- a/sysui/desktop/menus/startcenter.desktop
+++ b/sysui/desktop/menus/startcenter.desktop
+@@ -30,7 +30,7 @@ Comment=The office productivity suite compatible to the open and standardized OD
+ StartupNotify=true
+ X-GIO-NoFuse=true
+ StartupWMClass=libreoffice-startcenter
+-X-KDE-Protocols=file,http,smb,ftp,webdav
+X-KDE-Protocols=file,http,ftp,webdav
+ 
+ ##Define Actions
+ Actions=Writer;Calc;Impress;Draw;Base;Math;
+diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop
+index e22a7b4..44a6421 100644
+--- a/sysui/desktop/menus/writer.desktop
+++ b/sysui/desktop/menus/writer.desktop
+@@ -31,7 +31,7 @@ X-GIO-NoFuse=true
+ Keywords=Text;Letter;Fax;Document;OpenDocument Text;Microsoft Word;Microsoft Works;Lotus WordPro;OpenOffice Writer;CV;odt;doc;docx;rtf;
+ InitialPreference=5
+ StartupWMClass=libreoffice-writer
+-X-KDE-Protocols=file,http,smb,ftp,webdav
+X-KDE-Protocols=file,http,ftp,webdav
+ 
+ Actions=NewDocument;
+ [Desktop Action NewDocument]
+diff --git a/sysui/desktop/menus/xsltfilter.desktop b/sysui/desktop/menus/xsltfilter.desktop
+index 3dcad81..adea82a 100644
+--- a/sysui/desktop/menus/xsltfilter.desktop
+++ b/sysui/desktop/menus/xsltfilter.desktop
+@@ -9,4 +9,4 @@ GenericName=XSLT based filters
+ NoDisplay=true
+ StartupNotify=true
+ X-GIO-NoFuse=true
+-X-KDE-Protocols=file,http,smb,ftp,webdav
+X-KDE-Protocols=file,http,ftp,webdav
+-- 
+1.9.3
+
--- a/libreoffice.spec
+++ b/libreoffice.spec
@ -46,7 +46,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        4%{?libo_prerelease}%{?dist}
+Release:        5%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 and CC0
 Group:          Applications/Productivity
 URL:            http://www.libreoffice.org/
@ -321,6 +321,7 @@ Patch29: 0001-Resolves-fdo-80911-don-t-swap-notes-page-width-heigh.patch
 Patch30: 0001-default-n-up-printing-of-notes-to-sensible-2-x-1-not.patch
 Patch31: 0001-n-up-printing-done-by-vcl-brochures-by-draw-impress.patch
 Patch32: 0001-Resolves-fdo-68967-looping-layout.patch
+Patch33: 0001-Remove-smb-from-X-KDE-Protocols-lines.patch

 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@ -378,7 +379,6 @@ Requires: liberation-sans-fonts >= 1.0, liberation-serif-fonts >= 1.0, liberatio
 Requires: dejavu-sans-fonts, dejavu-serif-fonts, dejavu-sans-mono-fonts
 Requires: google-crosextra-caladea-fonts, google-crosextra-carlito-fonts
 Requires: hyphen-en, hyphen >= 2.4, autocorr-en
-Requires: gvfs-smb
 %if 0%{?rhel} && 0%{?rhel} < 7
 Requires: hunspell-en
 %else
@ -437,7 +437,6 @@ Summary: Database front-end for LibreOffice
 Group: Applications/Productivity
 Requires: pentaho-reporting-flow-engine
 Requires: postgresql-jdbc
-Requires: gvfs-smb
 %if 0%{?rhel} && 0%{?rhel} < 7
 Requires:  hsqldb
 %endif
@ -584,7 +583,6 @@ mathematical symbols.
 %package writer
 Summary: LibreOffice Word Processor Application
 Group: Applications/Productivity
-Requires: gvfs-smb
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Obsoletes: openoffice.org-writer-core < 1:3.3.1
@ -616,7 +614,6 @@ Enables the LibreOffice writer module to mail-merge to email.
 %package calc
 Summary: LibreOffice Spreadsheet Application
 Group: Applications/Productivity
-Requires: gvfs-smb
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Obsoletes: openoffice.org-calc-core < 1:3.3.1
@ -634,7 +631,6 @@ The LibreOffice Spreadsheet application.
 %package draw
 Summary: LibreOffice Drawing Application
 Group: Applications/Productivity
-Requires: gvfs-smb
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Requires: %{name}-pdfimport = %{epoch}:%{version}-%{release}
@ -654,7 +650,6 @@ The LibreOffice Drawing Application.
 %package impress
 Summary: LibreOffice Presentation Application
 Group: Applications/Productivity
-Requires: gvfs-smb
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Obsoletes: %{name}-presentation-minimizer < 2:4.2.0.0-1.alpha1
@ -682,7 +677,6 @@ The LibreOffice Presentation Application.
 %package math
 Summary: LibreOffice Equation Editor Application
 Group: Applications/Productivity
-Requires: gvfs-smb
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Obsoletes: openoffice.org-math-core < 1:3.3.1
@ -715,7 +709,6 @@ flash filters.
 %package xsltfilter
 Summary: Optional xsltfilter module for LibreOffice
 Group: Applications/Productivity
-Requires: gvfs-smb
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes: openoffice.org-xsltfilter < 1:3.3.1
 %if 0%{?rhel} && 0%{?rhel} < 7
@ -2297,6 +2290,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif

 %changelog
+* Wed Oct 08 2014 Stephan Bergmann <sbergman@redhat.com> - 1:4.3.2.2-5
+- Resolves: rhbz#1054952 bad access of smb URLs on KDE
+
 * Tue Sep 23 2014 Richard Hughes <richard@hughsie.com> - 1:4.3.2.2-4
 - move appdata files to desktop files, where the belong