From 338406589790678ce11c79499183110755cb7055 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Mon, 13 Apr 2015 19:12:46 +1000 Subject: [PATCH] Add patch to adjust work with protocols (ftp, smb, remote) in KDE --- libreoffice-4.4.2.2-desktop-protocols.patch | 102 ++++++++++++++++++++ libreoffice.spec | 3 +- 2 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 libreoffice-4.4.2.2-desktop-protocols.patch diff --git a/libreoffice-4.4.2.2-desktop-protocols.patch b/libreoffice-4.4.2.2-desktop-protocols.patch new file mode 100644 index 0000000..8cf5c54 --- /dev/null +++ b/libreoffice-4.4.2.2-desktop-protocols.patch @@ -0,0 +1,102 @@ +diff -urN libreoffice-4.4.2.2/sysui/desktop/menus/base.desktop libreoffice-4.4.2.2-patched/sysui/desktop/menus/base.desktop +--- libreoffice-4.4.2.2/sysui/desktop/menus/base.desktop 2015-04-13 18:58:37.249482785 +1000 ++++ libreoffice-4.4.2.2-patched/sysui/desktop/menus/base.desktop 2015-04-13 19:03:43.894496740 +1000 +@@ -31,7 +31,7 @@ + Keywords=Data;SQL; + InitialPreference=5 + StartupWMClass=libreoffice-base +-X-KDE-Protocols=file,http,ftp,webdav ++X-KDE-Protocols=file,http,webdav,smb,remote + + Actions=NewDocument; + [Desktop Action NewDocument] +diff -urN libreoffice-4.4.2.2/sysui/desktop/menus/calc.desktop libreoffice-4.4.2.2-patched/sysui/desktop/menus/calc.desktop +--- libreoffice-4.4.2.2/sysui/desktop/menus/calc.desktop 2015-04-13 18:58:37.254482785 +1000 ++++ libreoffice-4.4.2.2-patched/sysui/desktop/menus/calc.desktop 2015-04-13 19:03:54.607497227 +1000 +@@ -31,7 +31,7 @@ + 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,ftp,webdav ++X-KDE-Protocols=file,http,webdav,smb,remote + + Actions=NewDocument; + [Desktop Action NewDocument] +diff -urN libreoffice-4.4.2.2/sysui/desktop/menus/draw.desktop libreoffice-4.4.2.2-patched/sysui/desktop/menus/draw.desktop +--- libreoffice-4.4.2.2/sysui/desktop/menus/draw.desktop 2015-04-13 18:58:37.264482786 +1000 ++++ libreoffice-4.4.2.2-patched/sysui/desktop/menus/draw.desktop 2015-04-13 19:04:06.005497746 +1000 +@@ -31,7 +31,7 @@ + Keywords=Vector;Schema;Diagram;Layout;OpenDocument Graphics;Microsoft Publisher;Corel Draw;cdr;odg;svg; + InitialPreference=5 + StartupWMClass=libreoffice-draw +-X-KDE-Protocols=file,http,ftp,webdav ++X-KDE-Protocols=file,http,webdav,smb,remote + + Actions=NewDocument; + [Desktop Action NewDocument] +diff -urN libreoffice-4.4.2.2/sysui/desktop/menus/impress.desktop libreoffice-4.4.2.2-patched/sysui/desktop/menus/impress.desktop +--- libreoffice-4.4.2.2/sysui/desktop/menus/impress.desktop 2015-04-13 18:58:37.268482786 +1000 ++++ libreoffice-4.4.2.2-patched/sysui/desktop/menus/impress.desktop 2015-04-13 19:04:19.401498355 +1000 +@@ -31,7 +31,7 @@ + Keywords=Slideshow;Slides;OpenDocument Presentation;Microsoft PowerPoint;Microsoft Works;OpenOffice Impress;odp;ppt;pptx; + InitialPreference=5 + StartupWMClass=libreoffice-impress +-X-KDE-Protocols=file,http,ftp,webdav ++X-KDE-Protocols=file,http,webdav,smb,remote + + Actions=NewDocument; + [Desktop Action NewDocument] +diff -urN libreoffice-4.4.2.2/sysui/desktop/menus/math.desktop libreoffice-4.4.2.2-patched/sysui/desktop/menus/math.desktop +--- libreoffice-4.4.2.2/sysui/desktop/menus/math.desktop 2015-04-13 18:58:37.270482786 +1000 ++++ libreoffice-4.4.2.2-patched/sysui/desktop/menus/math.desktop 2015-04-13 19:04:35.337499081 +1000 +@@ -32,7 +32,7 @@ + Keywords=Equation;OpenDocument Formula;Formula;odf;MathML; + InitialPreference=5 + StartupWMClass=libreoffice-math +-X-KDE-Protocols=file,http,ftp,webdav ++X-KDE-Protocols=file,http,webdav,smb,remote + + Actions=NewDocument; + [Desktop Action NewDocument] +diff -urN libreoffice-4.4.2.2/sysui/desktop/menus/qstart.desktop libreoffice-4.4.2.2-patched/sysui/desktop/menus/qstart.desktop +--- libreoffice-4.4.2.2/sysui/desktop/menus/qstart.desktop 2015-03-26 21:51:14.000000000 +1000 ++++ libreoffice-4.4.2.2-patched/sysui/desktop/menus/qstart.desktop 2015-04-13 19:04:45.580499547 +1000 +@@ -25,4 +25,4 @@ + Name=%PRODUCTNAME Quickstarter + Comment=Hook for quickstarter startup + X-GIO-NoFuse=true +-X-KDE-Protocols=file,http,ftp,webdav ++X-KDE-Protocols=file,http,webdav,smb,remote +diff -urN libreoffice-4.4.2.2/sysui/desktop/menus/startcenter.desktop libreoffice-4.4.2.2-patched/sysui/desktop/menus/startcenter.desktop +--- libreoffice-4.4.2.2/sysui/desktop/menus/startcenter.desktop 2015-04-13 18:58:37.279482786 +1000 ++++ libreoffice-4.4.2.2-patched/sysui/desktop/menus/startcenter.desktop 2015-04-13 19:04:56.117500026 +1000 +@@ -30,7 +30,7 @@ + StartupNotify=true + X-GIO-NoFuse=true + StartupWMClass=libreoffice-startcenter +-X-KDE-Protocols=file,http,ftp,webdav ++X-KDE-Protocols=file,http,webdav,smb,remote + + ##Define Actions + Actions=Writer;Calc;Impress;Draw;Base;Math; +diff -urN libreoffice-4.4.2.2/sysui/desktop/menus/writer.desktop libreoffice-4.4.2.2-patched/sysui/desktop/menus/writer.desktop +--- libreoffice-4.4.2.2/sysui/desktop/menus/writer.desktop 2015-04-13 18:58:37.281482786 +1000 ++++ libreoffice-4.4.2.2-patched/sysui/desktop/menus/writer.desktop 2015-04-13 19:05:07.058500524 +1000 +@@ -31,7 +31,7 @@ + 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,ftp,webdav ++X-KDE-Protocols=file,http,webdav,smb,remote + + Actions=NewDocument; + [Desktop Action NewDocument] +diff -urN libreoffice-4.4.2.2/sysui/desktop/menus/xsltfilter.desktop libreoffice-4.4.2.2-patched/sysui/desktop/menus/xsltfilter.desktop +--- libreoffice-4.4.2.2/sysui/desktop/menus/xsltfilter.desktop 2015-03-26 21:51:14.000000000 +1000 ++++ libreoffice-4.4.2.2-patched/sysui/desktop/menus/xsltfilter.desktop 2015-04-13 19:05:14.100500845 +1000 +@@ -9,4 +9,4 @@ + NoDisplay=true + StartupNotify=true + X-GIO-NoFuse=true +-X-KDE-Protocols=file,http,ftp,webdav ++X-KDE-Protocols=file,http,webdav,smb,remote diff --git a/libreoffice.spec b/libreoffice.spec index 9ed7e2c..ad1837a 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -46,7 +46,7 @@ Version: 4.4.2 %if "%{beta}" != "" Release: 0.%{beta}.1 %else -Release: 2.1 +Release: 2.2 %endif 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 Group: Office @@ -111,6 +111,7 @@ Patch51: libreoffice-4.4.1.2-impress-kde-crash-hack.patch # ROSA vendor patch Patch100: libreoffice-4.1-vendor.patch Patch101: libreoffice-4.4.1.2-desktop-categories.patch +Patch102: libreoffice-4.4.2.2-desktop-protocols.patch BuildRequires: bison BuildRequires: bsh