From 4b402fcfcd8983ba672499bf33cc4b61e7c3565e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 27 Jul 2020 11:26:00 +0100 Subject: [PATCH] renable check for the next build --- 0001-drop-vcldemo.patch | 32 -------------------------------- libreoffice.spec | 2 +- 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 0001-drop-vcldemo.patch diff --git a/0001-drop-vcldemo.patch b/0001-drop-vcldemo.patch deleted file mode 100644 index fe1a39f..0000000 --- a/0001-drop-vcldemo.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 0723ead..725b3ef 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1481,7 +1481,7 @@ done %check %ifnarch ppc64 s390x aarch64 armv7hl # disable to allow broken build for dependencies -# make +make # we don't need this anymore rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %endif