3.24.24-2: Move gtk-update-icon-cache to gtk4

git-svn-id: file:///srv/repos/svn-packages/svn@405885 eb2447ed-0c53-47e4-bac8-5bc4a241df78

Author: heftig

trunk/PKGBUILD

@@ -1,10 +1,9 @@
 # Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
-pkgbase=gtk3
-pkgname=(gtk3 gtk-update-icon-cache)
+pkgname=gtk3
 pkgver=3.24.24
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="GObject-based multi-platform GUI toolkit"
 arch=(x86_64)
@@ -13,20 +12,19 @@ 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)
+ libcups libcanberra fribidi iso-codes tracker3 libcloudproviders
+ gtk-update-icon-cache)
 makedepends=(gobject-introspection gtk-doc git glib2-docs sassc meson)
+provides=(gtk3-print-backends libgtk-3.so libgdk-3.so libgailutil-3.so)
+conflicts=(gtk3-print-backends)
+replaces=("gtk3-print-backends<=3.22.26-1")
 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
- gtk-update-icon-cache.hook
- gtk-update-icon-cache.script)
+ gtk-query-immodules-3.0.hook)
 sha256sums=('SKIP'
- '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
- 'a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229'
- '2d435e3bec8b79b533f00f6d04decb1d7c299c6e89b5b175f20be0459f003fe8'
- 'f1d3a0dbfd82f7339301abecdbe5f024337919b48bd0e09296bb0e79863b2541')
+ 'a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229')
 
 pkgver() {
  cd gtk
@@ -48,29 +46,20 @@ build() {
  meson compile -C build
 }
 
-package_gtk3() {
- depends+=(gtk-update-icon-cache)
- provides=(gtk3-print-backends libgtk-3.so libgdk-3.so libgailutil-3.so)
- conflicts=(gtk3-print-backends)
- replaces=("gtk3-print-backends<=3.22.26-1")
- install=gtk3.install
-
+package() {
  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 -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
 
- # split this out to use with gtk2 too
- mv "$pkgdir/usr/bin/gtk-update-icon-cache" "$srcdir"
-}
-
-package_gtk-update-icon-cache() {
- pkgdesc="GTK+ icon cache updater"
- depends=(gdk-pixbuf2 librsvg hicolor-icon-theme)
+ install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 gtk-query-immodules-3.0.hook
 
- install -Dt "$pkgdir/usr/bin" gtk-update-icon-cache
- install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 gtk-update-icon-cache.hook
- install -D gtk-update-icon-cache.script "$pkgdir/usr/share/libalpm/scripts/gtk-update-icon-cache"
+ rm "$pkgdir/usr/bin/gtk-update-icon-cache"
+ rm "$pkgdir/usr/share/man/man1/gtk-update-icon-cache.1"
 }
 
 # vim:set ts=2 sw=2 et: