<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f03e1c0d6759f9163f0e3d055c5b50b64c36e1ef">https://github.com/macports/macports-ports/commit/f03e1c0d6759f9163f0e3d055c5b50b64c36e1ef</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f03e1c0d675 gedit: update to version 3.38.2, dependencies
</span>f03e1c0d675 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f03e1c0d6759f9163f0e3d055c5b50b64c36e1ef
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Fri Sep 18 21:15:47 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> gedit: update to version 3.38.2, dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Update python variants to +python38 +python39 +python310, default +python39.
</span>---
gnome/gedit/Portfile | 49 ++++++++++++----------
.../files/patch-gedit-meson-build-python3.diff | 14 +++----
.../patch-meson-darwin-dont-assume-quartz.diff | 20 ++++-----
3 files changed, 43 insertions(+), 40 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gedit/Portfile b/gnome/gedit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 94d93ae8304..c34e039b693 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gedit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gedit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,8 +8,8 @@ PortGroup meson 1.0
</span> PortGroup yelp 1.0
name gedit
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.36.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.38.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> license GPL-2+
set branch [join [lrange [split ${version} .] 0 1] .]
description GNOME editor.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,17 +25,16 @@ use_xz yes
</span> # redefinition of typedef error
compiler.c_standard 2011
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 8f8da4df2f7975c17631e385a54541bbcd38b11e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6887554643c5b1b3862ac364d97b7b50224bff95e6758aeaa08f4a482b554197 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 14770004
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 16148da5e7f20dba54313fc5687d632e147dbef9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0e3573508add1777f06c05a66c3fe6fba97694d66cb577b98dbe0166a222c62d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6858676
</span>
depends_build-append \
port:pkgconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:itstool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext \
</span> port:gtk-doc
depends_lib-append port:desktop-file-utils \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gettext \
</span> path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:gsettings-desktop-schemas \
path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,6 +61,7 @@ configure.args -Dgtk_doc=true
</span> if {![info exists universal_possible]} {
set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # gobject-introspection uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,24 +73,25 @@ if {${universal_possible} && [variant_isset universal]} {
</span> destroot.env-append "CC=${configure.cc} ${configure.cc_archflags}"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python36 conflicts python37 python38 description {Use python 3.6} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py36-gobject3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python3.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_framework ${frameworks_dir}/Python.framework/Versions/3.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 conflicts python39 python310 description {Use python 3.8} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py38-gobject3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_framework ${frameworks_dir}/Python.framework/Versions/3.8
</span> configure.pkg_config_path ${python_framework}/lib/pkgconfig
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 conflicts python36 python38 description {Use python 3.7} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py37-gobject3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python3.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_framework ${frameworks_dir}/Python.framework/Versions/3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python39 conflicts python38 python310 description {Use python 3.9} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py39-gobject3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_framework ${frameworks_dir}/Python.framework/Versions/3.9
</span> configure.pkg_config_path ${python_framework}/lib/pkgconfig
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 conflicts python36 python37 description {Use python 3.8} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py38-gobject3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python3.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_framework ${frameworks_dir}/Python.framework/Versions/3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python310 conflicts python38 python39 description {Use python 3.10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py310-gobject3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_framework ${frameworks_dir}/Python.framework/Versions/3.10
</span> configure.pkg_config_path ${python_framework}/lib/pkgconfig
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,17 +109,19 @@ if {![variant_isset quartz]} {
</span> default_variants-append +x11
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python36] && ![variant_isset python37]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +python38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python38] && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![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;'>+ default_variants-append +python39
</span> }
app.use_launch_script yes
app.icon ./logo.png
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# add symlink to lib/gedit/libgedit-3.36.dylib in standard libdir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# add symlink to lib/gedit/libgedit-3.38.dylib in standard libdir
</span> # works around introspection typelib issue
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/lib/gedit/libgedit-3.36.dylib ${destroot}${prefix}/lib/libgedit-3.36.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/lib/gedit/libgedit-3.38.dylib ${destroot}${prefix}/lib/libgedit-3.38.dylib
</span> }
notes "For extra functionality install gedit-plugins"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gedit/files/patch-gedit-meson-build-python3.diff b/gnome/gedit/files/patch-gedit-meson-build-python3.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f0b0afe5333..b2dd0254c9d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gedit/files/patch-gedit-meson-build-python3.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gedit/files/patch-gedit-meson-build-python3.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build.orig 2020-06-13 00:28:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build 2020-06-13 00:28:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -69,7 +69,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- introspection_dep = dependency('gobject-introspection-1.0', required: false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vapigen_dep = dependency('vapigen', version: '>= 0.25.1', required: false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2020-09-11 06:06:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2020-09-20 18:10:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,7 +55,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ]
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ gspell_dep = dependency('gspell-1', version: '>= 1.0')
</span> -python3 = python.find_installation('python3')
+python3 = python.find_installation('@@PYTHON3@@')
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build_checkupdate_plugin = host_machine.system() == 'windows'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if build_checkupdate_plugin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Configurations
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config_h = configuration_data()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gedit/files/patch-meson-darwin-dont-assume-quartz.diff b/gnome/gedit/files/patch-meson-darwin-dont-assume-quartz.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3e11dcef809..6d520765621 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gedit/files/patch-meson-darwin-dont-assume-quartz.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gedit/files/patch-meson-darwin-dont-assume-quartz.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +1,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gedit/meson.build.orig 2020-06-10 12:49:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gedit/meson.build 2020-06-10 12:49:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -122,7 +122,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gedit/meson.build.orig 2020-09-11 06:06:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gedit/meson.build 2020-09-20 18:48:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -126,7 +126,7 @@
</span> libgd_dep,
]
-if host_machine.system() == 'darwin'
+if host_machine.system() == 'mydarwin'
<span style='display:block; white-space:pre;background:#ffe0e0;'>- libgedit_sources += files(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libgedit_private_sources += [
</span> 'gedit-app-osx.m',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 'gedit-file-chooser-dialog-osx.m',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -291,7 +291,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -255,7 +255,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span>
gedit_c_args = []
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> -if host_machine.system() == 'darwin'
+if host_machine.system() == 'mydarwin'
<span style='display:block; white-space:pre;background:#ffe0e0;'>- gedit_c_args += [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '-DOS_OSX=1',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gedit_c_args += '-DOS_OSX=1'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>