From 07f201a9a832317a6bf0b43cea17f5f593aea03b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Fri, 17 Jul 2020 20:31:42 +0100 Subject: [PATCH] gcc crashing linking vcldemo, which we don't need --- 0001-drop-stuff.patch | 32 ++++++++++++++++++++++++++++++++ libreoffice.spec | 1 + 2 files changed, 33 insertions(+) create mode 100644 0001-drop-stuff.patch diff --git a/0001-drop-stuff.patch b/0001-drop-stuff.patch new file mode 100644 index 0000000..fe1a39f --- /dev/null +++ b/0001-drop-stuff.patch @@ -0,0 +1,32 @@ +From 6620df396db0db8d6c26e0a970568ce88fec6644 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Fri, 17 Jul 2020 20:29:41 +0100 +Subject: [PATCH] drop stuff + +Change-Id: I1622df61ee0eb0b35a6546c2fbb0aaefd0af8b79 +--- + vcl/Module_vcl.mk | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk +index 5620f188c7f2..ebb932ac2a59 100644 +--- a/vcl/Module_vcl.mk ++++ b/vcl/Module_vcl.mk +@@ -32,13 +32,7 @@ $(eval $(call gb_Module_add_targets,vcl,\ + $(if $(ENABLE_MACOSX_SANDBOX),, \ + $(if $(DISABLE_GUI),, \ + Executable_ui-previewer)) \ +- $(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)), \ +- Executable_outdevgrind \ +- $(if $(DISABLE_GUI),, \ +- Executable_vcldemo \ +- Executable_icontest \ +- Executable_visualbackendtest \ +- Executable_mtfdemo ))) \ ++ ) \ + )) + + ifeq ($(CROSS_COMPILING)$(DISABLE_DYNLOADING),) +-- +2.26.2 + diff --git a/libreoffice.spec b/libreoffice.spec index 5fbeac0..115bf01 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -248,6 +248,7 @@ Patch4: 0001-fix-detecting-qrcodegen.patch 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-drop-vcldemo.patch %if 0%{?rhel} # not upstreamed