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 120591382C5 for ; Mon, 1 Jun 2020 09:21:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 204C5E08F3; Mon, 1 Jun 2020 09:21:31 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 0AB7BE08F3 for ; Mon, 1 Jun 2020 09:21:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 AB66734F0C3 for ; Mon, 1 Jun 2020 09:21:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BD581AF for ; Mon, 1 Jun 2020 09:21:26 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1591003263.6ba09a115d3664eceb82bf0c949dc43f2b750e86.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/gnome-builder/, dev-util/gnome-builder/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/gnome-builder/files/libgit2-1.0-compat.patch dev-util/gnome-builder/gnome-builder-3.34.1-r1.ebuild X-VCS-Directories: dev-util/gnome-builder/ dev-util/gnome-builder/files/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: 6ba09a115d3664eceb82bf0c949dc43f2b750e86 X-VCS-Branch: master Date: Mon, 1 Jun 2020 09:21:26 +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: 9dbdeec2-ea50-49bc-a7be-4ef422e3ab15 X-Archives-Hash: 407b14090a2f084dda2d7762015b526b commit: 6ba09a115d3664eceb82bf0c949dc43f2b750e86 Author: Mart Raudsepp gentoo org> AuthorDate: Mon Jun 1 09:21:03 2020 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Mon Jun 1 09:21:03 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ba09a11 dev-util/gnome-builder: fix compat with libgit2:0/1.0 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Mart Raudsepp gentoo.org> .../gnome-builder/files/libgit2-1.0-compat.patch | 26 ++++++++++++++++++++++ .../gnome-builder/gnome-builder-3.34.1-r1.ebuild | 1 + 2 files changed, 27 insertions(+) diff --git a/dev-util/gnome-builder/files/libgit2-1.0-compat.patch b/dev-util/gnome-builder/files/libgit2-1.0-compat.patch new file mode 100644 index 00000000000..3e857eaac93 --- /dev/null +++ b/dev-util/gnome-builder/files/libgit2-1.0-compat.patch @@ -0,0 +1,26 @@ +From 582bf0281358437cc35d96d363f0af81a1b21068 Mon Sep 17 00:00:00 2001 +From: Igor Raits +Date: Tue, 3 Mar 2020 13:17:31 +0100 +Subject: [PATCH] plugins/git: Fix compatibility with libgit2 0.99.x + +Signed-off-by: Igor Raits +--- + src/plugins/git/daemon/ipc-git-repository-impl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/git/daemon/ipc-git-repository-impl.c b/src/plugins/git/daemon/ipc-git-repository-impl.c +index abcca5476..f2631945d 100644 +--- a/src/plugins/git/daemon/ipc-git-repository-impl.c ++++ b/src/plugins/git/daemon/ipc-git-repository-impl.c +@@ -34,7 +34,7 @@ + #include "ipc-git-types.h" + #include "ipc-git-util.h" + +-#if LIBGIT2_SOVERSION >= 28 ++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28) + G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC (git_buf, git_buf_dispose) + #else + G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC (git_buf, git_buf_free) +-- +2.26.2 + diff --git a/dev-util/gnome-builder/gnome-builder-3.34.1-r1.ebuild b/dev-util/gnome-builder/gnome-builder-3.34.1-r1.ebuild index a46b8a4cacf..a7817290a9e 100644 --- a/dev-util/gnome-builder/gnome-builder-3.34.1-r1.ebuild +++ b/dev-util/gnome-builder/gnome-builder-3.34.1-r1.ebuild @@ -116,6 +116,7 @@ that are currently available with packages include: PATCHES=( "${WORKDIR}/patches" # gnome-builder-3-34 branch 2020-01-22 (commit bf485934b37) + cherry-picked meson link_whole fixes "${FILESDIR}"/${PV}-optional-vala.patch + "${FILESDIR}"/libgit2-1.0-compat.patch ) llvm_check_deps() {