[arch-commits] Commit in nlohmann-json/trunk (PKGBUILD)

[David Runge]

    Date: Saturday, June 20, 2020 @ 21:34:22
  Author: dvzrv
Revision: 648658

upgpkg: nlohmann-json 3.8.0-2: Rebuilding with upstream patch to exclude tests requiring a git checkout.

Modified:
  nlohmann-json/trunk/PKGBUILD

----------+
 PKGBUILD |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-20 21:25:55 UTC (rev 648657)
+++ PKGBUILD	2020-06-20 21:34:22 UTC (rev 648658)
@@ -5,7 +5,7 @@
 _test_pkgver=2.0.0
 # upstream doesn't use annotated tags:
 _commit=e7452d87783fbf6e9d320d515675e26dfd1271c5
-pkgrel=1
+pkgrel=2
 pkgdesc="JSON for Modern C++"
 arch=('any')
 url="https://github.com/nlohmann/json"
@@ -12,14 +12,18 @@
 license=('MIT')
 makedepends=('cmake' 'git' 'meson')
 source=("${pkgname}::git+https://github.com/nlohmann/json#commit=${_commit}?signed"
+        "${pkgname}-3.8.0-git_tests.patch::https://github.com/nlohmann/json/commit/e86b3fae98854312fc6e59c62e35919a8d8012b1.patch"
         "json_test_data-${_test_pkgver}.tar.gz::https://github.com/nlohmann/json_test_data/archive/v${_test_pkgver}.tar.gz")
-md5sums=('SKIP'
-         'bf82cbb8d540a624194def861e96c417')
+sha512sums=('SKIP'
+            'b8002761041d7ee47404fbac082efe161362ba26daca061a0ff37274302866c724cd54827459a3836b93c02b46b90960a5a5686e2eeaf0fc460bd2bc7b2c731e'
+            'eb08a31b09929a027cdacded2e11b9caf47fa0079619c0fa67bcb766bff1be1642a11c8ccd2f4c48521387fe1d42625d4f53f6a063a290d4664b17813f784051')
 validpgpkeys=('797167AE41C0A6D9232E48457F3CEA63AE251B69') # Niels Lohmann <mail at nlohmann.me>
 
 prepare() {
   mkdir -vp "$pkgname/build"
   mv -v "json_test_data-${_test_pkgver}/" "$pkgname/build/json_test_data/"
+  cd "$pkgname"
+  patch -Np1 -i "../${pkgname}-3.8.0-git_tests.patch"
 }
 
 build() {
@@ -43,7 +47,7 @@
 
 check() {
   cd "$pkgname/build"
-  ctest --output-on-failure
+  ctest --output-on-failure -LE git_required
 }
 
 package() {