From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8FBB0138350 for ; Fri, 10 Apr 2020 14:12:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C1819E098A; Fri, 10 Apr 2020 14:12:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 91C7EE098A for ; Fri, 10 Apr 2020 14:12:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CBAFE34EF94 for ; Fri, 10 Apr 2020 14:12:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4860B9D for ; Fri, 10 Apr 2020 14:12:25 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1586527932.2adf746a17dc26dcaae744ed5ea957632fbf12c8.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/geany-plugins/, dev-util/geany-plugins/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/geany-plugins/files/geany-plugins-1.36-libgit2-0.99.patch dev-util/geany-plugins/geany-plugins-1.36-r1.ebuild X-VCS-Directories: dev-util/geany-plugins/ dev-util/geany-plugins/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 2adf746a17dc26dcaae744ed5ea957632fbf12c8 X-VCS-Branch: master Date: Fri, 10 Apr 2020 14:12:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cb959573-ce7b-4b56-afd4-368b9087063e X-Archives-Hash: 2a560c4949cfd4655bcab1e6e33072dd commit: 2adf746a17dc26dcaae744ed5ea957632fbf12c8 Author: Chris Mayo gmail com> AuthorDate: Sun Mar 8 19:41:19 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 10 14:12:12 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2adf746a dev-util/geany-plugins: make libgit2-0.99 compatible Closes: https://bugs.gentoo.org/711550 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Chris Mayo gmail.com> Closes: https://github.com/gentoo/gentoo/pull/14837 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/geany-plugins-1.36-libgit2-0.99.patch | 55 ++++++++++++++++++++++ .../geany-plugins/geany-plugins-1.36-r1.ebuild | 2 + 2 files changed, 57 insertions(+) diff --git a/dev-util/geany-plugins/files/geany-plugins-1.36-libgit2-0.99.patch b/dev-util/geany-plugins/files/geany-plugins-1.36-libgit2-0.99.patch new file mode 100644 index 00000000000..25e5ac4ea28 --- /dev/null +++ b/dev-util/geany-plugins/files/geany-plugins-1.36-libgit2-0.99.patch @@ -0,0 +1,55 @@ +From 9497d829e1b207eb83575dc6f617feecfb89bc16 Mon Sep 17 00:00:00 2001 +From: Dominik Schmidt +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 + #include + +-#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/dev-util/geany-plugins/geany-plugins-1.36-r1.ebuild b/dev-util/geany-plugins/geany-plugins-1.36-r1.ebuild index a52dca03895..d893f9de3ae 100644 --- a/dev-util/geany-plugins/geany-plugins-1.36-r1.ebuild +++ b/dev-util/geany-plugins/geany-plugins-1.36-r1.ebuild @@ -69,6 +69,8 @@ BDEPEND="virtual/pkgconfig nls? ( sys-devel/gettext ) " +PATCHES=( "${FILESDIR}"/${P}-libgit2-0.99.patch ) + pkg_setup() { use python && python-single-r1_pkg_setup }