[Libreoffice-commits] .: 2 commits - config_host.mk.in fontconfig/ExternalPackage_fontconfig.mk fontconfig/ExternalProject_fontconfig.mk fontconfig/Makefile fontconfig/makefile.mk fontconfig/Module_fontconfig.mk fontconfig/prj fontconfig/UnpackedTarball_fontconfig.mk freetype/ExternalPackage_freetype.mk freetype/ExternalProject_freetype.mk freetype/Makefile freetype/makefile.mk freetype/Module_freetype.mk freetype/prj freetype/UnpackedTarball_freetype.mk Makefile.top Module_tail_build.mk RepositoryModule_ooo.mk tail_build/prj
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Oct 24 03:42:53 PDT 2012
Makefile.top | 4 -
Module_tail_build.mk | 2
RepositoryModule_ooo.mk | 2
config_host.mk.in | 2
fontconfig/ExternalPackage_fontconfig.mk | 24 +++++++++
fontconfig/ExternalProject_fontconfig.mk | 34 +++++++++++++
fontconfig/Makefile | 7 ++
fontconfig/Module_fontconfig.mk | 22 ++++++++
fontconfig/UnpackedTarball_fontconfig.mk | 20 +++++++
fontconfig/makefile.mk | 67 --------------------------
fontconfig/prj/d.lst | 4 -
freetype/ExternalPackage_freetype.mk | 79 +++++++++++++++++++++++++++++++
freetype/ExternalProject_freetype.mk | 30 +++++++++++
freetype/Makefile | 7 ++
freetype/Module_freetype.mk | 22 ++++++++
freetype/UnpackedTarball_freetype.mk | 20 +++++++
freetype/makefile.mk | 59 -----------------------
freetype/prj/d.lst | 8 ---
tail_build/prj/build.lst | 2
19 files changed, 274 insertions(+), 141 deletions(-)
New commits:
commit 9a3fe78320fdb7e2f1cb1ac9dbf6f9a5201af9b6
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Oct 23 23:32:43 2012 +0200
freetype: convert to gbuild
Change-Id: I67f550385fa1f4073873f1e503eb153665e718ef
diff --git a/Makefile.top b/Makefile.top
index 7bab86c..1d50dd2 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -82,6 +82,7 @@ forms\
formula\
fpicker\
framework\
+freetype\
helpcompiler\
hsqldb\
hwpfilter\
@@ -212,7 +213,6 @@ curl\
epm\
expat\
external\
-freetype\
gdk-pixbuf\
gettext\
glib\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index f4b69dc..57a7dc8 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -74,6 +74,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
formula \
fpicker \
framework \
+ $(call gb_Helper_optional,FREETYPE,freetype) \
$(call gb_Helper_optional,DESKTOP,helpcompiler) \
$(call gb_Helper_optional,HSQLDB,hsqldb) \
hwpfilter \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index aa0446b..65a9fd9 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -79,6 +79,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
formula \
fpicker \
framework \
+ $(call gb_Helper_optional,FREETYPE,freetype) \
$(call gb_Helper_optional,DESKTOP,helpcompiler) \
$(call gb_Helper_optional,HSQLDB,hsqldb) \
hwpfilter \
diff --git a/config_host.mk.in b/config_host.mk.in
index 9a260f4..62c4ff7 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -197,6 +197,7 @@ export FONTCONFIG_TARBALL=@FONTCONFIG_TARBALL@
export FRAMEWORKSHOME=@FRAMEWORKSHOME@
export FREETYPE_CFLAGS=@FREETYPE_CFLAGS@
export FREETYPE_LIBS=@FREETYPE_LIBS@
+export FREETYPE_TARBALL=@FREETYPE_TARBALL@
export GCONF_CFLAGS=@GCONF_CFLAGS@
export GCONF_LIBS=@GCONF_LIBS@
export GIO_CFLAGS=@GIO_CFLAGS@
diff --git a/freetype/ExternalPackage_freetype.mk b/freetype/ExternalPackage_freetype.mk
new file mode 100644
index 0000000..0c90165
--- /dev/null
+++ b/freetype/ExternalPackage_freetype.mk
@@ -0,0 +1,79 @@
+# -*- 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,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 \
+))
+
+$(eval $(call gb_ExternalPackage_add_files,freetype,bin,\
+ builds/unix/freetype-config \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/freetype/ExternalProject_freetype.mk b/freetype/ExternalProject_freetype.mk
new file mode 100644
index 0000000..f689e2e
--- /dev/null
+++ b/freetype/ExternalProject_freetype.mk
@@ -0,0 +1,30 @@
+# -*- 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,freetype))
+
+$(eval $(call gb_ExternalProject_use_unpacked,freetype,freetype))
+
+$(eval $(call gb_ExternalProject_register_targets,freetype,\
+ build \
+))
+
+$(call gb_ExternalProject_get_state_target,freetype,build) :
+ cd $(EXTERNAL_WORKDIR) \
+ && ./configure \
+ --disable-shared \
+ --without-zlib \
+ --without-bzip2 \
+ --prefix=$(OUTDIR) --includedir=$(OUTDIR)/inc/external \
+ --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
+ && chmod +x builds/unix/freetype-config \
+ && $(GNUMAKE) \
+ && touch $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/freetype/Makefile b/freetype/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/freetype/Makefile
@@ -0,0 +1,7 @@
+# -*- 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:
diff --git a/freetype/Module_freetype.mk b/freetype/Module_freetype.mk
new file mode 100644
index 0000000..e0965a0
--- /dev/null
+++ b/freetype/Module_freetype.mk
@@ -0,0 +1,22 @@
+# -*- 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,freetype))
+
+ifeq ($(OS),ANDROID)
+
+$(eval $(call gb_Module_add_targets,freetype,\
+ ExternalPackage_freetype \
+ ExternalProject_freetype \
+ UnpackedTarball_freetype \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/freetype/UnpackedTarball_freetype.mk b/freetype/UnpackedTarball_freetype.mk
new file mode 100644
index 0000000..a1060ad
--- /dev/null
+++ b/freetype/UnpackedTarball_freetype.mk
@@ -0,0 +1,20 @@
+# -*- 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,freetype))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,freetype,$(FREETYPE_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_set_patchlevel,freetype,3))
+
+$(eval $(call gb_UnpackedTarball_add_patches,freetype,\
+ freetype/freetype-2.4.8.patch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/freetype/makefile.mk b/freetype/makefile.mk
deleted file mode 100644
index 52f7366..0000000
--- a/freetype/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#*************************************************************************
-#
-# 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=freetype
-TARGET=freetype
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=freetype-2.4.8
-TARFILE_MD5=dbf2caca1d3afd410a29217a9809d397
-
-PATCH_FILES=$(TARFILE_NAME).patch
-
-CONFIGURE_ACTION=./configure
-
-CONFIGURE_FLAGS=\
- --disable-shared \
- --without-zlib \
- --without-bzip2 \
- --prefix=$(SOLARVER)/$(INPATH) --includedir=$(SOLARVER)/$(INPATH)/inc/external \
- --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-
-BUILD_ACTION=chmod +x builds/unix/freetype-config && $(GNUMAKE)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
diff --git a/freetype/prj/d.lst b/freetype/prj/d.lst
index ac34ac4..e69de29 100644
--- a/freetype/prj/d.lst
+++ b/freetype/prj/d.lst
@@ -1,8 +0,0 @@
-..\%__SRC%\misc\build\freetype*\objs\.libs\*.a %_DEST%\lib
-
-..\%__SRC%\misc\build\freetype*\builds\unix\freetype-config %_DEST%\bin
-
-mkdir: %_DEST%\inc\external\freetype\config
-..\%__SRC%\misc\build\freetype*\include\ft2build.h %_DEST%\inc\external
-..\%__SRC%\misc\build\freetype*\include\freetype\*.h %_DEST%\inc\external\freetype
-..\%__SRC%\misc\build\freetype*\include\freetype\config\*.h %_DEST%\inc\external\freetype\config
diff --git a/freetype/prj/dmake b/freetype/prj/dmake
deleted file mode 100644
index e69de29..0000000
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 3c1a75d..11e4e0b 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-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 : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat 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
commit 526c9bdd0408cc0b983c11b35a0aaefda93fad13
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Oct 23 21:42:24 2012 +0200
fontconfig: convert to gbuild
Change-Id: Ia0ba9294e36c30147ed52826eac4b0059cfed200
diff --git a/Makefile.top b/Makefile.top
index 2b1acea..7bab86c 100644
--- a/Makefile.top
+++ b/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\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index eb0feeb..f4b69dc 100644
--- a/Module_tail_build.mk
+++ b/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 \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 557e179..aa0446b 100644
--- a/RepositoryModule_ooo.mk
+++ b/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 \
diff --git a/config_host.mk.in b/config_host.mk.in
index 0ea224e..9a260f4 100644
--- a/config_host.mk.in
+++ b/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@
diff --git a/fontconfig/ExternalPackage_fontconfig.mk b/fontconfig/ExternalPackage_fontconfig.mk
new file mode 100644
index 0000000..7f074e8
--- /dev/null
+++ b/fontconfig/ExternalPackage_fontconfig.mk
@@ -0,0 +1,24 @@
+# -*- 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:
diff --git a/fontconfig/ExternalProject_fontconfig.mk b/fontconfig/ExternalProject_fontconfig.mk
new file mode 100644
index 0000000..b7d2eb5
--- /dev/null
+++ b/fontconfig/ExternalProject_fontconfig.mk
@@ -0,0 +1,34 @@
+# -*- 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:
diff --git a/fontconfig/Makefile b/fontconfig/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/fontconfig/Makefile
@@ -0,0 +1,7 @@
+# -*- 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:
diff --git a/fontconfig/Module_fontconfig.mk b/fontconfig/Module_fontconfig.mk
new file mode 100644
index 0000000..1bfcbdb
--- /dev/null
+++ b/fontconfig/Module_fontconfig.mk
@@ -0,0 +1,22 @@
+# -*- 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:
diff --git a/fontconfig/UnpackedTarball_fontconfig.mk b/fontconfig/UnpackedTarball_fontconfig.mk
new file mode 100644
index 0000000..7a6cfcb
--- /dev/null
+++ b/fontconfig/UnpackedTarball_fontconfig.mk
@@ -0,0 +1,20 @@
+# -*- 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:
diff --git a/fontconfig/makefile.mk b/fontconfig/makefile.mk
deleted file mode 100644
index 55375c6..0000000
--- a/fontconfig/makefile.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#*************************************************************************
-#
-# 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
-
diff --git a/fontconfig/prj/d.lst b/fontconfig/prj/d.lst
index aeb7edf..e69de29 100644
--- a/fontconfig/prj/d.lst
+++ b/fontconfig/prj/d.lst
@@ -1,4 +0,0 @@
-..\%__SRC%\misc\build\fontconfig*\src\.libs\*.a %_DEST%\lib
-
-mkdir: %_DEST%\inc\external\fontconfig
-..\%__SRC%\misc\build\fontconfig*\fontconfig\*.h %_DEST%\inc\external\fontconfig
diff --git a/fontconfig/prj/dmake b/fontconfig/prj/dmake
deleted file mode 100644
index e69de29..0000000
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index aa1394b..3c1a75d 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-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
More information about the Libreoffice-commits
mailing list