fix file conflicts

2 files changed, 14 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 168de4e37060..7ad752e7efb7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Mon Sep 11 19:43:12 UTC 2017
+# Mon Sep 11 20:37:11 UTC 2017
 pkgbase = gtk3-patched-filechooser-icon-view
 	pkgdesc = GTK3 patched with dudemanguy's fork of wfr's filechooser-icon-view patch.
 	pkgver = 3.22.20
diff --git a/PKGBUILD b/PKGBUILD
index 50b0f413ede7..f0afc2611244 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -67,5 +67,18 @@ package() {
 
   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 these out to avoid file conflicts with gtk-update-icon-cache and gtk3-print-backends
+  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
 }