From f3f5c7f75e3af9fa8c67d4d668c833c81b004093 Mon Sep 17 00:00:00 2001 From: Rene Hickersberger Date: Thu, 24 Mar 2022 19:28:30 +0100 Subject: [PATCH] Update to version 0.4 --- .SRCINFO | 12 ++++++------ PKGBUILD | 15 ++++++++++----- remove_zig_version_check.patch | 16 ++++++++++++++++ 3 files changed, 32 insertions(+), 11 deletions(-) create mode 100644 remove_zig_version_check.patch diff --git a/.SRCINFO b/.SRCINFO index 2727f20..ab6974c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = mepo pkgdesc = Fast, simple, and hackable OSM map viewer for Linux - pkgver = 0.3 + pkgver = 0.4 pkgrel = 1 url = https://git.sr.ht/~mil/mepo arch = i686 @@ -8,8 +8,8 @@ pkgbase = mepo arch = arm arch = aarch64 license = GPL3 - checkdepends = zig=0.8.1 - makedepends = zig=0.8.1 + checkdepends = zig>=0.9 + makedepends = zig>=0.9 makedepends = sdl2 makedepends = sdl2_image makedepends = sdl2_ttf @@ -18,8 +18,8 @@ pkgbase = mepo depends = jq depends = xdotool depends = curl - source = mepo-0.3.tar.gz::https://git.sr.ht/~mil/mepo/archive/0.3.tar.gz - sha256sums = c802edb9c472ab8fe20bd8995f9bba4d16396e856da0d90ad9d5ec73148b9587 - sha512sums = 8fe6c044c139a614795b244532ac7a85de9c291e7033be68b1dd32b8882550e839a14611d2e85789842b78f1393ebf0e7793878777e78771dda44245ec82e115 + source = mepo-0.4.tar.gz::https://git.sr.ht/~mil/mepo/archive/0.4.tar.gz + sha256sums = 7cdf18d6dba7a629904f6349ac562fb36a69fe3c894926087e9f5bf055a37f37 + sha512sums = ecfdb630d0bc09572ecd119dbba832b319915fd53f4883c718b12ce4fe72e1b97bad77dbbd6bb2a58a50a77fcf3d58574f13aa8157063cd1125dbfe4451769d6 pkgname = mepo diff --git a/PKGBUILD b/PKGBUILD index ba5c6b4..5b23e39 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,18 +1,23 @@ # Maintainer: Rene Hickersberger +# Contributor: Robert Hamblin pkgname=mepo -pkgver=0.3 +pkgver=0.4.1 pkgrel=1 pkgdesc="Fast, simple, and hackable OSM map viewer for Linux" arch=('i686' 'x86_64' 'arm' 'aarch64') url="https://git.sr.ht/~mil/mepo" license=('GPL3') depends=('dmenu' 'jq' 'xdotool' 'curl') -makedepends=('zig=0.8.1' 'sdl2' 'sdl2_image' 'sdl2_ttf' 'sdl2_gfx') -checkdepends=('zig=0.8.1') +makedepends=('zig>=0.9' 'sdl2' 'sdl2_image' 'sdl2_ttf' 'sdl2_gfx') +checkdepends=('zig>=0.9') changelog= source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz") -sha512sums=('8fe6c044c139a614795b244532ac7a85de9c291e7033be68b1dd32b8882550e839a14611d2e85789842b78f1393ebf0e7793878777e78771dda44245ec82e115') -sha256sums=('c802edb9c472ab8fe20bd8995f9bba4d16396e856da0d90ad9d5ec73148b9587') +sha512sums=('0baf41980e9b4c85276019151e258c7588261c825e59b159af4fa00e5f821df26fbc5598382dc7f9ce3bb395986d867d5dfdf519c211e5a4c2bee0062b44becf') +sha256sums=('b6d01ce10618755ec604d7376a4fe56302860d425e6303530f0eaefcb867cb76') + +prepare() { + patch --directory="$pkgname-$pkgver" --forward --strip=1 --input="$startdir/remove_zig_version_check.patch" +} build() { cd "$pkgname-$pkgver" diff --git a/remove_zig_version_check.patch b/remove_zig_version_check.patch new file mode 100644 index 0000000..e0dc8c8 --- /dev/null +++ b/remove_zig_version_check.patch @@ -0,0 +1,16 @@ +diff --unified --recursive --text --color mepo-0.4.orig/src/main.zig mepo-0.4.new/src/main.zig +--- mepo-0.4.orig/src/main.zig 2022-03-24 19:26:51.450817126 +0100 ++++ mepo-0.4.new/src/main.zig 2022-03-24 19:27:04.786754328 +0100 +@@ -7,12 +7,6 @@ + const utildbg = @import("./util/utildbg.zig"); + + pub fn main() !void { +- comptime { +- const v = builtin.zig_version; +- if (v.major != 0 or v.minor != 9 or v.patch != 1) +- @panic("Must be built against Zig 0.9.1"); +- } +- + const allocator = std.heap.c_allocator; + var stderr_on: bool = false; + var mode: enum { Graphical, Download, Version } = .Graphical;