mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stop delivering freetype headers

Browse Source 
Change-Id: I8e14cc411520272969cfd24048e403b9fd53cde4
This commit is contained in:
David Tardon
2013-05-24 14:35:18 +02:00
parent 4eb68428f6
commit 962771f7d5
6 changed files with 33 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
RepositoryExternal.mk
View File

@@ -994,13 +994,12 @@ endif # SYSTEM_REDLAND
ifeq ($(SYSTEM_CAIRO),YES)
# FREETYPE_CLAGS from environment if ENABLE_CAIRO is used
define gb_LinkTarget__use_cairo
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(FREETYPE_CFLAGS) \
$(CAIRO_CFLAGS) \
)
$(call gb_LinkTarget_use_external,$(1),freetype_headers)
$(call gb_LinkTarget_add_libs,$(1),$(CAIRO_LIBS))
endef
@@ -1017,10 +1016,10 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
define gb_LinkTarget__use_cairo
$(call gb_LinkTarget_use_package,$(1),cairo)
$(call gb_LinkTarget_use_package,$(1),pixman)
$(call gb_LinkTarget_use_external,$(1),freetype_headers)
$(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,cairo) \
-I$(call gb_UnpackedTarball_get_dir,cairo)/src \
$(FREETYPE_CFLAGS) \
$$(INCLUDE) \
)
$(call gb_LinkTarget_use_libraries,$(1),\
@@ -1034,20 +1033,38 @@ endef
endif # SYSTEM_CAIRO
define gb_LinkTarget__use_freetype
ifeq ($(SYSTEM_FREETYPE),YES)
define gb_LinkTarget__use_freetype_headers
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(FREETYPE_CFLAGS) \
)
ifneq ($(OS),ANDROID)
endef
define gb_LinkTarget__use_freetype
$(call gb_LinkTarget_use_external,$(1),freetype_headers)
$(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS))
else
$(call gb_LinkTarget_use_static_libraries,$(1),freetype)
endif
endef
else # ! SYSTEM_FREETYPE
define gb_LinkTarget__use_freetype_headers
$(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,freetype)/include \
$$(INCLUDE) \
)
define gb_LinkTarget__use_freetype
$(call gb_LinkTarget_use_external,$(1),freetype_headers)
$(call gb_LinkTarget_use_static_libraries,$(1),freetype)
endef
endif # SYSTEM_FREETYPE
ifeq ($(SYSTEM_FONTCONFIG),YES)
define gb_LinkTarget__use_fontconfig

1
config_host.mk.in
View File

@@ -460,6 +460,7 @@ export SYSTEM_CURL=@SYSTEM_CURL@
export SYSTEM_DICTS=@SYSTEM_DICTS@
export SYSTEM_EXPAT=@SYSTEM_EXPAT@
export SYSTEM_FONTCONFIG=@SYSTEM_FONTCONFIG@
export SYSTEM_FREETYPE=@SYSTEM_FREETYPE@
export SYSTEM_GENBRK=@SYSTEM_GENBRK@
export SYSTEM_GENCCODE=@SYSTEM_GENCCODE@
export SYSTEM_GENCMN=@SYSTEM_GENCMN@

8
configure.ac
View File

@@ -7268,15 +7268,11 @@ if test "$test_freetype" = "yes"; then
# 9.4.3 is 2.1.5; the first FreeType release to provide a freetype2.pc file
# XXX: replace this with a real minimum required version
PKG_CHECK_MODULES( FREETYPE, freetype2 >= 9.4.3 )
else
case "$BUILD_TYPE" in
*FREETYPE*)
FREETYPE_LIBS="-lfreetype"
;;
esac
SYSTEM_FREETYPE=YES
fi
AC_SUBST(FREETYPE_CFLAGS)
AC_SUBST(FREETYPE_LIBS)
AC_SUBST([SYSTEM_FREETYPE])
dnl ===================================================================
dnl Check for system libwps

57
freetype/ExternalPackage_freetype.mk
View File

@@ -11,63 +11,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,freetype,freetype))
$(eval $(call gb_ExternalPackage_use_external_project,freetype,freetype))
$(eval $(call gb_ExternalPackage_add_unpacked_files,freetype,inc/external,\
include/ft2build.h \
))
$(eval $(call gb_ExternalPackage_add_unpacked_files,freetype,inc/external/freetype,\
include/freetype/freetype.h \
include/freetype/ftadvanc.h \
include/freetype/ftbbox.h \
include/freetype/ftbdf.h \
include/freetype/ftbitmap.h \
include/freetype/ftbzip2.h \
include/freetype/ftcache.h \
include/freetype/ftchapters.h \
include/freetype/ftcid.h \
include/freetype/fterrdef.h \
include/freetype/fterrors.h \
include/freetype/ftgasp.h \
include/freetype/ftglyph.h \
include/freetype/ftgxval.h \
include/freetype/ftgzip.h \
include/freetype/ftimage.h \
include/freetype/ftincrem.h \
include/freetype/ftlcdfil.h \
include/freetype/ftlist.h \
include/freetype/ftlzw.h \
include/freetype/ftmac.h \
include/freetype/ftmm.h \
include/freetype/ftmodapi.h \
include/freetype/ftmoderr.h \
include/freetype/ftotval.h \
include/freetype/ftoutln.h \
include/freetype/ftpfr.h \
include/freetype/ftrender.h \
include/freetype/ftsizes.h \
include/freetype/ftsnames.h \
include/freetype/ftstroke.h \
include/freetype/ftsynth.h \
include/freetype/ftsystem.h \
include/freetype/fttrigon.h \
include/freetype/fttypes.h \
include/freetype/ftwinfnt.h \
include/freetype/ftxf86.h \
include/freetype/t1tables.h \
include/freetype/ttnameid.h \
include/freetype/tttables.h \
include/freetype/tttags.h \
include/freetype/ttunpat.h \
))
$(eval $(call gb_ExternalPackage_add_unpacked_files,freetype,inc/external/freetype/config,\
include/freetype/config/ftconfig.h \
include/freetype/config/ftheader.h \
include/freetype/config/ftmodule.h \
include/freetype/config/ftoption.h \
include/freetype/config/ftstdlib.h \
))
$(eval $(call gb_ExternalPackage_add_files,freetype,lib,\
objs/.libs/libfreetype.a \
))

5
vcl/Library_vclplug_svp.mk
View File

@@ -24,10 +24,6 @@ $(eval $(call gb_Library_set_include,vclplug_svp,\
-I$(SRCDIR)/vcl/inc \
))
$(eval $(call gb_Library_add_cxxflags,vclplug_svp,\
$$(FREETYPE_CFLAGS) \
))
$(eval $(call gb_Library_add_defs,vclplug_svp,\
-DVCLPLUG_SVP_IMPLEMENTATION \
))
@@ -54,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_svp,\
$(eval $(call gb_Library_use_externals,vclplug_svp,\
boost_headers \
freetype_headers \
icule \
icuuc \
))

9
vcl/StaticLibrary_headless.mk
View File

@@ -8,17 +8,16 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,headless))
$(eval $(call gb_StaticLibrary_use_external,headless,boost_headers))
$(eval $(call gb_StaticLibrary_use_externals,headless,\
boost_headers \
freetype_headers \
))
$(eval $(call gb_StaticLibrary_use_api,headless,\
offapi \
udkapi \
))
$(eval $(call gb_StaticLibrary_add_cxxflags,headless,\
$$(FREETYPE_CFLAGS) \
))
$(eval $(call gb_StaticLibrary_add_exception_objects,headless,\
vcl/headless/svpbmp \
vcl/headless/svpdummies \