Skip to content
Snippets Groups Projects
Unverified Commit 98afa750 authored by Newbyte's avatar Newbyte :snowflake: Committed by Oliver Smith
Browse files

main/pure-maps: upgrade to 2.5.0 (MR 1926)

[ci:skip-build]: already built successfully in CI
parent 38fea40b
Branches
No related tags found
No related merge requests found
Pipeline #202000 passed
From 86c41e3ea75d2be6a9ea328bf8eb7644441362f9 Mon Sep 17 00:00:00 2001
From: Newbyte <newbie13xd@gmail.com>
Date: Tue, 2 Feb 2021 13:18:17 +0100
Subject: [PATCH 1/1] explicitly invoke python3 in check-json
python refers to python2 in some distributions which we don't want
---
tools/check-json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/check-json b/tools/check-json
index de0ee430..6e35395d 100755
--- a/tools/check-json
+++ b/tools/check-json
@@ -3,4 +3,4 @@
set -e
echo Checking "$1"
-python -m json.tool "$1" > /dev/null || (echo Check failed && exit 255)
+python3 -m json.tool "$1" > /dev/null || (echo Check failed && exit 255)
--
2.26.2
From 413046fe7050de246cc94584d159830c95f3ba14 Mon Sep 17 00:00:00 2001
From: Rinigus <rinigus.git@gmail.com>
Date: Fri, 29 Jan 2021 22:34:29 +0200
Subject: [PATCH 1/1] replace jsonlint with json.tool
As proposed by Newbyte
---
Makefile.test | 2 +-
tools/check-json | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100755 tools/check-json
diff --git a/Makefile.test b/Makefile.test
index ef3ba60a..8f244a74 100644
--- a/Makefile.test
+++ b/Makefile.test
@@ -4,7 +4,7 @@ all: check test
check:
python3 -m pyflakes geocoders guides poor routers
- find . -type f -name "*.json" -exec jsonlint -q {} \;
+ find . -type f -name "*.json" -print0 | xargs -0 -n 1 tools/check-json
test:
py.test geocoders guides poor routers
diff --git a/tools/check-json b/tools/check-json
new file mode 100755
index 00000000..de0ee430
--- /dev/null
+++ b/tools/check-json
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+
+echo Checking "$1"
+python -m json.tool "$1" > /dev/null || (echo Check failed && exit 255)
--
2.26.2
......@@ -2,8 +2,8 @@
# Contributor: Newbyte <newbytee@protonmail.com>
# Maintainer: Newbyte <newbytee@protonmail.com>
pkgname=pure-maps
pkgver=2.4.1
pkgrel=1
pkgver=2.5.0
pkgrel=0
_commit_geomag="8eb9a730c8643fb7d63fdee4fd9a195ee8ba4df2"
pkgdesc="Maps and navigation"
url="https://github.com/rinigus/pure-maps"
......@@ -38,8 +38,6 @@ checkdepends="py3-pytest"
subpackages="$pkgname-lang"
source="https://github.com/rinigus/pure-maps/archive/$pkgver/pure-maps-$pkgver.tar.gz
https://github.com/rinigus/geomag/archive/$_commit_geomag/geomag-$_commit_geomag.tar.gz
0001-replace-jsonlint-with-json.tool.patch
0001-explicitly-invoke-python3-in-check-json.patch
"
prepare() {
......@@ -70,7 +68,5 @@ package() {
mv "$pkgdir"/usr/share/pure-maps/locale "$pkgdir"/usr/share
}
sha512sums="4a7a3bbb9b573abdd7b6e1f837eafcce3a732c1b330de4df813f197d8e3a3ebf33d47b81fd75c9d8f49041b5a3fbf27efd773111f38e4465b8d4930cfe90ec93 pure-maps-2.4.1.tar.gz
13e11b6cb35162315deb86c6c6240a3555760397d7aa88ac9c3348d476e9e9547b03210134119c60790511489e3f2a13afb93a3c77d40b1258c664b6fcc0425c geomag-8eb9a730c8643fb7d63fdee4fd9a195ee8ba4df2.tar.gz
01344056bc0cfb23205bd75022177cd6cc680055cab5ee64895c894264b539de6697b97bec11fc6de18baf7b048930d16f422527635b2dcd35382a9228b8f397 0001-replace-jsonlint-with-json.tool.patch
39ddddb31b37c74fcac9b7f3263a2d04893673d21eb8fecb353d8a3047cb314cc50f973089ae6472afed2714800ed9b98c16c92ae78fc908ff6a92fb9bfa82f1 0001-explicitly-invoke-python3-in-check-json.patch"
sha512sums="a0f6cdc2be5ece40d1ef646fc9e0425a388cebc75135ade95a0d91b4d381f74094ebe7637d51d21193bf23074537506007d6eba46accc39d45ce323a1858c57d pure-maps-2.5.0.tar.gz
13e11b6cb35162315deb86c6c6240a3555760397d7aa88ac9c3348d476e9e9547b03210134119c60790511489e3f2a13afb93a3c77d40b1258c664b6fcc0425c geomag-8eb9a730c8643fb7d63fdee4fd9a195ee8ba4df2.tar.gz"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment