[arch-commits] Commit in glibmm/trunk (2 files)

[Jan Steffens]

    Date: Wednesday, May 4, 2022 @ 12:47:47
  Author: heftig
Revision: 444607

2.66.4-1

Modified:
  glibmm/trunk/PKGBUILD
Deleted:
  glibmm/trunk/0001-Revert-part-of-commit-94ab1e5359f3bd9eb8204aadea88e0.patch

-----------------------------------------------------------------+
 0001-Revert-part-of-commit-94ab1e5359f3bd9eb8204aadea88e0.patch |   47 ----------
 PKGBUILD                                                        |   16 +--
 2 files changed, 5 insertions(+), 58 deletions(-)

Deleted: 0001-Revert-part-of-commit-94ab1e5359f3bd9eb8204aadea88e0.patch
===================================================================
--- 0001-Revert-part-of-commit-94ab1e5359f3bd9eb8204aadea88e0.patch	2022-05-04 12:43:20 UTC (rev 444606)
+++ 0001-Revert-part-of-commit-94ab1e5359f3bd9eb8204aadea88e0.patch	2022-05-04 12:47:47 UTC (rev 444607)
@@ -1,47 +0,0 @@
-From 4bd41b51ff2a8dec070cb061df3c94083ceea891 Mon Sep 17 00:00:00 2001
-From: Kjell Ahlstedt <kjellahlstedt at 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
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-04 12:43:20 UTC (rev 444606)
+++ PKGBUILD	2022-05-04 12:47:47 UTC (rev 444607)
@@ -4,8 +4,8 @@
 
 pkgbase=glibmm
 pkgname=(glibmm glibmm-docs)
-pkgver=2.66.3
-pkgrel=3
+pkgver=2.66.4
+pkgrel=1
 pkgdesc="C++ bindings for GLib"
 url="https://www.gtkmm.org/"
 arch=(x86_64)
@@ -14,11 +14,9 @@
 makedepends=(git meson mm-common perl-xml-parser clang)
 checkdepends=(glib-networking)
 options=(!emptydirs debug)
-_commit=ccf78e04ac9d72d7f5c6b09a17204b2dfcbfd0df  # tags/2.66.3^0
-source=("git+https://gitlab.gnome.org/GNOME/glibmm.git#commit=$_commit"
-        0001-Revert-part-of-commit-94ab1e5359f3bd9eb8204aadea88e0.patch)
-sha256sums=('SKIP'
-            '654a7e25ff5d8d220c09ea5faa5725e26703c111870337106643799309879e91')
+_commit=646ca2c15dd03f804b92e3d547f22aa999a21677  # tags/2.66.4^0
+source=("git+https://gitlab.gnome.org/GNOME/glibmm.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd glibmm
@@ -27,10 +25,6 @@
 
 prepare() {
   cd glibmm
-
-  # Unbreak Inkscape
-  # https://gitlab.gnome.org/GNOME/glibmm/-/issues/98
-  git apply -3 ../0001-Revert-part-of-commit-94ab1e5359f3bd9eb8204aadea88e0.patch
 }
 
 build() {