parent
b8f5ff6180
commit
3d0a552ffb
2 changed files with 2 additions and 43 deletions
|
@ -1,41 +0,0 @@
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'geany-plugins'
|
# Template file for 'geany-plugins'
|
||||||
pkgname=geany-plugins
|
pkgname=geany-plugins
|
||||||
version=1.34.0
|
version=1.35.0
|
||||||
revision=2
|
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
|
||||||
|
@ -15,7 +15,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
|
||||||
license="GPL-2.0-or-later"
|
license="GPL-2.0-or-later"
|
||||||
homepage="http://plugins.geany.org"
|
homepage="http://plugins.geany.org"
|
||||||
distfiles="https://github.com/geany/${pkgname}/archive/${version}.tar.gz"
|
distfiles="https://github.com/geany/${pkgname}/archive/${version}.tar.gz"
|
||||||
checksum=2c37cb4ece1a29230caa0527132e58d32d0c143f8bf64e2c3748058949a9395b
|
checksum=8a46ed8ed79443ec891e0ac2da039ece666de1601178afe030dd50bcd6515fce
|
||||||
|
|
||||||
pre_configure() {
|
pre_configure() {
|
||||||
NOCONFIGURE=1 ./autogen.sh
|
NOCONFIGURE=1 ./autogen.sh
|
||||||
|
|
Loading…
Reference in a new issue