Harfbuzz => 10.0.1 + downstream updates (#10526)

* Harfbuzz => 10.0.1 + downstream updates Signed-off-by: Satadru Pramanik <satadru@gmail.com> * suggested changes, bump version Signed-off-by: Satadru Pramanik <satadru@gmail.com> * lint Signed-off-by: Satadru Pramanik <satadru@gmail.com> * remove glibc limitation on qt5_base Signed-off-by: Satadru Pramanik <satadru@gmail.com> * fixup Signed-off-by: Satadru Pramanik <satadru@gmail.com> --------- Signed-off-by: Satadru Pramanik <satadru@gmail.com>
2026-01-08 23:18:10 -05:00 · 2024-09-25 16:12:09 -04:00
parent f8a076f12e
commit a5fc2e945d
16 changed files with 127 additions and 176 deletions
--- a/lib/const.rb
+++ b/lib/const.rb
@@ -3,7 +3,7 @@
 require 'etc'

 OLD_CREW_VERSION ||= defined?(CREW_VERSION) ? CREW_VERSION : '1.0'
-CREW_VERSION ||= '1.52.9' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION
+CREW_VERSION ||= '1.53.0' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION

 # Kernel architecture.
 KERN_ARCH ||= Etc.uname[:machine]
--- a/lib/convenience_functions.rb
+++ b/lib/convenience_functions.rb
@@ -21,4 +21,65 @@ class ConvenienceFunctions
    # Copy over original if the write to the tmp file succeeds.
    FileUtils.cp("#{CREW_CONFIG_PATH}/device.json.tmp", File.join(CREW_CONFIG_PATH, 'device.json')) && FileUtils.rm("#{CREW_CONFIG_PATH}/device.json.tmp")
  end
+
+  def self.libtoolize(library, lib_pkg_name = nil)
+    lib_pkg_name = library if lib_pkg_name.nil?
+    libname = library.to_s.start_with?('lib') ? library.downcase : "lib#{library.downcase}"
+    puts "grep \"#{CREW_LIB_PREFIX}/#{libname}.so\\\|#{CREW_DEST_LIB_PREFIX}/#{libname}-*.so\" #{CREW_META_PATH}/#{lib_pkg_name}.filelist" if CREW_VERBOSE
+    libnames = `grep "#{CREW_LIB_PREFIX}/#{libname}.so\\\|#{CREW_DEST_LIB_PREFIX}/#{libname}-*.so*" #{CREW_META_PATH}/#{lib_pkg_name}.filelist`.chomp.split(/$/).map(&:strip)
+    libnames.each do |s|
+      s.gsub!("#{CREW_LIB_PREFIX}/", '')
+    end
+    return if libnames.empty?
+    dlname = libnames.grep(/.so./).first
+    libname = dlname.gsub(/.so.\d+/, '')
+    longest_libname = libnames.max_by(&:length)
+    libvars = longest_libname.rpartition('.so.')[2].split('.')
+
+    libtool_file = <<~LIBTOOLEOF
+      # #{libname}.la - a libtool library file
+      # Generated by libtool (GNU libtool) (Created by Chromebrew)
+      #
+      # Please DO NOT delete this file!
+      # It is necessary for linking the library.
+
+      # The name that we can dlopen(3).
+      dlname='#{dlname}'
+
+      # Names of this library.
+      library_names='#{libnames.reverse.join(' ')}'
+
+      # The name of the static archive.
+      old_library='#{libname}.a'
+
+      # Linker flags that cannot go in dependency_libs.
+      inherited_linker_flags=''
+
+      # Libraries that this one depends upon.
+      dependency_libs=''
+
+      # Names of additional weak libraries provided by this library
+      weak_library_names=''
+
+      # Version information for #{library}.
+      current=#{libvars[1]}
+      age=#{libvars[1]}
+      revision=#{libvars[2]}
+
+      # Is this an already installed library?
+      installed=yes
+
+      # Should we warn about portability when linking against -modules?
+      shouldnotlink=no
+
+      # Files to dlopen/dlpreopen
+      dlopen=''
+      dlpreopen=''
+
+      # Directory that this library needs to be installed in:
+      libdir='#{CREW_LIB_PREFIX}'
+    LIBTOOLEOF
+    File.write("#{CREW_LIB_PREFIX}/#{libname}.la", libtool_file)
+    puts "Generated #{CREW_LIB_PREFIX}/#{libname}.la..."
+  end
 end
--- 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.11801.1
+/usr/local/lib/libcairo-gobject.so.2.11802.2
 /usr/local/lib/libcairo-script-interpreter.so
 /usr/local/lib/libcairo-script-interpreter.so.2
-/usr/local/lib/libcairo-script-interpreter.so.2.11801.1
+/usr/local/lib/libcairo-script-interpreter.so.2.11802.2
 /usr/local/lib/libcairo.so
 /usr/local/lib/libcairo.so.2
-/usr/local/lib/libcairo.so.2.11801.1
+/usr/local/lib/libcairo.so.2.11802.2
 /usr/local/lib/pkgconfig/cairo-fc.pc
 /usr/local/lib/pkgconfig/cairo-ft.pc
 /usr/local/lib/pkgconfig/cairo-gobject.pc
--- a/manifest/armv7l/f/freetype.filelist
+++ b/manifest/armv7l/f/freetype.filelist
@@ -52,8 +52,8 @@
 /usr/local/include/freetype2/freetype/tttables.h
 /usr/local/include/freetype2/freetype/tttags.h
 /usr/local/include/freetype2/ft2build.h
-/usr/local/lib/libfreetype.la
 /usr/local/lib/libfreetype.so
 /usr/local/lib/libfreetype.so.6
-/usr/local/lib/libfreetype.so.6.20.1
+/usr/local/lib/libfreetype.so.6.20.2
 /usr/local/lib/pkgconfig/freetype2.pc
+/usr/local/share/aclocal/freetype2.m4
--- a/manifest/armv7l/h/harfbuzz.filelist
+++ b/manifest/armv7l/h/harfbuzz.filelist
@@ -126,7 +126,7 @@
 /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.11801.1
+/usr/local/lib/harfbuzz-libcairo.so.2.11802.2
 /usr/local/lib/harfbuzz-libfontconfig.a
 /usr/local/lib/harfbuzz-libfontconfig.so
 /usr/local/lib/harfbuzz-libfontconfig.so.1
@@ -134,28 +134,27 @@
 /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.60900.0
+/usr/local/lib/libharfbuzz-cairo.so.0.61001.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.1
+/usr/local/lib/libharfbuzz-freetype.so.6.20.2
 /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.60900.0
+/usr/local/lib/libharfbuzz-gobject.so.0.61001.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.60900.0
+/usr/local/lib/libharfbuzz-icu.so.0.61001.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.60900.0
+/usr/local/lib/libharfbuzz-subset.so.0.61001.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.60900.0
+/usr/local/lib/libharfbuzz.so.0.61001.0
 /usr/local/lib/pkgconfig/cairo.pc
 /usr/local/lib/pkgconfig/freetype2.pc
 /usr/local/lib/pkgconfig/harfbuzz-cairo.pc
@@ -163,4 +162,5 @@
 /usr/local/lib/pkgconfig/harfbuzz-icu.pc
 /usr/local/lib/pkgconfig/harfbuzz-subset.pc
 /usr/local/lib/pkgconfig/harfbuzz.pc
+/usr/local/share/aclocal/freetype2.m4
 /usr/local/share/gir-1.0/HarfBuzz-0.0.gir
--- 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.11801.1
+/usr/local/lib64/libcairo-gobject.so.2.11802.2
 /usr/local/lib64/libcairo-script-interpreter.so
 /usr/local/lib64/libcairo-script-interpreter.so.2
-/usr/local/lib64/libcairo-script-interpreter.so.2.11801.1
+/usr/local/lib64/libcairo-script-interpreter.so.2.11802.2
 /usr/local/lib64/libcairo.so
 /usr/local/lib64/libcairo.so.2
-/usr/local/lib64/libcairo.so.2.11801.1
+/usr/local/lib64/libcairo.so.2.11802.2
 /usr/local/lib64/pkgconfig/cairo-fc.pc
 /usr/local/lib64/pkgconfig/cairo-ft.pc
 /usr/local/lib64/pkgconfig/cairo-gobject.pc
--- a/manifest/x86_64/f/freetype.filelist
+++ b/manifest/x86_64/f/freetype.filelist
@@ -52,8 +52,8 @@
 /usr/local/include/freetype2/freetype/tttables.h
 /usr/local/include/freetype2/freetype/tttags.h
 /usr/local/include/freetype2/ft2build.h
-/usr/local/lib64/libfreetype.la
 /usr/local/lib64/libfreetype.so
 /usr/local/lib64/libfreetype.so.6
-/usr/local/lib64/libfreetype.so.6.20.1
+/usr/local/lib64/libfreetype.so.6.20.2
 /usr/local/lib64/pkgconfig/freetype2.pc
+/usr/local/share/aclocal/freetype2.m4
--- a/manifest/x86_64/h/harfbuzz.filelist
+++ b/manifest/x86_64/h/harfbuzz.filelist
@@ -126,7 +126,7 @@
 /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.11801.1
+/usr/local/lib64/harfbuzz-libcairo.so.2.11802.2
 /usr/local/lib64/harfbuzz-libfontconfig.a
 /usr/local/lib64/harfbuzz-libfontconfig.so
 /usr/local/lib64/harfbuzz-libfontconfig.so.1
@@ -134,28 +134,27 @@
 /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.60900.0
+/usr/local/lib64/libharfbuzz-cairo.so.0.61001.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.1
+/usr/local/lib64/libharfbuzz-freetype.so.6.20.2
 /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.60900.0
+/usr/local/lib64/libharfbuzz-gobject.so.0.61001.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.60900.0
+/usr/local/lib64/libharfbuzz-icu.so.0.61001.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.60900.0
+/usr/local/lib64/libharfbuzz-subset.so.0.61001.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.60900.0
+/usr/local/lib64/libharfbuzz.so.0.61001.0
 /usr/local/lib64/pkgconfig/cairo.pc
 /usr/local/lib64/pkgconfig/freetype2.pc
 /usr/local/lib64/pkgconfig/harfbuzz-cairo.pc
@@ -163,4 +162,5 @@
 /usr/local/lib64/pkgconfig/harfbuzz-icu.pc
 /usr/local/lib64/pkgconfig/harfbuzz-subset.pc
 /usr/local/lib64/pkgconfig/harfbuzz.pc
+/usr/local/share/aclocal/freetype2.m4
 /usr/local/share/gir-1.0/HarfBuzz-0.0.gir
--- a/packages/cairo.rb
+++ b/packages/cairo.rb
@@ -1,19 +1,20 @@
 require 'buildsystems/meson'
+# build order: harfbuzz => freetype => fontconfig => cairo => pango

 class Cairo < Meson
  description 'Cairo is a 2D graphics library with support for multiple output devices.'
  homepage 'https://www.cairographics.org'
-  version '1.18.1-43e08ae'
+  version '1.18.2'
  license 'LGPL-2.1 or MPL-1.1'
  compatibility 'x86_64 aarch64 armv7l'
  source_url 'https://gitlab.freedesktop.org/cairo/cairo.git'
-  git_hashtag '43e08aed8b70655d7e5834e81fa87fd353e27e1c'
+  git_hashtag version
  binary_compression 'tar.zst'

  binary_sha256({
-    aarch64: 'a62399b2399be1666777e3840ddb61e0f3f7295f67f63bfac88c62d7b0bff964',
-     armv7l: 'a62399b2399be1666777e3840ddb61e0f3f7295f67f63bfac88c62d7b0bff964',
-     x86_64: 'a979754d2b6d6ad19fa0454032b6cdbb53184f315f52b5f8eab86e4cf2e77291'
+    aarch64: 'a5dc26b94030439f13d34b3dc36aa14169cd2dfff918e1953f6de6c7c01a46c6',
+     armv7l: 'a5dc26b94030439f13d34b3dc36aa14169cd2dfff918e1953f6de6c7c01a46c6',
+     x86_64: '9ae42198c6c69d131d8431a26da921bb7a1da4fb79c98a12d3ecfce1138d818b'
  })

  depends_on 'fontconfig' # R
--- a/packages/fontconfig.rb
+++ b/packages/fontconfig.rb
@@ -4,7 +4,7 @@ require 'buildsystems/meson'
 class Fontconfig < Meson
  description 'Fontconfig is a library for configuring and customizing font access.'
  homepage 'https://www.freedesktop.org/wiki/Software/fontconfig/'
-  version '2.15.0-1'
+  version '2.15.0-2'
  license 'MIT'
  compatibility 'x86_64 aarch64 armv7l'
  source_url 'https://gitlab.freedesktop.org/fontconfig/fontconfig.git'
@@ -12,9 +12,9 @@ class Fontconfig < Meson
  binary_compression 'tar.zst'

  binary_sha256({
-    aarch64: 'db4ecc4a5e66ec68761a21f1112867d185712e337514928ca93dc40ba7e386e6',
-     armv7l: 'db4ecc4a5e66ec68761a21f1112867d185712e337514928ca93dc40ba7e386e6',
-     x86_64: '522fd2617e68a7fb67502c36b1accdf8ada922b895c8ab767a9fb36a69eb2585'
+    aarch64: 'f4b3f86770a0373bdbddc34a284ec36a5b0a7df1d0ef10e4caa0ce449dd5a235',
+     armv7l: 'f4b3f86770a0373bdbddc34a284ec36a5b0a7df1d0ef10e4caa0ce449dd5a235',
+     x86_64: 'bc9a2abe014c5ed4dfa097039af3c590b8251bbf8558aae1393f9fcf16c96a61'
  })

  depends_on 'expat' # R
--- a/packages/freetype.rb
+++ b/packages/freetype.rb
@@ -4,7 +4,7 @@ require 'buildsystems/meson'
 class Freetype < Meson
  description 'FreeType is a freely available software library to render fonts.'
  homepage 'https://freetype.org/'
-  version '2.13.2-1' # Update freetype in harfbuzz when updating freetype
+  version '2.13.3' # 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 < Meson
  binary_compression 'tar.zst'

  binary_sha256({
-    aarch64: '958e0cac92d47841889a468d33ac48237131ccde495953634a130e69399f1ed8',
-     armv7l: '958e0cac92d47841889a468d33ac48237131ccde495953634a130e69399f1ed8',
-     x86_64: 'fdc286d7ea8b83d6100b1c77a3fca43f6bbc7bc5f0a6fc627e7e1dd502f78389'
+    aarch64: 'cfe640869c0b399adc091b60da318e829f5df9f73c2b8b50f839459704aa401f',
+     armv7l: 'cfe640869c0b399adc091b60da318e829f5df9f73c2b8b50f839459704aa401f',
+     x86_64: '58a0a99738b716512226f35e6c657a5319af5f2d46c5432c0c417047c80872ef'
  })

  depends_on 'brotli' # R
@@ -31,66 +31,4 @@ class Freetype < Meson
  depends_on 'zlib' # R

  meson_options '-Dharfbuzz=enabled'
-
-  def self.install
-    system "DESTDIR=#{CREW_DEST_DIR} samu -C builddir install"
-    # Create libtool file. Needed by handbrake build.
-    return if File.file?("#{CREW_DEST_LIB_PREFIX}/#{@libname}.la")
-
-    @libname = name.to_s.start_with?('lib') ? name.downcase : "lib#{name.downcase}"
-    @libnames = Dir["#{CREW_DEST_LIB_PREFIX}/#{@libname}.so*"]
-    @libnames = Dir["#{CREW_DEST_LIB_PREFIX}/#{@libname}-*.so*"] if @libnames.empty?
-    @libnames.each do |s|
-      s.gsub!("#{CREW_DEST_LIB_PREFIX}/", '')
-    end
-    @dlname = @libnames.grep(/.so./).first
-    @libname = @dlname.gsub(/.so.\d+/, '')
-    @longest_libname = @libnames.max_by(&:length)
-    @libvars = @longest_libname.rpartition('.so.')[2].split('.')
-
-    @libtool_file = <<~LIBTOOLEOF
-      # #{@libname}.la - a libtool library file
-      # Generated by libtool (GNU libtool) (Created by Chromebrew)
-      #
-      # Please DO NOT delete this file!
-      # It is necessary for linking the library.
-
-      # The name that we can dlopen(3).
-      dlname='#{@dlname}'
-
-      # Names of this library.
-      library_names='#{@libnames.reverse.join(' ')}'
-
-      # The name of the static archive.
-      old_library='#{@libname}.a'
-
-      # Linker flags that cannot go in dependency_libs.
-      inherited_linker_flags=''
-
-      # Libraries that this one depends upon.
-      dependency_libs=''
-
-      # Names of additional weak libraries provided by this library
-      weak_library_names=''
-
-      # Version information for #{name}.
-      current=#{@libvars[1]}
-      age=#{@libvars[1]}
-      revision=#{@libvars[2]}
-
-      # Is this an already installed library?
-      installed=yes
-
-      # Should we warn about portability when linking against -modules?
-      shouldnotlink=no
-
-      # Files to dlopen/dlpreopen
-      dlopen=''
-      dlpreopen=''
-
-      # Directory that this library needs to be installed in:
-      libdir='#{CREW_LIB_PREFIX}'
-    LIBTOOLEOF
-    File.write("#{CREW_DEST_LIB_PREFIX}/#{@libname}.la", @libtool_file)
-  end
 end
--- a/packages/handbrake.rb
+++ b/packages/handbrake.rb
@@ -1,4 +1,5 @@
 require 'package'
+require 'convenience_functions'

 class Handbrake < Package
  description 'HandBrake is a tool for converting video from nearly any format to a selection of modern, widely supported codecs.'
@@ -6,7 +7,6 @@ class Handbrake < Package
  version '1.8.2'
  license 'GPL-2'
  compatibility 'x86_64'
-  min_glibc '2.37'
  source_url 'https://github.com/HandBrake/HandBrake.git'
  git_hashtag version
  binary_compression 'tar.zst'
@@ -67,6 +67,15 @@ class Handbrake < Package

  no_lto

+  def self.prebuild
+    ConvenienceFunctions.libtoolize('freetype')
+    ConvenienceFunctions.libtoolize('fribidi')
+    ConvenienceFunctions.libtoolize('harfbuzz')
+    ConvenienceFunctions.libtoolize('libpng')
+    ConvenienceFunctions.libtoolize('libuuid', 'util_linux')
+    ConvenienceFunctions.libtoolize('libxml2')
+  end
+
  def self.build
    # Need to temporarily create a symlink for libfribidi.la or the build fails
    # with a libtool error.
--- a/packages/harfbuzz.rb
+++ b/packages/harfbuzz.rb
@@ -7,7 +7,7 @@ Package.load_package("#{__dir__}/freetype.rb")
 class Harfbuzz < Meson
  description 'HarfBuzz is an OpenType text shaping engine.'
  homepage 'https://harfbuzz.github.io/'
-  version '9.0.0-icu75.1'
+  version '10.0.1-icu75.1'
  license 'Old-MIT, ISC and icu'
  compatibility 'x86_64 aarch64 armv7l'
  source_url 'https://github.com/harfbuzz/harfbuzz.git'
@@ -15,9 +15,9 @@ class Harfbuzz < Meson
  binary_compression 'tar.zst'

  binary_sha256({
-    aarch64: '83327f98fd8a245db7f98354a30937a39a8013ff65b7adc5aed2102ae1288e0b',
-     armv7l: '83327f98fd8a245db7f98354a30937a39a8013ff65b7adc5aed2102ae1288e0b',
-     x86_64: '76385118024b7c22e6e30caf5ed6369e2ed45566030f56d46beb334ba5764fa7'
+    aarch64: '46b5c610b6fbe6682cba6d1ef7f003478c1bc938e6d08f844e0df00157c19c8a',
+     armv7l: '46b5c610b6fbe6682cba6d1ef7f003478c1bc938e6d08f844e0df00157c19c8a',
+     x86_64: '41d90e25a0f0374383ba8dc3d0a74db8eb54bf95bf64c92d984be283640caecb'
  })

  depends_on 'brotli' # R
@@ -73,7 +73,7 @@ class Harfbuzz < Meson
      [wrap-git]
      directory = freetype-#{Freetype.version}
      url=https://gitlab.freedesktop.org/freetype/freetype.git
-      revision=VER-#{Freetype.version.tr('.', '-')}
+      revision=#{Freetype.git_hashtag}
      depth=1

      [provide]
@@ -240,63 +240,5 @@ class Harfbuzz < Meson
    FileUtils.rm Dir["#{CREW_DEST_LIB_PREFIX}/libpng*"]
    FileUtils.rm Dir["#{CREW_DEST_PREFIX}/include/libpng16/png*"]
    FileUtils.rm Dir["#{CREW_DEST_LIB_PREFIX}/pkgconfig/libpng*"]
-    # Create libtool file. Needed by handbrake build
-    return if File.file?("#{CREW_DEST_LIB_PREFIX}/#{@libname}.la")
-
-    @libname = name.to_s.start_with?('lib') ? name.downcase : "lib#{name.downcase}"
-    @libnames = Dir["#{CREW_DEST_LIB_PREFIX}/#{@libname}.so*"]
-    @libnames = Dir["#{CREW_DEST_LIB_PREFIX}/#{@libname}-*.so*"] if @libnames.empty?
-    @libnames.each do |s|
-      s.gsub!("#{CREW_DEST_LIB_PREFIX}/", '')
-    end
-    @dlname = @libnames.grep(/.so./).first
-    @libname = @dlname.gsub(/.so.\d+/, '')
-    @longest_libname = @libnames.max_by(&:length)
-    @libvars = @longest_libname.rpartition('.so.')[2].split('.')
-
-    @libtool_file = <<~LIBTOOLEOF
-      # #{@libname}.la - a libtool library file
-      # Generated by libtool (GNU libtool) (Created by Chromebrew)
-      #
-      # Please DO NOT delete this file!
-      # It is necessary for linking the library.
-
-      # The name that we can dlopen(3).
-      dlname='#{@dlname}'
-
-      # Names of this library.
-      library_names='#{@libnames.reverse.join(' ')}'
-
-      # The name of the static archive.
-      old_library='#{@libname}.a'
-
-      # Linker flags that cannot go in dependency_libs.
-      inherited_linker_flags=''
-
-      # Libraries that this one depends upon.
-      dependency_libs=''
-
-      # Names of additional weak libraries provided by this library
-      weak_library_names=''
-
-      # Version information for #{name}.
-      current=#{@libvars[0]}
-      age=#{@libvars[1]}
-      revision=#{@libvars[2]}
-
-      # Is this an already installed library?
-      installed=yes
-
-      # Should we warn about portability when linking against -modules?
-      shouldnotlink=no
-
-      # Files to dlopen/dlpreopen
-      dlopen=''
-      dlpreopen=''
-
-      # Directory that this library needs to be installed in:
-      libdir='#{CREW_LIB_PREFIX}'
-    LIBTOOLEOF
-    File.write("#{CREW_DEST_LIB_PREFIX}/#{@libname}.la", @libtool_file)
  end
 end
--- a/packages/pango.rb
+++ b/packages/pango.rb
@@ -4,17 +4,17 @@ 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.54.0'
+  version '1.54.0-1'
  license 'LGPL-2+ and FTL'
  compatibility 'x86_64 aarch64 armv7l'
  source_url 'https://gitlab.gnome.org/GNOME/pango.git'
-  git_hashtag version
+  git_hashtag version.split('-').first
  binary_compression 'tar.zst'

  binary_sha256({
-    aarch64: '68a5ce094545ce32662aede32d4f1c26222cc3ca66fdab7ce87f31dc9c721668',
-     armv7l: '68a5ce094545ce32662aede32d4f1c26222cc3ca66fdab7ce87f31dc9c721668',
-     x86_64: 'd30719f19fd95d01568bccd201408c27b6dc121fdb1d46bc5d58cb61beec7703'
+    aarch64: 'ca92c2d3cca59634ff7d09b80bb656c22137e981800ba06c5f781c7d6653dff8',
+     armv7l: 'ca92c2d3cca59634ff7d09b80bb656c22137e981800ba06c5f781c7d6653dff8',
+     x86_64: '5ef2193fac50ebf85e6b7fb46b38b3e8bd89ad47fe04039901ff290551ed9be8'
  })

  depends_on 'cairo' # R
--- a/packages/pangomm_2_48.rb
+++ b/packages/pangomm_2_48.rb
@@ -3,7 +3,7 @@ require 'buildsystems/meson'
 class Pangomm_2_48 < Meson
  description 'pangomm is the official C++ interface for the Pango font layout library.'
  homepage 'https://developer.gnome.org/pangomm/stable/'
-  version '2.52.0'
+  version '2.54.0'
  license 'LGPL-2.1+'
  compatibility 'x86_64 aarch64 armv7l'
  source_url 'https://gitlab.gnome.org/GNOME/pangomm.git'
@@ -11,9 +11,9 @@ class Pangomm_2_48 < Meson
  binary_compression 'tar.zst'

  binary_sha256({
-    aarch64: '4e1335db7e751445a22f73360025a1b1209a97f84624b82337bb47576b4d5cbd',
-     armv7l: '4e1335db7e751445a22f73360025a1b1209a97f84624b82337bb47576b4d5cbd',
-     x86_64: '7e13562938b068a914ad41b14a10f037b2b1053030b381b6b5901d829fb6f019'
+    aarch64: 'b3ff2f55f43473c0aec6d1db73851891f5571118bb18b498fbaa397c6d161f22',
+     armv7l: 'b3ff2f55f43473c0aec6d1db73851891f5571118bb18b498fbaa397c6d161f22',
+     x86_64: '83d5f2ee8c710d70044a96199c835e76815c97112413e81ab24fa331bc4a49ec'
  })

  depends_on 'cairomm_1_16' # R
--- a/packages/qt5_base.rb
+++ b/packages/qt5_base.rb
@@ -6,7 +6,7 @@ class Qt5_base < Package
  version 'kde-5.15.14-9f9a56d-icu75.1'
  license 'GPL-2'
  compatibility 'x86_64 aarch64 armv7l'
-  min_glibc '2.37'
+  # min_glibc '2.37'
  source_url 'https://invent.kde.org/qt/qt/qtbase.git'
  git_hashtag '9f9a56d750caff8b4459e7e9bf82f1f4d725f72f'
  binary_compression 'tar.zst'