<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/dd1d2983571ee0a27a819866fcbb9d7468e3c563">https://github.com/macports/macports-ports/commit/dd1d2983571ee0a27a819866fcbb9d7468e3c563</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit dd1d2983571ee0a27a819866fcbb9d7468e3c563
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Thu Jun 8 15:14:29 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> glade: update to 3.40.0; add py311, drop py38
</span>---
devel/glade/Portfile | 33 +++++++++++++++------------------
devel/glade/files/LINGUAS.patch | 12 ------------
devel/glade/files/meson.build.patch | 21 ---------------------
3 files changed, 15 insertions(+), 51 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glade/Portfile b/devel/glade/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0edc83cc4c8..3990c8e44f3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glade/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glade/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,8 @@ PortGroup meson 1.0
</span> PortGroup app 1.0
name glade
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.38.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.40.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories devel gnome
license LGPL-2+ GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +22,9 @@ set branch [join [lrange [split ${version} .] 0 1] .]
</span> master_sites gnome:sources/${name}/${branch}/
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 78381c71685f0ea17fecd975b356168737b7a315 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 98fc87647d88505c97dd2f30f2db2d3e9527515b3af11694787d62a8d28fbab7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2709224
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4063ca4a153d3ec620b5aa944e8c07cd4ab76cc2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 31c9adaea849972ab9517b564e19ac19977ca97758b109edc3167008f53e3d9c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2654772
</span>
depends_skip_archcheck devhelp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,9 +47,6 @@ depends_lib-append \
</span> depends_run-append \
port:desktop-file-utils
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append LINGUAS.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append meson.build.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-append \
-Dgladeui=true \
-Dgjs=enabled \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,22 +80,22 @@ proc py_setup {python_branch} {
</span> configure.pkg_config_path ${python_framework}/lib/pkgconfig
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 conflicts python39 python310 description {Build Python 3.8 widgets support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- py_setup 3.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python39 conflicts python38 python310 description {Build Python 3.9 widgets support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python39 conflicts python310 python311 description {Build Python 3.9 widgets support} {
</span> py_setup 3.9
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python310 conflicts python38 python39 description {Build Python 3.10 widgets support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python310 conflicts python39 python311 description {Build Python 3.10 widgets support} {
</span> py_setup 3.10
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python38] && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python39] && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python310]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python310
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python311 conflicts python39 python310 description {Build Python 3.11 widgets support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ py_setup 3.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python39] && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python310] && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python311]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python311
</span> }
variant webkit2gtk description {Enable WebKit widgets catalog} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glade/files/LINGUAS.patch b/devel/glade/files/LINGUAS.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4207195322a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glade/files/LINGUAS.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ERROR: Tried to create target "help-glade-da-update-po", but a target of that name already exists.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.gnome.org/GNOME/glade/-/issues/542
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.gnome.org/GNOME/glade/-/commit/efdd5338b034a11c5d617684d92d11edc600965e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- help/LINGUAS.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ help/LINGUAS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,6 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # please keep this list sorted alphabetically
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--da
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ca
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cs
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glade/files/meson.build.patch b/devel/glade/files/meson.build.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 688b0f2a498..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glade/files/meson.build.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ERROR: Function does not take positional arguments.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/mesonbuild/meson/issues/9441
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.gnome.org/GNOME/glade/-/commit/6da47128e8da04edccccdfcbc9101940fc15fe3a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- data/meson.build.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ data/meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,7 +2,6 @@ desktop_conf = configuration_data()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- desktop_conf.set('VERSION', glade_version)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- i18n.merge_file(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'desktop',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- type: 'desktop',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- input: configure_file(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- input: 'org.gnome.Glade.desktop.in.in',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,7 +17,6 @@ i18n.merge_file(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- appdata = glade_name + '.appdata.xml'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- i18n.merge_file(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'appdata',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- input: 'org.gnome.Glade.appdata.xml.in',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- output: '@BASENAME@',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- po_dir: po_dir,
</span></pre><pre style='margin:0'>
</pre>