@@ -262,6 +262,8 @@ comment "Cursors"
source "package/comix-cursors/Config.in"
comment "Fonts"
+ # check-package disable lib_config.CommentsMenusPackagesOrder
+ source "package/some-font/Config.in"
source "package/bitstream-vera/Config.in"
source "package/cantarell/Config.in"
source "package/dejavu/Config.in"
@@ -1,5 +1,6 @@
config BR2_PACKAGE_BITSTREAM_VERA
bool "Bitstream Vera"
+ select BR2_PACKAGE_SOME_FONT_AVAILABLE
help
Bitstream Vera font family.
@@ -1,5 +1,6 @@
config BR2_PACKAGE_CANTARELL
bool "cantarell"
+ select BR2_PACKAGE_SOME_FONT_AVAILABLE
help
The Cantarell font family is a contemporary Humanist
sans serif designed for on-screen reading.
@@ -1,6 +1,7 @@
config BR2_PACKAGE_DEJAVU
bool "DejaVu fonts"
select BR2_PACKAGE_DEJAVU_MONO if !BR2_PACKAGE_DEJAVU_HAS_FONT
+ select BR2_PACKAGE_SOME_FONT_AVAILABLE
help
The DejaVu fonts are a font family based on the Vera Fonts.
Its purpose is to provide a wider range of characters while
@@ -1,5 +1,6 @@
config BR2_PACKAGE_FONT_AWESOME
bool "font-awesome"
+ select BR2_PACKAGE_SOME_FONT_AVAILABLE
help
Font Awesome is a full suite of 605 pictographic icons for
easy scalable vector graphics on websites.
@@ -1,5 +1,6 @@
config BR2_PACKAGE_GHOSTSCRIPT_FONTS
bool "ghostscript-fonts"
+ select BR2_PACKAGE_SOME_FONT_AVAILABLE
help
Fonts and font metrics customarily distributed with
Ghostscript. Currently includes the 35 standard PostScript
@@ -1,5 +1,6 @@
config BR2_PACKAGE_INCONSOLATA
bool "inconsolata"
+ select BR2_PACKAGE_SOME_FONT_AVAILABLE
help
Inconsolata is a monospace font, designed for code listings
and the like.
new file mode 100644
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_SOME_FONT
+ bool
+ select BR2_PACKAGE_LIBERATION if !BR2_PACKAGE_SOME_FONT_AVAILABLE
+ help
+ This package does not provide any font of its own;
+ instead, it ensure that at least one font package is
+ enabled, and thus that at least one font is installed
+ in the target.
+
+ Select this if your package just requires some font,
+ whatever that may be.
+
+config BR2_PACKAGE_SOME_FONT_AVAILABLE
+ bool
+ help
+ This blind symbol should be selected by any package that
+ installs fonts.
@@ -1,5 +1,6 @@
config BR2_PACKAGE_WQY_ZENHEI
bool "wqy-zenhei"
+ select BR2_PACKAGE_SOME_FONT_AVAILABLE
help
"WenQuanYi Zen Hei" is a Hei-Ti Style (sans-serif) Chinese
font capable of text formatting and on-screen display of
Packages that will be rendering text, will need that some font be installed; most of the time, any font will fit the bill. However, we currently have no way for such a package to just require "some font"; it needs to actually select one package providing fonts. If the user selects another font package, then the one forcibly selected by the package would be superfluous. Fonts are a runtime dependency, not a build-time one, so we don't need to handle it like the virtual packages. Furthemore, multiple font packages can be installed at once, this is perfectly valid, so we can't use a virtual package. This commit adds a pseudo package (in fact, just a Kconfig symbol), that packages can select when they just require some font, but are not picky on which font that would be. We currently decide that the liberation fonts would be the default ones. Conversely, also add a Kconfig symbol that font-providing packages can select to indicate that some font is available, in which case liberation is not forcefully selected (of course, liberation can't, mustn't, and doesn't select that symbol). This also allows packages from br2-external trees to advertise they provide fonts, too. Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com> --- package/Config.in | 2 ++ package/bitstream-vera/Config.in | 1 + package/cantarell/Config.in | 1 + package/dejavu/Config.in | 1 + package/font-awesome/Config.in | 1 + package/ghostscript-fonts/Config.in | 1 + package/inconsolata/Config.in | 1 + package/some-font/Config.in | 17 +++++++++++++++++ package/wqy-zenhei/Config.in | 1 + 9 files changed, 26 insertions(+) create mode 100644 package/some-font/Config.in