Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging 
/ Packages / gtk3


Commits:
59376591 by Jan Alexander Steffens (heftig) at 2025-02-14T00:06:08+01:00
1:3.24.48-2: Backport a crash fix

- - - - -


3 changed files:

- .SRCINFO
- 0001-Allow-disabling-legacy-Tracker-search.patch
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = gtk3
        pkgdesc = GObject-based multi-platform GUI toolkit
        pkgver = 3.24.48
-       pkgrel = 1
+       pkgrel = 2
        epoch = 1
        url = https://www.gtk.org/
        arch = x86_64
@@ -54,7 +54,7 @@ pkgbase = gtk3
        source = 0001-Allow-disabling-legacy-Tracker-search.patch
        b2sums = 
f91f3973b5e411ddbd045a6bc395c57d0299a41bdf19dfba48509112d6c10a3fbc53e98eb7cf74743af67af7c8ee67a6a111d07ba3131629e061b1d850711e60
        b2sums = 
8e6a3906126749c6d853f582e3802254cdbba099c6af7190ad576eff6ea5425404a72b1b36950a87e3afdac82295cfe246003172c3e0341a73bd931a36f3b407
-       b2sums = 
ae371c52f24d00153037622de12a7e0026223c50fcb4b83e88138e2fd8b69a27422dfc91dae3a83c24705c57370bc9d75de4228210041c10c55482443478e240
+       b2sums = 
6469a46fe8d1964d764c116afe7ed876ece45919e1a7b830e7aa6e68f60c73a27c23962c434f97169da3e73ce7aa06aab6d814a25071ecbf921f13111202a8b6
 
 pkgname = gtk3
        install = gtk3.install


=====================================
0001-Allow-disabling-legacy-Tracker-search.patch
=====================================
@@ -74,7 +74,7 @@ index ea866d8231c2..03677b120f60 100644
    gtk_unix_sources += 'gtksearchenginetracker3.c'
  endif
 diff --git a/meson.build b/meson.build
-index 67b24e5e7d5f..103405038bcb 100644
+index 819ff0d80838..ae717e66df2c 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -466,6 +466,11 @@ if require_harfbuzz and not harfbuzz_dep.found()


=====================================
PKGBUILD
=====================================
@@ -8,7 +8,7 @@ pkgname=(
   gtk3-docs
 )
 pkgver=3.24.48
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="GObject-based multi-platform GUI toolkit"
 url="https://www.gtk.org/";
@@ -68,15 +68,14 @@ source=(
 )
 
b2sums=('f91f3973b5e411ddbd045a6bc395c57d0299a41bdf19dfba48509112d6c10a3fbc53e98eb7cf74743af67af7c8ee67a6a111d07ba3131629e061b1d850711e60'
         
'8e6a3906126749c6d853f582e3802254cdbba099c6af7190ad576eff6ea5425404a72b1b36950a87e3afdac82295cfe246003172c3e0341a73bd931a36f3b407'
-        
'ae371c52f24d00153037622de12a7e0026223c50fcb4b83e88138e2fd8b69a27422dfc91dae3a83c24705c57370bc9d75de4228210041c10c55482443478e240')
+        
'6469a46fe8d1964d764c116afe7ed876ece45919e1a7b830e7aa6e68f60c73a27c23962c434f97169da3e73ce7aa06aab6d814a25071ecbf921f13111202a8b6')
 
 prepare() {
   cd gtk
 
-  # Try to fix monitor geometry on sway
-  # https://gitlab.archlinux.org/archlinux/packaging/packages/gtk3/-/issues/8
-  # https://gitlab.gnome.org/GNOME/gtk/-/issues/6939
-  git cherry-pick -n 1cf0520454f8f55256b7f6cdfeefa8360a5842c7
+  # Crash fix
+  # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/8199
+  git cherry-pick -n 32381771b1cfa55770036e525a6c53c70be6c920
 
   # Don't try to use the old Tracker
   git apply -3 ../0001-Allow-disabling-legacy-Tracker-search.patch



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/gtk3/-/commit/59376591d5d9fb6ee82b266cc5daa994ee6f239c

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/gtk3/-/commit/59376591d5d9fb6ee82b266cc5daa994ee6f239c
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to