diffstat for glibmm2.4-2.64.2 glibmm2.4-2.64.2

 changelog                       |    7 
 control                         |    3 
 control.in                      |    3 
 patches/Apply-make-dist.diff    |  352 ++++++++++++++++++++++++++++++++++++++++
 patches/Variant-Fix-C++20.patch |  236 ++++++++++++++++++++++++++
 patches/series                  |    2 
 6 files changed, 601 insertions(+), 2 deletions(-)

diff -Nru glibmm2.4-2.64.2/debian/changelog glibmm2.4-2.64.2/debian/changelog
--- glibmm2.4-2.64.2/debian/changelog	2021-10-07 13:12:00.000000000 +0300
+++ glibmm2.4-2.64.2/debian/changelog	2021-12-28 19:00:04.000000000 +0300
@@ -1,3 +1,10 @@
+glibmm2.4 (2.64.2-2ubuntu0.1) impish-updates; urgency=medium
+
+  * Fix compiling in C++20 mode with GCC 11. (LP: #1955044)
+  * Regenerate distributed headers by means of `make dist`.
+
+ -- Nicholas Guriev <guriev-ns@ya.ru>  Tue, 28 Dec 2021 19:00:04 +0300
+
 glibmm2.4 (2.64.2-2build1) impish; urgency=medium
 
   * No-change rebuild to build packages with zstd compression.
diff -Nru glibmm2.4-2.64.2/debian/control glibmm2.4-2.64.2/debian/control
--- glibmm2.4-2.64.2/debian/control	2020-06-24 20:12:03.000000000 +0300
+++ glibmm2.4-2.64.2/debian/control	2021-12-28 18:09:22.000000000 +0300
@@ -5,7 +5,8 @@
 Source: glibmm2.4
 Section: libs
 Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
 Uploaders: Jeremy Bicha <jbicha@debian.org>
 Build-Depends: debhelper-compat (= 12),
                dh-sequence-gnome,
diff -Nru glibmm2.4-2.64.2/debian/control.in glibmm2.4-2.64.2/debian/control.in
--- glibmm2.4-2.64.2/debian/control.in	2020-06-24 20:12:03.000000000 +0300
+++ glibmm2.4-2.64.2/debian/control.in	2021-12-28 18:09:22.000000000 +0300
@@ -1,7 +1,8 @@
 Source: glibmm2.4
 Section: libs
 Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper-compat (= 12),
                dh-sequence-gnome,
diff -Nru glibmm2.4-2.64.2/debian/patches/Apply-make-dist.diff glibmm2.4-2.64.2/debian/patches/Apply-make-dist.diff
--- glibmm2.4-2.64.2/debian/patches/Apply-make-dist.diff	1970-01-01 03:00:00.000000000 +0300
+++ glibmm2.4-2.64.2/debian/patches/Apply-make-dist.diff	2021-12-28 11:50:33.000000000 +0300
@@ -0,0 +1,352 @@
+--- a/glib/glibmm/variant.h
++++ b/glib/glibmm/variant.h
+@@ -953,7 +953,7 @@ public:
+   using CppContainerType = Variant<VariantBase>;
+ 
+   /// Default constructor.
+-  Variant<VariantBase>();
++  Variant();
+ 
+   /** GVariant constructor.
+    * @param castitem The GVariant to wrap.
+@@ -961,7 +961,7 @@ public:
+    * GVariant or not (not taking one could destroy the GVariant with the
+    * wrapper).
+    */
+-  explicit Variant<VariantBase>(GVariant* castitem, bool take_a_reference = false);
++  explicit Variant(GVariant* castitem, bool take_a_reference = false);
+ 
+   /** Gets the VariantType.
+    * @return The VariantType.
+@@ -1014,7 +1014,7 @@ public:
+   using CppContainerType = Variant<CppType>;
+ 
+   /// Default constructor.
+-  Variant< Variant<T> >();
++  Variant();
+ 
+   /** GVariant constructor.
+    * @param castitem The GVariant to wrap.
+@@ -1023,7 +1023,7 @@ public:
+    * wrapper).
+    * @newin{2,36}
+    */
+-  explicit Variant< Variant<T> >(GVariant* castitem, bool take_a_reference = false);
++  explicit Variant(GVariant* castitem, bool take_a_reference = false);
+ 
+   /** Gets the VariantType.
+    * @return The VariantType.
+@@ -1067,7 +1067,7 @@ public:
+   using CppType = Glib::ustring;
+ 
+   /// Default constructor.
+-  Variant<Glib::ustring>();
++  Variant();
+ 
+   /** GVariant constructor.
+    * @param castitem The GVariant to wrap.
+@@ -1075,7 +1075,7 @@ public:
+    * GVariant or not (not taking one could destroy the GVariant with the
+    * wrapper).
+    */
+-  explicit Variant<Glib::ustring>(GVariant* castitem,  bool take_a_reference = false);
++  explicit Variant(GVariant* castitem,  bool take_a_reference = false);
+ 
+   /** Gets the VariantType.
+    * @return The VariantType.
+@@ -1237,7 +1237,7 @@ public:
+   using CppType = std::string;
+ 
+   /// Default constructor.
+-  Variant<std::string>();
++  Variant();
+ 
+   /** GVariant constructor.
+    * @param castitem The GVariant to wrap.
+@@ -1245,7 +1245,7 @@ public:
+    * GVariant or not (not taking one could destroy the GVariant with the
+    * wrapper).
+    */
+-  explicit Variant<std::string>(GVariant* castitem, bool take_a_reference = false);
++  explicit Variant(GVariant* castitem, bool take_a_reference = false);
+ 
+   /** Gets the VariantType.
+    * @return The VariantType.
+@@ -1283,7 +1283,7 @@ public:
+   using CppContainerType = Variant<CppType>;
+ 
+   /// Default constructor.
+-  Variant< std::pair<K, V> >()
++  Variant()
+   : VariantContainerBase()
+   {}
+ 
+@@ -1293,7 +1293,7 @@ public:
+    * GVariant or not (not taking one could destroy the GVariant with the
+    * wrapper).
+    */
+-  explicit Variant< std::pair<K, V> >(GVariant* castitem,
++  explicit Variant(GVariant* castitem,
+     bool take_a_reference = false)
+   : VariantContainerBase(castitem, take_a_reference)
+   {}
+@@ -1332,7 +1332,7 @@ public:
+   using CppContainerType = std::vector<T>;
+ 
+   /// Default constructor.
+-  Variant< std::vector<T> >()
++  Variant()
+   : VariantContainerBase()
+   {}
+ 
+@@ -1342,7 +1342,7 @@ public:
+    * GVariant or not (not taking one could destroy the GVariant with the
+    * wrapper).
+    */
+-  explicit Variant< std::vector<T> >(GVariant* castitem,
++  explicit Variant(GVariant* castitem,
+     bool take_a_reference = false)
+   : VariantContainerBase(castitem, take_a_reference)
+   {}
+@@ -1401,7 +1401,7 @@ public:
+   using CppContainerType = std::vector<Glib::ustring>;
+ 
+   /// Default constructor.
+-  Variant< std::vector<Glib::ustring> >();
++  Variant();
+ 
+   /** GVariant constructor.
+    * @param castitem The GVariant to wrap.
+@@ -1409,7 +1409,7 @@ public:
+    * GVariant or not (not taking one could destroy the GVariant with the
+    * wrapper).
+    */
+-  explicit Variant< std::vector<Glib::ustring> >(GVariant* castitem, bool take_a_reference = false);
++  explicit Variant(GVariant* castitem, bool take_a_reference = false);
+ 
+   /** Gets the VariantType.
+    * @return The VariantType.
+@@ -1527,7 +1527,7 @@ public:
+   using CppContainerType = std::vector<std::string>;
+ 
+   /// Default constructor.
+-  Variant< std::vector<std::string> >();
++  Variant();
+ 
+   /** GVariant constructor.
+    * @param castitem The GVariant to wrap.
+@@ -1535,7 +1535,7 @@ public:
+    * GVariant or not (not taking one could destroy the GVariant with the
+    * wrapper).
+    */
+-  explicit Variant< std::vector<std::string> >(GVariant* castitem, bool take_a_reference = false);
++  explicit Variant(GVariant* castitem, bool take_a_reference = false);
+ 
+   /** Gets the VariantType.
+    * @return The VariantType.
+@@ -1603,7 +1603,7 @@ public:
+   using CppContainerType = std::map<K, V>;
+ 
+   /// Default constructor.
+-  Variant< std::map<K, V> >()
++  Variant()
+   : VariantContainerBase()
+   {}
+ 
+@@ -1613,7 +1613,7 @@ public:
+    * GVariant or not (not taking one could destroy the GVariant with the
+    * wrapper).
+    */
+-  explicit Variant< std::map<K, V> >(GVariant* castitem,
++  explicit Variant(GVariant* castitem,
+     bool take_a_reference = false)
+   : VariantContainerBase(castitem, take_a_reference)
+   {}
+@@ -1676,7 +1676,7 @@ public:
+   using CppContainerType = std::tuple<Types...>;
+ 
+   /// Default constructor
+-  Variant<std::tuple<Types...>>()
++  Variant()
+   : VariantContainerBase()
+   {}
+ 
+@@ -1685,7 +1685,7 @@ public:
+    * @param take_a_reference Whether to take an extra reference of the GVariant
+    *        or not (not taking one could destroy the GVariant with the wrapper).
+    */
+-  explicit Variant<std::tuple<Types...>>(GVariant* castitem, bool take_a_reference = false)
++  explicit Variant(GVariant* castitem, bool take_a_reference = false)
+   : VariantContainerBase(castitem, take_a_reference)
+   {}
+ 
+--- a/glib/glibmm/variant_basictypes.h
++++ b/glib/glibmm/variant_basictypes.h
+@@ -1,4 +1,4 @@
+-// This is a generated file. Do not edit it.  Generated from /home/kjell/checkout/gnome/glibmm-2.4/glib/src/variant_basictypes.h.m4
++// This is a generated file. Do not edit it.  Generated from variant_basictypes.h.m4
+ 
+ #ifndef DOXYGEN_SHOULD_SKIP_THIS
+ #ifndef _GLIBMM_VARIANT_H_INCLUDE_VARIANT_BASICTYPES_H
+@@ -20,7 +20,7 @@ public:
+   using CType = gboolean;
+ 
+   /// Default constructor.
+-  Variant<bool>()
++  Variant()
+   : VariantBase()
+   {}
+ 
+@@ -30,7 +30,7 @@ public:
+    * GVariant or not (not taking one could destroy the GVariant with the
+    * wrapper).
+    */
+-  explicit Variant<bool>(GVariant* castitem, bool take_a_reference = false)
++  explicit Variant(GVariant* castitem, bool take_a_reference = false)
+   : VariantBase(castitem, take_a_reference)
+   {}
+ 
+@@ -63,7 +63,7 @@ public:
+   using CType = guchar;
+ 
+   /// Default constructor.
+-  Variant<unsigned char>()
++  Variant()
+   : VariantBase()
+   {}
+ 
+@@ -73,7 +73,7 @@ public:
+    * GVariant or not (not taking one could destroy the GVariant with the
+    * wrapper).
+    */
+-  explicit Variant<unsigned char>(GVariant* castitem, bool take_a_reference = false)
++  explicit Variant(GVariant* castitem, bool take_a_reference = false)
+   : VariantBase(castitem, take_a_reference)
+   {}
+ 
+@@ -106,7 +106,7 @@ public:
+   using CType = gint16;
+ 
+   /// Default constructor.
+-  Variant<gint16>()
++  Variant()
+   : VariantBase()
+   {}
+ 
+@@ -116,7 +116,7 @@ public:
+    * GVariant or not (not taking one could destroy the GVariant with the
+    * wrapper).
+    */
+-  explicit Variant<gint16>(GVariant* castitem, bool take_a_reference = false)
++  explicit Variant(GVariant* castitem, bool take_a_reference = false)
+   : VariantBase(castitem, take_a_reference)
+   {}
+ 
+@@ -149,7 +149,7 @@ public:
+   using CType = guint16;
+ 
+   /// Default constructor.
+-  Variant<guint16>()
++  Variant()
+   : VariantBase()
+   {}
+ 
+@@ -159,7 +159,7 @@ public:
+    * GVariant or not (not taking one could destroy the GVariant with the
+    * wrapper).
+    */
+-  explicit Variant<guint16>(GVariant* castitem, bool take_a_reference = false)
++  explicit Variant(GVariant* castitem, bool take_a_reference = false)
+   : VariantBase(castitem, take_a_reference)
+   {}
+ 
+@@ -192,7 +192,7 @@ public:
+   using CType = gint32;
+ 
+   /// Default constructor.
+-  Variant<gint32>()
++  Variant()
+   : VariantBase()
+   {}
+ 
+@@ -202,7 +202,7 @@ public:
+    * GVariant or not (not taking one could destroy the GVariant with the
+    * wrapper).
+    */
+-  explicit Variant<gint32>(GVariant* castitem, bool take_a_reference = false)
++  explicit Variant(GVariant* castitem, bool take_a_reference = false)
+   : VariantBase(castitem, take_a_reference)
+   {}
+ 
+@@ -241,7 +241,7 @@ public:
+   using CType = guint32;
+ 
+   /// Default constructor.
+-  Variant<guint32>()
++  Variant()
+   : VariantBase()
+   {}
+ 
+@@ -251,7 +251,7 @@ public:
+    * GVariant or not (not taking one could destroy the GVariant with the
+    * wrapper).
+    */
+-  explicit Variant<guint32>(GVariant* castitem, bool take_a_reference = false)
++  explicit Variant(GVariant* castitem, bool take_a_reference = false)
+   : VariantBase(castitem, take_a_reference)
+   {}
+ 
+@@ -284,7 +284,7 @@ public:
+   using CType = gint64;
+ 
+   /// Default constructor.
+-  Variant<gint64>()
++  Variant()
+   : VariantBase()
+   {}
+ 
+@@ -294,7 +294,7 @@ public:
+    * GVariant or not (not taking one could destroy the GVariant with the
+    * wrapper).
+    */
+-  explicit Variant<gint64>(GVariant* castitem, bool take_a_reference = false)
++  explicit Variant(GVariant* castitem, bool take_a_reference = false)
+   : VariantBase(castitem, take_a_reference)
+   {}
+ 
+@@ -327,7 +327,7 @@ public:
+   using CType = guint64;
+ 
+   /// Default constructor.
+-  Variant<guint64>()
++  Variant()
+   : VariantBase()
+   {}
+ 
+@@ -337,7 +337,7 @@ public:
+    * GVariant or not (not taking one could destroy the GVariant with the
+    * wrapper).
+    */
+-  explicit Variant<guint64>(GVariant* castitem, bool take_a_reference = false)
++  explicit Variant(GVariant* castitem, bool take_a_reference = false)
+   : VariantBase(castitem, take_a_reference)
+   {}
+ 
+@@ -370,7 +370,7 @@ public:
+   using CType = gdouble;
+ 
+   /// Default constructor.
+-  Variant<double>()
++  Variant()
+   : VariantBase()
+   {}
+ 
+@@ -380,7 +380,7 @@ public:
+    * GVariant or not (not taking one could destroy the GVariant with the
+    * wrapper).
+    */
+-  explicit Variant<double>(GVariant* castitem, bool take_a_reference = false)
++  explicit Variant(GVariant* castitem, bool take_a_reference = false)
+   : VariantBase(castitem, take_a_reference)
+   {}
+ 
diff -Nru glibmm2.4-2.64.2/debian/patches/series glibmm2.4-2.64.2/debian/patches/series
--- glibmm2.4-2.64.2/debian/patches/series	2020-06-24 20:12:03.000000000 +0300
+++ glibmm2.4-2.64.2/debian/patches/series	2021-12-28 11:50:33.000000000 +0300
@@ -1 +1,3 @@
 01-disable-tls-test.patch
+Variant-Fix-C++20.patch
+Apply-make-dist.diff
diff -Nru glibmm2.4-2.64.2/debian/patches/Variant-Fix-C++20.patch glibmm2.4-2.64.2/debian/patches/Variant-Fix-C++20.patch
--- glibmm2.4-2.64.2/debian/patches/Variant-Fix-C++20.patch	1970-01-01 03:00:00.000000000 +0300
+++ glibmm2.4-2.64.2/debian/patches/Variant-Fix-C++20.patch	2021-12-28 11:50:33.000000000 +0300
@@ -0,0 +1,236 @@
+From 75bb943092d4584b8061376a16079a51f72d2f0a Mon Sep 17 00:00:00 2001
+From: Magne Oestlyngen <magne@spacetec.no>
+Date: Tue, 6 Apr 2021 14:59:16 +0200
+Subject: [PATCH] Variant: Fix so it works with C++20
+
+C++20 changed some aspects of templates that broke variant.h on
+some compilers (GCC 11).
+
+Ref: https://wg21.cmeerw.net/cwg/issue2237
+
+  template<class T>
+  struct A {
+    A<T>();  // ok pre-C++20, now incorrect
+//  A();     // correct for all versions
+  };
+
+This commit removes the "simple-template-id" from both the default
+constructor (no args) and the explicit constructor (has args), even
+though only the default constructor currently gives error on GCC 11.
+Since both versions are wrong according to the issue referred to above
+it is expected that GCC (and possibly other compilers) will be updated
+to fail on both cases in the future.
+---
+ glib/src/variant.hg              | 40 ++++++++++++++++----------------
+ glib/src/variant_basictypes.h.m4 |  4 ++--
+ 2 files changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/glib/src/variant.hg b/glib/src/variant.hg
+index 0918d4d7..35f6bd83 100644
+--- a/glib/src/variant.hg
++++ b/glib/src/variant.hg
+@@ -457,7 +457,7 @@ public:
+   using CppContainerType = Variant<VariantBase>;
+ 
+   /// Default constructor.
+-  Variant<VariantBase>();
++  Variant();
+ 
+   /** GVariant constructor.
+    * @param castitem The GVariant to wrap.
+@@ -465,7 +465,7 @@ public:
+    * GVariant or not (not taking one could destroy the GVariant with the
+    * wrapper).
+    */
+-  explicit Variant<VariantBase>(GVariant* castitem, bool take_a_reference = false);
++  explicit Variant(GVariant* castitem, bool take_a_reference = false);
+ 
+   /** Gets the VariantType.
+    * @return The VariantType.
+@@ -508,7 +508,7 @@ public:
+   using CppContainerType = Variant<CppType>;
+ 
+   /// Default constructor.
+-  Variant< Variant<T> >();
++  Variant();
+ 
+   /** GVariant constructor.
+    * @param castitem The GVariant to wrap.
+@@ -517,7 +517,7 @@ public:
+    * wrapper).
+    * @newin{2,36}
+    */
+-  explicit Variant< Variant<T> >(GVariant* castitem, bool take_a_reference = false);
++  explicit Variant(GVariant* castitem, bool take_a_reference = false);
+ 
+   /** Gets the VariantType.
+    * @return The VariantType.
+@@ -554,7 +554,7 @@ public:
+   using CppType = Glib::ustring;
+ 
+   /// Default constructor.
+-  Variant<Glib::ustring>();
++  Variant();
+ 
+   /** GVariant constructor.
+    * @param castitem The GVariant to wrap.
+@@ -562,7 +562,7 @@ public:
+    * GVariant or not (not taking one could destroy the GVariant with the
+    * wrapper).
+    */
+-  explicit Variant<Glib::ustring>(GVariant* castitem,  bool take_a_reference = false);
++  explicit Variant(GVariant* castitem,  bool take_a_reference = false);
+ 
+   /** Gets the VariantType.
+    * @return The VariantType.
+@@ -694,7 +694,7 @@ public:
+   using CppType = std::string;
+ 
+   /// Default constructor.
+-  Variant<std::string>();
++  Variant();
+ 
+   /** GVariant constructor.
+    * @param castitem The GVariant to wrap.
+@@ -702,7 +702,7 @@ public:
+    * GVariant or not (not taking one could destroy the GVariant with the
+    * wrapper).
+    */
+-  explicit Variant<std::string>(GVariant* castitem, bool take_a_reference = false);
++  explicit Variant(GVariant* castitem, bool take_a_reference = false);
+ 
+   /** Gets the VariantType.
+    * @return The VariantType.
+@@ -735,7 +735,7 @@ public:
+   using CppContainerType = Variant<CppType>;
+ 
+   /// Default constructor.
+-  Variant< std::pair<K, V> >()
++  Variant()
+   : VariantContainerBase()
+   {}
+ 
+@@ -745,7 +745,7 @@ public:
+    * GVariant or not (not taking one could destroy the GVariant with the
+    * wrapper).
+    */
+-  explicit Variant< std::pair<K, V> >(GVariant* castitem,
++  explicit Variant(GVariant* castitem,
+     bool take_a_reference = false)
+   : VariantContainerBase(castitem, take_a_reference)
+   {}
+@@ -784,7 +784,7 @@ public:
+   using CppContainerType = std::vector<T>;
+ 
+   /// Default constructor.
+-  Variant< std::vector<T> >()
++  Variant()
+   : VariantContainerBase()
+   {}
+ 
+@@ -794,7 +794,7 @@ public:
+    * GVariant or not (not taking one could destroy the GVariant with the
+    * wrapper).
+    */
+-  explicit Variant< std::vector<T> >(GVariant* castitem,
++  explicit Variant(GVariant* castitem,
+     bool take_a_reference = false)
+   : VariantContainerBase(castitem, take_a_reference)
+   {}
+@@ -853,7 +853,7 @@ public:
+   using CppContainerType = std::vector<Glib::ustring>;
+ 
+   /// Default constructor.
+-  Variant< std::vector<Glib::ustring> >();
++  Variant();
+ 
+   /** GVariant constructor.
+    * @param castitem The GVariant to wrap.
+@@ -861,7 +861,7 @@ public:
+    * GVariant or not (not taking one could destroy the GVariant with the
+    * wrapper).
+    */
+-  explicit Variant< std::vector<Glib::ustring> >(GVariant* castitem, bool take_a_reference = false);
++  explicit Variant(GVariant* castitem, bool take_a_reference = false);
+ 
+   /** Gets the VariantType.
+    * @return The VariantType.
+@@ -979,7 +979,7 @@ public:
+   using CppContainerType = std::vector<std::string>;
+ 
+   /// Default constructor.
+-  Variant< std::vector<std::string> >();
++  Variant();
+ 
+   /** GVariant constructor.
+    * @param castitem The GVariant to wrap.
+@@ -987,7 +987,7 @@ public:
+    * GVariant or not (not taking one could destroy the GVariant with the
+    * wrapper).
+    */
+-  explicit Variant< std::vector<std::string> >(GVariant* castitem, bool take_a_reference = false);
++  explicit Variant(GVariant* castitem, bool take_a_reference = false);
+ 
+   /** Gets the VariantType.
+    * @return The VariantType.
+@@ -1055,7 +1055,7 @@ public:
+   using CppContainerType = std::map<K, V>;
+ 
+   /// Default constructor.
+-  Variant< std::map<K, V> >()
++  Variant()
+   : VariantContainerBase()
+   {}
+ 
+@@ -1065,7 +1065,7 @@ public:
+    * GVariant or not (not taking one could destroy the GVariant with the
+    * wrapper).
+    */
+-  explicit Variant< std::map<K, V> >(GVariant* castitem,
++  explicit Variant(GVariant* castitem,
+     bool take_a_reference = false)
+   : VariantContainerBase(castitem, take_a_reference)
+   {}
+@@ -1128,7 +1128,7 @@ public:
+   using CppContainerType = std::tuple<Types...>;
+ 
+   /// Default constructor
+-  Variant<std::tuple<Types...>>()
++  Variant()
+   : VariantContainerBase()
+   {}
+ 
+@@ -1137,7 +1137,7 @@ public:
+    * @param take_a_reference Whether to take an extra reference of the GVariant
+    *        or not (not taking one could destroy the GVariant with the wrapper).
+    */
+-  explicit Variant<std::tuple<Types...>>(GVariant* castitem, bool take_a_reference = false)
++  explicit Variant(GVariant* castitem, bool take_a_reference = false)
+   : VariantContainerBase(castitem, take_a_reference)
+   {}
+ 
+diff --git a/glib/src/variant_basictypes.h.m4 b/glib/src/variant_basictypes.h.m4
+index 199295b9..f73992fd 100644
+--- a/glib/src/variant_basictypes.h.m4
++++ b/glib/src/variant_basictypes.h.m4
+@@ -45,7 +45,7 @@ public:
+   using CType = $2;
+ 
+   /// Default constructor.
+-  Variant<$1>()
++  Variant()
+   : VariantBase()
+   {}
+ 
+@@ -55,7 +55,7 @@ public:
+    * GVariant or not (not taking one could destroy the GVariant with the
+    * wrapper).
+    */
+-  explicit Variant<$1>(GVariant* castitem, bool take_a_reference = false)
++  explicit Variant(GVariant* castitem, bool take_a_reference = false)
+   : VariantBase(castitem, take_a_reference)
+   {}
+ 
+-- 
+GitLab
+