3.24.42-1

3 files changed, 128 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 649a91f603af..3aa1cf7dc4be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,18 @@
 pkgbase = gtk3-patched-filechooser-icon-view
 	pkgdesc = GTK3 patched with dudemanguy's fork of wfr's filechooser-icon-view patch.
-	pkgver = 3.24.41
+	pkgver = 3.24.42
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/Dudemanguy/gtk
 	install = gtk3.install
 	arch = x86_64
-	license = LGPL-2.0-only
+	license = LGPL-2.1-or-later
+	makedepends = at-spi2-core
 	makedepends = git
 	makedepends = glib2-docs
 	makedepends = gobject-introspection
 	makedepends = gtk-doc
+	makedepends = hicolor-icon-theme
 	makedepends = meson
 	makedepends = sassc
 	makedepends = wayland-protocols
@@ -23,6 +25,7 @@ pkgbase = gtk3-patched-filechooser-icon-view
 	depends = fribidi
 	depends = gdk-pixbuf2
 	depends = glib2
+	depends = glibc
 	depends = harfbuzz
 	depends = gtk-update-icon-cache
 	depends = iso-codes
@@ -33,8 +36,8 @@ pkgbase = gtk3-patched-filechooser-icon-view
 	depends = libepoxy
 	depends = libgl
 	depends = librsvg
-	depends = libxcomposite
 	depends = libx11
+	depends = libxcomposite
 	depends = libxcursor
 	depends = libxdamage
 	depends = libxext
@@ -50,7 +53,7 @@ pkgbase = gtk3-patched-filechooser-icon-view
 	depends = wayland
 	optdepends = evince: Default print preview command
 	optdepends = glib2-patched-thumbnailer: Thumbnail generation in upload dialog
-	provides = gtk3=3.24.41
+	provides = gtk3=3.24.42
 	provides = gtk3-print-backends
 	provides = libgailutil-3.so
 	provides = libgdk-3.so
@@ -58,11 +61,13 @@ pkgbase = gtk3-patched-filechooser-icon-view
 	conflicts = gtk3
 	conflicts = gtk3-print-backends
 	replaces = gtk3-print-backends<=3.22.26-1
-	source = git+https://gitlab.gnome.org/GNOME/gtk.git#commit=77ebdd85091833a7869ece48c3114fa6d9966321
+	source = git+https://gitlab.gnome.org/GNOME/gtk.git#tag=3.24.42
 	source = gtk-query-immodules-3.0.hook
+	source = 0001-Allow-disabling-legacy-Tracker-search.patch
 	source = gtk3-filechooser-icon-view.patch
-	b2sums = SKIP
+	b2sums = 3f79244cfeac535186b84e6c9ad3dad7dbb5737e4ebd8762985fce95930a9bbb07fcc331fb915b7f6ab8496afd7995a5aa501377af01710ff2649e5adabcb249
 	b2sums = 8e6a3906126749c6d853f582e3802254cdbba099c6af7190ad576eff6ea5425404a72b1b36950a87e3afdac82295cfe246003172c3e0341a73bd931a36f3b407
+	b2sums = 7da1746e7702e4bf397f59dd1019e2c8fa8951b2bcc6bf64ec05f322de6dcec6fe5552848d6b389818f625988a3fb2211501d7f72ae97d2c49fbad1e5fe9cd6a
 	b2sums = a19fce8e87f2789d0bca3a62d2858d89e4db4a14cf76930228b01d94aefb8b58867df9c63a194fd3a2542382e3968bef2eda37e1a33847cbbe77838932d9f6c3
 
 pkgname = gtk3-patched-filechooser-icon-view
diff --git a/0001-Allow-disabling-legacy-Tracker-search.patch b/0001-Allow-disabling-legacy-Tracker-search.patch
new file mode 100644
index 000000000000..87b76223d348
--- /dev/null
+++ b/0001-Allow-disabling-legacy-Tracker-search.patch
@@ -0,0 +1,104 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Mon, 18 Mar 2024 02:14:24 +0100
+Subject: [PATCH] Allow disabling legacy Tracker search
+
+---
+ docs/reference/gtk/meson.build | 2 --
+ gtk/gtksearchengine.c          | 5 ++---
+ gtk/meson.build                | 5 ++++-
+ meson.build                    | 5 +++++
+ meson_options.txt              | 2 ++
+ 5 files changed, 13 insertions(+), 6 deletions(-)
+
+diff --git a/docs/reference/gtk/meson.build b/docs/reference/gtk/meson.build
+index 9fa282d38cb5..b2f977363a5a 100644
+--- a/docs/reference/gtk/meson.build
++++ b/docs/reference/gtk/meson.build
+@@ -129,7 +129,6 @@ private_headers = [
+   'gtksearchenginemodel.h',
+   'gtksearchenginequartz.h',
+   'gtksearchenginesimple.h',
+-  'gtksearchenginetracker.h',
+   'gtksearchentryprivate.h',
+   'gtkselectionprivate.h',
+   'gtksettingsprivate.h',
+@@ -208,7 +207,6 @@ private_headers = [
+   'gtkrecentchooserdefault.h',
+   'gtkrecentchooserutils.h',
+   'gtksearchengine.h',
+-  'gtksearchenginetracker.h',
+   'gtksearchenginesimple.h',
+   'gtksearchenginequartz.h',
+   'gtksequence.h',
+diff --git a/gtk/gtksearchengine.c b/gtk/gtksearchengine.c
+index 1910cc0ad337..dd4022c2cc4d 100644
+--- a/gtk/gtksearchengine.c
++++ b/gtk/gtksearchengine.c
+@@ -29,9 +29,8 @@
+ #if defined(HAVE_TRACKER3)
+ #include "gtksearchenginetracker3.h"
+ #endif
+-#if !defined G_OS_WIN32 /* No tracker on windows */
++#if defined(HAVE_TRACKER)
+ #include "gtksearchenginetracker.h"
+-#define HAVE_TRACKER 1
+ #endif
+ 
+ #include <gdk/gdk.h> /* for GDK_WINDOWING_QUARTZ */
+@@ -388,7 +387,7 @@ _gtk_search_engine_new (void)
+     }
+ #endif
+ 
+-#ifdef HAVE_TRACKER
++#if defined(HAVE_TRACKER)
+   if (!engine->priv->native)
+     {
+       engine->priv->native = _gtk_search_engine_tracker_new ();
+diff --git a/gtk/meson.build b/gtk/meson.build
+index ea866d8231c2..03677b120f60 100644
+--- a/gtk/meson.build
++++ b/gtk/meson.build
+@@ -652,9 +652,12 @@ gtk_unix_sources = files(
+   'gtkprintoperation-portal.c',
+   'gtkprintunixdialog.c',
+   'gtkprintbackend.c',
+-  'gtksearchenginetracker.c',
+ )
+ 
++if os_unix and tracker_enabled
++  gtk_unix_sources += 'gtksearchenginetracker.c'
++endif
++
+ if os_unix and tracker3_enabled
+   gtk_unix_sources += 'gtksearchenginetracker3.c'
+ endif
+diff --git a/meson.build b/meson.build
+index 24785bfe4dd8..1999f526d987 100644
+--- a/meson.build
++++ b/meson.build
+@@ -466,6 +466,11 @@ if require_harfbuzz and not harfbuzz_dep.found()
+                               fallback: ['harfbuzz', 'libharfbuzz_dep'])
+ endif
+ 
++tracker_enabled = get_option('tracker')
++if tracker_enabled
++  cdata.set('HAVE_TRACKER', true)
++endif
++
+ tracker3_enabled = get_option('tracker3')
+ if tracker3_enabled
+   tracker3_dep = dependency('tracker-sparql-3.0', required: false)
+diff --git a/meson_options.txt b/meson_options.txt
+index 94099aa01eb3..3b5485a88f74 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -17,6 +17,8 @@ option('cloudproviders', type: 'boolean', value: false,
+   description : 'Enable the cloudproviders support')
+ option('profiler', type: 'boolean', value: false,
+   description : 'Enable profiler support')
++option('tracker', type: 'boolean', value: true,
++  description : 'Enable Tracker filechooser search')
+ option('tracker3', type: 'boolean', value: false,
+   description : 'Enable Tracker3 filechooser search')
+ 
diff --git a/PKGBUILD b/PKGBUILD
index 93e9d1e1c106..5139a7676090 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3-patched-filechooser-icon-view
-pkgver=3.24.41
+pkgver=3.24.42
 pkgrel=1
 epoch=1
 pkgdesc="GTK3 patched with dudemanguy's fork of wfr's filechooser-icon-view patch."
@@ -20,6 +20,7 @@ depends=(
   fribidi
   gdk-pixbuf2
   glib2
+  glibc
   harfbuzz
   gtk-update-icon-cache
   iso-codes
@@ -30,8 +31,8 @@ depends=(
   libepoxy
   libgl
   librsvg
-  libxcomposite
   libx11
+  libxcomposite
   libxcursor
   libxdamage
   libxext
@@ -47,10 +48,12 @@ depends=(
   wayland
 )
 makedepends=(
+  at-spi2-core
   git
   glib2-docs
   gobject-introspection
   gtk-doc
+  hicolor-icon-theme
   meson
   sassc
   wayland-protocols
@@ -66,16 +69,17 @@ provides=(
 )
 conflicts=(gtk3 gtk3-print-backends)
 replaces=('gtk3-print-backends<=3.22.26-1')
-license=(LGPL-2.0-only)
+license=(LGPL-2.1-or-later)
 install=gtk3.install
-_commit=77ebdd85091833a7869ece48c3114fa6d9966321  # tags/3.24.41^0
 source=(
-  "git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
+  "git+https://gitlab.gnome.org/GNOME/gtk.git#tag=$pkgver"
   gtk-query-immodules-3.0.hook
+  0001-Allow-disabling-legacy-Tracker-search.patch
   gtk3-filechooser-icon-view.patch
 )
-b2sums=('SKIP'
+b2sums=('3f79244cfeac535186b84e6c9ad3dad7dbb5737e4ebd8762985fce95930a9bbb07fcc331fb915b7f6ab8496afd7995a5aa501377af01710ff2649e5adabcb249'
         '8e6a3906126749c6d853f582e3802254cdbba099c6af7190ad576eff6ea5425404a72b1b36950a87e3afdac82295cfe246003172c3e0341a73bd931a36f3b407'
+        '7da1746e7702e4bf397f59dd1019e2c8fa8951b2bcc6bf64ec05f322de6dcec6fe5552848d6b389818f625988a3fb2211501d7f72ae97d2c49fbad1e5fe9cd6a'
         'a19fce8e87f2789d0bca3a62d2858d89e4db4a14cf76930228b01d94aefb8b58867df9c63a194fd3a2542382e3968bef2eda37e1a33847cbbe77838932d9f6c3')
 
 pkgver() {
@@ -86,6 +90,8 @@ pkgver() {
 prepare() {
   cd gtk
 
+  git apply -3 ../0001-Allow-disabling-legacy-Tracker-search.patch
+
   # apply icon-view patch
   patch -Np1 -i ../gtk3-filechooser-icon-view.patch
 }
@@ -99,6 +105,7 @@ build() {
     -D introspection=true
     -D demos=false
     -D man=true
+    -D tracker=false
     -D tracker3=true
   )