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

[David Runge]

    Date: Monday, January 3, 2022 @ 18:14:21
  Author: dvzrv
Revision: 1092507

upgpkg: nlohmann-json 3.10.5-1: Upgrade to 3.10.5.

Simplify functions, by not requiring to cd into dirs.
Do not break long lines.

Modified:
  nlohmann-json/trunk/PKGBUILD

----------+
 PKGBUILD |   45 +++++++++++++++++++++------------------------
 1 file changed, 21 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-03 17:48:37 UTC (rev 1092506)
+++ PKGBUILD	2022-01-03 18:14:21 UTC (rev 1092507)
@@ -2,17 +2,17 @@
 
 pkgname=nlohmann-json
 # upstream doesn't use annotated tags
-_commit=fec56a1a16c6e1c1b1f4e116a20e79398282626c  # v3.10.4
-pkgver=3.10.4
+_commit=4f8fba14066156b73f1189a2b8bd568bde5284c5 # v3.10.5^{}
+pkgver=3.10.5
 pkgrel=1
 # tests are tracked in a separate repo
 # https://github.com/nlohmann/json_test_data
 _test_pkgver=3.0.0
 pkgdesc="JSON for Modern C++"
-arch=('any')
+arch=(any)
 url="https://github.com/nlohmann/json"
-license=('MIT')
-makedepends=('cmake' 'git')
+license=(MIT)
+makedepends=(cmake git)
 source=("${pkgname}::git+https://github.com/nlohmann/json#commit=${_commit}?signed"
         "json_test_data-${_test_pkgver}.tar.gz::https://github.com/nlohmann/json_test_data/archive/v${_test_pkgver}.tar.gz")
 sha512sums=('SKIP'
@@ -22,41 +22,38 @@
 validpgpkeys=('797167AE41C0A6D9232E48457F3CEA63AE251B69') # Niels Lohmann <mail at nlohmann.me>
 
 prepare() {
-  cp -av "${pkgname}" "${pkgname}-test"
-  mkdir -vp "${pkgname}-test/build"
-  mv -v "json_test_data-${_test_pkgver}/" "${pkgname}-test/build/json_test_data/"
+  mkdir -vp "build-test/"
+  mv -v "json_test_data-${_test_pkgver}/" "build-test/json_test_data/"
 }
 
 build() {
-  cmake -DCMAKE_INSTALL_PREFIX='/usr' \
-        -DCMAKE_INSTALL_LIBDIR='/usr/lib' \
-        -DCMAKE_BUILD_TYPE='None' \
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+        -DCMAKE_BUILD_TYPE=None \
         -DJSON_MultipleHeaders=ON \
         -Wno-dev \
-        -B "$pkgname/build" \
+        -B build \
         -S "$pkgname"
-  make VERBOSE=1 -C "$pkgname/build"
+  make VERBOSE=1 -C build
 
-  cmake -DCMAKE_INSTALL_PREFIX='/usr' \
-        -DCMAKE_INSTALL_LIBDIR='/usr/lib' \
-        -DCMAKE_BUILD_TYPE='None' \
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+        -DCMAKE_BUILD_TYPE=None \
         -DBUILD_TESTING=ON \
         -DJSON_BuildTests=ON \
         -DJSON_MultipleHeaders=ON \
         -Wno-dev \
-        -B "$pkgname-test/build" \
-        -S "$pkgname-test"
-  make VERBOSE=1 -C "$pkgname-test/build"
+        -B "build-test" \
+        -S "$pkgname"
+  make VERBOSE=1 -C build-test
 }
 
 check() {
-  make -k test -C "${pkgname}-test/build"
+  make -k test -C "build-test"
 }
 
 package() {
-  cd "${pkgname}"
   make DESTDIR="${pkgdir}" install -C build
-  install -vDm 644 {CODE_OF_CONDUCT,README}.md \
-    -t "${pkgdir}/usr/share/doc/${pkgname}"
-  install -vDm 644 LICENSE.MIT -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -vDm 644 "$pkgname/"{CODE_OF_CONDUCT,README}.md -t "${pkgdir}/usr/share/doc/${pkgname}"
+  install -vDm 644 "$pkgname/"LICENSE.MIT -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }