[arch-commits] Commit in geany-plugins/trunk (1 file)

Alexander Rødseth arodseth at archlinux.org
Mon Oct 26 20:05:33 UTC 2020


    Date: Monday, October 26, 2020 @ 20:05:33
  Author: arodseth
Revision: 734044

Remove patch that is no longer needed

Deleted:
  geany-plugins/trunk/9497d829e1b207eb83575dc6f617feecfb89bc16.patch

------------------------------------------------+
 9497d829e1b207eb83575dc6f617feecfb89bc16.patch |   55 -----------------------
 1 file changed, 55 deletions(-)

Deleted: 9497d829e1b207eb83575dc6f617feecfb89bc16.patch
===================================================================
--- 9497d829e1b207eb83575dc6f617feecfb89bc16.patch	2020-10-26 20:05:02 UTC (rev 734043)
+++ 9497d829e1b207eb83575dc6f617feecfb89bc16.patch	2020-10-26 20:05:33 UTC (rev 734044)
@@ -1,55 +0,0 @@
-From 9497d829e1b207eb83575dc6f617feecfb89bc16 Mon Sep 17 00:00:00 2001
-From: Dominik Schmidt <dominik at schm1dt.ch>
-Date: Sun, 23 Feb 2020 19:15:30 +0100
-Subject: [PATCH] Make libgit2 version preprocessor conditionals compatible
- with libgit2-0.99
-
-LIBGIT2_SOVERSION is defined as string literal, e.g. "0.99",
-from libgit2-0.99 and beyond. Arithmetic checks against this
-variable whill hence fail. This patch switches the checks to
-compare against the LIBGIT2_VER_* family, which should be more stable.
----
- git-changebar/src/gcb-plugin.c | 6 +++---
- workbench/src/plugin_main.c    | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/git-changebar/src/gcb-plugin.c b/git-changebar/src/gcb-plugin.c
-index b7083199..a911815f 100644
---- a/git-changebar/src/gcb-plugin.c
-+++ b/git-changebar/src/gcb-plugin.c
-@@ -32,11 +32,11 @@
- #include <geany.h>
- #include <document.h>
- 
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22
-+#if ! defined (LIBGIT2_VER_MINOR) || ( (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 ! defined (LIBGIT2_VER_MINOR) || ( (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 ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 28) )
- # define git_buf_dispose  git_buf_free
- # define git_error_last   giterr_last
- #endif
-diff --git a/workbench/src/plugin_main.c b/workbench/src/plugin_main.c
-index 6fa6fc84..25ecdf6d 100644
---- a/workbench/src/plugin_main.c
-+++ b/workbench/src/plugin_main.c
-@@ -36,7 +36,7 @@
- #include "tm_control.h"
- 
- 
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22
-+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22))
- # define git_libgit2_init     git_threads_init
- # define git_libgit2_shutdown git_threads_shutdown
- #endif



More information about the arch-commits mailing list