mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-05 21:37:15 +02:00
testing/mepo: upgrade to 1.3.1
This commit is contained in:
Miles Alan
Kevin Daudt
parent
fc67510466
commit
6ea2b2daa4
@ -1,40 +0,0 @@
|
||||
From a5fb84751db02c4f913199fd28bce3751a9bc485 Mon Sep 17 00:00:00 2001
|
||||
From: "lauren n. liberda" <lauren@selfisekai.rocks>
|
||||
Date: Sat, 8 Jun 2024 02:38:48 +0200
|
||||
Subject: [PATCH] zig 0.13: use std.Build.path
|
||||
|
||||
---
|
||||
build.zig | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/build.zig b/build.zig
|
||||
index a61082e..923eca5 100644
|
||||
--- a/build.zig
|
||||
+++ b/build.zig
|
||||
@@ -11,7 +11,7 @@ fn setDependencies(step: *std.Build.Step.Compile) void {
|
||||
|
||||
pub fn build(b: *std.Build) void {
|
||||
b.installDirectory(.{
|
||||
- .source_dir = .{ .path = "scripts" },
|
||||
+ .source_dir = b.path("scripts"),
|
||||
.install_dir = .{ .bin = {} },
|
||||
.install_subdir = "",
|
||||
});
|
||||
@@ -24,7 +24,7 @@ pub fn build(b: *std.Build) void {
|
||||
const optimize = b.standardOptimizeOption(.{});
|
||||
const exe = b.addExecutable(.{
|
||||
.name = "mepo",
|
||||
- .root_source_file = .{ .path = "src/main.zig" },
|
||||
+ .root_source_file = b.path("src/main.zig"),
|
||||
.target = target,
|
||||
.optimize = optimize,
|
||||
});
|
||||
@@ -42,7 +42,7 @@ pub fn build(b: *std.Build) void {
|
||||
|
||||
// Setup test
|
||||
const tests = b.addTest(.{
|
||||
- .root_source_file = .{ .path = "./src/test.zig" },
|
||||
+ .root_source_file = b.path("./src/test.zig"),
|
||||
.target = target,
|
||||
.optimize = optimize,
|
||||
});
|
||||
@ -1,24 +0,0 @@
|
||||
From aa43f762540d25acbdfbd218e5efde4c20851ce1 Mon Sep 17 00:00:00 2001
|
||||
From: "lauren n. liberda" <lauren@selfisekai.rocks>
|
||||
Date: Sat, 8 Jun 2024 02:39:04 +0200
|
||||
Subject: [PATCH] zig 0.13: require zig 0.13 now
|
||||
|
||||
---
|
||||
src/main.zig | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/main.zig b/src/main.zig
|
||||
index b477ad7..6ba77e2 100644
|
||||
--- a/src/main.zig
|
||||
+++ b/src/main.zig
|
||||
@@ -12,8 +12,8 @@ const utildbg = @import("./util/utildbg.zig");
|
||||
pub fn main() !void {
|
||||
comptime {
|
||||
const v = builtin.zig_version;
|
||||
- if (v.major != 0 or v.minor != 12)
|
||||
- @panic("Must be built against Zig 0.12.x");
|
||||
+ if (v.major != 0 or v.minor != 13)
|
||||
+ @panic("Must be built against Zig 0.13.x");
|
||||
}
|
||||
|
||||
const allocator = std.heap.c_allocator;
|
||||
@ -1,36 +0,0 @@
|
||||
From 65113031c6b0ce63e46f8fba43df268a32a1bb65 Mon Sep 17 00:00:00 2001
|
||||
From: "lauren n. liberda" <lauren@selfisekai.rocks>
|
||||
Date: Sat, 8 Jun 2024 02:40:54 +0200
|
||||
Subject: [PATCH] zig 0.13: std.ChildProcess -> std.process.Child
|
||||
|
||||
---
|
||||
src/api/shellpipe_async.zig | 2 +-
|
||||
src/api/shellpipe_sync.zig | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/api/shellpipe_async.zig b/src/api/shellpipe_async.zig
|
||||
index 9ebcfbf..e0f722e 100644
|
||||
--- a/src/api/shellpipe_async.zig
|
||||
+++ b/src/api/shellpipe_async.zig
|
||||
@@ -60,7 +60,7 @@ fn async_shellpipe_run_catch_errors(mepo: *Mepo, unique_handle_id: i8, cmd: []co
|
||||
const max_output_bytes: usize = 50 * 1024;
|
||||
var arena = std.heap.ArenaAllocator.init(mepo.allocator);
|
||||
defer arena.deinit();
|
||||
- var child = std.ChildProcess.init(argv[0..], arena.allocator());
|
||||
+ var child = std.process.Child.init(argv[0..], arena.allocator());
|
||||
child.stdin_behavior = .Ignore;
|
||||
child.stdout_behavior = .Pipe;
|
||||
const env = try get_env_vars(mepo, mepo.allocator);
|
||||
diff --git a/src/api/shellpipe_sync.zig b/src/api/shellpipe_sync.zig
|
||||
index 133b8c7..d0f6186 100644
|
||||
--- a/src/api/shellpipe_sync.zig
|
||||
+++ b/src/api/shellpipe_sync.zig
|
||||
@@ -32,7 +32,7 @@ fn shellpipe_sync(mepo: *Mepo, cmd: []const u8) !void {
|
||||
try mepo.blit();
|
||||
const env_vars = try get_env_vars(mepo, arena.allocator());
|
||||
const args = [_][]const u8{ "sh", "-c", cmd };
|
||||
- const process_result = try std.ChildProcess.run(.{
|
||||
+ const process_result = try std.process.Child.run(.{
|
||||
.allocator = arena.allocator(),
|
||||
.argv = args[0..],
|
||||
.env_map = &env_vars,
|
||||
@ -1,22 +0,0 @@
|
||||
From e370ef83141ac5caa41b65c665e86233020ff125 Mon Sep 17 00:00:00 2001
|
||||
From: "lauren n. liberda" <lauren@selfisekai.rocks>
|
||||
Date: Sat, 8 Jun 2024 02:51:12 +0200
|
||||
Subject: [PATCH] zig 0.13: adapt to new Dir.writeFile API (aka Dir.writeFile2)
|
||||
|
||||
---
|
||||
src/TileCache.zig | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/TileCache.zig b/src/TileCache.zig
|
||||
index 0b1fa63..17e662c 100644
|
||||
--- a/src/TileCache.zig
|
||||
+++ b/src/TileCache.zig
|
||||
@@ -425,7 +425,7 @@ fn download_loop_transfer_complete(tile_cache: *@This(), msg: *curl.CURLMsg) !vo
|
||||
// Save to FS
|
||||
if (is_valid_png_data) {
|
||||
const path = try png_path(tile_cache.allocator, p.get(p.pref.tile_cache_url).t.?, coords);
|
||||
- try cache_dir.writeFile(path, datum_array);
|
||||
+ try cache_dir.writeFile(.{ .sub_path = path, .data = datum_array });
|
||||
}
|
||||
}
|
||||
if (tile_cache.transfer_map.get(coords).?.load_to_texture) {
|
||||
@ -1,9 +1,8 @@
|
||||
# Maintainer: Miles Alan <m@milesalan.com>
|
||||
pkgname=mepo
|
||||
pkgver=1.2.1
|
||||
pkgrel=1
|
||||
_pkgdescbase="Fast, simple, and hackable OSM map viewer for Linux"
|
||||
pkgdesc="$_pkgdescbase (base SDL application)"
|
||||
pkgver=1.3.1
|
||||
pkgrel=0
|
||||
pkgdesc="Fast, simple, and hackable OSM map viewer for Linux"
|
||||
url="https://git.sr.ht/~mil/mepo"
|
||||
arch="aarch64 x86_64" # Limited by zig aport
|
||||
license="GPL-3.0-or-later"
|
||||
@ -15,16 +14,20 @@ makedepends="
|
||||
sdl2_ttf-dev
|
||||
zig>=0.13.0
|
||||
"
|
||||
depends="
|
||||
zenity
|
||||
curl
|
||||
xwininfo
|
||||
geoclue
|
||||
jq
|
||||
ncurses
|
||||
font-hack-nerd
|
||||
"
|
||||
source="
|
||||
$pkgname-$pkgver.tar.gz::https://git.sr.ht/~mil/mepo/archive/$pkgver.tar.gz
|
||||
0001-zig-0.13-use-std.Build.path.patch
|
||||
0002-zig-0.13-require-zig-0.13-now.patch
|
||||
0003-zig-0.13-std.ChildProcess-std.process.Child.patch
|
||||
0004-zig-0.13-adapt-to-new-Dir.writeFile-API-aka-Dir.writ.patch
|
||||
"
|
||||
subpackages="
|
||||
$pkgname-doc
|
||||
$pkgname-scripts:scripts:noarch
|
||||
"
|
||||
|
||||
# We may want other than "baseline" for other targets, when enabled by zig
|
||||
@ -34,7 +37,7 @@ esac
|
||||
|
||||
build() {
|
||||
zig build -Doptimize=ReleaseSafe ${cputarget:+-Dcpu="$cputarget"}
|
||||
zig-out/bin/mepo -docman > mepo.1
|
||||
zig-out/bin/mepo -docmd > doc.md
|
||||
}
|
||||
|
||||
check() {
|
||||
@ -43,22 +46,11 @@ check() {
|
||||
|
||||
package() {
|
||||
install -Dm755 zig-out/bin/mepo* -t "$pkgdir/usr/bin/"
|
||||
install -Dm755 scripts/mepo* -t "$pkgdir/usr/bin/"
|
||||
install -Dm644 zig-out/share/applications/mepo.desktop -t "$pkgdir/usr/share/applications/"
|
||||
install -Dm644 zig-out/share/pixmaps/mepo.png -t "$pkgdir/usr/share/pixmaps/"
|
||||
install -Dm644 mepo.1 -t "$pkgdir/usr/share/man/man1/"
|
||||
install -Dm644 doc.md -t "$pkgdir"/usr/share/doc/"$pkgname"/
|
||||
}
|
||||
|
||||
scripts() {
|
||||
pkgdesc="$_pkgdescbase (including base SDL application & scripts)"
|
||||
depends="$pkgname=$pkgver-r$pkgrel zenity curl findutils xwininfo geoclue jq ncurses font-hack-nerd"
|
||||
mkdir -p "$subpkgdir"
|
||||
amove usr/bin/mepo_*
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
1db1218a1cc43e4c4838f2b96c47ed3c0589efef2bff3aa7175a658e227b339032c22c0af3a4c95eb6b95a759d62315fd2a3fdf5e11706847c7fa02db5c7d63e mepo-1.2.1.tar.gz
|
||||
5a6ff2ef3171755eef17fbfa833a6e50212fc5f05e29f5a22ffcf949f33d1270c5be520843e68030dce90188f898f60af6ed24d0b35b1e8b8d67f53a3ed579ad 0001-zig-0.13-use-std.Build.path.patch
|
||||
4bee81606b41ebc52660cbb5e07ca186b75f5b6e587a2124887e2a52672dbb3177b3b15d21de4eacbcf7fb1a988b7ae504c22a55160d91d0ead9b9bde3e61b35 0002-zig-0.13-require-zig-0.13-now.patch
|
||||
c848660b9b24a2f9c1b128e4e4a00d5bf747c8d7ea0e186424adec8be2f9b8599ce01d8a4d40cc16537b94c351b034cfa3f0f35270eef2c45d16c9479fd428cf 0003-zig-0.13-std.ChildProcess-std.process.Child.patch
|
||||
59adbb414bb847df77f3812bf7b7a57af1a7c40c53ea2437c07bf3b6169f3c178d48e0a5e17691a878cda9f14f9bfcb88ace7f811cc411e32bce586348398dd1 0004-zig-0.13-adapt-to-new-Dir.writeFile-API-aka-Dir.writ.patch
|
||||
b68e23f44fb613c7d4111c031ca4be303e541043a573400274db0f2648a90c032025a11debe55dcf69d489f08a8fdedc1fc176719bdde671aecef6ef2b0441c0 mepo-1.3.1.tar.gz
|
||||
"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user