diff options
| author | marino <marino@pkgsrc.org> | 2012-08-12 07:09:19 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2012-08-12 07:09:19 +0000 |
| commit | cd95af6d74b78e219b2fcc6628b78e6e950f8bf2 (patch) | |
| tree | 212412d302591171ca009bf73c78a2f45781ba43 | |
| parent | 29e2e7f892b70904b6acc41b8259e905a6aed0e2 (diff) | |
| download | pkgsrc-cd95af6d74b78e219b2fcc6628b78e6e950f8bf2.tar.gz | |
misc/libreoffice: Disable unit testing
Some of the libreoffice unit tests, for example system fonts, require
additional and currently unidentified dependencies to run. As a
result, Libreoffice will build outside a clean environment but fails
to build in pbulk chroot or Tinderbox.
With this new patch, libreoffice builds cleanly in Tinderbox.
The modified patch probably makes no difference but it's kept because
the configuration is known to build in a clean environment.
| -rw-r--r-- | misc/libreoffice/distinfo | 5 | ||||
| -rw-r--r-- | misc/libreoffice/patches/patch-solenv_gbuild_Module.mk | 13 | ||||
| -rw-r--r-- | misc/libreoffice/patches/patch-sw_Module_sw.mk | 12 |
3 files changed, 23 insertions, 7 deletions
diff --git a/misc/libreoffice/distinfo b/misc/libreoffice/distinfo index a2f9f406026..25d9011a357 100644 --- a/misc/libreoffice/distinfo +++ b/misc/libreoffice/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2012/06/05 21:53:42 wiz Exp $ +$NetBSD: distinfo,v 1.3 2012/08/12 07:09:19 marino Exp $ SHA1 (libreoffice/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz) = 025d5d0d566a23ddb353495c116116c1088ba2e9 RMD160 (libreoffice/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz) = aefa80476ef8340be84440b61f738f432da51c92 @@ -47,6 +47,7 @@ SHA1 (patch-lotuswordpro_Module_lotuswordpro.mk) = 15f65e86c7b47f2113b68561a9a36 SHA1 (patch-sc_Module_sc.mk) = 615e2cfd132fbb8eb4b5272f36f95b2881e27959 SHA1 (patch-sd_Module_sd.mk) = c1c49ed37086d868c44e600bf1d1784ae2973276 SHA1 (patch-set_soenv.in) = 754a82444bab39d5d51f2a033da153479f33d2ae +SHA1 (patch-solenv_gbuild_Module.mk) = 2193f4edf7c2f8ea918191b4d48ab6725f7b6b92 SHA1 (patch-solenv_inc_unxgcc.mk) = 1bebcc32475b6592a97384410c1036ab647eacec -SHA1 (patch-sw_Module_sw.mk) = 48ca89a9a318dea3975d42869994dc89e0449c6e +SHA1 (patch-sw_Module_sw.mk) = 358f7172278267cccfa6a624f49b1047af1a5788 SHA1 (patch-writerfilter_Module_writerfilter.mk) = 1eb3caa50258be5f8b5e2bb19e5f5d039b5eb7a0 diff --git a/misc/libreoffice/patches/patch-solenv_gbuild_Module.mk b/misc/libreoffice/patches/patch-solenv_gbuild_Module.mk new file mode 100644 index 00000000000..188d7b69a69 --- /dev/null +++ b/misc/libreoffice/patches/patch-solenv_gbuild_Module.mk @@ -0,0 +1,13 @@ +$NetBSD: patch-solenv_gbuild_Module.mk,v 1.1 2012/08/12 07:09:20 marino Exp $ + +--- solenv/gbuild/Module.mk.orig 2012-08-07 13:32:53.000000000 +0000 ++++ solenv/gbuild/Module.mk +@@ -119,7 +119,7 @@ gb_Module_DEVINSTALLHINT= + debugrun :| build + endif + +-all : build unitcheck ++all : build + $(info $(gb_Module_BUILDHINT)) + + build : diff --git a/misc/libreoffice/patches/patch-sw_Module_sw.mk b/misc/libreoffice/patches/patch-sw_Module_sw.mk index 6ac701c774a..e93c14264a5 100644 --- a/misc/libreoffice/patches/patch-sw_Module_sw.mk +++ b/misc/libreoffice/patches/patch-sw_Module_sw.mk @@ -1,10 +1,12 @@ -$NetBSD: patch-sw_Module_sw.mk,v 1.1.1.1 2012/06/01 06:12:14 wiz Exp $ +$NetBSD: patch-sw_Module_sw.mk,v 1.2 2012/08/12 07:09:20 marino Exp $ -Disable unit tests crashing on NetBSD +Disable an unit test crashing with the error message +"No fonts could be found on the system" +in unclear circumstances. ---- sw/Module_sw.mk.orig 2012-01-09 22:08:58.000000000 +0000 +--- sw/Module_sw.mk.orig 2012-08-07 13:32:53.000000000 +0000 +++ sw/Module_sw.mk -@@ -40,11 +40,13 @@ $(eval $(call gb_Module_add_targets,sw,\ +@@ -40,11 +40,12 @@ $(eval $(call gb_Module_add_targets,sw,\ Package_xml \ )) @@ -12,7 +14,7 @@ Disable unit tests crashing on NetBSD $(eval $(call gb_Module_add_check_targets,sw,\ CppunitTest_sw_filters_test \ CppunitTest_sw_macros_test \ - CppunitTest_sw_swdoc_test \ +- CppunitTest_sw_swdoc_test \ )) +endif |