Arch Linux User Repository

Upstream release is currently messed up: says 0.7.4 but is 1.7.4 in Git

I'll wait until this gets figured out.

https://github.com/magic-wormhole/magic-wormhole.rs/issues/275

https://github.com/Homebrew/homebrew-core/pull/198791

@deraffe, I just issued a temporary fix by disabling lto

@xeruf, did you try building wormhole-rs with a more recent Rust version ? The 1.56.0-nightly version seems quite old, and I can't reproduce with rust 1.71.0.

fails to build:

error: failed to parse manifest at `/home/janek/.local/cache/yay/wormhole-rs/src/magic-wormhole.rs-0.6.1/Cargo.toml`

Caused by:
  feature `strip` is required

  The package requires the Cargo feature called `strip`, but that feature is not stabilized in this version of Cargo (1.56.0-nightly (e515c3277 2021-09-08)).
  Consider adding `cargo-features = ["strip"]` to the top of Cargo.toml (above the [package] table) to tell Cargo you are opting in to use this unstable feature.
  See https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#profile-strip-option for more information about the status of this feature.

Looks like this is affected by https://github.com/briansmith/ring/issues/1444

I just added the shell completions. However, the completions for zsh don't work for me, I'll debug this later.

PS: the bash and fish ones seem to work

One of the new features in 0.6.0 is shell completions. Can you please add those to the packaging?

Yeah, never mind. I also prefer the plain-text patches. I guess, too, that tabs are replaced by spaces at some point, probably because of my editor or the AUR web interface.

Anyway, I agree it's not a big deal.

Migrating to [community] at some point would be really cool.

Sorry, I don't know what the deal is with git am for you. I recommend it a lot because it's one of the most robust ways I know of to send patches short of having a direct Git remote wired up somewhere. That doesn't mean it's bullet proof. I suspect though that you have your editor set to auto munge some spacing and that's getting into the patch before it is saved / passed to Git. The .SRCINFO files are generated using the usual Arch tooling and I can see in the commit on my side and the patch content below they don't have the bogus spacing showing up in the commit on your side; on my side they are identical to what you are regenerating with makepkg --printsrcinfo.

No sweat though, I appreciate this being maintained. It's on my list to consider migrating to [community] if it gets a little more AUR traction too.

Thanks for the patch, but I guess my merging workflow is wrong.

I tried piping the email and copy-pasting the patch into a file, but I have to use --ignore-space-change with git am for it to work. Otherwise the patch can't apply and git status shows no conflicts.

Anyway, I just pushed the new commits.

I don't think there were 3-space indents, but there were some tabs. I think your editor defaults must be for 3 space tabs. In any case cleaning up the indents to be all spaces is fine of course.

The patch I included is not in the upstream 0.5.0 release, so that can be dropped when bumping this:

From 8fa2f68443495f03e429524911818374eb15c9f4 Mon Sep 17 00:00:00 2001
From: Caleb Maclennan <caleb@alerque.com>
Date: Thu, 19 May 2022 13:46:57 +0300
Subject: [PATCH] Bump to 0.5.0, drop patch included upstream

Signed-off-by: Caleb Maclennan <caleb@alerque.com>
---
 .SRCINFO | 11 ++++-------
 PKGBUILD | 13 +++++--------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index cb28b6a..205cbd4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,13 @@
 pkgbase = wormhole-rs
    pkgdesc = Rust implementation of Magic Wormhole, with new features and enhancements
-   pkgver = 0.4.0
-   pkgrel = 4
+   pkgver = 0.5.0
+   pkgrel = 1
    url = https://github.com/magic-wormhole/magic-wormhole.rs
    arch = x86_64
    license = custom:EUPL-1.2+
    makedepends = cargo
-   makedepends = git
    depends = libxcb
-   source = https://github.com/magic-wormhole/magic-wormhole.rs/archive/0.4.0/magic-wormhole.rs-0.4.0.tar.gz
-   source = wormhole-rs-cli-clipboard-dep.patch::https://github.com/magic-wormhole/magic-wormhole.rs/commit/1606112.patch
-   sha256sums = 4773a5f179d1f26b61eed8a95b586b30cc45b205255d1427ba735e6df5804061
-   sha256sums = 0c0d6afe4ecc8869ef5a8f4afed9d15a423c462c99e9af22984f0085802fae7d
+   source = https://github.com/magic-wormhole/magic-wormhole.rs/archive/0.5.0/magic-wormhole.rs-0.5.0.tar.gz
+   sha256sums = fdd1d0bd00948f9bdce28b7d21e84bebd25d08502efe30408ded91a150afa5ce

 pkgname = wormhole-rs
diff --git a/PKGBUILD b/PKGBUILD
index a59661c..7c9b3ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,23 +3,20 @@

 _pkgname=magic-wormhole.rs
 pkgname=wormhole-rs
-pkgver=0.4.0
-pkgrel=4
+pkgver=0.5.0
+pkgrel=1
 pkgdesc='Rust implementation of Magic Wormhole, with new features and enhancements'
 arch=(x86_64)
 url="https://github.com/magic-wormhole/$_pkgname"
 license=('custom:EUPL-1.2+')
 depends=(libxcb)
-makedepends=(cargo git)
+makedepends=(cargo)
 _archive="$_pkgname-$pkgver"
-source=("$url/archive/$pkgver/$_archive.tar.gz"
-        "$pkgname-cli-clipboard-dep.patch::$url/commit/1606112.patch")
-sha256sums=('4773a5f179d1f26b61eed8a95b586b30cc45b205255d1427ba735e6df5804061'
-            '0c0d6afe4ecc8869ef5a8f4afed9d15a423c462c99e9af22984f0085802fae7d')
+source=("$url/archive/$pkgver/$_archive.tar.gz")
+sha256sums=('fdd1d0bd00948f9bdce28b7d21e84bebd25d08502efe30408ded91a150afa5ce')

 prepare() {
   cd "$_archive"
-  patch -p1 < ../${source[1]%::*}
   cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
 }

-- 
2.36.1