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

[Jan Steffens]

    Date: Sunday, November 26, 2017 @ 15:32:32
  Author: heftig
Revision: 310954

3.22.26+47+g3a1a7135a2-1

Modified:
  gtk3/trunk/PKGBUILD

----------+
 PKGBUILD |   36 +++++++++---------------------------
 1 file changed, 9 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-26 15:24:14 UTC (rev 310953)
+++ PKGBUILD	2017-11-26 15:32:32 UTC (rev 310954)
@@ -3,8 +3,8 @@
 # Contributor: Ionut Biru <ibiru at archlinux.org>
 
 pkgbase=gtk3
-pkgname=(gtk3 gtk-update-icon-cache gtk3-print-backends)
-pkgver=3.22.26
+pkgname=(gtk3 gtk-update-icon-cache)
+pkgver=3.22.26+47+g3a1a7135a2
 pkgrel=1
 pkgdesc="GObject-based multi-platform GUI toolkit"
 arch=(x86_64)
@@ -12,11 +12,10 @@
 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
-         cantarell-fonts)
-makedepends=(gobject-introspection libcanberra gtk-doc git colord rest libcups glib2-docs
-             sassc)
+         cantarell-fonts colord rest libcups libcanberra libcloudproviders)
+makedepends=(gobject-introspection gtk-doc git glib2-docs sassc)
 license=(LGPL)
-_commit=77a4e2ec3759648e85a5172bb9fbdedcd7370023  # tags/3.22.26^0
+_commit=3a1a7135a276f2b6336c7566f6342da739a41d39  # gtk-3-22
 source=("git+https://git.gnome.org/browse/gtk+#commit=$_commit"
         settings.ini
         gtk-query-immodules-3.0.hook
@@ -34,7 +33,6 @@
 }
 
 prepare() {
-  mkdir print-backends
   cd gtk+
   NOCONFIGURE=1 ./autogen.sh
 }
@@ -46,6 +44,7 @@
     --sysconfdir=/etc \
     --localstatedir=/var \
     --disable-schemas-compile \
+    --enable-cloudproviders \
     --enable-x11-backend \
     --enable-broadway-backend \
     --enable-wayland-backend \
@@ -59,8 +58,9 @@
 
 package_gtk3() {
   depends+=(gtk-update-icon-cache)
-  optdepends=('libcanberra: gtk3-widget-factory demo'
-              'gtk3-print-backends: Printing')
+  provides=(gtk3-print-backends)
+  conflicts=(gtk3-print-backends)
+  replaces=("gtk3-print-backends<=3.22.26-1")
   install=gtk3.install
 
   cd gtk+
@@ -71,16 +71,6 @@
 
   # 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
 }
 
 package_gtk-update-icon-cache() {
@@ -93,12 +83,4 @@
   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)
-  groups=(gnome)
-
-  mv print-backends/* "$pkgdir"
-}
-
 # vim:set et sw=2: