<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/10829efcb6f7cebdc23997548f577ef97bd5c31b">https://github.com/macports/macports-ports/commit/10829efcb6f7cebdc23997548f577ef97bd5c31b</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 10829efcb6f gitg: update to version 3.32.1
</span>10829efcb6f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 10829efcb6f7cebdc23997548f577ef97bd5c31b
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Fri Aug 21 10:35:12 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> gitg: update to version 3.32.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * port build to meson
</span><span style='display:block; white-space:pre;color:#404040;'> * update configuration, dependencies
</span><span style='display:block; white-space:pre;color:#404040;'> * add gobject-introspection boiler plate
</span><span style='display:block; white-space:pre;color:#404040;'> * add python variants, fix meson python configuration
</span>---
gnome/gitg/Portfile | 72 ++++++++++++++--------
gnome/gitg/files/avoid-empty-css-files.patch | 36 -----------
gnome/gitg/files/patch-autogen.sh.diff | 11 ----
.../gitg/files/patch-libgitg-ext-meson-build.diff | 15 +++++
4 files changed, 61 insertions(+), 73 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 bfb37d27926..c0410d51648 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;'>@@ -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 gitg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.26.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.32.1
</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 git repository viewer.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,48 +28,68 @@ master_sites gnome:sources/${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 444ae82b90a2f88a03a89b7fdcdd5bd92de381db \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 26730d437d6a30d6e341b9e8da99d2134dce4b96022c195609f45062f82b54d5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 adf58770ac00c43a4bfc9df2d0ea69fd8a7b95cd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 24a4aabf8a42aa2e783e1fb5996ebb3c2a82a01b9689269f1329517ef124ef5a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10613836
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:intltool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gnome-common \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool
</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>
depends_lib port:desktop-file-utils \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gobject-introspection \
</span> port:gsettings-desktop-schemas \
port:gtk3 \
port:gtksourceview3 \
port:gtkspell3 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libdazzle \
</span> port:libgee \
port:libgit2-glib \
port:libpeas \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsecret \
</span> port:libsoup \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsecret
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxml2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:vala
</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:#e0ffe0;'>+# build GitgExt python extension for our configured python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# use meson python module rather than deprecated python3 module
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-libgitg-ext-meson-build.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-autogen.sh.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- avoid-empty-css-files.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@PYTHON3_BIN@@|${configure.python}|" ${worksrcpath}/libgitg-ext/meson.build
</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;'>+# requires C11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.c_standard 2011
</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:#e0ffe0;'>+configure.args -Dpython=false
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python36 conflicts python37 python38 description {Enable Python support using python36} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete -Dpython=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py36-gobject3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python3.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pkg_config_path-append ${frameworks_dir}/Python.framework/Versions/3.6/lib/pkgconfig/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# blacklist compilers that do not support C11 redefinition of typedefs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# redefinition of typedef 'GgitRef' at libgit2-glib/ggit-ref.h:33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# redefinition of typedef 'GgitCloneOptions' at libgit2-glib/ggit-clone-options.h:34
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# redefinition of typedef 'GgitCommit' at libgit2-glib/ggit-commit.h:37
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# redefinition of typedef 'GgitRemote' at libgit2-glib/ggit-remote.h:34
</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:#e0ffe0;'>+variant python37 conflicts python36 python38 description {Enable Python support using python37} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete -Dpython=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py37-gobject3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pkg_config_path-append ${frameworks_dir}/Python.framework/Versions/3.7/lib/pkgconfig/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --enable-compile-warnings=no \
</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:#e0ffe0;'>+variant python38 conflicts python36 python37 description {Enable Python support using python38} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete -Dpython=false
</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;'>+ configure.pkg_config_path-append ${frameworks_dir}/Python.framework/Versions/3.8/lib/pkgconfig/
</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 python36] && ![variant_isset python37]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
variant quartz {}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gitg/files/avoid-empty-css-files.patch b/gnome/gitg/files/avoid-empty-css-files.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 008ffbe3c7b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gitg/files/avoid-empty-css-files.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,36 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 92e8b11b2175b70733356a3899606fde37e1478c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Alberto Fanjul <albertofanjul@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 14 Oct 2018 21:59:08 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Avoid empty css files
</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;'>- gitg/resources/ui/style-osx.css | 2 ++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gitg/resources/ui/style-unix.css | 1 +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gitg/resources/ui/style-win32.css | 1 +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3 files changed, 4 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gitg/resources/ui/style-osx.css b/gitg/resources/ui/style-osx.css
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6ff3fb5f..9a0adcfb 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gitg/resources/ui/style-osx.css
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gitg/resources/ui/style-osx.css
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* osx css styles */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .monospace {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- font: menlo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gitg/resources/ui/style-unix.css b/gitg/resources/ui/style-unix.css
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e69de29b..e67de545 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gitg/resources/ui/style-unix.css
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gitg/resources/ui/style-unix.css
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* unix styles */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gitg/resources/ui/style-win32.css b/gitg/resources/ui/style-win32.css
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e69de29b..321553bd 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gitg/resources/ui/style-win32.css
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gitg/resources/ui/style-win32.css
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* win32 css styles */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.18.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gitg/files/patch-autogen.sh.diff b/gnome/gitg/files/patch-autogen.sh.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b1550899eac..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gitg/files/patch-autogen.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- autogen.sh.orig 2017-02-04 13:36:05.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ autogen.sh 2017-07-25 08:19:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,7 +24,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBTOOL=`which libtoolize`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBTOOL=`which glibtoolize`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -z $LIBTOOL; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "*** No libtool found, please install it ***"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gitg/files/patch-libgitg-ext-meson-build.diff b/gnome/gitg/files/patch-libgitg-ext-meson-build.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d456021ff3e
</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-libgitg-ext-meson-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgitg-ext/meson.build.orig 2020-08-22 14:51:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgitg-ext/meson.build 2020-08-22 15:31:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -125,10 +125,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enable_python = get_option('python')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if enable_python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- python = import('python3')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ python = import('python').find_installation('@@PYTHON3_BIN@@')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install_data(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'GitgExt.py',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install_dir: join_paths(python.sysconfig_path('purelib'), 'gi', 'overrides'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install_dir: join_paths(python.get_path('purelib'), 'gi', 'overrides'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span></pre><pre style='margin:0'>
</pre>