forked from pool/libgit2-glib
Dominique Leuenberger
0e4236a447
- Add libgit2-glib-include.patch: Fix build against libgit2 1.8.0. OBS-URL: https://build.opensuse.org/request/show/1164282 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libgit2-glib?expand=0&rev=73
74 lines
2.6 KiB
Diff
74 lines
2.6 KiB
Diff
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;
|
|
|