aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpsykose <alice@ayaya.dev>2023-07-22 10:44:18 +0000
committerpsykose <alice@ayaya.dev>2023-07-22 12:28:30 +0000
commite8dda72ec55cff00210573c1eace5619be833765 (patch)
treefecb475765d67d4748b7c645dff1d0bb6e06f93f
parent24c7ae91ef526f0824b4c999caa3520d750efc90 (diff)
community/*: rebuild against libgit2.so.1.7
-rw-r--r--community/bat/APKBUILD13
-rw-r--r--community/broot/APKBUILD15
-rw-r--r--community/calligra/APKBUILD2
-rw-r--r--community/cargo-audit/APKBUILD14
-rw-r--r--community/cargo-c/APKBUILD13
-rw-r--r--community/cargo-edit/APKBUILD12
-rw-r--r--community/committed/APKBUILD15
-rw-r--r--community/delta/APKBUILD12
-rw-r--r--community/exa/APKBUILD12
-rw-r--r--community/git-branchless/APKBUILD17
-rw-r--r--community/git-branchless/getrandom.patch140
-rw-r--r--community/git-cliff/APKBUILD12
-rw-r--r--community/git-interactive-rebase-tool/APKBUILD20
-rw-r--r--community/git-interactive-rebase-tool/no-werror.patch73
-rw-r--r--community/git-shuffle/APKBUILD2
-rw-r--r--community/gitui/APKBUILD15
-rw-r--r--community/kup/APKBUILD2
-rw-r--r--community/libgit2-glib/APKBUILD2
-rw-r--r--community/onefetch/APKBUILD6
-rw-r--r--community/py3-pygit2/APKBUILD13
-rw-r--r--community/py3-pygit2/libgit2-1.7.patch72
-rw-r--r--community/ruby-rugged/APKBUILD4
-rw-r--r--community/ruby-rugged/libgit2-1.7.patch90
-rw-r--r--community/sheldon/APKBUILD12
-rw-r--r--community/stagit/APKBUILD2
-rw-r--r--community/wezterm/APKBUILD12
26 files changed, 576 insertions, 26 deletions
diff --git a/community/bat/APKBUILD b/community/bat/APKBUILD
index d5e51627776..98123346033 100644
--- a/community/bat/APKBUILD
+++ b/community/bat/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: psykose <alice@ayaya.dev>
pkgname=bat
pkgver=0.23.0
-pkgrel=3
+pkgrel=4
pkgdesc="cat(1) clone with wings"
url="https://github.com/sharkdp/bat"
# s390x: nix crate fails to build
@@ -37,6 +37,17 @@ export RUSTONIG_DYNAMIC_LIBONIG=1 # use system libonig
prepare() {
default_prepare
+
+ # Rust target triple.
+ local target=$(rustc -vV | sed -n 's/host: //p')
+
+ # Build against system-provided libs
+ mkdir -p .cargo
+ cat >> .cargo/config.toml <<-EOF
+ [target.$target]
+ git2 = { rustc-link-lib = ["git2"] }
+ EOF
+
cargo fetch --target="$CTARGET" --locked
}
diff --git a/community/broot/APKBUILD b/community/broot/APKBUILD
index 646a838e17a..87ebda8758f 100644
--- a/community/broot/APKBUILD
+++ b/community/broot/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=broot
pkgver=1.21.3
-pkgrel=2
+pkgrel=3
pkgdesc="New way to see and navigate directory trees"
url="https://github.com/Canop/broot"
# riscv64: TODO
@@ -36,6 +36,19 @@ prepare() {
default_prepare
+ # Rust target triple.
+ local target=$(rustc -vV | sed -n 's/host: //p')
+
+ # Build against system-provided libs
+ mkdir -p .cargo
+ cat >> .cargo/config.toml <<-EOF
+ [target.$target]
+ git2 = { rustc-link-lib = ["git2"] }
+ EOF
+
+ # open64
+ cargo update -p getrandom --precise 0.2.10
+
cargo fetch --target="$CTARGET" # update after patching
}
diff --git a/community/calligra/APKBUILD b/community/calligra/APKBUILD
index ca2b61ca47f..17e6dab49df 100644
--- a/community/calligra/APKBUILD
+++ b/community/calligra/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=calligra
pkgver=3.2.1
-pkgrel=41
+pkgrel=42
pkgdesc="Office and graphic art suite by KDE"
# armhf blocked by extra-cmake-modules
# ppc64le, s390x and riscv64 blocked by qt5-qtwebengine -> okular
diff --git a/community/cargo-audit/APKBUILD b/community/cargo-audit/APKBUILD
index b954ca74edb..72687b8ce15 100644
--- a/community/cargo-audit/APKBUILD
+++ b/community/cargo-audit/APKBUILD
@@ -2,13 +2,13 @@
# Maintainer: kpcyrd <git@rxv.cc>
pkgname=cargo-audit
pkgver=0.17.6
-pkgrel=2
+pkgrel=3
pkgdesc="Audit Cargo.lock for crates with security vulnerabilities"
url="https://github.com/RustSec/rustsec"
# s390x, ppc64le, riscv64: blocked by ring crate
arch="all !s390x !ppc64le !riscv64"
license="MIT OR Apache-2.0"
-makedepends="cargo libgit2-1.5-dev openssl-dev>3 cargo-auditable"
+makedepends="cargo libgit2-dev openssl-dev>3 cargo-auditable"
subpackages="$pkgname-doc"
options="net"
source="$pkgname-$pkgver.tar.gz::https://github.com/RustSec/cargo-audit/archive/cargo-audit/v$pkgver.tar.gz"
@@ -18,6 +18,16 @@ options="net !check" # requires running binaries prebuilt against glibc as part
prepare() {
default_prepare
+ # Rust target triple.
+ local target=$(rustc -vV | sed -n 's/host: //p')
+
+ # Build against system-provided libs
+ mkdir -p .cargo
+ cat >> .cargo/config.toml <<-EOF
+ [target.$target]
+ git2 = { rustc-link-lib = ["git2"] }
+ EOF
+
# no lock
cargo fetch --target="$CTARGET"
}
diff --git a/community/cargo-c/APKBUILD b/community/cargo-c/APKBUILD
index a33b7a2c6fd..772a2fa7fd3 100644
--- a/community/cargo-c/APKBUILD
+++ b/community/cargo-c/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Oleg Titov <oleg.titov@gmail.com>
pkgname=cargo-c
pkgver=0.9.22
-pkgrel=0
+pkgrel=1
pkgdesc="cargo subcommand to build and install C-ABI compatibile dynamic and static libraries"
url="https://github.com/lu-zero/cargo-c"
arch="all"
@@ -29,6 +29,17 @@ prepare() {
default_prepare
cp "$srcdir"/$pkgname-$pkgver-Cargo.lock Cargo.lock
+
+ # Rust target triple.
+ local target=$(rustc -vV | sed -n 's/host: //p')
+
+ # Build against system-provided libs
+ mkdir -p .cargo
+ cat >> .cargo/config.toml <<-EOF
+ [target.$target]
+ git2 = { rustc-link-lib = ["git2"] }
+ EOF
+
cargo fetch --target="$CTARGET" --locked
}
diff --git a/community/cargo-edit/APKBUILD b/community/cargo-edit/APKBUILD
index fa4ab8d2f07..b9181e7cb06 100644
--- a/community/cargo-edit/APKBUILD
+++ b/community/cargo-edit/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: kpcyrd <git@rxv.cc>
pkgname=cargo-edit
pkgver=0.12.0
-pkgrel=0
+pkgrel=1
pkgdesc="Managing cargo dependencies from the command line"
url="https://github.com/killercup/cargo-edit"
# s390x, ppc64le, riscv64: blocked by ring crate
@@ -27,6 +27,16 @@ _cargo_opts="--frozen --no-default-features --features add,rm,upgrade,set-versio
prepare() {
default_prepare
+ # Rust target triple.
+ local target=$(rustc -vV | sed -n 's/host: //p')
+
+ # Build against system-provided libs
+ mkdir -p .cargo
+ cat >> .cargo/config.toml <<-EOF
+ [target.$target]
+ git2 = { rustc-link-lib = ["git2"] }
+ EOF
+
cargo fetch --target="$CTARGET" --locked
}
diff --git a/community/committed/APKBUILD b/community/committed/APKBUILD
index b27ea4c3b03..8b4c03ca074 100644
--- a/community/committed/APKBUILD
+++ b/community/committed/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Michał Polański <michal@polanski.me>
pkgname=committed
pkgver=1.0.18
-pkgrel=1
+pkgrel=2
pkgdesc="Nitpicking your commit history"
url="https://github.com/crate-ci/committed"
license="MIT OR Apache-2.0"
@@ -15,6 +15,19 @@ options="net" # fetch dependencies
prepare() {
default_prepare
+ # Rust target triple.
+ local target=$(rustc -vV | sed -n 's/host: //p')
+
+ # Build against system-provided libs
+ mkdir -p .cargo
+ cat >> .cargo/config.toml <<-EOF
+ [target.$target]
+ git2 = { rustc-link-lib = ["git2"] }
+ EOF
+
+ # open64
+ cargo update -p getrandom --precise 0.2.10
+
cargo fetch --target="$CTARGET" --locked
}
diff --git a/community/delta/APKBUILD b/community/delta/APKBUILD
index 6962ee258d6..76ca5f911ef 100644
--- a/community/delta/APKBUILD
+++ b/community/delta/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Aleks Bunin <alpinelinux@compuix.com>
pkgname=delta
pkgver=0.16.5
-pkgrel=0
+pkgrel=1
pkgdesc="Syntax-highlighting pager for git and diff output"
url="https://github.com/dandavison/delta"
license="MIT"
@@ -27,6 +27,16 @@ export RUSTONIG_SYSTEM_LIBONIG="true"
prepare() {
default_prepare
+ # Rust target triple.
+ local target=$(rustc -vV | sed -n 's/host: //p')
+
+ # Build against system-provided libs
+ mkdir -p .cargo
+ cat >> .cargo/config.toml <<-EOF
+ [target.$target]
+ git2 = { rustc-link-lib = ["git2"] }
+ EOF
+
cargo fetch --target="$CTARGET" --locked
}
diff --git a/community/exa/APKBUILD b/community/exa/APKBUILD
index 495fff7d7b8..73105b2efc8 100644
--- a/community/exa/APKBUILD
+++ b/community/exa/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=exa
pkgver=0.10.1
-pkgrel=8
+pkgrel=9
pkgdesc="ls replacement written in Rust"
url="https://the.exa.website/"
# riscv64: doesn't build
@@ -24,6 +24,16 @@ options="net"
prepare() {
default_prepare
+ # Rust target triple.
+ local target=$(rustc -vV | sed -n 's/host: //p')
+
+ # Build against system-provided libs
+ mkdir -p .cargo
+ cat >> .cargo/config.toml <<-EOF
+ [target.$target]
+ git2 = { rustc-link-lib = ["git2"] }
+ EOF
+
cargo fetch --target="$CTARGET" --locked
}
diff --git a/community/git-branchless/APKBUILD b/community/git-branchless/APKBUILD
index 481c42d712f..2106b4c8dd7 100644
--- a/community/git-branchless/APKBUILD
+++ b/community/git-branchless/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=git-branchless
pkgver=0.7.1
-pkgrel=2
+pkgrel=3
pkgdesc="Suite of tools to help you visualize, navigate, manipulate, and repair your commit graph"
url="https://github.com/arxanas/git-branchless"
arch="aarch64 armhf armv7 ppc64le x86 x86_64" # blocked by rust/cargo
@@ -20,6 +20,7 @@ checkdepends="
git
"
source="https://github.com/arxanas/git-branchless/archive/v$pkgver/git-branchless-$pkgver.tar.gz
+ getrandom.patch
libgit2.patch
unbundle-sqlite.patch
"
@@ -30,6 +31,19 @@ export LIBSSH2_SYS_USE_PKG_CONFIG=1 # use system libssh2
prepare() {
default_prepare
+ # Rust target triple.
+ local target=$(rustc -vV | sed -n 's/host: //p')
+
+ # Build against system-provided libs
+ mkdir -p .cargo
+ cat >> .cargo/config.toml <<-EOF
+ [target.$target]
+ git2 = { rustc-link-lib = ["git2"] }
+ EOF
+
+ # open64
+ cargo update -p getrandom --precise 0.2.10
+
cargo fetch --target="$CTARGET" --locked
}
@@ -57,6 +71,7 @@ package() {
sha512sums="
c556d3e72ee13ce4ab6600a64a4b20788234176c89107b57dfccd69ac72027bfed126c1bf3dc71d075b71bc13d88c696700da320e0795e3f737000c6a1f651c4 git-branchless-0.7.1.tar.gz
+d9c4e44f19bfcf2b979eca0ba3f022791566e61fdfc1cfe6eadeb1c34894aba072a634b9e62ab4a7d342b9885526487b3629dae90603ef4c70b23315c66200c1 getrandom.patch
3630b78ae2191104f31ce5b797ca392a08b6e89e200f1c1487b1a4d0cce29b4c8ebc89f824470966ae55793bbb6ff7945d9a4d62c327d2898c81a1e67765438f libgit2.patch
ebee160cd936b151515609d9c972c0b747d3bb122bfc0cb6946e3ade86e521efdf1277b033fcf76ecd60f4e81fcfa0f233db1eb2da7ad800d30f7a938cf5ba2f unbundle-sqlite.patch
"
diff --git a/community/git-branchless/getrandom.patch b/community/git-branchless/getrandom.patch
new file mode 100644
index 00000000000..fa7a6f5dbef
--- /dev/null
+++ b/community/git-branchless/getrandom.patch
@@ -0,0 +1,140 @@
+link a patched 0.1 so it doesn't use lfs64
+--
+diff --git a/Cargo.lock b/Cargo.lock
+index 129d612..83f1453 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -23,7 +23,7 @@ version = "0.7.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
+ dependencies = [
+- "getrandom 0.2.8",
++ "getrandom",
+ "once_cell",
+ "version_check",
+ ]
+@@ -35,7 +35,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "bf6ccdb167abbf410dcb915cabd428929d7f6a04980b54a11f26a39f1c7f7107"
+ dependencies = [
+ "cfg-if",
+- "getrandom 0.2.8",
++ "getrandom",
+ "once_cell",
+ "version_check",
+ ]
+@@ -1067,7 +1067,7 @@ checksum = "3be3c61c59fdc91f5dbc3ea31ee8623122ce80057058be560654c5d410d181a6"
+ dependencies = [
+ "lazy_static",
+ "log",
+- "rand 0.7.3",
++ "rand 0.7.4",
+ ]
+
+ [[package]]
+@@ -1247,17 +1247,6 @@ dependencies = [
+ "thread_local",
+ ]
+
+-[[package]]
+-name = "getrandom"
+-version = "0.1.16"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+-dependencies = [
+- "cfg-if",
+- "libc",
+- "wasi 0.9.0+wasi-snapshot-preview1",
+-]
+-
+ [[package]]
+ name = "getrandom"
+ version = "0.2.8"
+@@ -2573,11 +2562,10 @@ dependencies = [
+
+ [[package]]
+ name = "rand"
+-version = "0.7.3"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
++version = "0.7.4"
++source = "git+https://github.com/nekopsykose/rand?rev=0dc97a89afa9237baa6c421c9517030cb391921c#0dc97a89afa9237baa6c421c9517030cb391921c"
+ dependencies = [
+- "getrandom 0.1.16",
++ "getrandom",
+ "libc",
+ "rand_chacha 0.2.2",
+ "rand_core 0.5.1",
+@@ -2598,8 +2586,7 @@ dependencies = [
+ [[package]]
+ name = "rand_chacha"
+ version = "0.2.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
++source = "git+https://github.com/nekopsykose/rand?rev=0dc97a89afa9237baa6c421c9517030cb391921c#0dc97a89afa9237baa6c421c9517030cb391921c"
+ dependencies = [
+ "ppv-lite86",
+ "rand_core 0.5.1",
+@@ -2633,10 +2620,9 @@ checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
+ [[package]]
+ name = "rand_core"
+ version = "0.5.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
++source = "git+https://github.com/nekopsykose/rand?rev=0dc97a89afa9237baa6c421c9517030cb391921c#0dc97a89afa9237baa6c421c9517030cb391921c"
+ dependencies = [
+- "getrandom 0.1.16",
++ "getrandom",
+ ]
+
+ [[package]]
+@@ -2645,14 +2631,13 @@ version = "0.6.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+ dependencies = [
+- "getrandom 0.2.8",
++ "getrandom",
+ ]
+
+ [[package]]
+ name = "rand_hc"
+ version = "0.2.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
++source = "git+https://github.com/nekopsykose/rand?rev=0dc97a89afa9237baa6c421c9517030cb391921c#0dc97a89afa9237baa6c421c9517030cb391921c"
+ dependencies = [
+ "rand_core 0.5.1",
+ ]
+@@ -2712,7 +2697,7 @@ version = "0.4.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+ dependencies = [
+- "getrandom 0.2.8",
++ "getrandom",
+ "redox_syscall",
+ "thiserror",
+ ]
+@@ -3562,12 +3547,6 @@ dependencies = [
+ "winapi-util",
+ ]
+
+-[[package]]
+-name = "wasi"
+-version = "0.9.0+wasi-snapshot-preview1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+-
+ [[package]]
+ name = "wasi"
+ version = "0.10.0+wasi-snapshot-preview1"
+diff --git a/Cargo.toml b/Cargo.toml
+index cd19514..6b1dc74 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -32,3 +32,7 @@ members = [
+ consolidate-commits = true
+ push = false
+ tag = false
++
++[patch.crates-io]
++"rand_core" = { git = 'https://github.com/nekopsykose/rand', rev = '0dc97a89afa9237baa6c421c9517030cb391921c' }
++"rand" = { git = 'https://github.com/nekopsykose/rand', rev = '0dc97a89afa9237baa6c421c9517030cb391921c' }
diff --git a/community/git-cliff/APKBUILD b/community/git-cliff/APKBUILD
index 9efa0a57404..86129056e3d 100644
--- a/community/git-cliff/APKBUILD
+++ b/community/git-cliff/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Orhun Parmaksız <orhunparmaksiz@gmail.com>
pkgname=git-cliff
pkgver=1.2.0
-pkgrel=3
+pkgrel=4
pkgdesc="A highly customizable changelog generator"
url="https://github.com/orhun/git-cliff"
# s390x, ppc64le, riscv64: blocked by ring crate
@@ -25,6 +25,16 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/orhun/git-cliff/archive/v$pk
prepare() {
default_prepare
+ # Rust target triple.
+ local target=$(rustc -vV | sed -n 's/host: //p')
+
+ # Build against system-provided libs
+ mkdir -p .cargo
+ cat >> .cargo/config.toml <<-EOF
+ [target.$target]
+ git2 = { rustc-link-lib = ["git2"] }
+ EOF
+
cargo fetch --target="$CTARGET" --locked
}
diff --git a/community/git-interactive-rebase-tool/APKBUILD b/community/git-interactive-rebase-tool/APKBUILD
index a12473ce3c6..9f587685e17 100644
--- a/community/git-interactive-rebase-tool/APKBUILD
+++ b/community/git-interactive-rebase-tool/APKBUILD
@@ -2,14 +2,16 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=git-interactive-rebase-tool
pkgver=2.2.1
-pkgrel=2
+pkgrel=3
pkgdesc="Terminal based sequence editor for interactive rebase"
url="https://gitrebasetool.mitmaro.ca"
arch="all !s390x !riscv64" # limited by rust/cargo
license="GPL-3.0-or-later"
makedepends="cargo libgit2-dev zlib-dev cargo-auditable"
subpackages="$pkgname-doc"
-source="https://github.com/MitMaro/git-interactive-rebase-tool/archive/$pkgver/git-interactive-rebase-tool-$pkgver.tar.gz"
+source="https://github.com/MitMaro/git-interactive-rebase-tool/archive/$pkgver/git-interactive-rebase-tool-$pkgver.tar.gz
+ no-werror.patch
+ "
options="net"
export CARGO_PROFILE_RELEASE_OPT_LEVEL="z"
@@ -17,6 +19,19 @@ export CARGO_PROFILE_RELEASE_OPT_LEVEL="z"
prepare() {
default_prepare
+ # Rust target triple.
+ local target=$(rustc -vV | sed -n 's/host: //p')
+
+ # Build against system-provided libs
+ mkdir -p .cargo
+ cat >> .cargo/config.toml <<-EOF
+ [target.$target]
+ git2 = { rustc-link-lib = ["git2"] }
+ EOF
+
+ # open64
+ cargo update -p getrandom --precise 0.2.10
+
cargo fetch --target="$CTARGET" --locked
}
@@ -37,4 +52,5 @@ package() {
sha512sums="
beb4e41a99ea9a1ce47de324152c146b759abe6301b46203d4f7947fb064f4ddeb6dce437c30de29a5e3a0d4aa214eaad627f068a7e3f3ae5d5db32912213b48 git-interactive-rebase-tool-2.2.1.tar.gz
+b6c154cf342e1a037fd3fd3682696f27cc2de6d47325e52195bef1c850ebdd958e881e60696f5a1426717a6d7e78e8904480590744d10dbc9a8cc7484ae52c1e no-werror.patch
"
diff --git a/community/git-interactive-rebase-tool/no-werror.patch b/community/git-interactive-rebase-tool/no-werror.patch
new file mode 100644
index 00000000000..83296b488fe
--- /dev/null
+++ b/community/git-interactive-rebase-tool/no-werror.patch
@@ -0,0 +1,73 @@
+diff --git a/src/view/src/lib.rs b/src/view/src/lib.rs
+index 76afa88..4c33f99 100644
+--- a/src/view/src/lib.rs
++++ b/src/view/src/lib.rs
+@@ -9,8 +9,7 @@
+ nonstandard_style,
+ rust_2018_compatibility,
+ rust_2018_idioms,
+- unused,
+- warnings
++ unused
+ )]
+ // rustc's additional allowed by default lints
+ #![deny(
+@@ -105,14 +104,8 @@ use display::{Display, DisplayColor, Size, Tui};
+
+ use self::render_slice::RenderSlice;
+ pub use self::{
+- action::ViewAction,
+- line_segment::LineSegment,
+- render_context::RenderContext,
+- sender::Sender as ViewSender,
+- thread::spawn_view_thread,
+- view_data::ViewData,
+- view_data_updater::ViewDataUpdater,
+- view_line::ViewLine,
++ action::ViewAction, line_segment::LineSegment, render_context::RenderContext, sender::Sender as ViewSender,
++ thread::spawn_view_thread, view_data::ViewData, view_data_updater::ViewDataUpdater, view_line::ViewLine,
+ };
+
+ const TITLE: &str = "Git Interactive Rebase Tool";
+@@ -213,14 +206,11 @@ impl<C: Tui> View<C> {
+ if show_scroll_bar {
+ self.display.move_from_end_of_line(1)?;
+ self.display.color(DisplayColor::Normal, true)?;
+- self.display.draw_str(
+- if scroll_indicator_index == index {
+- SCROLLBAR_INDICATOR_CHARACTER
+- }
+- else {
+- " "
+- },
+- )?;
++ self.display.draw_str(if scroll_indicator_index == index {
++ SCROLLBAR_INDICATOR_CHARACTER
++ } else {
++ " "
++ })?;
+ }
+ self.display.color(DisplayColor::Normal, false)?;
+ self.display.set_style(false, false, false)?;
+@@ -279,18 +269,15 @@ impl<C: Tui> View<C> {
+ if show_help {
+ self.display
+ .draw_str(format!("{}{}", TITLE_HELP_INDICATOR_LABEL, self.help_indicator_key).as_str())?;
+- }
+- else {
++ } else {
+ let padding = " ".repeat(title_help_indicator_total_length);
+ self.display.draw_str(padding.as_str())?;
+ }
+- }
+- else if (window_width - TITLE.len()) > 0 {
++ } else if (window_width - TITLE.len()) > 0 {
+ let padding = " ".repeat(window_width - TITLE.len());
+ self.display.draw_str(padding.as_str())?;
+ }
+- }
+- else {
++ } else {
+ self.display.draw_str(TITLE_SHORT)?;
+ if (window_width - TITLE_SHORT.len()) > 0 {
+ let padding = " ".repeat(window_width - TITLE_SHORT.len());
diff --git a/community/git-shuffle/APKBUILD b/community/git-shuffle/APKBUILD
index 455e929a116..605c8e35b59 100644
--- a/community/git-shuffle/APKBUILD
+++ b/community/git-shuffle/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
pkgname=git-shuffle
pkgver=1.0.0
-pkgrel=1
+pkgrel=2
pkgdesc="Randomize Git commit timestamps to enhance privacy"
url="https://github.com/nmeum/git-shuffle"
arch="all"
diff --git a/community/gitui/APKBUILD b/community/gitui/APKBUILD
index 87d8e3ecd86..ae55766a19f 100644
--- a/community/gitui/APKBUILD
+++ b/community/gitui/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=gitui
pkgver=0.23.0
-pkgrel=0
+pkgrel=1
pkgdesc="Blazing fast terminal client for git"
url="https://github.com/extrawurst/gitui"
arch="x86_64 armv7 armhf aarch64 x86 ppc64le" # limited by rust/cargo
@@ -26,6 +26,19 @@ _cargo_opts="--frozen --no-default-features --features regex-onig"
prepare() {
default_prepare
+ # Rust target triple.
+ local target=$(rustc -vV | sed -n 's/host: //p')
+
+ # Build against system-provided libs
+ mkdir -p .cargo
+ cat >> .cargo/config.toml <<-EOF
+ [target.$target]
+ git2 = { rustc-link-lib = ["git2"] }
+ EOF
+
+ # open64
+ cargo update -p getrandom --precise 0.2.10
+
cargo fetch --target="$CTARGET" --locked
}
diff --git a/community/kup/APKBUILD b/community/kup/APKBUILD
index 65c3c779ed9..8dc7ee0c766 100644
--- a/community/kup/APKBUILD
+++ b/community/kup/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=kup
pkgver=0.9.1
-pkgrel=5
+pkgrel=6
pkgdesc="KDE bup backup software for helping people to keep up-to-date backups"
# armhf blocked by extra-cmake-modules
arch="all !armhf"
diff --git a/community/libgit2-glib/APKBUILD b/community/libgit2-glib/APKBUILD
index 7add4110756..9d27586e6f9 100644
--- a/community/libgit2-glib/APKBUILD
+++ b/community/libgit2-glib/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=libgit2-glib
pkgver=1.1.0
-pkgrel=2
+pkgrel=3
pkgdesc="Glib wrapper library around libgit2"
url="https://wiki.gnome.org/Projects/Libgit2-glib"
arch="all"
diff --git a/community/onefetch/APKBUILD b/community/onefetch/APKBUILD
index afd05480505..c34ed3daceb 100644
--- a/community/onefetch/APKBUILD
+++ b/community/onefetch/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: omni <omni+alpine@hack.org>
pkgname=onefetch
pkgver=2.18.1
-pkgrel=1
+pkgrel=2
pkgdesc="Git repository summary on your terminal"
url="https://github.com/o2sh/onefetch"
# s390x: build failure
@@ -39,10 +39,14 @@ prepare() {
mkdir -p .cargo
cat >> .cargo/config.toml <<-EOF
[target.$target]
+ git2 = { rustc-link-lib = ["git2"] }
z-ng = { rustc-link-lib = ["z-ng"], rustc-cfg = ["zng"] }
zstd = { rustc-link-lib = ["zstd"] }
EOF
+ # open64
+ cargo update -p getrandom --precise 0.2.10
+
cargo fetch --target="$CTARGET" --locked
}
diff --git a/community/py3-pygit2/APKBUILD b/community/py3-pygit2/APKBUILD
index aa66b92362b..18ec1bb23b2 100644
--- a/community/py3-pygit2/APKBUILD
+++ b/community/py3-pygit2/APKBUILD
@@ -4,7 +4,7 @@
pkgname=py3-pygit2
_pkgname=pygit2
pkgver=1.12.2
-pkgrel=0
+pkgrel=1
pkgdesc="Python bindings for libgit2"
url="https://github.com/libgit2/pygit2"
arch="all"
@@ -17,9 +17,15 @@ makedepends="
py3-wheel
python3-dev
"
-checkdepends="py3-pytest py3-hypothesis"
+checkdepends="
+ py3-pytest
+ py3-pytest-forked
+ py3-pytest-xdist
+ py3-hypothesis
+ "
subpackages="$pkgname-pyc"
source="$pkgname-$pkgver.tar.gz::https://github.com/libgit2/pygit2/archive/refs/tags/v$pkgver.tar.gz
+ libgit2-1.7.patch
s390x-patch-context-mark-xfail.patch
test-skip-ls-remote-github.patch
"
@@ -40,7 +46,7 @@ build() {
check() {
python3 -m venv --clear --without-pip --system-site-packages .testenv
.testenv/bin/python3 -m installer .dist/*.whl
- .testenv/bin/python3 -m pytest
+ .testenv/bin/python3 -m pytest -n auto --forked
}
package() {
@@ -50,6 +56,7 @@ package() {
sha512sums="
ffeddcf99a17249a4abce44fca2292af914e4bfedf1a900f68bbb784ebba21d0d13e1993af37c3e679cf4b920935ba76c59f158ed77a13cfb485e99557ba1c8c py3-pygit2-1.12.2.tar.gz
+b424f59cd14abb3c9bc82770b42383079ebbe251477bf196f8246c97bd320947d1db24b8fe4282c8b336bc2ebeb4d41feda7e26d95781bcef359f66d6a371c05 libgit2-1.7.patch
e7f3a43f2de1503d75c5583c4d9a30027dd3d619ba02e7e62bed3b912e8c91e4bc58ad395b110eb506b365bebf99d4245837c65c9988f15e4dc41f0f87fe7c13 s390x-patch-context-mark-xfail.patch
c0114b96d0064f272f166a6af915a1abcadc1ec8aac0c84007e4f24d669784d42c24f50ad71118453f0fb25b6f38f991a9d6f968d1a21f017c4662c9ba9c5c41 test-skip-ls-remote-github.patch
"
diff --git a/community/py3-pygit2/libgit2-1.7.patch b/community/py3-pygit2/libgit2-1.7.patch
new file mode 100644
index 00000000000..d5718aa990b
--- /dev/null
+++ b/community/py3-pygit2/libgit2-1.7.patch
@@ -0,0 +1,72 @@
+Patch-Source: https://github.com/libgit2/pygit2/commit/1473e8eb6eb59dc7521dcd5f8a4c9390e9b53223
+--
+From 1473e8eb6eb59dc7521dcd5f8a4c9390e9b53223 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= <jdavid.ibp@gmail.com>
+Date: Mon, 17 Jul 2023 22:23:30 +0200
+Subject: [PATCH] Upgrade to libgit2 v1.7.0
+
+---
+ .github/workflows/tests.yml | 8 ++++----
+ .github/workflows/wheels.yml | 4 ++--
+ CHANGELOG.rst | 9 +++++++++
+ Makefile | 2 +-
+ appveyor.yml | 2 +-
+ build.sh | 12 ++++++------
+ docs/install.rst | 18 ++++++++++--------
+ pygit2/decl/diff.h | 1 +
+ pygit2/decl/oid.h | 4 ++++
+ pygit2/decl/remote.h | 1 +
+ src/types.h | 4 ++--
+ 11 files changed, 41 insertions(+), 24 deletions(-)
+
+diff --git a/pygit2/decl/diff.h b/pygit2/decl/diff.h
+index ded873f68..31a32d520 100644
+--- a/pygit2/decl/diff.h
++++ b/pygit2/decl/diff.h
+@@ -54,6 +54,7 @@ typedef struct {
+ void *payload;
+ uint32_t context_lines;
+ uint32_t interhunk_lines;
++ git_oid_t oid_type;
+ uint16_t id_abbrev;
+ git_off_t max_size;
+ const char *old_prefix;
+diff --git a/pygit2/decl/oid.h b/pygit2/decl/oid.h
+index db420f7c5..0890dfdde 100644
+--- a/pygit2/decl/oid.h
++++ b/pygit2/decl/oid.h
+@@ -1,3 +1,7 @@
++typedef enum {
++ GIT_OID_SHA1 = 1, /**< SHA1 */
++} git_oid_t;
++
+ typedef struct git_oid {
+ unsigned char id[20];
+ } git_oid;
+diff --git a/pygit2/decl/remote.h b/pygit2/decl/remote.h
+index d889356cb..5fedf6d37 100644
+--- a/pygit2/decl/remote.h
++++ b/pygit2/decl/remote.h
+@@ -83,6 +83,7 @@ typedef struct {
+ int update_fetchhead;
+ git_remote_autotag_option_t download_tags;
+ git_proxy_options proxy_opts;
++ int depth;
+ git_remote_redirect_t follow_redirects;
+ git_strarray custom_headers;
+ } git_fetch_options;
+diff --git a/src/types.h b/src/types.h
+index 0c4aad69f..2c87621a4 100644
+--- a/src/types.h
++++ b/src/types.h
+@@ -32,8 +32,8 @@
+ #include <Python.h>
+ #include <git2.h>
+
+-#if !(LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR == 6)
+-#error You need a compatible libgit2 version (1.6.x)
++#if !(LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR == 7)
++#error You need a compatible libgit2 version (1.7.x)
+ #endif
+
+ /*
diff --git a/community/ruby-rugged/APKBUILD b/community/ruby-rugged/APKBUILD
index afb7da9c28c..49561133343 100644
--- a/community/ruby-rugged/APKBUILD
+++ b/community/ruby-rugged/APKBUILD
@@ -3,7 +3,7 @@
pkgname=ruby-rugged
_gemname=rugged
pkgver=1.6.3
-pkgrel=0
+pkgrel=1
pkgdesc="Ruby bindings to libgit2"
url="https://github.com/libgit2/rugged"
arch="all"
@@ -23,6 +23,7 @@ makedepends="
source="$_gemname-$pkgver.tar.gz::https://github.com/libgit2/$_gemname/archive/v$pkgver.tar.gz
fix-extconf-version-check.patch
libgit2-fixture-dir.patch
+ libgit2-1.7.patch
skip-test_discover_false.patch
skip-test_read_global_config_file.patch
skip-online-tests.patch
@@ -67,6 +68,7 @@ sha512sums="
4d54b5df04382628aff7e1abbf5fbd9730564c9bcb4e17da34ac59578b306db567b15151629a10c4a6d8174a31cd8be03c27ff0d1514cb19de237e773f4b64ce rugged-1.6.3.tar.gz
0e55aff667175496e9df1920c6d49042077196aa992a729323628224e7930a6f976bcbfae70d2af733a043c173e8cd5f571606f0b898b008472b40fcefe6b425 fix-extconf-version-check.patch
0c749aeb8d6a29aed51737bab09c7b0a6669ac691461758c856ede5d8510ad6edfa284cddd1b54982bf614a45ba817b70e838e071889a9b05e1b0580111ec826 libgit2-fixture-dir.patch
+bcf7b554390fb2b1ef9043f8c934ae51a299f223ec1d7826dcb8eed078961cd084c05148c84142d60cc0a3213653bd416af1fbb09bfa5b26c9ce87fca79f6a18 libgit2-1.7.patch
33464eeefc7669fe3bf5f47c4016cacdcba4f7455ed22b441383b49721870072b5095dbb68832cdb933a7659a415476db64b579a98c888b83900d092bb8b54be skip-test_discover_false.patch
b9e028f18830e447773e895046eb03489e94bb5a76fede51f93545ed67f7249ed8f37ed4bb832eb68a2db281ff3e2b84dab8b72bb21eea4b835b0f1ce23943c3 skip-test_read_global_config_file.patch
5f0ad88eb7ac8c69605c43712e046efd47b727f48e98ee4047be850da4fea48c11fc2a383c791810a1bc81c08ca00428d4906c1af02a0d0da6e1ffbd4723b8f3 skip-online-tests.patch
diff --git a/community/ruby-rugged/libgit2-1.7.patch b/community/ruby-rugged/libgit2-1.7.patch
new file mode 100644
index 00000000000..4fe0884f5b7
--- /dev/null
+++ b/community/ruby-rugged/libgit2-1.7.patch
@@ -0,0 +1,90 @@
+Patch-Source: https://github.com/libgit2/rugged/pull/964
+safe as we apply the libgit2 fix to libgit.
+--
+From 508fbc2bcd8fdc400fcc4513b53d5205c4b7e9d4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= <cmn@dwim.me>
+Date: Tue, 18 Jul 2023 10:27:37 +0200
+Subject: [PATCH 1/3] Update libgit2 to v1.7.0
+
+---
+ vendor/libgit2 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ext/rugged/rugged_allocator.c b/ext/rugged/rugged_allocator.c
+index 30ee537..0059af6 100644
+--- a/ext/rugged/rugged_allocator.c
++++ b/ext/rugged/rugged_allocator.c
+@@ -13,58 +13,11 @@ static void *rugged_gmalloc(size_t n, const char *file, int line)
+ return xmalloc(n);
+ }
+
+-static void *rugged_gcalloc(size_t nelem, size_t elsize, const char *file, int line)
+-{
+- return xcalloc(nelem, elsize);
+-}
+-
+-static char *rugged_gstrdup(const char *str, const char *file, int line)
+-{
+- return ruby_strdup(str);
+-}
+-
+-static char *rugged_gstrndup(const char *str, size_t n, const char *file, int line)
+-{
+- size_t len;
+- char *newstr;
+-
+- len = strnlen(str, n);
+- if (len < n)
+- n = len;
+-
+- newstr = xmalloc(n+1);
+- memcpy(newstr, str, n);
+- newstr[n] = '\0';
+-
+- return newstr;
+-}
+-
+-static char *rugged_gsubstrdup(const char *str, size_t n, const char *file, int line)
+-{
+- char *newstr;
+-
+- newstr = xmalloc(n+1);
+- memcpy(newstr, str, n);
+- newstr[n] = '\0';
+-
+- return newstr;
+-}
+-
+ static void *rugged_grealloc(void *ptr, size_t size, const char *file, int line)
+ {
+ return xrealloc(ptr, size);
+ }
+
+-static void *rugged_greallocarray(void *ptr, size_t nelem, size_t elsize, const char *file, int line)
+-{
+- return xrealloc2(ptr, nelem, elsize);
+-}
+-
+-static void *rugged_gmallocarray(size_t nelem, size_t elsize, const char *file, int line)
+-{
+- return xmalloc2(nelem, elsize);
+-}
+-
+ static void rugged_gfree(void *ptr)
+ {
+ xfree(ptr);
+@@ -75,14 +28,7 @@ void rugged_set_allocator(void)
+ git_allocator allocator;
+
+ allocator.gmalloc = rugged_gmalloc;
+- allocator.gcalloc = rugged_gcalloc;
+- allocator.gstrdup = rugged_gstrdup;
+- allocator.gstrndup = rugged_gstrndup;
+- allocator.gstrndup = rugged_gstrndup;
+- allocator.gsubstrdup = rugged_gsubstrdup;
+ allocator.grealloc = rugged_grealloc;
+- allocator.greallocarray = rugged_greallocarray;
+- allocator.gmallocarray = rugged_gmallocarray;
+ allocator.gfree = rugged_gfree;
+
+ git_libgit2_opts(GIT_OPT_SET_ALLOCATOR, &allocator);
diff --git a/community/sheldon/APKBUILD b/community/sheldon/APKBUILD
index c3f744432b0..0e7e86c4a76 100644
--- a/community/sheldon/APKBUILD
+++ b/community/sheldon/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=sheldon
pkgver=0.7.3
-pkgrel=0
+pkgrel=1
pkgdesc="Fast, configurable, shell plugin manager"
url="https://github.com/rossmacarthur/sheldon"
arch="aarch64 armhf armv7 ppc64le x86 x86_64" # blocked by rust/cargo
@@ -31,6 +31,16 @@ prepare() {
# Build against system libgit2.
sed -i 's/"vendored-libgit2"//' Cargo.toml
+ # Rust target triple.
+ local target=$(rustc -vV | sed -n 's/host: //p')
+
+ # Build against system-provided libs
+ mkdir -p .cargo
+ cat >> .cargo/config.toml <<-EOF
+ [target.$target]
+ git2 = { rustc-link-lib = ["git2"] }
+ EOF
+
cargo fetch --target="$CTARGET" --locked
}
diff --git a/community/stagit/APKBUILD b/community/stagit/APKBUILD
index b582cbcbb35..16f275a003d 100644
--- a/community/stagit/APKBUILD
+++ b/community/stagit/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Justin Berthault <justin.berthault@zaclys.net>
pkgname=stagit
pkgver=1.2
-pkgrel=2
+pkgrel=3
pkgdesc="static git page generator"
url="https://www.codemadness.org/stagit.html"
arch="all"
diff --git a/community/wezterm/APKBUILD b/community/wezterm/APKBUILD
index 0a7958c5b1f..49f7b85ea4a 100644
--- a/community/wezterm/APKBUILD
+++ b/community/wezterm/APKBUILD
@@ -3,7 +3,7 @@
pkgname=wezterm
pkgver=20230712.072601
_pkgver="${pkgver/./-}-f4abf8fd"
-pkgrel=0
+pkgrel=1
pkgdesc="GPU-accelerated cross-platform terminal emulator and multiplexer written in Rust"
url="https://wezfurlong.org/wezterm/"
# s390x, riscv64 limited by rust
@@ -70,6 +70,16 @@ prepare() {
default_prepare
+ # Rust target triple.
+ local target=$(rustc -vV | sed -n 's/host: //p')
+
+ # Build against system-provided libs
+ mkdir -p .cargo
+ cat >> .cargo/config.toml <<-EOF
+ [target.$target]
+ git2 = { rustc-link-lib = ["git2"] }
+ EOF
+
cargo fetch --target="$CTARGET" # regenerate Cargo.lock after patching
# dont print malformed sshd config, this can possibly fail on builders but not on CI