From 3ee2cc1c7e95e4b32402fc5e979337bcda99aae5 Mon Sep 17 00:00:00 2001 From: "chromebrew-actions[bot]" <220035932+chromebrew-actions[bot]@users.noreply.github.com> Date: Sun, 1 Feb 2026 12:04:33 -0600 Subject: [PATCH] =?UTF-8?q?gtk4:=204.20.2=20=E2=86=92=204.20.3=20(#14439)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add unbuilt gtk4 to updater-gtk4-4.20.3 * Add 32-bit patch and Generate PR changes from #14438 Signed-off-by: Satadru Pramanik * updater-gtk4-4.20.3: Package File Update Run on linux/amd64 container. * updater-gtk4-4.20.3: Package File Update Run on linux/arm/v7 container. * Adjust patch conditions. Signed-off-by: Satadru Pramanik --------- Signed-off-by: Satadru Pramanik Co-authored-by: satmandu Co-authored-by: Satadru Pramanik Co-authored-by: chromebrew-actions[bot] --- .github/workflows/Generate-PR.yml | 10 +++++++--- manifest/armv7l/g/gtk4.filelist | 4 ++-- manifest/x86_64/g/gtk4.filelist | 4 ++-- packages/gtk4.rb | 17 +++++++++++++---- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/.github/workflows/Generate-PR.yml b/.github/workflows/Generate-PR.yml index 0ae7ddaae8..f9018d3b51 100644 --- a/.github/workflows/Generate-PR.yml +++ b/.github/workflows/Generate-PR.yml @@ -1,5 +1,5 @@ --- -# Version 1.2 +# Version 1.3 name: Generate PR run-name: Generate PR for ${{ inputs.branch || github.ref_name }} by @${{ github.actor }} on: @@ -539,14 +539,18 @@ jobs: echo -e "##\n### Run the following to get this pull request's changes locally for testing.\n\`\`\`bash" >> /tmp/pr.txt echo -e "CREW_REPO=https://github.com/${{ github.repository }}.git CREW_BRANCH=${{ inputs.branch || github.ref_name }} crew update \\" >> /tmp/pr.txt echo -e "&& yes | crew upgrade\n\`\`\`" >> /tmp/pr.txt - [[ -n "${PKG_DELTA[*]}" ]] && PKG_DELTAS="— $(join_by , "${PKG_DELTA[@]}")" + [[ -n "${PKG_DELTA[*]}" ]] && PKG_DELTAS="$(join_by , "${PKG_DELTA[@]}")" echo "PKG_DELTAS: $PKG_DELTAS" cat /tmp/pr.txt PR_NUMBER=$(gh pr list -L 1 -s open -H ${{ inputs.branch || github.ref_name }} | cut -f1) PR_TITLE_INPUT="${{ inputs.pr_title }}" if [[ -z ${PR_TITLE_INPUT} ]]; then PR_TITLE="$(git log --oneline master..${{ inputs.branch || github.ref_name }} | grep -v "Merge branch 'master'\|Build Run on\|Package File Update Run on" | tail -n 1 | cut -c 11-)" - TITLE="$(echo "${PR_TITLE}" | sed -e "s/^'//" -e "s/'$//") ${PKG_DELTAS}" + if [[ -z ${PKG_DELTAS} ]]; then + TITLE="$(echo "${PR_TITLE}" | sed -e "s/^'//" -e "s/'$//")" + else + TITLE="$(echo "${PR_TITLE}" | sed -e "s/^'//" -e "s/'$//") — ${PKG_DELTAS}" + fi else if [[ "${PR_TITLE_INPUT}" == *"${{ inputs.branch || github.ref_name }}"* ]]; then PR_TITLE="${PKG_DELTAS}" diff --git a/manifest/armv7l/g/gtk4.filelist b/manifest/armv7l/g/gtk4.filelist index fcc332b862..e64f3b8031 100644 --- a/manifest/armv7l/g/gtk4.filelist +++ b/manifest/armv7l/g/gtk4.filelist @@ -1,4 +1,4 @@ -# Total size: 48562317 +# Total size: 48587600 /usr/local/.config/gtk-4.0/settings.ini /usr/local/bin/gtk4-broadwayd /usr/local/bin/gtk4-builder-tool @@ -417,7 +417,7 @@ /usr/local/lib/girepository-1.0/Gtk-4.0.typelib /usr/local/lib/libgtk-4.so /usr/local/lib/libgtk-4.so.1 -/usr/local/lib/libgtk-4.so.1.2000.2 +/usr/local/lib/libgtk-4.so.1.2000.3 /usr/local/lib/pkgconfig/gtk4-atspi.pc /usr/local/lib/pkgconfig/gtk4-broadway.pc /usr/local/lib/pkgconfig/gtk4-unix-print.pc diff --git a/manifest/x86_64/g/gtk4.filelist b/manifest/x86_64/g/gtk4.filelist index 2bad259e1e..f149a6ad2b 100644 --- a/manifest/x86_64/g/gtk4.filelist +++ b/manifest/x86_64/g/gtk4.filelist @@ -1,4 +1,4 @@ -# Total size: 54283113 +# Total size: 54231416 /usr/local/.config/gtk-4.0/settings.ini /usr/local/bin/gtk4-broadwayd /usr/local/bin/gtk4-builder-tool @@ -417,7 +417,7 @@ /usr/local/lib64/girepository-1.0/Gtk-4.0.typelib /usr/local/lib64/libgtk-4.so /usr/local/lib64/libgtk-4.so.1 -/usr/local/lib64/libgtk-4.so.1.2000.2 +/usr/local/lib64/libgtk-4.so.1.2000.3 /usr/local/lib64/pkgconfig/gtk4-atspi.pc /usr/local/lib64/pkgconfig/gtk4-broadway.pc /usr/local/lib64/pkgconfig/gtk4-unix-print.pc diff --git a/packages/gtk4.rb b/packages/gtk4.rb index 88c0309a84..77f574dbdc 100644 --- a/packages/gtk4.rb +++ b/packages/gtk4.rb @@ -3,7 +3,7 @@ require 'buildsystems/meson' class Gtk4 < Meson description 'GTK+ is a multi-platform toolkit for creating graphical user interfaces.' homepage 'https://www.gtk.org/' - version '4.20.2' + version '4.20.3' license 'LGPL-2.1' compatibility 'aarch64 armv7l x86_64' source_url 'https://gitlab.gnome.org/GNOME/gtk.git' @@ -11,9 +11,9 @@ class Gtk4 < Meson binary_compression 'tar.zst' binary_sha256({ - aarch64: 'b3627c8720cdf41e459964f44a477a90dd24e64518cd2190a98c6c4b6d2ff04c', - armv7l: 'b3627c8720cdf41e459964f44a477a90dd24e64518cd2190a98c6c4b6d2ff04c', - x86_64: '93152f070abd5e2402c6e04ccad186f79d2596e07ed8b459803decd238a444f4' + aarch64: '0ce35946d1961f8c88e5282131c684d2ba5796adaffab2d44277b4550e8f12a2', + armv7l: '0ce35946d1961f8c88e5282131c684d2ba5796adaffab2d44277b4550e8f12a2', + x86_64: 'f0df0579473887cc0f967ffa2f5485f76cf992f70010d9f0eb1cb1d36cc4958f' }) # depends_on 'gnome_icon_theme' # L @@ -80,6 +80,15 @@ class Gtk4 < Meson FileUtils.rm_rf "subprojects/#{dep}" FileUtils.rm_rf "subprojects/#{dep}.wrap" end + + patches = [ + # These fix the 32-bit build. + ['https://gitlab.gnome.org/GNOME/gtk/-/commit/1f9e80c8c0e7440f6d2256fbf8ead29c44a83b90.patch', + '130071ac28e4fca222915a232b754dafcaf2a6b937634ab7da1383dbc3f10429'], + ['https://gitlab.gnome.org/GNOME/gtk/-/commit/af9440dea029d225adcfc1f9024a1122e9abb006.patch', + '6ff8f4264ec92ffc2922c0c7c3b9bd52293d62aa553aec27146dcda9a64b072f'] + ] + ConvenienceFunctions.patch(patches) if ARCH != 'x86_64' && version == '4.20.3' end meson_options '-Dbroadway-backend=true \