gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-05 12:38:09 -07:00
Code Issues Projects Releases Wiki Activity

dev-cpp/glibmm: add 2.88.1, w/ G_GNUC_CONST fix

Browse Source 
* mmgir is off by default but it brings in some new deps, so let's
  disable it explicitly to avoid accidents.

* Include fix for G_GNUC_CONST. It's not yet merged upstream (though
  its counterpart in glib has been) and not in a release, so we need
  to enable maintainer mode to regenerate the files affected by the
  changes.

Bug: https://bugs.gentoo.org/970774
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2026-06-28 23:05:51 +01:00
parent 62f4d8acb4
commit 67f70a9ada
3 changed files with 512 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dev-cpp/glibmm/Manifest
View File

@@ -1,3 +1,4 @@
DIST glibmm-2.66.8.tar.xz 8597344 BLAKE2B 43ce7739259b928ed71946b3de8090aab9c4c900d8233dbe16cef2a1ff9b9521f304b50bf4a57c9398aaa8deed882600814551404991d1cdd09b3c45bb461cc7 SHA512 4ebf203324d3ee95c47012915efb39d4dc59eb7a6f337e7b8c7c0b3589574b07967974363931b0d4159618f88178b04715b2c359c3dc3f67a7781bfac0d9f277
DIST glibmm-2.84.0.tar.xz 9596876 BLAKE2B efbf89adaed0d673bc6391f44205cdbfa5400c4137a199cb69bb7580b81ae0e2d2304906b0b15409c68b369929d44fb2b9134d23638d7244a69f92ccfc7a8402 SHA512 dbe7d7b39ccf4a4acb0a67a0eab1a4b5f47dff3c0ae645aa2eaca498b646ee2da0f6f8ef81b3253621119d94bcdc3b1d4dcbf234eedfbd20aaa065c430e67daf
DIST glibmm-2.88.0.tar.xz 9523144 BLAKE2B 614ef69c23345b4080656e55c24cb4781682d6a5cbb05377022921fac533509c7187590080ce2c1819f57d364bc6d9528e2aa2c62cdd71741b91f592a7da6825 SHA512 550c9087ead950de3d7de2eac29ea7cab23c70ce1a0081c162df0369765d547d754dc296a0f06ab494df01f43f7bab29dfb88b6d2fdf920eebc3aef896dff1f0
DIST glibmm-2.88.1.tar.xz 10282176 BLAKE2B 9b3f3528cc7cd4a173a22d85d320e9a39e5bbd3054fbab4d23f08ab6aa173b1ed2bc4ef675c0a4b34596b33935fbb82a80802fd31e078a87eca3025944557748 SHA512 af05171b4651e94f4ef0d8e06a27160cd1a7b0a4e596ba7b6584567564829a60031f27ab96a25ba7fefb6395026f4cb40a5eaf1c5bc2e15428c18fd4d52b9328

450
dev-cpp/glibmm/files/glibmm-2.88.1-const-whoops.patch Normal file
View File

@@ -0,0 +1,450 @@
https://gitlab.gnome.org/GNOME/glibmm/-/merge_requests/77
From fa0d3e3f1159f509ab3181c4a9880431eeb6539c Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Mon, 22 Jun 2026 00:23:05 +0100
Subject: [PATCH 1/2] tools: drop G_GNUC_CONST for get_type with pointer
argument
GCC's documentation for the `const` attribute [0] says:
> Note that a function that has pointer arguments and examines the data pointed
> to must not be declared const if the pointed-to data might change between
> successive invocations of the function.
Note that "might change" here is quite aggressive: it includes "if the
pointer escapes at all", e.g. if it's some malloc'd memory that gets reused
internally later too without something resetting its lifetime.
The `pure` attribute would be appropriate here *if* there's no state
changes even on the first run.
[0] https://gcc.gnu.org/onlinedocs/gcc/Common-Attributes.html#index-const
Bug: https://gitlab.gnome.org/GNOME/glib/-/work_items/3984
Signed-off-by: Sam James <sam@gentoo.org>
---
tools/m4/class_gobject.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/m4/class_gobject.m4 b/tools/m4/class_gobject.m4
index bcf0572c..2f9d5f1a 100644
--- a/tools/m4/class_gobject.m4
+++ b/tools/m4/class_gobject.m4
@@ -302,7 +302,7 @@ _IMPORT(SECTION_DTOR_DOCUMENTATION)
#ifndef DOXYGEN_SHOULD_SKIP_THIS
ifdef(`__BOOL_DYNAMIC_GTYPE_REGISTRATION__',`
- static GType get_type(GTypeModule* module) G_GNUC_CONST;
+ static GType get_type(GTypeModule* module);
',`')
static GType get_base_type() G_GNUC_CONST;
--
GitLab
From 287cbcf768644c49196efcb42bfca2560721331d Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Mon, 22 Jun 2026 00:46:36 +0100
Subject: [PATCH 2/2] Drop G_GNUC_CONST as in glib
This mirrors 016829559e75a1be24d637cad958a2cb00c6791d in glib, where
the attributes were dropped because their use was invalid.
This fixes glibmm being miscompiled by trunk GCC.
Bug: https://gitlab.gnome.org/GNOME/glib/-/work_items/3984
Signed-off-by: Sam James <sam@gentoo.org>
---
glib/glibmm/interface.h | 4 ++--
glib/glibmm/object.h | 4 ++--
glib/glibmm/objectbase.h | 2 +-
glib/glibmm/value.h | 12 ++++++------
glib/glibmm/value_custom.h | 4 ++--
glib/src/value_basictypes.h.m4 | 2 +-
glib/src/variant.hg | 26 +++++++++++++-------------
glib/src/variant_basictypes.h.m4 | 2 +-
tools/m4/class_boxedtype.m4 | 2 +-
tools/m4/class_boxedtype_static.m4 | 2 +-
tools/m4/class_gobject.m4 | 4 ++--
tools/m4/class_interface.m4 | 4 ++--
tools/m4/class_opaque_refcounted.m4 | 2 +-
tools/m4/enum.m4 | 2 +-
tools/m4/gerror.m4 | 2 +-
15 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/glib/glibmm/interface.h b/glib/glibmm/interface.h
index 1e2189c3..8e54ed88 100644
--- a/glib/glibmm/interface.h
+++ b/glib/glibmm/interface.h
@@ -70,8 +70,8 @@ public:
// static Glib::Interface* wrap_new(GTypeInterface*);
#ifndef DOXYGEN_SHOULD_SKIP_THIS
- static GType get_type() G_GNUC_CONST;
- static GType get_base_type() G_GNUC_CONST;
+ static GType get_type();
+ static GType get_base_type();
#endif
inline GObject* gobj() { return gobject_; }
diff --git a/glib/glibmm/object.h b/glib/glibmm/object.h
index 4cb6ad91..aaf038b5 100644
--- a/glib/glibmm/object.h
+++ b/glib/glibmm/object.h
@@ -112,8 +112,8 @@ public:
// static RefPtr<Object> create(); //You must reimplement this in each derived class.
#ifndef DOXYGEN_SHOULD_SKIP_THIS
- static GType get_type() G_GNUC_CONST;
- static GType get_base_type() G_GNUC_CONST;
+ static GType get_type();
+ static GType get_base_type();
#endif
// GObject* gobj_copy(); //Give a ref-ed copy to someone. Use for direct struct access.
diff --git a/glib/glibmm/objectbase.h b/glib/glibmm/objectbase.h
index da42039b..162a051a 100644
--- a/glib/glibmm/objectbase.h
+++ b/glib/glibmm/objectbase.h
@@ -64,7 +64,7 @@ public:
// Glib::Value and _WRAP_PROPERTY in Glib::Binding without a
// Value<RefPtr<ObjectBase>> specialization.
// The Value<RefPtr<T>> specialization requires T::get_base_type().
- static GType get_base_type() G_GNUC_CONST;
+ static GType get_base_type();
#endif
protected:
diff --git a/glib/glibmm/value.h b/glib/glibmm/value.h
index 5dc322a5..eb08f56f 100644
--- a/glib/glibmm/value.h
+++ b/glib/glibmm/value.h
@@ -100,7 +100,7 @@ protected:
class GLIBMM_API ValueBase_Boxed : public ValueBase
{
public:
- static GType value_type() G_GNUC_CONST;
+ static GType value_type();
#ifndef DOXYGEN_SHOULD_SKIP_THIS
GParamSpec* create_param_spec(const Glib::ustring& name, const Glib::ustring& nick,
@@ -118,7 +118,7 @@ protected:
class GLIBMM_API ValueBase_Object : public ValueBase
{
public:
- static GType value_type() G_GNUC_CONST;
+ static GType value_type();
#ifndef DOXYGEN_SHOULD_SKIP_THIS
GParamSpec* create_param_spec(const Glib::ustring& name, const Glib::ustring& nick,
@@ -137,7 +137,7 @@ protected:
class GLIBMM_API ValueBase_Enum : public ValueBase
{
public:
- static GType value_type() G_GNUC_CONST;
+ static GType value_type();
#ifndef DOXYGEN_SHOULD_SKIP_THIS
GParamSpec* create_param_spec(const Glib::ustring& name, const Glib::ustring& nick,
@@ -155,7 +155,7 @@ protected:
class GLIBMM_API ValueBase_Flags : public ValueBase
{
public:
- static GType value_type() G_GNUC_CONST;
+ static GType value_type();
#ifndef DOXYGEN_SHOULD_SKIP_THIS
GParamSpec* create_param_spec(const Glib::ustring& name, const Glib::ustring& nick,
@@ -173,7 +173,7 @@ protected:
class GLIBMM_API ValueBase_String : public ValueBase
{
public:
- static GType value_type() G_GNUC_CONST;
+ static GType value_type();
#ifndef DOXYGEN_SHOULD_SKIP_THIS
GParamSpec* create_param_spec(const Glib::ustring& name, const Glib::ustring& nick,
@@ -191,7 +191,7 @@ protected:
class GLIBMM_API ValueBase_Variant : public ValueBase
{
public:
- static GType value_type() G_GNUC_CONST;
+ static GType value_type();
#ifndef DOXYGEN_SHOULD_SKIP_THIS
GParamSpec* create_param_spec(const Glib::ustring& name, const Glib::ustring& nick,
diff --git a/glib/glibmm/value_custom.h b/glib/glibmm/value_custom.h
index 9f84389e..c623326a 100644
--- a/glib/glibmm/value_custom.h
+++ b/glib/glibmm/value_custom.h
@@ -78,7 +78,7 @@ public:
using T = std::remove_cv_t<std::remove_pointer_t<PtrT>>;
using CppType = PtrT;
- static inline GType value_type() G_GNUC_CONST;
+ static inline GType value_type();
inline void set(CppType data);
inline CppType get() const;
@@ -129,7 +129,7 @@ public:
#endif
using CppType = T;
- static GType value_type() G_GNUC_CONST;
+ static GType value_type();
inline void set(const CppType& data);
inline CppType get() const;
diff --git a/glib/src/value_basictypes.h.m4 b/glib/src/value_basictypes.h.m4
index 342f1e93..32e83d06 100644
--- a/glib/src/value_basictypes.h.m4
+++ b/glib/src/value_basictypes.h.m4
@@ -34,7 +34,7 @@ class GLIBMM_API Value<$1> : public ValueBase
public:
using CppType = $1;
- static GType value_type() G_GNUC_CONST;
+ static GType value_type();
void set($1 data);
$1 get() const;
diff --git a/glib/src/variant.hg b/glib/src/variant.hg
index 5699f6eb..55525cc4 100644
--- a/glib/src/variant.hg
+++ b/glib/src/variant.hg
@@ -531,7 +531,7 @@ public:
* @return The VariantType.
* @newin{2,28}
*/
- static const VariantType& variant_type() G_GNUC_CONST;
+ static const VariantType& variant_type();
//This must have a create() method because otherwise it would be a copy
//constructor.
@@ -583,7 +583,7 @@ public:
* @return The VariantType.
* @newin{2,36}
*/
- static const VariantType& variant_type() G_GNUC_CONST;
+ static const VariantType& variant_type();
/** Creates a new Variant< Variant<T> >.
* @param data The value of the new Variant.
@@ -628,7 +628,7 @@ public:
* @return The VariantType.
* @newin{2,28}
*/
- static const VariantType& variant_type() G_GNUC_CONST;
+ static const VariantType& variant_type();
/** Creates a new Variant<Glib::ustring>.
* @param data The value of the new Variant.
@@ -675,7 +675,7 @@ public:
* @return The VariantType.
* @newin{2,54}
*/
- static const VariantType& variant_type() G_GNUC_CONST;
+ static const VariantType& variant_type();
/** Creates a new Variant<Glib::DBusObjectPathString>.
* @param data The value of the new Variant.
@@ -721,7 +721,7 @@ public:
* @return The VariantType.
* @newin{2,54}
*/
- static const VariantType& variant_type() G_GNUC_CONST;
+ static const VariantType& variant_type();
/** Creates a new Variant<Glib::DBusSignatureString>.
* @param data The value of the new Variant.
@@ -768,7 +768,7 @@ public:
* @return The VariantType.
* @newin{2,28}
*/
- static const VariantType& variant_type() G_GNUC_CONST;
+ static const VariantType& variant_type();
/** Creates a new Variant<std::string>.
* @param data The value of the new Variant.
@@ -814,7 +814,7 @@ public:
* @return The VariantType.
* @newin{2,28}
*/
- static const VariantType& variant_type() G_GNUC_CONST;
+ static const VariantType& variant_type();
/** Creates a new Variant< std::pair<K, V> >.
* @param data The value of the new Variant.
@@ -863,7 +863,7 @@ public:
* @return The VariantType.
* @newin{2,28}
*/
- static const VariantType& variant_type() G_GNUC_CONST;
+ static const VariantType& variant_type();
/** Creates a new Variant from an array of numeric types.
* @param data The array to use for creation.
@@ -927,7 +927,7 @@ public:
* @return The VariantType.
* @newin{2,28}
*/
- static const VariantType& variant_type() G_GNUC_CONST;
+ static const VariantType& variant_type();
/** Creates a new Variant from an array of strings.
* @param data The array to use for creation.
@@ -991,7 +991,7 @@ public:
* @return The VariantType.
* @newin{2,54}
*/
- static const VariantType& variant_type() G_GNUC_CONST;
+ static const VariantType& variant_type();
/** Creates a new Variant from an array of strings.
* @param data The array to use for creation.
@@ -1053,7 +1053,7 @@ public:
* @return The VariantType.
* @newin{2,28}
*/
- static const VariantType& variant_type() G_GNUC_CONST;
+ static const VariantType& variant_type();
/** Creates a new Variant from an array of strings.
* @param data The array to use for creation.
@@ -1134,7 +1134,7 @@ public:
* @return The VariantType.
* @newin{2,28}
*/
- static const VariantType& variant_type() G_GNUC_CONST;
+ static const VariantType& variant_type();
/** Creates a new Variant containing a dictionary from a map.
* @param data The map to use for creation.
@@ -1212,7 +1212,7 @@ public:
* @return The VariantType.
* @newin{2,54}
*/
- static const VariantType& variant_type() G_GNUC_CONST;
+ static const VariantType& variant_type();
/** Gets a specific element from the tuple.
* It is an error if @a index is greater than or equal to the number of
diff --git a/glib/src/variant_basictypes.h.m4 b/glib/src/variant_basictypes.h.m4
index 7cc59d7e..0042c223 100644
--- a/glib/src/variant_basictypes.h.m4
+++ b/glib/src/variant_basictypes.h.m4
@@ -62,7 +62,7 @@ public:
/** Gets the Glib::VariantType.
* @return The Glib::VariantType.
*/
- static const VariantType& variant_type() G_GNUC_CONST;
+ static const VariantType& variant_type();
/** Creates a new Glib::Variant<$1>.
* @param data The value of the new Glib::Variant<$1>.
diff --git a/tools/m4/class_boxedtype.m4 b/tools/m4/class_boxedtype.m4
index 4c2092b9..fdbdad16 100644
--- a/tools/m4/class_boxedtype.m4
+++ b/tools/m4/class_boxedtype.m4
@@ -208,7 +208,7 @@ public:
/** Get the GType for this class, for use with the underlying GObject type system.
*/
- static GType get_type() G_GNUC_CONST;
+ static GType get_type();
ifdef(`__BOOL_CUSTOM_DEFAULT_CTOR__',`dnl
',`dnl else
diff --git a/tools/m4/class_boxedtype_static.m4 b/tools/m4/class_boxedtype_static.m4
index bbb34411..b036412d 100644
--- a/tools/m4/class_boxedtype_static.m4
+++ b/tools/m4/class_boxedtype_static.m4
@@ -183,7 +183,7 @@ public:
/** Get the GType for this class, for use with the underlying GObject type system.
*/
- static GType get_type() G_GNUC_CONST;
+ static GType get_type();
ifdef(`__BOOL_CUSTOM_DEFAULT_CTOR__',,`dnl else
__CPPNAME__`'();
diff --git a/tools/m4/class_gobject.m4 b/tools/m4/class_gobject.m4
index 2f9d5f1a..53f4aad4 100644
--- a/tools/m4/class_gobject.m4
+++ b/tools/m4/class_gobject.m4
@@ -298,14 +298,14 @@ _IMPORT(SECTION_DTOR_DOCUMENTATION)
/** Get the GType for this class, for use with the underlying GObject type system.
*/
- static GType get_type() G_GNUC_CONST;
+ static GType get_type();
#ifndef DOXYGEN_SHOULD_SKIP_THIS
ifdef(`__BOOL_DYNAMIC_GTYPE_REGISTRATION__',`
static GType get_type(GTypeModule* module);
',`')
- static GType get_base_type() G_GNUC_CONST;
+ static GType get_base_type();
#endif
///Provides access to the underlying C GObject.
diff --git a/tools/m4/class_interface.m4 b/tools/m4/class_interface.m4
index 5243b265..832d1197 100644
--- a/tools/m4/class_interface.m4
+++ b/tools/m4/class_interface.m4
@@ -292,10 +292,10 @@ _IMPORT(SECTION_DTOR_DOCUMENTATION)
/** Get the GType for this class, for use with the underlying GObject type system.
*/
- static GType get_type() G_GNUC_CONST;
+ static GType get_type();
#ifndef DOXYGEN_SHOULD_SKIP_THIS
- static GType get_base_type() G_GNUC_CONST;
+ static GType get_base_type();
#endif
///Provides access to the underlying C GObject.
diff --git a/tools/m4/class_opaque_refcounted.m4 b/tools/m4/class_opaque_refcounted.m4
index 544f772e..3a5f8d7f 100644
--- a/tools/m4/class_opaque_refcounted.m4
+++ b/tools/m4/class_opaque_refcounted.m4
@@ -186,7 +186,7 @@ public:
ifdef(`__OPAQUE_FUNC_GTYPE__',`dnl
/** Get the GType for this class, for use with the underlying GObject type system.
*/
- static GType get_type() G_GNUC_CONST;
+ static GType get_type();
')dnl endif __OPAQUE_FUNC_GTYPE__
ifelse(__OPAQUE_FUNC_NEW,NONE,`dnl
diff --git a/tools/m4/enum.m4 b/tools/m4/enum.m4
index a6a27e1e..03109c1f 100644
--- a/tools/m4/enum.m4
+++ b/tools/m4/enum.m4
@@ -125,7 +125,7 @@ template <>
class __ENUM_DECL_PREFIX__ Value<__NAMESPACE__::__ENUM_CLASS_CPPNAME__> : public __ENUM_VALUE_BASE__
{
public:
- static GType value_type() G_GNUC_CONST;
+ static GType value_type();
};
ifelse(`$9',,,`_DEPRECATE_IFDEF_END')`'dnl
diff --git a/tools/m4/gerror.m4 b/tools/m4/gerror.m4
index 01036f06..55446c7b 100644
--- a/tools/m4/gerror.m4
+++ b/tools/m4/gerror.m4
@@ -55,7 +55,7 @@ template <>
class $9 Value<__NAMESPACE__::__CPPNAME__::Code> : public __VALUE_BASE__
{
public:
- static GType value_type() G_GNUC_CONST;
+ static GType value_type();
};
ifelse(`$8',,,`_DEPRECATE_IFDEF_END')`'dnl
--
GitLab

61
dev-cpp/glibmm/glibmm-2.88.1.ebuild Normal file
View File

@@ -0,0 +1,61 @@
# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{11..14} )
inherit flag-o-matic gnome.org meson-multilib python-any-r1
DESCRIPTION="C++ interface for glib2"
HOMEPAGE="https://gnome.pages.gitlab.gnome.org/glibmm/"
LICENSE="LGPL-2.1+"
SLOT="2.68"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="gtk-doc debug test"
RESTRICT="!test? ( test )"
RDEPEND="
>=dev-libs/glib-2.87.3:2[${MULTILIB_USEDEP}]
dev-libs/libsigc++:3[gtk-doc?,${MULTILIB_USEDEP}]
"
DEPEND="${RDEPEND}"
BDEPEND="
${PYTHON_DEPS}
dev-cpp/mm-common
virtual/pkgconfig
gtk-doc? (
app-text/doxygen[dot]
dev-lang/perl
dev-libs/libxslt
)
"
PATCHES=(
"${FILESDIR}"/${PN}-2.88.1-const-whoops.patch
)
src_prepare() {
default
# giomm_tls_client requires FEATURES=-network-sandbox and glib-networking rdep
sed -i -e '/giomm_tls_client/d' tests/meson.build || die
if ! use test; then
sed -i -e "/^subdir('tests')/d" meson.build || die
fi
}
multilib_src_configure() {
local emesonargs=(
-Dwarnings=min
-Dbuild-deprecated-api=true
$(meson_native_use_bool gtk-doc build-documentation)
$(meson_use debug debug-refcounting)
-Dbuild-examples=false
-Dbuild-mmgir=false
# XXX: Drop this once https://gitlab.gnome.org/GNOME/glibmm/-/merge_requests/77 is in a release
-Dmaintainer-mode=true
)
meson_src_configure
}