[arch-commits] Commit in lib32-gtk3/trunk (PKGBUILD)

[Maxime Gauduin]

    Date: Tuesday, April 3, 2018 @ 09:02:53
  Author: alucryd
Revision: 313957

upgpkg: lib32-gtk3 3.22.29+60+ge42d8598ca-1

Modified:
  lib32-gtk3/trunk/PKGBUILD

----------+
 PKGBUILD |   26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-03 08:50:39 UTC (rev 313956)
+++ PKGBUILD	2018-04-03 09:02:53 UTC (rev 313957)
@@ -4,7 +4,7 @@
 # Contributor: GordonGR <ntheo1979 at gmail.com>
 
 pkgname=lib32-gtk3
-pkgver=3.22.29+4+gb485cf91b5
+pkgver=3.22.29+60+ge42d8598ca
 pkgrel=1
 pkgdesc='GObject-based multi-platform GUI toolkit (32-bit)'
 arch=('x86_64')
@@ -16,10 +16,10 @@
          'lib32-libxinerama' 'lib32-libxkbcommon' 'lib32-libxrandr'
          'lib32-pango' 'lib32-rest' 'lib32-libcanberra' 'lib32-wayland'
          'lib32-libxdamage')
-makedepends=(gobject-introspection gtk-doc git glib2-docs sassc)
-install=lib32-gtk3.install
-_commit=b485cf91b53cd21fad8b4ff35fef53e4d1a9f009  # gtk-3-22
-source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
+makedepends=('gobject-introspection' 'gtk-doc' 'git' 'glib2-docs' 'sassc')
+install='lib32-gtk3.install'
+_commit='e42d8598ca892587a1029c458a19c86fd4867877'
+source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=${_commit}"
         'gtk-query-immodules-3.0-32.hook')
 sha256sums=('SKIP'
             '4ac8112ac7e6fa879756e1eeb89b5efa0825ba00e5b05469913b256f86a37608')
@@ -26,21 +26,23 @@
 
 pkgver() {
   cd gtk
+
   git describe --tags | sed 's/-/+/g'
 }
 
 prepare() {
   cd gtk
+
   NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
+  cd gtk
+
   export CC='gcc -m32'
   export CXX='/bin/false'
   export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
 
-  cd gtk
-
   ./configure \
     --prefix='/usr' \
     --sysconfdir='/etc' \
@@ -56,14 +58,14 @@
 
 package() {
   cd gtk
-  make DESTDIR="$pkgdir" install
 
+  make DESTDIR="${pkgdir}" install
+
   rm -r "${pkgdir}"/{etc,usr/{include,share}}
-  find "$pkgdir/usr/bin" -type f -not -name gtk-query-immodules-3.0 -delete
-  mv "$pkgdir"/usr/bin/gtk-query-immodules-3.0{,-32}
+  find "${pkgdir}"/usr/bin -type f -not -name gtk-query-immodules-3.0 -delete
+  mv "${pkgdir}"/usr/bin/gtk-query-immodules-3.0{,-32}
 
-  install -dm 755 "${pkgdir}"/usr/share/libalpm/hooks
-  install -m 644 ../gtk-query-immodules-3.0-32.hook "${pkgdir}"/usr/share/libalpm/hooks/
+  install -Dm 644 ../gtk-query-immodules-3.0-32.hook -t "${pkgdir}"/usr/share/libalpm/hooks/
 }
 
 # vim:set ts=2 sw=2 et: