diff --git a/devel/libgit2/libgit2-glib/Makefile b/devel/libgit2/libgit2-glib/Makefile index a5c1692c772..0b3f39e7551 100644 --- a/devel/libgit2/libgit2-glib/Makefile +++ b/devel/libgit2/libgit2-glib/Makefile @@ -2,6 +2,7 @@ COMMENT= GLib library wrapping libgit2 V= 1.2.0 DISTNAME= libgit2-glib-$V +REVISION= 0 SHARED_LIBS += git2-glib-1.0 5.4 # 0.200.0 diff --git a/devel/libgit2/libgit2-glib/patches/patch-libgit2-glib_ggit-clone-options_c b/devel/libgit2/libgit2-glib/patches/patch-libgit2-glib_ggit-clone-options_c new file mode 100644 index 00000000000..29076000cd0 --- /dev/null +++ b/devel/libgit2/libgit2-glib/patches/patch-libgit2-glib_ggit-clone-options_c @@ -0,0 +1,13 @@ +https://gitlab.gnome.org/GNOME/libgit2-glib/-/merge_requests/40 + +Index: libgit2-glib/ggit-clone-options.c +--- libgit2-glib/ggit-clone-options.c.orig ++++ libgit2-glib/ggit-clone-options.c +@@ -19,6 +19,7 @@ + */ + + #include ++#include + #include + + #include "ggit-clone-options.h" diff --git a/devel/libgit2/libgit2-glib/patches/patch-libgit2-glib_ggit-cred-ssh-interactive_c b/devel/libgit2/libgit2-glib/patches/patch-libgit2-glib_ggit-cred-ssh-interactive_c new file mode 100644 index 00000000000..0644ccfd7b9 --- /dev/null +++ b/devel/libgit2/libgit2-glib/patches/patch-libgit2-glib_ggit-cred-ssh-interactive_c @@ -0,0 +1,14 @@ +https://gitlab.gnome.org/GNOME/libgit2-glib/-/merge_requests/40 + +Index: libgit2-glib/ggit-cred-ssh-interactive.c +--- libgit2-glib/ggit-cred-ssh-interactive.c.orig ++++ libgit2-glib/ggit-cred-ssh-interactive.c +@@ -191,7 +191,7 @@ callback_wrapper (const char + { + gchar *text; + +- text = g_strndup (prompts[i].text, prompts[i].length); ++ text = g_strndup ((const gchar *)prompts[i].text, prompts[i].length); + + wprompts[i] = ggit_cred_ssh_interactive_prompt_new (wname, + winstruction, diff --git a/devel/libgit2/libgit2-glib/patches/patch-libgit2-glib_ggit-remote-callbacks_h b/devel/libgit2/libgit2-glib/patches/patch-libgit2-glib_ggit-remote-callbacks_h new file mode 100644 index 00000000000..946892e7e20 --- /dev/null +++ b/devel/libgit2/libgit2-glib/patches/patch-libgit2-glib_ggit-remote-callbacks_h @@ -0,0 +1,13 @@ +https://gitlab.gnome.org/GNOME/libgit2-glib/-/merge_requests/40 + +Index: libgit2-glib/ggit-remote-callbacks.h +--- libgit2-glib/ggit-remote-callbacks.h.orig ++++ libgit2-glib/ggit-remote-callbacks.h +@@ -24,6 +24,7 @@ + + #include + #include ++#include + #include + + G_BEGIN_DECLS diff --git a/devel/libgit2/libgit2-glib/patches/patch-libgit2-glib_ggit-repository_c b/devel/libgit2/libgit2-glib/patches/patch-libgit2-glib_ggit-repository_c new file mode 100644 index 00000000000..9332b30f488 --- /dev/null +++ b/devel/libgit2/libgit2-glib/patches/patch-libgit2-glib_ggit-repository_c @@ -0,0 +1,23 @@ +https://gitlab.gnome.org/GNOME/libgit2-glib/-/merge_requests/40 + +Index: libgit2-glib/ggit-repository.c +--- libgit2-glib/ggit-repository.c.orig ++++ libgit2-glib/ggit-repository.c +@@ -3182,7 +3182,7 @@ ggit_repository_create_commit (GgitRepository *reposi + message, + _ggit_native_get (tree), + parent_count, +- (const git_commit **)parents_native); ++ (gpointer)parents_native); + + g_free (parents_native); + +@@ -3323,7 +3323,7 @@ ggit_repository_create_commit_buffer(GgitRepository *r + message, + _ggit_tree_get_tree (tree), + parent_count, +- (git_commit const **)parents_native); ++ (gpointer)parents_native); + + g_free (parents_native); + diff --git a/devel/libgit2/libgit2-glib/patches/patch-libgit2-glib_ggit-types_h b/devel/libgit2/libgit2-glib/patches/patch-libgit2-glib_ggit-types_h new file mode 100644 index 00000000000..ce4f63f713b --- /dev/null +++ b/devel/libgit2/libgit2-glib/patches/patch-libgit2-glib_ggit-types_h @@ -0,0 +1,15 @@ +https://gitlab.gnome.org/GNOME/libgit2-glib/-/merge_requests/40 + +Index: libgit2-glib/ggit-types.h +--- libgit2-glib/ggit-types.h.orig ++++ 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/devel/libgit2/libgit2-glib/patches/patch-meson_build b/devel/libgit2/libgit2-glib/patches/patch-meson_build new file mode 100644 index 00000000000..896da962d00 --- /dev/null +++ b/devel/libgit2/libgit2-glib/patches/patch-meson_build @@ -0,0 +1,14 @@ +https://gitlab.gnome.org/GNOME/libgit2-glib/-/merge_requests/40 + +Index: meson.build +--- meson.build.orig ++++ meson.build +@@ -126,7 +126,7 @@ glib_dep = dependency('glib-2.0', version: '>=' + glib + 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') + + # XXX: Not nice, but probably our best option + enable_gir = get_option('introspection') and find_program('g-ir-scanner', required: false).found() diff --git a/devel/libgit2/py-git2/Makefile b/devel/libgit2/py-git2/Makefile index e0b4a184ae3..f52f35f3f6f 100644 --- a/devel/libgit2/py-git2/Makefile +++ b/devel/libgit2/py-git2/Makefile @@ -3,6 +3,7 @@ COMMENT= libgit2 bindings in Python MODPY_EGG_VERSION= 1.14.1 DISTNAME= pygit2-${MODPY_EGG_VERSION} PKGNAME= py-git2-${MODPY_EGG_VERSION} +REVISION= 0 MODULES= lang/python MODPY_PI= Yes diff --git a/devel/libgit2/py-git2/patches/patch-pygit2_decl_config_h b/devel/libgit2/py-git2/patches/patch-pygit2_decl_config_h new file mode 100644 index 00000000000..b3b3479b001 --- /dev/null +++ b/devel/libgit2/py-git2/patches/patch-pygit2_decl_config_h @@ -0,0 +1,36 @@ +From 1a9947a21a7cc71d07c86a87eeb49a24e40ce95e Mon Sep 17 00:00:00 2001 +From: WANG Xuerui +Date: Mon, 4 Mar 2024 14:52:41 +0800 +Subject: [PATCH] Format the whole repository with ruff + +From 6d539d76b53bb8ebddb97aaae0f783959e1f0810 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= +Date: Thu, 21 Mar 2024 10:15:15 +0100 +Subject: [PATCH] Upgrade to libgit2 v1.8.0 + +Index: pygit2/decl/config.h +--- pygit2/decl/config.h.orig ++++ pygit2/decl/config.h +@@ -6,17 +6,19 @@ typedef enum { + GIT_CONFIG_LEVEL_XDG = 3, + GIT_CONFIG_LEVEL_GLOBAL = 4, + GIT_CONFIG_LEVEL_LOCAL = 5, +- GIT_CONFIG_LEVEL_APP = 6, +- GIT_CONFIG_HIGHEST_LEVEL = -1, ++ GIT_CONFIG_LEVEL_WORKTREE = 6, ++ GIT_CONFIG_LEVEL_APP = 7, ++ GIT_CONFIG_HIGHEST_LEVEL = -1 + } git_config_level_t; + + typedef struct git_config_entry { + const char *name; + const char *value; ++ const char *backend_type; ++ const char *origin_path; + unsigned int include_depth; + git_config_level_t level; + void (*free)(struct git_config_entry *entry); +- void *payload; + } git_config_entry; + + void git_config_entry_free(git_config_entry *); diff --git a/devel/libgit2/py-git2/patches/patch-pygit2_decl_remote_h b/devel/libgit2/py-git2/patches/patch-pygit2_decl_remote_h new file mode 100644 index 00000000000..a92a861b6dc --- /dev/null +++ b/devel/libgit2/py-git2/patches/patch-pygit2_decl_remote_h @@ -0,0 +1,31 @@ +From 1a9947a21a7cc71d07c86a87eeb49a24e40ce95e Mon Sep 17 00:00:00 2001 +From: WANG Xuerui +Date: Mon, 4 Mar 2024 14:52:41 +0800 +Subject: [PATCH] Format the whole repository with ruff + +From 6d539d76b53bb8ebddb97aaae0f783959e1f0810 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= +Date: Thu, 21 Mar 2024 10:15:15 +0100 +Subject: [PATCH] Upgrade to libgit2 v1.8.0 + +Index: pygit2/decl/remote.h +--- pygit2/decl/remote.h.orig ++++ pygit2/decl/remote.h +@@ -57,6 +57,7 @@ typedef struct { + git_proxy_options proxy_opts; + git_remote_redirect_t follow_redirects; + git_strarray custom_headers; ++ git_strarray remote_push_options; + } git_push_options; + + int git_push_options_init( +@@ -80,7 +81,8 @@ typedef struct { + int version; + git_remote_callbacks callbacks; + git_fetch_prune_t prune; +- int update_fetchhead; ++ unsigned int update_fetchhead : 1, ++ report_unchanged : 1; + git_remote_autotag_option_t download_tags; + git_proxy_options proxy_opts; + int depth; diff --git a/devel/libgit2/py-git2/patches/patch-pygit2_enums_py b/devel/libgit2/py-git2/patches/patch-pygit2_enums_py new file mode 100644 index 00000000000..03a63902154 --- /dev/null +++ b/devel/libgit2/py-git2/patches/patch-pygit2_enums_py @@ -0,0 +1,44 @@ +From 1a9947a21a7cc71d07c86a87eeb49a24e40ce95e Mon Sep 17 00:00:00 2001 +From: WANG Xuerui +Date: Mon, 4 Mar 2024 14:52:41 +0800 +Subject: [PATCH] Format the whole repository with ruff + +From 6d539d76b53bb8ebddb97aaae0f783959e1f0810 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= +Date: Thu, 21 Mar 2024 10:15:15 +0100 +Subject: [PATCH] Upgrade to libgit2 v1.8.0 + +Index: pygit2/enums.py +--- pygit2/enums.py.orig ++++ pygit2/enums.py +@@ -65,16 +65,16 @@ class BlameFlag(IntFlag): + "Normal blame, the default" + + TRACK_COPIES_SAME_FILE = _pygit2.GIT_BLAME_TRACK_COPIES_SAME_FILE +- "Not yet implemented and reserved for future use (as of libgit2 1.7.1)." ++ "Not yet implemented and reserved for future use (as of libgit2 1.8.0)." + + TRACK_COPIES_SAME_COMMIT_MOVES = _pygit2.GIT_BLAME_TRACK_COPIES_SAME_COMMIT_MOVES +- "Not yet implemented and reserved for future use (as of libgit2 1.7.1)." ++ "Not yet implemented and reserved for future use (as of libgit2 1.8.0)." + + TRACK_COPIES_SAME_COMMIT_COPIES = _pygit2.GIT_BLAME_TRACK_COPIES_SAME_COMMIT_COPIES +- "Not yet implemented and reserved for future use (as of libgit2 1.7.1)." ++ "Not yet implemented and reserved for future use (as of libgit2 1.8.0)." + + TRACK_COPIES_ANY_COMMIT_COPIES = _pygit2.GIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES +- "Not yet implemented and reserved for future use (as of libgit2 1.7.1)." ++ "Not yet implemented and reserved for future use (as of libgit2 1.8.0)." + + FIRST_PARENT = _pygit2.GIT_BLAME_FIRST_PARENT + "Restrict the search of commits to those reachable following only the first parents." +@@ -250,6 +250,9 @@ class ConfigLevel(IntEnum): + + LOCAL = _pygit2.GIT_CONFIG_LEVEL_LOCAL + "Repository specific configuration file; $WORK_DIR/.git/config on non-bare repos" ++ ++ WORKTREE = _pygit2.GIT_CONFIG_LEVEL_WORKTREE ++ 'Worktree specific configuration file; $GIT_DIR/config.worktree' + + APP = _pygit2.GIT_CONFIG_LEVEL_APP + "Application specific configuration file; freely defined by applications" diff --git a/devel/libgit2/py-git2/patches/patch-pyproject_toml b/devel/libgit2/py-git2/patches/patch-pyproject_toml new file mode 100644 index 00000000000..eb2ec7f2594 --- /dev/null +++ b/devel/libgit2/py-git2/patches/patch-pyproject_toml @@ -0,0 +1,29 @@ +From 1a9947a21a7cc71d07c86a87eeb49a24e40ce95e Mon Sep 17 00:00:00 2001 +From: WANG Xuerui +Date: Mon, 4 Mar 2024 14:52:41 +0800 +Subject: [PATCH] Format the whole repository with ruff + +From 6d539d76b53bb8ebddb97aaae0f783959e1f0810 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= +Date: Thu, 21 Mar 2024 10:15:15 +0100 +Subject: [PATCH] Upgrade to libgit2 v1.8.0 + +Index: pyproject.toml +--- pyproject.toml.orig ++++ pyproject.toml +@@ -7,7 +7,7 @@ skip = "pp3* *musllinux_aarch64" + archs = ["auto"] + build-frontend = "default" + dependency-versions = "pinned" +-environment = {LIBGIT2_VERSION="1.7.2", LIBSSH2_VERSION="1.11.0", OPENSSL_VERSION="3.1.5", LIBGIT2="/project/ci"} ++environment = {LIBGIT2_VERSION="1.8.0", LIBSSH2_VERSION="1.11.0", OPENSSL_VERSION="3.1.5", LIBGIT2="/project/ci"} + + before-all = "sh build.sh" + +@@ -21,5 +21,5 @@ repair-wheel-command = "LD_LIBRARY_PATH=/project/ci/li + + [tool.cibuildwheel.macos] + archs = ["universal2"] +-environment = {LIBGIT2_VERSION="1.7.2", LIBSSH2_VERSION="1.11.0", OPENSSL_VERSION="3.1.5", LIBGIT2="/Users/runner/work/pygit2/pygit2/ci"} ++environment = {LIBGIT2_VERSION="1.8.0", LIBSSH2_VERSION="1.11.0", OPENSSL_VERSION="3.1.5", LIBGIT2="/Users/runner/work/pygit2/pygit2/ci"} + repair-wheel-command = "DYLD_LIBRARY_PATH=/Users/runner/work/pygit2/pygit2/ci/lib delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}" diff --git a/devel/libgit2/py-git2/patches/patch-src_blob_c b/devel/libgit2/py-git2/patches/patch-src_blob_c new file mode 100644 index 00000000000..30e09fd9a83 --- /dev/null +++ b/devel/libgit2/py-git2/patches/patch-src_blob_c @@ -0,0 +1,14 @@ +Fix for libgit2->=1.8.0: +warning: call to undeclared function 'git_error_set' + +Index: src/blob.c +--- src/blob.c.orig ++++ src/blob.c +@@ -28,6 +28,7 @@ + #define PY_SSIZE_T_CLEAN + #include + #include ++#include + #include "diff.h" + #include "error.h" + #include "object.h" diff --git a/devel/libgit2/py-git2/patches/patch-src_filter_c b/devel/libgit2/py-git2/patches/patch-src_filter_c new file mode 100644 index 00000000000..e69a02bde2d --- /dev/null +++ b/devel/libgit2/py-git2/patches/patch-src_filter_c @@ -0,0 +1,14 @@ +Fix for libgit2->=1.8.0: +warning: call to undeclared function 'git_error_set' + +Index: src/filter.c +--- src/filter.c.orig ++++ src/filter.c +@@ -28,6 +28,7 @@ + #define PY_SSIZE_T_CLEAN + #include + #include ++#include + #include + #include "diff.h" + #include "error.h" diff --git a/devel/libgit2/py-git2/patches/patch-src_pygit2_c b/devel/libgit2/py-git2/patches/patch-src_pygit2_c new file mode 100644 index 00000000000..b0d6811dcc2 --- /dev/null +++ b/devel/libgit2/py-git2/patches/patch-src_pygit2_c @@ -0,0 +1,21 @@ +From 1a9947a21a7cc71d07c86a87eeb49a24e40ce95e Mon Sep 17 00:00:00 2001 +From: WANG Xuerui +Date: Mon, 4 Mar 2024 14:52:41 +0800 +Subject: [PATCH] Format the whole repository with ruff + +From 6d539d76b53bb8ebddb97aaae0f783959e1f0810 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= +Date: Thu, 21 Mar 2024 10:15:15 +0100 +Subject: [PATCH] Upgrade to libgit2 v1.8.0 + +Index: src/pygit2.c +--- src/pygit2.c.orig ++++ src/pygit2.c +@@ -792,6 +792,7 @@ PyInit__pygit2(void) + ADD_CONSTANT_INT(m, GIT_CONFIG_LEVEL_XDG); + ADD_CONSTANT_INT(m, GIT_CONFIG_LEVEL_GLOBAL); + ADD_CONSTANT_INT(m, GIT_CONFIG_LEVEL_LOCAL); ++ ADD_CONSTANT_INT(m, GIT_CONFIG_LEVEL_WORKTREE); + ADD_CONSTANT_INT(m, GIT_CONFIG_LEVEL_APP); + ADD_CONSTANT_INT(m, GIT_CONFIG_HIGHEST_LEVEL); + diff --git a/devel/libgit2/py-git2/patches/patch-src_types_h b/devel/libgit2/py-git2/patches/patch-src_types_h new file mode 100644 index 00000000000..b3d95cbba48 --- /dev/null +++ b/devel/libgit2/py-git2/patches/patch-src_types_h @@ -0,0 +1,24 @@ +From 1a9947a21a7cc71d07c86a87eeb49a24e40ce95e Mon Sep 17 00:00:00 2001 +From: WANG Xuerui +Date: Mon, 4 Mar 2024 14:52:41 +0800 +Subject: [PATCH] Format the whole repository with ruff + +From 6d539d76b53bb8ebddb97aaae0f783959e1f0810 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= +Date: Thu, 21 Mar 2024 10:15:15 +0100 +Subject: [PATCH] Upgrade to libgit2 v1.8.0 + +Index: src/types.h +--- src/types.h.orig ++++ src/types.h +@@ -33,8 +33,8 @@ + #include + #include + +-#if !(LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR == 7) +-#error You need a compatible libgit2 version (1.7.x) ++#if !(LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR == 8) ++#error You need a compatible libgit2 version (1.8.x) + #endif + + /* diff --git a/emulators/es-de/Makefile b/emulators/es-de/Makefile index ace397df84d..42b578214a3 100644 --- a/emulators/es-de/Makefile +++ b/emulators/es-de/Makefile @@ -3,6 +3,7 @@ COMMENT = emulator frontend PKGNAME = es-de-$V V = 3.0.1 REV = a47a0547a2248d1f7c9f6c27b19b5013bed3f23e +REVISION = 0 DIST_TUPLE += gitlab es-de emulationstation-de v$V . diff --git a/emulators/es-de/patches/patch-es-app_src_guis_GuiThemeDownloader_cpp b/emulators/es-de/patches/patch-es-app_src_guis_GuiThemeDownloader_cpp new file mode 100644 index 00000000000..e92e27539c7 --- /dev/null +++ b/emulators/es-de/patches/patch-es-app_src_guis_GuiThemeDownloader_cpp @@ -0,0 +1,15 @@ +Fix for libgit2->=1.8.0: +error: use of undeclared identifier 'git_error_clear' + +Index: es-app/src/guis/GuiThemeDownloader.cpp +--- es-app/src/guis/GuiThemeDownloader.cpp.orig ++++ es-app/src/guis/GuiThemeDownloader.cpp +@@ -6,6 +6,8 @@ + // Theme downloader. + // + ++#include ++ + #include "guis/GuiThemeDownloader.h" + + #include "ApplicationVersion.h" diff --git a/sysutils/bat/Makefile b/sysutils/bat/Makefile index 53f02ab4929..d0e2a5429fb 100644 --- a/sysutils/bat/Makefile +++ b/sysutils/bat/Makefile @@ -3,6 +3,7 @@ COMMENT = cat(1) clone with wings GH_ACCOUNT = sharkdp GH_PROJECT = bat GH_TAGNAME = v0.24.0 +REVISION = 0 CATEGORIES = sysutils diff --git a/sysutils/bat/patches/patch-modcargo-crates_libgit2-sys-0_16_1+1_7_1_build_rs b/sysutils/bat/patches/patch-modcargo-crates_libgit2-sys-0_16_1+1_7_1_build_rs new file mode 100644 index 00000000000..4c1e8b4266f --- /dev/null +++ b/sysutils/bat/patches/patch-modcargo-crates_libgit2-sys-0_16_1+1_7_1_build_rs @@ -0,0 +1,14 @@ +Fix for libgit2->=1.8.0 + +Index: modcargo-crates/libgit2-sys-0.16.1+1.7.1/build.rs +--- modcargo-crates/libgit2-sys-0.16.1+1.7.1/build.rs.orig ++++ modcargo-crates/libgit2-sys-0.16.1+1.7.1/build.rs +@@ -7,7 +7,7 @@ use std::process::Command; + /// Tries to use system libgit2 and emits necessary build script instructions. + fn try_system_libgit2() -> Result { + let mut cfg = pkg_config::Config::new(); +- match cfg.range_version("1.7.1".."1.8.0").probe("libgit2") { ++ match cfg.range_version("1.7.1".."1.9.0").probe("libgit2") { + Ok(lib) => { + for include in &lib.include_paths { + println!("cargo:root={}", include.display()); diff --git a/sysutils/eza/Makefile b/sysutils/eza/Makefile index ad044b098b7..efc644bd329 100644 --- a/sysutils/eza/Makefile +++ b/sysutils/eza/Makefile @@ -3,6 +3,7 @@ COMMENT = ls alternative written in Rust (fork of exa) GH_ACCOUNT = eza-community GH_PROJECT = eza GH_TAGNAME = v0.18.3 +REVISION = 0 HOMEPAGE = https://eza.rocks/ diff --git a/sysutils/eza/patches/patch-modcargo-crates_libgit2-sys-0_16_2+1_7_2_build_rs b/sysutils/eza/patches/patch-modcargo-crates_libgit2-sys-0_16_2+1_7_2_build_rs new file mode 100644 index 00000000000..9b81e07c25f --- /dev/null +++ b/sysutils/eza/patches/patch-modcargo-crates_libgit2-sys-0_16_2+1_7_2_build_rs @@ -0,0 +1,14 @@ +Fix for libgit2->=1.8.0 + +Index: modcargo-crates/libgit2-sys-0.16.2+1.7.2/build.rs +--- modcargo-crates/libgit2-sys-0.16.2+1.7.2/build.rs.orig ++++ modcargo-crates/libgit2-sys-0.16.2+1.7.2/build.rs +@@ -7,7 +7,7 @@ use std::process::Command; + /// Tries to use system libgit2 and emits necessary build script instructions. + fn try_system_libgit2() -> Result { + let mut cfg = pkg_config::Config::new(); +- match cfg.range_version("1.7.2".."1.8.0").probe("libgit2") { ++ match cfg.range_version("1.7.2".."1.9.0").probe("libgit2") { + Ok(lib) => { + for include in &lib.include_paths { + println!("cargo:root={}", include.display()); diff --git a/sysutils/lsd/Makefile b/sysutils/lsd/Makefile index 0d6b5a6d7b4..750e623dc82 100644 --- a/sysutils/lsd/Makefile +++ b/sysutils/lsd/Makefile @@ -3,6 +3,7 @@ COMMENT = pretty ls alternative with support for icons and colors GH_ACCOUNT = lsd-rs GH_PROJECT = lsd GH_TAGNAME = v1.0.0 +REVISION = 0 CATEGORIES = sysutils diff --git a/sysutils/lsd/patches/patch-modcargo-crates_libgit2-sys-0_14_2+1_5_1_build_rs b/sysutils/lsd/patches/patch-modcargo-crates_libgit2-sys-0_14_2+1_5_1_build_rs index 209f93bee4d..3e21570e887 100644 --- a/sysutils/lsd/patches/patch-modcargo-crates_libgit2-sys-0_14_2+1_5_1_build_rs +++ b/sysutils/lsd/patches/patch-modcargo-crates_libgit2-sys-0_14_2+1_5_1_build_rs @@ -1,3 +1,5 @@ +Fix for libgit2->=1.8.0 + Index: modcargo-crates/libgit2-sys-0.14.2+1.5.1/build.rs --- modcargo-crates/libgit2-sys-0.14.2+1.5.1/build.rs.orig +++ modcargo-crates/libgit2-sys-0.14.2+1.5.1/build.rs @@ -6,7 +8,7 @@ Index: modcargo-crates/libgit2-sys-0.14.2+1.5.1/build.rs // the SSH fixes for CVE-2023-22742 (1.5.1+ or 1.4.5+). if let Ok(lib) = cfg - .range_version("1.5.1".."1.6.0") -+ .range_version("1.5.1".."1.8.0") ++ .range_version("1.5.1".."1.9.0") .probe("libgit2") .or_else(|_| cfg.range_version("1.4.5".."1.5.0").probe("libgit2")) { diff --git a/textproc/delta/Makefile b/textproc/delta/Makefile index 4d05860fd45..76f9168edbd 100644 --- a/textproc/delta/Makefile +++ b/textproc/delta/Makefile @@ -3,6 +3,7 @@ COMMENT = viewer for git and diff output GH_ACCOUNT = dandavison GH_PROJECT = delta GH_TAGNAME = 0.17.0 +REVISION = 0 CATEGORIES = textproc diff --git a/textproc/delta/patches/patch-modcargo-crates_libgit2-sys-0_16_2+1_7_2_build_rs b/textproc/delta/patches/patch-modcargo-crates_libgit2-sys-0_16_2+1_7_2_build_rs new file mode 100644 index 00000000000..9b81e07c25f --- /dev/null +++ b/textproc/delta/patches/patch-modcargo-crates_libgit2-sys-0_16_2+1_7_2_build_rs @@ -0,0 +1,14 @@ +Fix for libgit2->=1.8.0 + +Index: modcargo-crates/libgit2-sys-0.16.2+1.7.2/build.rs +--- modcargo-crates/libgit2-sys-0.16.2+1.7.2/build.rs.orig ++++ modcargo-crates/libgit2-sys-0.16.2+1.7.2/build.rs +@@ -7,7 +7,7 @@ use std::process::Command; + /// Tries to use system libgit2 and emits necessary build script instructions. + fn try_system_libgit2() -> Result { + let mut cfg = pkg_config::Config::new(); +- match cfg.range_version("1.7.2".."1.8.0").probe("libgit2") { ++ match cfg.range_version("1.7.2".."1.9.0").probe("libgit2") { + Ok(lib) => { + for include in &lib.include_paths { + println!("cargo:root={}", include.display());