From 512d9fbf2b8178c5062f23f4848387d22f86fad0 Mon Sep 17 00:00:00 2001 From: "Satadru Pramanik, DO, MPH, MEng" Date: Fri, 15 Aug 2025 03:00:18 -0400 Subject: [PATCH] Updater zenity 4.0.5 WIP branch * Add unbuilt zenity to updater-zenity-4.0.5 * Adjust zenity deps. Signed-off-by: Satadru Pramanik * Update webkit dep Signed-off-by: Satadru Pramanik * Update anitya set. Signed-off-by: Satadru Pramanik * Let version.rb handle more version strings in source_url Signed-off-by: Satadru Pramanik * Adjust webkit build options. Signed-off-by: Satadru Pramanik * Adjust webkit build options. Signed-off-by: Satadru Pramanik * Adjust webkit build options. Signed-off-by: Satadru Pramanik * Adjust webkit build options. Signed-off-by: Satadru Pramanik * Adjust webkit build options. Signed-off-by: Satadru Pramanik * Adjust webkit build options. Signed-off-by: Satadru Pramanik --------- Signed-off-by: Satadru Pramanik Co-authored-by: satmandu --- lib/const.rb | 4 ++-- packages/webkitgtk_6.rb | 9 +++++---- packages/zenity.rb | 4 ++-- tools/version.rb | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/lib/const.rb b/lib/const.rb index 8bcafaaa8..24c1e41c3 100644 --- a/lib/const.rb +++ b/lib/const.rb @@ -4,7 +4,7 @@ require 'etc' require 'open3' OLD_CREW_VERSION ||= defined?(CREW_VERSION) ? CREW_VERSION : '1.0' -CREW_VERSION ||= '1.64.5' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION +CREW_VERSION ||= '1.64.6' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION # Kernel architecture. KERN_ARCH ||= Etc.uname[:machine] @@ -191,6 +191,7 @@ unless defined?(CREW_ANITYA_PACKAGE_NAME_MAPPINGS) { pkg_name: 'cvs', anitya_pkg: 'cvs-stable', comments: '' }, { pkg_name: 'py3_atspi', anitya_pkg: 'pyatspi', comments: '' }, { pkg_name: 'signal_desktop', anitya_pkg: 'signal', comments: '' }, + { pkg_name: 'webkitgtk_6', anitya_pkg: 'webkitgtk~stable', comments: '' }, { pkg_name: 'xauth', anitya_pkg: 'xorg-x11-xauth', comments: '' } ].to_h { |h| [h[:pkg_name], h[:anitya_pkg]] } end @@ -327,7 +328,6 @@ CREW_CMAKE_OPTIONS ||= <<~OPT.chomp -DCMAKE_C_FLAGS='#{CREW_COMMON_FLAGS.gsub(/-fuse-ld=.{2,4}\s/, '')}' \ -DCMAKE_CXX_FLAGS='#{CREW_COMMON_FLAGS.gsub(/-fuse-ld=.{2,4}\s/, '')}' \ -DCMAKE_EXE_LINKER_FLAGS='#{CREW_LINKER_FLAGS}' \ - -DCMAKE_LINKER_TYPE=MOLD \ -DCMAKE_SHARED_LINKER_FLAGS='#{CREW_LINKER_FLAGS}' \ -DCMAKE_MODULE_LINKER_FLAGS='#{CREW_LINKER_FLAGS}' \ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=TRUE \ diff --git a/packages/webkitgtk_6.rb b/packages/webkitgtk_6.rb index eaa07e35f..538aa1f64 100644 --- a/packages/webkitgtk_6.rb +++ b/packages/webkitgtk_6.rb @@ -3,10 +3,9 @@ require 'package' class Webkitgtk_6 < Package description 'Web content engine for GTK' homepage 'https://webkitgtk.org' - version "2.44.2-#{CREW_ICU_VER}" + version "2.48.5-#{CREW_ICU_VER}" license 'LGPL-2+ and BSD-2' compatibility 'aarch64 armv7l x86_64' - min_glibc '2.37' source_url "https://webkitgtk.org/releases/webkitgtk-#{version.split('-').first}.tar.xz" source_sha256 '523f42c8ff24832add17631f6eaafe8f9303afe316ef1a7e1844b952a7f7521b' binary_compression 'tar.zst' @@ -24,7 +23,7 @@ class Webkitgtk_6 < Package depends_on 'enchant' # R depends_on 'fontconfig' depends_on 'freetype' # R - depends_on 'gcc10' => :build + # depends_on 'gcc10' => :build depends_on 'gcc_lib' # R depends_on 'gdk_pixbuf' # R depends_on 'glibc' # R @@ -121,7 +120,7 @@ class Webkitgtk_6 < Package # @arch_flags = '-mtune=cortex-a15 -mfloat-abi=hard -mfpu=neon -mtls-dialect=gnu -marm -mlibarch=armv8-a+crc+simd -march=armv8-a+crc+simd' @arch_flags = '-mfloat-abi=hard -mtls-dialect=gnu -mthumb -mfpu=vfpv3-d16 -mlibarch=armv7-a+fp -march=armv7-a+fp' end - @gcc_ver = '-10' + @gcc_ver = '-15' @new_gcc = <<~NEW_GCCEOF #!/bin/bash gcc#{@gcc_ver} #{@arch_flags} $@ @@ -154,7 +153,9 @@ class Webkitgtk_6 < Package -DENABLE_JOURNALD_LOG=OFF \ -DENABLE_GAMEPAD=OFF \ -DENABLE_MINIBROWSER=ON \ + -DENABLE_SPEECH_SYNTHESIS=OFF \ -DUSE_SYSTEM_MALLOC=ON \ + -D USE_SYSTEM_SYSPROF_CAPTURE=NO \ -DPORT=GTK \ -DUSE_GTK4=ON \ -DUSE_JPEGXL=ON \ diff --git a/packages/zenity.rb b/packages/zenity.rb index 18bd40611..846e3e849 100644 --- a/packages/zenity.rb +++ b/packages/zenity.rb @@ -3,7 +3,7 @@ require 'buildsystems/meson' class Zenity < Meson description 'A tool that allows you to display GTK dialog boxes in commandline and shell scripts.' homepage 'https://wiki.gnome.org/Projects/Zenity' - version '4.0.1' + version '4.0.5' license 'GPL-2' compatibility 'aarch64 armv7l x86_64' source_url 'https://gitlab.gnome.org/GNOME/zenity.git' @@ -23,7 +23,7 @@ class Zenity < Meson depends_on 'gtk4' # R depends_on 'libadwaita' # R depends_on 'pango' # R - depends_on 'webkit2gtk' => :build + depends_on 'webkitgtk_6' => :build gnome end diff --git a/tools/version.rb b/tools/version.rb index 480ac9ab8..069c1ef00 100755 --- a/tools/version.rb +++ b/tools/version.rb @@ -1,5 +1,5 @@ #!/usr/bin/env ruby -# version.rb version 1.9.1 (for Chromebrew) +# version.rb version 2.0 (for Chromebrew) OPTIONS = %w[-h --help -j --json -u --update-package-files -v --verbose] @@ -209,7 +209,7 @@ if filelist.length.positive? # If a source_url exists check if # that line has 'version' in it. elsif !@pkg.source_url.nil? - if `grep source_url #{filename} | grep '\#{version}'`.empty? + if `grep source_url #{filename} | grep '\#{version'`.empty? 'static source_url' else 'Yes'