From 325986f7dc04067760952fb8bcc57a3a29052370 Mon Sep 17 00:00:00 2001 From: "Satadru Pramanik, DO, MPH, MEng" Date: Tue, 7 Mar 2023 12:17:17 -0500 Subject: [PATCH] Updates to *mm* packages and deps (#8045) * update mm_common * update glibmm_2_4 * cleanup deps * Update glibmm_2_68 and atkmm * harfbuzz => 7.1.0 * update graphite * update libxft, pango packages * update cairo * update cairomm_1_0 * update cairomm_1_16 * update libxft * Update packages * fix pango deps * add pango binaries * add binary * rejigger deps * fix version * adjust deps * add freetype binaries * fix fontconfig package * lint * add fontconfig binaries * add pango binaries * update pangomm binaries --- packages/atkmm.rb | 37 ++++++++++++++--------------- packages/cairo.rb | 50 +++++++++++++++++++-------------------- packages/cairomm_1_0.rb | 38 ++++++++++++++++-------------- packages/cairomm_1_16.rb | 38 ++++++++++++++++-------------- packages/fontconfig.rb | 51 +++++++++++++++++++++++----------------- packages/freetype.rb | 28 ++++++++++++---------- packages/glibmm_2_4.rb | 34 +++++++++++++-------------- packages/glibmm_2_68.rb | 34 +++++++++++++-------------- packages/graphite.rb | 33 +++++++++++++------------- packages/harfbuzz.rb | 32 ++++++++++++++++--------- packages/libxft.rb | 30 +++++++++++------------ packages/mm_common.rb | 26 ++++++++++---------- packages/pango.rb | 51 ++++++++++++++++++++-------------------- packages/pangomm_1_4.rb | 40 +++++++++++++++++-------------- packages/pangomm_2_48.rb | 40 +++++++++++++++++-------------- 15 files changed, 295 insertions(+), 267 deletions(-) diff --git a/packages/atkmm.rb b/packages/atkmm.rb index beaf07cf2..e53477277 100644 --- a/packages/atkmm.rb +++ b/packages/atkmm.rb @@ -3,44 +3,43 @@ require 'package' class Atkmm < Package description 'Atkmm is the official C++ interface for the ATK accessibility toolkit library.' homepage 'https://www.gtkmm.org/' - version '2.28.3' + version '2.36.2' license 'LGPL-2.1+' compatibility 'all' - source_url 'https://ftp.gnome.org/pub/gnome/sources/atkmm/2.28/atkmm-2.28.3.tar.xz' - source_sha256 '7c2088b486a909be8da2b18304e56c5f90884d1343c8da7367ea5cd3258b9969' + source_url 'https://gitlab.gnome.org/GNOME/atkmm.git' + git_hashtag version binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/atkmm/2.28.3_armv7l/atkmm-2.28.3-chromeos-armv7l.tar.zst', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/atkmm/2.28.3_armv7l/atkmm-2.28.3-chromeos-armv7l.tar.zst', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/atkmm/2.28.3_i686/atkmm-2.28.3-chromeos-i686.tar.zst', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/atkmm/2.28.3_x86_64/atkmm-2.28.3-chromeos-x86_64.tar.zst' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/atkmm/2.36.2_armv7l/atkmm-2.36.2-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/atkmm/2.36.2_armv7l/atkmm-2.36.2-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/atkmm/2.36.2_i686/atkmm-2.36.2-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/atkmm/2.36.2_x86_64/atkmm-2.36.2-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: 'bdf1a9c594244ba93b4ea98b38064cc67bfc6364d8edddf5135aaf53891fcc48', - armv7l: 'bdf1a9c594244ba93b4ea98b38064cc67bfc6364d8edddf5135aaf53891fcc48', - i686: '411689a402104d3b0e91cc7edb4781ffa247fb2ec361bae6ab97d3c39398ff6e', - x86_64: '86017c202ce153168975d2bac00d6777961dc9af26ded6d058e8a70537400a8e' + aarch64: '049d1efb8c411ac36328983605a54d54e3bc45587aa3ac9157f4b629be75f720', + armv7l: '049d1efb8c411ac36328983605a54d54e3bc45587aa3ac9157f4b629be75f720', + i686: '4ceaac05ebc9ae13009b10103249356131e260b7ce8ed3a3e57ad91f73f174e2', + x86_64: 'ffe420ab3a9f104326cdb232bf5326767b07e4b5ecbc9af73909e53692b5c685' }) - depends_on 'at_spi2_core' - depends_on 'glibmm' + depends_on 'at_spi2_core' # R depends_on 'gcc' # R - depends_on 'glib' # R depends_on 'glibc' # R - depends_on 'glibmm_2_4' # R - depends_on 'libsigcplusplus' # R + depends_on 'glibmm_2_68' # R + depends_on 'glib' # R + depends_on 'libsigcplusplus3' # R + gnome def self.build system "meson setup #{CREW_MESON_OPTIONS} \ - --default-library=both \ -Dbuild-documentation=false \ builddir" system 'meson configure builddir' - system 'ninja -C builddir' + system "#{CREW_NINJA} -C builddir" end def self.install - system "DESTDIR=#{CREW_DEST_DIR} ninja -C builddir install" + system "DESTDIR=#{CREW_DEST_DIR} #{CREW_NINJA} -C builddir install" end end diff --git a/packages/cairo.rb b/packages/cairo.rb index c533feaf9..418bb1ba4 100644 --- a/packages/cairo.rb +++ b/packages/cairo.rb @@ -3,51 +3,51 @@ require 'package' class Cairo < Package description 'Cairo is a 2D graphics library with support for multiple output devices.' homepage 'https://www.cairographics.org' - version '1.17.6' + version '1.17.8-af5a25a' license 'LGPL-2.1 or MPL-1.1' compatibility 'all' source_url 'https://gitlab.freedesktop.org/cairo/cairo.git' - git_hashtag version + git_hashtag 'af5a25a7f19e8fe6242c50f17bd246f98b6fdf87' binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairo/1.17.6_armv7l/cairo-1.17.6-chromeos-armv7l.tar.zst', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairo/1.17.6_armv7l/cairo-1.17.6-chromeos-armv7l.tar.zst', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairo/1.17.6_i686/cairo-1.17.6-chromeos-i686.tar.zst', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairo/1.17.6_x86_64/cairo-1.17.6-chromeos-x86_64.tar.zst' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairo/1.17.8-af5a25a_armv7l/cairo-1.17.8-af5a25a-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairo/1.17.8-af5a25a_armv7l/cairo-1.17.8-af5a25a-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairo/1.17.8-af5a25a_i686/cairo-1.17.8-af5a25a-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairo/1.17.8-af5a25a_x86_64/cairo-1.17.8-af5a25a-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: '198bf86fac13ac40cd02b4775bd74cd62bf95c47f4f7e83ac13fe3cf60ad52c4', - armv7l: '198bf86fac13ac40cd02b4775bd74cd62bf95c47f4f7e83ac13fe3cf60ad52c4', - i686: '12e9a7fe07745cbcb83d4297888517594b1b96fee4af0711ba903fb6186231f4', - x86_64: '8d3e0763cc7cd309846fb54f15a3003b6a01efa6fcc5843005e1d6b8137371dd' + aarch64: '9e8b8dc46bc173ca21a45b5f0c500c96e1cfcadd1985548568adecb25ff96ec0', + armv7l: '9e8b8dc46bc173ca21a45b5f0c500c96e1cfcadd1985548568adecb25ff96ec0', + i686: 'e5e7549bbedbb0dd1f49488f253deb11b504147e39adf99733ce5c664d237022', + x86_64: 'ded85aef72c1c263d094b18a95201cd9e933c39b880e6ff41782c14090b8a9be' }) - depends_on 'fontconfig' - depends_on 'freetype' - depends_on 'glib' - depends_on 'harfbuzz' - depends_on 'libx11' - depends_on 'libxcb' - depends_on 'libxrender' - depends_on 'lzo' - depends_on 'mesa' - depends_on 'pixman' + depends_on 'gcc' # R + depends_on 'glib' # R + depends_on 'glibc' # R + depends_on 'harfbuzz' # R + depends_on 'libpng' # R + depends_on 'libx11' # R + depends_on 'libxcb' # R + depends_on 'libxrender' # R + depends_on 'lzo' # R + depends_on 'mesa' => :build + depends_on 'pixman' # R + depends_on 'zlibpkg' # R + conflicts_ok # because this overwrites the limited cairo from harfbuzz def self.build system "meson setup #{CREW_MESON_OPTIONS} \ - --default-library=both \ - -Dgl-backend=auto \ - -Dglesv3=enabled \ -Dxlib-xcb=enabled \ -Dtee=enabled \ -Dtests=disabled \ builddir" system 'meson configure builddir' - system 'ninja -C builddir' + system "#{CREW_NINJA} -C builddir" end def self.install - system "DESTDIR=#{CREW_DEST_DIR} ninja -C builddir install" + system "DESTDIR=#{CREW_DEST_DIR} #{CREW_NINJA} -C builddir install" end end diff --git a/packages/cairomm_1_0.rb b/packages/cairomm_1_0.rb index 2bfb5fc2e..abbe164cb 100644 --- a/packages/cairomm_1_0.rb +++ b/packages/cairomm_1_0.rb @@ -3,43 +3,45 @@ require 'package' class Cairomm_1_0 < Package description 'The Cairomm package provides a C++ interface to Cairo.' homepage 'https://www.cairographics.org/' - @_ver = '1.14.2' + @_ver = '1.14.4' version @_ver license 'LGPL-2+' compatibility 'all' - source_url "https://www.cairographics.org/releases/cairomm-#{@_ver}.tar.xz" - source_sha256 '0126b9cc295dc36bc9c0860d5b720cb5469fd78d5620c8f10cc5f0c07b928de3' + source_url 'https://gitlab.freedesktop.org/cairo/cairomm.git' + git_hashtag version binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairomm_1_0/1.14.2_armv7l/cairomm_1_0-1.14.2-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairomm_1_0/1.14.2_armv7l/cairomm_1_0-1.14.2-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairomm_1_0/1.14.2_i686/cairomm_1_0-1.14.2-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairomm_1_0/1.14.2_x86_64/cairomm_1_0-1.14.2-chromeos-x86_64.tar.xz' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairomm_1_0/1.14.4_armv7l/cairomm_1_0-1.14.4-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairomm_1_0/1.14.4_armv7l/cairomm_1_0-1.14.4-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairomm_1_0/1.14.4_i686/cairomm_1_0-1.14.4-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairomm_1_0/1.14.4_x86_64/cairomm_1_0-1.14.4-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: '43377afdfd60e5d6de950d883d7053c5f21dc2fe7b87b99d60b51de2c16e480d', - armv7l: '43377afdfd60e5d6de950d883d7053c5f21dc2fe7b87b99d60b51de2c16e480d', - i686: 'b66a27aae76d273e8d365d764efafb4a01703d087dde1f63401b3feff0257ad0', - x86_64: '3ec47e52333e93b341c65d1af2d58bb51c6d60a9b4023b20b2b8c04fd5a42b5e' + aarch64: '476734904312bcf2ab5f68b6e01c21d9cec2ce8a193bb72460a5ff4b6963d2f6', + armv7l: '476734904312bcf2ab5f68b6e01c21d9cec2ce8a193bb72460a5ff4b6963d2f6', + i686: '012bc214aeabf2221851723ffff25cbe9d3cb325cb44d954e4ce5e63f961458a', + x86_64: '55cce265874cfb769db0f0c7583d6aaef29eb4919431c10d8db4adaacf94b289' }) - depends_on 'cairo' - depends_on 'libsigcplusplus3' - depends_on 'libxxf86vm' - depends_on 'libxrender' + depends_on 'cairo' # R + depends_on 'gcc' # R + depends_on 'glibc' # R + depends_on 'harfbuzz' # R + depends_on 'libsigcplusplus' # R + depends_on 'libxrender' => :build + depends_on 'libxxf86vm' => :build def self.build system "meson setup #{CREW_MESON_OPTIONS} \ - --default-library=both \ -Dbuild-documentation=false \ -Dbuild-examples=false \ -Dbuild-tests=false \ builddir" system 'meson configure builddir' - system 'ninja -C builddir' + system "#{CREW_NINJA} -C builddir" end def self.install - system "DESTDIR=#{CREW_DEST_DIR} ninja -C builddir install" + system "DESTDIR=#{CREW_DEST_DIR} #{CREW_NINJA} -C builddir install" end end diff --git a/packages/cairomm_1_16.rb b/packages/cairomm_1_16.rb index 78d7b4ec0..576e6d668 100644 --- a/packages/cairomm_1_16.rb +++ b/packages/cairomm_1_16.rb @@ -3,43 +3,45 @@ require 'package' class Cairomm_1_16 < Package description 'The Cairomm package provides a C++ interface to Cairo.' homepage 'https://www.cairographics.org/' - @_ver = '1.16.0' + @_ver = '1.16.2' version @_ver license 'LGPL-2+' compatibility 'all' - source_url "https://www.cairographics.org/releases/cairomm-#{@_ver}.tar.xz" - source_sha256 '7e881492c5f9f546688c31160deb742c166fc4c68b6b8eb9920c00a0f0f144f9' + source_url 'https://gitlab.freedesktop.org/cairo/cairomm.git' + git_hashtag version binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairomm_1_16/1.16.0_armv7l/cairomm_1_16-1.16.0-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairomm_1_16/1.16.0_armv7l/cairomm_1_16-1.16.0-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairomm_1_16/1.16.0_i686/cairomm_1_16-1.16.0-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairomm_1_16/1.16.0_x86_64/cairomm_1_16-1.16.0-chromeos-x86_64.tar.xz' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairomm_1_16/1.16.2_armv7l/cairomm_1_16-1.16.2-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairomm_1_16/1.16.2_armv7l/cairomm_1_16-1.16.2-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairomm_1_16/1.16.2_i686/cairomm_1_16-1.16.2-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairomm_1_16/1.16.2_x86_64/cairomm_1_16-1.16.2-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: '59ca0664657952e1296639082e8352e26ad1b9792208b4a2b713c64178f73e77', - armv7l: '59ca0664657952e1296639082e8352e26ad1b9792208b4a2b713c64178f73e77', - i686: 'e874a3fc54b12a36625063808ac69fe76dbd77eed044f300cf51170359f4bd4a', - x86_64: '69ad2d194716615b38b13eb321bd019c61cceb1124c787a990524d792d1eac6d' + aarch64: 'f762614a3a14af45a249fb9c218864f90fc5f17c76e162b1ebac72a3f50ff8d6', + armv7l: 'f762614a3a14af45a249fb9c218864f90fc5f17c76e162b1ebac72a3f50ff8d6', + i686: '69c11234edaa48db3e9f916a66566eea806f451c48d787174a015c9d905607d3', + x86_64: '98b889a6b0e94f60e931471faead51a176f1efd88bf17221c04ac1a13b2f195e' }) - depends_on 'cairo' - depends_on 'libsigcplusplus3' - depends_on 'libxxf86vm' - depends_on 'libxrender' + depends_on 'cairo' # R + depends_on 'gcc' # R + depends_on 'glibc' # R + depends_on 'harfbuzz' # R + depends_on 'libsigcplusplus3' # R + depends_on 'libxrender' => :build + depends_on 'libxxf86vm' => :build def self.build system "meson setup #{CREW_MESON_OPTIONS} \ - --default-library=both \ -Dbuild-documentation=false \ -Dbuild-examples=false \ -Dbuild-tests=false \ builddir" system 'meson configure builddir' - system 'ninja -C builddir' + system "#{CREW_NINJA} -C builddir" end def self.install - system "DESTDIR=#{CREW_DEST_DIR} ninja -C builddir install" + system "DESTDIR=#{CREW_DEST_DIR} #{CREW_NINJA} -C builddir install" end end diff --git a/packages/fontconfig.rb b/packages/fontconfig.rb index 952d30675..cd1121969 100644 --- a/packages/fontconfig.rb +++ b/packages/fontconfig.rb @@ -1,44 +1,53 @@ require 'package' +# build order: harfbuzz => freetype => fontconfig => pango class Fontconfig < Package description 'Fontconfig is a library for configuring and customizing font access.' homepage 'https://www.freedesktop.org/wiki/Software/fontconfig/' - version '2.14.0' + version '2.14.2' license 'MIT' compatibility 'all' - source_url 'https://gitlab.freedesktop.org/fontconfig/fontconfig/-/archive/2.14.0/fontconfig-2.14.0.tar.bz2' - source_sha256 'e89a0c6868771b88de27bd20cd98f1056a3083666a1cf7c85d26ac5c67cc25a8' + source_url 'https://gitlab.freedesktop.org/fontconfig/fontconfig.git' + git_hashtag version binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/fontconfig/2.14.0_armv7l/fontconfig-2.14.0-chromeos-armv7l.tar.zst', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/fontconfig/2.14.0_armv7l/fontconfig-2.14.0-chromeos-armv7l.tar.zst', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/fontconfig/2.14.0_i686/fontconfig-2.14.0-chromeos-i686.tar.zst', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/fontconfig/2.14.0_x86_64/fontconfig-2.14.0-chromeos-x86_64.tar.zst' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/fontconfig/2.14.2_armv7l/fontconfig-2.14.2-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/fontconfig/2.14.2_armv7l/fontconfig-2.14.2-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/fontconfig/2.14.2_i686/fontconfig-2.14.2-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/fontconfig/2.14.2_x86_64/fontconfig-2.14.2-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: '99c5724f5a53e7ba476b4fb5dfbec97632608fc28afb39a26f0ea394b6b8ca86', - armv7l: '99c5724f5a53e7ba476b4fb5dfbec97632608fc28afb39a26f0ea394b6b8ca86', - i686: 'fce56b685e312d9754c3376c6ff8ed83f7cc99154da5f6a913d2d76c9b8736c2', - x86_64: 'ea6e16d4505be56cbb9ed5a0b971e1df7f34c8ddd9e6c160cda62c8f30ca6af2' + aarch64: '8bf542223e21a4c683aa148fa2b98f0f66758676fb64b01f819239cf0c6de686', + armv7l: '8bf542223e21a4c683aa148fa2b98f0f66758676fb64b01f819239cf0c6de686', + i686: '93a0f764c5352cf888849d4212519c06338b65cdc7099f2a01b9bdc28ee022e7', + x86_64: '24a0a1cd2cc53c56bb7256e410592ac9b6398eecf02effc6c3944554dc840c77' }) - depends_on 'expat' - depends_on 'jsonc' - depends_on 'gperf' - depends_on 'freetype' - depends_on 'libpng' - depends_on 'util_linux' - depends_on 'graphite' + depends_on 'expat' # R + depends_on 'jsonc' => :build + depends_on 'gperf' => :build + depends_on 'freetype' # R + depends_on 'libpng' => :build + depends_on 'util_linux' => :build + depends_on 'graphite' => :build + depends_on 'glibc' # R + depends_on 'harfbuzz' # R no_fhs + conflicts_ok # allowed to overwrite harfbuzz def self.build - system "./autogen.sh #{CREW_OPTIONS} --localstatedir=#{CREW_PREFIX}/cache" - system 'make' + system "meson setup #{CREW_MESON_OPTIONS} \ + --wrap-mode=default \ + -Dlocalstatedir=#{CREW_PREFIX}/cache \ + -Dtests=disabled \ + builddir" + system 'meson configure builddir' + system "mold -run #{CREW_NINJA} -C builddir" end def self.install - system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install' + system "DESTDIR=#{CREW_DEST_DIR} #{CREW_NINJA} -C builddir install" # The following are included the libpng package. FileUtils.rm Dir["#{CREW_DEST_LIB_PREFIX}/libpng*"] FileUtils.rm Dir["#{CREW_DEST_PREFIX}/include/libpng16/png*"] diff --git a/packages/freetype.rb b/packages/freetype.rb index cfd0c6058..0b80a76ec 100644 --- a/packages/freetype.rb +++ b/packages/freetype.rb @@ -1,25 +1,27 @@ require 'package' +# build order: harfbuzz => freetype => fontconfig => pango class Freetype < Package description 'FreeType is a freely available software library to render fonts.' homepage 'https://www.freetype.org/' - version '2.13.0' # Update freetype in harfbuzz when updating freetype + @_ver = '2.13.0' # Update freetype in harfbuzz when updating freetype + version "#{@_ver}-1" # Update freetype in harfbuzz when updating freetype license 'FTL or GPL-2+' compatibility 'all' source_url 'https://gitlab.freedesktop.org/freetype/freetype.git' - git_hashtag "VER-#{version.tr('.', '-')}" + git_hashtag "VER-#{@_ver.tr('.', '-')}" binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype/2.13.0_armv7l/freetype-2.13.0-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype/2.13.0_armv7l/freetype-2.13.0-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype/2.13.0_i686/freetype-2.13.0-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype/2.13.0_x86_64/freetype-2.13.0-chromeos-x86_64.tar.xz' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype/2.13.0-1_armv7l/freetype-2.13.0-1-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype/2.13.0-1_armv7l/freetype-2.13.0-1-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype/2.13.0-1_i686/freetype-2.13.0-1-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype/2.13.0-1_x86_64/freetype-2.13.0-1-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: '5ac0c1ae298b159f60e169e647b3830569a7059d36f18d947cc80dc999acb917', - armv7l: '5ac0c1ae298b159f60e169e647b3830569a7059d36f18d947cc80dc999acb917', - i686: '71b1668a81a50c9b570affac0b7ea6f86b856c9b4798b3b0990d65977b43e80b', - x86_64: '0d6b3a3e3ef42571543fee805e3a65b796c1e1aa4f0ace8f595fc10a835a71a3' + aarch64: '5dfea8476173a297a87f2c697a661fe79395b7d65179fbd5079c456a22052571', + armv7l: '5dfea8476173a297a87f2c697a661fe79395b7d65179fbd5079c456a22052571', + i686: '08ec3e9ef14be4aff807b56b6ad416a42107009c048256a89a630a64b9876a6a', + x86_64: 'a67976b71b703e33708410238d4c987ed7a37d4033f12515dfea01ecdb2fcb0b' }) depends_on 'brotli' @@ -29,7 +31,7 @@ class Freetype < Package depends_on 'glib' depends_on 'graphite' depends_on 'harfbuzz' - depends_on 'librsvg' + # depends_on 'librsvg' depends_on 'pcre' depends_on 'zlibpkg' depends_on 'glibc' # R @@ -40,7 +42,7 @@ class Freetype < Package no_env_options # This overwrites the freetype in harfbuzz, which have # epicircular dependencies on each other. - conflicts_ok + conflicts_ok # allowed to overwrite harfbuzz def self.build system "meson setup #{CREW_MESON_OPTIONS} \ @@ -68,7 +70,7 @@ class Freetype < Package @libtool_file = <<~LIBTOOLEOF # #{@libname}.la - a libtool library file - # Generated by libtool (GNU libtool) (hacked up by Chromebrew) + # Generated by libtool (GNU libtool) (Created by Chromebrew) # # Please DO NOT delete this file! # It is necessary for linking the library. diff --git a/packages/glibmm_2_4.rb b/packages/glibmm_2_4.rb index 02449e982..361650c56 100644 --- a/packages/glibmm_2_4.rb +++ b/packages/glibmm_2_4.rb @@ -3,42 +3,42 @@ require 'package' class Glibmm_2_4 < Package description 'C++ bindings for GLib' homepage 'https://www.gtkmm.org' - @_ver = '2.66.0' - @_ver_prelastdot = @_ver.rpartition('.')[0] + @_ver = '2.66.5' version @_ver license 'LGPL-2.1+' compatibility 'all' - source_url "https://ftp.gnome.org/pub/GNOME/sources/glibmm/#{@_ver_prelastdot}/glibmm-#{@_ver}.tar.xz" - source_sha256 '9e1db7d43d2e2d4dfa2771354e21a69a6beec7c446b711619cf8c779e13a581e' + source_url 'https://gitlab.gnome.org/GNOME/glibmm.git' + git_hashtag version binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/glibmm_2_4/2.66.0_armv7l/glibmm_2_4-2.66.0-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/glibmm_2_4/2.66.0_armv7l/glibmm_2_4-2.66.0-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/glibmm_2_4/2.66.0_i686/glibmm_2_4-2.66.0-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/glibmm_2_4/2.66.0_x86_64/glibmm_2_4-2.66.0-chromeos-x86_64.tar.xz' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/glibmm_2_4/2.66.5_armv7l/glibmm_2_4-2.66.5-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/glibmm_2_4/2.66.5_armv7l/glibmm_2_4-2.66.5-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/glibmm_2_4/2.66.5_i686/glibmm_2_4-2.66.5-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/glibmm_2_4/2.66.5_x86_64/glibmm_2_4-2.66.5-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: 'c6c0459c412f133ac1d581a4db4a8d4c6ae69227755f191822d59272502d0455', - armv7l: 'c6c0459c412f133ac1d581a4db4a8d4c6ae69227755f191822d59272502d0455', - i686: '8a3dade9644c0be55d3fb3ddf21f470466562020e5313e3f97557e2243db42fe', - x86_64: 'cd9b610bceadc050a09099d80815cfe4c092cb5cb8b67d0bc73c5d71e2f5f63c' + aarch64: '3e34ada67361ef49fa5ef6849d86864834f24637492360412645a4f556f8b3d0', + armv7l: '3e34ada67361ef49fa5ef6849d86864834f24637492360412645a4f556f8b3d0', + i686: 'f272fb88a74508d78f0dfad36a3d39e870962ded2ecc404e3c85175efe6fef62', + x86_64: 'b259f25b53e787d82690c55235c0180c264e7fcdf50d2e2be9aaf0cabf4f9bf5' }) + depends_on 'gcc' # R + depends_on 'glibc' # R + depends_on 'glib' # R depends_on 'libsigcplusplus' + depends_on 'libsigcplusplus' # R depends_on 'mm_common' => :build def self.build system "meson setup #{CREW_MESON_OPTIONS} \ - --default-library=both \ -Dbuild-documentation=false \ - -Dbuild-demos=false \ - -Dbuild-tests=false \ builddir" system 'meson configure builddir' - system 'ninja -C builddir' + system "#{CREW_NINJA} -C builddir" end def self.install - system "DESTDIR=#{CREW_DEST_DIR} ninja -C builddir install" + system "DESTDIR=#{CREW_DEST_DIR} #{CREW_NINJA} -C builddir install" end end diff --git a/packages/glibmm_2_68.rb b/packages/glibmm_2_68.rb index b65520cd4..dc2c0c3ea 100644 --- a/packages/glibmm_2_68.rb +++ b/packages/glibmm_2_68.rb @@ -3,43 +3,41 @@ require 'package' class Glibmm_2_68 < Package description 'C++ bindings for GLib api version 2.68' homepage 'https://www.gtkmm.org' - @_ver = '2.74.0' - @_ver_prelastdot = @_ver.rpartition('.')[0] + @_ver = '2.75.0' version @_ver license 'LGPL-2.1+' compatibility 'all' - source_url "https://ftp.gnome.org/pub/GNOME/sources/glibmm/#{@_ver_prelastdot}/glibmm-#{@_ver}.tar.xz" - source_sha256 '2b472696cbac79db8e405724118ec945219c5b9b18af63dc8cfb7f1d89b0f1fa' + source_url 'https://gitlab.gnome.org/GNOME/glibmm.git' + git_hashtag version binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/glibmm_2_68/2.74.0_armv7l/glibmm_2_68-2.74.0-chromeos-armv7l.tar.zst', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/glibmm_2_68/2.74.0_armv7l/glibmm_2_68-2.74.0-chromeos-armv7l.tar.zst', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/glibmm_2_68/2.74.0_i686/glibmm_2_68-2.74.0-chromeos-i686.tar.zst', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/glibmm_2_68/2.74.0_x86_64/glibmm_2_68-2.74.0-chromeos-x86_64.tar.zst' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/glibmm_2_68/2.75.0_armv7l/glibmm_2_68-2.75.0-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/glibmm_2_68/2.75.0_armv7l/glibmm_2_68-2.75.0-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/glibmm_2_68/2.75.0_i686/glibmm_2_68-2.75.0-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/glibmm_2_68/2.75.0_x86_64/glibmm_2_68-2.75.0-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: 'b464088efb05c2cb1b403c1b60f4c17fb6bac1e522430175c0469d5cfc2f71a7', - armv7l: 'b464088efb05c2cb1b403c1b60f4c17fb6bac1e522430175c0469d5cfc2f71a7', - i686: '80f5820530d743a99b18df63652e797bcb85c4215e9b8a9e39074d6b63765530', - x86_64: 'b9583ce77a34e5fa1138f47d25761eea9a06068d31caf6f8652f3d035f93b5ab' + aarch64: '6e6dea95b0de055316df3584217217ac6e71f1433f5fd94ce686a556e1f7cdcd', + armv7l: '6e6dea95b0de055316df3584217217ac6e71f1433f5fd94ce686a556e1f7cdcd', + i686: '2d8765e47873841ff2dd2dfa5b23dc8a7add20624978698223416e1e3e368860', + x86_64: 'a50f35cdfec10d52ce52c8054310aca215bb2089da825245992672a1a12dec66' }) - depends_on 'libsigcplusplus3' - depends_on 'mm_common' => :build depends_on 'gcc' # R - depends_on 'glib' # R depends_on 'glibc' # R + depends_on 'glib' # R + depends_on 'libsigcplusplus3' # R + depends_on 'mm_common' => :build def self.build system "meson setup #{CREW_MESON_OPTIONS} \ - --default-library=both \ -Dbuild-documentation=false \ builddir" system 'meson configure builddir' - system 'ninja -C builddir' + system "#{CREW_NINJA} -C builddir" end def self.install - system "DESTDIR=#{CREW_DEST_DIR} ninja -C builddir install" + system "DESTDIR=#{CREW_DEST_DIR} #{CREW_NINJA} -C builddir install" end end diff --git a/packages/graphite.rb b/packages/graphite.rb index 41f069b42..47a33126c 100644 --- a/packages/graphite.rb +++ b/packages/graphite.rb @@ -3,40 +3,39 @@ require 'package' class Graphite < Package description 'Reimplementation of the SIL Graphite text processing engine' homepage 'https://github.com/silnrsi/graphite' - version '425da3d' + version '2757274' license 'LGPL-2.1' compatibility 'all' source_url 'https://github.com/silnrsi/graphite.git' - git_hashtag '425da3d08926b9cf321fc0014dfa979c24d2cf64' + git_hashtag '27572742003b93dc53dc02c01c237b72c6c25f54' binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/graphite/425da3d_armv7l/graphite-425da3d-chromeos-armv7l.tar.zst', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/graphite/425da3d_armv7l/graphite-425da3d-chromeos-armv7l.tar.zst', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/graphite/425da3d_i686/graphite-425da3d-chromeos-i686.tar.zst', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/graphite/425da3d_x86_64/graphite-425da3d-chromeos-x86_64.tar.zst' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/graphite/2757274_armv7l/graphite-2757274-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/graphite/2757274_armv7l/graphite-2757274-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/graphite/2757274_i686/graphite-2757274-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/graphite/2757274_x86_64/graphite-2757274-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: '94516aa9980b775d1134a8d1ccdfc22cc1cfe205214da799d725ddbb23994968', - armv7l: '94516aa9980b775d1134a8d1ccdfc22cc1cfe205214da799d725ddbb23994968', - i686: '085fdc5fd0b57b89d924bee3db23499cdb2804351e4da10830f6b99fe8dd5ba8', - x86_64: '7731c7c3bfc32f76f80294621cc1b37cb1270828bc1f80c0226f44e9f28abce7' + aarch64: 'db258e3b6e5c9809d0d2f95bcbda19fd8bb989667f722282e5284745cc3a20e4', + armv7l: 'db258e3b6e5c9809d0d2f95bcbda19fd8bb989667f722282e5284745cc3a20e4', + i686: '7245cfaa6b1d4dbfd0b495b0a78a4b0969002d67e118184e887a2347328c12c4', + x86_64: 'f3e5350af96d7c6785b06f260bbc66a96568118739ae737cd98d91e9cfcc49ca' }) + depends_on 'gcc' # R + depends_on 'glibc' # R + def self.patch # remove font tools dependent tests system "sed -i '/cmptest/d' tests/CMakeLists.txt" end def self.build - Dir.mkdir 'build' - Dir.chdir 'build' do - system "cmake #{CREW_CMAKE_LIBSUFFIX_OPTIONS} .." - end + system "cmake -B builddir #{CREW_CMAKE_LIBSUFFIX_OPTIONS} -G Ninja" + system "#{CREW_NINJA} -C builddir" end def self.install - Dir.chdir 'build' do - system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install' - end + system "DESTDIR=#{CREW_DEST_DIR} #{CREW_NINJA} -C builddir install" end end diff --git a/packages/harfbuzz.rb b/packages/harfbuzz.rb index 4f2f53451..6edfb9ed7 100644 --- a/packages/harfbuzz.rb +++ b/packages/harfbuzz.rb @@ -1,9 +1,10 @@ require 'package' +# build order: harfbuzz => freetype => fontconfig => pango class Harfbuzz < Package description 'HarfBuzz is an OpenType text shaping engine.' homepage 'https://www.freedesktop.org/wiki/Software/HarfBuzz/' - @_ver = '7.0.0' + @_ver = '7.1.0' version @_ver license 'Old-MIT, ISC and icu' compatibility 'all' @@ -11,16 +12,16 @@ class Harfbuzz < Package git_hashtag @_ver binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/harfbuzz/7.0.0_armv7l/harfbuzz-7.0.0-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/harfbuzz/7.0.0_armv7l/harfbuzz-7.0.0-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/harfbuzz/7.0.0_i686/harfbuzz-7.0.0-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/harfbuzz/7.0.0_x86_64/harfbuzz-7.0.0-chromeos-x86_64.tar.xz' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/harfbuzz/7.1.0_armv7l/harfbuzz-7.1.0-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/harfbuzz/7.1.0_armv7l/harfbuzz-7.1.0-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/harfbuzz/7.1.0_i686/harfbuzz-7.1.0-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/harfbuzz/7.1.0_x86_64/harfbuzz-7.1.0-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: '342f5333c03ee22b9a171d4e4d998b8b68deafd5db27dfdd0ad0c17ea8ece173', - armv7l: '342f5333c03ee22b9a171d4e4d998b8b68deafd5db27dfdd0ad0c17ea8ece173', - i686: 'a96129c9bb8a4b1a74bb5d06515f90825cde267615901d8bffc61d7a9ace962d', - x86_64: 'ee2537c312edb6427d21ac09065478650eab4da979054ffcc756e4caa6629085' + aarch64: '4f7a52a90c3ba072e520ce35d1f3ae98d5673394703ef2af3bc11ecc59be653e', + armv7l: '4f7a52a90c3ba072e520ce35d1f3ae98d5673394703ef2af3bc11ecc59be653e', + i686: '51ff026b275866174cf2e3b3b86f5351c542ae6bd62763124eba9ea69d8f8471', + x86_64: '6403cc02542560d51c9e64ab8ab502774a8324f59f8e936956dc3425565c67b5' }) depends_on 'brotli' # R @@ -51,7 +52,16 @@ class Harfbuzz < Package no_env_options conflicts_ok + 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 + end + def self.build + system 'update-ca-certificates --fresh' system "meson setup #{CREW_MESON_OPTIONS} \ --wrap-mode=default \ --default-library=both \ @@ -65,11 +75,11 @@ class Harfbuzz < Package -Dtests=disabled \ builddir" system 'meson configure builddir' - system 'mold -run ninja -C builddir' + system "mold -run #{CREW_NINJA} -C builddir" end def self.install - system "DESTDIR=#{CREW_DEST_DIR} ninja install -C builddir" + system "DESTDIR=#{CREW_DEST_DIR} #{CREW_NINJA} -C builddir install" # The following are included the libpng package. FileUtils.rm Dir["#{CREW_DEST_LIB_PREFIX}/libpng*"] FileUtils.rm Dir["#{CREW_DEST_PREFIX}/include/libpng16/png*"] diff --git a/packages/libxft.rb b/packages/libxft.rb index b04e5e5d5..8951a17a4 100644 --- a/packages/libxft.rb +++ b/packages/libxft.rb @@ -3,32 +3,30 @@ require 'package' class Libxft < Package description 'X.org X FreeType interface library' homepage 'https://www.x.org' - version '2.3.6' + version '2.3.7' license 'MIT' compatibility 'all' - source_url 'https://www.x.org/archive/individual/lib/libXft-2.3.6.tar.xz' - source_sha256 '60a6e7319fc938bbb8d098c9bcc86031cc2327b5d086d3335fc5c76323c03022' + source_url 'https://www.x.org/archive/individual/lib/libXft-2.3.7.tar.xz' + source_sha256 '79f0b37c45007381c371a790c2754644ad955166dbf2a48e3625032e9bdd4f71' binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libxft/2.3.6_armv7l/libxft-2.3.6-chromeos-armv7l.tar.zst', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libxft/2.3.6_armv7l/libxft-2.3.6-chromeos-armv7l.tar.zst', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libxft/2.3.6_i686/libxft-2.3.6-chromeos-i686.tar.zst', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libxft/2.3.6_x86_64/libxft-2.3.6-chromeos-x86_64.tar.zst' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libxft/2.3.7_armv7l/libxft-2.3.7-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libxft/2.3.7_armv7l/libxft-2.3.7-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libxft/2.3.7_i686/libxft-2.3.7-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libxft/2.3.7_x86_64/libxft-2.3.7-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: '1b3530350b911564546426102b9e98649f8368ee24e84349211e6de8934eb7f9', - armv7l: '1b3530350b911564546426102b9e98649f8368ee24e84349211e6de8934eb7f9', - i686: '122cf78151a5e1d00ea1dd3a8194818bbcb8faa8d9a223da0d33f62334a5b7fe', - x86_64: 'bafef43f2fc7087875145273472f333873cfdd6324bbdf286c603ebf76de0768' + aarch64: '2114f2123bd6fc24fc4f5d9b16441f0ce70aab9bf752ceb2aff99a79ce576334', + armv7l: '2114f2123bd6fc24fc4f5d9b16441f0ce70aab9bf752ceb2aff99a79ce576334', + i686: 'b2530407ab23604e809570ffdef1d0269e8481039a5672946bb49c4f72f79c94', + x86_64: 'bac8b590570dd2b635e90f0b0b383237bf9df45e7c836bad733ff4023b903a4b' }) - depends_on 'libxrender' - depends_on 'libx11' - depends_on 'fontconfig' - depends_on 'util_macros' - depends_on 'freetype' # R depends_on 'glibc' # R depends_on 'harfbuzz' # R + depends_on 'libx11' # R + depends_on 'libxrender' # R + depends_on 'util_macros' => :build def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' diff --git a/packages/mm_common.rb b/packages/mm_common.rb index 5a6aef8c3..5ccfb3f1e 100644 --- a/packages/mm_common.rb +++ b/packages/mm_common.rb @@ -3,24 +3,24 @@ require 'package' class Mm_common < Package description 'Common build files of the C++ bindings' homepage 'http://www.gtkmm.org/' - @_ver = '1.0.4' + @_ver = '1.0.5' version @_ver license 'GPL-2' compatibility 'all' - source_url "https://github.com/GNOME/mm-common/archive/#{@_ver}.tar.gz" - source_sha256 'a4120f37145805dd45695bc8b33c9c466eea6f91bdc5a8a5197276ae7d9f42e0' + source_url 'https://gitlab.gnome.org/GNOME/mm-common.git' + git_hashtag version binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mm_common/1.0.4_armv7l/mm_common-1.0.4-chromeos-armv7l.tar.zst', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mm_common/1.0.4_armv7l/mm_common-1.0.4-chromeos-armv7l.tar.zst', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mm_common/1.0.4_i686/mm_common-1.0.4-chromeos-i686.tar.zst', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mm_common/1.0.4_x86_64/mm_common-1.0.4-chromeos-x86_64.tar.zst' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mm_common/1.0.5_armv7l/mm_common-1.0.5-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mm_common/1.0.5_armv7l/mm_common-1.0.5-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mm_common/1.0.5_i686/mm_common-1.0.5-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mm_common/1.0.5_x86_64/mm_common-1.0.5-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: '9d932933fd7d8c705d4917baaf64e16a6204da03c7b99b2a927ce867b3486c5d', - armv7l: '9d932933fd7d8c705d4917baaf64e16a6204da03c7b99b2a927ce867b3486c5d', - i686: 'ba1b1dfcc78d3a51af070ac6fc47453ed6c89276becf9e41e1defd551bbcb9c6', - x86_64: '7b3e6e1f8ea7df0ead6b3320a69bd6e7c9999d0542bb83b33cd58fcdcf044cdb' + aarch64: 'a110f805f19bc44dbd355baed6cbb85291bfaafd6dd7a0e2e42c6abde4aa8d0e', + armv7l: 'a110f805f19bc44dbd355baed6cbb85291bfaafd6dd7a0e2e42c6abde4aa8d0e', + i686: '5d10a96b65a810fd6d3fb8d686307b15bea5dc54e7e30d5f3983ad0225493ca6', + x86_64: '33eed58c4c387e25ee5d70a9b0c64525db105553918b03819a7ed27959c11553' }) def self.build @@ -28,10 +28,10 @@ class Mm_common < Package -Duse-network=true \ builddir" system 'meson configure builddir' - system 'ninja -C builddir' + system "#{CREW_NINJA} -C builddir" end def self.install - system "DESTDIR=#{CREW_DEST_DIR} ninja -C builddir install" + system "DESTDIR=#{CREW_DEST_DIR} #{CREW_NINJA} -C builddir install" end end diff --git a/packages/pango.rb b/packages/pango.rb index 35b587746..111e3a1c8 100644 --- a/packages/pango.rb +++ b/packages/pango.rb @@ -1,9 +1,10 @@ require 'package' +# build order: harfbuzz => freetype => fontconfig => pango. class Pango < Package description 'Pango is a library for laying out and rendering of text, with an emphasis on internationalization.' homepage 'https://pango.gnome.org/' - @_ver = '1.50.10' + @_ver = '1.50.14' version @_ver license 'LGPL-2+ and FTL' compatibility 'all' @@ -11,32 +12,32 @@ class Pango < Package git_hashtag @_ver binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pango/1.50.10_armv7l/pango-1.50.10-chromeos-armv7l.tar.zst', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pango/1.50.10_armv7l/pango-1.50.10-chromeos-armv7l.tar.zst', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pango/1.50.10_i686/pango-1.50.10-chromeos-i686.tar.zst', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pango/1.50.10_x86_64/pango-1.50.10-chromeos-x86_64.tar.zst' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pango/1.50.14_armv7l/pango-1.50.14-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pango/1.50.14_armv7l/pango-1.50.14-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pango/1.50.14_i686/pango-1.50.14-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pango/1.50.14_x86_64/pango-1.50.14-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: '53ef271e640894edfe28064d33001b940e2b696519f58b587bf7abe605a8b2f9', - armv7l: '53ef271e640894edfe28064d33001b940e2b696519f58b587bf7abe605a8b2f9', - i686: 'd84a0a3efe1f1aefb67d8a88f962db89475e3fc581952734920c2f1b3ecb0ed6', - x86_64: 'aea1ea8fdc7d53166a36e983bf092e0a41cb8b7a9133548bc88a964d5219f3bf' + aarch64: '1ce1cf1f0c7caf921d5d0781ae6758ee907e39d6f305653d761e0be63e152964', + armv7l: '1ce1cf1f0c7caf921d5d0781ae6758ee907e39d6f305653d761e0be63e152964', + i686: '488189887047f561ab1bd02065fab5781c3178ff6ea430bf07dad9db5c420b8a', + x86_64: 'c984d03b58e8bcfb5a35e44be3be61f37efb3ceef4554fe9dab4a7cf86cf6b43' }) - depends_on 'cairo' - depends_on 'fontconfig' - depends_on 'freetype' - depends_on 'fribidi' # Gets built inside install automatically. - depends_on 'glib' - depends_on 'gobject_introspection' # add this package to build gtk+, avoid compilation error - depends_on 'harfbuzz' - depends_on 'libx11' - depends_on 'libxdmcp' - depends_on 'libxft' - depends_on 'libxrender' - depends_on 'py3_six' - depends_on 'xorg_proto' => :build + depends_on 'cairo' => :build + depends_on 'fribidi' # R + depends_on 'glib' # R depends_on 'glibc' # R + depends_on 'gobject_introspection' => :build # add this package to build gtk+, avoid compilation error + depends_on 'fontconfig' # R + depends_on 'freetype' # R + depends_on 'harfbuzz' # R + depends_on 'libx11' # R + depends_on 'libxdmcp' => :build + depends_on 'libxft' # R + depends_on 'libxrender' # R + depends_on 'xorg_proto' => :build + depends_on 'cairo' # R def self.build system "meson setup #{CREW_MESON_OPTIONS} \ @@ -49,14 +50,14 @@ class Pango < Package # gtk-doc is set to false because I (@saltedcofii) am not # convinced anyone is reading them; it's accessable online anyway system 'meson configure builddir' - system 'mold -run samu -C builddir' + system "mold -run #{CREW_NINJA} -C builddir" end def self.install - system "DESTDIR=#{CREW_DEST_DIR} samu -C builddir install" + system "DESTDIR=#{CREW_DEST_DIR} #{CREW_NINJA} -C builddir install" end def self.check - system 'samu -C builddir test || true' + system "#{CREW_NINJA} -C builddir test || true" end end diff --git a/packages/pangomm_1_4.rb b/packages/pangomm_1_4.rb index 7a533ea72..73947209f 100644 --- a/packages/pangomm_1_4.rb +++ b/packages/pangomm_1_4.rb @@ -3,31 +3,35 @@ require 'package' class Pangomm_1_4 < Package description 'pangomm is the official C++ interface for the Pango font layout library.' homepage 'https://developer.gnome.org/pangomm/stable/' - @_ver = '2.46.0' + @_ver = '2.46.3' version @_ver license 'LGPL-2.1+' compatibility 'all' - source_url "https://gitlab.gnome.org/GNOME/pangomm/-/archive/#{@_ver}/pangomm-#{@_ver}.tar.bz2" - source_sha256 '9582d961e71d5134aeadc73de63baa27424f76ab6d04280d6b6c9177c4b653a9' + source_url 'https://gitlab.gnome.org/GNOME/pangomm.git' + git_hashtag version binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pangomm_1_4/2.46.0_armv7l/pangomm_1_4-2.46.0-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pangomm_1_4/2.46.0_armv7l/pangomm_1_4-2.46.0-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pangomm_1_4/2.46.0_i686/pangomm_1_4-2.46.0-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pangomm_1_4/2.46.0_x86_64/pangomm_1_4-2.46.0-chromeos-x86_64.tar.xz' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pangomm_1_4/2.46.3_armv7l/pangomm_1_4-2.46.3-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pangomm_1_4/2.46.3_armv7l/pangomm_1_4-2.46.3-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pangomm_1_4/2.46.3_i686/pangomm_1_4-2.46.3-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pangomm_1_4/2.46.3_x86_64/pangomm_1_4-2.46.3-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: '36bd8512279d1f7fe1e33d2a69ec7488404bedd879bd021485ffee036dbc376e', - armv7l: '36bd8512279d1f7fe1e33d2a69ec7488404bedd879bd021485ffee036dbc376e', - i686: '28c625ea2df998071dfd1bba523b01989b8e8d8c1dbbdb381d2ca4ac298cbdf9', - x86_64: 'c29af342514e22182c03946216f4faa04975bcff142c859ba9f5f5b19b8cfcf0' + aarch64: 'aebb5450624f733edb35c4397445b2992996f29820e9d13880ce348ad38d1498', + armv7l: 'aebb5450624f733edb35c4397445b2992996f29820e9d13880ce348ad38d1498', + i686: '525c1b73617d88faf5df331af60ba13c93ad4da7bce9bdb849017dd57dbc5f0b', + x86_64: 'bbad260e15756dcbb0f0faa65de5c95a3ab00ee8a41481d348db19cb842fe6ab' }) - depends_on 'glibmm' - depends_on 'cairomm' - depends_on 'pango' - depends_on 'graphite' - depends_on 'mm_common' + depends_on 'cairomm_1_0' # R + depends_on 'gcc' # R + depends_on 'glibc' # R + depends_on 'glibmm_2_4' # R + depends_on 'glib' # R + depends_on 'graphite' => :build + depends_on 'libsigcplusplus' # R + depends_on 'mm_common' => :build + depends_on 'pango' # R def self.build system "meson setup #{CREW_MESON_OPTIONS} \ @@ -35,10 +39,10 @@ class Pangomm_1_4 < Package -Dbuild-documentation=false \ builddir" system 'meson configure builddir' - system 'ninja -C builddir' + system "#{CREW_NINJA} -C builddir" end def self.install - system "DESTDIR=#{CREW_DEST_DIR} ninja -C builddir install" + system "DESTDIR=#{CREW_DEST_DIR} #{CREW_NINJA} -C builddir install" end end diff --git a/packages/pangomm_2_48.rb b/packages/pangomm_2_48.rb index 7e135a06c..9417b0ce2 100644 --- a/packages/pangomm_2_48.rb +++ b/packages/pangomm_2_48.rb @@ -3,31 +3,35 @@ require 'package' class Pangomm_2_48 < Package description 'pangomm is the official C++ interface for the Pango font layout library.' homepage 'https://developer.gnome.org/pangomm/stable/' - @_ver = '2.48.0' + @_ver = '2.50.1' version @_ver license 'LGPL-2.1+' compatibility 'all' - source_url "https://gitlab.gnome.org/GNOME/pangomm/-/archive/#{@_ver}/pangomm-#{@_ver}.tar.bz2" - source_sha256 '744ba9156ca642f6cbbe049f965c741319c9f71629b153b6888dbca239fa770b' + source_url 'https://gitlab.gnome.org/GNOME/pangomm.git' + git_hashtag version binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pangomm_2_48/2.48.0_armv7l/pangomm_2_48-2.48.0-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pangomm_2_48/2.48.0_armv7l/pangomm_2_48-2.48.0-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pangomm_2_48/2.48.0_i686/pangomm_2_48-2.48.0-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pangomm_2_48/2.48.0_x86_64/pangomm_2_48-2.48.0-chromeos-x86_64.tar.xz' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pangomm_2_48/2.50.1_armv7l/pangomm_2_48-2.50.1-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pangomm_2_48/2.50.1_armv7l/pangomm_2_48-2.50.1-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pangomm_2_48/2.50.1_i686/pangomm_2_48-2.50.1-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pangomm_2_48/2.50.1_x86_64/pangomm_2_48-2.50.1-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: '720f11d212bf078bbac66bf6751ebc24e5040fa2d7d5908a637b3d6c83a8d28d', - armv7l: '720f11d212bf078bbac66bf6751ebc24e5040fa2d7d5908a637b3d6c83a8d28d', - i686: '8aab1853da7476426c766f453535056e9d57c8bac1b9eb575bbb3b4f3ed37ceb', - x86_64: 'e6093416abe7406abfe366d07850591d2da70bc0c90591ce00b438b5f9598a32' + aarch64: '217a0cdd025020aefaa9c8a07366e72ac564d7d8fbdb3c45bfd4e29ae1c69204', + armv7l: '217a0cdd025020aefaa9c8a07366e72ac564d7d8fbdb3c45bfd4e29ae1c69204', + i686: '8a9b560961d6f11166fd47bfcefbecd11b0196f979e33433c321305dece1bb94', + x86_64: '385ac710ce7ae48615305920bdb3c1284211799f9db312aaba9805232c40c02a' }) - depends_on 'glibmm' - depends_on 'cairomm' - depends_on 'pango' - depends_on 'graphite' - depends_on 'mm_common' + depends_on 'cairomm_1_16' # R + depends_on 'gcc' # R + depends_on 'glibc' # R + depends_on 'glibmm_2_68' # R + depends_on 'glib' # R + depends_on 'graphite' => :build + depends_on 'libsigcplusplus3' # R + depends_on 'mm_common' => :build + depends_on 'pango' # R def self.build system "meson setup #{CREW_MESON_OPTIONS} \ @@ -35,10 +39,10 @@ class Pangomm_2_48 < Package -Dbuild-documentation=false \ builddir" system 'meson configure builddir' - system 'ninja -C builddir' + system "#{CREW_NINJA} -C builddir" end def self.install - system "DESTDIR=#{CREW_DEST_DIR} ninja -C builddir install" + system "DESTDIR=#{CREW_DEST_DIR} #{CREW_NINJA} -C builddir install" end end