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

David Runge dvzrv at archlinux.org
Sat May 8 17:12:50 UTC 2021


    Date: Saturday, May 8, 2021 @ 17:12:49
  Author: dvzrv
Revision: 928889

upgpkg: nlohmann-json 3.9.1-2: Rebuild to build correct commit.

In 3.9.1-1 the commit pointed at by upstream tag v3.9.0 had been used.
Remove fix for tests, which is included now.

Modified:
  nlohmann-json/trunk/PKGBUILD

----------+
 PKGBUILD |   14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-08 17:10:52 UTC (rev 928888)
+++ PKGBUILD	2021-05-08 17:12:49 UTC (rev 928889)
@@ -1,12 +1,12 @@
 # Maintainer: David Runge <dvzrv at archlinux.org>
 
-# tests are tracked in separate repo
-_test_pkgver=3.0.0
+pkgname=nlohmann-json
 # upstream doesn't use annotated tags
-_commit=d34771cafc87b358ba421faca28facc7f8080174
-pkgname=nlohmann-json
+_commit=db78ac1d7716f56fc9f1b030b715f872f93964e4 # v3.9.1
 pkgver=3.9.1
-pkgrel=1
+pkgrel=2
+# tests are tracked in a separate repo
+_test_pkgver=3.0.0
 pkgdesc="JSON for Modern C++"
 arch=('any')
 url="https://github.com/nlohmann/json"
@@ -23,10 +23,6 @@
 prepare() {
   mkdir -vp "$pkgname/build"
   mv -v "json_test_data-${_test_pkgver}/" "$pkgname/build/json_test_data/"
-  cd "$pkgname"
-  # remove tests that make the package non-reproducible
-  # https://github.com/nlohmann/json/issues/2324
-  sed -e '/add_subdirectory/d' -i test/CMakeLists.txt
 }
 
 build() {



More information about the arch-commits mailing list