diff --git a/0001-rhbz-1918152-fix-FTBFS.patch b/0001-rhbz-1918152-fix-FTBFS.patch new file mode 100644 index 0000000..b2502d1 --- /dev/null +++ b/0001-rhbz-1918152-fix-FTBFS.patch @@ -0,0 +1,26 @@ +From 8b8a49e14c1010c5ab325b64fc3b65524a6a6049 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Wed, 20 Jan 2021 09:19:25 +0000 +Subject: [PATCH] rhbz#1918152 fix FTBFS + +Change-Id: I5c03c810d3b2572b0e58c62293add49bd7025e70 +--- + vcl/source/gdi/bitmap3.cxx | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx +index ec80b03c6008..8ea5c31bee3e 100644 +--- a/vcl/source/gdi/bitmap3.cxx ++++ b/vcl/source/gdi/bitmap3.cxx +@@ -17,8 +17,6 @@ + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +-#include +- + #include + #include + #include +-- +2.28.0 + diff --git a/libreoffice.spec b/libreoffice.spec index adbb7de..713de51 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -50,7 +50,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -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/ @@ -254,6 +254,7 @@ Patch7: 0001-export-HYPERLINK-target-in-html-clipboard-export.patch Patch10: 0001-gcc11.patch Patch11: 0001-disable-tests-that-don-t-work-without-pdfium.patch Patch12: 0001-rhbz-1913828-SfxViewFrame-Current-can-return-null.patch +Patch13: 0001-rhbz-1918152-fix-FTBFS.patch # Patches with numbers above 100 are applied conditionally Patch101: 0001-Upgrade-liborcus-to-0.16.0.patch @@ -2272,6 +2273,9 @@ done %{_includedir}/LibreOfficeKit %changelog +* Fri Jan 22 2021 Jonathan Wakely - 1:7.0.4.2-5 +- Rebuilt for Boost 1.75 + * Fri Jan 15 2021 Caolán McNamara - 1:7.0.4.2-4 - rebuild for poppler