Fixing lib install dir, cleaning up formatting

1 files changed, 16 insertions, 32 deletions

diff --git a/PKGBUILD b/PKGBUILD
index eae3d4e50cda..22f1573a6319 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,20 @@
 # Maintainer: Andrew Crerar <andrew (at) crerar (dot) io>
 
-pkgbase=gtk4-git
 pkgname=(gtk4-git)
-pkgver=3.93.0.r237.gedffa8d6ed
+pkgver=3.93.0.r331.g481b5d1b89
 pkgrel=1
 pkgdesc="GObject-based multi-platform GUI toolkit (GIT Version)"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://www.gtk.org/"
-license=('LGPL')
-depends=('at-spi2-atk'
-         'atk-git>=2.15.1'
-         'dconf'
-         'glib2-git>=2.53.7'
-         'libepoxy>=1.4'
-         'libxcomposite'
-         'libxcursor'
-         'libxinerama'
-         'libxkbcommon'
-         'libxrandr'
-         'mesa'
-         'pango-git>=1.37.3'
-         'wayland-git>=1.9.91'
-         'graphene>=1.5.1')
-makedepends=('gobject-introspection-git'
-             'gtk-doc'
-             'git'
-             'colord'
-             'rest'
-             'libcups'
-             'meson'
-             'ninja')
+license=(LGPL)
+depends=(at-spi2-atk  'atk-git>=2.15.1' dconf 'glib2-git>=2.53.7' 'libepoxy>=1.4'
+         libxcomposite libxcursor libxinerama libxkbcommon libxrandr mesa
+         'pango-git>=1.37.3' 'wayland-git>=1.9.91' 'graphene>=1.5.1')
+makedepends=(gobject-introspection-git gtk-doc git colord rest libcups meson ninja)
 optdepends=('gnome-icon-theme: Default icon theme'
             'gnome-themes-standard: Default widget theme'
             'hicolor-icon-theme: Freedesktop.org Hicolor icon theme'
             'gdk-pixbuf2: An image loading library')
-backup=('usr/share/gtk-4.0/settings.ini')
 source=('git+https://git.gnome.org/browse/gtk+'
         'gtk4.install'
         'gtk4-query-immodules.hook'
@@ -44,8 +24,8 @@ source=('git+https://git.gnome.org/browse/gtk+'
 sha512sums=('SKIP'
             '5dcb698a15e7d5f4611c9357782d475052944cc71e73351238ffb5dfbe18d1bd1b62289da7f8066cde256c4339de5efa982088f47781876f5d8317f92b87f79f'
             '1dbcce0a3e17ee05b579613adba25feff692f6626155e91fa6859e5f176753201b5ceffa8c9c7c897cf945aeeb32fbd28affa24050dfc0d65237733964bf28de'
-            'abfd73de4faa6f53784182800395aa3c39bb98e15a0eb300fb4142073ff7ce565a0836a2363393b2f132060b5293dbc0c30c380a023f38d5bd39c62cb58389c2'
-            '5cd50d93bb6bc203438a2a0764bd717409658e124058b18a1da26a21f10ef7564a16f32fc0633a68b45b2e303fa63a5efefeadd6b0bf1d7f474556df8cdb6c58'
+            '9d3bb80afb3a00dc50402d32476719daaeab017e1a066425bb602316b534d0a9899d48734a84f70af1066ed104df0491264383a34969dfad2ea9828fb41b9b6b'
+            '805cf12606c738d0442d8af415223d3faada93c933b563b7c4c1d5e0c16d2d21435406add1fcc69300fb2fe534f2d0ddbf50b2c0463fc7462109d0f7802ccef1'
             '1642d77622d61234e316e8fcbc803a6a5556c606e37e56aa5981ef2f2df85bfa959c31b5d1bff248b340760e1178281cb0d7abdf540c5f7d4b62cb383a67c685')
 pkgver() {
   cd gtk+
@@ -61,6 +41,7 @@ build() {
   meson --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
+    --libdir=/usr/lib \
     -Denable-broadway-backend=true \
     _build .
 
@@ -76,7 +57,10 @@ package_gtk4-git() {
 
   DESTDIR="$pkgdir" ninja install
 
-  install -Dm644 "../../settings.ini" "$pkgdir/usr/share/gtk-4.0/settings.ini"
-  install -Dm644 ../../gtk4-query-immodules.hook "$pkgdir/usr/share/libalpm/hooks/gtk4-query-immodules.hook"
-}
+  install -Dm 644 "../../settings.ini" "$pkgdir/usr/share/gtk-4.0/settings.ini"
+  install -Dm 644 "../../gtk4-query-immodules.hook" "$pkgdir/usr/share/libalpm/hooks/gtk4-query-immodules.hook"
+  install -D "gtk/gtk4-update-icon-cache" "$pkgdir/usr/bin/gtk4-update-icon-cache"
+  install -Dm 644 "../../gtk4-update-icon-cache.hook" "$pkgdir/usr/share/libalpm/hooks/gtk4-update-icon-cache.hook"
+  install -Dm 755 "../../gtk4-update-icon-cache.script" "$pkgdir/usr/share/libalpm/scripts/gtk4-update-icon-cache"
 
+}