diff options
| author | Jan-Marek Glogowski <jan-marek.glogowski@extern.cib.de> | 2019-12-06 14:46:44 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-12-16 12:58:35 +0100 |
| commit | 1fc85d03c46cedda136986fd6df7fe862893414b (patch) | |
| tree | 493299bdb73b92fcbede4696eb03feb4643941b3 /RepositoryModule_host.mk | |
| parent | lok: calc - send other views our selection in their co-ordinates. (diff) | |
| download | core-1fc85d03c46cedda136986fd6df7fe862893414b.tar.gz core-1fc85d03c46cedda136986fd6df7fe862893414b.zip | |
Revert "Make font-based unit test depend on instdir fonts"
The following build:
$ make clean && make gb_CppunitTest_sc_ucalc
[...]
$ cd sc
$ make gb_CppunitTest_sc_ucalc
triggers:
sc/CppunitTest_sc_subsequent_filters_test.mk:133:
*** Missing font filelist -> run make more_fonts extras.
This didn't help the general Win32 font build problem AFAIK. There
were additional patches to the way Windows loads the LO provided
fonts, so just revert this.
This reverts commit 368c996b24e09c427a30972b3405493328db6779.
Change-Id: I841f96fe8312c47980c8e3be2e9d88242df5b28d
Reviewed-on: https://gerrit.libreoffice.org/84633
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'RepositoryModule_host.mk')
| -rw-r--r-- | RepositoryModule_host.mk | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 80992dfed7e2..062679170b42 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -11,13 +11,6 @@ $(eval $(call gb_Module_Module,libreoffice)) -# These have to be included before the others for more_fonts dependencies -$(eval $(call gb_Module_add_moduledirs,libreoffice,\ - $(call gb_Helper_optional,MORE_FONTS,external/more_fonts) \ - extras \ -)) - - # This makefile needs to be read first because some variables like T_LIBS # for libmerged are cleared there and then later we append stuff to it # through e.g. gb_Library_use_external for various libraries in libmerged. @@ -62,6 +55,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ eventattacher \ extensions \ external \ + extras \ filter \ $(call gb_Helper_optional,DBCONNECTIVITY,forms) \ formula \ |