diff options
| author |   Alistair Francis <alistair@alistair23.me> | 2020-05-03 21:48:01 -0700 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2020-05-04 12:15:50 -0700 |
| commit | 32975810c70d7c48f2f5b69e3b8644a720797ca7 (patch) | |
| tree | a48c08436e33c5c26844500d55470b249f098e5c /meta-oe/recipes-devtools/geany | |
| parent | 171b924a1f6eda1e602e117d62483386175bddc3 (diff) | |
| download | meta-openembedded-32975810c70d7c48f2f5b69e3b8644a720797ca7.tar.gz | |
geany-plugins: Support libgit2 version 1.0
Signed-off-by: Alistair Francis <alistair@alistair23.me>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/geany')
| -rw-r--r-- | meta-oe/recipes-devtools/geany/geany-plugins/0002-Make-libgit2-version-preprocessor-conditionals-compatible.patch | 55 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb | 1 |
2 files changed, 56 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/geany/geany-plugins/0002-Make-libgit2-version-preprocessor-conditionals-compatible.patch b/meta-oe/recipes-devtools/geany/geany-plugins/0002-Make-libgit2-version-preprocessor-conditionals-compatible.patch new file mode 100644 index 0000000000..25e5ac4ea2 --- /dev/null +++ b/meta-oe/recipes-devtools/geany/geany-plugins/0002-Make-libgit2-version-preprocessor-conditionals-compatible.patch @@ -0,0 +1,55 @@ +From 9497d829e1b207eb83575dc6f617feecfb89bc16 Mon Sep 17 00:00:00 2001 +From: Dominik Schmidt <dominik@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 diff --git a/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb b/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb index a6a0b17dd4..3cf2605733 100644 --- a/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb +++ b/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb @@ -31,6 +31,7 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = " \ https://plugins.geany.org/${BPN}/${BP}.tar.bz2 \ file://0001-Use-pkg-config-to-find-gpgme.patch \ + file://0002-Make-libgit2-version-preprocessor-conditionals-compatible.patch \ " SRC_URI[md5sum] = "91fb4634953702f914d9105da7048a33" SRC_URI[sha256sum] = "ebe18dd699292174622e8cb8745b020ada8a5be3b604ab980af36e8518df7ce6" |