fdo#70393: move freetype to a subdir of external

Change-Id: I533d855e30e46b937d27d185eabc0ca3a3473f4d
Reviewed-on: https://gerrit.libreoffice.org/6304
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

7 files changed, 0 insertions, 128 deletions

diff --git a/freetype/ExternalPackage_freetype.mk b/freetype/ExternalPackage_freetype.mk
deleted file mode 100644
index 87067ad18407..000000000000
--- a/freetype/ExternalPackage_freetype.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- 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_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
deleted file mode 100644
index ba22a64838f0..000000000000
--- a/freetype/ExternalProject_freetype.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- 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_register_targets,freetype,\
-	build \
-))
-
-$(call gb_ExternalProject_get_state_target,freetype,build) :
-	cd $(EXTERNAL_WORKDIR) \
-	&& CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" \
-		./configure \
-		--disable-shared \
-		--without-zlib \
-		--without-bzip2 \
-		--prefix=$(OUTDIR) --includedir=$(call gb_UnpackedTarball_get_dir,freetype)/include \
-		--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
-	&& chmod +x builds/unix/freetype-config \
-	&& $(MAKE) \
-	&& touch $@
-
-# vim: set noet sw=4 ts=4:
diff --git a/freetype/Makefile b/freetype/Makefile
deleted file mode 100644
index ccb1c85a04da..000000000000
--- a/freetype/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- 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
deleted file mode 100644
index e0965a0deb2b..000000000000
--- a/freetype/Module_freetype.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- 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/README b/freetype/README
deleted file mode 100644
index c90f9509fb1a..000000000000
--- a/freetype/README
+++ /dev/null
@@ -1,8 +0,0 @@
-This "bundled" freetype is built only in an Android build
-
-FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable,
-and portable while capable of producing high-quality output (glyph images). It can be
-used in graphics libraries, display servers, font conversion tools, text image generation
-tools, and many other products as well.
-
-From [http://freetype.sourceforge.net/freetype2/index.html]
\ No newline at end of file
diff --git a/freetype/UnpackedTarball_freetype.mk b/freetype/UnpackedTarball_freetype.mk
deleted file mode 100644
index c1ba0ae8a003..000000000000
--- a/freetype/UnpackedTarball_freetype.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- 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),,freetype))
-
-$(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/freetype-2.4.8.patch b/freetype/freetype-2.4.8.patch
deleted file mode 100644
index 9ae69a3a6b45..000000000000
--- a/freetype/freetype-2.4.8.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- misc/build/freetype-2.4.8/builds/unix/configure
-+++ misc/build/freetype-2.4.8/builds/unix/configure
-@@ -3619,7 +3619,7 @@
- 
- if test "x$GCC" = xyes; then
-   XX_CFLAGS="-Wall"
--  XX_ANSIFLAGS="-pedantic -ansi"
-+  XX_ANSIFLAGS=
- else
-   case "$host" in
-   *-dec-osf*)
-@@ -10039,7 +10039,7 @@
- 	*Sun\ F*)			# Sun Fortran 8.3
- 	  tmp_sharedflag='-G' ;;
- 	esac
--	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags -o $lib'
- 
-         if test "x$supports_anon_versioning" = xyes; then
-           archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~