<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1afbae49ba1bc1f8a5e29f8edcc6d5689a43a764">https://github.com/macports/macports-ports/commit/1afbae49ba1bc1f8a5e29f8edcc6d5689a43a764</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1afbae49ba1bc1f8a5e29f8edcc6d5689a43a764
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Wed Jun 10 12:47:33 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> gedit: update to 3.36.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> builds with meson now
</span><span style='display:block; white-space:pre;color:#404040;'> requires tepl
</span><span style='display:block; white-space:pre;color:#404040;'> fixes quartz build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/60610
</span>---
gnome/gedit/Portfile | 53 +++++++---------------
.../patch-meson-darwin-dont-assume-quartz.diff | 20 ++++++++
2 files changed, 36 insertions(+), 37 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 ca2d2b0c61c..38ebb99ab7d 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;'>@@ -3,11 +3,11 @@
</span> PortSystem 1.0
PortGroup active_variants 1.1
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup gobject_introspection 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup meson 1.0
</span>
name gedit
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.28.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.36.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;'>@@ -20,11 +20,12 @@ master_sites gnome:sources/${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 43b2a5b5254a4481f276f67e6b94d52256cc5434 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f174be0958ce63771fef9a81d06da6769358dab8705364a6abb5c7d10ec8211d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3149684
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8f8da4df2f7975c17631e385a54541bbcd38b11e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6887554643c5b1b3862ac364d97b7b50224bff95e6758aeaa08f4a482b554197 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 14770004
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span> port:intltool \
port:itstool \
port:yelp-tools \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,43 +35,20 @@ depends_build port:pkgconfig \
</span> port:automake \
port:libtool
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:desktop-file-utils \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:desktop-file-utils \
</span> port:gsettings-desktop-schemas \
port:gtk3 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtksourceview3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtksourceview4 \
</span> port:libpeas \
port:libsoup \
port:libxml2 \
port:gspell \
port:iso-codes \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:vala
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:vala \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tepl
</span>
depends_run port:adwaita-icon-theme
<span style='display:block; white-space:pre;background:#ffe0e0;'>-gobject_introspection yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# blacklist compilers that do not support C11 (redefinition of typedef ‘GtkSourceTag’ at gtksourceview/gtksourcetag.h:35)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist *gcc-3.* *gcc-4.* {clang < 300}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Wno-error=format-nonliteral
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-gvfs-metadata \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-schemas-compile \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-silent-rules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # minimum python version is 3.2.3
variant python35 conflicts python36 python37 description {Use python 3.5} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +56,7 @@ variant python35 conflicts python36 python37 description {Use python 3.5} {
</span> configure.python ${prefix}/bin/python3.5
set python_framework ${frameworks_dir}/Python.framework/Versions/3.5
configure.pkg_config_path ${python_framework}/lib/pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-python --enable-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure.args-replace --disable-python --enable-python
</span> }
variant python36 conflicts python35 python37 description {Use python 3.6} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,7 +64,7 @@ variant python36 conflicts python35 python37 description {Use python 3.6} {
</span> configure.python ${prefix}/bin/python3.6
set python_framework ${frameworks_dir}/Python.framework/Versions/3.6
configure.pkg_config_path ${python_framework}/lib/pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-python --enable-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure.args-replace --disable-python --enable-python
</span> }
variant python37 conflicts python35 python36 description {Use python 3.7} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,7 +72,7 @@ variant python37 conflicts python35 python36 description {Use python 3.7} {
</span> configure.python ${prefix}/bin/python3.7
set python_framework ${frameworks_dir}/Python.framework/Versions/3.7
configure.pkg_config_path ${python_framework}/lib/pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-python --enable-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure.args-replace --disable-python --enable-python
</span> }
variant quartz {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,6 +83,7 @@ if {[variant_isset quartz]} {
</span> } else {
require_active_variants gtk3 x11
depends_run-append port:yelp
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-meson-darwin-dont-assume-quartz.diff
</span> }
if {![variant_isset python35] && ![variant_isset python37]} {
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3e11dcef809
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gedit/meson.build.orig 2020-06-10 12:49:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gedit/meson.build 2020-06-10 12:49:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -122,7 +122,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libgd_dep,
</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 host_machine.system() == 'darwin'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if host_machine.system() == 'mydarwin'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libgedit_sources += files(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'gedit-app-osx.m',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'gedit-file-chooser-dialog-osx.m',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -291,7 +291,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gedit_c_args = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if host_machine.system() == 'darwin'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if host_machine.system() == 'mydarwin'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gedit_c_args += [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '-DOS_OSX=1',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ]
</span></pre><pre style='margin:0'>
</pre>