[PR PATCH] Update geany and geany-plugins

[PR PATCH] Update geany and geany-plugins

[mobinmob]

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

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

https://github.com/mobinmob/void-packages geany+plugins
https://github.com/void-linux/void-packages/pull/26487

Update geany and geany-plugins


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

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

From 04d0ac4b8187336b7c73f4dce1e0901f4a447b5d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 18 Nov 2020 19:17:27 +0200
Subject: [PATCH 1/2] geany: update to 1.37.1.

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

diff --git a/srcpkgs/geany/template b/srcpkgs/geany/template
index 9eef9728d52..4a3ac7f2ac9 100644
--- a/srcpkgs/geany/template
+++ b/srcpkgs/geany/template
@@ -1,6 +1,6 @@
 # Template file for 'geany'
 pkgname=geany
-version=1.37
+version=1.37.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-vte --enable-gtk3"
@@ -12,8 +12,9 @@ short_desc="Fast and lightweight IDE"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.geany.org"
+changelog="https://raw.githubusercontent.com/geany/geany/master/NEWS"
 distfiles="https://download.${pkgname}.org/${pkgname}-${version}.tar.bz2"
-checksum=dde52584823b769c56704c27dbedddb7a6bbaf4eacb9587d10bbc387816e3d51
+checksum=18c5756444c1d8bcd737c8ecfd4ef0b3607c924fc02560d4e8b78f6121531a18
 python_version=3
 
 pre_configure() {

From de80e8df23ea1378467766c8a6fd998d40cce9f7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 18 Nov 2020 19:19:45 +0200
Subject: [PATCH 2/2] geany-plugins: update to 1.37.0.

---
 .../geany-plugins/patches/libgit2-1.0.patch   | 54 -------------------
 srcpkgs/geany-plugins/template                |  7 +--
 2 files changed, 4 insertions(+), 57 deletions(-)
 delete mode 100644 srcpkgs/geany-plugins/patches/libgit2-1.0.patch

diff --git a/srcpkgs/geany-plugins/patches/libgit2-1.0.patch b/srcpkgs/geany-plugins/patches/libgit2-1.0.patch
deleted file mode 100644
index 2cd070e1041..00000000000
--- a/srcpkgs/geany-plugins/patches/libgit2-1.0.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-commit c5840bc94d5870b2f8b38ea16853e0c2dd0ac981
-Author: q66 <daniel@octaforge.org>
-Date:   Sun May 3 19:36:54 2020 +0200
-
-    fix build on libgit2-1.0
-
-diff --git git-changebar/src/gcb-plugin.c git-changebar/src/gcb-plugin.c
-index b708319..8d3abaf 100644
---- git-changebar/src/gcb-plugin.c
-+++ git-changebar/src/gcb-plugin.c
-@@ -32,25 +32,6 @@
- #include <geany.h>
- #include <document.h>
- 
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22
--# define git_libgit2_init     git_threads_init
--# define git_libgit2_shutdown git_threads_shutdown
--#endif
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 23
--/* 0.23 added @p binary_cb */
--# define git_diff_buffers(old_buffer, old_len, old_as_path, \
--                          new_buffer, new_len, new_as_path, options, \
--                          file_cb, binary_cb, hunk_cb, line_cb, payload) \
--  git_diff_buffers (old_buffer, old_len, old_as_path, \
--                    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;
- GeanyData        *geany_data;
- 
-diff --git workbench/src/plugin_main.c workbench/src/plugin_main.c
-index 6fa6fc8..b620666 100644
---- workbench/src/plugin_main.c
-+++ workbench/src/plugin_main.c
-@@ -35,13 +35,6 @@
- #include "idle_queue.h"
- #include "tm_control.h"
- 
--
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22
--# define git_libgit2_init     git_threads_init
--# define git_libgit2_shutdown git_threads_shutdown
--#endif
--
--
- GeanyPlugin *geany_plugin;
- GeanyData *geany_data;
- 
diff --git a/srcpkgs/geany-plugins/template b/srcpkgs/geany-plugins/template
index 8af71c85368..8038f5f3704 100644
--- a/srcpkgs/geany-plugins/template
+++ b/srcpkgs/geany-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'geany-plugins'
 pkgname=geany-plugins
-version=1.36.0
-revision=2
+version=1.37.0
+revision=1
 build_style=gnu-configure
 configure_args="PYTHON=/usr/bin/python2 --enable-all-plugins --disable-devhelp
  --disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm"
@@ -14,8 +14,9 @@ short_desc="Geany IDE plugins"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://plugins.geany.org"
+changelog="https://raw.githubusercontent.com/geany/geany-plugins/master/NEWS"
 distfiles="https://github.com/geany/${pkgname}/archive/${version}.tar.gz"
-checksum=39409e948502a7d6d88a290f201b7c6c678ce8ecaff7c73589ee0f6dcc059568
+checksum=14df1dda3760eedd3a28daba0788f3bee5b83ae31f042c57a78c20f37a77eb28
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh

Re: [PR PATCH] [Merged]: Update geany and geany-plugins

[ericonr]

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

There's a merged pull request on the void-packages repository

Update geany and geany-plugins
https://github.com/void-linux/void-packages/pull/26487

Description: