[arch-commits] Commit in (12 files)

[Jan Steffens]

    Date: Friday, June 9, 2017 @ 10:37:31
  Author: heftig
Revision: 298463

Add gyp

Added:
  gtk4/
  gtk4/trunk/
  gtk4/trunk/gtk-query-immodules-4.0.hook
    (from rev 291837, gtk3/trunk/gtk-query-immodules-3.0.hook)
  gtk4/trunk/gtk4.install
    (from rev 291837, gtk3/trunk/gtk3.install)
  gyp/
  gyp/repos/
  gyp/trunk/
  shaderc/
  shaderc/trunk/
Modified:
  gtk4/trunk/PKGBUILD
Deleted:
  gtk4/trunk/gtk-query-immodules-3.0.hook
  gtk4/trunk/gtk3.install

-----------------------------------------+
 gtk4/trunk/gtk-query-immodules-4.0.hook |   11 +++++++++
 gtk4/trunk/gtk4.install                 |    3 ++
 trunk/PKGBUILD                          |   34 +++++++++++++++---------------
 trunk/gtk-query-immodules-3.0.hook      |   11 ---------
 trunk/gtk3.install                      |    3 --
 5 files changed, 32 insertions(+), 30 deletions(-)

Modified: gtk4/trunk/PKGBUILD
===================================================================
--- gtk3/trunk/PKGBUILD	2017-03-29 20:48:04 UTC (rev 291837)
+++ gtk4/trunk/PKGBUILD	2017-06-09 10:37:31 UTC (rev 298463)
@@ -2,8 +2,8 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 # Contributor: Ionut Biru <ibiru at archlinux.org>
 
-pkgbase=gtk3
-pkgname=(gtk3 gtk-update-icon-cache gtk3-print-backends)
+pkgbase=gtk4
+pkgname=(gtk4 gtk-update-icon-cache gtk4-print-backends)
 pkgver=3.22.11
 pkgrel=1
 pkgdesc="GObject-based multi-platform GUI toolkit"
@@ -11,18 +11,20 @@
 url="http://www.gtk.org/"
 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)
-makedepends=(gobject-introspection libcanberra gtk-doc git colord rest libcups glib2-docs)
+         adwaita-icon-theme json-glib librsvg wayland-protocols desktop-file-utils mesa
+         vulkan-icd-loader graphene)
+makedepends=(gobject-introspection libcanberra gtk-doc git colord rest libcups glib2-docs
+             vulkan-headers)
 license=(LGPL)
-_commit=a7ebe62e673b72d2a4b8791ef4acaf8d979aad7b  # tags/3.22.11^0
+_commit=7cb2c560ae8d856b621003d31105b50c1957b357  # tags/3.89.5^0
 source=("git+https://git.gnome.org/browse/gtk+#commit=$_commit"
         settings.ini
-        gtk-query-immodules-3.0.hook
+        gtk-query-immodules-4.0.hook
         gtk-update-icon-cache.hook
         gtk-update-icon-cache.script)
 sha256sums=('SKIP'
             '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
-            'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845'
+            '81abf7a778d276a54521e5ea1c863e1259acf856bfab1ea10c3e79c447346c3d'
             '496064a9dd6214bd58f689dd817dbdc4d7f17d42a8c9940a87018c3f829ce308'
             'f1d3a0dbfd82f7339301abecdbe5f024337919b48bd0e09296bb0e79863b2541')
 
@@ -55,17 +57,17 @@
   make
 }
 
-package_gtk3() {
+package_gtk4() {
   depends+=(gtk-update-icon-cache)
-  optdepends=('libcanberra: gtk3-widget-factory demo'
-              'gtk3-print-backends: Printing')
-  install=gtk3.install
+  optdepends=('libcanberra: gtk4-widget-factory demo'
+              'gtk4-print-backends: Printing')
+  install=gtk4.install
 
   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"
+  install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-4.0/settings.ini"
+  install -Dm644 ../gtk-query-immodules-4.0.hook "$pkgdir/usr/share/libalpm/hooks/gtk-query-immodules-4.0.hook"
 
   # split this out to use with gtk2 too
   rm "$pkgdir/usr/bin/gtk-update-icon-cache"
@@ -91,9 +93,9 @@
   install -D ../gtk-update-icon-cache.script "$pkgdir/usr/share/libalpm/scripts/gtk-update-icon-cache"
 }
 
-package_gtk3-print-backends() {
-  pkgdesc="Print backends for GTK3"
-  depends=(gtk3 rest colord libcups)
+package_gtk4-print-backends() {
+  pkgdesc="Print backends for gtk4"
+  depends=(gtk4 rest colord libcups)
   groups=(gnome)
 
   mv print-backends/* "$pkgdir"

Deleted: gtk4/trunk/gtk-query-immodules-3.0.hook
===================================================================
--- gtk3/trunk/gtk-query-immodules-3.0.hook	2017-03-29 20:48:04 UTC (rev 291837)
+++ gtk4/trunk/gtk-query-immodules-3.0.hook	2017-06-09 10:37:31 UTC (rev 298463)
@@ -1,11 +0,0 @@
-[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

Copied: gtk4/trunk/gtk-query-immodules-4.0.hook (from rev 291837, gtk3/trunk/gtk-query-immodules-3.0.hook)
===================================================================
--- gtk4/trunk/gtk-query-immodules-4.0.hook	                        (rev 0)
+++ gtk4/trunk/gtk-query-immodules-4.0.hook	2017-06-09 10:37:31 UTC (rev 298463)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/gtk-4.0/4.0.0/immodules/*.so
+
+[Action]
+Description = Probing GTK4 input method modules...
+When = PostTransaction
+Exec = /usr/bin/gtk-query-immodules-4.0 --update-cache

Deleted: gtk4/trunk/gtk3.install
===================================================================
--- gtk3/trunk/gtk3.install	2017-03-29 20:48:04 UTC (rev 291837)
+++ gtk4/trunk/gtk3.install	2017-06-09 10:37:31 UTC (rev 298463)
@@ -1,3 +0,0 @@
-pre_remove() {
-    rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
-}

Copied: gtk4/trunk/gtk4.install (from rev 291837, gtk3/trunk/gtk3.install)
===================================================================
--- gtk4/trunk/gtk4.install	                        (rev 0)
+++ gtk4/trunk/gtk4.install	2017-06-09 10:37:31 UTC (rev 298463)
@@ -0,0 +1,3 @@
+pre_remove() {
+    rm -f /usr/lib/gtk-4.0/4.0.0/immodules.cache
+}