unblock build on ARM

f41
David Tardon 11 years ago
parent 4a47f8f406
commit 452553cce4

@ -0,0 +1,24 @@
From adbd9c70d4326e2577c4b5eff486f1809777fa90 Mon Sep 17 00:00:00 2001
From: rpmbuild <rpmbuild@fedoraproject.org>
Date: Mon, 26 May 2014 10:01:33 +0200
Subject: [PATCH] disable PSD import test which deadlocks on ARM
---
filter/Module_filter.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 3558f44..3f3301f 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -87,7 +87,6 @@ $(eval $(call gb_Module_add_check_targets,filter,\
CppunitTest_filter_pcx_test \
CppunitTest_filter_pict_test \
CppunitTest_filter_ppm_test \
- CppunitTest_filter_psd_test \
CppunitTest_filter_ras_test \
CppunitTest_filter_tiff_test \
CppunitTest_filter_tga_test \
--
1.9.0

@ -37,7 +37,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.0
Release: 3%{?libo_prerelease}%{?dist}
Release: 4%{?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 Artistic and MPLv2.0
Group: Applications/Productivity
URL: http://www.libreoffice.org/
@ -285,6 +285,10 @@ Patch11: 0001-disable-firebird-unit-test.patch
Patch12: 0001-never-run-autogen.sh.patch
# not upstreamed
Patch13: 0001-add-X-TryExec-entries-to-desktop-files.patch
%ifarch %{arm}
# not upstreamed
Patch14: 0001-disable-PSD-import-test-which-deadlocks-on-ARM.patch
%endif
%define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice
@ -2247,6 +2251,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
* Mon May 26 2014 David Tardon <dtardon@redhat.com> - 1:4.3.0.0-4.beta1
- unblock build on ARM
* Fri May 23 2014 Petr Machata <pmachata@redhat.com> - 1:4.3.0.0-3.beta1
- Rebuild for boost 1.55.0

Loading…
Cancel
Save