From d31d8cf025fa44f87b15ff5ae4837f8acefee839 Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Tue, 3 May 2022 21:35:50 +0530
Subject: [PATCH] glibmm: Revert a commit partially to fix inkscape crashes

---
 ...ommit-94ab1e5359f3bd9eb8204aadea88e0.patch | 47 +++++++++++++++++++
 mingw-w64-glibmm/PKGBUILD                     | 12 +++--
 2 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 mingw-w64-glibmm/0001-Revert-part-of-commit-94ab1e5359f3bd9eb8204aadea88e0.patch

diff --git a/mingw-w64-glibmm/0001-Revert-part-of-commit-94ab1e5359f3bd9eb8204aadea88e0.patch b/mingw-w64-glibmm/0001-Revert-part-of-commit-94ab1e5359f3bd9eb8204aadea88e0.patch
new file mode 100644
index 0000000000..5e1c6861f7
--- /dev/null
+++ b/mingw-w64-glibmm/0001-Revert-part-of-commit-94ab1e5359f3bd9eb8204aadea88e0.patch
@@ -0,0 +1,47 @@
+From 4bd41b51ff2a8dec070cb061df3c94083ceea891 Mon Sep 17 00:00:00 2001
+From: Kjell Ahlstedt <kjellahlstedt@gmail.com>
+Date: Tue, 3 May 2022 16:01:19 +0200
+Subject: [PATCH] Revert part of commit
+ 94ab1e5359f3bd9eb8204aadea88e08f52a291d8
+
+See glibmm#98
+---
+ glib/glibmm/ustring.h | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/glib/glibmm/ustring.h b/glib/glibmm/ustring.h
+index 8746ca6e..22d8abca 100644
+--- a/glib/glibmm/ustring.h
++++ b/glib/glibmm/ustring.h
+@@ -199,14 +199,7 @@ public:
+   using pointer = void;
+ 
+   inline ustring_Iterator();
+-  // A std::string::iterator can be copied to a std::string::const_iterator.
+-  template <typename T2, typename = typename std::enable_if<
+-    std::is_same<std::string::const_iterator, T>::value &&
+-    std::is_same<std::string::iterator, T2>::value, T2>::type>
+-  inline ustring_Iterator(const ustring_Iterator<T2>& other)
+-  : pos_(other.base())
+-  { }
+-  ustring_Iterator(const ustring_Iterator& other) = default;
++  inline ustring_Iterator(const ustring_Iterator<std::string::iterator>& other);
+   ustring_Iterator& operator=(const ustring_Iterator& other) = default;
+ 
+   inline value_type operator*() const;
+@@ -1169,6 +1162,12 @@ inline ustring_Iterator<T>::ustring_Iterator() : pos_()
+ {
+ }
+ 
++template <class T>
++inline ustring_Iterator<T>::ustring_Iterator(const ustring_Iterator<std::string::iterator>& other)
++: pos_(other.base())
++{
++}
++
+ template <class T>
+ inline typename ustring_Iterator<T>::value_type ustring_Iterator<T>::operator*() const
+ {
+-- 
+2.34.1
+
diff --git a/mingw-w64-glibmm/PKGBUILD b/mingw-w64-glibmm/PKGBUILD
index c3eb50abad..cda7ed981d 100644
--- a/mingw-w64-glibmm/PKGBUILD
+++ b/mingw-w64-glibmm/PKGBUILD
@@ -4,7 +4,7 @@ _realname=glibmm
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.66.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Glib-- (glibmm) is a C++ interface for glib (V2.66) (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -16,14 +16,20 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-meson"
              "${MINGW_PACKAGE_PREFIX}-pkg-config"
              "${MINGW_PACKAGE_PREFIX}-cc")
 options=('strip' '!debug' 'staticlibs')
-source=("https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz")
-sha256sums=('afb96202491485d3f44102d98219a172da2d3f9eb78fce3cfb92559ba496e499')
+source=("https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz"
+        0001-Revert-part-of-commit-94ab1e5359f3bd9eb8204aadea88e0.patch)
+sha256sums=('afb96202491485d3f44102d98219a172da2d3f9eb78fce3cfb92559ba496e499'
+            '654a7e25ff5d8d220c09ea5faa5725e26703c111870337106643799309879e91')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   # glibmm_binding test can not be built due to linking error
   sed '/glibmm_binding/d' -i tests/meson.build
+
+  # Unbreak Inkscape
+  # https://gitlab.gnome.org/GNOME/glibmm/-/issues/98
+  patch -p1 -i "${srcdir}/0001-Revert-part-of-commit-94ab1e5359f3bd9eb8204aadea88e0.patch"
 }
 
 build() {