From a73263ad3842a91881d6d8213e62c61d12461116 Mon Sep 17 00:00:00 2001 From: Pouria Rezaei Date: Sun, 21 Jul 2024 20:27:09 +0330 Subject: [PATCH] libraries/libgit2-glib: Updated for 1.0.0.1. Signed-off-by: Pouria Rezaei Signed-off-by: Willy Sudiarto Raharjo --- .../libgit2-glib/detect-libgit2-version.patch | 102 +++++++----------- .../libgit2-glib/libgit2-glib.SlackBuild | 2 +- libraries/libgit2-glib/libgit2-glib.info | 6 +- 3 files changed, 43 insertions(+), 67 deletions(-) diff --git a/libraries/libgit2-glib/detect-libgit2-version.patch b/libraries/libgit2-glib/detect-libgit2-version.patch index 9358d6a126..27a2625205 100644 --- a/libraries/libgit2-glib/detect-libgit2-version.patch +++ b/libraries/libgit2-glib/detect-libgit2-version.patch @@ -1,3 +1,29 @@ +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 @@ -11,10 +37,10 @@ index 3005ff4..2340712 100644 G_BEGIN_DECLS diff --git a/libgit2-glib/ggit-repository.c b/libgit2-glib/ggit-repository.c -index 68fdb31..304129b 100644 +index 1e095c8..6861c13 100644 --- a/libgit2-glib/ggit-repository.c +++ b/libgit2-glib/ggit-repository.c -@@ -3151,7 +3151,7 @@ ggit_repository_create_commit (GgitRepository *repository, +@@ -3182,7 +3182,7 @@ ggit_repository_create_commit (GgitRepository *repository, message, _ggit_native_get (tree), parent_count, @@ -38,10 +64,19 @@ index 4d5accf..c8b7af4 100644 } GgitConfigLevel; diff --git a/meson.build b/meson.build -index a36b606..92a1d3a 100644 +index ddac357..c72f1e8 100644 --- a/meson.build +++ b/meson.build -@@ -122,7 +122,7 @@ glib_dep = dependency('glib-2.0', version: '>=' + glib_req) +@@ -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) @@ -50,62 +85,3 @@ index a36b606..92a1d3a 100644 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) diff --git a/libraries/libgit2-glib/libgit2-glib.SlackBuild b/libraries/libgit2-glib/libgit2-glib.SlackBuild index 7fa52474bf..aca86d980b 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:-0.99.0.1} +VERSION=${VERSION:-1.0.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/libgit2-glib/libgit2-glib.info b/libraries/libgit2-glib/libgit2-glib.info index 080b0943be..a6f23b86c1 100644 --- a/libraries/libgit2-glib/libgit2-glib.info +++ b/libraries/libgit2-glib/libgit2-glib.info @@ -1,8 +1,8 @@ PRGNAM="libgit2-glib" -VERSION="0.99.0.1" +VERSION="1.0.0.1" HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib" -DOWNLOAD="https://download.gnome.org/sources/libgit2-glib/0.99/libgit2-glib-0.99.0.1.tar.xz" -MD5SUM="0507d588f149f7b002256e5e8e733156" +DOWNLOAD="https://download.gnome.org/sources/libgit2-glib/1.0/libgit2-glib-1.0.0.1.tar.xz" +MD5SUM="d5b64b1cea56253301bcc87e3d50fb56" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libgit2"