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] 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/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" 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/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/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/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/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 2a130a96..48293f5a 100644 --- a/tests/buildall/recipes/all.yaml +++ b/tests/buildall/recipes/all.yaml @@ -11,8 +11,16 @@ depends: - core::tz-zic - graphics::graphviz + - graphics::fonts::bitstream-vera - graphics::fonts::dejavu - graphics::fonts::unicode + - 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 - graphics::imagemagick - graphics::kmscube