3.24.25

1 files changed, 45 insertions, 32 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 0d2b64156994..9b331c574f07 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,55 +1,68 @@
-# Maintainer: twilinx <twilinx@mesecons.net>
-
+# Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
+# Contributor: twilinx <twilinx@mesecons.net>
+# Contributor: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
 pkgname=gtk3-typeahead
-pkgver=3.24.21
+pkgver=3.24.25
 pkgrel=1
-conflicts=(gtk3)
-provides=("gtk3=$pkgver" gtk3-print-backends libgtk-3.so libgdk-3.so libgailutil-3.so)
-replaces=("gtk3-print-backends<=3.22.26-1")
-pkgdesc="GTK+ 3 with typeahead feature enabled for the file chooser widget"
+pkgdesc="GObject-based multi-platform GUI toolkit - Typeahead feature enabled for file chooser widget"
 arch=(x86_64)
 url="https://www.gtk.org/"
-install=gtk3.install
-depends=(atk cairo libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2 dconf
-         libxcomposite libxdamage pango shared-mime-info at-spi2-atk wayland libxkbcommon
-         adwaita-icon-theme json-glib librsvg wayland-protocols desktop-file-utils mesa
-         cantarell-fonts colord rest libcups libcanberra fribidi iso-codes)
-makedepends=(gobject-introspection gtk-doc git glib2-docs sassc meson)
 license=(LGPL)
-_commit=ab4b85f88cf822d6dbb9cda9c4d71fd10a5d3d99  # tags/3.24.21^0
+depends=(atk cairo libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2
+         dconf libxcomposite libxdamage pango shared-mime-info at-spi2-atk
+         wayland libxkbcommon adwaita-icon-theme json-glib librsvg
+         wayland-protocols desktop-file-utils mesa cantarell-fonts colord rest
+         libcups libcanberra fribidi iso-codes tracker3 libcloudproviders
+         gtk-update-icon-cache)
+makedepends=(gobject-introspection gtk-doc git glib2-docs sassc meson)
+provides=("gtk3=$pkgver" gtk3-print-backends libgtk-3.so libgdk-3.so libgailutil-3.so)
+conflicts=(gtk3 gtk3-print-backends)
+replaces=("gtk3-print-backends<=3.22.26-1")
+install=gtk3.install
+_commit=5c6aa76979499fa4fc1c202fd30e6977827c7730  # tags/3.24.25^0
 source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
-        settings.ini
         gtk-query-immodules-3.0.hook
         typeahead.patch)
 sha256sums=('SKIP'
-            '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
             'a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229'
             '3b94b53ee720e24e999e6fe40de269ec5b6ddfcbab64fb1a14e7d89256651607')
 
+pkgver() {
+  cd gtk
+  git describe --tags | sed 's/-/+/g'
+}
+
 prepare() {
-    cd gtk
+  cd gtk
 
-    # Typeahead-specific changes
-    patch gtk/gtkfilechooserwidget.c -i $srcdir/typeahead.patch
+  # Typeahead-specific changes
+  patch gtk/gtkfilechooserwidget.c -i $srcdir/typeahead.patch
 }
 
 build() {
-    CFLAGS+=" -DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"
-    arch-meson gtk build \
-        -D broadway_backend=true \
-        -D colord=yes \
-        -D gtk_doc=true \
-        -D man=true
-    meson compile -C build
+  CFLAGS+=" -DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"
+  arch-meson gtk build \
+    -D broadway_backend=true \
+    -D cloudproviders=true \
+    -D colord=yes \
+    -D gtk_doc=true \
+    -D man=true
+  meson compile -C build
 }
 
 package() {
-    install=gtk3.install
+  DESTDIR="$pkgdir" meson install -C build
+
+  install -Dm644 /dev/stdin "$pkgdir/usr/share/gtk-3.0/settings.ini" <<END
+[Settings]
+gtk-icon-theme-name = Adwaita
+gtk-theme-name = Adwaita
+gtk-font-name = Cantarell 11
+END
 
-    DESTDIR="$pkgdir" meson install -C build
-    install -Dt "$pkgdir/usr/share/gtk-3.0" -m644 settings.ini
-    install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 gtk-query-immodules-3.0.hook
+  install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 gtk-query-immodules-3.0.hook
 
-    # gtk-update-icon-cache will be provided in a separate package
-    rm "$pkgdir/usr/bin/gtk-update-icon-cache"
+  rm "$pkgdir/usr/bin/gtk-update-icon-cache"
+  rm "$pkgdir/usr/share/man/man1/gtk-update-icon-cache.1"
 }