[packages/geany-plugins] - fix building with libgit2 1.0 - rel 4

[baggins]

commit 2afca160dadcfc5bb461af1496386e64c7829540
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun May 17 01:14:55 2020 +0200

    - fix building with libgit2 1.0
    - rel 4

 geany-plugins.spec |  4 +++-
 libgit2-1.0.patch  | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
---
diff --git a/geany-plugins.spec b/geany-plugins.spec
index 431c9b1..a7e24a3 100644
--- a/geany-plugins.spec
+++ b/geany-plugins.spec
@@ -2,11 +2,12 @@ Summary:	A collection of different plugins for Geany
 Summary(pl.UTF-8):	Zbiór różnych wtyczek dla Geany
 Name:		geany-plugins
 Version:	1.36
-Release:	3
+Release:	4
 License:	GPL v2+
 Group:		Libraries
 Source0:	https://plugins.geany.org/geany-plugins/%{name}-%{version}.tar.gz
 # Source0-md5:	76501a5adb92633cc41d0b6453692454
+Patch0:		libgit2-1.0.patch
 URL:		https://plugins.geany.org
 BuildRequires:	check-devel
 BuildRequires:	cppcheck
@@ -703,6 +704,7 @@ wpisaniu otwierającego tagu.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
diff --git a/libgit2-1.0.patch b/libgit2-1.0.patch
new file mode 100644
index 0000000..1cadc91
--- /dev/null
+++ b/libgit2-1.0.patch
@@ -0,0 +1,38 @@
+diff -ur geany-plugins-1.36/git-changebar/src/gcb-plugin.c geany-plugins-1.36-libgit1/git-changebar/src/gcb-plugin.c
+--- geany-plugins-1.36/git-changebar/src/gcb-plugin.c	2019-03-24 18:58:57.000000000 +0100
++++ geany-plugins-1.36-libgit1/git-changebar/src/gcb-plugin.c	2020-05-17 01:08:19.618324822 +0200
+@@ -32,11 +32,11 @@
+ #include <geany.h>
+ #include <document.h>
+ 
+-#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22
++#if (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22)
+ # define git_libgit2_init     git_threads_init
+ # define git_libgit2_shutdown git_threads_shutdown
+ #endif
+-#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 23
++#if (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 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, \
+@@ -45,7 +45,7 @@
+                     new_buffer, new_len, new_as_path, options, \
+                     file_cb, hunk_cb, line_cb, payload)
+ #endif
+-#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 28
++#if (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 28)
+ # define git_buf_dispose  git_buf_free
+ # define git_error_last   giterr_last
+ #endif
+diff -ur geany-plugins-1.36/workbench/src/plugin_main.c geany-plugins-1.36-libgit1/workbench/src/plugin_main.c
+--- geany-plugins-1.36/workbench/src/plugin_main.c	2019-07-25 19:11:40.000000000 +0200
++++ geany-plugins-1.36-libgit1/workbench/src/plugin_main.c	2020-05-17 01:08:47.295824244 +0200
+@@ -36,7 +36,7 @@
+ #include "tm_control.h"
+ 
+ 
+-#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22
++#if (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22)
+ # define git_libgit2_init     git_threads_init
+ # define git_libgit2_shutdown git_threads_shutdown
+ #endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/geany-plugins.git/commitdiff/2afca160dadcfc5bb461af1496386e64c7829540