[PR PATCH] geany: update to 1.35

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 306 bytes --]

There is a new pull request by bobertlo against master on the void-packages repository

https://github.com/bobertlo/void-packages geany
https://github.com/void-linux/void-packages/pull/11469

geany: update to 1.35


A patch file from https://github.com/void-linux/void-packages/pull/11469.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-geany-11469.patch --]
[-- Type: application/text/x-diff, Size: 3867 bytes --]

From ef340af912f5ceda2d33fad5c27a6d3b78aae933 Mon Sep 17 00:00:00 2001
From: Robert Lowry <bobertlo@gmail.com>
Date: Fri, 3 May 2019 14:45:59 -0500
Subject: [PATCH 1/2] geany: update to 1.35

---
 srcpkgs/geany/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/geany/template b/srcpkgs/geany/template
index 1d25b01cad3..4325616bf3d 100644
--- a/srcpkgs/geany/template
+++ b/srcpkgs/geany/template
@@ -1,6 +1,6 @@
 # Template file for 'geany'
 pkgname=geany
-version=1.34.1
+version=1.35
 revision=1
 build_style=gnu-configure
 configure_args="--enable-vte --enable-gtk3"
@@ -13,7 +13,7 @@ maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.geany.org"
 distfiles="https://download.${pkgname}.org/${pkgname}-${version}.tar.bz2"
-checksum=e765efd89e759defe3fd797d8a2052afbb4b23522efbcc72e3a72b7f1093ec11
+checksum=35ee1d3ddfadca8bf1764e174ba3a5f348b1f1f430d32a36295b7706b7753d9d
 
 pre_configure() {
 	autoreconf -fi

From 5d10b1ab00c0245be7fc13d89de5be9716541ea9 Mon Sep 17 00:00:00 2001
From: Robert Lowry <bobertlo@gmail.com>
Date: Fri, 3 May 2019 14:46:44 -0500
Subject: [PATCH 2/2] geany-plugins: update to 1.35.0

closes #11467
---
 .../geany-plugins/patches/libgit-0.28.patch   | 41 -------------------
 srcpkgs/geany-plugins/template                |  4 +-
 2 files changed, 2 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/geany-plugins/patches/libgit-0.28.patch

diff --git a/srcpkgs/geany-plugins/patches/libgit-0.28.patch b/srcpkgs/geany-plugins/patches/libgit-0.28.patch
deleted file mode 100644
index 701f2d65566..00000000000
--- a/srcpkgs/geany-plugins/patches/libgit-0.28.patch
+++ /dev/null
@@ -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;
-   }
-
diff --git a/srcpkgs/geany-plugins/template b/srcpkgs/geany-plugins/template
index da07dda3d96..db0775ae22f 100644
--- a/srcpkgs/geany-plugins/template
+++ b/srcpkgs/geany-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'geany-plugins'
 pkgname=geany-plugins
-version=1.34.0
+version=1.35.0
 revision=2
 build_style=gnu-configure
 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"
 homepage="http://plugins.geany.org"
 distfiles="https://github.com/geany/${pkgname}/archive/${version}.tar.gz"
-checksum=2c37cb4ece1a29230caa0527132e58d32d0c143f8bf64e2c3748058949a9395b
+checksum=8a46ed8ed79443ec891e0ac2da039ece666de1601178afe030dd50bcd6515fce
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh