From fc256b2e67392baaa1b86b8eaecf20667e173b9f Mon Sep 17 00:00:00 2001
From: Gabriel Rauter <rauter.gabriel@gmail.com>
Date: Thu, 24 Mar 2022 13:07:23 +0100
Subject: [PATCH] baobab: update to 42.0, remove upstreamed patch

Removed the upstreamed patch for windows icon in gtk3. Even though this
patch is upstreamed, the fix does not work anymore for gtk4 and the 42
release.
---
 ...n-icon-name-in-baobab-main-window.ui.patch | 27 -------------------
 mingw-w64-baobab/PKGBUILD                     | 16 +++++------
 2 files changed, 6 insertions(+), 37 deletions(-)
 delete mode 100644 mingw-w64-baobab/0001-Fix-application-icon-name-in-baobab-main-window.ui.patch

diff --git a/mingw-w64-baobab/0001-Fix-application-icon-name-in-baobab-main-window.ui.patch b/mingw-w64-baobab/0001-Fix-application-icon-name-in-baobab-main-window.ui.patch
deleted file mode 100644
index 8fc9ec5cbc..0000000000
--- a/mingw-w64-baobab/0001-Fix-application-icon-name-in-baobab-main-window.ui.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From cb4216a709e9364e3c17ddebd7cdfb9a85089391 Mon Sep 17 00:00:00 2001
-From: Gabriel Rauter <rauter.gabriel@gmail.com>
-Date: Sat, 22 Aug 2020 10:53:58 +0200
-Subject: [PATCH] Fix application icon name in baobab-main-window.ui
-
-Use the correct named icon for the window. This is needed to get the
-right icon on mingw builds.
----
- data/ui/baobab-main-window.ui | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/ui/baobab-main-window.ui b/data/ui/baobab-main-window.ui
-index b677cb5..2590abc 100644
---- a/data/ui/baobab-main-window.ui
-+++ b/data/ui/baobab-main-window.ui
-@@ -64,7 +64,7 @@
-   </object>
-   <template class="BaobabWindow" parent="HdyApplicationWindow">
-     <property name="title" translatable="yes">Disk Usage Analyzer</property>
--    <property name="icon_name">baobab</property>
-+    <property name="icon_name">org.gnome.baobab</property>
-     <child>
-       <object class="GtkBox" id="vbox">
-       <property name="orientation">vertical</property>
--- 
-2.31.1
-
diff --git a/mingw-w64-baobab/PKGBUILD b/mingw-w64-baobab/PKGBUILD
index c6bc5501b0..a83873f2ce 100644
--- a/mingw-w64-baobab/PKGBUILD
+++ b/mingw-w64-baobab/PKGBUILD
@@ -3,36 +3,32 @@
 _realname=baobab
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=41.0
+pkgver=42.0
 pkgrel=1
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 pkgdesc="A graphical directory tree analyzer (mingw-w64)"
 url="https://wiki.gnome.org/Apps/DiskUsageAnalyzer"
-depends=("${MINGW_PACKAGE_PREFIX}-gsettings-desktop-schemas"
-         "${MINGW_PACKAGE_PREFIX}-gobject-introspection-runtime"
-         "${MINGW_PACKAGE_PREFIX}-libhandy"
+depends=("${MINGW_PACKAGE_PREFIX}-gobject-introspection-runtime"
+         "${MINGW_PACKAGE_PREFIX}-gsettings-desktop-schemas"
+         "${MINGW_PACKAGE_PREFIX}-gtk4"
+         "${MINGW_PACKAGE_PREFIX}-libadwaita"
          "${MINGW_PACKAGE_PREFIX}-librsvg")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-vala"
              "${MINGW_PACKAGE_PREFIX}-gobject-introspection"
              "${MINGW_PACKAGE_PREFIX}-yelp-tools"
              "${MINGW_PACKAGE_PREFIX}-appstream-glib"
-             "${MINGW_PACKAGE_PREFIX}-pkg-config"
              "${MINGW_PACKAGE_PREFIX}-meson")
 options=('strip' 'staticlibs')
 license=("GPL2")
 source=("https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz"
-        "0001-Fix-application-icon-name-in-baobab-main-window.ui.patch"
         "0001-Open-directory-in-explorer.patch")
-sha256sums=('cad6278d2dcc80c84b57105aa5bb58d8a30ce98d6fabd767519ddb86c857e855'
-            '53b44512790623b318c07584ea72c85acaf5c1280c00dde8969e863010cb183c'
+sha256sums=('4b1aabe6bab1582b3fea79a2829bce7f2415bb6e5062f25357aeedd5317a50dc'
             '5373f48a42f48adb951f7eefe0330034f865f91e736ad8e54f29206b971df18e')
 
 prepare() {
     cd "${_realname}-${pkgver}"
-    # https://gitlab.gnome.org/GNOME/baobab/-/merge_requests/23
-    patch --forward --strip=1 --input="${srcdir}/0001-Fix-application-icon-name-in-baobab-main-window.ui.patch"
     patch --forward --strip=1 --input="${srcdir}/0001-Open-directory-in-explorer.patch"
 }