summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.fetch1
-rw-r--r--android/experimental/desktop/Makefile2
-rw-r--r--config_host.mk.in1
-rw-r--r--configure.ac21
-rw-r--r--download.lst1
-rw-r--r--external/Module_external.mk1
-rw-r--r--external/afms/ExternalPackage_fontunxafm.mk46
-rw-r--r--external/afms/Makefile7
-rw-r--r--external/afms/Module_afms.mk17
-rw-r--r--external/afms/README1
-rw-r--r--external/afms/UnpackedTarball_afms.mk14
-rw-r--r--scp2/source/ooo/directory_ooo.scp9
-rw-r--r--scp2/source/ooo/file_extra_ooo.scp13
13 files changed, 1 insertions, 133 deletions
diff --git a/Makefile.fetch b/Makefile.fetch
index ae76cf73701c..5b3f5010fe1a 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -88,7 +88,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,VISIO,VISIO_TARBALL) \
,$(call fetch_Download_item_special,http://dev-www.libreoffice.org/src,$(item)))
$(foreach item, \
- $(call fetch_Optional,AFMS,$(AFMS_TARBALL)) \
$(call fetch_Optional,APACHE_COMMONS,$(APACHE_COMMONS_CODEC_TARBALL)) \
$(call fetch_Optional,APACHE_COMMONS,$(APACHE_COMMONS_HTTPCLIENT_TARBALL)) \
$(call fetch_Optional,APACHE_COMMONS,$(APACHE_COMMONS_LANG_TARBALL)) \
diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile
index bd75e51f5d9e..145a9fbebe2f 100644
--- a/android/experimental/desktop/Makefile
+++ b/android/experimental/desktop/Makefile
@@ -117,7 +117,7 @@ copy-stuff:
cp -r $(SRC_ROOT)/icon-themes/galaxy/brand/* assets/program
# presets - becomes the users home directory, .stamp forces .zip dir creation
for D in $(strip autocorr autotext backup basic config gallery \
- psprint/driver psprint/fontmetric template \
+ psprint/driver template \
uno_packages/cache wordbook); do \
mkdir -p assets/presets/$$D ; \
echo "content" > assets/presets/$$D/stamp; \
diff --git a/config_host.mk.in b/config_host.mk.in
index 49977f1833ca..e5177856036f 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -577,7 +577,6 @@ export WINDOWS_SDK_VERSION=@WINDOWS_SDK_VERSION@
export WINDOWS_SDK_WILANGID=@WINDOWS_SDK_WILANGID@
export WINDRES=@WINDRES@
export WINEGCC=@WINEGCC@
-export WITHOUT_AFMS=@WITHOUT_AFMS@
export WITHOUT_PPDS=@WITHOUT_PPDS@
export WITH_COMPAT_OOWRAPPERS=@WITH_COMPAT_OOWRAPPERS@
export WITH_EXTENSION_INTEGRATION=@WITH_EXTENSION_INTEGRATION@
diff --git a/configure.ac b/configure.ac
index 3f9b91304529..3b9abe9a4f0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1396,13 +1396,6 @@ AC_ARG_WITH(ppds,
PPDs are known to be already available (every recent distro with CUPS backend).]),
,)
-AC_ARG_WITH(afms,
- AS_HELP_STRING([--without-afms],
- [Removes bitmap font files from LibreOffice installation set, for people
- building for specific distributions where AFM files or TrueType Fonts
- are known to be available.]),
-,)
-
AC_ARG_WITH(epm,
AS_HELP_STRING([--with-epm],
[Decides which epm to use. Default is to use the one from the system if
@@ -11483,20 +11476,6 @@ fi
AC_SUBST(WITHOUT_PPDS)
dnl ===================================================================
-dnl Test whether to include afms
-dnl ===================================================================
-AC_MSG_CHECKING([whether to include AFMs])
-if test "$with_afms" != "no"; then
- AC_MSG_RESULT([yes])
- BUILD_TYPE="$BUILD_TYPE AFMS"
-else
- AC_MSG_RESULT([no])
- WITHOUT_AFMS=YES
- SCPDEFS="$SCPDEFS -DWITHOUT_AFMS"
-fi
-AC_SUBST(WITHOUT_AFMS)
-
-dnl ===================================================================
dnl Test whether to include extra galleries
dnl ===================================================================
AC_MSG_CHECKING([whether to include extra galleries])
diff --git a/download.lst b/download.lst
index 03fe79939ba1..74ff6f1cb8dd 100644
--- a/download.lst
+++ b/download.lst
@@ -25,7 +25,6 @@ export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip
LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548
export LIBEOT_TARBALL := libeot-0.01.tar.bz2
-export AFMS_TARBALL := 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
export APACHE_COMMONS_CODEC_TARBALL := 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz
export APACHE_COMMONS_HTTPCLIENT_TARBALL := 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
export APACHE_COMMONS_LANG_TARBALL := 625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
diff --git a/external/Module_external.mk b/external/Module_external.mk
index dcd5b0822271..b753cfdc735d 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
accessories \
libxmlsec \
np_sdk \
- $(call gb_Helper_optional,AFMS,afms) \
$(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
$(call gb_Helper_optional,BOOST,boost) \
$(call gb_Helper_optional,BSH,beanshell) \
diff --git a/external/afms/ExternalPackage_fontunxafm.mk b/external/afms/ExternalPackage_fontunxafm.mk
deleted file mode 100644
index 97c7e489eb2c..000000000000
--- a/external/afms/ExternalPackage_fontunxafm.mk
+++ /dev/null
@@ -1,46 +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,afms_fontunxafm,afms))
-
-$(eval $(call gb_ExternalPackage_add_unpacked_files,afms_fontunxafm,$(LIBO_SHARE_FOLDER)/psprint/fontmetric,\
- Courier-Bold.afm \
- Courier-BoldOblique.afm \
- Courier-Oblique.afm \
- Courier.afm \
- Helvetica-Bold.afm \
- Helvetica-BoldOblique.afm \
- Helvetica-Oblique.afm \
- Helvetica.afm \
- ITCAvantGarde-Book.afm \
- ITCAvantGarde-BookOblique.afm \
- ITCAvantGarde-Demi.afm \
- ITCAvantGarde-DemiOblique.afm \
- ITCBookman-Demi.afm \
- ITCBookman-DemiItalic.afm \
- ITCBookman-Light.afm \
- ITCBookman-LightItalic.afm \
- ITCZapfChancery-MediumItalic.afm \
- NewCenturySchlbk-Bold.afm \
- NewCenturySchlbk-BoldItalic.afm \
- NewCenturySchlbk-Italic.afm \
- NewCenturySchlbk-Roman.afm \
- Palatino-Bold.afm \
- Palatino-BoldItalic.afm \
- Palatino-Italic.afm \
- Palatino-Roman.afm \
- Symbol.afm \
- Times-Bold.afm \
- Times-BoldItalic.afm \
- Times-Italic.afm \
- Times-Roman.afm \
- ZapfDingbats.afm \
-))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/external/afms/Makefile b/external/afms/Makefile
deleted file mode 100644
index e4968cf85fb6..000000000000
--- a/external/afms/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/external/afms/Module_afms.mk b/external/afms/Module_afms.mk
deleted file mode 100644
index 5e0c75052272..000000000000
--- a/external/afms/Module_afms.mk
+++ /dev/null
@@ -1,17 +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,afms))
-
-$(eval $(call gb_Module_add_targets,afms,\
- UnpackedTarball_afms \
- ExternalPackage_fontunxafm \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/afms/README b/external/afms/README
deleted file mode 100644
index 78be83a38c46..000000000000
--- a/external/afms/README
+++ /dev/null
@@ -1 +0,0 @@
-External package containing font metrics.
diff --git a/external/afms/UnpackedTarball_afms.mk b/external/afms/UnpackedTarball_afms.mk
deleted file mode 100644
index feed2f94853e..000000000000
--- a/external/afms/UnpackedTarball_afms.mk
+++ /dev/null
@@ -1,14 +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,afms))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,afms,$(AFMS_TARBALL)))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 4bda27ed7316..eb51cd84ba1c 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -433,15 +433,6 @@ End
#endif
-#ifdef UNX
-
-Directory gid_Dir_Psprint_Fontmetric
- ParentID = gid_Dir_Psprint;
- DosName = "fontmetric";
-End
-
-#endif
-
/* *** Accessories Extras *** */
/* ** Gallery ** */
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index 17cf18c78a8b..b9490bd68ba7 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -96,19 +96,6 @@ End
#ifdef UNX
-#ifndef WITHOUT_AFMS
-File gid_File_Extra_Fontunxafm
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "afms_fontunxafm.filelist";
-End
-#endif
-
-#endif
-
-#ifdef UNX
-
#ifndef WITHOUT_PPDS
File gid_File_Extra_Fontunxppds
Dir = FILELIST_DIR;
generated by cgit (git 2.34.1) at 2024-08-15 02:08:16 +0000