Browse Source
libraries/libgit2-glib: Updated to 0.99.0.1 + new maintainer
libraries/libgit2-glib: Updated to 0.99.0.1 + new maintainer
Signed-off-by: Pouria Rezaei <Pouria.rz@outlook.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>pull/229/head
Pouria Rezaei
1 year ago
committed by
Willy Sudiarto Raharjo
Willy Sudiarto Raharjo
3 changed files with 111 additions and 140 deletions
-
238libraries/libgit2-glib/detect-libgit2-version.patch
-
3libraries/libgit2-glib/libgit2-glib.SlackBuild
-
10libraries/libgit2-glib/libgit2-glib.info
@ -1,141 +1,111 @@ |
|||
diff -Naur libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-clone-options.c libgit2-glib-0.28.0.1/libgit2-glib/ggit-clone-options.c
|
|||
--- libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-clone-options.c 2019-04-24 04:18:53.000000000 +0000
|
|||
+++ libgit2-glib-0.28.0.1/libgit2-glib/ggit-clone-options.c 2020-05-02 03:01:42.273450898 +0000
|
|||
@@ -149,7 +149,7 @@
|
|||
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 @@
|
|||
|
|||
if (error != NULL) |
|||
{ |
|||
-#if LIBGIT2_SOVERSION >= 28
|
|||
+#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28)
|
|||
git_error_set_str (GIT_ERROR, error->message); |
|||
#else |
|||
giterr_set_str (GIT_ERROR, error->message); |
|||
@@ -191,7 +191,7 @@
|
|||
#include <glib-object.h> |
|||
#include <git2.h> |
|||
+#include <git2/sys/errors.h>
|
|||
#include <libgit2-glib/ggit-cred.h> |
|||
|
|||
if (error) |
|||
{ |
|||
-#if LIBGIT2_SOVERSION >= 28
|
|||
+#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28)
|
|||
git_error_set_str (GIT_ERROR, error->message); |
|||
#else |
|||
giterr_set_str (GIT_ERROR, error->message); |
|||
diff -Naur libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-config.c libgit2-glib-0.28.0.1/libgit2-glib/ggit-config.c
|
|||
--- libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-config.c 2019-04-24 04:18:53.000000000 +0000
|
|||
+++ libgit2-glib-0.28.0.1/libgit2-glib/ggit-config.c 2020-05-02 03:10:08.034437972 +0000
|
|||
@@ -191,7 +191,7 @@
|
|||
if (git_config_find_global (&buf) == GIT_OK) |
|||
{ |
|||
path = g_file_new_for_path (buf.ptr); |
|||
-#if LIBGIT2_SOVERSION >= 28
|
|||
+#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28)
|
|||
git_buf_dispose (&buf); |
|||
#else |
|||
git_buf_free (&buf); |
|||
@@ -224,7 +224,7 @@
|
|||
if (git_config_find_system (&buf) == GIT_OK) |
|||
{ |
|||
path = g_file_new_for_path (buf.ptr); |
|||
-#if LIBGIT2_SOVERSION >= 28
|
|||
+#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28)
|
|||
git_buf_dispose (&buf); |
|||
#else |
|||
git_buf_free (&buf); |
|||
@@ -303,7 +303,7 @@
|
|||
ret = git_config_add_file_ondisk (_ggit_native_get (config), |
|||
path, |
|||
(git_config_level_t)level, |
|||
-#if LIBGIT2_SOVERSION >= 27
|
|||
+#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 27)
|
|||
NULL, |
|||
#endif |
|||
force); |
|||
diff -Naur libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-diff.c libgit2-glib-0.28.0.1/libgit2-glib/ggit-diff.c
|
|||
--- libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-diff.c 2019-04-24 04:18:53.000000000 +0000
|
|||
+++ libgit2-glib-0.28.0.1/libgit2-glib/ggit-diff.c 2020-05-02 03:04:17.745446924 +0000
|
|||
@@ -786,7 +786,7 @@
|
|||
G_BEGIN_DECLS |
|||
diff --git a/libgit2-glib/ggit-repository.c b/libgit2-glib/ggit-repository.c
|
|||
index 68fdb31..304129b 100644
|
|||
--- a/libgit2-glib/ggit-repository.c
|
|||
+++ b/libgit2-glib/ggit-repository.c
|
|||
@@ -3151,7 +3151,7 @@ ggit_repository_create_commit (GgitRepository *repository,
|
|||
message, |
|||
_ggit_native_get (tree), |
|||
parent_count, |
|||
- (const git_commit **)parents_native);
|
|||
+ (gpointer)parents_native);
|
|||
|
|||
if (ret != GIT_OK) |
|||
{ |
|||
-#if LIBGIT2_SOVERSION >= 28
|
|||
+#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28)
|
|||
git_buf_dispose (&buf); |
|||
#else |
|||
git_buf_free (&buf); |
|||
@@ -796,7 +796,7 @@
|
|||
} |
|||
g_free (parents_native); |
|||
|
|||
retval = g_strndup (buf.ptr, buf.size); |
|||
-#if LIBGIT2_SOVERSION >= 28
|
|||
+#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28)
|
|||
git_buf_dispose (&buf); |
|||
#else |
|||
git_buf_free (&buf); |
|||
diff -Naur libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-error.c libgit2-glib-0.28.0.1/libgit2-glib/ggit-error.c
|
|||
--- libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-error.c 2019-04-24 04:18:53.000000000 +0000
|
|||
+++ libgit2-glib-0.28.0.1/libgit2-glib/ggit-error.c 2020-05-02 03:05:09.952445590 +0000
|
|||
@@ -51,7 +51,7 @@
|
|||
g_return_if_fail (err < 0); |
|||
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; |
|||
|
|||
/* TODO: add more kind of errors, see git_error_t */ |
|||
-#if LIBGIT2_SOVERSION >= 28
|
|||
+#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28)
|
|||
git2_err = git_error_last (); |
|||
#else |
|||
git2_err = giterr_last (); |
|||
diff -Naur libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-message.c libgit2-glib-0.28.0.1/libgit2-glib/ggit-message.c
|
|||
--- libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-message.c 2019-04-24 04:18:53.000000000 +0000
|
|||
+++ libgit2-glib-0.28.0.1/libgit2-glib/ggit-message.c 2020-05-02 03:05:44.877444697 +0000
|
|||
@@ -46,7 +46,7 @@
|
|||
git_message_prettify (&buf, message, strip_comments, comment_char); |
|||
diff --git a/meson.build b/meson.build
|
|||
index a36b606..92a1d3a 100644
|
|||
--- a/meson.build
|
|||
+++ b/meson.build
|
|||
@@ -122,7 +122,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) |
|||
|
|||
d = g_strdup (buf.ptr); |
|||
-#if LIBGIT2_SOVERSION >= 28
|
|||
+#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28)
|
|||
git_buf_dispose (&buf); |
|||
#else |
|||
git_buf_free (&buf); |
|||
diff -Naur libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-patch.c libgit2-glib-0.28.0.1/libgit2-glib/ggit-patch.c
|
|||
--- libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-patch.c 2019-04-24 04:18:53.000000000 +0000
|
|||
+++ libgit2-glib-0.28.0.1/libgit2-glib/ggit-patch.c 2020-05-02 03:06:32.489443481 +0000
|
|||
@@ -194,7 +194,7 @@
|
|||
if (ret == GIT_OK) |
|||
{ |
|||
result = g_strdup (buf.ptr); |
|||
-#if LIBGIT2_SOVERSION >= 28
|
|||
+#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28)
|
|||
git_buf_dispose (&buf); |
|||
#else |
|||
git_buf_free (&buf); |
|||
diff -Naur libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-remote-callbacks.c libgit2-glib-0.28.0.1/libgit2-glib/ggit-remote-callbacks.c
|
|||
--- libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-remote-callbacks.c 2019-04-24 04:18:53.000000000 +0000
|
|||
+++ libgit2-glib-0.28.0.1/libgit2-glib/ggit-remote-callbacks.c 2020-05-02 03:07:14.164442416 +0000
|
|||
@@ -160,7 +160,7 @@
|
|||
{ |
|||
if (error) |
|||
{ |
|||
-#if LIBGIT2_SOVERSION >= 28
|
|||
+#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28)
|
|||
git_error_set_str (GIT_ERROR, error->message); |
|||
#else |
|||
giterr_set_str (GIT_ERROR, error->message); |
|||
diff -Naur libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-repository.c libgit2-glib-0.28.0.1/libgit2-glib/ggit-repository.c
|
|||
--- libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-repository.c 2019-04-24 04:18:53.000000000 +0000
|
|||
+++ libgit2-glib-0.28.0.1/libgit2-glib/ggit-repository.c 2020-05-02 03:08:08.018441039 +0000
|
|||
@@ -1013,7 +1013,7 @@
|
|||
if (ret == GIT_OK) |
|||
{ |
|||
rep = g_file_new_for_path (buf.ptr); |
|||
-#if LIBGIT2_SOVERSION >= 28
|
|||
+#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28)
|
|||
git_buf_dispose (&buf); |
|||
#else |
|||
git_buf_free (&buf); |
|||
@@ -3684,7 +3684,7 @@
|
|||
} |
|||
-libgit2_dep = dependency('libgit2', version: '>= 0.25.0')
|
|||
+libgit2_dep = dependency('libgit2', version: '>= 1.8.0')
|
|||
|
|||
ref = g_strdup (buf.ptr); |
|||
-#if LIBGIT2_SOVERSION >= 28
|
|||
+#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28)
|
|||
git_buf_dispose (&buf); |
|||
#else |
|||
git_buf_free (&buf); |
|||
enable_gir = get_option('introspection') |
|||
if enable_gir |
|||
diff --git a/meson_python_compile.py b/meson_python_compile.py
|
|||
index 1ffe0c0..24a74d8 100755
|
|||
--- a/meson_python_compile.py
|
|||
+++ b/meson_python_compile.py
|
|||
@@ -8,7 +8,7 @@ if not os.environ.get('DESTDIR'):
|
|||
libdir = sys.argv[1] |
|||
|
|||
print('Byte-compiling python modules...') |
|||
- subprocess.call(['python3', '-m', 'compileall', '-f', '-q', libdir])
|
|||
+ subprocess.check_call(['python3', '-m', 'compileall', '-f', '-q', libdir])
|
|||
|
|||
print('Byte-compiling python modules (optimized versions) ...') |
|||
- subprocess.call(['python3', '-O', '-m', 'compileall', '-f', '-q', libdir])
|
|||
+ subprocess.check_call(['python3', '-O', '-m', 'compileall', '-f', '-q', libdir])
|
|||
diff --git a/meson_vapi_link.py b/meson_vapi_link.py
|
|||
old mode 100644 |
|||
new mode 100755 |
|||
index eb64fd6..db1e4e8
|
|||
--- a/meson_vapi_link.py
|
|||
+++ b/meson_vapi_link.py
|
|||
@@ -1,22 +1,28 @@
|
|||
#!/usr/bin/env python3 |
|||
|
|||
import os |
|||
-import subprocess
|
|||
+import shutil
|
|||
import sys |
|||
|
|||
-vapidir = os.path.join(os.environ['MESON_INSTALL_DESTDIR_PREFIX'], sys.argv[1], 'vala', 'vapi')
|
|||
+datadir = sys.argv[1]
|
|||
+
|
|||
+destdir = os.environ.get('DESTDIR')
|
|||
+if destdir:
|
|||
+ datadir = os.path.splitdrive(datadir)[1].lstrip(os.path.sep)
|
|||
+ datadir = os.path.join(destdir, datadir)
|
|||
+
|
|||
+vapidir = os.path.join(datadir, 'vala', 'vapi')
|
|||
+os.chdir(vapidir)
|
|||
|
|||
# FIXME: meson will not track the creation of these files |
|||
# https://github.com/mesonbuild/meson/blob/master/mesonbuild/scripts/uninstall.py#L39 |
|||
old = 'ggit-1.0' |
|||
new = 'libgit2-glib-1.0' |
|||
|
|||
-wd = os.getcwd()
|
|||
-os.chdir(vapidir)
|
|||
-
|
|||
for ext in ['vapi', 'deps']: |
|||
- src = os.path.join('{}.{}'.format(new, ext))
|
|||
- dest = os.path.join('{}.{}'.format(old, ext))
|
|||
- subprocess.call(['ln', '-s', '-f', src, dest])
|
|||
-
|
|||
-os.chdir(wd)
|
|||
+ src = '{}.{}'.format(new, ext)
|
|||
+ dest = '{}.{}'.format(old, ext)
|
|||
+ try:
|
|||
+ os.symlink(src, dest)
|
|||
+ except OSError:
|
|||
+ shutil.copy(src, dest)
|
|||
@ -1,10 +1,10 @@ |
|||
PRGNAM="libgit2-glib" |
|||
VERSION="0.28.0.1" |
|||
VERSION="0.99.0.1" |
|||
HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib" |
|||
DOWNLOAD="https://ftp.gnome.org/pub/GNOME/sources/libgit2-glib/0.28/libgit2-glib-0.28.0.1.tar.xz" |
|||
MD5SUM="04c4cf24291c16406bddb5760449ab52" |
|||
DOWNLOAD="https://download.gnome.org/sources/libgit2-glib/0.99/libgit2-glib-0.99.0.1.tar.xz" |
|||
MD5SUM="0507d588f149f7b002256e5e8e733156" |
|||
DOWNLOAD_x86_64="" |
|||
MD5SUM_x86_64="" |
|||
REQUIRES="libgit2" |
|||
MAINTAINER="Willy Sudiarto Raharjo" |
|||
EMAIL="willysr@slackbuilds.org" |
|||
MAINTAINER="Pouria Rezaei" |
|||
EMAIL="Pouria.rz@outlook.com" |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue