mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-05 21:37:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

testing/aercbook: rebuild with zig 0.12

Browse Source
This commit is contained in:
lauren n. liberda 2024-04-20 13:12:56 +02:00 committed by Sören Tempel
parent 5b810daf79
commit 9d7a49cced
3 changed files with 85 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
testing/aercbook/0001-zig-0.12-std.ChildProcess.exec-run.patch Normal file
View File

@ -0,0 +1,23 @@
From b7be34e4c7183817729e9e23eba32d93fceaf34d Mon Sep 17 00:00:00 2001
From: "lauren n. liberda" <lauren@selfisekai.rocks>
Date: Sat, 20 Apr 2024 22:25:14 +0200
Subject: [PATCH] zig 0.12: std.ChildProcess.exec -> run
solves "error: struct 'child_process.ChildProcess' has no member named 'exec'"
---
src/gitversiontag.zig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gitversiontag.zig b/src/gitversiontag.zig
index 40aed0f..08480a7 100644
--- a/src/gitversiontag.zig
+++ b/src/gitversiontag.zig
@@ -6,7 +6,7 @@ pub fn gitVersionTag(a: std.mem.Allocator) []const u8 {
"--sort=-creatordate",
};
- if (std.ChildProcess.exec(.{ .argv = args[0..], .allocator = a })) |ret| {
+ if (std.ChildProcess.run(.{ .argv = args[0..], .allocator = a })) |ret| {
var it = std.mem.split(u8, ret.stdout, "\n");
if (it.next()) |firstline| {
return firstline;

55
testing/aercbook/0002-zig-0.12-convert-some-vars-to-consts.patch Normal file
View File

@ -0,0 +1,55 @@
From 5e40820838eaaf78e95132cb6fdc906686904480 Mon Sep 17 00:00:00 2001
From: "lauren n. liberda" <lauren@selfisekai.rocks>
Date: Sat, 20 Apr 2024 22:29:48 +0200
Subject: [PATCH] zig 0.12: convert some vars to consts
solves "error: local variable is never mutated"
---
src/args.zig | 6 +++---
src/main.zig | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/args.zig b/src/args.zig
index a243c98..89a980e 100644
--- a/src/args.zig
+++ b/src/args.zig
@@ -401,7 +401,7 @@ fn parseInt(comptime T: type, str: []const u8) !T {
base1024 = true;
}
if (buf.len != 0) {
- var pow: u3 = switch (buf[buf.len - 1]) {
+ const pow: u3 = switch (buf[buf.len - 1]) {
'k', 'K' => 1, //kilo
'm', 'M' => 2, //mega
'g', 'G' => 3, //giga
@@ -415,7 +415,7 @@ fn parseInt(comptime T: type, str: []const u8) !T {
if (comptime std.math.maxInt(T) < 1024)
return error.Overflow;
- var base: T = if (base1024) 1024 else 1000;
+ const base: T = if (base1024) 1024 else 1000;
multiplier = try std.math.powi(T, base, @intCast(pow));
}
}
@@ -567,7 +567,7 @@ pub const ErrorCollection = struct {
/// Appends an error to the collection
fn insert(self: *Self, err: Error) !void {
- var dupe = Error{
+ const dupe = Error{
.option = try self.arena.allocator().dupe(u8, err.option),
.kind = switch (err.kind) {
.invalid_value => |v| Error.Kind{
diff --git a/src/main.zig b/src/main.zig
index 7759ebc..38f2a99 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -440,7 +440,7 @@ pub fn main() anyerror!void {
help();
return;
}
- var key: []const u8 = options.positionals[1];
+ const key: []const u8 = options.positionals[1];
var value: []const u8 = undefined;
if (options.positionals.len >= 3) {
value = options.positionals[2];

9
testing/aercbook/APKBUILD
View File

@ -2,14 +2,17 @@
# Maintainer: Coco Liliace <coco@liliace.dev>
pkgname=aercbook
pkgver=0.1.5
pkgrel=0
pkgrel=1
pkgdesc="Minimalistic address book for aerc"
url="https://sr.ht/~renerocksai/aercbook/"
arch="aarch64 x86_64"
license="MIT"
makedepends="zig"
options="!check" # no tests
source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~renerocksai/aercbook/archive/v$pkgver.tar.gz"
source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~renerocksai/aercbook/archive/v$pkgver.tar.gz
0001-zig-0.12-std.ChildProcess.exec-run.patch
0002-zig-0.12-convert-some-vars-to-consts.patch
"
builddir="$srcdir/$pkgname-v$pkgver"
# We may want other than "baseline" for other targets, when enabled by zig
@ -27,4 +30,6 @@ package() {
sha512sums="
ffabe7017e5d15df2cf19fa7663b045a7e693acfd34d25a85aa22235ed1f02d5ea40cee2cd0ff9f35d0ad497aefcde5048097365b7037c06c95729cf29d46614 aercbook-0.1.5.tar.gz
d6c164144d7296df949d24a876ae45e72236efdc1c0997ffe079125ae13794e78c60ffcee3d6d9b33dc5d6021225da27a9e6ba2669d8d4b53939b977e4de1255 0001-zig-0.12-std.ChildProcess.exec-run.patch
81ed9206b6530fd072732bb9587a3a8ad2c89518203ce49bc225799a06a30548e3654a16cf63bb16db4a6afa1be1c8394317c0b003eaa95eb982fca604f1489c 0002-zig-0.12-convert-some-vars-to-consts.patch
"