3.24.24-2

1 files changed, 17 insertions, 13 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 9f02df560922..e2d67cf18c4c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,32 +5,30 @@
 
 pkgname=gtk3-patched-filechooser-icon-view
 pkgver=3.24.24
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="GTK3 patched with dudemanguy's fork of wfr's filechooser-icon-view patch."
 arch=(x86_64)
 url="https://github.com/Dudemanguy/gtk"
+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)
+optdepends=('glib2-patched-thumbnailer: Thumbnail generation in upload dialog')
+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')
-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)
-optdepends=('glib2-patched-thumbnailer: Thumbnail generation in upload dialog')
-makedepends=(gobject-introspection gtk-doc git glib2-docs sassc meson)
-
 license=(LGPL)
 install=gtk3.install
 _commit=de8329b3ce4b235eac9ddcbb6cd121cc83dd9e74  # tags/3.24.24^0
 source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
-        settings.ini
         gtk-query-immodules-3.0.hook
         gtk3-filechooser-icon-view.patch)        
 
 sha256sums=('SKIP'
-            '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
             'a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229'
             '37d8d594ee3ef4528b8066992999c39746f3506078083a7d21c19bbceae87b2b')
 pkgver() {
@@ -59,10 +57,16 @@ build() {
 package() {
   DESTDIR="$pkgdir" meson install -C build
 
-  install -Dt "$pkgdir/usr/share/gtk-3.0" -m644 settings.ini
+  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
+
   install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 gtk-query-immodules-3.0.hook
 
-  # avoid file conflict with gtk-update-icon-cache
   rm "$pkgdir/usr/bin/gtk-update-icon-cache"
+  rm "$pkgdir/usr/share/man/man1/gtk-update-icon-cache.1"
 }