diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 21 | ||||
| -rw-r--r-- | fix-libgit2-1.5-compat.patch | 96 |
3 files changed, 120 insertions, 9 deletions
@@ -1,7 +1,7 @@ pkgbase = cargo-doc2readme pkgdesc = cargo subcommand to create a readme file containing the rustdoc comments from... pkgver = 0.1.4 - pkgrel = 1 + pkgrel = 2 url = https://crates.io/crates/cargo-doc2readme arch = aarch64 arch = i686 @@ -11,8 +11,14 @@ pkgbase = cargo-doc2readme makedepends = libgit2 depends = gcc-libs depends = curl - depends = libgit2.so=1.4 + depends = libgit2.so=1.5 source = cargo-doc2readme-0.1.4.tar.gz::https://crates.io/api/v1/crates/cargo-doc2readme/0.1.4/download + source = https://github.com/rust-lang/cargo/archive/refs/heads/rust-1.63.0.zip + source = https://github.com/rust-lang/cargo/pull/11004.patch + source = fix-libgit2-1.5-compat.patch sha512sums = 448e351b70e6d973929a3b1de0bef1abe5e4ba67dbb08ef44a6a8d2f778ab1fac3a98e33b2a09c2ed65089d2cc95fe27845a71c616ea3746ed3c274704aa8998 + sha512sums = a786581377075ae921a4331e8f70c93242d6aef89ae5da29a69fc7f8597e9bc34682d48bd01ba8186fb509128a95706d9ccd4e75f85c15539dd6ff54b871a0fe + sha512sums = ed4b148bbbdc26059278d9170d377f36b4847d3c253fa4e3549354de8e17bb2849a6541048a9438f1880f003c8debea9766737773c856c9acec31b90fb60553f + sha512sums = 19b531890bf9c9762886a4344783305d8821370f92c36c56ccece503fc1089d309ee1225061aeeeac196cf5ed0b1e3f60730a4690134b8bcee1685affa10e942 -pkgname = cargo-doc2readme
\ No newline at end of file +pkgname = cargo-doc2readme @@ -4,23 +4,32 @@ _crate="cargo-doc2readme" pkgname="cargo-doc2readme" pkgver=0.1.4 -pkgrel=1 +pkgrel=2 pkgdesc='cargo subcommand to create a readme file containing the rustdoc comments from...' url='https://crates.io/crates/cargo-doc2readme' license=('Apache') -depends=('gcc-libs' 'curl' 'libgit2.so=1.4') +depends=('gcc-libs' 'curl' 'libgit2.so=1.5') makedepends=('cargo' 'libgit2') -source=("$_crate-$pkgver.tar.gz::https://crates.io/api/v1/crates/cargo-doc2readme/0.1.4/download") -sha512sums=('448e351b70e6d973929a3b1de0bef1abe5e4ba67dbb08ef44a6a8d2f778ab1fac3a98e33b2a09c2ed65089d2cc95fe27845a71c616ea3746ed3c274704aa8998') +source=("$_crate-$pkgver.tar.gz::https://crates.io/api/v1/crates/cargo-doc2readme/0.1.4/download" + "https://github.com/rust-lang/cargo/archive/refs/heads/rust-1.63.0.zip" + "https://github.com/rust-lang/cargo/pull/11004.patch" + "fix-libgit2-1.5-compat.patch") +sha512sums=('448e351b70e6d973929a3b1de0bef1abe5e4ba67dbb08ef44a6a8d2f778ab1fac3a98e33b2a09c2ed65089d2cc95fe27845a71c616ea3746ed3c274704aa8998' + 'a786581377075ae921a4331e8f70c93242d6aef89ae5da29a69fc7f8597e9bc34682d48bd01ba8186fb509128a95706d9ccd4e75f85c15539dd6ff54b871a0fe' + 'ed4b148bbbdc26059278d9170d377f36b4847d3c253fa4e3549354de8e17bb2849a6541048a9438f1880f003c8debea9766737773c856c9acec31b90fb60553f' + '19b531890bf9c9762886a4344783305d8821370f92c36c56ccece503fc1089d309ee1225061aeeeac196cf5ed0b1e3f60730a4690134b8bcee1685affa10e942') # Tier 1 architectures supported by Rust (https://doc.rust-lang.org/nightly/rustc/platform-support.html#tier-1) arch=('aarch64' 'i686' 'x86_64') prepare() { + cd "$srcdir/cargo-rust-1.63.0" + patch -N -p1 -i "$srcdir/11004.patch" + cd "$srcdir/$_crate-$pkgver" - + patch -N -p1 -i "$srcdir/fix-libgit2-1.5-compat.patch" cargo fetch --locked } @@ -36,4 +45,4 @@ build() { package() { cd "$srcdir/$_crate-$pkgver" install -Dm755 "target/release/cargo-doc2readme" -t "$pkgdir/usr/bin" -}
\ No newline at end of file +} diff --git a/fix-libgit2-1.5-compat.patch b/fix-libgit2-1.5-compat.patch new file mode 100644 index 000000000000..13fa614e4241 --- /dev/null +++ b/fix-libgit2-1.5-compat.patch @@ -0,0 +1,96 @@ +diff --git a/Cargo.lock b/Cargo.lock +index a848a5a..a14c5e6 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -170,8 +170,6 @@ checksum = "6c58ec36aac5066d5ca17df51b3e70279f5670a72102f5752cb7e7c856adfc70" + [[package]] + name = "cargo" + version = "0.64.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7019448b7d0ffe19d4ab26a340d2efe6da8cf86c8cc01a352b90853e31cd8f7c" + dependencies = [ + "anyhow", + "atty", +@@ -259,8 +257,6 @@ dependencies = [ + [[package]] + name = "cargo-platform" + version = "0.1.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" + dependencies = [ + "serde", + ] +@@ -268,8 +264,6 @@ dependencies = [ + [[package]] + name = "cargo-util" + version = "0.2.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "eb66f33d96c58d1eef3a4744556ce0fae012b01165a3f171169a15cb4efc9633" + dependencies = [ + "anyhow", + "core-foundation", +@@ -394,8 +388,6 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + [[package]] + name = "crates-io" + version = "0.34.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6b4a87459133b2e708195eaab34be55039bc30e0d120658bd40794bb00b6328d" + dependencies = [ + "anyhow", + "curl", +@@ -632,9 +624,9 @@ dependencies = [ + + [[package]] + name = "git2" +-version = "0.14.4" ++version = "0.15.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d0155506aab710a86160ddb504a480d2964d7ab5b9e62419be69e0032bc5931c" ++checksum = "2994bee4a3a6a51eb90c218523be382fd7ea09b16380b9312e9dbe955ff7c7d1" + dependencies = [ + "bitflags", + "libc", +@@ -647,9 +639,9 @@ dependencies = [ + + [[package]] + name = "git2-curl" +-version = "0.15.0" ++version = "0.16.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1ee51709364c341fbb6fe2a385a290fb9196753bdde2fc45447d27cd31b11b13" ++checksum = "ed817a00721e2f8037ba722e60358d4956dae9cca10315fc982f967907d3b0cd" + dependencies = [ + "curl", + "git2", +@@ -865,9 +857,9 @@ checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" + + [[package]] + name = "libgit2-sys" +-version = "0.13.4+1.4.2" ++version = "0.14.0+1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d0fa6563431ede25f5cc7f6d803c6afbc1c5d3ad3d4925d12c882bf2b526f5d1" ++checksum = "47a00859c70c8a4f7218e6d1cc32875c4b55f6799445b842b0d8ed5e4c3d959b" + dependencies = [ + "cc", + "libc", +diff --git a/Cargo.toml b/Cargo.toml +index 8b0b81d..403202f 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -65,7 +65,7 @@ + version = "1.6" + + [dependencies.git2-curl] +-version = "0.15" ++version = "0.16" + + [dependencies.itertools] + version = "0.10" +@@ -122,3 +122,6 @@ + version = "0.9" + features = ["simd"] + default-features = false ++ ++[patch.crates-io] ++cargo = { path = "../cargo-rust-1.63.0" } |