[libreoffice/f20] Fix patch to apply

[sbergmann]

commit 61adb03dbb56f89817e5765edd563955a8c49dd3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Oct 8 12:19:51 2014 +0200

    Fix patch to apply
    
    (cherry picked from commit 2b5a69f5ca6819b40286221c7252804d042067b5)

 0001-Remove-smb-from-X-KDE-Protocols-lines.patch |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/0001-Remove-smb-from-X-KDE-Protocols-lines.patch b/0001-Remove-smb-from-X-KDE-Protocols-lines.patch
index 3881e2f..79ee877 100644
--- a/0001-Remove-smb-from-X-KDE-Protocols-lines.patch
+++ b/0001-Remove-smb-from-X-KDE-Protocols-lines.patch
@@ -38,12 +38,13 @@ 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
+@@ -31,8 +31,8 @@ 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
+ X-TryExec=oobase
  
  Actions=NewDocument;
  [Desktop Action NewDocument]
@@ -51,12 +52,13 @@ 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
+@@ -31,8 +31,8 @@ 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
+ X-TryExec=oocalc
  
  Actions=NewDocument;
  [Desktop Action NewDocument]
@@ -64,12 +66,13 @@ 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
+@@ -31,8 +31,8 @@ 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
+ X-TryExec=oodraw
  
  Actions=NewDocument;
  [Desktop Action NewDocument]
@@ -77,12 +80,13 @@ diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.d
 index c1f6231..b419593 100644
 --- a/sysui/desktop/menus/impress.desktop
 +++ b/sysui/desktop/menus/impress.desktop
-@@ -31,7 +31,7 @@ X-GIO-NoFuse=true
+@@ -31,8 +31,8 @@ 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
+ X-TryExec=ooimpress
  
  Actions=NewDocument;
  [Desktop Action NewDocument]
@@ -90,12 +94,13 @@ 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
+@@ -32,8 +32,8 @@ 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
+ X-TryExec=oomath
  
  Actions=NewDocument;
  [Desktop Action NewDocument]
@@ -126,12 +131,13 @@ diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.des
 index e22a7b4..44a6421 100644
 --- a/sysui/desktop/menus/writer.desktop
 +++ b/sysui/desktop/menus/writer.desktop
-@@ -31,7 +31,7 @@ X-GIO-NoFuse=true
+@@ -31,8 +31,8 @@ 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
+ X-TryExec=oowriter
  
  Actions=NewDocument;
  [Desktop Action NewDocument]