update gtk3-nobroadway-nowayland-nocolord

Signed-off-by: Mattias Andrée <maandree@kth.se>

3 files changed, 48 insertions, 11 deletions

diff --git a/gtk3-nobroadway-nowayland-nocolord/.gitignore b/gtk3-nobroadway-nowayland-nocolord/.gitignore
new file mode 100644
index 0000000..cd85985
--- /dev/null
+++ b/gtk3-nobroadway-nowayland-nocolord/.gitignore
@@ -0,0 +1 @@
+gtk+
diff --git a/gtk3-nobroadway-nowayland-nocolord/PKGBUILD b/gtk3-nobroadway-nowayland-nocolord/PKGBUILD
index e67e8db..e7b0144 100644
--- a/gtk3-nobroadway-nowayland-nocolord/PKGBUILD
+++ b/gtk3-nobroadway-nowayland-nocolord/PKGBUILD
@@ -3,28 +3,41 @@
 # Maintainer of the gtk3 package: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gtk3-nobroadway-nowayland-nocolord
-pkgver=3.18.6
+pkgver=3.22.4
 pkgrel=1
 pkgdesc="GObject-based multi-platform GUI toolkit"
 arch=(i686 x86_64)
 url="http://www.gtk.org/"
-depends=(atk cairo libcups libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2
+depends=(atk cairo libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2 dconf
          libxcomposite libxdamage pango shared-mime-info at-spi2-atk libxkbcommon
-         adwaita-icon-theme json-glib rest librsvg gtk-update-icon-cache)
-makedepends=(gobject-introspection libcanberra)
-optdepends=('libcanberra: gtk3-widget-factory demo')
+         adwaita-icon-theme json-glib librsvg gtk-update-icon-cache mesa)
+makedepends=(gobject-introspection libcanberra gtk-doc git rest libcups)
+optdepends=('libcanberra: gtk3-widget-factory demo'
+	    'gtk3-print-backends: printing')
 install=gtk3.install
 license=(LGPL)
 conflicts=(gtk3)
 provides=("gtk3=$pkgver")
-source=(https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz
-        settings.ini)
-sha256sums=('78cabf0fd5a662f8723f62d5ac633072c76c557c1d700454c9c3deaa37e441ef'
-            '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202')
+_commit=4569bb372f838a9a68c9b134ef18865abe77001c # tags/3.22.4^0
+source=("git://git.gnome.org/gtk+#commit=$_commit"
+        settings.ini
+	gtk-query-immodules-3.0.hook)
+sha256sums=('SKIP'
+            '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
+	    'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845')
 
+pkgver() {
+    cd gtk+
+    git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+    cd gtk+
+    NOCONFIGURE=1 ./autogen.sh
+}
 
 build() {
-    cd "gtk+-$pkgver"
+    cd gtk+
 
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
@@ -47,11 +60,23 @@ build() {
 }
 
 package() {
-    cd "gtk+-$pkgver"
+    cd gtk+
     make DESTDIR="$pkgdir" install
+
     install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-3.0/settings.ini"
+    install -Dm644 ../gtk-query-immodules-3.0.hook "$pkgdir/usr/share/libalpm/hooks/gtk-query-immodules-3.0.hook"
 
     # split this out to use with gtk2 too
     rm "$pkgdir/usr/bin/gtk-update-icon-cache"
+
+    cd "$pkgdir"
+    for _f in usr/lib/*/*/printbackends/*; do
+        case $_f in
+            *-file.so|*-lpr.so) continue;;
+        esac
+
+        mkdir -p "$srcdir/print-backends/${_f%/*}"
+        mv "$_f" "$srcdir/print-backends/$_f"
+    done
 }
 
diff --git a/gtk3-nobroadway-nowayland-nocolord/gtk-query-immodules-3.0.hook b/gtk3-nobroadway-nowayland-nocolord/gtk-query-immodules-3.0.hook
new file mode 100644
index 0000000..c7703cf
--- /dev/null
+++ b/gtk3-nobroadway-nowayland-nocolord/gtk-query-immodules-3.0.hook
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/gtk-3.0/3.0.0/immodules/*.so
+
+[Action]
+Description = Probing GTK3 input method modules...
+When = PostTransaction
+Exec = /usr/bin/gtk-query-immodules-3.0 --update-cache