88 lines
2.9 KiB
Diff
88 lines
2.9 KiB
Diff
diff --git a/libgit2-glib/ggit-enum-types.c.template b/libgit2-glib/ggit-enum-types.c.template
|
|
index 2c5f15b..acc5f75 100644
|
|
--- a/libgit2-glib/ggit-enum-types.c.template
|
|
+++ b/libgit2-glib/ggit-enum-types.c.template
|
|
@@ -4,7 +4,7 @@
|
|
/*** END file-header ***/
|
|
|
|
/*** BEGIN file-production ***/
|
|
-/* enumerations from "@filename@" */
|
|
+/* enumerations from "@basename@" */
|
|
#include "@filename@"
|
|
|
|
/*** END file-production ***/
|
|
diff --git a/libgit2-glib/ggit-enum-types.h.template b/libgit2-glib/ggit-enum-types.h.template
|
|
index 7d7c564..f40326d 100644
|
|
--- a/libgit2-glib/ggit-enum-types.h.template
|
|
+++ b/libgit2-glib/ggit-enum-types.h.template
|
|
@@ -9,7 +9,7 @@ G_BEGIN_DECLS
|
|
/*** END file-header ***/
|
|
|
|
/*** BEGIN file-production ***/
|
|
-/* Enumerations from "@filename@" */
|
|
+/* Enumerations from "@basename@" */
|
|
|
|
/*** END file-production ***/
|
|
|
|
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 1e095c8..6861c13 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);
|
|
|
|
diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h
|
|
index 4d5accf..c8b7af4 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;
|
|
|
|
diff --git a/meson.build b/meson.build
|
|
index ddac357..c72f1e8 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -3,7 +3,7 @@ project(
|
|
version: '1.0.0.1',
|
|
default_options: 'buildtype=debugoptimized',
|
|
license: 'LGPL2+',
|
|
- meson_version: '>= 0.49.0',
|
|
+ meson_version: '>= 0.59.0',
|
|
)
|
|
|
|
libgit2_glib_version = meson.project_version()
|
|
@@ -124,7 +124,7 @@ glib_dep = dependency('glib-2.0', version: '>=' + glib_req)
|
|
gobject_dep = dependency('gobject-2.0', version: '>=' + glib_req)
|
|
gio_dep = dependency('gio-2.0', version: '>=' + glib_req)
|
|
|
|
-libgit2_dep = dependency('libgit2', version: '>= 0.25.0')
|
|
+libgit2_dep = dependency('libgit2', version: '>= 1.8.0')
|
|
|
|
enable_gir = get_option('introspection')
|
|
if enable_gir
|