Campbell Jones pushed to branch main at Arch Linux / Packaging / Packages / 
mergiraf


Commits:
1bb91b29 by Campbell Jones at 2024-12-07T22:09:19-05:00
upgpkg: 0.3.1-3: Follow our Rust packaging guidelines

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = mergiraf
        pkgdesc = A syntax-aware git merge driver for a growing collection of 
programming languages and file formats
        pkgver = 0.3.1
-       pkgrel = 2
+       pkgrel = 3
        url = https://mergiraf.org/
        arch = x86_64
        license = GPL-3.0-or-later


=====================================
PKGBUILD
=====================================
@@ -1,8 +1,9 @@
 # Maintainer: Sven-Hendrik Haase <svenst...@archlinux.org>
+# Maintainer: Campbell Jones <serebit at archlinux dot org>
 # Contributor: VCalV
 pkgname=mergiraf
 pkgver=0.3.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A syntax-aware git merge driver for a growing collection of 
programming languages and file formats"
 arch=('x86_64')
 url="https://mergiraf.org/";
@@ -14,16 +15,25 @@ options=('!lto')
 
source=("$pkgname-$pkgver.tar.gz::https://codeberg.org/mergiraf/mergiraf/archive/v$pkgver.tar.gz";)
 
sha512sums=('7d5733517db1f1599399ebb2f665f228ea56ec7b52373644c18312ab3ea3285b44de664f798c00ce9fe77f3cc72422b490f6251dba1fb3466b4a8d5e5050c27b')
 
+prepare() {
+    cd "$pkgname"
+
+    export RUSTUP_TOOLCHAIN=stable
+    cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
+}
+
 build() {
     cd "$pkgname"
-    
-    cargo build --release --all-features --locked --bin mergiraf
+
+    export RUSTUP_TOOLCHAIN=stable
+    export CARGO_TARGET_DIR=target
+    cargo build --frozen --release --all-features --bin mergiraf
 }
 
 check() {
     cd "$pkgname"
 
-    cargo test --all-features --locked
+    cargo test --all-features
 }
 
 



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/mergiraf/-/commit/1bb91b29b6f7b27b2cbfcce6a6c8ba226e5b9570

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/mergiraf/-/commit/1bb91b29b6f7b27b2cbfcce6a6c8ba226e5b9570
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to