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

[Jan Steffens]

    Date: Saturday, March 17, 2018 @ 20:49:29
  Author: heftig
Revision: 309002

3.22.29+4+gb485cf91b5-1

Added:
  lib32-gtk3/trunk/lib32-gtk3.install
Modified:
  lib32-gtk3/trunk/PKGBUILD
  lib32-gtk3/trunk/gtk-query-immodules-3.0-32.hook

---------------------------------+
 PKGBUILD                        |   48 +++++++++++++++++++-------------------
 gtk-query-immodules-3.0-32.hook |    4 +--
 lib32-gtk3.install              |    3 ++
 3 files changed, 29 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-17 20:42:39 UTC (rev 309001)
+++ PKGBUILD	2018-03-17 20:49:29 UTC (rev 309002)
@@ -4,66 +4,66 @@
 # Contributor: GordonGR <ntheo1979 at gmail.com>
 
 pkgname=lib32-gtk3
-pkgver=3.22.26
+pkgver=3.22.29+4+gb485cf91b5
 pkgrel=1
-pkgdesc='GObject-based multi-platform GUI toolkit'
+pkgdesc='GObject-based multi-platform GUI toolkit (32-bit)'
 arch=('x86_64')
 license=('LGPL')
 url='http://www.gtk.org/'
-depends=('gtk3' 'lib32-at-spi2-atk' 'lib32-colord' 'lib32-dbus'
+depends=('gtk3' 'lib32-at-spi2-atk' 'lib32-colord' 'lib32-dbus' 'lib32-mesa'
          'lib32-gdk-pixbuf2' 'lib32-json-glib' 'lib32-libcups' 'lib32-libepoxy'
          'lib32-librsvg' 'lib32-libxcomposite' 'lib32-libxcursor'
          'lib32-libxinerama' 'lib32-libxkbcommon' 'lib32-libxrandr'
-         'lib32-pango' 'lib32-rest')
-makedepends=('gcc-multilib' 'git' 'gobject-introspection' 'gtk-doc')
-_commit='77a4e2ec3759648e85a5172bb9fbdedcd7370023'
-source=("git+https://git.gnome.org/browse/gtk+#commit=${_commit}"
+         '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"
         'gtk-query-immodules-3.0-32.hook')
 sha256sums=('SKIP'
-            'c87e56504cd38d73748d12e87353680156cdeef30d082cca407d2375db821115')
+            '4ac8112ac7e6fa879756e1eeb89b5efa0825ba00e5b05469913b256f86a37608')
 
 pkgver() {
-  cd gtk+
-
+  cd gtk
   git describe --tags | sed 's/-/+/g'
 }
 
 prepare() {
-  cd gtk+
-
+  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' \
     --libdir='/usr/lib32' \
     --localstatedir='/var' \
-    --sysconfdir='/etc' \
+    --disable-schemas-compile \
     --enable-{broadway,wayland,x11}-backend \
-    --disable-libcanberra \
-    --disable-schemas-compile
+    --disable-gtk-doc
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
 package() {
-  cd gtk+
+  cd gtk
+  make DESTDIR="$pkgdir" install
 
-  make DESTDIR="${pkgdir}" install
-  mv "${pkgdir}"/usr/bin/gtk-query-immodules-3.0{,-32}
-  mv "${pkgdir}"/usr/bin/gtk-query-settings{,-32}
-  rm "${pkgdir}"/usr/bin/{broadwayd,gtk-{builder-tool,encode-symbolic-svg,launch,update-icon-cache},gtk3-{demo,demo-application,icon-browser,widget-factory}}
-  rm -rf "${pkgdir}"/{etc,usr/{include,share}}
+  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}
 
   install -dm 755 "${pkgdir}"/usr/share/libalpm/hooks
   install -m 644 ../gtk-query-immodules-3.0-32.hook "${pkgdir}"/usr/share/libalpm/hooks/
 }
 
-# vim: ts=2 sw=2 et:
+# vim:set ts=2 sw=2 et:

Modified: gtk-query-immodules-3.0-32.hook
===================================================================
--- gtk-query-immodules-3.0-32.hook	2018-03-17 20:42:39 UTC (rev 309001)
+++ gtk-query-immodules-3.0-32.hook	2018-03-17 20:49:29 UTC (rev 309002)
@@ -6,6 +6,6 @@
 Target = usr/lib32/gtk-3.0/3.0.0/immodules/*.so
 
 [Action]
-Description = Probing GTK3 input method modules (multilib)...
+Description = Probing 32-bit GTK3 input method modules...
 When = PostTransaction
-Exec = /usr/bin/env GTK_PATH=/usr/lib32/gtk-3.0 gtk-query-immodules-3.0-32 --update-cache
+Exec = /usr/bin/gtk-query-immodules-3.0-32 --update-cache

Added: lib32-gtk3.install
===================================================================
--- lib32-gtk3.install	                        (rev 0)
+++ lib32-gtk3.install	2018-03-17 20:49:29 UTC (rev 309002)
@@ -0,0 +1,3 @@
+pre_remove() {
+    rm -f /usr/lib32/gtk-3.0/3.0.0/immodules.cache
+}