From 1b79976de6c2835aa48a60b990494e642290301e Mon Sep 17 00:00:00 2001 From: Ralf Hubert Date: Wed, 4 Mar 2026 11:13:02 +0100 Subject: [PATCH 1/9] add xorg::font class All xorg-fonts require font-util, bdftopcf and xorg-util-macros. Bundle these requirements in a class. --- classes/xorg/font.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 classes/xorg/font.yaml diff --git a/classes/xorg/font.yaml b/classes/xorg/font.yaml new file mode 100644 index 00000000..3d6f0b61 --- /dev/null +++ b/classes/xorg/font.yaml @@ -0,0 +1,10 @@ +inherit: [autotools, "xorg::font-util"] + +depends: + - graphics::xorg::utils::util-macros-dev + - name: graphics::xorg::utils::bdftopcf + tools: + target-toolchain: host-compat-toolchain + use: [tools] + +buildTools: [bdftopcf] From be809e123e9c30034f75858a5af460f51b4829e5 Mon Sep 17 00:00:00 2001 From: Ralf Hubert Date: Wed, 4 Mar 2026 11:14:14 +0100 Subject: [PATCH 2/9] fonts::xorg: use xorg::font class --- recipes/graphics/fonts/xorg/alias.yaml | 12 +----------- recipes/graphics/fonts/xorg/cursor-misc.yaml | 12 +----------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/recipes/graphics/fonts/xorg/alias.yaml b/recipes/graphics/fonts/xorg/alias.yaml index 44681e41..e1215ac2 100644 --- a/recipes/graphics/fonts/xorg/alias.yaml +++ b/recipes/graphics/fonts/xorg/alias.yaml @@ -1,4 +1,4 @@ -inherit: [autotools, "xorg::font-util"] +inherit: ["xorg::font"] metaEnvironment: PKG_VERSION: "1.0.5" @@ -12,16 +12,6 @@ checkoutSCM: digestSHA256: 9f89e217bb73e0e3636a0a493fbf8b7c995156e0c53d9a0476d201b67c2d6b6e stripComponents: 1 -depends: - - tools: - target-toolchain: host-compat-toolchain - use: [tools] - depends: - - graphics::xorg::utils::bdftopcf - - - graphics::xorg::utils::util-macros-dev - -buildTools: [bdftopcf] buildScript: | autotoolsBuild "$1" diff --git a/recipes/graphics/fonts/xorg/cursor-misc.yaml b/recipes/graphics/fonts/xorg/cursor-misc.yaml index 59029958..0f24d9e0 100644 --- a/recipes/graphics/fonts/xorg/cursor-misc.yaml +++ b/recipes/graphics/fonts/xorg/cursor-misc.yaml @@ -1,4 +1,4 @@ -inherit: [autotools, "xorg::font-util"] +inherit: ["xorg::font"] metaEnvironment: PKG_VERSION: "1.0.4" @@ -12,16 +12,6 @@ checkoutSCM: digestSHA256: 25d9c9595013cb8ca08420509993a6434c917e53ca1fec3f63acd45a19d4f982 stripComponents: 1 -depends: - - tools: - target-toolchain: host-compat-toolchain - use: [tools] - depends: - - graphics::xorg::utils::bdftopcf - - - graphics::xorg::utils::util-macros-dev - -buildTools: [bdftopcf] buildScript: | autotoolsBuild "$1" From 7599a019583d124436cd34be4a38f7e072c54066 Mon Sep 17 00:00:00 2001 From: Ralf Hubert Date: Wed, 4 Mar 2026 11:16:58 +0100 Subject: [PATCH 3/9] buildall: add fonts::xorg --- tests/buildall/recipes/all.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/buildall/recipes/all.yaml b/tests/buildall/recipes/all.yaml index 2a130a96..fa361cfa 100644 --- a/tests/buildall/recipes/all.yaml +++ b/tests/buildall/recipes/all.yaml @@ -13,6 +13,8 @@ depends: - graphics::graphviz - graphics::fonts::dejavu - graphics::fonts::unicode + - graphics::fonts::xorg::alias + - graphics::fonts::xorg::cursor-misc - graphics::imagemagick - graphics::kmscube From bec4e4f1951ef365d1873392b5352306a228f8c8 Mon Sep 17 00:00:00 2001 From: Ralf Hubert Date: Fri, 24 Jan 2025 08:37:35 +0000 Subject: [PATCH 4/9] add font::dec-misc v1.0.4 --- recipes/graphics/fonts/xorg/dec-misc.yaml | 16 ++++++++++++++++ tests/buildall/recipes/all.yaml | 1 + 2 files changed, 17 insertions(+) create mode 100644 recipes/graphics/fonts/xorg/dec-misc.yaml diff --git a/recipes/graphics/fonts/xorg/dec-misc.yaml b/recipes/graphics/fonts/xorg/dec-misc.yaml new file mode 100644 index 00000000..8e63b348 --- /dev/null +++ b/recipes/graphics/fonts/xorg/dec-misc.yaml @@ -0,0 +1,16 @@ +inherit: ["xorg::font"] + +metaEnvironment: + PKG_VERSION: "1.0.4" + PKG_LICENSE: "LicenseRef-xorg-font-dec-misc" + PKG_LICENSE_PATH: | + xorg-font-dev-misc:COPYING + +checkoutSCM: + scm: url + url: https://xorg.freedesktop.org/releases/individual/font/font-dec-misc-${PKG_VERSION}.tar.xz + digestSHA256: 82d968201d8ff8bec0e51dccd781bb4d4ebf17e11004944279bdc0201e161af7 + stripComponents: 1 + +buildScript: autotoolsBuild $1 +packageScript: autotoolsPackageTgt diff --git a/tests/buildall/recipes/all.yaml b/tests/buildall/recipes/all.yaml index fa361cfa..c87bc7c7 100644 --- a/tests/buildall/recipes/all.yaml +++ b/tests/buildall/recipes/all.yaml @@ -15,6 +15,7 @@ depends: - graphics::fonts::unicode - graphics::fonts::xorg::alias - graphics::fonts::xorg::cursor-misc + - graphics::fonts::xorg::dec-misc - graphics::imagemagick - graphics::kmscube From 2d640d93b135370a4b233369220aaf9ba3a697cf Mon Sep 17 00:00:00 2001 From: Ralf Hubert Date: Fri, 24 Jan 2025 08:39:12 +0000 Subject: [PATCH 5/9] add xorg::font-schumacher-misc v1.1.3 --- recipes/graphics/fonts/xorg/schumacher-misc.yaml | 16 ++++++++++++++++ tests/buildall/recipes/all.yaml | 1 + 2 files changed, 17 insertions(+) create mode 100644 recipes/graphics/fonts/xorg/schumacher-misc.yaml diff --git a/recipes/graphics/fonts/xorg/schumacher-misc.yaml b/recipes/graphics/fonts/xorg/schumacher-misc.yaml new file mode 100644 index 00000000..48bc7285 --- /dev/null +++ b/recipes/graphics/fonts/xorg/schumacher-misc.yaml @@ -0,0 +1,16 @@ +inherit: ["xorg::font"] + +metaEnvironment: + PKG_VERSION: "1.1.3" + PKG_LICENSE: "LicenseRef-xorg-font-schumacher-misc" + PKG_LICENSE_PATH: | + xorg-font-schumacher-misc:COPYING + +checkoutSCM: + scm: url + url: https://xorg.freedesktop.org/releases/individual/font/font-schumacher-misc-${PKG_VERSION}.tar.xz + digestSHA256: 8b849f0cdb1e55a34cc3dd8b0fb37443fabbc224d5ba44085569581244a68070 + stripComponents: 1 + +buildScript: autotoolsBuild $1 +packageScript: autotoolsPackageTgt diff --git a/tests/buildall/recipes/all.yaml b/tests/buildall/recipes/all.yaml index c87bc7c7..b6df7728 100644 --- a/tests/buildall/recipes/all.yaml +++ b/tests/buildall/recipes/all.yaml @@ -16,6 +16,7 @@ depends: - graphics::fonts::xorg::alias - graphics::fonts::xorg::cursor-misc - graphics::fonts::xorg::dec-misc + - graphics::fonts::xorg::schumacher-misc - graphics::imagemagick - graphics::kmscube From 041123cced074f89600900e1d733e306730d229e Mon Sep 17 00:00:00 2001 From: Ralf Hubert Date: Fri, 24 Jan 2025 08:39:57 +0000 Subject: [PATCH 6/9] add xorg::font::sun-misc v1.0.4 --- recipes/graphics/fonts/xorg/sun-misc.yaml | 16 ++++++++++++++++ tests/buildall/recipes/all.yaml | 1 + 2 files changed, 17 insertions(+) create mode 100644 recipes/graphics/fonts/xorg/sun-misc.yaml diff --git a/recipes/graphics/fonts/xorg/sun-misc.yaml b/recipes/graphics/fonts/xorg/sun-misc.yaml new file mode 100644 index 00000000..6781b057 --- /dev/null +++ b/recipes/graphics/fonts/xorg/sun-misc.yaml @@ -0,0 +1,16 @@ +inherit: ["xorg::font"] + +metaEnvironment: + PKG_VERSION: "1.0.4" + PKG_LICENSE: "LicenseRef-xorg-font-sun-misc" + PKG_LICENSE_PATH: | + xorg-font-sun-misc:COPYING + +checkoutSCM: + scm: url + url: https://xorg.freedesktop.org/releases/individual/font/font-sun-misc-${PKG_VERSION}.tar.xz + digestSHA256: dd84dd116d927affa4fa0fa29727b3ecfc0f064238817c0a1e552a0ac384db9f + stripComponents: 1 + +buildScript: autotoolsBuild $1 +packageScript: autotoolsPackageTgt diff --git a/tests/buildall/recipes/all.yaml b/tests/buildall/recipes/all.yaml index b6df7728..cfb3f0d5 100644 --- a/tests/buildall/recipes/all.yaml +++ b/tests/buildall/recipes/all.yaml @@ -17,6 +17,7 @@ depends: - graphics::fonts::xorg::cursor-misc - graphics::fonts::xorg::dec-misc - graphics::fonts::xorg::schumacher-misc + - graphics::fonts::xorg::sun-misc - graphics::imagemagick - graphics::kmscube From 3910754e34360dbdb9b1b673582178809ce80fb8 Mon Sep 17 00:00:00 2001 From: Ralf Hubert Date: Fri, 24 Jan 2025 08:39:39 +0000 Subject: [PATCH 7/9] add xorg::font::sony-misc v1.0.4 --- recipes/graphics/fonts/xorg/sony-misc.yaml | 16 ++++++++++++++++ tests/buildall/recipes/all.yaml | 1 + 2 files changed, 17 insertions(+) create mode 100644 recipes/graphics/fonts/xorg/sony-misc.yaml diff --git a/recipes/graphics/fonts/xorg/sony-misc.yaml b/recipes/graphics/fonts/xorg/sony-misc.yaml new file mode 100644 index 00000000..6acafd6b --- /dev/null +++ b/recipes/graphics/fonts/xorg/sony-misc.yaml @@ -0,0 +1,16 @@ +inherit: ["xorg::font"] + +metaEnvironment: + PKG_VERSION: "1.0.4" + PKG_LICENSE: "LicenseRef-xorg-font-sony-misc" + PKG_LICENSE_PATH: | + xorg-font-sony-misc:COPYING + +checkoutSCM: + scm: url + url: https://xorg.freedesktop.org/releases/individual/font/font-sony-misc-${PKG_VERSION}.tar.xz + digestSHA256: e6b09f823fccb06e0bd0b2062283b6514153323bd8a7486e9c2e3f55ab84946b + stripComponents: 1 + +buildScript: autotoolsBuild $1 +packageScript: autotoolsPackageTgt diff --git a/tests/buildall/recipes/all.yaml b/tests/buildall/recipes/all.yaml index cfb3f0d5..0980d184 100644 --- a/tests/buildall/recipes/all.yaml +++ b/tests/buildall/recipes/all.yaml @@ -17,6 +17,7 @@ depends: - graphics::fonts::xorg::cursor-misc - graphics::fonts::xorg::dec-misc - graphics::fonts::xorg::schumacher-misc + - graphics::fonts::xorg::sony-misc - graphics::fonts::xorg::sun-misc - graphics::imagemagick - graphics::kmscube From c5b5d618bf72e0d334b112d5184a9bd67dd4ab37 Mon Sep 17 00:00:00 2001 From: Ralf Hubert Date: Fri, 24 Jan 2025 08:38:42 +0000 Subject: [PATCH 8/9] add xorg::font::mutt-misc v1.0.4 --- recipes/graphics/fonts/xorg/mutt-misc.yaml | 16 ++++++++++++++++ tests/buildall/recipes/all.yaml | 1 + 2 files changed, 17 insertions(+) create mode 100644 recipes/graphics/fonts/xorg/mutt-misc.yaml diff --git a/recipes/graphics/fonts/xorg/mutt-misc.yaml b/recipes/graphics/fonts/xorg/mutt-misc.yaml new file mode 100644 index 00000000..0f08281f --- /dev/null +++ b/recipes/graphics/fonts/xorg/mutt-misc.yaml @@ -0,0 +1,16 @@ +inherit: ["xorg::font"] + +metaEnvironment: + PKG_VERSION: "1.0.4" + PKG_LICENSE: "LicenseRef-xorg-font-mutt-misc" + PKG_LICENSE_PATH: | + xorg-font-mutt-misc:COPYING + +checkoutSCM: + scm: url + url: https://xorg.freedesktop.org/releases/individual/font/font-mutt-misc-${PKG_VERSION}.tar.xz + digestSHA256: b12359f4e12c23bcfcb448b918297e975fa91bef5293d88d3c25343cc768bb24 + stripComponents: 1 + +buildScript: autotoolsBuild $1 +packageScript: autotoolsPackageTgt diff --git a/tests/buildall/recipes/all.yaml b/tests/buildall/recipes/all.yaml index 0980d184..b562a9ce 100644 --- a/tests/buildall/recipes/all.yaml +++ b/tests/buildall/recipes/all.yaml @@ -16,6 +16,7 @@ depends: - graphics::fonts::xorg::alias - graphics::fonts::xorg::cursor-misc - graphics::fonts::xorg::dec-misc + - graphics::fonts::xorg::mutt-misc - graphics::fonts::xorg::schumacher-misc - graphics::fonts::xorg::sony-misc - graphics::fonts::xorg::sun-misc From 1490636e26a0d4b5cc63be9633d1e073fec7e69b Mon Sep 17 00:00:00 2001 From: Ralf Hubert Date: Thu, 27 Feb 2025 10:08:58 +0000 Subject: [PATCH 9/9] add fonts::bitstream-vera v1.10 --- recipes/graphics/fonts/bitstream-vera.yaml | 20 ++++++++++++++++++++ tests/buildall/recipes/all.yaml | 1 + 2 files changed, 21 insertions(+) create mode 100644 recipes/graphics/fonts/bitstream-vera.yaml diff --git a/recipes/graphics/fonts/bitstream-vera.yaml b/recipes/graphics/fonts/bitstream-vera.yaml new file mode 100644 index 00000000..db06c7c4 --- /dev/null +++ b/recipes/graphics/fonts/bitstream-vera.yaml @@ -0,0 +1,20 @@ +metaEnvironment: + PKG_VERSION: "1.10" + PKG_LICENSE: "Bitstream-Vera" + +checkoutSCM: + scm: url + url: https://download.gnome.org/sources/ttf-bitstream-vera/${PKG_VERSION}/ttf-bitstream-vera-${PKG_VERSION}.tar.bz2 + digestSHA1: "c3e8505a58d52e198a02960a2bd295e4c7a14242" + extract: false + +buildVars: [PKG_VERSION] +buildScript: | + ln -sf $1/ttf-bitstream-vera-${PKG_VERSION}.tar.bz2 + +packageScript: | + mkdir -p usr/share/fonts/truetype/ttf-bitstream-vera + tar -C usr/share/fonts/truetype/ttf-bitstream-vera \ + -xf $1/ttf-bitstream-vera-${PKG_VERSION}.tar.bz2 \ + --strip-components 1 \ + --wildcards "*.ttf" diff --git a/tests/buildall/recipes/all.yaml b/tests/buildall/recipes/all.yaml index b562a9ce..48293f5a 100644 --- a/tests/buildall/recipes/all.yaml +++ b/tests/buildall/recipes/all.yaml @@ -11,6 +11,7 @@ depends: - core::tz-zic - graphics::graphviz + - graphics::fonts::bitstream-vera - graphics::fonts::dejavu - graphics::fonts::unicode - graphics::fonts::xorg::alias