From caf34680f25b9f1a8507e438a047445568ecd737 Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 3 May 2020 19:50:17 +0200 Subject: [PATCH] gnome-builder: rebuild against libgit2-1.0.0 --- .../gnome-builder/patches/libgit2-1.0.0.patch | 22 +++++++++++++++++++ srcpkgs/gnome-builder/template | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/gnome-builder/patches/libgit2-1.0.0.patch diff --git a/srcpkgs/gnome-builder/patches/libgit2-1.0.0.patch b/srcpkgs/gnome-builder/patches/libgit2-1.0.0.patch new file mode 100644 index 00000000000..7b9b4a2bf1a --- /dev/null +++ b/srcpkgs/gnome-builder/patches/libgit2-1.0.0.patch @@ -0,0 +1,22 @@ +commit 44136a2e5c52623b0e62c38846f511f307615ce2 +Author: q66 +Date: Sun May 3 19:52:09 2020 +0200 + + fix build with libgit2-1.0.0 + +diff --git a/src/plugins/git/daemon/ipc-git-repository-impl.c b/src/plugins/git/daemon/ipc-git-repository-impl.c +index 7f01042..2ccc4df 100644 +--- a/src/plugins/git/daemon/ipc-git-repository-impl.c ++++ b/src/plugins/git/daemon/ipc-git-repository-impl.c +@@ -33,11 +33,7 @@ + #include "ipc-git-types.h" + #include "ipc-git-util.h" + +-#if LIBGIT2_SOVERSION >= 28 + G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC (git_buf, git_buf_dispose) +-#else +-G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC (git_buf, git_buf_free) +-#endif + + typedef enum + { diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template index d4f612b46f7..9d715064a19 100644 --- a/srcpkgs/gnome-builder/template +++ b/srcpkgs/gnome-builder/template @@ -1,11 +1,11 @@ # Template file for 'gnome-builder' pkgname=gnome-builder version=3.34.1 -revision=2 +revision=3 build_style=meson configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true" hostmakedepends="pkg-config appdata-tools desktop-file-utils flex gobject-introspection - gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme" + gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext" makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel gspell-devel gtksourceview4-devel gtk+3-devel json-glib-devel jsonrpc-glib-devel libdazzle-devel libgit2-glib-devel libglib-devel libostree-devel libpeas-devel