diff --git a/gnome/gtkmm4/Portfile b/gnome/gtkmm4/Portfile index 1636b787e0f..fc43e100553 100644 --- a/gnome/gtkmm4/Portfile +++ b/gnome/gtkmm4/Portfile @@ -6,7 +6,7 @@ PortGroup meson 1.0 name gtkmm4 set gname gtkmm -version 4.14.0 +version 4.22.0 revision 0 categories gnome devel @@ -24,9 +24,9 @@ dist_subdir ${gname} distname ${gname}-${version} use_xz yes -checksums rmd160 88254ec90b23de9db6bb4440d2367b6d4379fd75 \ - sha256 9350a0444b744ca3dc69586ebd1b6707520922b6d9f4f232103ce603a271ecda \ - size 16713784 +checksums rmd160 4976f6e2105b6d7eb16ae58fa2d576f2f645bc2b \ + sha256 2e8a21b4b0725f620e33aaee0cd343ed121b533275b632896619b1c89e96de67 \ + size 17841520 # Disable unexpected download of subprojects meson.wrap_mode nodownload @@ -59,26 +59,15 @@ depends_skip_archcheck-append \ compiler.cxx_standard 2017 -configure.perl /usr/bin/perl configure.python ${prefix}/bin/python${py_ver} -configure.env-append \ - PERL_PATH=${configure.perl} + +meson.native.binaries python=${configure.python} configure.args-append \ -Dbuild-demos=false \ -Dbuild-documentation=false \ -Dbuild-tests=false -patchfiles-append \ - patch-meson-build-python-path.diff \ - patch-aboutdialog.diff - -post-patch { - reinplace -W ${worksrcpath} \ - "s|@@PYTHON@@|${configure.python}|" \ - meson.build -} - variant x11 conflicts quartz { require_active_variants path:lib/pkgconfig/cairomm.pc:cairomm x11 require_active_variants path:lib/pkgconfig/gtk4.pc:gtk4 x11 diff --git a/gnome/gtkmm4/files/patch-aboutdialog.diff b/gnome/gtkmm4/files/patch-aboutdialog.diff deleted file mode 100644 index 1f45873e878..00000000000 --- a/gnome/gtkmm4/files/patch-aboutdialog.diff +++ /dev/null @@ -1,11 +0,0 @@ -https://gitlab.gnome.org/GNOME/gtkmm/-/issues/157 ---- untracked/gtk/gtkmm/aboutdialog.h.orig 2024-03-17 14:38:29 -+++ untracked/gtk/gtkmm/aboutdialog.h 2024-06-02 00:27:40 -@@ -124,6 +124,7 @@ - GPL_3_0, - LGPL_2_1, - LGPL_3_0, -+#undef BSD - BSD, - MIT_X11, - ARTISTIC, diff --git a/gnome/gtkmm4/files/patch-meson-build-python-path.diff b/gnome/gtkmm4/files/patch-meson-build-python-path.diff deleted file mode 100644 index b0341a0f86f..00000000000 --- a/gnome/gtkmm4/files/patch-meson-build-python-path.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- meson.build.orig 2023-08-08 07:40:41.000000000 -0400 -+++ meson.build 2023-08-10 07:31:27.000000000 -0400 -@@ -47,7 +47,7 @@ - cpp_compiler = meson.get_compiler('cpp') - is_msvc = cpp_compiler.get_id() == 'msvc' - is_host_windows = host_machine.system() == 'windows' --python3 = find_program('python3', version: '>=3.5') -+python3 = find_program('@@PYTHON@@', version: '>=3.5') - - # Do we build from a git repository? - # Suppose we do if and only if the meson.build file is tracked by git.