Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 927383
Collapse All | Expand All

(-)a/libgit2-glib/ggit-clone-options.c (+1 lines)
Lines 19-24 Link Here
19
 */
19
 */
20
20
21
#include <git2.h>
21
#include <git2.h>
22
#include <git2/sys/errors.h>
22
#include <gio/gio.h>
23
#include <gio/gio.h>
23
24
24
#include "ggit-clone-options.h"
25
#include "ggit-clone-options.h"
(-)a/libgit2-glib/ggit-cred-ssh-interactive.c (-1 / +1 lines)
Lines 191-197 callback_wrapper (const char *name, Link Here
191
	{
191
	{
192
		gchar *text;
192
		gchar *text;
193
193
194
		text = g_strndup (prompts[i].text, prompts[i].length);
194
		text = g_strndup ((const gchar *)prompts[i].text, prompts[i].length);
195
195
196
		wprompts[i] = ggit_cred_ssh_interactive_prompt_new (wname,
196
		wprompts[i] = ggit_cred_ssh_interactive_prompt_new (wname,
197
		                                                    winstruction,
197
		                                                    winstruction,
(-)a/libgit2-glib/ggit-remote-callbacks.h (+1 lines)
Lines 24-29 Link Here
24
24
25
#include <glib-object.h>
25
#include <glib-object.h>
26
#include <git2.h>
26
#include <git2.h>
27
#include <git2/sys/errors.h>
27
#include <libgit2-glib/ggit-cred.h>
28
#include <libgit2-glib/ggit-cred.h>
28
29
29
G_BEGIN_DECLS
30
G_BEGIN_DECLS
(-)a/libgit2-glib/ggit-repository.c (-2 / +2 lines)
Lines 3182-3188 ggit_repository_create_commit (GgitRepository *repository, Link Here
3182
	                         message,
3182
	                         message,
3183
	                         _ggit_native_get (tree),
3183
	                         _ggit_native_get (tree),
3184
	                         parent_count,
3184
	                         parent_count,
3185
	                         (const git_commit **)parents_native);
3185
	                         (gpointer)parents_native);
3186
3186
3187
	g_free (parents_native);
3187
	g_free (parents_native);
3188
3188
Lines 3323-3329 ggit_repository_create_commit_buffer(GgitRepository *repository, Link Here
3323
	                                message,
3323
	                                message,
3324
	                                _ggit_tree_get_tree (tree),
3324
	                                _ggit_tree_get_tree (tree),
3325
	                                parent_count,
3325
	                                parent_count,
3326
	                                (git_commit const **)parents_native);
3326
	                                (gpointer)parents_native);
3327
3327
3328
	g_free (parents_native);
3328
	g_free (parents_native);
3329
3329
(-)a/libgit2-glib/ggit-types.h (-1 / +2 lines)
Lines 355-361 typedef enum Link Here
355
	GGIT_CONFIG_LEVEL_XDG         = 3,
355
	GGIT_CONFIG_LEVEL_XDG         = 3,
356
	GGIT_CONFIG_LEVEL_GLOBAL      = 4,
356
	GGIT_CONFIG_LEVEL_GLOBAL      = 4,
357
	GGIT_CONFIG_LEVEL_LOCAL       = 5,
357
	GGIT_CONFIG_LEVEL_LOCAL       = 5,
358
	GGIT_CONFIG_LEVEL_APP         = 6,
358
	GGIT_CONFIG_LEVEL_WORKTREE    = 6,
359
	GGIT_CONFIG_LEVEL_APP         = 7,
359
	GGIT_CONFIG_LEVEL_HIGHEST     = -1
360
	GGIT_CONFIG_LEVEL_HIGHEST     = -1
360
} GgitConfigLevel;
361
} GgitConfigLevel;
361
362
(-)a/meson.build (-2 / +1 lines)
Lines 126-132 glib_dep = dependency('glib-2.0', version: '>=' + glib_req) Link Here
126
gobject_dep = dependency('gobject-2.0', version: '>=' + glib_req)
126
gobject_dep = dependency('gobject-2.0', version: '>=' + glib_req)
127
gio_dep = dependency('gio-2.0', version: '>=' + glib_req)
127
gio_dep = dependency('gio-2.0', version: '>=' + glib_req)
128
128
129
libgit2_dep = dependency('libgit2', version: '>= 0.25.0')
129
libgit2_dep = dependency('libgit2', version: '>= 1.8.0')
130
130
131
# XXX: Not nice, but probably our best option
131
# XXX: Not nice, but probably our best option
132
enable_gir = get_option('introspection') and find_program('g-ir-scanner', required: false).found()
132
enable_gir = get_option('introspection') and find_program('g-ir-scanner', required: false).found()
133
- 

Return to bug 927383