fontconfig: convert to gbuild

Change-Id: Ia0ba9294e36c30147ed52826eac4b0059cfed200

Makefile.top

@@ -77,6 +77,7 @@ extensions\
 extras\
 fileaccess\
 filter\
+fontconfig\
 forms\
 formula\
 fpicker\
@@ -211,7 +212,6 @@ curl\
 epm\
 expat\
 external\
-fontconfig\
 freetype\
 gdk-pixbuf\
 gettext\

Module_tail_build.mk

@@ -69,6 +69,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 	extras \
 	fileaccess \
 	filter \
+	$(call gb_Helper_optional,FONTCONFIG,fontconfig) \
 	forms \
 	formula \
 	fpicker \

RepositoryModule_ooo.mk

@@ -74,6 +74,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 	extras \
     fileaccess \
     filter \
+	$(call gb_Helper_optional,FONTCONFIG,fontconfig) \
     forms \
     formula \
     fpicker \

config_host.mk.in

@@ -193,6 +193,7 @@ export FONT_GENTIUM_TARBALL=@FONT_GENTIUM_TARBALL@
 export FONT_DEJAVU_TARBALL=@FONT_DEJAVU_TARBALL@
 export FONTCONFIG_CFLAGS=@FONTCONFIG_CFLAGS@
 export FONTCONFIG_LIBS=@FONTCONFIG_LIBS@
+export FONTCONFIG_TARBALL=@FONTCONFIG_TARBALL@
 export FRAMEWORKSHOME=@FRAMEWORKSHOME@
 export FREETYPE_CFLAGS=@FREETYPE_CFLAGS@
 export FREETYPE_LIBS=@FREETYPE_LIBS@

fontconfig/ExternalPackage_fontconfig.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,fontconfig,fontconfig))
+
+$(eval $(call gb_ExternalPackage_use_external_project,fontconfig,fontconfig))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fontconfig,inc/fontconfig,\
+	fontconfig/fcfreetype.h \
+	fontconfig/fcprivate.h \
+	fontconfig/fontconfig.h \
+))
+
+$(eval $(call gb_ExternalPackage_add_files,fontconfig,lib,\
+	src/.libs/libfontconfig.a \
+))
+
+# vim: set noet sw=4 ts=4:

fontconfig/ExternalProject_fontconfig.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalProject_ExternalProject,fontconfig))
+
+$(eval $(call gb_ExternalProject_use_unpacked,fontconfig,fontconfig))
+
+$(eval $(call gb_ExternalProject_use_packages,fontconfig,\
+	freetype \
+))
+
+$(eval $(call gb_ExternalProject_register_targets,fontconfig,\
+	build \
+))
+
+$(call gb_ExternalProject_get_state_target,fontconfig,build) :
+	cd $(EXTERNAL_WORKDIR) \
+	&& $(if $(debug),CFLAGS=-g) ./configure \
+		--disable-shared \
+		--with-arch=arm \
+		--with-expat-includes=$(OUTDIR)/inc/external \
+		--with-expat-lib=$(OUTDIR)/lib \
+		--with-freetype-config=$(OUTDIR)/bin/freetype-config \
+		--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
+	&& $(GNUMAKE) \
+	&& touch $@
+
+# vim: set noet sw=4 ts=4:

fontconfig/Makefile

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:

fontconfig/Module_fontconfig.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Module_Module,fontconfig))
+
+ifeq ($(OS),ANDROID)
+
+$(eval $(call gb_Module_add_targets,fontconfig,\
+	ExternalPackage_fontconfig \
+	ExternalProject_fontconfig \
+	UnpackedTarball_fontconfig \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:

fontconfig/UnpackedTarball_fontconfig.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,fontconfig))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,fontconfig,$(FONTCONFIG_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_set_patchlevel,fontconfig,3))
+
+$(eval $(call gb_UnpackedTarball_add_patches,fontconfig,\
+	fontconfig/fontconfig-2.8.0.patch \
+))
+
+# vim: set noet sw=4 ts=4:

fontconfig/makefile.mk

-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=fontconfig
-TARGET=fontconfig
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=fontconfig-2.8.0
-TARFILE_MD5=77e15a92006ddc2adbb06f840d591c0e
-
-PATCH_FILES=$(TARFILE_NAME).patch
-
-CONFIGURE_ACTION=./configure
-
-.IF "$(debug)" != ""
-CONFIGURE_ACTION!:=CFLAGS=-g $(CONFIGURE_ACTION)
-.ENDIF
-
-# This "bundled" fontconfig is built only when cross-compiling for Android
-
-CONFIGURE_FLAGS=\
-    --disable-shared \
-    --with-arch=arm \
-    --with-expat-includes=$(SOLARVER)/$(INPATH)/inc/external \
-    --with-expat-lib=$(SOLARVER)/$(INPATH)/lib \
-    --with-freetype-config=$(SOLARVER)/$(INPATH)/bin/freetype-config \
-    --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-
-BUILD_ACTION=$(GNUMAKE)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-

fontconfig/prj/d.lst

-..\%__SRC%\misc\build\fontconfig*\src\.libs\*.a %_DEST%\lib
-
-mkdir: %_DEST%\inc\external\fontconfig
-..\%__SRC%\misc\build\fontconfig*\fontconfig\*.h %_DEST%\inc\external\fontconfig

tail_build/prj/build.lst

-tb      tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GETTEXT:gettext GLIB:glib GDK_PIXBUF:gdk-pixbuf PANGO:pango LIBCROCO:libcroco LIBGSF:libgsf GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl PYTHON:python REDLAND:redland stax XPDF:xpdf ZLIB:zlib external sal solenv soltools NULL
+tb      tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FREETYPE:freetype GETTEXT:gettext GLIB:glib GDK_PIXBUF:gdk-pixbuf PANGO:pango LIBCROCO:libcroco LIBGSF:libgsf GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl PYTHON:python REDLAND:redland stax XPDF:xpdf ZLIB:zlib external sal solenv soltools NULL
 tb tail_build\prj nmake - all tb_prj   NULL