<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/4b40106e0d009d8981eaa2cc5bb99c8fe2306968">https://github.com/macports/macports-ports/commit/4b40106e0d009d8981eaa2cc5bb99c8fe2306968</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4b40106e0d009d8981eaa2cc5bb99c8fe2306968
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Jul 25 09:53:08 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> libgit2-glib: update to version 0.25
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * patch for API compatibility with libgit2 0.26
</span>---
gnome/libgit2-glib/Portfile | 10 +-
gnome/libgit2-glib/files/patch-configure.ac.diff | 2 +-
gnome/libgit2-glib/files/patch-libgit2-0.26.diff | 135 +++++++++++++++++++++++
3 files changed, 141 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libgit2-glib/Portfile b/gnome/libgit2-glib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7dd67f3..867763e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/libgit2-glib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libgit2-glib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,7 @@ PortGroup gobject_introspection 1.0
</span> PortGroup compiler_blacklist_versions 1.0
name libgit2-glib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.24.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.25.0
</span> license LGPL-2.1
set branch [join [lrange [split ${version} .] 0 1] .]
description Glib wrapper library around the libgit2 git access library.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,8 +19,8 @@ master_sites gnome:sources/${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e472bbaed8394d8298a46feb98b7785c370e95e7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3a211f756f250042f352b3070e7314a048c88e785dba9d118b851253a7c60220
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a5ed2d70280229efdbe723d8137d024e01ee3d41 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4a256b9acfb93ea70d37213a4083e2310e59b05f2c7595242fe3c239327bc565
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +30,8 @@ depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span> port:libssh2 \
port:vala
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-libgit2-0.26.diff
</span>
gobject_introspection yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libgit2-glib/files/patch-configure.ac.diff b/gnome/libgit2-glib/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b4c75ba..47eb52b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/libgit2-glib/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libgit2-glib/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- configure.ac.orig 2014-11-07 03:44:41.000000000 -0800
+++ configure.ac 2014-11-07 03:46:24.000000000 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -153,6 +153,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -151,6 +151,18 @@
</span> if test "x$enable_python" = "xyes"; then
AM_PATH_PYTHON(3.2.3)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libgit2-glib/files/patch-libgit2-0.26.diff b/gnome/libgit2-glib/files/patch-libgit2-0.26.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..87f4f90
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libgit2-glib/files/patch-libgit2-0.26.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,135 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 995b33c745085439d3cb3fed85dbfdb89cb876a9 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Igor Gnatenko <ignatenko@src.gnome.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 8 Jul 2017 19:37:51 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: remove
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ggit_submodule_update_options_set/get_clone_checkout_strategy()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GIT_CHECKOUT_SAFE_CREATE was folded into GIT_CHECKOUT_SAFE in checkout_opts.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Igor Gnatenko <ignatenko@src.gnome.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugzilla.gnome.org/show_bug.cgi?id=784706
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libgit2-glib/ggit-submodule-update-options.c | 65 ----------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libgit2-glib/ggit-submodule-update-options.h | 4 --
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 69 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libgit2-glib/ggit-submodule-update-options.c b/libgit2-glib/ggit-submodule-update-options.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3b092b1..94ef550 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgit2-glib/ggit-submodule-update-options.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgit2-glib/ggit-submodule-update-options.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,7 +44,6 @@ enum
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PROP_0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PROP_CHECKOUT_OPTIONS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PROP_FETCH_OPTIONS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PROP_CLONE_CHECKOUT_STRATEGY,
</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;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -79,10 +78,6 @@ ggit_submodule_update_options_set_property (GObject *object,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ggit_submodule_update_options_set_fetch_options (options,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_value_get_boxed (value));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case PROP_CLONE_CHECKOUT_STRATEGY:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ggit_submodule_update_options_set_clone_checkout_strategy (options,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- g_value_get_flags (value));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -108,10 +103,6 @@ ggit_submodule_update_options_get_property (GObject *object,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case PROP_FETCH_OPTIONS:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_value_set_boxed (value, priv->fetch_options);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case PROP_CLONE_CHECKOUT_STRATEGY:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- g_value_set_flags (value,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ggit_submodule_update_options_get_clone_checkout_strategy (options));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -144,16 +135,6 @@ ggit_submodule_update_options_class_init (GgitSubmoduleUpdateOptionsClass *klass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GGIT_TYPE_FETCH_OPTIONS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G_PARAM_READWRITE |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G_PARAM_STATIC_STRINGS));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- g_object_class_install_property (object_class,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PROP_CLONE_CHECKOUT_STRATEGY,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- g_param_spec_flags ("clone-checkout-strategy",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "Clone Checkout Strategy",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "Clone checkout strategy",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GGIT_TYPE_CHECKOUT_STRATEGY,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GGIT_CHECKOUT_NONE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- G_PARAM_READWRITE |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- G_PARAM_STATIC_STRINGS));
</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;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -318,50 +299,4 @@ ggit_submodule_update_options_set_fetch_options (GgitSubmoduleUpdateOptions *opt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_object_notify (G_OBJECT (options), "fetch-options");
</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;'>+-/**
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * ggit_submodule_update_options_get_clone_checkout_strategy:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * @options: a #GgitSubmoduleUpdateOptions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Gets the clone checkout strategy.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Returns: the clone checkout strategy.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-GgitCheckoutStrategy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ggit_submodule_update_options_get_clone_checkout_strategy (GgitSubmoduleUpdateOptions *options)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GgitSubmoduleUpdateOptionsPrivate *priv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- g_return_val_if_fail (GGIT_IS_SUBMODULE_UPDATE_OPTIONS (options), GGIT_CHECKOUT_NONE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- priv = ggit_submodule_update_options_get_instance_private (options);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return priv->options.clone_checkout_strategy;
</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;'>+-/**
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * ggit_submodule_update_options_set_clone_checkout_strategy:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * @options: a #GgitSubmoduleUpdateOptions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * @checkout_strategy: a #GgitCheckoutStrategy.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Sets the clone checkout strategy. Use %GGIT_CHECKOUT_SAFE_CREATE to create
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * all files in the working directory for the newly cloned repository.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ggit_submodule_update_options_set_clone_checkout_strategy (GgitSubmoduleUpdateOptions *options,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GgitCheckoutStrategy checkout_strategy)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GgitSubmoduleUpdateOptionsPrivate *priv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- g_return_if_fail (GGIT_IS_SUBMODULE_UPDATE_OPTIONS (options));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- priv = ggit_submodule_update_options_get_instance_private (options);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (priv->options.clone_checkout_strategy != checkout_strategy)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- priv->options.clone_checkout_strategy = checkout_strategy;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- g_object_notify (G_OBJECT (options), "clone-checkout-strategy");
</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;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* ex:set ts=8 noet: */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libgit2-glib/ggit-submodule-update-options.h b/libgit2-glib/ggit-submodule-update-options.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5816d97..d26290b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgit2-glib/ggit-submodule-update-options.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgit2-glib/ggit-submodule-update-options.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,10 +50,6 @@ GgitFetchOptions *ggit_submodule_update_options_get_fetch_options (Ggit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void ggit_submodule_update_options_set_fetch_options (GgitSubmoduleUpdateOptions *options,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GgitFetchOptions *fetch_options);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-GgitCheckoutStrategy ggit_submodule_update_options_get_clone_checkout_strategy (GgitSubmoduleUpdateOptions *options);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void ggit_submodule_update_options_set_clone_checkout_strategy (GgitSubmoduleUpdateOptions *options,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GgitCheckoutStrategy checkout_strategy);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G_END_DECLS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* __GGIT_SUBMODULE_UPDATE_OPTIONS_H__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cgit v0.12
</span></pre><pre style='margin:0'>
</pre>