glibmm: update to 2.88

Closes: https://trac.macports.org/ticket/70133
This commit is contained in:
Renee Otten
2026-05-01 10:03:53 -04:00
committed by Renee Otten
parent acb56b9825
commit 8264e3db05
4 changed files with 31 additions and 36 deletions
+3 -3
View File
@@ -41,7 +41,7 @@ depends_build-append \
path:bin/pkg-config:pkgconfig \
port:python${py_ver_nodot}
depends_lib-append path:lib/pkgconfig/glib-2.0.pc:glib2-devel \
depends_lib-append path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:libsigcxx3
# Python only needed for scripts
@@ -71,12 +71,12 @@ post-patch {
variant quartz conflicts x11 {
require_active_variants \
path:lib/pkgconfig/glib-2.0.pc:glib2-devel quartz
path:lib/pkgconfig/glib-2.0.pc:glib2 quartz
}
variant x11 conflicts quartz {
require_active_variants \
path:lib/pkgconfig/glib-2.0.pc:glib2-devel x11
path:lib/pkgconfig/glib-2.0.pc:glib2 x11
patchfiles-append \
patch-no_cocoa.diff
}
+9 -14
View File
@@ -9,8 +9,7 @@ conflicts glibmm-devel
set my_name glibmm
# this version should match glib2, as closely as possible
version 2.78.0
revision 0
version 2.88.0
epoch 1
categories devel x11
@@ -19,7 +18,7 @@ maintainers {devans @dbevans} {mascguy @mascguy} openmaintainer
description C++ interface to glib
long_description {*}${description}
homepage http://www.gtkmm.org/
homepage https://www.gtkmm.org/
set branch [join [lrange [split ${version} .] 0 1] .]
master_sites gnome:sources/${my_name}/${branch}/
@@ -27,25 +26,22 @@ dist_subdir ${my_name}
distname ${my_name}-${version}
use_xz yes
checksums rmd160 053ae1c4b654da637465ac5cc0f32d42fca2a572 \
sha256 5d2e872564996f02a06d8bbac3677e7c394af8b00dd1526aebd47af842a3ef50 \
size 9292916
checksums rmd160 0b7afc211194261ba709ef3647f6e1e1d93db888 \
sha256 a6549da3a6c43de83b8717dae5413c57a60d92f6ecc624615c612d0bb0ad0fe2 \
size 9523144
# Disable unexpected download of subprojects
meson.wrap_mode nodownload
set py_ver 3.11
set py_ver 3.14
set py_ver_nodot [string map {. {}} ${py_ver}]
depends_build-append \
port:mm-common \
port:pkgconfig \
path:bin/pkg-config:pkgconfig \
port:python${py_ver_nodot}
# Pull in legacy bindings via 'glibmm-2.4', so that dependents don't have to be changed
depends_lib-append \
path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:glibmm-2.4 \
depends_lib-append path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:libsigcxx3
# Python only needed for scripts
@@ -65,8 +61,7 @@ configure.args-append \
-Dbuild-examples=true \
-Dmaintainer-mode=false
patchfiles-append \
patch-meson-build-python-path.diff
patchfiles-append patch-meson-build-python-path.diff
post-patch {
reinplace -W ${worksrcpath} \
@@ -1,11 +1,11 @@
--- meson.build.orig 2023-03-13 05:35:02.000000000 -0400
+++ meson.build 2023-04-29 17:39:57.000000000 -0400
@@ -49,7 +49,7 @@
is_host_windows = host_machine.system() == 'windows'
--- meson.build.orig 2025-09-19 04:50:40
+++ meson.build 2026-02-13 12:32:55
@@ -48,7 +48,7 @@
is_os_cocoa = host_machine.system() == 'darwin'
-python3 = find_program('python3', version: '>=3.5')
+python3 = find_program('@@PYTHON@@', version: '>=3.5')
# Use the Python installation that Meson uses. Its version is >= 3.7.
-python3 = import('python').find_installation()
+python3 = find_program('@@PYTHON@@', version: '>=3.7')
# Do we build from a git repository?
# Suppose we do if and only if the meson.build file is tracked by git.
pkgconfig = import('pkgconfig')
common_pkgconfig_vars = [
+11 -11
View File
@@ -1,11 +1,11 @@
--- configure.ac.orig 2017-09-04 06:26:39.000000000 -0700
+++ configure.ac 2017-09-05 01:57:18.000000000 -0700
@@ -62,7 +62,7 @@
glibmm_have_cocoa=no
AC_MSG_CHECKING([for Mac OS X Cocoa support])
AC_PREPROC_IFELSE([AC_LANG_SOURCE([[
-#include <Cocoa/Cocoa.h>
+#error "Detected Mac OS X Cocoa support"
#ifdef GNUSTEP_BASE_VERSION
#error "Detected GNUstep, not Cocoa"
#endif
--- meson.build.orig 2026-02-17 09:53:04
+++ meson.build 2026-02-17 09:54:17
@@ -45,7 +45,7 @@
cpp_compiler = meson.get_compiler('cpp')
is_msvc = cpp_compiler.get_id() == 'msvc'
is_host_windows = host_machine.system() == 'windows'
-is_os_cocoa = host_machine.system() == 'darwin'
+is_os_cocoa = false
# Use the Python installation that Meson uses. Its version is >= 3.7.
python3 = find_program('/opt/local/bin/python3.14', version: '>=3.7')