Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libgit2-glib for openSUSE:Factory checked in at 2024-04-03 17:20:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgit2-glib (Old) and /work/SRC/openSUSE:Factory/.libgit2-glib.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libgit2-glib" Wed Apr 3 17:20:40 2024 rev:38 rq:1164290 version:1.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libgit2-glib/libgit2-glib.changes 2023-09-20 13:24:18.136139914 +0200 +++ /work/SRC/openSUSE:Factory/.libgit2-glib.new.1905/libgit2-glib.changes 2024-04-03 17:22:01.441054567 +0200 @@ -1,0 +2,5 @@ +Wed Apr 3 07:32:07 UTC 2024 - Dominique Leuenberger <dims...@opensuse.org> + +- Add libgit2-glib-include.patch: Fix build against libgit2 1.8.0. + +------------------------------------------------------------------- New: ---- libgit2-glib-include.patch BETA DEBUG BEGIN: New: - Add libgit2-glib-include.patch: Fix build against libgit2 1.8.0. BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgit2-glib.spec ++++++ --- /var/tmp/diff_new_pack.TOYJeV/_old 2024-04-03 17:22:01.941073015 +0200 +++ /var/tmp/diff_new_pack.TOYJeV/_new 2024-04-03 17:22:01.945073162 +0200 @@ -1,7 +1,7 @@ # # spec file for package libgit2-glib # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # Copyright (c) 2013 Dominique Leuenberger, Amsterdam, The Netherlands. # # All modifications and additions to the file contributed by third parties @@ -25,6 +25,7 @@ Group: Development/Libraries/C and C++ URL: https://wiki.gnome.org/Projects/Libgit2-glib Source0: %{name}-%{version}.tar.xz +Patch0: libgit2-glib-include.patch BuildRequires: meson BuildRequires: pkgconfig @@ -36,7 +37,7 @@ BuildRequires: pkgconfig(glib-2.0) >= 2.44.0 BuildRequires: pkgconfig(gobject-2.0) >= 2.44.0 BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.10.1 -BuildRequires: pkgconfig(libgit2) >= 0.25.0 +BuildRequires: pkgconfig(libgit2) >= 1.8.0 BuildRequires: pkgconfig(libssh2) %description ++++++ libgit2-glib-include.patch ++++++ diff --git a/libgit2-glib/ggit-clone-options.c b/libgit2-glib/ggit-clone-options.c index b47fdb1..30c7d86 100644 --- a/libgit2-glib/ggit-clone-options.c +++ b/libgit2-glib/ggit-clone-options.c @@ -19,6 +19,7 @@ */ #include <git2.h> +#include <git2/sys/errors.h> #include <gio/gio.h> #include "ggit-clone-options.h" diff --git a/libgit2-glib/ggit-cred-ssh-interactive.c b/libgit2-glib/ggit-cred-ssh-interactive.c index 4f60f8b..0bdca95 100644 --- a/libgit2-glib/ggit-cred-ssh-interactive.c +++ b/libgit2-glib/ggit-cred-ssh-interactive.c @@ -191,7 +191,7 @@ callback_wrapper (const char *name, { gchar *text; - text = g_strndup (prompts[i].text, prompts[i].length); + text = g_strndup ((const gchar *)prompts[i].text, prompts[i].length); wprompts[i] = ggit_cred_ssh_interactive_prompt_new (wname, winstruction, diff --git a/libgit2-glib/ggit-remote-callbacks.h b/libgit2-glib/ggit-remote-callbacks.h index 3005ff4..2340712 100644 --- a/libgit2-glib/ggit-remote-callbacks.h +++ b/libgit2-glib/ggit-remote-callbacks.h @@ -24,6 +24,7 @@ #include <glib-object.h> #include <git2.h> +#include <git2/sys/errors.h> #include <libgit2-glib/ggit-cred.h> G_BEGIN_DECLS diff --git a/libgit2-glib/ggit-repository.c b/libgit2-glib/ggit-repository.c index bf099f6..936c6fc 100644 --- a/libgit2-glib/ggit-repository.c +++ b/libgit2-glib/ggit-repository.c @@ -3182,7 +3182,7 @@ ggit_repository_create_commit (GgitRepository *repository, message, _ggit_native_get (tree), parent_count, - (const git_commit **)parents_native); + (gpointer)parents_native); g_free (parents_native); @@ -3323,7 +3323,7 @@ ggit_repository_create_commit_buffer(GgitRepository *repository, message, _ggit_tree_get_tree (tree), parent_count, - (git_commit const **)parents_native); + (gpointer)parents_native); g_free (parents_native); diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h index 7e28975..5666edd 100644 --- a/libgit2-glib/ggit-types.h +++ b/libgit2-glib/ggit-types.h @@ -355,7 +355,8 @@ typedef enum GGIT_CONFIG_LEVEL_XDG = 3, GGIT_CONFIG_LEVEL_GLOBAL = 4, GGIT_CONFIG_LEVEL_LOCAL = 5, - GGIT_CONFIG_LEVEL_APP = 6, + GGIT_CONFIG_LEVEL_WORKTREE = 6, + GGIT_CONFIG_LEVEL_APP = 7, GGIT_CONFIG_LEVEL_HIGHEST = -1 } GgitConfigLevel;
