From f2b0aec92b5bff880bedb5386cee59da1ac491da Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Fri, 30 Oct 2020 05:56:25 +0000 Subject: [PATCH] games/veloren: chase GitLab providing LFS files => Fetched file size mismatch (expected 1125711, actual 135167598) => SHA256 Checksum mismatch for veloren-veloren-8f8b20c9139fbe1ddfb1937e3264e592d42f4fd0_GL0.tar.gz. --- games/veloren/Makefile | 12 ++---------- games/veloren/distinfo | 6 ++---- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/games/veloren/Makefile b/games/veloren/Makefile index 11725f5b952b..09cb6be4591b 100644 --- a/games/veloren/Makefile +++ b/games/veloren/Makefile @@ -5,10 +5,8 @@ DISTVERSIONPREFIX= v DISTVERSION= 0.7.0 PORTREVISION= 2 CATEGORIES= games -MASTER_SITES= https://veloren.net/icons/favicon/:icon \ - LOCAL/jbeich:assets -DISTFILES= android-icon-192x192.png:icon \ - ${PORTNAME}-assets-${DISTVERSIONFULL}.tar.xz:assets +MASTER_SITES= https://veloren.net/icons/favicon/:icon +DISTFILES= android-icon-192x192.png:icon EXTRACT_ONLY= ${DISTFILES:N*\:icon:C/:.*//} MAINTAINER= jbeich@FreeBSD.org @@ -540,12 +538,6 @@ CARGO_ENV= RUSTC_BOOTSTRAP=1 # XXX https://github.com/rust-lang/cargo/issues/4101 CARGO_INSTALL_PATH= chat-cli server-cli voxygen -post-extract: -# XXX https://gitlab.com/gitlab-org/gitlab/issues/15079 -# Replace LFS placeholders with data from a LOCAL snapshot - @${RM} -r ${WRKSRC}/assets - @${MV} ${WRKDIR}/assets ${WRKSRC} - post-patch: # .git/ directory is missing, so don't abort if git binary is also missing @${REINPLACE_CMD} -e 's/"git"/"${TRUE}"/' \ diff --git a/games/veloren/distinfo b/games/veloren/distinfo index 490767c4426f..c62aa2f90aca 100644 --- a/games/veloren/distinfo +++ b/games/veloren/distinfo @@ -1,8 +1,6 @@ TIMESTAMP = 1597487251 SHA256 (android-icon-192x192.png) = a6dd989aad6a03e0b7580f9fcec7aba14cfa8896aa260605c25a3317ac960cc8 SIZE (android-icon-192x192.png) = 24176 -SHA256 (veloren-assets-v0.7.0.tar.xz) = 9f5fc511d700a2d508021400ef1afb788d07aa4129ad636e067901d19d9fcf77 -SIZE (veloren-assets-v0.7.0.tar.xz) = 130059692 SHA256 (rust/crates/addr2line-0.12.1.tar.gz) = a49806b9dadc843c61e7c97e72490ad7f7220ae249012fbda9ad0609457c0543 SIZE (rust/crates/addr2line-0.12.1.tar.gz) = 119746 SHA256 (rust/crates/adler32-1.0.4.tar.gz) = 5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2 @@ -967,8 +965,8 @@ SHA256 (amethyst-specs-7a2e348ab2223818bad487695c66c43db88050a5_GH0.tar.gz) = 2e SIZE (amethyst-specs-7a2e348ab2223818bad487695c66c43db88050a5_GH0.tar.gz) = 123290 SHA256 (Imberflur-winit-e98133adf2abbfc4368f6c069d0beb2b8b688b42_GH0.tar.gz) = a70521696cf7fb01c901e5cce7bf947a0d4d68396cd8324f1e08020c3cd10f27 SIZE (Imberflur-winit-e98133adf2abbfc4368f6c069d0beb2b8b688b42_GH0.tar.gz) = 299709 -SHA256 (veloren-veloren-8f8b20c9139fbe1ddfb1937e3264e592d42f4fd0_GL0.tar.gz) = 7fd78bb521f63cac04dadeeb25bccff1b144002bf4280c83e9dd2ecd13691f43 -SIZE (veloren-veloren-8f8b20c9139fbe1ddfb1937e3264e592d42f4fd0_GL0.tar.gz) = 1125711 +SHA256 (veloren-veloren-8f8b20c9139fbe1ddfb1937e3264e592d42f4fd0_GL0.tar.gz) = e86e6a65b48dc1e534c6ed4549a4f3c2dff9edc41ec70510dd27694dbe492f27 +SIZE (veloren-veloren-8f8b20c9139fbe1ddfb1937e3264e592d42f4fd0_GL0.tar.gz) = 135167598 SHA256 (veloren-auth-b943c85e4a38f5ec60cd18c34c73097640162bfe_GL0.tar.gz) = 5e1155aab8719c47ef35f1dc1f0339b14dcbe1b88c0a76f235998e54ca1831b3 SIZE (veloren-auth-b943c85e4a38f5ec60cd18c34c73097640162bfe_GL0.tar.gz) = 31876 SHA256 (veloren-conrod-1ab6eccf94b16a8977a3274b31d4dbfef9cf9a30_GL0.tar.gz) = 3aa2bde93776b0fd962c11bd6a4b28329825462731b1bb3a6a51d220c9a4a498