<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/d88b7e4ae584abecde34567e4ab04620ec96f994">https://github.com/macports/macports-ports/commit/d88b7e4ae584abecde34567e4ab04620ec96f994</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d88b7e4ae584abecde34567e4ab04620ec96f994
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Mon Sep 11 12:54:16 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> gitg: update to 41; add py311; use pg app
</span>---
gnome/gitg/Portfile | 53 +++++++++++++++++----------
gnome/gitg/files/patch-meson-build-debug.diff | 29 +++++++++++++++
2 files changed, 62 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gitg/Portfile b/gnome/gitg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dbbd6a91dba..de5b39b862a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gitg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gitg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,12 +2,14 @@
</span>
PortSystem 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup app 1.1
</span> PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup gitlab 1.0
</span> PortGroup meson 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name gitg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.32.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.instance https://gitlab.gnome.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.setup GNOME gitg 41 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories gnome devel
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,15 +23,16 @@ long_description gitg is a fast git repository browser. It currently features
</span> \n * Search in the revision history on subject, author or hash \
\n * Switch between history view of branches easily \
\n * Commit view providing per hunk stage/unstage and commit
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://www.gnome.org/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites gnome:sources/${name}/${branch}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Disable unexpected download of subprojects
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+meson.wrap_mode nodownload
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 adf58770ac00c43a4bfc9df2d0ea69fd8a7b95cd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 24a4aabf8a42aa2e783e1fb5996ebb3c2a82a01b9689269f1329517ef124ef5a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10613836
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 7237c894d49812752c8ecad057632e21ae58d65d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b7b08dcfd2caa4d3cc402c7d94d4d1618a330558a37a9ee7e1d101e173ac00e7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10783851
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Don't allow build to promote warnings to errors. Full details in patchfile.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-meson-build-debug.diff
</span>
# build GitgExt python extension for our configured python
# use meson python module rather than deprecated python3 module
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,6 +42,9 @@ patchfiles-append patch-meson-0.61.diff
</span> post-patch {
reinplace -W ${worksrcpath} "s|@@PYTHON3_BIN@@|${configure.python}|" \
libgitg-ext/meson.build
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|^#!.*|#!${configure.python}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ meson_post_install.py
</span> }
depends_build-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,9 +57,10 @@ depends_lib-append \
</span> path:lib/pkgconfig/glib-2.0.pc:glib2 \
path:lib/pkgconfig/gobject-introspection-1.0.pc:gobject-introspection \
port:gsettings-desktop-schemas \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gspell \
</span> path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtksourceview3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtkspell3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtksourceview4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:json-glib \
</span> port:libdazzle \
port:libgee \
port:libgit2-glib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,9 +77,12 @@ depends_run-append \
</span> compiler.c_standard 2011
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Ddocs=true \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddocs=false \
</span> -Dpython=false
<span style='display:block; white-space:pre;background:#e0ffe0;'>+app.icon ${worksrcpath}/osx/data/Gitg.iconset/icon_512x512@2x.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.retina yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> proc py_setup {py_ver} {
global prefix frameworks_dir
set py_ver_nodot [string map {. {}} ${py_ver}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,22 +100,27 @@ proc py_setup {py_ver} {
</span> port:py${py_ver_nodot}-gobject3
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 conflicts python39 python310 description {Enable Python support using python38} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 conflicts python39 python310 python311 description {Enable Python support using python38} {
</span> py_setup 3.8
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python39 conflicts python38 python310 description {Enable Python support using python39} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python39 conflicts python38 python310 python311 description {Enable Python support using python39} {
</span> py_setup 3.9
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python310 conflicts python38 python39 description {Enable Python support using python310} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python310 conflicts python38 python39 python311 description {Enable Python support using python310} {
</span> py_setup 3.10
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python311 conflicts python38 python39 python310 description {Enable Python support using python311} {
</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> if {![variant_isset python38] && \
![variant_isset python39] && \
<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_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 quartz {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,5 +136,3 @@ post-activate {
</span> system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type gnome
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gitg/files/patch-meson-build-debug.diff b/gnome/gitg/files/patch-meson-build-debug.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f152c75a4e0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gitg/files/patch-meson-build-debug.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</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;'>+# Patch to change the behavior of warning promotion, which is presently enabled for all types of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# debug builds. That includes 'debugoptimized', which one might argue isn't a developer build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# So, we tweak upstream's logic slightly, only enabling maximum strictness for a pure-debug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This allows us to avoid having to selectively disable one or more specific warning options,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# since they're no longer promoted to error (via '-Werror=xxx').
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Ultimately I plan to collaborate with upstream, to see if they'd be willing to accept this.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (Either verbatim, or via a slightly different approach.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Author: Christopher Nielsen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Date: 2023-09-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;'>+--- meson.build.orig 2023-09-11 09:04:47.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2023-09-11 09:05:52.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,7 +40,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libversion = '@0@.@1@.@2@'.format(soversion, current, revision)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-gitg_debug = get_option('buildtype').contains('debug')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++gitg_debug = get_option('buildtype') == 'debug'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cc = meson.get_compiler('c')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ valac = meson.get_compiler('vala')
</span></pre><pre style='margin:0'>
</pre>