geany-plugins: rebuild against libgit2.so.28

[ci skip]
This commit is contained in:
maxice8 2019-02-11 22:12:51 -02:00
parent f4d29fbd75
commit 0addbcdd1a
No known key found for this signature in database
GPG key ID: 543B9D4F4299F06B
2 changed files with 42 additions and 1 deletions

View file

@ -0,0 +1,41 @@
diff --git a/git-changebar/src/gcb-plugin.c b/git-changebar/src/gcb-plugin.c
index 532a99a..886aa9f 100644
--- git-changebar/src/gcb-plugin.c
+++ git-changebar/src/gcb-plugin.c
@@ -238,7 +238,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 +293,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 +463,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 +1481,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;
}

View file

@ -1,7 +1,7 @@
# Template file for 'geany-plugins' # Template file for 'geany-plugins'
pkgname=geany-plugins pkgname=geany-plugins
version=1.34.0 version=1.34.0
revision=1 revision=2
build_style=gnu-configure build_style=gnu-configure
configure_args="PYTHON=/usr/bin/python2 --enable-all-plugins --disable-devhelp configure_args="PYTHON=/usr/bin/python2 --enable-all-plugins --disable-devhelp
--disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm" --disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm"