diff options
| author |   Mart Raudsepp <leio@gentoo.org> | 2020-06-01 12:21:03 +0300 |
|---|---|---|
| committer | Mart Raudsepp <leio@gentoo.org> | 2020-06-01 12:21:03 +0300 |
| commit | 6ba09a115d3664eceb82bf0c949dc43f2b750e86 (patch) | |
| tree | 3e2961fd1993ec4fb722685419b15793cec2b647 /dev-util/gnome-builder | |
| parent | dev-python/twisted: arm64 stable (bug #722278) (diff) | |
| download | gentoo-6ba09a115d3664eceb82bf0c949dc43f2b750e86.tar.gz gentoo-6ba09a115d3664eceb82bf0c949dc43f2b750e86.tar.bz2 gentoo-6ba09a115d3664eceb82bf0c949dc43f2b750e86.zip | |
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 <leio@gentoo.org>
Diffstat (limited to 'dev-util/gnome-builder')
| -rw-r--r-- | dev-util/gnome-builder/files/libgit2-1.0-compat.patch | 26 | ||||
| -rw-r--r-- | dev-util/gnome-builder/gnome-builder-3.34.1-r1.ebuild | 1 |
2 files changed, 27 insertions, 0 deletions
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 000000000000..3e857eaac933 --- /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 <i.gnatenko.brain@gmail.com> +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 <i.gnatenko.brain@gmail.com> +--- + 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 a46b8a4cacfc..a7817290a9e5 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() { |