From ff08787691b957ca2e916fc562d462076e2aad32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 29 Aug 2019 19:09:45 +0100 Subject: [PATCH] Resolves: rhbz#1736810 disable opencl by default again --- ...bz-1432468-disable-opencl-by-default.patch | 26 +++++++++++++++++++ libreoffice.spec | 9 +++++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch diff --git a/0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch b/0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch new file mode 100644 index 0000000..d17e9c0 --- /dev/null +++ b/0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch @@ -0,0 +1,26 @@ +From b54cfe9d3d22fdd40f7015bd343df8620c983779 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Mon, 27 Mar 2017 11:47:01 +0100 +Subject: [PATCH] Resolves: rhbz#1432468 disable opencl by default + +Change-Id: Ie037fcabdd219f195425979dd721501fb5527573 +--- + officecfg/registry/schema/org/openoffice/Office/Common.xcs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs +index 946bd32..284d694 100644 +--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs ++++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs +@@ -5670,7 +5670,7 @@ + Determines whether OpenCL can be used, when available, to speed up + some operations. + +- true ++ false + + + +-- +2.9.3 + diff --git a/libreoffice.spec b/libreoffice.spec index 02e8c8a..004316c 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -54,7 +54,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.4 -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 MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -239,8 +239,10 @@ Requires: %{name}-emailmerge%{?_isa} = %{epoch}:%{version}-%{release} # not upstreamed: upstream wants an automatic restart after a crash; we # want a nice abrt report Patch0: 0001-don-t-suppress-crashes.patch +# rhbz#1736810 disable opencl by default again +Patch1: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch # backported -Patch1: 0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch +Patch2: 0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch %if 0%{?rhel} # not upstreamed @@ -2131,6 +2133,9 @@ done %{_includedir}/LibreOfficeKit %changelog +* Thu Aug 29 2019 Caolán McNamara - 1:6.3.0.4-5 +- Resolves: rhbz#1736810 disable opencl by default again + * Sun Aug 25 2019 Caolán McNamara - 1:6.3.0.4-4 - Resolves: rhbz#1744876 firebird not an automatically dependency