aboutsummaryrefslogtreecommitdiff
path: root/libraries/libgit2-glib
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/libgit2-glib')
-rw-r--r--libraries/libgit2-glib/detect-libgit2-version.patch87
-rw-r--r--libraries/libgit2-glib/libgit2-glib.SlackBuild8
-rw-r--r--libraries/libgit2-glib/libgit2-glib.info8
3 files changed, 8 insertions, 95 deletions
diff --git a/libraries/libgit2-glib/detect-libgit2-version.patch b/libraries/libgit2-glib/detect-libgit2-version.patch
deleted file mode 100644
index 27a2625205..0000000000
--- a/libraries/libgit2-glib/detect-libgit2-version.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-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
diff --git a/libraries/libgit2-glib/libgit2-glib.SlackBuild b/libraries/libgit2-glib/libgit2-glib.SlackBuild
index aca86d980b..7c558cfbed 100644
--- a/libraries/libgit2-glib/libgit2-glib.SlackBuild
+++ b/libraries/libgit2-glib/libgit2-glib.SlackBuild
@@ -26,7 +26,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=libgit2-glib
-VERSION=${VERSION:-1.0.0.1}
+VERSION=${VERSION:-1.2.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -71,7 +71,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -80,8 +80,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Build against libgit2 version >= 1.0
-patch -p1 < $CWD/detect-libgit2-version.patch
+PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')
+export PYTHONPATH=/opt/python$PYVER/site-packages
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/libraries/libgit2-glib/libgit2-glib.info b/libraries/libgit2-glib/libgit2-glib.info
index a6f23b86c1..6ba1a766bc 100644
--- a/libraries/libgit2-glib/libgit2-glib.info
+++ b/libraries/libgit2-glib/libgit2-glib.info
@@ -1,10 +1,10 @@
PRGNAM="libgit2-glib"
-VERSION="1.0.0.1"
+VERSION="1.2.1"
HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
-DOWNLOAD="https://download.gnome.org/sources/libgit2-glib/1.0/libgit2-glib-1.0.0.1.tar.xz"
-MD5SUM="d5b64b1cea56253301bcc87e3d50fb56"
+DOWNLOAD="https://gitlab.gnome.org/GNOME/libgit2-glib/-/archive/1.2.1/libgit2-glib-1.2.1.tar.gz"
+MD5SUM="cda52c49cc6a3f3bcb863365f1e8196b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="libgit2"
+REQUIRES="libgit2 gi-docgen python3-meson-opt"
MAINTAINER="Pouria Rezaei"
EMAIL="Pouria.rz@outlook.com"