Revert fontconfig, freetype and harfbuzz packages (#6004)

This commit is contained in:
Ed Reel
2021-07-29 06:56:38 -05:00
committed by GitHub
parent c086c3207c
commit 9ba1896daa
5 changed files with 69 additions and 134 deletions

View File

@@ -1,45 +0,0 @@
# Adapted from Arch Linux chafa PKGBUILD at:
# https://github.com/archlinux/svntogit-community/raw/packages/chafa/trunk/PKGBUILD
require 'package'
class Chafa < Package
description 'Image-to-text converter supporting a wide range of symbols and palettes, transparency, animations, etc.'
homepage 'https://hpjansson.org/chafa/'
version '1.6.1'
license 'LGPL'
compatibility 'x86_64 aarch64 armv7l'
source_url 'https://github.com/hpjansson/chafa/releases/download/1.6.1/chafa-1.6.1.tar.xz'
source_sha256 '76c98930e99b3e5fadb986148b99d65636e9e9619124e568ff13d364ede89fa5'
binary_url({
aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/chafa/1.6.1_armv7l/chafa-1.6.1-chromeos-armv7l.tpxz',
armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/chafa/1.6.1_armv7l/chafa-1.6.1-chromeos-armv7l.tpxz',
x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/chafa/1.6.1_x86_64/chafa-1.6.1-chromeos-x86_64.tpxz'
})
binary_sha256({
aarch64: '3b1070f6bb7c4e3756fec41b9241b7823d34c09cbedf59fb7a700921e06cb561',
armv7l: '3b1070f6bb7c4e3756fec41b9241b7823d34c09cbedf59fb7a700921e06cb561',
x86_64: '4b3fd102523ce0458a897bcd0ce1bbe8c60e30eb830e4aa98cedb782576795e6'
})
depends_on 'imagemagick7' => :build
depends_on 'freetype_sub' => :build
depends_on 'libxslt'
depends_on 'gtk_doc' => ':build'
def self.patch
system 'filefix'
end
def self.build
system "#{CREW_ENV_OPTIONS} \
./configure \
#{CREW_OPTIONS}"
system 'make'
end
def self.install
system "make DESTDIR=#{CREW_DEST_DIR} install"
end
end

View File

@@ -3,24 +3,24 @@ require 'package'
class Fontconfig < Package
description 'Fontconfig is a library for configuring and customizing font access.'
homepage 'https://www.freedesktop.org/software/fontconfig/front.html'
@_ver = '2.13.94'
version @_ver
@_ver = '2.13.93'
version "#{@_ver}-2"
license 'MIT'
compatibility 'all'
source_url "https://github.com/freedesktop/fontconfig/archive/#{@_ver}.tar.gz"
source_sha256 '4cfaf426a59ad65ea7397182156efdc01835bab9a8e81d15e008f08d38f38d58'
source_sha256 'f8452c78d1a12f6966455b0d584f89553b13e970b40644c3650f690ec0b3b4fe'
binary_url({
i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/fontconfig/2.13.94_i686/fontconfig-2.13.94-chromeos-i686.tpxz',
aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/fontconfig/2.13.94_armv7l/fontconfig-2.13.94-chromeos-armv7l.tpxz',
armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/fontconfig/2.13.94_armv7l/fontconfig-2.13.94-chromeos-armv7l.tpxz',
x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/fontconfig/2.13.94_x86_64/fontconfig-2.13.94-chromeos-x86_64.tpxz'
aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/fontconfig/2.13.93-2_armv7l/fontconfig-2.13.93-2-chromeos-armv7l.tar.xz',
armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/fontconfig/2.13.93-2_armv7l/fontconfig-2.13.93-2-chromeos-armv7l.tar.xz',
i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/fontconfig/2.13.93-2_i686/fontconfig-2.13.93-2-chromeos-i686.tar.xz',
x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/fontconfig/2.13.93-2_x86_64/fontconfig-2.13.93-2-chromeos-x86_64.tar.xz'
})
binary_sha256({
i686: '63bfecf60d42174392ba22d0762f0fb6102540d784eaa86cd098a411e7349d8d',
aarch64: '85980c50415f61219e04efc1bb7ae977083756bccb65f7dbe5d6bfc7562698a6',
armv7l: '85980c50415f61219e04efc1bb7ae977083756bccb65f7dbe5d6bfc7562698a6',
x86_64: '00e921605653191b9b62fadf1437834211e11436c685660782fc1641bd20bfbe'
aarch64: '0047a707a1fc8531fa6bfc6fa45f2aead43ece0e65d1eaad094e4e98f3e43ec0',
armv7l: '0047a707a1fc8531fa6bfc6fa45f2aead43ece0e65d1eaad094e4e98f3e43ec0',
i686: 'abef1aab53d6880c0f43fc188a6de1ca1bf9b60c20c3f6459cdbcb40b32cb80a',
x86_64: '762b2f4a1d0d593f7f4c5000b651e9d03e98b11759a113bac0c260cc45830391'
})
depends_on 'gperf'
@@ -40,7 +40,7 @@ class Fontconfig < Package
INSTALLCACHE_HEREDOC
IO.write('install-cache', @install_cache, perm: 0o666)
system "meson #{CREW_MESON_OPTIONS} \
--localstatedir=#{CREW_PREFIX}/var \
--localstatedir=#{CREW_PREFIX}/cache \
--default-library=both \
-Ddoc=disabled \
-Dfreetype2:harfbuzz=enabled \
@@ -53,7 +53,7 @@ class Fontconfig < Package
def self.install
system "DESTDIR=#{CREW_DEST_DIR} ninja -C builddir install"
FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/etc/fonts/conf.d"
FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/var/cache/fontconfig"
FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/cache/fontconfig"
@fonts_conf = <<~FONTCONF_HEREDOC
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
@@ -63,17 +63,17 @@ class Fontconfig < Package
<dir>/usr/local/share/fonts</dir>
<dir>~/.fonts</dir>
<!-- Font cache directory list -->
<cachedir>#{CREW_PREFIX}/var/cache/fontconfig</cachedir>
<cachedir>#{CREW_PREFIX}/cache/fontconfig</cachedir>
<cachedir>~/.fontconfig</cachedir>
</fontconfig>
FONTCONF_HEREDOC
IO.write("#{CREW_DEST_PREFIX}/etc/fonts/conf.d/52-chromebrew.conf", @fonts_conf, perm: 0o666)
FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/etc/env.d/"
@env = <<~FONTCONFIG_ENV_HEREDOC
@env = <<~EOF
# Fontconfig configuration
export FONTCONFIG_PATH=#{CREW_PREFIX}/etc/fonts
FONTCONFIG_ENV_HEREDOC
EOF
IO.write("#{CREW_DEST_PREFIX}/etc/env.d/fontconfig", @env)
end

View File

@@ -3,48 +3,40 @@ require 'package'
class Freetype < Package
description 'FreeType is a freely available software library to render fonts.'
homepage 'https://www.freetype.org/'
version '2.11.0'
version '2.10.4'
license 'FTL or GPL-2+'
compatibility 'x86_64 aarch64 armv7l'
source_url 'https://download.savannah.gnu.org/releases/freetype/freetype-2.11.0.tar.xz'
source_sha256 '8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7'
compatibility 'all'
source_url 'https://download.savannah.gnu.org/releases/freetype/freetype-2.10.4.tar.xz'
source_sha256 '86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784'
binary_url({
aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype/2.11.0_armv7l/freetype-2.11.0-chromeos-armv7l.tpxz',
armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype/2.11.0_armv7l/freetype-2.11.0-chromeos-armv7l.tpxz',
x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype/2.11.0_x86_64/freetype-2.11.0-chromeos-x86_64.tpxz'
binary_url ({
aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype/2.10.4_armv7l/freetype-2.10.4-chromeos-armv7l.tar.xz',
armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype/2.10.4_armv7l/freetype-2.10.4-chromeos-armv7l.tar.xz',
i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype/2.10.4_i686/freetype-2.10.4-chromeos-i686.tar.xz',
x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype/2.10.4_x86_64/freetype-2.10.4-chromeos-x86_64.tar.xz',
})
binary_sha256({
aarch64: 'c08cf688f4f1ef885f349da0334de39cecdb20747465687065d95e03465c58d1',
armv7l: 'c08cf688f4f1ef885f349da0334de39cecdb20747465687065d95e03465c58d1',
x86_64: '395ed9c9be0c260428f1588ddce0a969bdfaab0c664c67f6518278610622a6d1'
binary_sha256 ({
aarch64: 'c3063feb7034883e248ac4d62a82409df69577ccc4abe38ca7bd7e39c5ed3576',
armv7l: 'c3063feb7034883e248ac4d62a82409df69577ccc4abe38ca7bd7e39c5ed3576',
i686: 'a53b10cf19f25922aa6cc0f09fe846e5ee7221c73f2288ca04f83529191a94f5',
x86_64: '4622df673ffd07fdcec9591f039ad6e89c4687517678adb6f964dbfdff6a39cf',
})
depends_on 'harfbuzz'
depends_on 'expat'
depends_on 'libpng' # freetype needs zlib optionally. zlib is also the dependency of libpng
def self.patch
system 'sed -ri "s:.*(AUX_MODULES.*valid):\1:" modules.cfg'
system 'sed -r "s:.*(#.*SUBPIXEL_RENDERING) .*:\1:" \
-i include/freetype/config/ftoption.h'
end
depends_on 'bz2'
depends_on 'harfbuzz'
def self.build
system 'pip3 install docwriter'
system "meson #{CREW_MESON_OPTIONS} \
--default-library=both \
builddir"
system 'meson configure builddir'
system 'ninja -C builddir'
system "sed -i 's,/usr/include/freetype2,#{CREW_PREFIX}/include/freetype2,g' configure"
system "./configure CFLAGS=' -fPIC' #{CREW_OPTIONS} --enable-freetype-config --with-harfbuzz"
system 'make'
system 'pip3 uninstall docwriter -y'
system "pip3 install docwriter --root #{CREW_DEST_DIR} --prefix #{CREW_PREFIX}"
end
def self.install
system "DESTDIR=#{CREW_DEST_DIR} ninja install -C builddir"
end
def self.postinstall
system "find #{CREW_BREW_DIR}/* -name freetype*.tar | xargs rm -rf" # make sure to delete downloaded files
system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
end
end

View File

@@ -3,51 +3,39 @@ require 'package'
class Freetype_sub < Package
description 'Freetype_sub is a version without harfbuzz. It is intended to handle circular dependency betwwen freetype and harfbuzz.'
homepage 'https://www.freetype.org/'
version '2.11.0'
version '2.10.4'
license 'FTL or GPL-2+'
compatibility 'x86_64 aarch64 armv7l'
source_url 'https://download.savannah.gnu.org/releases/freetype/freetype-2.11.0.tar.xz'
source_sha256 '8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7'
compatibility 'all'
source_url 'https://download.savannah.gnu.org/releases/freetype/freetype-2.10.4.tar.xz'
source_sha256 '86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784'
binary_url({
aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype_sub/2.11.0_armv7l/freetype_sub-2.11.0-chromeos-armv7l.tpxz',
armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype_sub/2.11.0_armv7l/freetype_sub-2.11.0-chromeos-armv7l.tpxz',
x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype_sub/2.11.0_x86_64/freetype_sub-2.11.0-chromeos-x86_64.tpxz'
binary_url ({
aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype_sub/2.10.4_armv7l/freetype_sub-2.10.4-chromeos-armv7l.tar.xz',
armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype_sub/2.10.4_armv7l/freetype_sub-2.10.4-chromeos-armv7l.tar.xz',
i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype_sub/2.10.4_i686/freetype_sub-2.10.4-chromeos-i686.tar.xz',
x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype_sub/2.10.4_x86_64/freetype_sub-2.10.4-chromeos-x86_64.tar.xz',
})
binary_sha256({
aarch64: '845ef60abffc0428c99102712323568f17d9a27e5a080df115dd07da25ff110a',
armv7l: '845ef60abffc0428c99102712323568f17d9a27e5a080df115dd07da25ff110a',
x86_64: '039810744e62693895f366e48f2ff9156b4a02c3784a4b7a851992dc94ded9a6'
binary_sha256 ({
aarch64: '7c8620a0cad19fbcd7ff0d96a7304323648b97c93d86352cfbb8216c768aeb1b',
armv7l: '7c8620a0cad19fbcd7ff0d96a7304323648b97c93d86352cfbb8216c768aeb1b',
i686: '4e6ab3e8a7dacab4380099315c2d547b89ce490f33d7e677744034d4e44ccabe',
x86_64: 'a5c364bdee4a22ca72bbaba4162dc2d75730f15b4340bddf038ee3698751c116',
})
depends_on 'expat'
depends_on 'libpng' # freetype needs zlib optionally. zlib is also the dependency of libpng
def self.preflight
@device = JSON.parse(File.read("#{CREW_CONFIG_PATH}device.json"), symbolize_names: true)
if @device[:installed_packages].any? 'harfbuzz'
abort 'This harfbuzz prereq needs to be built without harfbuzz installed.'.lightred
end
end
def self.patch
system 'sed -ri "s:.*(AUX_MODULES.*valid):\1:" modules.cfg'
system 'sed -r "s:.*(#.*SUBPIXEL_RENDERING) .*:\1:" \
-i include/freetype/config/ftoption.h'
end
depends_on 'bz2'
def self.build
system 'pip3 install docwriter'
system "meson #{CREW_MESON_OPTIONS} \
--default-library=both \
builddir"
system 'meson configure builddir'
system 'ninja -C builddir'
system "./configure CFLAGS=' -fPIC' #{CREW_OPTIONS} --enable-freetype-config --without-harfbuzz"
system 'make'
system 'pip3 uninstall docwriter -y'
system "pip3 install docwriter --root #{CREW_DEST_DIR} --prefix #{CREW_PREFIX}"
end
def self.install
system "DESTDIR=#{CREW_DEST_DIR} ninja install -C builddir"
system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
end
def self.postinstall

View File

@@ -3,37 +3,37 @@ require 'package'
class Harfbuzz < Package
description 'HarfBuzz is an OpenType text shaping engine.'
homepage 'https://www.freedesktop.org/wiki/Software/HarfBuzz/'
@_ver = '2.8.2'
@_ver = '2.8.1'
version @_ver
license 'Old-MIT, ISC and icu'
compatibility 'x86_64 aarch64 armv7l'
source_url 'https://github.com/harfbuzz/harfbuzz.git'
git_hashtag @_ver
compatibility 'all'
source_url "https://github.com/harfbuzz/harfbuzz/archive/#{@_ver}.tar.gz"
source_sha256 'b3f17394c5bccee456172b2b30ddec0bb87e9c5df38b4559a973d14ccd04509d'
binary_url({
aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/harfbuzz/2.8.2_armv7l/harfbuzz-2.8.2-chromeos-armv7l.tpxz',
armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/harfbuzz/2.8.2_armv7l/harfbuzz-2.8.2-chromeos-armv7l.tpxz',
x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/harfbuzz/2.8.2_x86_64/harfbuzz-2.8.2-chromeos-x86_64.tpxz'
aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/harfbuzz/2.8.1_armv7l/harfbuzz-2.8.1-chromeos-armv7l.tpxz',
armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/harfbuzz/2.8.1_armv7l/harfbuzz-2.8.1-chromeos-armv7l.tpxz',
i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/harfbuzz/2.8.1_i686/harfbuzz-2.8.1-chromeos-i686.tpxz',
x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/harfbuzz/2.8.1_x86_64/harfbuzz-2.8.1-chromeos-x86_64.tpxz'
})
binary_sha256({
aarch64: 'b5161044e1976ac2ed7fcc59c7ed1a1539530c6695cb84f1efdd33b1c7b55a97',
armv7l: 'b5161044e1976ac2ed7fcc59c7ed1a1539530c6695cb84f1efdd33b1c7b55a97',
x86_64: 'ab4f370493d031b21c1fbe58575096eb3616c84d824bbed5c7dfe9e3bdfd05f0'
aarch64: 'f39e2aba4445d71c63a6602650590d8c5463a5c093b3ec26933e2963dc354dcc',
armv7l: 'f39e2aba4445d71c63a6602650590d8c5463a5c093b3ec26933e2963dc354dcc',
i686: '25e7c49b04e81fa61db4385d4033b6b2c633bdfe5ef2a5ab3606c970ad4b307d',
x86_64: '801f46cbab0369087004aa3ce7952fc4d7754a85a0cb3c4b0648ce647fc87604'
})
depends_on 'cairo' => :build
depends_on 'chafa' => :build
depends_on 'glib' => :build
depends_on 'gobject_introspection'
depends_on 'ragel' => :build
depends_on 'freetype_sub' => :build
depends_on 'freetype_sub'
depends_on 'six' => :build
depends_on 'graphite' => :build
def self.build
system "meson #{CREW_MESON_OPTIONS} \
--default-library=both \
-Dfreetype=enabled \
-Dintrospection=enabled \
-Dbenchmark=disabled \
-Dtests=disabled \