Update package version to 2.66.10
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
name: glibmm
|
name: glibmm
|
||||||
description: Official C++ interface for the popular cross-platform library Glib
|
description: Official C++ interface for the popular cross-platform library Glib
|
||||||
version: 2.66.9
|
version: 2.66.10
|
||||||
revision: 2
|
revision: 1
|
||||||
url: https://www.gtkmm.org/
|
url: https://www.gtkmm.org/
|
||||||
license: LGPL-2.1-or-later
|
license: LGPL-2.1-or-later
|
||||||
maintainers:
|
maintainers:
|
||||||
@@ -9,16 +9,19 @@ maintainers:
|
|||||||
architecture: any
|
architecture: any
|
||||||
type: source
|
type: source
|
||||||
depends:
|
depends:
|
||||||
|
- gcc-libs
|
||||||
- glib
|
- glib
|
||||||
|
- glibc
|
||||||
- libsigcpp
|
- libsigcpp
|
||||||
|
- perl
|
||||||
make_depends:
|
make_depends:
|
||||||
- doxygen
|
- clang
|
||||||
- meson
|
- meson
|
||||||
- mm-common
|
- mm-common
|
||||||
- libxslt
|
- perl-xml-parser
|
||||||
- glib-networking
|
- glib-networking
|
||||||
downloads:
|
downloads:
|
||||||
- url: https://download.gnome.org/sources/glibmm/${BPM_PKG_VERSION%.*}/glibmm-${BPM_PKG_VERSION}.tar.xz
|
- url: https://download.gnome.org/sources/glibmm/${BPM_PKG_VERSION%.*}/glibmm-${BPM_PKG_VERSION}.tar.xz
|
||||||
extract_to: ${BPM_SOURCE}
|
extract_to: ${BPM_SOURCE}
|
||||||
extract_strip_components: 1
|
extract_strip_components: 1
|
||||||
checksum: 5a026e5602085307c7dcb72b71b07261c40f80914277bef5f8d7f2ecab739bec
|
checksum: 2b61780203aed98e701d3ea57c8f353e7c8ada9706a79be782f6c5153dd035c0
|
||||||
|
|||||||
@@ -2,14 +2,6 @@
|
|||||||
# BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE
|
# BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE
|
||||||
# BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT
|
# BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT
|
||||||
|
|
||||||
# The prepare function is executed in the root of the temp directory
|
|
||||||
# This function is used for downloading files and putting them into the correct location
|
|
||||||
prepare() {
|
|
||||||
cd "$BPM_SOURCE"
|
|
||||||
|
|
||||||
patch -Np1 -i "$BPM_WORKDIR"/glibmm24-2.66.9-glib_2.89.2-type-definition.patch
|
|
||||||
}
|
|
||||||
|
|
||||||
# The build function is executed in the source directory
|
# The build function is executed in the source directory
|
||||||
# This function is used to compile the source code
|
# This function is used to compile the source code
|
||||||
build() {
|
build() {
|
||||||
@@ -21,7 +13,7 @@ build() {
|
|||||||
# The check function is executed in the source directory
|
# The check function is executed in the source directory
|
||||||
# This function is used to run tests to verify the package has been compiled correctly
|
# This function is used to run tests to verify the package has been compiled correctly
|
||||||
check() {
|
check() {
|
||||||
meson test -C build
|
meson test -C build --print-errorlogs
|
||||||
}
|
}
|
||||||
|
|
||||||
# The package function is executed in the source directory
|
# The package function is executed in the source directory
|
||||||
|
|||||||
@@ -1,110 +0,0 @@
|
|||||||
From d26083c41219958e802d5da733d4b4d3c342ec89 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kjell Ahlstedt <[email protected]>
|
|
||||||
Date: Sun, 5 Jul 2026 16:49:52 +0200
|
|
||||||
Subject: [PATCH] Gio: Emblem and DBus::ActionGroup: Don't derive gtkmm__Gxxx
|
|
||||||
types
|
|
||||||
|
|
||||||
GEmblem and GDBusActionGroup are declared G_DECLARE_FINAL_TYPE.
|
|
||||||
Add _DO_NOT_DERIVE_GTYPE, _ABI_AS_WITH_DERIVED_GTYPE and _STRUCT_NOT_HIDDEN
|
|
||||||
to the corresponding glibmm classes.
|
|
||||||
---
|
|
||||||
gio/src/dbusactiongroup.hg | 14 ++++++++++++++
|
|
||||||
gio/src/emblem.hg | 4 ++++
|
|
||||||
2 files changed, 18 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/gio/src/dbusactiongroup.hg b/gio/src/dbusactiongroup.hg
|
|
||||||
index ae9bb6fd..27359bfe 100644
|
|
||||||
--- a/gio/src/dbusactiongroup.hg
|
|
||||||
+++ b/gio/src/dbusactiongroup.hg
|
|
||||||
@@ -21,6 +21,17 @@
|
|
||||||
_DEFS(giomm,gio)
|
|
||||||
_PINCLUDE(glibmm/private/object_p.h)
|
|
||||||
|
|
||||||
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
|
|
||||||
+// Necessary if compiled against glib < 2.89.1, where GDBusActionGroup is not
|
|
||||||
+// a final type, and GDBusActionGroupClass is not defined by G_DECLARE_FINAL_TYPE().
|
|
||||||
+// (It was declared a final type somewhere between 2.89.1 and 2.89.2.
|
|
||||||
+// The compiler will probably complain if you compile against a glib 2.89.1
|
|
||||||
+// where GDBusActionGroup is not a final type.)
|
|
||||||
+#if !GLIB_CHECK_VERSION(2,89,1)
|
|
||||||
+using GDBusActionGroupClass = struct _GDBusActionGroupClass;
|
|
||||||
+#endif
|
|
||||||
+#endif /* DOXYGEN_SHOULD_SKIP_THIS */
|
|
||||||
+
|
|
||||||
namespace Gio
|
|
||||||
{
|
|
||||||
|
|
||||||
@@ -43,6 +54,9 @@ class GIOMM_API ActionGroup
|
|
||||||
_CLASS_GOBJECT(ActionGroup, GDBusActionGroup, G_DBUS_ACTION_GROUP, Glib::Object, GObject, , , GIOMM_API)
|
|
||||||
_IMPLEMENTS_INTERFACE(::Gio::ActionGroup)
|
|
||||||
_IMPLEMENTS_INTERFACE(RemoteActionGroup)
|
|
||||||
+ _DO_NOT_DERIVE_GTYPE dnl// GDBusActionGroup is a final type since glib 2.89.2
|
|
||||||
+ _ABI_AS_WITH_DERIVED_GTYPE dnl// Remove when we can break ABI
|
|
||||||
+ _STRUCT_NOT_HIDDEN
|
|
||||||
|
|
||||||
protected:
|
|
||||||
_CTOR_DEFAULT
|
|
||||||
diff --git a/gio/src/emblem.hg b/gio/src/emblem.hg
|
|
||||||
index 3a0d3316..737fff24 100644
|
|
||||||
--- a/gio/src/emblem.hg
|
|
||||||
+++ b/gio/src/emblem.hg
|
|
||||||
@@ -16,6 +16,7 @@
|
|
||||||
|
|
||||||
#include <glibmm/object.h>
|
|
||||||
#include <giomm/icon.h>
|
|
||||||
+#include <gio/gio.h>
|
|
||||||
|
|
||||||
_DEFS(giomm,gio)
|
|
||||||
_PINCLUDE(glibmm/private/object_p.h)
|
|
||||||
@@ -42,6 +43,9 @@ class GIOMM_API Emblem
|
|
||||||
{
|
|
||||||
_CLASS_GOBJECT(Emblem, GEmblem, G_EMBLEM, Glib::Object, GObject, , , GIOMM_API)
|
|
||||||
_IMPLEMENTS_INTERFACE(Icon)
|
|
||||||
+ _DO_NOT_DERIVE_GTYPE dnl// GEmblem is a final type since glib 2.89.2
|
|
||||||
+ _ABI_AS_WITH_DERIVED_GTYPE dnl// Remove when we can break ABI
|
|
||||||
+ _STRUCT_NOT_HIDDEN
|
|
||||||
|
|
||||||
protected:
|
|
||||||
/** Creates a new emblem for @a icon.
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
||||||
From b353a8b0afc1aa78f3eec58229f02acd9fab6d3e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kjell Ahlstedt <[email protected]>
|
|
||||||
Date: Mon, 6 Jul 2026 12:23:57 +0200
|
|
||||||
Subject: [PATCH] Gio::DBus::ActionGroup: Improve the test whether
|
|
||||||
GDBusActionGroup is final
|
|
||||||
|
|
||||||
---
|
|
||||||
gio/src/dbusactiongroup.hg | 15 ++++++++-------
|
|
||||||
1 file changed, 8 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/gio/src/dbusactiongroup.hg b/gio/src/dbusactiongroup.hg
|
|
||||||
index 27359bfe..777e8fd7 100644
|
|
||||||
--- a/gio/src/dbusactiongroup.hg
|
|
||||||
+++ b/gio/src/dbusactiongroup.hg
|
|
||||||
@@ -22,13 +22,14 @@ _DEFS(giomm,gio)
|
|
||||||
_PINCLUDE(glibmm/private/object_p.h)
|
|
||||||
|
|
||||||
#ifndef DOXYGEN_SHOULD_SKIP_THIS
|
|
||||||
-// Necessary if compiled against glib < 2.89.1, where GDBusActionGroup is not
|
|
||||||
-// a final type, and GDBusActionGroupClass is not defined by G_DECLARE_FINAL_TYPE().
|
|
||||||
-// (It was declared a final type somewhere between 2.89.1 and 2.89.2.
|
|
||||||
-// The compiler will probably complain if you compile against a glib 2.89.1
|
|
||||||
-// where GDBusActionGroup is not a final type.)
|
|
||||||
-#if !GLIB_CHECK_VERSION(2,89,1)
|
|
||||||
-using GDBusActionGroupClass = struct _GDBusActionGroupClass;
|
|
||||||
+// GDBusActionGroup was declared a final type between GLib 2.89.1 and 2.89.2.
|
|
||||||
+// Before that, GDBusActionGroupClass was not declared in GLib.
|
|
||||||
+// The preprocessor macro G_DBUS_ACTION_GROUP_CLASS was defined, though.
|
|
||||||
+#if !GLIB_CHECK_VERSION(2,89,1) || (!GLIB_CHECK_VERSION(2,89,2) && defined(G_DBUS_ACTION_GROUP_CLASS))
|
|
||||||
+ // glib < 2.89.1 or (glib == 2.89.1 and G_DBUS_ACTION_GROUP_CLASS is a preprocessor macro)
|
|
||||||
+ // GDBusActionGroup is not a final type,
|
|
||||||
+ // GDBusActionGroupClass is not declared in GLib.
|
|
||||||
+ using GDBusActionGroupClass = struct _GDBusActionGroupClass;
|
|
||||||
#endif
|
|
||||||
#endif /* DOXYGEN_SHOULD_SKIP_THIS */
|
|
||||||
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user