diff --git a/0001-add-X-TryExec-entries-to-desktop-files.patch b/0001-add-X-TryExec-entries-to-desktop-files.patch deleted file mode 100644 index 43e8ceb..0000000 --- a/0001-add-X-TryExec-entries-to-desktop-files.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 5c6b12167e070e2713640e0756f40efa2fd7494c Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Mon, 28 Apr 2014 09:59:10 +0200 -Subject: [PATCH] add X-TryExec entries to desktop files - -Change-Id: Ic3626f79fa8b0b6e0d6696799445eaea8b0ab47f ---- - sysui/desktop/menus/base.desktop | 1 + - sysui/desktop/menus/calc.desktop | 1 + - sysui/desktop/menus/draw.desktop | 1 + - sysui/desktop/menus/impress.desktop | 1 + - sysui/desktop/menus/math.desktop | 1 + - sysui/desktop/menus/writer.desktop | 1 + - 6 files changed, 6 insertions(+) - -diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop -index 26f1c6a..2861dfe 100644 ---- a/sysui/desktop/menus/base.desktop -+++ b/sysui/desktop/menus/base.desktop -@@ -32,6 +32,7 @@ Keywords=Data;SQL; - InitialPreference=5 - StartupWMClass=libreoffice-base - X-KDE-Protocols=file,http,ftp,webdav -+X-TryExec=oobase - - Actions=NewDocument; - [Desktop Action NewDocument] -diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop -index fc5e241..c50f380 100644 ---- a/sysui/desktop/menus/calc.desktop -+++ b/sysui/desktop/menus/calc.desktop -@@ -32,6 +32,7 @@ Keywords=Accounting;Stats;OpenDocument Spreadsheet;Chart;Microsoft Excel;Microso - InitialPreference=5 - StartupWMClass=libreoffice-calc - X-KDE-Protocols=file,http,ftp,webdav -+X-TryExec=oocalc - - Actions=NewDocument; - [Desktop Action NewDocument] -diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop -index b5d58ce..274275f 100644 ---- a/sysui/desktop/menus/draw.desktop -+++ b/sysui/desktop/menus/draw.desktop -@@ -32,6 +32,7 @@ Keywords=Vector;Schema;Diagram;Layout;OpenDocument Graphics;Microsoft Publisher; - InitialPreference=5 - StartupWMClass=libreoffice-draw - X-KDE-Protocols=file,http,ftp,webdav -+X-TryExec=oodraw - - Actions=NewDocument; - [Desktop Action NewDocument] -diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop -index c1f6231..7e70bfb 100644 ---- a/sysui/desktop/menus/impress.desktop -+++ b/sysui/desktop/menus/impress.desktop -@@ -32,6 +32,7 @@ Keywords=Slideshow;Slides;OpenDocument Presentation;Microsoft PowerPoint;Microso - InitialPreference=5 - StartupWMClass=libreoffice-impress - X-KDE-Protocols=file,http,ftp,webdav -+X-TryExec=ooimpress - - Actions=NewDocument; - [Desktop Action NewDocument] -diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop -index b6981f5..4d7bd3c 100644 ---- a/sysui/desktop/menus/math.desktop -+++ b/sysui/desktop/menus/math.desktop -@@ -33,6 +33,7 @@ Keywords=Equation;OpenDocument Formula;Formula;odf;MathML; - InitialPreference=5 - StartupWMClass=libreoffice-math - X-KDE-Protocols=file,http,ftp,webdav -+X-TryExec=oomath - - Actions=NewDocument; - [Desktop Action NewDocument] -diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop -index c4cea12..6d943a9 100644 ---- a/sysui/desktop/menus/writer.desktop -+++ b/sysui/desktop/menus/writer.desktop -@@ -32,6 +32,7 @@ Keywords=Text;Letter;Fax;Document;OpenDocument Text;Microsoft Word;Microsoft Wor - InitialPreference=5 - StartupWMClass=libreoffice-writer - X-KDE-Protocols=file,http,ftp,webdav -+X-TryExec=oowriter - - Actions=NewDocument; - [Desktop Action NewDocument] --- -1.9.0 - diff --git a/libreoffice.spec b/libreoffice.spec index 16b8541..d342d2f 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -235,18 +235,16 @@ Requires: %{name}-emailmerge%{?_isa} = %{epoch}:%{version}-%{release} Patch0: 0001-installation-fix.patch # not upstreamed Patch1: 0001-never-run-autogen.sh.patch -# not upstreamed -Patch2: 0001-add-X-TryExec-entries-to-desktop-files.patch # not upstreamed: upstream wants an automatic restart after a crash; we # want a nice abrt report -Patch3: 0001-don-t-suppress-crashes.patch +Patch2: 0001-don-t-suppress-crashes.patch # not upstreamed -Patch4: 0001-Related-tdf-106100-recover-mangled-svg-in-presentati.patch +Patch3: 0001-Related-tdf-106100-recover-mangled-svg-in-presentati.patch # not upstreamed -Patch5: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch -Patch6: 0001-apparently-the-executable-does-not-need-pdfium-direc.patch -Patch7: 0001-add-missing-dep-on-dir.patch -Patch8: 0001-Use-gcd-from-boost-math-gcd.patch +Patch4: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch +Patch5: 0001-apparently-the-executable-does-not-need-pdfium-direc.patch +Patch6: 0001-add-missing-dep-on-dir.patch +Patch7: 0001-Use-gcd-from-boost-math-gcd.patch %if 0%{?rhel} # not upstreamed