diff --git a/0001-workaround-internal-compiler-error.patch b/0001-workaround-internal-compiler-error.patch new file mode 100644 index 0000000..105f6d0 --- /dev/null +++ b/0001-workaround-internal-compiler-error.patch @@ -0,0 +1,25 @@ +From 06acb7b4cb3a476b359449b9042534f99e6bc02c Mon Sep 17 00:00:00 2001 +From: rpmbuild +Date: Fri, 24 Jul 2020 20:37:13 +0100 +Subject: [PATCH] workaround internal compiler error + +--- + vcl/workben/vcldemo.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx +index 74dc6fb..9655a77 100644 +--- a/vcl/workben/vcldemo.cxx ++++ b/vcl/workben/vcldemo.cxx +@@ -1730,7 +1730,7 @@ class DemoWin : public WorkWindow + } + virtual ~RenderThread() override + { +- join(); ++ salhelper::Thread::join(); + } + virtual void execute() override + { +-- +2.26.2 + diff --git a/libreoffice.spec b/libreoffice.spec index f39b57b..656df95 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -54,7 +54,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 2%{?libo_prerelease}%{?dist} +Release: 3%{?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/ @@ -249,6 +249,7 @@ Patch5: 0001-Flatpak-Add-app-bin-libreoffice-app-libreoffice-prog.patch Patch6: 0001-Restructure-solenv-bin-assemble-flatpak.sh.patch Patch7: 0001-Related-tdf-127782-resize-the-print-dialog-to-its-op.patch Patch8: 0001-fix-f33-build.patch +Patch9: 0001-workaround-internal-compiler-error.patch %if 0%{?rhel} # not upstreamed @@ -2232,6 +2233,9 @@ done %{_includedir}/LibreOfficeKit %changelog +* Fri Jul 24 2020 Caolán McNamara - 1:6.4.5.2-3 +- Related: rhbz#1859588 workaround vcldemo ICE + * Tue Jul 14 2020 Jiri Vanek - 1:6.4.5.2-2 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11