Hello community, here is the log from the commit of package geany-plugins for openSUSE:Factory checked in at 2019-02-15 10:04:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/geany-plugins (Old) and /work/SRC/openSUSE:Factory/.geany-plugins.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "geany-plugins" Fri Feb 15 10:04:03 2019 rev:26 rq:676260 version:1.34 Changes: -------- --- /work/SRC/openSUSE:Factory/geany-plugins/geany-plugins.changes 2019-01-21 10:28:19.253555249 +0100 +++ /work/SRC/openSUSE:Factory/.geany-plugins.new.28833/geany-plugins.changes 2019-02-15 10:04:41.371581406 +0100 @@ -1,0 +2,6 @@ +Wed Feb 13 22:19:04 UTC 2019 - [email protected] + +- Add geany-plugins-fix-compat-libgit2_0.28.patch: Fix build with + new libgit2 0.28 api. + +------------------------------------------------------------------- New: ---- geany-plugins-fix-compat-libgit2_0.28.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ geany-plugins.spec ++++++ --- /var/tmp/diff_new_pack.SzBmK9/_old 2019-02-15 10:04:42.491581043 +0100 +++ /var/tmp/diff_new_pack.SzBmK9/_new 2019-02-15 10:04:42.491581043 +0100 @@ -1,7 +1,7 @@ # # spec file for package geany-plugins # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -32,6 +32,8 @@ # PATCH-FIX-UPSTREAM geany-plugins-lua-5_2.patch sf#3476581 [email protected] -- Fix build with lua 5.2. # FIXME: the patch breaks GeanyLua building with lua 5.1.5 Patch0: geany-plugins-lua-5_2.patch +# PATCH-FIX-UPSTREAM geany-plugins-fix-compat-libgit2_0.28.patch -- Fix build with new libgit2 0.28 api +Patch1: geany-plugins-fix-compat-libgit2_0.28.patch BuildRequires: devhelp-devel BuildRequires: fdupes @@ -69,6 +71,7 @@ %prep %setup -q #patch0 -p1 +%patch1 -p1 %build %configure \ ++++++ geany-plugins-fix-compat-libgit2_0.28.patch ++++++ >From e18cc0c97f6a2098cd070765e5705fe293fe4e25 Mon Sep 17 00:00:00 2001 From: maxice8 <[email protected]> Date: Mon, 11 Feb 2019 23:50:28 -0200 Subject: [PATCH] git-changebar: fix compatibility with libgit2 0.28 API Namely rename the deprecated git_buf_free to git_buf_dispose and change giterr calls to git_error. --- git-changebar/src/gcb-plugin.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/git-changebar/src/gcb-plugin.c b/git-changebar/src/gcb-plugin.c index 532a99aa..b7083199 100644 --- a/git-changebar/src/gcb-plugin.c +++ b/git-changebar/src/gcb-plugin.c @@ -45,6 +45,10 @@ new_buffer, new_len, new_as_path, options, \ file_cb, hunk_cb, line_cb, payload) #endif +#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 28 +# define git_buf_dispose git_buf_free +# define git_error_last giterr_last +#endif GeanyPlugin *geany_plugin; @@ -238,7 +242,7 @@ static void clear_cached_blob_contents (void) { if (G_blob_contents.ptr) { - git_buf_free (&G_blob_contents); + git_buf_dispose (&G_blob_contents); buf_zero (&G_blob_contents); } G_blob_contents_tag = 0; @@ -293,7 +297,7 @@ free_job (gpointer data) /* unlikely, but if we still have the buffer, free it */ if (job->buf.ptr) { - git_buf_free (&job->buf); + git_buf_dispose (&job->buf); } g_free (job->path); g_slice_free1 (sizeof *job, job); @@ -463,7 +467,7 @@ worker_thread (gpointer data) if (relpath) { if (! repo_get_file_blob_contents (repo, relpath, &job->buf, 0)) { - git_buf_free (&job->buf); + git_buf_dispose (&job->buf); buf_zero (&job->buf); } @@ -1481,7 +1485,7 @@ plugin_init (GeanyData *data) G_queue = NULL; if (git_libgit2_init () < 0) { - const git_error *err = giterr_last (); + const git_error *err = git_error_last (); g_warning ("Failed to initialize libgit2: %s", err ? err->message : "?"); return; }
