From fa8fa7091e3aa2ea40cc35f4b73f8f1419191b08 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Fri, 10 Mar 2023 09:30:05 +0100
Subject: [PATCH] adwaita-icon-theme: cleanup; drop install scripts

* basic cleanup
* drop the install scripts in favor of the cache hook. Adds
  a build cycle, but gets rid of the install error
* don't move the .pc file, not sure why this was added

Fixes #7611
---
 mingw-w64-adwaita-icon-theme/PKGBUILD         | 49 ++++++++++---------
 .../theme-CLANG32.install                     | 18 -------
 .../theme-CLANG64.install                     | 18 -------
 .../theme-CLANGARM64.install                  | 18 -------
 .../theme-MINGW32.install                     | 18 -------
 .../theme-MINGW64.install                     | 18 -------
 .../theme-UCRT64.install                      | 18 -------
 7 files changed, 26 insertions(+), 131 deletions(-)
 delete mode 100644 mingw-w64-adwaita-icon-theme/theme-CLANG32.install
 delete mode 100644 mingw-w64-adwaita-icon-theme/theme-CLANG64.install
 delete mode 100644 mingw-w64-adwaita-icon-theme/theme-CLANGARM64.install
 delete mode 100644 mingw-w64-adwaita-icon-theme/theme-MINGW32.install
 delete mode 100644 mingw-w64-adwaita-icon-theme/theme-MINGW64.install
 delete mode 100644 mingw-w64-adwaita-icon-theme/theme-UCRT64.install

diff --git a/mingw-w64-adwaita-icon-theme/PKGBUILD b/mingw-w64-adwaita-icon-theme/PKGBUILD
index 18d2481da1..5a37bff217 100644
--- a/mingw-w64-adwaita-icon-theme/PKGBUILD
+++ b/mingw-w64-adwaita-icon-theme/PKGBUILD
@@ -4,45 +4,48 @@ _realname=adwaita-icon-theme
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=43
-pkgrel=1
-pkgdesc="GNOME icon theme (mingw-w64)"
+pkgrel=2
+pkgdesc="GNOME standard icons (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
-url="https://www.gnome.org"
-license=("GPL")
-makedepends=("${MINGW_PACKAGE_PREFIX}-gtk3" "${MINGW_PACKAGE_PREFIX}-autotools")
-depends=("${MINGW_PACKAGE_PREFIX}-hicolor-icon-theme"
-         "${MINGW_PACKAGE_PREFIX}-librsvg")
-options=(!libtool strip staticlibs)
-install=theme-${MSYSTEM}.install
+url="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
+license=("spdx:LGPL-3.0-or-later OR CC-BY-SA-3.0")
+makedepends=(
+  "${MINGW_PACKAGE_PREFIX}-gtk3"
+  "${MINGW_PACKAGE_PREFIX}-autotools"
+)
+depends=(
+  "${MINGW_PACKAGE_PREFIX}-hicolor-icon-theme"
+  "${MINGW_PACKAGE_PREFIX}-librsvg"
+  "${MINGW_PACKAGE_PREFIX}-gtk-update-icon-cache"
+)
 source=(
   "https://download.gnome.org/sources/${_realname}/${pkgver:0:2}/${_realname}-${pkgver}.tar.xz"
 )
 sha256sums=('2e3ac77d32a6aa5554155df37e8f0a0dd54fc5a65fd721e88d505f970da32ec6')
 
 prepare() {
-  cd ${srcdir}/${_realname}-${pkgver}
+  cd "${srcdir}/${_realname}-${pkgver}"
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir ${srcdir}/build-${MINGW_CHOST}
-  cd ${srcdir}/build-${MINGW_CHOST}
-  ../${_realname}-${pkgver}/configure \
-    --prefix=${MINGW_PREFIX} \
-    --build=${MINGW_CHOST} \
-    --host=${MINGW_CHOST}
+  mkdir "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MINGW_CHOST}"
+
+  ../"${_realname}-${pkgver}"/configure \
+    --prefix="${MINGW_PREFIX}" \
+    --build="${MINGW_CHOST}" \
+    --host="${MINGW_CHOST}"
 
   make
 }
 
 package() {
   cd "${srcdir}/build-${MINGW_CHOST}"
-  make DESTDIR="$pkgdir" install
-  mkdir -p ${pkgdir}${MINGW_PREFIX}/lib
-  mv ${pkgdir}${MINGW_PREFIX}/share/pkgconfig ${pkgdir}${MINGW_PREFIX}/lib/
 
-  install -Dm644 "${srcdir}/${_realname}-${pkgver}"/COPYING ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING
-  install -Dm644 "${srcdir}/${_realname}-${pkgver}"/COPYING_LGPL ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING_LGPL
-  install -Dm644 "${srcdir}/${_realname}-${pkgver}"/COPYING_CCBYSA3 ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING_CCBYSA3
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 "${srcdir}/${_realname}-${pkgver}"/COPYING "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
+  install -Dm644 "${srcdir}/${_realname}-${pkgver}"/COPYING_LGPL "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING_LGPL"
+  install -Dm644 "${srcdir}/${_realname}-${pkgver}"/COPYING_CCBYSA3 "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING_CCBYSA3"
 }
diff --git a/mingw-w64-adwaita-icon-theme/theme-CLANG32.install b/mingw-w64-adwaita-icon-theme/theme-CLANG32.install
deleted file mode 100644
index fffd726c0f..0000000000
--- a/mingw-w64-adwaita-icon-theme/theme-CLANG32.install
+++ /dev/null
@@ -1,18 +0,0 @@
-MINGW_INSTALL=clang32
-
-post_install() {
-  [[ -f ${MINGW_INSTALL}/bin/gtk-update-icon-cache.exe ]] && {
-    ${MINGW_INSTALL}/bin/gtk-update-icon-cache -q -t -f ${MINGW_INSTALL}/share/icons/Adwaita
-  }
-  [[ -f ${MINGW_INSTALL}/bin/gtk-update-icon-cache-3.0.exe ]] && {
-    ${MINGW_INSTALL}/bin/gtk-update-icon-cache-3.0 -q -t -f ${MINGW_INSTALL}/share/icons/Adwaita
-  }
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/mingw-w64-adwaita-icon-theme/theme-CLANG64.install b/mingw-w64-adwaita-icon-theme/theme-CLANG64.install
deleted file mode 100644
index 0b58a62af0..0000000000
--- a/mingw-w64-adwaita-icon-theme/theme-CLANG64.install
+++ /dev/null
@@ -1,18 +0,0 @@
-MINGW_INSTALL=clang64
-
-post_install() {
-  [[ -f ${MINGW_INSTALL}/bin/gtk-update-icon-cache.exe ]] && {
-    ${MINGW_INSTALL}/bin/gtk-update-icon-cache -q -t -f ${MINGW_INSTALL}/share/icons/Adwaita
-  }
-  [[ -f ${MINGW_INSTALL}/bin/gtk-update-icon-cache-3.0.exe ]] && {
-    ${MINGW_INSTALL}/bin/gtk-update-icon-cache-3.0 -q -t -f ${MINGW_INSTALL}/share/icons/Adwaita
-  }
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/mingw-w64-adwaita-icon-theme/theme-CLANGARM64.install b/mingw-w64-adwaita-icon-theme/theme-CLANGARM64.install
deleted file mode 100644
index 7fd8fa6cbb..0000000000
--- a/mingw-w64-adwaita-icon-theme/theme-CLANGARM64.install
+++ /dev/null
@@ -1,18 +0,0 @@
-MINGW_INSTALL=clangarm64
-
-post_install() {
-  [[ -f ${MINGW_INSTALL}/bin/gtk-update-icon-cache.exe ]] && {
-    ${MINGW_INSTALL}/bin/gtk-update-icon-cache -q -t -f ${MINGW_INSTALL}/share/icons/Adwaita
-  }
-  [[ -f ${MINGW_INSTALL}/bin/gtk-update-icon-cache-3.0.exe ]] && {
-    ${MINGW_INSTALL}/bin/gtk-update-icon-cache-3.0 -q -t -f ${MINGW_INSTALL}/share/icons/Adwaita
-  }
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/mingw-w64-adwaita-icon-theme/theme-MINGW32.install b/mingw-w64-adwaita-icon-theme/theme-MINGW32.install
deleted file mode 100644
index 72e0adf25e..0000000000
--- a/mingw-w64-adwaita-icon-theme/theme-MINGW32.install
+++ /dev/null
@@ -1,18 +0,0 @@
-MINGW_INSTALL=mingw32
-
-post_install() {
-  [[ -f ${MINGW_INSTALL}/bin/gtk-update-icon-cache.exe ]] && {
-    ${MINGW_INSTALL}/bin/gtk-update-icon-cache -q -t -f ${MINGW_INSTALL}/share/icons/Adwaita
-  }
-  [[ -f ${MINGW_INSTALL}/bin/gtk-update-icon-cache-3.0.exe ]] && {
-    ${MINGW_INSTALL}/bin/gtk-update-icon-cache-3.0 -q -t -f ${MINGW_INSTALL}/share/icons/Adwaita
-  }
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/mingw-w64-adwaita-icon-theme/theme-MINGW64.install b/mingw-w64-adwaita-icon-theme/theme-MINGW64.install
deleted file mode 100644
index f9a748e89f..0000000000
--- a/mingw-w64-adwaita-icon-theme/theme-MINGW64.install
+++ /dev/null
@@ -1,18 +0,0 @@
-MINGW_INSTALL=mingw64
-
-post_install() {
-  [[ -f ${MINGW_INSTALL}/bin/gtk-update-icon-cache.exe ]] && {
-    ${MINGW_INSTALL}/bin/gtk-update-icon-cache -q -t -f ${MINGW_INSTALL}/share/icons/Adwaita
-  }
-  [[ -f ${MINGW_INSTALL}/bin/gtk-update-icon-cache-3.0.exe ]] && {
-    ${MINGW_INSTALL}/bin/gtk-update-icon-cache-3.0 -q -t -f ${MINGW_INSTALL}/share/icons/Adwaita
-  }
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/mingw-w64-adwaita-icon-theme/theme-UCRT64.install b/mingw-w64-adwaita-icon-theme/theme-UCRT64.install
deleted file mode 100644
index 7465cf5374..0000000000
--- a/mingw-w64-adwaita-icon-theme/theme-UCRT64.install
+++ /dev/null
@@ -1,18 +0,0 @@
-MINGW_INSTALL=ucrt64
-
-post_install() {
-  [[ -f ${MINGW_INSTALL}/bin/gtk-update-icon-cache.exe ]] && {
-    ${MINGW_INSTALL}/bin/gtk-update-icon-cache -q -t -f ${MINGW_INSTALL}/share/icons/Adwaita
-  }
-  [[ -f ${MINGW_INSTALL}/bin/gtk-update-icon-cache-3.0.exe ]] && {
-    ${MINGW_INSTALL}/bin/gtk-update-icon-cache-3.0 -q -t -f ${MINGW_INSTALL}/share/icons/Adwaita
-  }
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}