From 7e18e782e8b56b778f400a3b2fe6d3253ce3d6f1 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Sat, 27 Mar 2021 19:45:45 +0100
Subject: [PATCH] gdk-pixbuf2: fix install scripts

---
 mingw-w64-gdk-pixbuf2/PKGBUILD                    | 4 ++--
 mingw-w64-gdk-pixbuf2/gdk-pixbuf2-MINGW32.install | 5 +++++
 mingw-w64-gdk-pixbuf2/gdk-pixbuf2-MINGW64.install | 5 +++++
 mingw-w64-gdk-pixbuf2/gdk-pixbuf2-UCRT64.install  | 5 +++++
 mingw-w64-gdk-pixbuf2/gdk-pixbuf2-i686.install    | 3 ---
 mingw-w64-gdk-pixbuf2/gdk-pixbuf2-x86_64.install  | 3 ---
 6 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 mingw-w64-gdk-pixbuf2/gdk-pixbuf2-MINGW32.install
 create mode 100644 mingw-w64-gdk-pixbuf2/gdk-pixbuf2-MINGW64.install
 create mode 100644 mingw-w64-gdk-pixbuf2/gdk-pixbuf2-UCRT64.install
 delete mode 100644 mingw-w64-gdk-pixbuf2/gdk-pixbuf2-i686.install
 delete mode 100644 mingw-w64-gdk-pixbuf2/gdk-pixbuf2-x86_64.install

diff --git a/mingw-w64-gdk-pixbuf2/PKGBUILD b/mingw-w64-gdk-pixbuf2/PKGBUILD
index f1edd273db..21e9c3ecfc 100644
--- a/mingw-w64-gdk-pixbuf2/PKGBUILD
+++ b/mingw-w64-gdk-pixbuf2/PKGBUILD
@@ -6,7 +6,7 @@ _realname=gdk-pixbuf2
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.42.2
-pkgrel=1
+pkgrel=2
 pkgdesc="An image loading library (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64')
@@ -23,7 +23,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-libpng"
          "${MINGW_PACKAGE_PREFIX}-libtiff")
 options=('emptydirs')
-install=${_realname}-${CARCH}.install
+install=${_realname}-${MSYSTEM}.install
 source=("https://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-${pkgver}.tar.xz"
         0003-fix-dllmain.patch
         0004-build-all-loaders-plus-gdi.patch
diff --git a/mingw-w64-gdk-pixbuf2/gdk-pixbuf2-MINGW32.install b/mingw-w64-gdk-pixbuf2/gdk-pixbuf2-MINGW32.install
new file mode 100644
index 0000000000..846e694f55
--- /dev/null
+++ b/mingw-w64-gdk-pixbuf2/gdk-pixbuf2-MINGW32.install
@@ -0,0 +1,5 @@
+MINGW_INSTALL=mingw32
+
+pre_remove() {
+  rm -f ${MINGW_INSTALL}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
+}
\ No newline at end of file
diff --git a/mingw-w64-gdk-pixbuf2/gdk-pixbuf2-MINGW64.install b/mingw-w64-gdk-pixbuf2/gdk-pixbuf2-MINGW64.install
new file mode 100644
index 0000000000..070fb0dc47
--- /dev/null
+++ b/mingw-w64-gdk-pixbuf2/gdk-pixbuf2-MINGW64.install
@@ -0,0 +1,5 @@
+MINGW_INSTALL=mingw64
+
+pre_remove() {
+  rm -f ${MINGW_INSTALL}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
+}
\ No newline at end of file
diff --git a/mingw-w64-gdk-pixbuf2/gdk-pixbuf2-UCRT64.install b/mingw-w64-gdk-pixbuf2/gdk-pixbuf2-UCRT64.install
new file mode 100644
index 0000000000..cb5040bbf3
--- /dev/null
+++ b/mingw-w64-gdk-pixbuf2/gdk-pixbuf2-UCRT64.install
@@ -0,0 +1,5 @@
+MINGW_INSTALL=ucrt64
+
+pre_remove() {
+  rm -f ${MINGW_INSTALL}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
+}
\ No newline at end of file
diff --git a/mingw-w64-gdk-pixbuf2/gdk-pixbuf2-i686.install b/mingw-w64-gdk-pixbuf2/gdk-pixbuf2-i686.install
deleted file mode 100644
index 472b526320..0000000000
--- a/mingw-w64-gdk-pixbuf2/gdk-pixbuf2-i686.install
+++ /dev/null
@@ -1,3 +0,0 @@
-pre_remove() {
-  rm -f mingw32/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
-}
\ No newline at end of file
diff --git a/mingw-w64-gdk-pixbuf2/gdk-pixbuf2-x86_64.install b/mingw-w64-gdk-pixbuf2/gdk-pixbuf2-x86_64.install
deleted file mode 100644
index 13098806c8..0000000000
--- a/mingw-w64-gdk-pixbuf2/gdk-pixbuf2-x86_64.install
+++ /dev/null
@@ -1,3 +0,0 @@
-pre_remove() {
-  rm -f mingw64/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
-}
\ No newline at end of file