From 9e9a1e3e286c402e45722579ca5628d1a87eff7c Mon Sep 17 00:00:00 2001 From: "Satadru Pramanik, DO, MPH, MEng" Date: Tue, 14 May 2024 16:40:21 -0400 Subject: [PATCH] Update patchelf, harfbuzz, freetype, fontconfig, cairo, pango (#9803) Signed-off-by: Satadru Pramanik --- manifest/armv7l/c/cairo.filelist | 6 +- manifest/armv7l/f/fontconfig.filelist | 3 +- manifest/armv7l/f/freetype.filelist | 2 +- manifest/armv7l/h/harfbuzz.filelist | 17 +++--- manifest/armv7l/p/pango.filelist | 8 +-- manifest/armv7l/p/patchelf.filelist | 1 + manifest/i686/p/patchelf.filelist | 1 + manifest/x86_64/c/cairo.filelist | 6 +- manifest/x86_64/f/fontconfig.filelist | 3 +- manifest/x86_64/f/freetype.filelist | 2 +- manifest/x86_64/h/harfbuzz.filelist | 17 +++--- manifest/x86_64/p/pango.filelist | 8 +-- manifest/x86_64/p/patchelf.filelist | 1 + packages/cairo.rb | 10 ++-- packages/fontconfig.rb | 25 +++----- packages/freetype.rb | 20 +++---- packages/harfbuzz.rb | 82 +++++++++++++++++++-------- packages/pango.rb | 8 +-- packages/patchelf.rb | 28 +++++---- 19 files changed, 136 insertions(+), 112 deletions(-) diff --git a/manifest/armv7l/c/cairo.filelist b/manifest/armv7l/c/cairo.filelist index 4a5a8611b..4961c1a9f 100644 --- a/manifest/armv7l/c/cairo.filelist +++ b/manifest/armv7l/c/cairo.filelist @@ -18,13 +18,13 @@ /usr/local/lib/cairo/libcairo-trace.so /usr/local/lib/libcairo-gobject.so /usr/local/lib/libcairo-gobject.so.2 -/usr/local/lib/libcairo-gobject.so.2.11800.0 +/usr/local/lib/libcairo-gobject.so.2.11801.1 /usr/local/lib/libcairo-script-interpreter.so /usr/local/lib/libcairo-script-interpreter.so.2 -/usr/local/lib/libcairo-script-interpreter.so.2.11800.0 +/usr/local/lib/libcairo-script-interpreter.so.2.11801.1 /usr/local/lib/libcairo.so /usr/local/lib/libcairo.so.2 -/usr/local/lib/libcairo.so.2.11800.0 +/usr/local/lib/libcairo.so.2.11801.1 /usr/local/lib/pkgconfig/cairo-fc.pc /usr/local/lib/pkgconfig/cairo-ft.pc /usr/local/lib/pkgconfig/cairo-gobject.pc diff --git a/manifest/armv7l/f/fontconfig.filelist b/manifest/armv7l/f/fontconfig.filelist index 665b63d12..75672c015 100644 --- a/manifest/armv7l/f/fontconfig.filelist +++ b/manifest/armv7l/f/fontconfig.filelist @@ -35,7 +35,7 @@ /usr/local/include/fontconfig/fontconfig.h /usr/local/lib/libfontconfig.so /usr/local/lib/libfontconfig.so.1 -/usr/local/lib/libfontconfig.so.1.13.0 +/usr/local/lib/libfontconfig.so.1.14.0 /usr/local/lib/pkgconfig/fontconfig.pc /usr/local/share/fontconfig/conf.avail/05-reset-dirs-sample.conf /usr/local/share/fontconfig/conf.avail/09-autohint-if-no-hinting.conf @@ -56,6 +56,7 @@ /usr/local/share/fontconfig/conf.avail/11-lcdfilter-default.conf /usr/local/share/fontconfig/conf.avail/11-lcdfilter-legacy.conf /usr/local/share/fontconfig/conf.avail/11-lcdfilter-light.conf +/usr/local/share/fontconfig/conf.avail/11-lcdfilter-none.conf /usr/local/share/fontconfig/conf.avail/20-unhint-small-vera.conf /usr/local/share/fontconfig/conf.avail/25-unhint-nonlatin.conf /usr/local/share/fontconfig/conf.avail/30-metric-aliases.conf diff --git a/manifest/armv7l/f/freetype.filelist b/manifest/armv7l/f/freetype.filelist index 79a903f9f..f2369a216 100644 --- a/manifest/armv7l/f/freetype.filelist +++ b/manifest/armv7l/f/freetype.filelist @@ -55,5 +55,5 @@ /usr/local/lib/libfreetype.la /usr/local/lib/libfreetype.so /usr/local/lib/libfreetype.so.6 -/usr/local/lib/libfreetype.so.6.20.0 +/usr/local/lib/libfreetype.so.6.20.1 /usr/local/lib/pkgconfig/freetype2.pc diff --git a/manifest/armv7l/h/harfbuzz.filelist b/manifest/armv7l/h/harfbuzz.filelist index 91df5c7d1..1f50725e5 100644 --- a/manifest/armv7l/h/harfbuzz.filelist +++ b/manifest/armv7l/h/harfbuzz.filelist @@ -3,7 +3,6 @@ /usr/local/bin/hb-shape /usr/local/bin/hb-subset /usr/local/bin/hb-view -/usr/local/bin/ragel /usr/local/etc/fonts/conf.d/10-hinting-slight.conf /usr/local/etc/fonts/conf.d/10-scale-bitmap-fonts.conf /usr/local/etc/fonts/conf.d/10-sub-pixel-none.conf @@ -127,36 +126,36 @@ /usr/local/lib/harfbuzz-libcairo.a /usr/local/lib/harfbuzz-libcairo.so /usr/local/lib/harfbuzz-libcairo.so.2 -/usr/local/lib/harfbuzz-libcairo.so.2.11708.0 +/usr/local/lib/harfbuzz-libcairo.so.2.11801.1 /usr/local/lib/harfbuzz-libfontconfig.a /usr/local/lib/harfbuzz-libfontconfig.so /usr/local/lib/harfbuzz-libfontconfig.so.1 -/usr/local/lib/harfbuzz-libfontconfig.so.1.13.0 +/usr/local/lib/harfbuzz-libfontconfig.so.1.14.0 /usr/local/lib/libharfbuzz-cairo.a /usr/local/lib/libharfbuzz-cairo.so /usr/local/lib/libharfbuzz-cairo.so.0 -/usr/local/lib/libharfbuzz-cairo.so.0.60730.0 +/usr/local/lib/libharfbuzz-cairo.so.0.60850.0 /usr/local/lib/libharfbuzz-freetype.a /usr/local/lib/libharfbuzz-freetype.so /usr/local/lib/libharfbuzz-freetype.so.6 -/usr/local/lib/libharfbuzz-freetype.so.6.20.0 +/usr/local/lib/libharfbuzz-freetype.so.6.20.1 /usr/local/lib/libharfbuzz-gobject.a /usr/local/lib/libharfbuzz-gobject.so /usr/local/lib/libharfbuzz-gobject.so.0 -/usr/local/lib/libharfbuzz-gobject.so.0.60730.0 +/usr/local/lib/libharfbuzz-gobject.so.0.60850.0 /usr/local/lib/libharfbuzz-icu.a /usr/local/lib/libharfbuzz-icu.so /usr/local/lib/libharfbuzz-icu.so.0 -/usr/local/lib/libharfbuzz-icu.so.0.60730.0 +/usr/local/lib/libharfbuzz-icu.so.0.60850.0 /usr/local/lib/libharfbuzz-subset.a /usr/local/lib/libharfbuzz-subset.so /usr/local/lib/libharfbuzz-subset.so.0 -/usr/local/lib/libharfbuzz-subset.so.0.60730.0 +/usr/local/lib/libharfbuzz-subset.so.0.60850.0 /usr/local/lib/libharfbuzz.a /usr/local/lib/libharfbuzz.la /usr/local/lib/libharfbuzz.so /usr/local/lib/libharfbuzz.so.0 -/usr/local/lib/libharfbuzz.so.0.60730.0 +/usr/local/lib/libharfbuzz.so.0.60850.0 /usr/local/lib/pkgconfig/cairo.pc /usr/local/lib/pkgconfig/freetype2.pc /usr/local/lib/pkgconfig/harfbuzz-cairo.pc diff --git a/manifest/armv7l/p/pango.filelist b/manifest/armv7l/p/pango.filelist index 9f00087f8..5d5ab4854 100644 --- a/manifest/armv7l/p/pango.filelist +++ b/manifest/armv7l/p/pango.filelist @@ -47,16 +47,16 @@ /usr/local/lib/girepository-1.0/PangoXft-1.0.typelib /usr/local/lib/libpango-1.0.so /usr/local/lib/libpango-1.0.so.0 -/usr/local/lib/libpango-1.0.so.0.5200.1 +/usr/local/lib/libpango-1.0.so.0.5200.2 /usr/local/lib/libpangocairo-1.0.so /usr/local/lib/libpangocairo-1.0.so.0 -/usr/local/lib/libpangocairo-1.0.so.0.5200.1 +/usr/local/lib/libpangocairo-1.0.so.0.5200.2 /usr/local/lib/libpangoft2-1.0.so /usr/local/lib/libpangoft2-1.0.so.0 -/usr/local/lib/libpangoft2-1.0.so.0.5200.1 +/usr/local/lib/libpangoft2-1.0.so.0.5200.2 /usr/local/lib/libpangoxft-1.0.so /usr/local/lib/libpangoxft-1.0.so.0 -/usr/local/lib/libpangoxft-1.0.so.0.5200.1 +/usr/local/lib/libpangoxft-1.0.so.0.5200.2 /usr/local/lib/pkgconfig/pango.pc /usr/local/lib/pkgconfig/pangocairo.pc /usr/local/lib/pkgconfig/pangofc.pc diff --git a/manifest/armv7l/p/patchelf.filelist b/manifest/armv7l/p/patchelf.filelist index 4d165d862..c7adb8f14 100644 --- a/manifest/armv7l/p/patchelf.filelist +++ b/manifest/armv7l/p/patchelf.filelist @@ -1,3 +1,4 @@ /usr/local/bin/patchelf /usr/local/share/doc/patchelf/README.md /usr/local/share/man/man1/patchelf.1.zst +/usr/local/share/zsh/site-functions/_patchelf diff --git a/manifest/i686/p/patchelf.filelist b/manifest/i686/p/patchelf.filelist index 4d165d862..c7adb8f14 100644 --- a/manifest/i686/p/patchelf.filelist +++ b/manifest/i686/p/patchelf.filelist @@ -1,3 +1,4 @@ /usr/local/bin/patchelf /usr/local/share/doc/patchelf/README.md /usr/local/share/man/man1/patchelf.1.zst +/usr/local/share/zsh/site-functions/_patchelf diff --git a/manifest/x86_64/c/cairo.filelist b/manifest/x86_64/c/cairo.filelist index 9edbfd2dc..94e44a13b 100644 --- a/manifest/x86_64/c/cairo.filelist +++ b/manifest/x86_64/c/cairo.filelist @@ -18,13 +18,13 @@ /usr/local/lib64/cairo/libcairo-trace.so /usr/local/lib64/libcairo-gobject.so /usr/local/lib64/libcairo-gobject.so.2 -/usr/local/lib64/libcairo-gobject.so.2.11800.0 +/usr/local/lib64/libcairo-gobject.so.2.11801.1 /usr/local/lib64/libcairo-script-interpreter.so /usr/local/lib64/libcairo-script-interpreter.so.2 -/usr/local/lib64/libcairo-script-interpreter.so.2.11800.0 +/usr/local/lib64/libcairo-script-interpreter.so.2.11801.1 /usr/local/lib64/libcairo.so /usr/local/lib64/libcairo.so.2 -/usr/local/lib64/libcairo.so.2.11800.0 +/usr/local/lib64/libcairo.so.2.11801.1 /usr/local/lib64/pkgconfig/cairo-fc.pc /usr/local/lib64/pkgconfig/cairo-ft.pc /usr/local/lib64/pkgconfig/cairo-gobject.pc diff --git a/manifest/x86_64/f/fontconfig.filelist b/manifest/x86_64/f/fontconfig.filelist index d36ae406c..1c42d1c10 100644 --- a/manifest/x86_64/f/fontconfig.filelist +++ b/manifest/x86_64/f/fontconfig.filelist @@ -35,7 +35,7 @@ /usr/local/include/fontconfig/fontconfig.h /usr/local/lib64/libfontconfig.so /usr/local/lib64/libfontconfig.so.1 -/usr/local/lib64/libfontconfig.so.1.13.0 +/usr/local/lib64/libfontconfig.so.1.14.0 /usr/local/lib64/pkgconfig/fontconfig.pc /usr/local/share/fontconfig/conf.avail/05-reset-dirs-sample.conf /usr/local/share/fontconfig/conf.avail/09-autohint-if-no-hinting.conf @@ -56,6 +56,7 @@ /usr/local/share/fontconfig/conf.avail/11-lcdfilter-default.conf /usr/local/share/fontconfig/conf.avail/11-lcdfilter-legacy.conf /usr/local/share/fontconfig/conf.avail/11-lcdfilter-light.conf +/usr/local/share/fontconfig/conf.avail/11-lcdfilter-none.conf /usr/local/share/fontconfig/conf.avail/20-unhint-small-vera.conf /usr/local/share/fontconfig/conf.avail/25-unhint-nonlatin.conf /usr/local/share/fontconfig/conf.avail/30-metric-aliases.conf diff --git a/manifest/x86_64/f/freetype.filelist b/manifest/x86_64/f/freetype.filelist index 7aa9f6d57..1ee77f7ac 100644 --- a/manifest/x86_64/f/freetype.filelist +++ b/manifest/x86_64/f/freetype.filelist @@ -55,5 +55,5 @@ /usr/local/lib64/libfreetype.la /usr/local/lib64/libfreetype.so /usr/local/lib64/libfreetype.so.6 -/usr/local/lib64/libfreetype.so.6.20.0 +/usr/local/lib64/libfreetype.so.6.20.1 /usr/local/lib64/pkgconfig/freetype2.pc diff --git a/manifest/x86_64/h/harfbuzz.filelist b/manifest/x86_64/h/harfbuzz.filelist index f8bde6ff4..eba9fece3 100644 --- a/manifest/x86_64/h/harfbuzz.filelist +++ b/manifest/x86_64/h/harfbuzz.filelist @@ -3,7 +3,6 @@ /usr/local/bin/hb-shape /usr/local/bin/hb-subset /usr/local/bin/hb-view -/usr/local/bin/ragel /usr/local/etc/fonts/conf.d/10-hinting-slight.conf /usr/local/etc/fonts/conf.d/10-scale-bitmap-fonts.conf /usr/local/etc/fonts/conf.d/10-sub-pixel-none.conf @@ -127,36 +126,36 @@ /usr/local/lib64/harfbuzz-libcairo.a /usr/local/lib64/harfbuzz-libcairo.so /usr/local/lib64/harfbuzz-libcairo.so.2 -/usr/local/lib64/harfbuzz-libcairo.so.2.11708.0 +/usr/local/lib64/harfbuzz-libcairo.so.2.11801.1 /usr/local/lib64/harfbuzz-libfontconfig.a /usr/local/lib64/harfbuzz-libfontconfig.so /usr/local/lib64/harfbuzz-libfontconfig.so.1 -/usr/local/lib64/harfbuzz-libfontconfig.so.1.13.0 +/usr/local/lib64/harfbuzz-libfontconfig.so.1.14.0 /usr/local/lib64/libharfbuzz-cairo.a /usr/local/lib64/libharfbuzz-cairo.so /usr/local/lib64/libharfbuzz-cairo.so.0 -/usr/local/lib64/libharfbuzz-cairo.so.0.60730.0 +/usr/local/lib64/libharfbuzz-cairo.so.0.60850.0 /usr/local/lib64/libharfbuzz-freetype.a /usr/local/lib64/libharfbuzz-freetype.so /usr/local/lib64/libharfbuzz-freetype.so.6 -/usr/local/lib64/libharfbuzz-freetype.so.6.20.0 +/usr/local/lib64/libharfbuzz-freetype.so.6.20.1 /usr/local/lib64/libharfbuzz-gobject.a /usr/local/lib64/libharfbuzz-gobject.so /usr/local/lib64/libharfbuzz-gobject.so.0 -/usr/local/lib64/libharfbuzz-gobject.so.0.60730.0 +/usr/local/lib64/libharfbuzz-gobject.so.0.60850.0 /usr/local/lib64/libharfbuzz-icu.a /usr/local/lib64/libharfbuzz-icu.so /usr/local/lib64/libharfbuzz-icu.so.0 -/usr/local/lib64/libharfbuzz-icu.so.0.60730.0 +/usr/local/lib64/libharfbuzz-icu.so.0.60850.0 /usr/local/lib64/libharfbuzz-subset.a /usr/local/lib64/libharfbuzz-subset.so /usr/local/lib64/libharfbuzz-subset.so.0 -/usr/local/lib64/libharfbuzz-subset.so.0.60730.0 +/usr/local/lib64/libharfbuzz-subset.so.0.60850.0 /usr/local/lib64/libharfbuzz.a /usr/local/lib64/libharfbuzz.la /usr/local/lib64/libharfbuzz.so /usr/local/lib64/libharfbuzz.so.0 -/usr/local/lib64/libharfbuzz.so.0.60730.0 +/usr/local/lib64/libharfbuzz.so.0.60850.0 /usr/local/lib64/pkgconfig/cairo.pc /usr/local/lib64/pkgconfig/freetype2.pc /usr/local/lib64/pkgconfig/harfbuzz-cairo.pc diff --git a/manifest/x86_64/p/pango.filelist b/manifest/x86_64/p/pango.filelist index 00975af39..6c36e98d4 100644 --- a/manifest/x86_64/p/pango.filelist +++ b/manifest/x86_64/p/pango.filelist @@ -47,16 +47,16 @@ /usr/local/lib64/girepository-1.0/PangoXft-1.0.typelib /usr/local/lib64/libpango-1.0.so /usr/local/lib64/libpango-1.0.so.0 -/usr/local/lib64/libpango-1.0.so.0.5200.1 +/usr/local/lib64/libpango-1.0.so.0.5200.2 /usr/local/lib64/libpangocairo-1.0.so /usr/local/lib64/libpangocairo-1.0.so.0 -/usr/local/lib64/libpangocairo-1.0.so.0.5200.1 +/usr/local/lib64/libpangocairo-1.0.so.0.5200.2 /usr/local/lib64/libpangoft2-1.0.so /usr/local/lib64/libpangoft2-1.0.so.0 -/usr/local/lib64/libpangoft2-1.0.so.0.5200.1 +/usr/local/lib64/libpangoft2-1.0.so.0.5200.2 /usr/local/lib64/libpangoxft-1.0.so /usr/local/lib64/libpangoxft-1.0.so.0 -/usr/local/lib64/libpangoxft-1.0.so.0.5200.1 +/usr/local/lib64/libpangoxft-1.0.so.0.5200.2 /usr/local/lib64/pkgconfig/pango.pc /usr/local/lib64/pkgconfig/pangocairo.pc /usr/local/lib64/pkgconfig/pangofc.pc diff --git a/manifest/x86_64/p/patchelf.filelist b/manifest/x86_64/p/patchelf.filelist index 4d165d862..c7adb8f14 100644 --- a/manifest/x86_64/p/patchelf.filelist +++ b/manifest/x86_64/p/patchelf.filelist @@ -1,3 +1,4 @@ /usr/local/bin/patchelf /usr/local/share/doc/patchelf/README.md /usr/local/share/man/man1/patchelf.1.zst +/usr/local/share/zsh/site-functions/_patchelf diff --git a/packages/cairo.rb b/packages/cairo.rb index c529e63f1..3c9a47708 100644 --- a/packages/cairo.rb +++ b/packages/cairo.rb @@ -3,17 +3,17 @@ require 'buildsystems/meson' class Cairo < Meson description 'Cairo is a 2D graphics library with support for multiple output devices.' homepage 'https://www.cairographics.org' - version '1.18.0' + version '1.18.1-27c8ad5' license 'LGPL-2.1 or MPL-1.1' compatibility 'x86_64 aarch64 armv7l' source_url 'https://gitlab.freedesktop.org/cairo/cairo.git' - git_hashtag version + git_hashtag '27c8ad5cd8591db742dbf2000ca0d2b08b2c3675' binary_compression 'tar.zst' binary_sha256({ - aarch64: 'd72e3793ff72a3f368d159b719522a9f832438caf816437214e359b0e5d4c2af', - armv7l: 'd72e3793ff72a3f368d159b719522a9f832438caf816437214e359b0e5d4c2af', - x86_64: '79cb19209eaeabc0f7fd49b4e73c38cae590d4f7e170ebe69b77c085657717ec' + aarch64: 'b3f20a3551db00c8054a648f4b9efdd06becac58f4e95806e17f959a279c07ab', + armv7l: 'b3f20a3551db00c8054a648f4b9efdd06becac58f4e95806e17f959a279c07ab', + x86_64: '9f432c84a29a7de5eb6014b911eeb58fa96cd036ac5c2b57d35d99c07eeedc1c' }) depends_on 'fontconfig' # R diff --git a/packages/fontconfig.rb b/packages/fontconfig.rb index 485eb48b7..f9fa916c6 100644 --- a/packages/fontconfig.rb +++ b/packages/fontconfig.rb @@ -1,21 +1,20 @@ -require 'package' +require 'buildsystems/meson' # build order: harfbuzz => freetype => fontconfig => cairo => pango -class Fontconfig < Package +class Fontconfig < Meson description 'Fontconfig is a library for configuring and customizing font access.' homepage 'https://www.freedesktop.org/wiki/Software/fontconfig/' - @_ver = '2.14.2' - version "#{@_ver}-1" + version '2.15.0' license 'MIT' compatibility 'x86_64 aarch64 armv7l' source_url 'https://gitlab.freedesktop.org/fontconfig/fontconfig.git' - git_hashtag @_ver + git_hashtag version binary_compression 'tar.zst' binary_sha256({ - aarch64: '9be6e2ad2bae395de354b1a1daad812a60bf0706fe429aa6eb3c50ac16de4001', - armv7l: '9be6e2ad2bae395de354b1a1daad812a60bf0706fe429aa6eb3c50ac16de4001', - x86_64: '312be51a3f24e688489a30efaf61027d257998814be2fd670d403b0a88d5e818' + aarch64: 'f5af985710bd151112adb8eb55ed194aee1e6ed1226479e0d0bb5bd6fb9849ef', + armv7l: 'f5af985710bd151112adb8eb55ed194aee1e6ed1226479e0d0bb5bd6fb9849ef', + x86_64: '0be5e2b39cb0b9aba7255f05c76fd38b2b43e6ebad5176b748fea953d8dad4ac' }) depends_on 'expat' # R @@ -31,15 +30,9 @@ class Fontconfig < Package no_fhs - def self.build - system "mold -run meson setup #{CREW_MESON_OPTIONS} \ - --wrap-mode=default \ + meson_options "--wrap-mode=default \ -Dlocalstatedir=#{CREW_PREFIX}/cache \ - -Dtests=disabled \ - builddir" - system 'meson configure --no-pager builddir' - system "#{CREW_NINJA} -C builddir" - end + -Dtests=disabled" def self.install system "DESTDIR=#{CREW_DEST_DIR} #{CREW_NINJA} -C builddir install" diff --git a/packages/freetype.rb b/packages/freetype.rb index 8bacfb97c..7ef67d199 100644 --- a/packages/freetype.rb +++ b/packages/freetype.rb @@ -1,10 +1,10 @@ -require 'package' +require 'buildsystems/meson' # build order: harfbuzz => freetype => fontconfig => cairo => pango -class Freetype < Package +class Freetype < Meson description 'FreeType is a freely available software library to render fonts.' homepage 'https://www.freetype.org/' - version '2.13.1' # Update freetype in harfbuzz when updating freetype + version '2.13.2' # Update freetype in harfbuzz when updating freetype license 'FTL or GPL-2+' compatibility 'x86_64 aarch64 armv7l' source_url 'https://gitlab.freedesktop.org/freetype/freetype.git' @@ -12,9 +12,9 @@ class Freetype < Package binary_compression 'tar.zst' binary_sha256({ - aarch64: '32d644934a6727c0ea8a0e8e13ed70de49e9c0337651818566dbd91d4cd52fd7', - armv7l: '32d644934a6727c0ea8a0e8e13ed70de49e9c0337651818566dbd91d4cd52fd7', - x86_64: '7f137b4b0bdcf332afe470d32c2cfb8b1a3464ed66cc9d7d1a20fe925ddca1f8' + aarch64: '1910229405d27c90a8dabeba5be6ea3884bdf5bfe48a6a1978a7a40af7879246', + armv7l: '1910229405d27c90a8dabeba5be6ea3884bdf5bfe48a6a1978a7a40af7879246', + x86_64: '8136147b106facdb16d82bdf3683615d68da9fd8735cab9d8a47e7c564520eae' }) depends_on 'brotli' # R @@ -30,13 +30,7 @@ class Freetype < Package depends_on 'py3_docwriter' => :build depends_on 'zlibpkg' # R - def self.build - system "meson setup #{CREW_MESON_OPTIONS} \ - -Dharfbuzz=enabled \ - builddir" - system 'meson configure --no-pager builddir' - system 'samu -C builddir' - end + meson_options '-Dharfbuzz=enabled' def self.install system "DESTDIR=#{CREW_DEST_DIR} samu -C builddir install" diff --git a/packages/harfbuzz.rb b/packages/harfbuzz.rb index 32306cb63..ced08e8cb 100644 --- a/packages/harfbuzz.rb +++ b/packages/harfbuzz.rb @@ -1,11 +1,13 @@ -require 'package' +require 'buildsystems/meson' +require_relative 'cairo' +require_relative 'fontconfig' require_relative 'freetype' # build order: harfbuzz => freetype => fontconfig => cairo => pango -class Harfbuzz < Package +class Harfbuzz < Meson description 'HarfBuzz is an OpenType text shaping engine.' homepage 'https://www.freedesktop.org/wiki/Software/HarfBuzz/' - version '7.3.0' + version '8.5.0' license 'Old-MIT, ISC and icu' compatibility 'x86_64 aarch64 armv7l' source_url 'https://github.com/harfbuzz/harfbuzz.git' @@ -13,9 +15,9 @@ class Harfbuzz < Package binary_compression 'tar.zst' binary_sha256({ - aarch64: '8eae2341b560a92f4e214b369e670e9d1cb195cbcc60489d9718fb7bfec615b0', - armv7l: '8eae2341b560a92f4e214b369e670e9d1cb195cbcc60489d9718fb7bfec615b0', - x86_64: '4bd7fadc454ddc205e67884bef2c926399174344ee70c1cbcb0d59828933d044' + aarch64: '448ad35c9e90e8c5cbcdef4440061f83041446c98e069a937f9048cd5e24d703', + armv7l: '448ad35c9e90e8c5cbcdef4440061f83041446c98e069a937f9048cd5e24d703', + x86_64: 'a987092cf2e77d5620d3a412979ca4d6708a26afb0e1ae7478ce36e184b8f193' }) depends_on 'brotli' # R @@ -31,6 +33,7 @@ class Harfbuzz < Package depends_on 'gperf' => :build depends_on 'graphite' # R depends_on 'icu4c' # R + depends_on 'jsonc' => :build depends_on 'libffi' => :build depends_on 'libpng' # R depends_on 'libx11' # R @@ -45,12 +48,24 @@ class Harfbuzz < Package # provides freetype (sans harfbuzz), ragel, and a non-x11 cairo stub + meson_options '--wrap-mode=default \ + --default-library=both \ + -Dbenchmark=disabled \ + -Dcairo=enabled \ + -Ddocs=disabled \ + -Dfreetype=enabled \ + -Dgraphite2=enabled \ + -Dintrospection=enabled \ + -Dragel_subproject=true \ + -Dtests=disabled' + def self.prebuild %w[fontconfig freetype].each do |build_exclusion| next unless File.exist? "#{CREW_PREFIX}/etc/crew/meta/#{build_exclusion}.filelist" puts "#{build_exclusion} needs to be uninstalled before this build.".lightred end + system 'update-ca-certificates --fresh' end def self.patch @@ -65,24 +80,45 @@ class Harfbuzz < Package freetype2 = freetype_dep freetype = freetype_dep FREETYPE2_WRAP_EOF - end - def self.build - system 'update-ca-certificates --fresh' - system "mold -run meson setup #{CREW_MESON_OPTIONS} \ - --wrap-mode=default \ - --default-library=both \ - -Dbenchmark=disabled \ - -Dcairo=enabled \ - -Ddocs=disabled \ - -Dfreetype=enabled \ - -Dgraphite2=enabled \ - -Dintrospection=enabled \ - -Dragel_subproject=true \ - -Dtests=disabled \ - builddir" - system 'meson configure --no-pager builddir' - system "#{CREW_NINJA} -C builddir" + File.write 'subprojects/cairo.wrap', <<~CAIRO_WRAP_EOF + [wrap-git] + directory = cairo + url=https://gitlab.freedesktop.org/cairo/cairo.git + revision=#{Cairo.git_hashtag} + depth=1 + + [provide] + dependency_names = cairo + CAIRO_WRAP_EOF + + FileUtils.mkdir_p 'subprojects/packagefiles' + File.write 'subprojects/packagefiles/fontconfig.diff', <<~FCSTDINT_WRAP_EOF + diff -Npaur a/src/fcstdint.h b/src/fcstdint.h + --- a/src/fcstdint.h 1969-12-31 19:00:00.000000000 -0500 + +++ b/src/fcstdint.h 2024-05-14 13:58:12.402498838 -0400 + @@ -0,0 +1,8 @@ + +#ifndef _FONTCONFIG_SRC_FCSTDINT_H + +#define _FONTCONFIG_SRC_FCSTDINT_H 1 + +#ifndef _GENERATED_STDINT_H + +#define _GENERATED_STDINT_H "fontconfig #{Fontconfig.version}" + +#define _STDINT_HAVE_STDINT_H 1 + +#include + +#endif + +#endif + FCSTDINT_WRAP_EOF + + File.write 'subprojects/fontconfig.wrap', <<~FONTCONFIG_WRAP_EOF + [wrap-git] + directory = fontconfig + url=https://gitlab.freedesktop.org/fontconfig/fontconfig.git + revision=#{Fontconfig.git_hashtag} + depth=1 + diff_files = fontconfig.diff + + [provide] + dependency_names = fontconfig + FONTCONFIG_WRAP_EOF end def self.install diff --git a/packages/pango.rb b/packages/pango.rb index 39d085012..f23de815f 100644 --- a/packages/pango.rb +++ b/packages/pango.rb @@ -4,7 +4,7 @@ require 'buildsystems/meson' class Pango < Meson description 'Pango is a library for laying out and rendering of text, with an emphasis on internationalization.' homepage 'https://pango.gnome.org/' - version '1.52.1' + version '1.52.2' license 'LGPL-2+ and FTL' compatibility 'x86_64 aarch64 armv7l' source_url 'https://gitlab.gnome.org/GNOME/pango.git' @@ -12,9 +12,9 @@ class Pango < Meson binary_compression 'tar.zst' binary_sha256({ - aarch64: 'c29f6ef32a0485b110a3b356ee5dc6a2f3fbdbae36e1522fb7cea721467879ca', - armv7l: 'c29f6ef32a0485b110a3b356ee5dc6a2f3fbdbae36e1522fb7cea721467879ca', - x86_64: '88669ba12416df9d44d70a79eb2ae081e6473bfe05054012589fcca9fb32e4a0' + aarch64: 'bd55b1eb27d8106deaedb2a1af4bacea3c567f5bfbc037d9dde51f11b48e3454', + armv7l: 'bd55b1eb27d8106deaedb2a1af4bacea3c567f5bfbc037d9dde51f11b48e3454', + x86_64: 'dac956a0fb4c555d5aa7242876f150961eeb341ac35bda66833d8cfe8380b9e9' }) depends_on 'cairo' # R diff --git a/packages/patchelf.rb b/packages/patchelf.rb index 2c467fe02..d24102f13 100644 --- a/packages/patchelf.rb +++ b/packages/patchelf.rb @@ -1,9 +1,9 @@ -require 'package' +require 'buildsystems/autotools' -class Patchelf < Package +class Patchelf < Autotools description 'PatchELF is a small utility to modify the dynamic linker and RPATH of ELF executables.' homepage 'http://nixos.org/patchelf.html' - version '0.17.2' + version '0.18.0' license 'GPL-3' compatibility 'all' source_url 'https://github.com/NixOS/patchelf.git' @@ -11,18 +11,20 @@ class Patchelf < Package binary_compression 'tar.zst' binary_sha256({ - aarch64: 'd3b21500b8727dc9372dd42f21c24e346634cb4aa972fbc4653832c08cb9e64d', - armv7l: 'd3b21500b8727dc9372dd42f21c24e346634cb4aa972fbc4653832c08cb9e64d', - i686: '6175e787dee232ce9120e86dbb5b578c2662959f92ff8e51efb2efdd8d52d915', - x86_64: 'ce1fc5eb4f3ba8bf99fab4f4c3b4c9ca2cd2a93c504c0ac0928318b8cdafaeab' + aarch64: '56fbe54307a6a7db9933c8e4d7b2d3c92836afd7c1c67d036a7a40d19b5a85ef', + armv7l: '56fbe54307a6a7db9933c8e4d7b2d3c92836afd7c1c67d036a7a40d19b5a85ef', + i686: '3602b232577da2b67aba8ae9069995909d38e8fb0efca5db0909df44e24e7c9e', + x86_64: 'a75cf598e6498555c867d1a462ef78a43f1fe8f9ca3a147f3aab33336ca90f78' }) no_env_options - def self.build - system './bootstrap.sh' - system "LDFLAGS='-flto=auto -static' ./configure #{CREW_OPTIONS}" - system 'make' + pre_configure_options "LDFLAGS='-flto=auto -static' " + + def self.patch + # Allocate PHT & SHT at the end of the *.elf file + downloader 'https://github.com/NixOS/patchelf/pull/544.patch', 'dbb0a0626e933e7368aaa84536bdb9cf46d4d05565e7fb5a9643154ec70c8ba1' + system 'patch -Np1 -i 544.patch' end def self.check @@ -33,8 +35,4 @@ class Patchelf < Package end system 'make', 'check' end - - def self.install - system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install' - end end