Hello community, here is the log from the commit of package geany-plugins for openSUSE:Factory checked in at 2020-04-23 18:30:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/geany-plugins (Old) and /work/SRC/openSUSE:Factory/.geany-plugins.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "geany-plugins" Thu Apr 23 18:30:05 2020 rev:30 rq:795148 version:1.36 Changes: -------- --- /work/SRC/openSUSE:Factory/geany-plugins/geany-plugins.changes 2020-02-29 21:25:04.514583081 +0100 +++ /work/SRC/openSUSE:Factory/.geany-plugins.new.2738/geany-plugins.changes 2020-04-23 18:30:13.492063313 +0200 @@ -1,0 +2,8 @@ +Thu Apr 16 23:11:48 UTC 2020 - Bjørn Lie <[email protected]> + +- Add geany-plugins-Make-libgit2-compatible.patch: Make libgit2 + version preprocessor conditionals compatible with libgit2-0.99. +- Drop long disabled downstream patch, geany-plugins-lua-5_2.patch: + We will move to lua 5.2 when upstream does. + +------------------------------------------------------------------- Old: ---- geany-plugins-lua-5_2.patch New: ---- geany-plugins-Make-libgit2-compatible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ geany-plugins.spec ++++++ --- /var/tmp/diff_new_pack.gECf4K/_old 2020-04-23 18:30:14.808065830 +0200 +++ /var/tmp/diff_new_pack.gECf4K/_new 2020-04-23 18:30:14.808065830 +0200 @@ -29,9 +29,8 @@ URL: https://plugins.geany.org/geany-plugins/ Source: http://plugins.geany.org/geany-plugins/%{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM geany-plugins-lua-5_2.patch sf#3476581 [email protected] -- Fix build with lua 5.2. -# FIXME: the patch breaks GeanyLua building with lua 5.1.5 -Patch0: geany-plugins-lua-5_2.patch +# PATCH-FIX-UPSTREAM geany-plugins-Make-libgit2-compatible.patch -- Make libgit2 version preprocessor conditionals compatible with libgit2-0.99 +Patch0: geany-plugins-Make-libgit2-compatible.patch BuildRequires: devhelp-devel BuildRequires: fdupes @@ -69,9 +68,9 @@ a lightweight IDE. %lang_package + %prep -%setup -q -#patch0 -p1 +%autosetup -p1 %build %configure \ ++++++ geany-plugins-Make-libgit2-compatible.patch ++++++ >From 9497d829e1b207eb83575dc6f617feecfb89bc16 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt <[email protected]> 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
