From f6fe3fa23c4cb8abadea3f0c5008b6e8e681e099 Mon Sep 17 00:00:00 2001 From: NoTag Date: Sun, 6 Oct 2024 11:05:45 +0000 Subject: [PATCH] * deleted old mepo patches that are not necessary for zig 0.13.0 git-svn-id: https://svn.exactcode.de/t2/trunk@71144 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- .../mepo/0001-zig-0.13-use-std.Build.path.patch | 53 ---------------------- .../mepo/0002-zig-0.13-require-zig-0.13-now.patch | 37 --------------- ...g-0.13-std.ChildProcess-std.process.Child.patch | 49 -------------------- ...apt-to-new-Dir.writeFile-API-aka-Dir.writ.patch | 35 -------------- 4 files changed, 174 deletions(-) delete mode 100644 package/zig/mepo/0001-zig-0.13-use-std.Build.path.patch delete mode 100644 package/zig/mepo/0002-zig-0.13-require-zig-0.13-now.patch delete mode 100644 package/zig/mepo/0003-zig-0.13-std.ChildProcess-std.process.Child.patch delete mode 100644 package/zig/mepo/0004-zig-0.13-adapt-to-new-Dir.writeFile-API-aka-Dir.writ.patch diff --git a/package/zig/mepo/0001-zig-0.13-use-std.Build.path.patch b/package/zig/mepo/0001-zig-0.13-use-std.Build.path.patch deleted file mode 100644 index d2d39cf0db..0000000000 --- a/package/zig/mepo/0001-zig-0.13-use-std.Build.path.patch +++ /dev/null @@ -1,53 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# T2 SDE: package/*/mepo/0001-zig-0.13-use-std.Build.path.patch -# Copyright (C) 2024 The T2 SDE Project -# -# This Copyright note is generated by scripts/Create-CopyPatch, -# more information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License version 2 as used by the T2 SDE. -# --- T2-COPYRIGHT-NOTE-END --- - -From a5fb84751db02c4f913199fd28bce3751a9bc485 Mon Sep 17 00:00:00 2001 -From: "lauren n. liberda" -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, - }); diff --git a/package/zig/mepo/0002-zig-0.13-require-zig-0.13-now.patch b/package/zig/mepo/0002-zig-0.13-require-zig-0.13-now.patch deleted file mode 100644 index 892734d25b..0000000000 --- a/package/zig/mepo/0002-zig-0.13-require-zig-0.13-now.patch +++ /dev/null @@ -1,37 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# T2 SDE: package/*/mepo/0002-zig-0.13-require-zig-0.13-now.patch -# Copyright (C) 2024 The T2 SDE Project -# -# This Copyright note is generated by scripts/Create-CopyPatch, -# more information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License version 2 as used by the T2 SDE. -# --- T2-COPYRIGHT-NOTE-END --- - -From aa43f762540d25acbdfbd218e5efde4c20851ce1 Mon Sep 17 00:00:00 2001 -From: "lauren n. liberda" -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; diff --git a/package/zig/mepo/0003-zig-0.13-std.ChildProcess-std.process.Child.patch b/package/zig/mepo/0003-zig-0.13-std.ChildProcess-std.process.Child.patch deleted file mode 100644 index 50a434736d..0000000000 --- a/package/zig/mepo/0003-zig-0.13-std.ChildProcess-std.process.Child.patch +++ /dev/null @@ -1,49 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# T2 SDE: package/*/mepo/0003-zig-0.13-std.ChildProcess-std.process.Child.patch -# Copyright (C) 2024 The T2 SDE Project -# -# This Copyright note is generated by scripts/Create-CopyPatch, -# more information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License version 2 as used by the T2 SDE. -# --- T2-COPYRIGHT-NOTE-END --- - -From 65113031c6b0ce63e46f8fba43df268a32a1bb65 Mon Sep 17 00:00:00 2001 -From: "lauren n. liberda" -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, diff --git a/package/zig/mepo/0004-zig-0.13-adapt-to-new-Dir.writeFile-API-aka-Dir.writ.patch b/package/zig/mepo/0004-zig-0.13-adapt-to-new-Dir.writeFile-API-aka-Dir.writ.patch deleted file mode 100644 index 969d2152ef..0000000000 --- a/package/zig/mepo/0004-zig-0.13-adapt-to-new-Dir.writeFile-API-aka-Dir.writ.patch +++ /dev/null @@ -1,35 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# T2 SDE: package/*/mepo/0004-zig-0.13-adapt-to-new-Dir.writeFile-API-aka-Dir.writ.patch -# Copyright (C) 2024 The T2 SDE Project -# -# This Copyright note is generated by scripts/Create-CopyPatch, -# more information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License version 2 as used by the T2 SDE. -# --- T2-COPYRIGHT-NOTE-END --- - -From e370ef83141ac5caa41b65c665e86233020ff125 Mon Sep 17 00:00:00 2001 -From: "lauren n. liberda" -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) { -- 2.11.4.GIT