[Libreoffice-commits] core.git: 12 commits - ct2n/ExternalPackage_ct2n.mk ct2n/Module_ct2n.mk ct2n/Zip_ct2n.mk extras/ExternalPackage_extra_fonts.mk extras/Package_fonts.mk extras/unx librelogo/Module_librelogo.mk librelogo/Package_librelogo.mk librelogo/Package_librelogo_properties.mk librelogo/Zip_librelogo.mk more_fonts/ExternalPackage_dejavu.mk more_fonts/ExternalPackage_gentium.mk more_fonts/ExternalPackage_liberation.mk more_fonts/ExternalPackage_liberation_narrow.mk more_fonts/ExternalPackage_libertineg.mk more_fonts/ExternalPackage_opensans.mk more_fonts/ExternalPackage_ptserif.mk more_fonts/ExternalPackage_sourcecode.mk more_fonts/ExternalPackage_sourcesans.mk more_fonts/Package_conf.mk scp2/inc scp2/source solenv/bin solenv/gbuild
David Tardon
dtardon at redhat.com
Sun Apr 14 04:55:16 PDT 2013
ct2n/ExternalPackage_ct2n.mk | 42
ct2n/Module_ct2n.mk | 2
ct2n/Zip_ct2n.mk | 59 -
extras/ExternalPackage_extra_fonts.mk | 4
extras/Package_fonts.mk | 5
extras/unx/source/fonts/fonts.dir | 2
librelogo/Module_librelogo.mk | 3
librelogo/Package_librelogo.mk | 40
librelogo/Package_librelogo_properties.mk | 18
librelogo/Zip_librelogo.mk | 49 -
more_fonts/ExternalPackage_dejavu.mk | 8
more_fonts/ExternalPackage_gentium.mk | 8
more_fonts/ExternalPackage_liberation.mk | 8
more_fonts/ExternalPackage_liberation_narrow.mk | 8
more_fonts/ExternalPackage_libertineg.mk | 8
more_fonts/ExternalPackage_opensans.mk | 8
more_fonts/ExternalPackage_ptserif.mk | 8
more_fonts/ExternalPackage_sourcecode.mk | 8
more_fonts/ExternalPackage_sourcesans.mk | 8
more_fonts/Package_conf.mk | 6
scp2/inc/macros.inc | 43 -
scp2/source/accessories/file_font_accessories.scp | 851 --------------------
scp2/source/accessories/module_font_accessories.scp | 164 ---
scp2/source/extensions/file_extensions.scp | 6
scp2/source/ooo/file_font_ooo.scp | 147 ---
scp2/source/ooo/module_hidden_ooo.scp | 77 -
scp2/source/python/file_python_librelogo.scp | 13
scp2/source/python/module_python_librelogo.scp | 1
solenv/bin/modules/installer/windows/directory.pm | 2
solenv/gbuild/ExternalPackage.mk | 10
30 files changed, 208 insertions(+), 1408 deletions(-)
New commits:
commit dcdc7bf5520b4b26090db52d8437c513a79d41ed
Author: David Tardon <dtardon at redhat.com>
Date: Sun Apr 14 12:59:48 2013 +0200
install librelogo using filelists
Change-Id: Iffd409c66608d4e67eee9e149f0063f09e0e4675
diff --git a/librelogo/Module_librelogo.mk b/librelogo/Module_librelogo.mk
index caa4cf9..5d8996f 100644
--- a/librelogo/Module_librelogo.mk
+++ b/librelogo/Module_librelogo.mk
@@ -14,7 +14,8 @@ ifneq ($(DISABLE_PYTHON),TRUE)
$(eval $(call gb_Module_add_targets,librelogo,\
CustomTarget_librelogo \
- Zip_librelogo \
+ Package_librelogo \
+ Package_librelogo_properties \
))
endif
diff --git a/librelogo/Package_librelogo.mk b/librelogo/Package_librelogo.mk
new file mode 100644
index 0000000..71181ce
--- /dev/null
+++ b/librelogo/Package_librelogo.mk
@@ -0,0 +1,40 @@
+# -*- 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_Package_Package,librelogo,$(SRCDIR)/librelogo/source))
+
+$(eval $(call gb_Package_set_outdir,librelogo,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,librelogo,share/Scripts/python/LibreLogo,\
+ LibreLogo/LibreLogo.py \
+ pythonpath/LibreLogo_en_US.properties \
+))
+
+$(eval $(call gb_Package_add_files,librelogo,share/Scripts/python/LibreLogo/icons,\
+ icons/lc_arrowshapes.circular-arrow.png \
+ icons/lc_arrowshapes.circular-leftarrow.png \
+ icons/lc_arrowshapes.down-arrow.png \
+ icons/lc_arrowshapes.up-arrow.png \
+ icons/lc_basicstop.png \
+ icons/lc_editglossary.png \
+ icons/lc_navigationbarleft.png \
+ icons/lc_newdoc.png \
+ icons/lc_runbasic.png \
+ icons/sc_arrowshapes.circular-arrow.png \
+ icons/sc_arrowshapes.circular-leftarrow.png \
+ icons/sc_arrowshapes.down-arrow.png \
+ icons/sc_arrowshapes.up-arrow.png \
+ icons/sc_basicstop.png \
+ icons/sc_editglossary.png \
+ icons/sc_navigationbarleft.png \
+ icons/sc_newdoc.png \
+ icons/sc_runbasic.png \
+))
+
+# vim:set noet sw=4 ts=4:
diff --git a/librelogo/Package_librelogo_properties.mk b/librelogo/Package_librelogo_properties.mk
new file mode 100644
index 0000000..3377470
--- /dev/null
+++ b/librelogo/Package_librelogo_properties.mk
@@ -0,0 +1,18 @@
+# -*- 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_Package_Package,librelogo_properties,$(call gb_CustomTarget_get_workdir,librelogo/locproperties)))
+
+$(eval $(call gb_Package_set_outdir,librelogo_properties,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,librelogo_properties,share/Scripts/python/LibreLogo,\
+ $(foreach lang,$(subst -,_,$(gb_TRANS_LANGS)),LibreLogo_$(lang).properties) \
+))
+
+# vim:set noet sw=4 ts=4:
diff --git a/librelogo/Zip_librelogo.mk b/librelogo/Zip_librelogo.mk
deleted file mode 100644
index d4ca750..0000000
--- a/librelogo/Zip_librelogo.mk
+++ /dev/null
@@ -1,49 +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_Zip_Zip,LibreLogo,$(WORKDIR)/Zip/LibreLogo))
-
-$(eval $(call gb_Zip_add_file,LibreLogo,python/LibreLogo/LibreLogo.py,\
- $(SRCDIR)/librelogo/source/LibreLogo/LibreLogo.py \
-))
-
-$(eval $(call gb_Zip_add_file,LibreLogo,python/LibreLogo/LibreLogo_en_US.properties,\
- $(SRCDIR)/librelogo/source/pythonpath/LibreLogo_en_US.properties \
-))
-
-librelogo_LANGS := $(subst -,_,$(filter-out qtz,$(filter-out en-US,$(gb_WITH_LANG))))
-
-$(eval $(foreach lang,$(librelogo_LANGS),\
- $(call gb_Zip_add_file,LibreLogo,python/LibreLogo/LibreLogo_$(lang).properties,\
- $(call gb_CustomTarget_get_workdir,librelogo/locproperties)/LibreLogo_$(lang).properties)))
-
-$(eval $(foreach icon,\
- lc_arrowshapes.circular-arrow.png \
- lc_arrowshapes.circular-leftarrow.png \
- lc_arrowshapes.down-arrow.png \
- lc_arrowshapes.up-arrow.png \
- lc_basicstop.png \
- lc_editglossary.png \
- lc_navigationbarleft.png \
- lc_newdoc.png \
- lc_runbasic.png \
- sc_arrowshapes.circular-arrow.png \
- sc_arrowshapes.circular-leftarrow.png \
- sc_arrowshapes.down-arrow.png \
- sc_arrowshapes.up-arrow.png \
- sc_basicstop.png \
- sc_editglossary.png \
- sc_navigationbarleft.png \
- sc_newdoc.png \
- sc_runbasic.png, \
- $(call gb_Zip_add_file,LibreLogo,python/LibreLogo/icons/$(icon),\
- $(SRCDIR)/librelogo/source/icons/$(icon) \
-)))
-
-# vim:set noet sw=4 ts=4:
diff --git a/scp2/source/python/file_python_librelogo.scp b/scp2/source/python/file_python_librelogo.scp
index a089262..d78bdd2 100644
--- a/scp2/source/python/file_python_librelogo.scp
+++ b/scp2/source/python/file_python_librelogo.scp
@@ -12,9 +12,16 @@
#ifndef DISABLE_PYUNO
File gid_File_LibreLogo
TXT_FILE_BODY;
- Styles = (ARCHIVE);
- Dir = gid_Dir_Share_Scripts;
- Name = "LibreLogo.zip";
+ Styles = (FILELIST);
+ Dir = FILELIST_DIR;
+ Name = "librelogo.filelist";
+End
+
+File gid_File_LibreLogoProperties
+ TXT_FILE_BODY;
+ Styles = (FILELIST);
+ Dir = FILELIST_DIR;
+ Name = "librelogo_properties.filelist";
End
File gid_File_Share_Registry_LibreLogo_Xcd
diff --git a/scp2/source/python/module_python_librelogo.scp b/scp2/source/python/module_python_librelogo.scp
index dac4a9c..0c35d61 100644
--- a/scp2/source/python/module_python_librelogo.scp
+++ b/scp2/source/python/module_python_librelogo.scp
@@ -16,6 +16,7 @@ Module gid_Module_Optional_Pyuno_LibreLogo
ParentID = gid_Module_Optional;
Sortkey = "810";
Files = (gid_File_LibreLogo,
+ gid_File_LibreLogoProperties,
gid_File_Share_Registry_LibreLogo_Xcd);
Minimal = NO;
Default = YES;
commit 25b75577efed9f04f3ea5936aceb66c84e9e4b4e
Author: David Tardon <dtardon at redhat.com>
Date: Sun Apr 14 12:21:33 2013 +0200
install ConvertTextToNumber ext. using filelist
Change-Id: I59c132239a410653c27be569c45b789fcb109898
diff --git a/ct2n/ExternalPackage_ct2n.mk b/ct2n/ExternalPackage_ct2n.mk
new file mode 100644
index 0000000..6d2e6b6
--- /dev/null
+++ b/ct2n/ExternalPackage_ct2n.mk
@@ -0,0 +1,42 @@
+# -*- 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,ct2n,ConvertTextToNumber))
+
+$(eval $(call gb_ExternalPackage_set_outdir,ct2n,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_use_unpacked,ct2n,ConvertTextToNumber))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files_with_dir,ct2n,share/extensions/ConvertTextToNumber,\
+ Addons.xcu \
+ CT2N/MainCode.xba \
+ CT2N/ToClipbord.xba \
+ CT2N/Language.xba \
+ CT2N/dialog.xlb \
+ CT2N/dlgCode.xba \
+ CT2N/script.xlb \
+ CT2N/dlgCT2N.xdl \
+ CT2N/UserSettings.xba \
+ META-INF/manifest.xml \
+ Office/UI/BaseWindowState.xcu \
+ Office/UI/ImpressWindowState.xcu \
+ Office/UI/StartModuleWindowState.xcu \
+ Office/UI/BasicIDEWindowState.xcu \
+ Office/UI/CalcWindowState.xcu \
+ Office/UI/WriterWindowState.xcu \
+ Office/UI/DrawWindowState.xcu \
+ Office/UI/MathWindowState.xcu \
+ description.xml \
+ icons/image1_26.bmp \
+ icons/image1_16.bmp \
+ pkg-desc/pkg-description.txt \
+ registration/COPYING \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/ct2n/Module_ct2n.mk b/ct2n/Module_ct2n.mk
index acc9d5f..873f31b 100644
--- a/ct2n/Module_ct2n.mk
+++ b/ct2n/Module_ct2n.mk
@@ -12,8 +12,8 @@ $(eval $(call gb_Module_Module,ConvertTextToNumber))
ifneq (,$(filter CT2N,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,ConvertTextToNumber,\
+ ExternalPackage_ct2n \
UnpackedTarball_ct2n \
- Zip_ct2n \
))
endif
diff --git a/ct2n/Zip_ct2n.mk b/ct2n/Zip_ct2n.mk
deleted file mode 100644
index 1ca489c..0000000
--- a/ct2n/Zip_ct2n.mk
+++ /dev/null
@@ -1,59 +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_Zip_Zip,ct2n,$(call gb_UnpackedTarball_get_dir,ConvertTextToNumber)))
-
-$(eval $(call gb_Zip_use_unpacked,ct2n,ConvertTextToNumber))
-
-$(eval $(call gb_Zip_add_files,ct2n,\
- Addons.xcu \
- CT2N \
- CT2N/MainCode.xba \
- CT2N/ToClipbord.xba \
- CT2N/Language.xba \
- CT2N/dialog.xlb \
- CT2N/dlgCode.xba \
- CT2N/script.xlb \
- CT2N/dlgCT2N.xdl \
- CT2N/UserSettings.xba \
- META-INF \
- META-INF/manifest.xml \
- Office \
- Office/UI \
- Office/UI/BaseWindowState.xcu \
- Office/UI/ImpressWindowState.xcu \
- Office/UI/StartModuleWindowState.xcu \
- Office/UI/BasicIDEWindowState.xcu \
- Office/UI/CalcWindowState.xcu \
- Office/UI/WriterWindowState.xcu \
- Office/UI/DrawWindowState.xcu \
- Office/UI/MathWindowState.xcu \
- description.xml \
- icons \
- icons/image1_26.bmp \
- icons/image1_16.bmp \
- pkg-desc \
- pkg-desc/pkg-description.txt \
- registration \
- registration/COPYING \
-))
-
-# UGLY: the Zip target always has .zip suffix, so copy the file to .oxt here...
-
-$(call gb_Zip_get_final_target,ct2n) : $(OUTDIR)/bin/ConvertTextToNumber.oxt
-$(call gb_Zip_get_clean_target,ct2n) : Clean_ConvertTextToNumber_oxt
-
-$(OUTDIR)/bin/ConvertTextToNumber.oxt : $(call gb_Zip_get_target,ct2n) | $(OUTDIR)/bin/.dir
- $(call gb_Deliver_deliver,$<,$@)
-
-.PHONY : Clean_ConvertTextToNumber_oxt
-Clean_ConvertTextToNumber_oxt :
- rm -f $(OUTDIR)/bin/ConvertTextToNumber.oxt
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index 936f15a..8084335 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -78,9 +78,9 @@ End
File gid_File_Oxt_CT2N
TXT_FILE_BODY;
- Styles = (PACKED, ARCHIVE);
- Dir = gid_Brand_Dir_Share_Extensions_CT2N;
- Name = "ConvertTextToNumber.oxt";
+ Styles = (PACKED, FILELIST);
+ Dir = FILELIST_DIR;
+ Name = "ct2n.filelist";
End
#endif
commit 5ec03f9fe566df77c6fa959c675b1b0c726e8db7
Author: David Tardon <dtardon at redhat.com>
Date: Sun Apr 14 10:51:40 2013 +0200
drop unused macros
Change-Id: I8965462b47e02863e40f2c218e8ceb9cd995afea
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 98a3b88..ad9f264 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -134,14 +134,6 @@
End
#ifdef UNX
-#define STD_FONT_FILE(id,name,fontname) \
- File id \
- TXT_FILE_BODY; \
- Dir = gid_Dir_Fonts_Truetype; \
- Styles = (PACKED, FONT_WARN_IF_EXISTS); \
- Name = STRING(name) ; \
- End
-
#define STD_FONT_FILELIST(id,name) \
File id \
TXT_FILE_BODY; \
@@ -152,15 +144,6 @@
#endif
#ifdef WNT
-#define STD_FONT_FILE(id,name,fontname) \
- File id \
- TXT_FILE_BODY; \
- Dir = gid_Dir_Fonts_Truetype; \
- Styles = (PACKED,FONT,DONT_DELETE,FONT_WARN_IF_EXISTS); \
- Name = STRING(name) ; \
- NetDir = gid_Dir_Winfonts; \
- End
-
#define STD_FONT_FILELIST(id,name) \
File id \
TXT_FILE_BODY; \
commit 11a0e150b26c018485f3b575e2f4f93b84e23660
Author: David Tardon <dtardon at redhat.com>
Date: Sun Apr 14 10:47:56 2013 +0200
install extra fonts using filelists
Change-Id: I2346fb024504c33f8a100aea0438f38f86caeb76
diff --git a/extras/ExternalPackage_extra_fonts.mk b/extras/ExternalPackage_extra_fonts.mk
index 638af35..bf97717 100644
--- a/extras/ExternalPackage_extra_fonts.mk
+++ b/extras/ExternalPackage_extra_fonts.mk
@@ -9,9 +9,11 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_extra_fonts,fonts-pack))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_extra_fonts,$(INSTDIR)))
+
$(eval $(call gb_ExternalPackage_use_unpacked,extras_extra_fonts,fonts-pack))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_extra_fonts,pck,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_extra_fonts,share/fonts/truetype,\
decorative/BETSY2.ttf \
decorative/Berylibi.ttf \
decorative/Beryliub.ttf \
diff --git a/scp2/source/accessories/file_font_accessories.scp b/scp2/source/accessories/file_font_accessories.scp
index 9adbe4b..e0298ab 100644
--- a/scp2/source/accessories/file_font_accessories.scp
+++ b/scp2/source/accessories/file_font_accessories.scp
@@ -28,855 +28,6 @@
#include "macros.inc"
-/* Airmole font */
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_airmole, airmole.ttf, Airmole )
+STD_FONT_FILELIST( gid_File_Fnt_Extra, "extras_extra_fonts.filelist" )
#endif
-
-/* Airmole Antique font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_airmolea, airmolea.ttf, Airmole Antique )
-#endif
-
-/* Airmole Shaded font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_airmoles, airmoles.ttf, Airmole Shaded )
-#endif
-
-/* Airmole Stripe font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_airmoleq, airmoleq.ttf, Airmole Stripe )
-#endif
-
-/* Astron Boy font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_astronbo, astronbo.ttf, Astron Boy )
-#endif
-
-/* Astron Boy Italic font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_astronbi, astronbi.ttf, Astron Boy Italic )
-#endif
-
-/* Astron Boy Video font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_astronbv, astronbv.ttf, Astron Boy Video )
-#endif
-
-/* Astron Boy Wonder font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_astronbw, astronbw.ttf, Astron Boy Wonder )
-#endif
-
-/* Baveuse font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_baveuse, baveuse.ttf, Baveuse )
-#endif
-
-/* Berylium font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Berylium, Berylium.ttf, Berylium )
-#endif
-
-/* Berylium Bold font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Beryliub, Beryliub.ttf, Berylium Bold )
-#endif
-
-/* Berylium Bold Italic font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Berylibi, Berylibi.ttf, Berylium Bold Italic )
-#endif
-
-/* Berylium Italic font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Beryliui, Beryliui.ttf, Berylium Italic )
-#endif
-
-/* Betsy Flanagan 2 font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_BETSY2, BETSY2.ttf, Betsy Flanagan 2 )
-#endif
-
-/* Blue Highway font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_bluehigh, bluehigh.ttf, Blue Highway )
-#endif
-
-/* Blue Highway Bold font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_bluebold, bluebold.ttf, Blue Highway Bold )
-#endif
-
-/* Blue Highway Condensed font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_bluecond, bluecond.ttf, Blue Highway Condensed )
-#endif
-
-/* Blue Highway Linocut font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_bluehigl, bluehigl.ttf, Blue Highway Linocut )
-#endif
-
-/* Bullpen font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_bullpen_, bullpen_.ttf, Bullpen )
-#endif
-
-/* Bullpen 3D font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_bullpen3, bullpen3.ttf, Bullpen 3D )
-#endif
-
-/* Bullpen Italic font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_bullpeni, bullpeni.ttf, Bullpen Italic )
-#endif
-
-/* Colourbars font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_colourba, colourba.ttf, Colourbars )
-#endif
-
-/* Colourbars Bold font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_colourbb, colourbb.ttf, Colourbars Bold )
-#endif
-
-/* Counterscraps font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_counters, counters.ttf, Counterscraps )
-#endif
-
-/* Credit Valley font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_creditva, creditva.ttf, Credit Valley )
-#endif
-
-/* Credit Valley Bold font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_creditvb, creditvb.ttf, Credit Valley Bold )
-#endif
-
-/* Credit Valley Bold Italic font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_creditvz, creditvz.ttf, Credit Valley Bold Italic )
-#endif
-
-/* Credit Valley Italic font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_creditvi, creditvi.ttf, Credit Valley Italic )
-#endif
-
-/* Edmunds font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_edmunds, edmunds.ttf, Edmunds )
-#endif
-
-/* Edmunds Distressed font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_edmundis, edmundis.ttf, Edmunds Distressed )
-#endif
-
-/* Engebrechtre font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_engeregu, engeregu.ttf, Engebrechtre )
-#endif
-
-/* Engebrechtre Bold font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_engebold, engebold.ttf, Engebrechtre Bold )
-#endif
-
-/* Engebrechtre Bold Italic font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_engeboit, engeboit.ttf, Engebrechtre Bold Italic )
-#endif
-
-/* Engebrechtre Expanded font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_engeexpa, engeexpa.ttf, Engebrechtre Expanded )
-#endif
-
-/* Engebrechtre Expanded Bold font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_engeexbo, engeexbo.ttf, Engebrechtre Expanded Bold )
-#endif
-
-/* Engebrechtre Expanded Bold Italic font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_engeexbi, engeexbi.ttf, Engebrechtre Expanded Bold Italic )
-#endif
-
-/* Engebrechtre Expanded Italic font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_engeexit, engeexit.ttf, Engebrechtre Expanded Italic )
-#endif
-
-/* Engebrechtre Italic font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_engeital, engeital.ttf, Engebrechtre Italic )
-#endif
-
-/* Goodfish font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_goodfish, goodfish.ttf, Goodfish )
-#endif
-
-/* Goodfish Bold font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_goodfisb, goodfisb.ttf, Goodfish Bold )
-#endif
-
-/* Goodfish Bold Italic font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_goodfisc, goodfisc.ttf, Goodfish Bold Italic )
-#endif
-
-/* Goodfish Italic font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_goodfisi, goodfisi.ttf, Goodfish Italic )
-#endif
-
-/* Guanine font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_guanine_, guanine_.ttf, Guanine )
-#endif
-
-/* Gunplay font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_gunplay, gunplay.ttf, Gunplay )
-#endif
-
-/* Kirsty font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_kirsty__, kirsty__.ttf, Kirsty )
-#endif
-
-/* Kirsty Bold font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_kirsty_b, kirsty_b.ttf, Kirsty Bold )
-#endif
-
-/* Kirsty Bold Italic font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_kirstybi, kirstybi.ttf, Kirsty Bold Italic )
-#endif
-
-/* Kirsty Italic font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_kirsty_i, kirsty_i.ttf, Kirsty Italic )
-#endif
-
-/* Kirsty Ink font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_kirstyin, kirstyin.ttf, Kirsty Ink )
-#endif
-
-/* Mufferaw font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_mufferaw, mufferaw.ttf, Mufferaw )
-#endif
-
-/* Nasalization font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_nasaliza, nasaliza.ttf, Nasalization )
-#endif
-
-/* Neuropol font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_NEUROPOL, NEUROPOL.ttf, Neuropol )
-#endif
-
-/* Numberpile font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_numberpi, numberpi.ttf, Numberpile )
-#endif
-
-/* Pricedown font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_pricedow, pricedow.ttf, Pricedown )
-#endif
-
-/* Pupcat font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_pupcat__, pupcat__.ttf, Pupcat )
-#endif
-
-/* Rina font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_rina, rina.ttf, Rina )
-#endif
-
-/* Sandoval font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_sandoval, sandoval.ttf, Sandoval )
-#endif
-
-/* Sappy Mugs font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_SAPPM___, SAPPM___.ttf, Sappy Mugs )
-#endif
-
-/* Screengem font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_screenge, screenge.ttf, Screengem )
-#endif
-
-/* Steelfish font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_steelfis, steelfis.ttf, Steelfish )
-#endif
-
-/* Steelfish Bold font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_steelfib, steelfib.ttf, Steelfish Bold )
-#endif
-
-/* Steelfish Outline font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_steelout, steelout.ttf, Steelfish Outline )
-#endif
-
-/* Strenuous font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_strenuou, strenuou.ttf, Strenuous )
-#endif
-
-/* Strenuous 3D font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_strenu3d, strenu3d.ttf, Strenuous 3D )
-#endif
-
-/* Subpear font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_subpear_, subpear_.ttf, Subpear )
-#endif
-
-/* Teen font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_teen____, teen____.ttf, Teen )
-#endif
-
-/* Teen Bold font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_teenbold, teenbold.ttf, Teen Bold )
-#endif
-
-/* Teen Bold Italic font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_teenbdit, teenbdit.ttf, Teen Bold Italic )
-#endif
-
-/* Teen Italic font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_teenital, teenital.ttf, Teen Italic )
-#endif
-
-/* Teen Light font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_teenlite, teenlite.ttf, Teen Light )
-#endif
-
-/* Teen Light Italic font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_teenlita, teenlita.ttf, Teen Light Italic )
-#endif
-
-/* Typodermic font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_typoderm, typoderm.ttf, Typodermic )
-#endif
-
-/* Vahika font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_vahika_, vahika_.ttf, Vahika )
-#endif
-
-/* Vahika Bold font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_vahikab, vahikab.ttf, Vahika Bold )
-#endif
-
-/* Vahika Bold Italic font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_vahikac, vahikac.ttf, Vahika Bold Italic )
-#endif
-
-/* Vahika Italic font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_vahikai, vahikai.ttf, Vahika Italic )
-#endif
-
-/* Vectroid font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_vectroid, vectroid.ttf, Vectroid )
-#endif
-
-/* Velvenda Cooler font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_velvendc, velvendc.ttf, Velvenda Cooler )
-#endif
-
-/* Velvenda Megablack font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_velvenda, velvenda.ttf, Velvenda Megablack )
-#endif
-
-/* Vibrocentric font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_vibrocen, vibrocen.ttf, Vibrocentric )
-#endif
-
-/* Vibrocentric Bold font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_vibroceb, vibroceb.ttf, Vibrocentric Bold )
-#endif
-
-/* Vibrocentric Bold Italic font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_vibrocex, vibrocex.ttf, Vibrocentric Bold Italic )
-#endif
-
-/* Vibrocentric Italic font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_vibrocei, vibrocei.ttf, Vibrocentric Italic )
-#endif
-
-/* Wintermute font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_wintermu, wintermu.ttf, Wintermute )
-#endif
-
-/* You're Gone font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_youregon, youregon.ttf, You are Gone )
-#endif
-
-/* You're Gone Italic font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_youregoi, youregoi.ttf, You are Gone Italic )
-#endif
-
-/* Zekton font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_zekton__, zekton__.ttf, Zekton )
-#endif
-
-/* Zekton Bold font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_zektonbo, zektonbo.ttf, Zekton Bold )
-#endif
-
-/* Zekton Bold Italic font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_zektonbi, zektonbi.ttf, Zekton Bold Italic )
-#endif
-
-/* Zekton Italic font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_zektonit, zektonit.ttf, Zekton Italic )
-#endif
-
-/* Zorque font */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_zorque, zorque.ttf, Zorque )
-#endif
-
-/* Additional fonts for 2.0.3 */
-
-/* URW Gothic L */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Gothic_L_Avantgarde, a010013l.ttf, URW Gothic L )
-#endif
-
-/* URW Gothic L Bold */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Gothic_L_Bold_Avantgarde, a010015l.ttf, URW Gothic L Bold )
-#endif
-
-/* URW Gothic L Italic */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Gothic_L_Italic_Avantgarde, a010033l.ttf, URW Gothic L Italic )
-#endif
-
-/* URW Gothic L Bold Italic */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Gothic_L_Bold_Italic_Avantgarde, a010035l.ttf, URW Gothic L Bold Italic )
-#endif
-
-/* URW Bookman L */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Bookman_L_Bookman, b018012l.ttf, URW Bookman L )
-#endif
-
-/* URW Bookman L Bold */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Bookman_L_Bold_Bookman, b018015l.ttf, URW Bookman L Bold )
-#endif
-
-/* URW Bookman L Italic */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Bookman_L_Italic_Bookman, b018032l.ttf, URW Bookman L Italic )
-#endif
-
-/* URW Bookman L Bold Italic */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Bookman_L_Bold_Italic_Bookman, b018035l.ttf, URW Bookman L Bold Italic )
-#endif
-
-/* URW Century Schoolbook L */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Century_Schoolbook_L_New_Century_SchoolBook, c059013l.ttf, URW Century Schoolbook L )
-#endif
-
-/* URW Century Schoolbook L Bold */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Century_Schoolbook_L_Bold_New_Century_SchoolBook, c059016l.ttf, URW Century Schoolbook L Bold )
-#endif
-
-/* URW Century Schoolbook L Italic */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Century_Schoolbook_L_Italic_New_Century_SchoolBook, c059033l.ttf, URW Century Schoolbook L Italic )
-#endif
-
-/* URW Century Schoolbook L Bold Italic */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Century_Schoolbook_L_Bold_Italic_New_Century_SchoolBook, c059036l.ttf, URW Century Schoolbook L Bold Italic )
-#endif
-
-/* URW Nimbus Sans L */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Helvetica, n019003l.ttf, URW Nimbus Sans L )
-#endif
-
-/* URW Nimbus Sans L Bold */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Helvetica, n019004l.ttf, URW Nimbus Sans L Bold )
-#endif
-
-/* URW Nimbus Sans L Italic */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Italic_Helvetica, n019023l.ttf, URW Nimbus Sans L Italic )
-#endif
-
-/* URW Nimbus Sans L Bold Italic */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Italic_Helvetica, n019024l.ttf, URW Nimbus Sans L Bold Italic )
-#endif
-
-/* URW Nimbus Sans L Condensed */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Helvetica_Condensed, n019043l.ttf, URW Nimbus Sans L Condensed )
-#endif
-
-/* URW Nimbus Sans L Bold Condensed */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Helvetica_Condensed, n019044l.ttf, URW Nimbus Sans L Bold Condensed )
-#endif
-
-/* URW Nimbus Sans L Italic Condensed */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Italic_Helvetica_Condensed, n019063l.ttf, URW Nimbus Sans L Italic Condensed )
-#endif
-
-/* URW Nimbus Sans L Bold Italic Condensed */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Italic_Helvetica_Condensed, n019064l.ttf, URW Nimbus Sans L Bold Italic Condensed )
-#endif
-
-/* URW Nimbus Roman No9 L */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Roman_No9_L_Times, n021003l.ttf, URW Nimbus Roman No9 L )
-#endif
-
-/* URW Nimbus Roman No9 L Bold */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Roman_No9_L_Bold_Times, n021004l.ttf, URW Nimbus Roman No9 L Bold )
-#endif
-
-/* URW Nimbus Roman No9 L Italic */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Roman_No9_L_Italic_Times, n021023l.ttf, URW Nimbus Roman No9 L Italic )
-#endif
-
-/* URW Nimbus Roman No9 L Bold Italic */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Roman_No9_L_Bold_Italic_Times, n021024l.ttf, URW Nimbus Roman No9 L Bold Italic )
-#endif
-
-/* URW Nimbus Mono L */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Mono_L_Courier, n022003l.ttf, URW Nimbus Mono L )
-#endif
-
-/* URW Nimbus Mono L Bold */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Mono_L_Bold_Courier, n022004l.ttf, URW Nimbus Mono L Bold )
-#endif
-
-/* URW Nimbus Mono LK Italic */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Mono_LK_Italic_Courier, n022023l.ttf, URW Nimbus Mono LK Italic )
-#endif
-
-/* URW Nimbus Mono L Bold Italic */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Mono_L_Bold_Italic_Courier, n022024l.ttf, URW Nimbus Mono L Bold Italic )
-#endif
-
-/* URW Palladio L */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Palladio_L_Palitino, p052003l.ttf, URW Palladio L )
-#endif
-
-/* URW Palladio L Bold */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Palladio_L_Bold_Palitino, p052004l.ttf, URW Palladio L Bold )
-#endif
-
-/* URW Palladio L Italic */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Palladio_L_Italic_Palitino, p052023l.ttf, URW Palladio L Italic )
-#endif
-
-/* URW Palladio L Bold Italic */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Palladio_L_Bold_Italic_Palitino, p052024l.ttf, URW Palladio L Bold Italic )
-#endif
-
-/* URW Standard Symbols L */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Standard_Symbols_L_Symbol, s050000l.ttf, URW Standard Symbols L )
-#endif
-
-/* URW Chancery L */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_URW_Chancery_L_Zapf_Chancery, z003034l.ttf, URW Chancery L )
-#endif
-
-/* Dingbats */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Dingbats, d050000l.ttf, Dingbats )
-#endif
-
-/* Luxi Mono Bold */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Bold, luximb.ttf, Luxi Mono Bold )
-#endif
-
-/* Luxi Mono Bold Oblique */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Bold_Oblique, luximbi.ttf, Luxi Mono Bold Oblique )
-#endif
-
-/* Luxi Mono Regular */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Regular, luximr.ttf, Luxi Mono Regular )
-#endif
-
-/* Luxi Mono Oblique */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Oblique, luximri.ttf, Luxi Mono Oblique )
-#endif
-
-/* Luxi Serif Bold */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Bold, luxirb.ttf, Luxi Serif Bold )
-#endif
-
-/* Luxi Serif Bold Oblique */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Bold_Oblique, luxirbi.ttf, Luxi Serif Bold Oblique )
-#endif
-
-/* Luxi Serif Regular */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Regular, luxirr.ttf, Luxi Serif Regular )
-#endif
-
-/* Luxi Serif Oblique */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Oblique, luxirri.ttf, Luxi Serif Oblique )
-#endif
-
-/* Luxi Sans Bold */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Bold, luxisb.ttf, Luxi Sans Bold )
-#endif
-
-/* Luxi Sans Bold Oblique */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Bold_Oblique, luxisbi.ttf, Luxi Sans Bold Oblique )
-#endif
-
-/* Luxi Sans Regular */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Regular, luxisr.ttf, Luxi Sans Regular )
-#endif
-
-/* Luxi Sans Oblique */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Oblique, luxisri.ttf, Luxi Sans Oblique )
-#endif
-
-/* Gentium */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Gentium, GenR102.TTF, Gentium )
-#endif
-
-/* Gentium Italic */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Gentium_Italic, GenI102.TTF, Gentium Italic )
-#endif
-
-/* GentiumAlt */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_GentiumAlt, GenAR102.TTF, GentiumAlt )
-#endif
-
-/* GentiumAlt Italic */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_GentiumAlt_Italic, GenAI102.TTF, GentiumAlt Italic )
-#endif
-
-/* MgOpen Canonica Bold */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Bold, MgOpenCanonicaBold.ttf, MgOpen Canonica Bold )
-#endif
-
-/* MgOpen Canonica Bold Italic */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Bold_Italic, MgOpenCanonicaBoldItalic.ttf, MgOpen Canonica Bold Italic)
-#endif
-
-/* MgOpen Canonica Italic */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Italic, MgOpenCanonicaItalic.ttf, MgOpen Canonica Italic )
-#endif
-
-/* MgOpen Canonica Regular */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Regular, MgOpenCanonicaRegular.ttf, MgOpen Canonica )
-#endif
-
-/* Chopin Script */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Chopin_Script, CHOPS___.TTF, Chopin Script )
-#endif
-
-/* DTP Dingbats */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_DTPDingbats, DTPDingbats.ttf, DTP Dingbats )
-#endif
-
-/* Justus Bold */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Justus_Bold, Justus-Bold.ttf, Justus Bold )
-#endif
-
-/* Justus Italic Oldstyle */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Justus_ItalicOldstyle, Justus-ItalicOldstyle.ttf, Justus Italic Oldstyle )
-#endif
-
-/* Justus Italic */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Justus_Italic, Justus-Italic.ttf, Justus Italic )
-#endif
-
-/* Justus Oldstyle */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Justus_Oldstyle, Justus-Oldstyle.ttf, Justus Oldstyle )
-#endif
-
-/* Justus Roman */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Justus_Roman, Justus-Roman.ttf, Justus Roman )
-#endif
-
-/* Justus Versalitas */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Justus_Versalitas, Justus-Versalitas.ttf, Justus Versalitas )
-#endif
-
-/* Let's trace basic */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Lets_trace_basic, letstracebasic.ttf, Lets trace basic )
-#endif
-
-/* Let's trace ruled */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Lets_trace_ruled, letstraceruled.ttf, Lets trace ruled )
-#endif
-
-/* Tuffy Bold Italic */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Tuffy_Bold_Italic, Tuffy_Bold_Italic.ttf, Tuffy Bold Italic )
-#endif
-
-/* Tuffy Bold */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Tuffy_Bold, Tuffy_Bold.ttf, Tuffy Bold )
-#endif
-
-/* Tuffy Italic */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Tuffy_Italic, Tuffy_Italic.ttf, Tuffy Italic )
-#endif
-
-/* Tuffy */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Tuffy, Tuffy.ttf, Tuffy )
-#endif
-
-/* Verina Sans Bold Oblique */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Bold_Oblique, Verina_Sans_Bold_Oblique.otf, Verina Sans Bold Oblique )
-#endif
-
-/* Verina Sans Bold */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Bold, Verina_Sans_Bold.otf, Verina Sans Bold )
-#endif
-
-/* Verina Sans Mono Bold Oblique */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Mono_Bold_Oblique, Verina_Sans_Mono_Bold_Oblique.otf, Verina Sans Mono Bold Oblique )
-#endif
-
-/* Verina Sans Mono Bold */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Mono_Bold, Verina_Sans_Mono_Bold.otf, Verina Sans Mono Bold )
-#endif
-
-/* Verina Sans Mono Oblique */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Mono_Oblique, Verina_Sans_Mono_Oblique.otf, Verina Sans Mono Oblique )
-#endif
-
-/* Verina Sans Mono */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Mono, Verina_Sans_Mono.otf, Verina Sans Mono )
-#endif
-
-/* Verina Sans Oblique */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Oblique, Verina_Sans_Oblique.otf, Verina Sans Oblique )
-#endif
-
-/* Verina Sans Roman */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Roman, Verina_Sans_Roman.otf, Verina Sans Roman )
-#endif
-
-/* Verina Serif Bold */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Verina_Serif_Bold, Verina_Serif_Bold.otf, Verina Serif Bold )
-#endif
-
-/* Verina Serif */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Verina_Serif, Verina_Serif.otf, Verina Serif )
-#endif
-
diff --git a/scp2/source/accessories/module_font_accessories.scp b/scp2/source/accessories/module_font_accessories.scp
index b41eb09..53d202f 100644
--- a/scp2/source/accessories/module_font_accessories.scp
+++ b/scp2/source/accessories/module_font_accessories.scp
@@ -34,169 +34,7 @@ Module gid_Module_Optional_Accessories_Fonts
PackageInfo = "packinfo_accessories.txt";
MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_FONTS);
ParentID = gid_Module_Optional_Accessories;
- Files = (
- gid_File_Fnt_airmole,
- gid_File_Fnt_airmolea,
- gid_File_Fnt_airmoles,
- gid_File_Fnt_airmoleq,
- gid_File_Fnt_astronbo,
- gid_File_Fnt_astronbi,
- gid_File_Fnt_astronbv,
- gid_File_Fnt_astronbw,
- gid_File_Fnt_baveuse,
- gid_File_Fnt_Berylium,
- gid_File_Fnt_Beryliub,
- gid_File_Fnt_Berylibi,
- gid_File_Fnt_Beryliui,
- gid_File_Fnt_BETSY2,
- gid_File_Fnt_bluehigh,
- gid_File_Fnt_bluebold,
- gid_File_Fnt_bluecond,
- gid_File_Fnt_bluehigl,
- gid_File_Fnt_bullpen_,
- gid_File_Fnt_bullpen3,
- gid_File_Fnt_bullpeni,
- gid_File_Fnt_colourba,
- gid_File_Fnt_colourbb,
- gid_File_Fnt_counters,
- gid_File_Fnt_creditva,
- gid_File_Fnt_creditvb,
- gid_File_Fnt_creditvz,
- gid_File_Fnt_creditvi,
- gid_File_Fnt_edmunds,
- gid_File_Fnt_edmundis,
- gid_File_Fnt_engeregu,
- gid_File_Fnt_engebold,
- gid_File_Fnt_engeboit,
- gid_File_Fnt_engeexpa,
- gid_File_Fnt_engeexbo,
- gid_File_Fnt_engeexbi,
- gid_File_Fnt_engeexit,
- gid_File_Fnt_engeital,
- gid_File_Fnt_goodfish,
- gid_File_Fnt_goodfisb,
- gid_File_Fnt_goodfisc,
- gid_File_Fnt_goodfisi,
- gid_File_Fnt_guanine_,
- gid_File_Fnt_gunplay,
- gid_File_Fnt_kirsty__,
- gid_File_Fnt_kirsty_b,
- gid_File_Fnt_kirstybi,
- gid_File_Fnt_kirsty_i,
- gid_File_Fnt_kirstyin,
- gid_File_Fnt_mufferaw,
- gid_File_Fnt_nasaliza,
- gid_File_Fnt_NEUROPOL,
- gid_File_Fnt_numberpi,
- gid_File_Fnt_pricedow,
- gid_File_Fnt_pupcat__,
- gid_File_Fnt_rina,
- gid_File_Fnt_sandoval,
- gid_File_Fnt_SAPPM___,
- gid_File_Fnt_screenge,
- gid_File_Fnt_steelfis,
- gid_File_Fnt_steelfib,
- gid_File_Fnt_steelout,
- gid_File_Fnt_strenuou,
- gid_File_Fnt_strenu3d,
- gid_File_Fnt_subpear_,
- gid_File_Fnt_teen____,
- gid_File_Fnt_teenbold,
- gid_File_Fnt_teenbdit,
- gid_File_Fnt_teenital,
- gid_File_Fnt_teenlite,
- gid_File_Fnt_teenlita,
- gid_File_Fnt_typoderm,
- gid_File_Fnt_vahika_,
- gid_File_Fnt_vahikab,
- gid_File_Fnt_vahikac,
- gid_File_Fnt_vahikai,
- gid_File_Fnt_vectroid,
- gid_File_Fnt_velvendc,
- gid_File_Fnt_velvenda,
- gid_File_Fnt_vibrocen,
- gid_File_Fnt_vibroceb,
- gid_File_Fnt_vibrocex,
- gid_File_Fnt_vibrocei,
- gid_File_Fnt_wintermu,
- gid_File_Fnt_youregon,
- gid_File_Fnt_youregoi,
- gid_File_Fnt_zekton__,
- gid_File_Fnt_zektonbo,
- gid_File_Fnt_zektonbi,
- gid_File_Fnt_zektonit,
- gid_File_Fnt_zorque,
- gid_File_Fnt_URW_Gothic_L_Avantgarde,
- gid_File_Fnt_URW_Gothic_L_Bold_Avantgarde,
- gid_File_Fnt_URW_Gothic_L_Italic_Avantgarde,
- gid_File_Fnt_URW_Gothic_L_Bold_Italic_Avantgarde,
- gid_File_Fnt_URW_Bookman_L_Bookman,
- gid_File_Fnt_URW_Bookman_L_Bold_Bookman,
- gid_File_Fnt_URW_Bookman_L_Italic_Bookman,
- gid_File_Fnt_URW_Bookman_L_Bold_Italic_Bookman,
- gid_File_Fnt_URW_Century_Schoolbook_L_New_Century_SchoolBook,
- gid_File_Fnt_URW_Century_Schoolbook_L_Bold_New_Century_SchoolBook,
- gid_File_Fnt_URW_Century_Schoolbook_L_Italic_New_Century_SchoolBook,
- gid_File_Fnt_URW_Century_Schoolbook_L_Bold_Italic_New_Century_SchoolBook,
- gid_File_Fnt_URW_Nimbus_Sans_L_Helvetica,
- gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Helvetica,
- gid_File_Fnt_URW_Nimbus_Sans_L_Italic_Helvetica,
- gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Italic_Helvetica,
- gid_File_Fnt_URW_Nimbus_Sans_L_Helvetica_Condensed,
- gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Helvetica_Condensed,
- gid_File_Fnt_URW_Nimbus_Sans_L_Italic_Helvetica_Condensed,
- gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Italic_Helvetica_Condensed,
- gid_File_Fnt_URW_Nimbus_Roman_No9_L_Times,
- gid_File_Fnt_URW_Nimbus_Roman_No9_L_Bold_Times,
- gid_File_Fnt_URW_Nimbus_Roman_No9_L_Italic_Times,
- gid_File_Fnt_URW_Nimbus_Roman_No9_L_Bold_Italic_Times,
- gid_File_Fnt_URW_Nimbus_Mono_L_Courier,
- gid_File_Fnt_URW_Nimbus_Mono_L_Bold_Courier,
- gid_File_Fnt_URW_Nimbus_Mono_LK_Italic_Courier,
- gid_File_Fnt_URW_Nimbus_Mono_L_Bold_Italic_Courier,
- gid_File_Fnt_URW_Palladio_L_Palitino,
- gid_File_Fnt_URW_Palladio_L_Bold_Palitino,
- gid_File_Fnt_URW_Palladio_L_Italic_Palitino,
- gid_File_Fnt_URW_Palladio_L_Bold_Italic_Palitino,
- gid_File_Fnt_URW_Standard_Symbols_L_Symbol,
- gid_File_Fnt_URW_Chancery_L_Zapf_Chancery,
- gid_File_Fnt_Dingbats,
- gid_File_Fnt_Luxi_Mono_Bold,
- gid_File_Fnt_Luxi_Mono_Bold_Oblique,
- gid_File_Fnt_Luxi_Mono_Regular,
- gid_File_Fnt_Luxi_Mono_Oblique,
- gid_File_Fnt_Luxi_Serif_Bold,
- gid_File_Fnt_Luxi_Serif_Bold_Oblique,
- gid_File_Fnt_Luxi_Serif_Regular,
- gid_File_Fnt_Luxi_Serif_Oblique,
- gid_File_Fnt_Luxi_Sans_Bold,
- gid_File_Fnt_Luxi_Sans_Bold_Oblique,
- gid_File_Fnt_Luxi_Sans_Regular,
- gid_File_Fnt_Luxi_Sans_Oblique,
- gid_File_Fnt_Gentium,
- gid_File_Fnt_Gentium_Italic,
- gid_File_Fnt_GentiumAlt,
- gid_File_Fnt_GentiumAlt_Italic,
- gid_File_Fnt_MgOpen_Canonica_Bold,
- gid_File_Fnt_MgOpen_Canonica_Bold_Italic,
- gid_File_Fnt_MgOpen_Canonica_Italic,
- gid_File_Fnt_MgOpen_Canonica_Regular,
- gid_File_Fnt_MagyarLinBiolinum,
- gid_File_Fnt_MagyarLinBiolinumB,
- gid_File_Fnt_MagyarLinLibertine,
- gid_File_Fnt_MagyarLinLibertineB,
- gid_File_Fnt_MagyarLinLibertineBI,
- gid_File_Fnt_MagyarLinLibertineC,
- gid_File_Fnt_MagyarLinLibertineG,
- gid_File_Fnt_MagyarLinLibertineGB,
- gid_File_Fnt_MagyarLinLibertineGBI,
- gid_File_Fnt_MagyarLinLibertineGI,
- gid_File_Fnt_MagyarLinLibertineI,
- gid_File_Fnt_MagyarLinLibertineN,
- gid_File_Fnt_MagyarLinLibertineNB,
- gid_File_Fnt_MagyarLinLibertineNBI,
- gid_File_Fnt_MagyarLinLibertineNI,
- gid_File_Fnt_MagyarLinLibertineNC );
+ Files = ( gid_File_Fnt_Extra );
Minimal = NO;
Default = YES;
Styles = ( );
commit ae1fea19fd40220ecc5c9d3e063e85bd5d4e49f5
Author: David Tardon <dtardon at redhat.com>
Date: Sun Apr 14 09:59:27 2013 +0200
install fonts using filelists
Change-Id: I1312908e2039a9836d25ec3a558f9ef78abf177e
diff --git a/extras/Package_fonts.mk b/extras/Package_fonts.mk
index 9d10c14..f751349 100644
--- a/extras/Package_fonts.mk
+++ b/extras/Package_fonts.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_Package_Package,extras_fonts,$(SRCDIR)/extras))
-$(eval $(call gb_Package_add_file,extras_fonts,pck/opens___.ttf,source/truetype/symbol/opens___.ttf))
+$(eval $(call gb_Package_set_outdir,extras_fonts,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,extras_fonts,share/fonts/truetype/opens___.ttf,source/truetype/symbol/opens___.ttf))
# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/ExternalPackage_dejavu.mk b/more_fonts/ExternalPackage_dejavu.mk
index ad09fcf..ad40182 100644
--- a/more_fonts/ExternalPackage_dejavu.mk
+++ b/more_fonts/ExternalPackage_dejavu.mk
@@ -9,7 +9,9 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_dejavu,font_dejavu))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_dejavu,pck,\
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_dejavu,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_dejavu,share/fonts/truetype,\
ttf/DejaVuSans-Bold.ttf \
ttf/DejaVuSans-BoldOblique.ttf \
ttf/DejaVuSans-ExtraLight.ttf \
diff --git a/more_fonts/ExternalPackage_gentium.mk b/more_fonts/ExternalPackage_gentium.mk
index 40c65b8..0cf551f 100644
--- a/more_fonts/ExternalPackage_gentium.mk
+++ b/more_fonts/ExternalPackage_gentium.mk
@@ -9,7 +9,9 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_gentium,font_gentium))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_gentium,pck,\
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_gentium,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_gentium,share/fonts/truetype,\
GenBasB.ttf \
GenBasBI.ttf \
GenBasI.ttf \
diff --git a/more_fonts/ExternalPackage_liberation.mk b/more_fonts/ExternalPackage_liberation.mk
index e191b3a..21015e2 100644
--- a/more_fonts/ExternalPackage_liberation.mk
+++ b/more_fonts/ExternalPackage_liberation.mk
@@ -9,7 +9,9 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_liberation,font_liberation))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation,pck,\
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_liberation,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation,share/fonts/truetype,\
LiberationMono-Bold.ttf \
LiberationMono-BoldItalic.ttf \
LiberationMono-Italic.ttf \
diff --git a/more_fonts/ExternalPackage_liberation_narrow.mk b/more_fonts/ExternalPackage_liberation_narrow.mk
index 09dc0a3..74c6b56 100644
--- a/more_fonts/ExternalPackage_liberation_narrow.mk
+++ b/more_fonts/ExternalPackage_liberation_narrow.mk
@@ -9,7 +9,9 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_liberation_narrow,font_liberation_narrow))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation_narrow,pck,\
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_liberation_narrow,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation_narrow,share/fonts/truetype,\
LiberationSansNarrow-Bold.ttf \
LiberationSansNarrow-BoldItalic.ttf \
LiberationSansNarrow-Italic.ttf \
diff --git a/more_fonts/ExternalPackage_libertineg.mk b/more_fonts/ExternalPackage_libertineg.mk
index cc4aaa8..7064ca9 100644
--- a/more_fonts/ExternalPackage_libertineg.mk
+++ b/more_fonts/ExternalPackage_libertineg.mk
@@ -9,7 +9,9 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_libertineg,font_libertineg))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_libertineg,pck,\
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_libertineg,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_libertineg,share/fonts/truetype,\
LinBiolinum_RB_G.ttf \
LinBiolinum_RI_G.ttf \
LinBiolinum_R_G.ttf \
diff --git a/more_fonts/ExternalPackage_opensans.mk b/more_fonts/ExternalPackage_opensans.mk
index 6aa1364..92d15e7 100644
--- a/more_fonts/ExternalPackage_opensans.mk
+++ b/more_fonts/ExternalPackage_opensans.mk
@@ -9,7 +9,9 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_opensans,font_opensans))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_opensans,pck,\
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_opensans,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_opensans,share/fonts/truetype,\
OpenSans-BoldItalic.ttf \
OpenSans-Bold.ttf \
OpenSans-Italic.ttf \
diff --git a/more_fonts/ExternalPackage_ptserif.mk b/more_fonts/ExternalPackage_ptserif.mk
index c0507ee..9f978d6 100644
--- a/more_fonts/ExternalPackage_ptserif.mk
+++ b/more_fonts/ExternalPackage_ptserif.mk
@@ -9,7 +9,9 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_ptserif,font_ptserif))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_ptserif,pck,\
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_ptserif,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_ptserif,share/fonts/truetype,\
PT_Serif-Web-BoldItalic.ttf \
PT_Serif-Web-Bold.ttf \
PT_Serif-Web-Italic.ttf \
diff --git a/more_fonts/ExternalPackage_sourcecode.mk b/more_fonts/ExternalPackage_sourcecode.mk
index 19a9c94..42aa79e 100644
--- a/more_fonts/ExternalPackage_sourcecode.mk
+++ b/more_fonts/ExternalPackage_sourcecode.mk
@@ -9,7 +9,9 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcecode,font_sourcecode))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcecode,pck,\
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_sourcecode,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcecode,share/fonts/truetype,\
SourceCodePro-Bold.ttf \
SourceCodePro-Regular.ttf \
))
diff --git a/more_fonts/ExternalPackage_sourcesans.mk b/more_fonts/ExternalPackage_sourcesans.mk
index 65f2de9..da53e4a 100644
--- a/more_fonts/ExternalPackage_sourcesans.mk
+++ b/more_fonts/ExternalPackage_sourcesans.mk
@@ -9,7 +9,9 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcesans,font_sourcesans))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcesans,pck,\
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_sourcesans,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcesans,share/fonts/truetype,\
SourceSansPro-BoldItalic.ttf \
SourceSansPro-Bold.ttf \
SourceSansPro-Italic.ttf \
diff --git a/more_fonts/Package_conf.mk b/more_fonts/Package_conf.mk
index c6d48d0..f5c03fc 100644
--- a/more_fonts/Package_conf.mk
+++ b/more_fonts/Package_conf.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_Package_Package,more_fonts_conf,$(SRCDIR)/more_fonts/fonts))
-$(eval $(call gb_Package_add_file,more_fonts_conf,pck/fc_local.conf,fc_local.conf))
+$(eval $(call gb_Package_set_outdir,more_fonts_conf,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,more_fonts_conf,share/fonts/truetype/fc_local.conf,fc_local.conf))
# vim: set noet sw=4 ts=4:
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index eaee15a..98a3b88 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -141,6 +141,14 @@
Styles = (PACKED, FONT_WARN_IF_EXISTS); \
Name = STRING(name) ; \
End
+
+#define STD_FONT_FILELIST(id,name) \
+ File id \
+ TXT_FILE_BODY; \
+ Dir = FILELIST_DIR; \
+ Styles = (FILELIST, PACKED, FONT_WARN_IF_EXISTS); \
+ Name = name; \
+ End
#endif
#ifdef WNT
@@ -152,6 +160,14 @@
Name = STRING(name) ; \
NetDir = gid_Dir_Winfonts; \
End
+
+#define STD_FONT_FILELIST(id,name) \
+ File id \
+ TXT_FILE_BODY; \
+ Dir = FILELIST_DIR; \
+ Styles = (FILELIST,PACKED,FONT,DONT_DELETE,FONT_WARN_IF_EXISTS); \
+ Name = name; \
+ End
#endif
#define STD_JAR_FILE(id,name) \
diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
index 0781dfc..e7a2da35 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -29,154 +29,35 @@
// OpenSymbol
-STD_FONT_FILE( gid_File_Fnt_Opensymb, opens___.ttf, OpenSymbol)
+STD_FONT_FILELIST( gid_File_Fnt_Opensymb, "extras_fonts.filelist" )
-// DejaVu fonts
-
-// DejaVuSans Proportional
-#ifndef WITHOUT_FONTS
-STD_FONT_FILE( gid_File_Fnt_DejaVuSans, DejaVuSans.ttf, DejaVu Sans)
-STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Bold, DejaVuSans-Bold.ttf, DejaVu Sans Bold)
-STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Oblique, DejaVuSans-Oblique.ttf, DejaVu Sans Oblique)
-STD_FONT_FILE( gid_File_Fnt_DejaVuSans_BoldOblique, DejaVuSans-BoldOblique.ttf, DejaVu Sans Bold Oblique)
-#endif
-
-// DejaVuSans ExtraLight
#ifndef WITHOUT_FONTS
-STD_FONT_FILE( gid_File_Fnt_DejaVuSansExtraLight, DejaVuSans-ExtraLight.ttf, DejaVu Sans ExtraLight)
-#endif
-
-// DejaVuSans Condensed
-#ifndef WITHOUT_FONTS
-STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed, DejaVuSansCondensed.ttf, DejaVu Sans Condensed)
-STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Bold, DejaVuSansCondensed-Bold.ttf, DejaVu Sans Condensed Bold)
-STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Oblique, DejaVuSansCondensed-Oblique.ttf, DejaVu Sans Condensed Oblique)
-STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_BoldOblique, DejaVuSansCondensed-BoldOblique.ttf, DejaVu Sans Condensed Bold Oblique)
-#endif
-
-// DejaVuSans Mono
-#ifndef WITHOUT_FONTS
-STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono, DejaVuSansMono.ttf, DejaVu Sans Mono)
-STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Bold, DejaVuSansMono-Bold.ttf, DejaVu Sans Mono Bold)
-STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Oblique, DejaVuSansMono-Oblique.ttf, DejaVu Sans Mono Oblique)
-STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_BoldOblique, DejaVuSansMono-BoldOblique.ttf, DejaVu Sans Mono Bold Oblique)
-#endif
-
-// DejaVuSerif Proportional
-#ifndef WITHOUT_FONTS
-STD_FONT_FILE( gid_File_Fnt_DejaVuSerif, DejaVuSerif.ttf, DejaVu Serif)
-STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Bold, DejaVuSerif-Bold.ttf, DejaVu Serif Bold)
-STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Italic, DejaVuSerif-Italic.ttf, DejaVu Serif Italic)
-STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_BoldItalic, DejaVuSerif-BoldItalic.ttf, DejaVu Serif Bold Italic)
-#endif
-
-// DejaVuSerif Condensed
-#ifndef WITHOUT_FONTS
-STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed, DejaVuSerifCondensed.ttf, DejaVu Serif Condensed)
-STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_Bold, DejaVuSerifCondensed-Bold.ttf, DejaVu Serif Condensed Bold)
-STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_Italic, DejaVuSerifCondensed-Italic.ttf, DejaVu Serif Condensed Italic)
-STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_BoldItalic, DejaVuSerifCondensed-BoldItalic.ttf, DejaVu Serif Condensed Bold Italic)
-#endif
+// DejaVu fonts
+STD_FONT_FILELIST(gid_File_Fnt_DejaVu, "fonts_dejavu.filelist")
// Liberation fonts
-
-// Liberation Sans Narrow
-#ifndef WITHOUT_FONTS
-STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Regular, LiberationSansNarrow-Regular.ttf, Liberation Sans Narrow Regular)
-STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Bold, LiberationSansNarrow-Bold.ttf, Liberation Sans Narrow Bold)
-STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Italic, LiberationSansNarrow-Italic.ttf, Liberation Sans Narrow Italic)
-STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_BoldItalic, LiberationSansNarrow-BoldItalic.ttf, Liberation Sans Narrow Bold Italic)
-#endif
-
-// Liberation Mono
-#ifndef WITHOUT_FONTS
-STD_FONT_FILE( gid_File_Fnt_LiberationMono_Regular, LiberationMono-Regular.ttf, Liberation Mono Regular)
-STD_FONT_FILE( gid_File_Fnt_LiberationMono_Bold, LiberationMono-Bold.ttf, Liberation Mono Bold)
-STD_FONT_FILE( gid_File_Fnt_LiberationMono_Italic, LiberationMono-Italic.ttf, Liberation Mono Italic)
-STD_FONT_FILE( gid_File_Fnt_LiberationMono_BoldItalic, LiberationMono-BoldItalic.ttf, Liberation Mono Bold Italic)
-#endif
-
-// Liberation Sans
-#ifndef WITHOUT_FONTS
-STD_FONT_FILE( gid_File_Fnt_LiberationSans_Regular, LiberationSans-Regular.ttf, Liberation Sans Regular)
-STD_FONT_FILE( gid_File_Fnt_LiberationSans_Italic, LiberationSans-Italic.ttf, Liberation Sans Italic)
-STD_FONT_FILE( gid_File_Fnt_LiberationSans_Bold, LiberationSans-Bold.ttf, Liberation Sans Bold)
-STD_FONT_FILE( gid_File_Fnt_LiberationSans_BoldItalic, LiberationSans-BoldItalic.ttf, Liberation Sans Bold Italic)
-#endif
-
-// Liberation Serif
-#ifndef WITHOUT_FONTS
-STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Regular, LiberationSerif-Regular.ttf, Liberation Serif Regular)
-STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Bold, LiberationSerif-Bold.ttf, Liberation Serif Bold)
-STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Italic, LiberationSerif-Italic.ttf, Liberation Serif Italic)
-STD_FONT_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, LiberationSerif-BoldItalic.ttf, Liberation Serif Bold Italic)
-#endif
+STD_FONT_FILELIST(gid_File_Fnt_LibSansNarrow, "fonts_liberation_narrow.filelist")
+STD_FONT_FILELIST(gid_File_Fnt_Liberation, "fonts_liberation.filelist")
// Gentium fonts
-
-#ifndef WITHOUT_FONTS
-STD_FONT_FILE( gid_File_Fnt_GentiumBasicRegular, GenBasR.ttf, Gentium Basic)
-STD_FONT_FILE( gid_File_Fnt_GentiumBasicBold, GenBasB.ttf, Gentium Basic Bold)
-STD_FONT_FILE( gid_File_Fnt_GentiumBasicItalic, GenBasI.ttf, Gentium Basic Bold)
-STD_FONT_FILE( gid_File_Fnt_GentiumBasicBoldItalic, GenBasBI.ttf, Gentium Basic Bold Italic)
-#endif
-
-#ifndef WITHOUT_FONTS
-STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicRegular, GenBkBasR.ttf, Gentium Book Basic)
-STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBold, GenBkBasB.ttf, Gentium Book Basic Bold)
-STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicItalic, GenBkBasI.ttf, Gentium Book Basic Bold)
-STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBoldItalic, GenBkBasBI.ttf, Gentium Book Basic Bold Italic)
-#endif
+STD_FONT_FILELIST(gid_File_Fnt_Gentium, "fonts_gentium.filelist")
// Linux Libertine G and Linux Biolinum G fonts
-
-#ifndef WITHOUT_FONTS
-STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_Regular, LinLibertine_R_G.ttf, Linux Libertine G Regular)
-STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_Semibold, LinLibertine_RZ_G.ttf, Linux Libertine G Semibold)
-STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_Bold, LinLibertine_RB_G.ttf, Linux Libertine G Bold)
-STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_Italic, LinLibertine_RI_G.ttf, Linux Libertine G Italic)
-STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_SemiboldItalic, LinLibertine_RZI_G.ttf, Linux Libertine G Semibold Italic)
-STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_BoldItalic, LinLibertine_RBI_G.ttf, Linux Libertine G Bold Italic)
-STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Regular, LinBiolinum_R_G.ttf, Linux Biolinum G Regular)
-STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Bold, LinBiolinum_RB_G.ttf, Linux Biolinum G Bold)
-STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Italic, LinBiolinum_RI_G.ttf, Linux Biolinum G Italic)
-#endif
+STD_FONT_FILELIST(gid_File_Fnt_LinuxLibertineG, "fonts_libertineg.filelist")
// PT Serif fonts
-
-#ifndef WITHOUT_FONTS
-STD_FONT_FILE( gid_File_Fnt_PtSerif_Regular, PT_Serif-Web-Regular.ttf, PT Serif Regular)
-STD_FONT_FILE( gid_File_Fnt_PtSerif_Bold, PT_Serif-Web-Bold.ttf, PT Serif Bold)
-STD_FONT_FILE( gid_File_Fnt_PtSerif_Italic, PT_Serif-Web-Italic.ttf, PT Serif Italic)
-STD_FONT_FILE( gid_File_Fnt_PtSerif_BoldItalic, PT_Serif-Web-BoldItalic.ttf, PT Serif Bold Italic)
-#endif
+STD_FONT_FILELIST(gid_File_Fnt_PtSerif, "fonts_ptserif.filelist")
// Open Sans fonts
-
-#ifndef WITHOUT_FONTS
-STD_FONT_FILE( gid_File_Fnt_OpenSans_Regular, OpenSans-Regular.ttf, Open Sans Regular)
-STD_FONT_FILE( gid_File_Fnt_OpenSans_Bold, OpenSans-Bold.ttf, Open Sans Bold)
-STD_FONT_FILE( gid_File_Fnt_OpenSans_Italic, OpenSans-Italic.ttf, Open Sans Italic)
-STD_FONT_FILE( gid_File_Fnt_OpenSans_BoldItalic, OpenSans-BoldItalic.ttf, Open Sans Bold Italic)
-#endif
-
+STD_FONT_FILELIST(gid_File_Fnt_OpenSans, "fonts_opensans.filelist")
// Source Sans Pro fonts
-
-#ifndef WITHOUT_FONTS
-STD_FONT_FILE( gid_File_Fnt_SourceSans_Regular, SourceSansPro-Regular.ttf, Source Sans Pro Regular)
-STD_FONT_FILE( gid_File_Fnt_SourceSans_Bold, SourceSansPro-Bold.ttf, Source Sans Pro Bold)
-STD_FONT_FILE( gid_File_Fnt_SourceSans_Italic, SourceSansPro-Italic.ttf, Source Sans Pro Italic)
-STD_FONT_FILE( gid_File_Fnt_SourceSans_BoldItalic, SourceSansPro-BoldItalic.ttf, Source Sans Pro Bold Italic)
-#endif
-
+STD_FONT_FILELIST(gid_File_Fnt_SourceSans, "fonts_sourcesans.filelist")
// Source Code Pro fonts
+STD_FONT_FILELIST(gid_File_Fnt_SourceCode, "fonts_sourcecode.filelist")
-#ifndef WITHOUT_FONTS
-STD_FONT_FILE( gid_File_Fnt_SourceCode_Regular, SourceCodePro-Regular.ttf, Source Code Pro Regular)
-STD_FONT_FILE( gid_File_Fnt_SourceCode_Bold, SourceCodePro-Bold.ttf, Source Code Pro Bold)
#endif
// fontconfig updates to allow proper use of local fonts
@@ -184,10 +65,10 @@ STD_FONT_FILE( gid_File_Fnt_SourceCode_Bold, SourceCodePro-Bold.ttf, Source Code
#ifdef UNX
#ifndef WITHOUT_FONTS
File gid_File_FcLocal_Conf
- Dir = gid_Dir_Fonts_Truetype;
+ Dir = FILELIST_DIR;
USER_FILE_BODY;
-// Styles = ();
- Name = "fc_local.conf";
+ Styles = (FILELIST);
+ Name = "more_fonts_conf.filelist";
End
#endif
#endif
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 188a2f0a..ebe6972 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -683,74 +683,15 @@ Module gid_Module_Root_Fonts_OOo_Hidden
Default = YES;
Styles = (HIDDEN_ROOT);
Files = (gid_File_Fnt_Opensymb,
- gid_File_Fnt_DejaVuSans_Bold,
- gid_File_Fnt_DejaVuSans_BoldOblique,
- gid_File_Fnt_DejaVuSans_Oblique,
- gid_File_Fnt_DejaVuSans,
- gid_File_Fnt_DejaVuSansCondensed_Bold,
- gid_File_Fnt_DejaVuSansCondensed_BoldOblique,
- gid_File_Fnt_DejaVuSansCondensed_Oblique,
- gid_File_Fnt_DejaVuSansCondensed,
- gid_File_Fnt_DejaVuSansExtraLight,
- gid_File_Fnt_DejaVuSansMono_Bold,
- gid_File_Fnt_DejaVuSansMono_BoldOblique,
- gid_File_Fnt_DejaVuSansMono_Oblique,
- gid_File_Fnt_DejaVuSansMono,
- gid_File_Fnt_DejaVuSerif_Bold,
- gid_File_Fnt_DejaVuSerif_BoldItalic,
- gid_File_Fnt_DejaVuSerif_Italic,
- gid_File_Fnt_DejaVuSerif,
- gid_File_Fnt_DejaVuSerifCondensed_Bold,
- gid_File_Fnt_DejaVuSerifCondensed_BoldItalic,
- gid_File_Fnt_DejaVuSerifCondensed_Italic,
- gid_File_Fnt_DejaVuSerifCondensed,
- gid_File_Fnt_GentiumBasicRegular,
- gid_File_Fnt_GentiumBasicBold,
- gid_File_Fnt_GentiumBasicItalic,
- gid_File_Fnt_GentiumBasicBoldItalic,
- gid_File_Fnt_GentiumBookBasicRegular,
- gid_File_Fnt_GentiumBookBasicBold,
- gid_File_Fnt_GentiumBookBasicItalic,
- gid_File_Fnt_GentiumBookBasicBoldItalic,
- gid_File_Fnt_LibSansNarrow_Regular,
- gid_File_Fnt_LibSansNarrow_Bold,
- gid_File_Fnt_LibSansNarrow_BoldItalic,
- gid_File_Fnt_LibSansNarrow_Italic,
- gid_File_Fnt_LiberationMono_Bold,
- gid_File_Fnt_LiberationMono_BoldItalic,
- gid_File_Fnt_LiberationMono_Italic,
- gid_File_Fnt_LiberationMono_Regular,
- gid_File_Fnt_LiberationSans_Bold,
- gid_File_Fnt_LiberationSans_BoldItalic,
- gid_File_Fnt_LiberationSans_Italic,
- gid_File_Fnt_LiberationSans_Regular,
- gid_File_Fnt_LiberationSerif_Bold,
- gid_File_Fnt_LiberationSerif_BoldItalic,
- gid_File_Fnt_LiberationSerif_Italic,
- gid_File_Fnt_LiberationSerif_Regular,
- gid_File_Fnt_LinuxLibertineG_Regular,
- gid_File_Fnt_LinuxLibertineG_Semibold,
- gid_File_Fnt_LinuxLibertineG_Bold,
- gid_File_Fnt_LinuxLibertineG_Italic,
- gid_File_Fnt_LinuxLibertineG_SemiboldItalic,
- gid_File_Fnt_LinuxLibertineG_BoldItalic,
- gid_File_Fnt_LinuxBiolinumG_Regular,
- gid_File_Fnt_LinuxBiolinumG_Bold,
- gid_File_Fnt_LinuxBiolinumG_Italic,
- gid_File_Fnt_PtSerif_Regular,
- gid_File_Fnt_PtSerif_Bold,
- gid_File_Fnt_PtSerif_Italic,
- gid_File_Fnt_PtSerif_BoldItalic,
- gid_File_Fnt_OpenSans_Regular,
- gid_File_Fnt_OpenSans_Bold,
- gid_File_Fnt_OpenSans_Italic,
- gid_File_Fnt_OpenSans_BoldItalic,
- gid_File_Fnt_SourceSans_Regular,
- gid_File_Fnt_SourceSans_Bold,
- gid_File_Fnt_SourceSans_Italic,
- gid_File_Fnt_SourceSans_BoldItalic,
- gid_File_Fnt_SourceCode_Regular,
- gid_File_Fnt_SourceCode_Bold,
+ gid_File_Fnt_DejaVu,
+ gid_File_Fnt_Gentium,
+ gid_File_Fnt_LibSansNarrow,
+ gid_File_Fnt_Liberation,
+ gid_File_Fnt_LinuxLibertineG,
+ gid_File_Fnt_PtSerif,
+ gid_File_Fnt_OpenSans,
+ gid_File_Fnt_SourceSans,
+ gid_File_Fnt_SourceCode,
gid_File_FcLocal_Conf);
End
#endif
commit 71b8595f3ab3a4f35d700c0270ed5826af0fdb60
Author: David Tardon <dtardon at redhat.com>
Date: Sun Apr 14 10:37:33 2013 +0200
fonts.dir has not been installed since _2005_
Change-Id: I48a7e6ca1058a3b7d93cb27146f8205276313fc0
diff --git a/extras/Package_fonts.mk b/extras/Package_fonts.mk
index a43a1fa..9d10c14 100644
--- a/extras/Package_fonts.mk
+++ b/extras/Package_fonts.mk
@@ -10,6 +10,5 @@
$(eval $(call gb_Package_Package,extras_fonts,$(SRCDIR)/extras))
$(eval $(call gb_Package_add_file,extras_fonts,pck/opens___.ttf,source/truetype/symbol/opens___.ttf))
-$(eval $(call gb_Package_add_file,extras_fonts,pck/openoffice/fonts.dir,unx/source/fonts/fonts.dir))
# vim: set noet sw=4 ts=4:
diff --git a/extras/unx/source/fonts/fonts.dir b/extras/unx/source/fonts/fonts.dir
deleted file mode 100644
index ebfd3ab..0000000
--- a/extras/unx/source/fonts/fonts.dir
+++ /dev/null
@@ -1,2 +0,0 @@
-1
-opens___.ttf -sun-OpenSymbol-medium-r-normal--0-0-0-0-p-0-iso10646-1
commit 02e4933d8a39ecdc3e75eed4c975d2aaed88a222
Author: David Tardon <dtardon at redhat.com>
Date: Sun Apr 14 10:09:07 2013 +0200
do not install extra font licenses
They are not used for anything, so why copy them anywhere?
Change-Id: Ifb0b9bb96e96b42b2bfaa70ffd7b41407f6b74c4
diff --git a/more_fonts/ExternalPackage_dejavu.mk b/more_fonts/ExternalPackage_dejavu.mk
index a6ae367..ad09fcf 100644
--- a/more_fonts/ExternalPackage_dejavu.mk
+++ b/more_fonts/ExternalPackage_dejavu.mk
@@ -33,6 +33,4 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_dejavu,pck,\
ttf/DejaVuSerifCondensed.ttf \
))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,font_dejavu_lic,pck/License_dejavu.txt,LICENSE))
-
# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/ExternalPackage_gentium.mk b/more_fonts/ExternalPackage_gentium.mk
index ba16e43..40c65b8 100644
--- a/more_fonts/ExternalPackage_gentium.mk
+++ b/more_fonts/ExternalPackage_gentium.mk
@@ -20,6 +20,4 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_gentium,pck,\
GenBkBasR.ttf \
))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,fonts_gentium,pck/License_gentium.txt,OFL.txt))
-
# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/ExternalPackage_liberation.mk b/more_fonts/ExternalPackage_liberation.mk
index 82898b3..e191b3a 100644
--- a/more_fonts/ExternalPackage_liberation.mk
+++ b/more_fonts/ExternalPackage_liberation.mk
@@ -24,6 +24,4 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation,pck,\
LiberationSerif-Regular.ttf \
))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,fonts_liberation,pck/License_liberation.txt,LICENSE))
-
# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/ExternalPackage_liberation_narrow.mk b/more_fonts/ExternalPackage_liberation_narrow.mk
index 63d3ebe..09dc0a3 100644
--- a/more_fonts/ExternalPackage_liberation_narrow.mk
+++ b/more_fonts/ExternalPackage_liberation_narrow.mk
@@ -16,6 +16,4 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation_narrow,pck,
LiberationSansNarrow-Regular.ttf \
))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,fonts_liberation_narrow,pck/License_liberation_narrow.txt,License.txt))
-
# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/ExternalPackage_libertineg.mk b/more_fonts/ExternalPackage_libertineg.mk
index 148150a..cc4aaa8 100644
--- a/more_fonts/ExternalPackage_libertineg.mk
+++ b/more_fonts/ExternalPackage_libertineg.mk
@@ -22,6 +22,4 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_libertineg,pck,\
LinLibertine_R_G.ttf \
))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,fonts_libertineg,pck/License_libertineg.txt,OFL.txt))
-
# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/ExternalPackage_opensans.mk b/more_fonts/ExternalPackage_opensans.mk
index 96cec1e..6aa1364 100644
--- a/more_fonts/ExternalPackage_opensans.mk
+++ b/more_fonts/ExternalPackage_opensans.mk
@@ -16,6 +16,4 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_opensans,pck,\
OpenSans-Regular.ttf \
))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,fonts_opensans,pck/License_opensans.txt,LICENSE.txt))
-
# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/ExternalPackage_ptserif.mk b/more_fonts/ExternalPackage_ptserif.mk
index b5541ff..c0507ee 100644
--- a/more_fonts/ExternalPackage_ptserif.mk
+++ b/more_fonts/ExternalPackage_ptserif.mk
@@ -16,6 +16,4 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_ptserif,pck,\
PT_Serif-Web-Regular.ttf \
))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,fonts_ptserif,pck/License_ptserif.txt,OFL.txt))
-
# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/ExternalPackage_sourcecode.mk b/more_fonts/ExternalPackage_sourcecode.mk
index 52476ee..19a9c94 100644
--- a/more_fonts/ExternalPackage_sourcecode.mk
+++ b/more_fonts/ExternalPackage_sourcecode.mk
@@ -14,6 +14,4 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcecode,pck,\
SourceCodePro-Regular.ttf \
))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,fonts_sourcecode,pck/License_sourcecode.txt,OFL.txt))
-
# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/ExternalPackage_sourcesans.mk b/more_fonts/ExternalPackage_sourcesans.mk
index 81df839..65f2de9 100644
--- a/more_fonts/ExternalPackage_sourcesans.mk
+++ b/more_fonts/ExternalPackage_sourcesans.mk
@@ -16,6 +16,4 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcesans,pck,\
SourceSansPro-Regular.ttf \
))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,fonts_sourcesans,pck/License_sourcesans.txt,OFL.txt))
-
# vim: set noet sw=4 ts=4:
commit 013fd9e15ae7a31b748bf2d17452f949b4e76d49
Author: David Tardon <dtardon at redhat.com>
Date: Sun Apr 14 10:04:11 2013 +0200
rename font packages
Change-Id: Ib5bdf5e96b47122ac546e7dfcc7b32184d727917
diff --git a/more_fonts/ExternalPackage_dejavu.mk b/more_fonts/ExternalPackage_dejavu.mk
index c1209ec..a6ae367 100644
--- a/more_fonts/ExternalPackage_dejavu.mk
+++ b/more_fonts/ExternalPackage_dejavu.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalPackage_ExternalPackage,font_dejavu_inc,font_dejavu))
+$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_dejavu,font_dejavu))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,font_dejavu_inc,pck,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_dejavu,pck,\
ttf/DejaVuSans-Bold.ttf \
ttf/DejaVuSans-BoldOblique.ttf \
ttf/DejaVuSans-ExtraLight.ttf \
diff --git a/more_fonts/ExternalPackage_gentium.mk b/more_fonts/ExternalPackage_gentium.mk
index 3992d2b..ba16e43 100644
--- a/more_fonts/ExternalPackage_gentium.mk
+++ b/more_fonts/ExternalPackage_gentium.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalPackage_ExternalPackage,font_gentium_inc,font_gentium))
+$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_gentium,font_gentium))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,font_gentium_inc,pck,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_gentium,pck,\
GenBasB.ttf \
GenBasBI.ttf \
GenBasI.ttf \
@@ -20,6 +20,6 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,font_gentium_inc,pck,\
GenBkBasR.ttf \
))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,font_gentium_inc,pck/License_gentium.txt,OFL.txt))
+$(eval $(call gb_ExternalPackage_add_unpacked_file,fonts_gentium,pck/License_gentium.txt,OFL.txt))
# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/ExternalPackage_liberation.mk b/more_fonts/ExternalPackage_liberation.mk
index a0aae9a..82898b3 100644
--- a/more_fonts/ExternalPackage_liberation.mk
+++ b/more_fonts/ExternalPackage_liberation.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalPackage_ExternalPackage,font_liberation_inc,font_liberation))
+$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_liberation,font_liberation))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,font_liberation_inc,pck,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation,pck,\
LiberationMono-Bold.ttf \
LiberationMono-BoldItalic.ttf \
LiberationMono-Italic.ttf \
@@ -24,6 +24,6 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,font_liberation_inc,pck,\
LiberationSerif-Regular.ttf \
))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,font_liberation_inc,pck/License_liberation.txt,LICENSE))
+$(eval $(call gb_ExternalPackage_add_unpacked_file,fonts_liberation,pck/License_liberation.txt,LICENSE))
# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/ExternalPackage_liberation_narrow.mk b/more_fonts/ExternalPackage_liberation_narrow.mk
index 2672d75..63d3ebe 100644
--- a/more_fonts/ExternalPackage_liberation_narrow.mk
+++ b/more_fonts/ExternalPackage_liberation_narrow.mk
@@ -7,15 +7,15 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalPackage_ExternalPackage,font_liberation_narrow_inc,font_liberation_narrow))
+$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_liberation_narrow,font_liberation_narrow))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,font_liberation_narrow_inc,pck,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation_narrow,pck,\
LiberationSansNarrow-Bold.ttf \
LiberationSansNarrow-BoldItalic.ttf \
LiberationSansNarrow-Italic.ttf \
LiberationSansNarrow-Regular.ttf \
))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,font_liberation_narrow_inc,pck/License_liberation_narrow.txt,License.txt))
+$(eval $(call gb_ExternalPackage_add_unpacked_file,fonts_liberation_narrow,pck/License_liberation_narrow.txt,License.txt))
# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/ExternalPackage_libertineg.mk b/more_fonts/ExternalPackage_libertineg.mk
index f0e8af2..148150a 100644
--- a/more_fonts/ExternalPackage_libertineg.mk
+++ b/more_fonts/ExternalPackage_libertineg.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalPackage_ExternalPackage,font_libertineg_inc,font_libertineg))
+$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_libertineg,font_libertineg))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,font_libertineg_inc,pck,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_libertineg,pck,\
LinBiolinum_RB_G.ttf \
LinBiolinum_RI_G.ttf \
LinBiolinum_R_G.ttf \
@@ -22,6 +22,6 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,font_libertineg_inc,pck,\
LinLibertine_R_G.ttf \
))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,font_libertineg_inc,pck/License_libertineg.txt,OFL.txt))
+$(eval $(call gb_ExternalPackage_add_unpacked_file,fonts_libertineg,pck/License_libertineg.txt,OFL.txt))
# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/ExternalPackage_opensans.mk b/more_fonts/ExternalPackage_opensans.mk
index 52c2090..96cec1e 100644
--- a/more_fonts/ExternalPackage_opensans.mk
+++ b/more_fonts/ExternalPackage_opensans.mk
@@ -7,15 +7,15 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalPackage_ExternalPackage,font_opensans_inc,font_opensans))
+$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_opensans,font_opensans))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,font_opensans_inc,pck,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_opensans,pck,\
OpenSans-BoldItalic.ttf \
OpenSans-Bold.ttf \
OpenSans-Italic.ttf \
OpenSans-Regular.ttf \
))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,font_opensans_inc,pck/License_opensans.txt,LICENSE.txt))
+$(eval $(call gb_ExternalPackage_add_unpacked_file,fonts_opensans,pck/License_opensans.txt,LICENSE.txt))
# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/ExternalPackage_ptserif.mk b/more_fonts/ExternalPackage_ptserif.mk
index 6dd15b9..b5541ff 100644
--- a/more_fonts/ExternalPackage_ptserif.mk
+++ b/more_fonts/ExternalPackage_ptserif.mk
@@ -7,15 +7,15 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalPackage_ExternalPackage,font_ptserif_inc,font_ptserif))
+$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_ptserif,font_ptserif))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,font_ptserif_inc,pck,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_ptserif,pck,\
PT_Serif-Web-BoldItalic.ttf \
PT_Serif-Web-Bold.ttf \
PT_Serif-Web-Italic.ttf \
PT_Serif-Web-Regular.ttf \
))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,font_ptserif_inc,pck/License_ptserif.txt,OFL.txt))
+$(eval $(call gb_ExternalPackage_add_unpacked_file,fonts_ptserif,pck/License_ptserif.txt,OFL.txt))
# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/ExternalPackage_sourcecode.mk b/more_fonts/ExternalPackage_sourcecode.mk
index f1b485f..52476ee 100644
--- a/more_fonts/ExternalPackage_sourcecode.mk
+++ b/more_fonts/ExternalPackage_sourcecode.mk
@@ -7,13 +7,13 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalPackage_ExternalPackage,font_sourcecode_inc,font_sourcecode))
+$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcecode,font_sourcecode))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,font_sourcecode_inc,pck,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcecode,pck,\
SourceCodePro-Bold.ttf \
SourceCodePro-Regular.ttf \
))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,font_sourcecode_inc,pck/License_sourcecode.txt,OFL.txt))
+$(eval $(call gb_ExternalPackage_add_unpacked_file,fonts_sourcecode,pck/License_sourcecode.txt,OFL.txt))
# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/ExternalPackage_sourcesans.mk b/more_fonts/ExternalPackage_sourcesans.mk
index 3a88dc2..81df839 100644
--- a/more_fonts/ExternalPackage_sourcesans.mk
+++ b/more_fonts/ExternalPackage_sourcesans.mk
@@ -7,15 +7,15 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalPackage_ExternalPackage,font_sourcesans_inc,font_sourcesans))
+$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcesans,font_sourcesans))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,font_sourcesans_inc,pck,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcesans,pck,\
SourceSansPro-BoldItalic.ttf \
SourceSansPro-Bold.ttf \
SourceSansPro-Italic.ttf \
SourceSansPro-Regular.ttf \
))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,font_sourcesans_inc,pck/License_sourcesans.txt,OFL.txt))
+$(eval $(call gb_ExternalPackage_add_unpacked_file,fonts_sourcesans,pck/License_sourcesans.txt,OFL.txt))
# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/Package_conf.mk b/more_fonts/Package_conf.mk
index d5160bf..c6d48d0 100644
--- a/more_fonts/Package_conf.mk
+++ b/more_fonts/Package_conf.mk
@@ -7,8 +7,8 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,more_fonts_inc,$(SRCDIR)/more_fonts/fonts))
+$(eval $(call gb_Package_Package,more_fonts_conf,$(SRCDIR)/more_fonts/fonts))
-$(eval $(call gb_Package_add_file,more_fonts_inc,pck/fc_local.conf,fc_local.conf))
+$(eval $(call gb_Package_add_file,more_fonts_conf,pck/fc_local.conf,fc_local.conf))
# vim: set noet sw=4 ts=4:
commit 45cf2634f7991226e94312dcfc8229d77ad1ed07
Author: David Tardon <dtardon at redhat.com>
Date: Sun Apr 14 09:53:25 2013 +0200
FontName is not used for anything
... and it has not been used since 2004, when it was added. In other
words, it has never been used at all.
Change-Id: I3476b5497e901b3cffe5f589948ee7e8e3b63fe6
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 34159c4..eaee15a 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -130,7 +130,6 @@
Dir = gid_Dir_Fonts_Truetype; \
Styles = (PACKED,FONT,DONT_DELETE,FONT_WARN_IF_EXISTS); \
Name = STRING(name) ; \
- FontName = STRING(fontname) ; \
NetDir = gid_Dir_Winfonts; \
End
@@ -151,7 +150,6 @@
Dir = gid_Dir_Fonts_Truetype; \
Styles = (PACKED,FONT,DONT_DELETE,FONT_WARN_IF_EXISTS); \
Name = STRING(name) ; \
- FontName = STRING(fontname) ; \
NetDir = gid_Dir_Winfonts; \
End
#endif
commit a63714e2819a48fee9bed670cd42aaf2d4755fce
Author: David Tardon <dtardon at redhat.com>
Date: Sun Apr 14 09:52:38 2013 +0200
drop extra complication
Change-Id: Ic26080af8496357fec063f833dc79701a83b9061
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index d924d3e..34159c4 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -127,7 +127,7 @@
#define STD_FONTWIN_FILE(id,name,fontname) \
File id \
TXT_FILE_BODY; \
- Dir = PREDEFINED_OSSYSTEMFONTDIR; \
+ Dir = gid_Dir_Fonts_Truetype; \
Styles = (PACKED,FONT,DONT_DELETE,FONT_WARN_IF_EXISTS); \
Name = STRING(name) ; \
FontName = STRING(fontname) ; \
@@ -148,7 +148,7 @@
#define STD_FONT_FILE(id,name,fontname) \
File id \
TXT_FILE_BODY; \
- Dir = PREDEFINED_OSSYSTEMFONTDIR; \
+ Dir = gid_Dir_Fonts_Truetype; \
Styles = (PACKED,FONT,DONT_DELETE,FONT_WARN_IF_EXISTS); \
Name = STRING(name) ; \
FontName = STRING(fontname) ; \
diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm
index 97b9937..d6e79c7 100644
--- a/solenv/bin/modules/installer/windows/directory.pm
+++ b/solenv/bin/modules/installer/windows/directory.pm
@@ -364,7 +364,7 @@ sub create_defaultdir_directorynames
my $fontdefaultdir = "";
if ( $onedir->{'defaultdir'} ) { $fontdefaultdir = $onedir->{'defaultdir'}; }
- if (( $fontdir eq "PREDEFINED_OSSYSTEMFONTDIR" ) && ( $fontdefaultdir eq $installer::globals::fontsdirhostname ))
+ if (( $fontdir eq $installer::globals::fontsdirhostname ) && ( $fontdefaultdir eq $installer::globals::fontsdirhostname ))
{
$installer::globals::fontsdirname = $onedir->{'defaultdir'};
$installer::globals::fontsdirparent = $onedir->{'uniqueparentname'};
commit c29d73f75c9d58e9f2d870500941798ab0e5cd3b
Author: David Tardon <dtardon at redhat.com>
Date: Sun Apr 14 09:18:40 2013 +0200
add gb_ExternalPackage_set_outdir
Change-Id: Ic12bfc750a127172f3b081a915d90dacbd1bde37
diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk
index c4fbc96..9e0a019 100644
--- a/solenv/gbuild/ExternalPackage.mk
+++ b/solenv/gbuild/ExternalPackage.mk
@@ -68,6 +68,16 @@ gb_ExternalPackage_UNPACKED_$(1) := $(2)
endef
+# Set output dir for the package's files.
+#
+# Default is $(OUTDIR).
+#
+# gb_ExternalPackage_set_outdir package outdir
+define gb_ExternalPackage_set_outdir
+$(call gb_Package_set_outdir,$(1),$(2))
+
+endef
+
# Mark a source file to be used outside of this module
#
# This results in the timestamp of the file being updated, so a possible
commit 114f71db50ca5f474717e7d559a5d09445bd4551
Author: David Tardon <dtardon at redhat.com>
Date: Sun Apr 14 09:17:05 2013 +0200
drop unused macros
Change-Id: I9ba66d5cdf6cff8e432cdcdbdf8d361d41c81104
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index dd8b518..d924d3e 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -144,16 +144,6 @@
End
#endif
-#ifdef UNX
-#define STD_FONT_FILE_DUO(id,name,unxfontname,winfontname) \
- File id \
- TXT_FILE_BODY; \
- Dir = gid_Dir_Fonts_Truetype; \
- Styles = (PACKED, FONT_WARN_IF_EXISTS); \
- Name = STRING(name) ; \
- End
-#endif
-
#ifdef WNT
#define STD_FONT_FILE(id,name,fontname) \
File id \
@@ -166,18 +156,6 @@
End
#endif
-#ifdef WNT
-#define STD_FONT_FILE_DUO(id,name,unxfontname,winfontname) \
- File id \
- TXT_FILE_BODY; \
- Dir = PREDEFINED_OSSYSTEMFONTDIR; \
- Styles = (PACKED,FONT,DONT_DELETE,FONT_WARN_IF_EXISTS); \
- Name = STRING(name) ; \
- FontName = STRING(winfontname) ; \
- NetDir = gid_Dir_Winfonts; \
- End
-#endif
-
#define STD_JAR_FILE(id,name) \
File id \
TXT_FILE_BODY; \
More information about the Libreoffice-commits
mailing list