Provide gtk3-print-backends, add a missing patch

1 files changed, 13 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c71ff9c6ba47..8749d426705f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,29 @@
 # Maintainer: twilinx <twilinx@mesecons.net>
 
 pkgname=gtk3-typeahead
-pkgver=3.22.26
+pkgver=3.22.26+47+g3a1a7135a2
 pkgrel=1
 conflicts=(gtk3)
-provides=("gtk3=$pkgver")
+provides=("gtk3=$pkgver" gtk3-print-backends)
+replaces=("gtk3-print-backends<=3.22.26-1")
 pkgdesc="GTK+ 3 with typeahead feature enabled for the file chooser widget"
-arch=(i686 x86_64)
+arch=(x86_64)
 url="http://www.gtk.org/"
 install=gtk3.install
 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 gtk-update-icon-cache)
-optdepends=('libcanberra: gtk3-widget-factory demo'
-            'gtk3-print-backends: Printing')
-makedepends=(gobject-introspection libcanberra gtk-doc git colord rest libcups glib2-docs
-             sassc)
+         cantarell-fonts colord rest libcups libcanberra)
+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://git.gnome.org/gtk+#commit=$_commit"
+        0001-entry-Undo-ABI-breakage-from-addition-of-insert_emoj.patch
         settings.ini
         gtk-query-immodules-3.0.hook
         typeahead.patch)
 sha256sums=('SKIP'
+            '3a52d723db863564bea9245d5f65b1dc5c3ca20ee190fca249eb8bd8fdbc5c0b'
             '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
             'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845'
             '5006fa1dcea9aa74766196ec5c18e5172d7287195c2a49ffcd0adc13bc6e62c1')
@@ -34,6 +34,9 @@ prepare() {
     # Typeahead-specific changes
     patch gtk/gtkfilechooserwidget.c -i $srcdir/typeahead.patch
 
+    # https://bugs.archlinux.org/task/56474
+    patch -Np1 -i ../0001-entry-Undo-ABI-breakage-from-addition-of-insert_emoj.patch
+
     NOCONFIGURE=1 ./autogen.sh
 }
 
@@ -64,15 +67,5 @@ package() {
     install -Dm644 ../gtk-query-immodules-3.0.hook "$pkgdir/usr/share/libalpm/hooks/gtk-query-immodules-3.0.hook"
 
     # gtk-update-icon-cache will be provided in a separate package
-    rm $pkgdir/usr/bin/gtk-update-icon-cache
-
-    # remove files that are already provided by gtk3-print-backends
-    cd "$pkgdir"
-    for _f in usr/lib/*/*/printbackends/*; do
-        case $_f in
-            *-file.so|*-lpr.so) continue;;
-        esac
-
-        rm "$_f"
-    done
+    rm "$pkgdir/usr/bin/gtk-update-icon-cache"
 }