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

David Runge dvzrv at gemini.archlinux.org
Tue Aug 2 15:53:18 UTC 2022


    Date: Tuesday, August 2, 2022 @ 15:53:18
  Author: dvzrv
Revision: 1259825

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

Remove unnecessary quotes and curly braces.

Added:
  nlohmann-json/trunk/keys/
  nlohmann-json/trunk/keys/pgp/
  nlohmann-json/trunk/keys/pgp/797167AE41C0A6D9232E48457F3CEA63AE251B69.asc
Modified:
  nlohmann-json/trunk/PKGBUILD

-------------------------------------------------------+
 PKGBUILD                                              |   34 ++++++++--------
 keys/pgp/797167AE41C0A6D9232E48457F3CEA63AE251B69.asc |    1 
 2 files changed, 19 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-02 15:47:17 UTC (rev 1259824)
+++ PKGBUILD	2022-08-02 15:53:18 UTC (rev 1259825)
@@ -2,28 +2,30 @@
 
 pkgname=nlohmann-json
 # upstream doesn't use annotated tags
-_commit=4f8fba14066156b73f1189a2b8bd568bde5284c5 # v3.10.5^{}
-pkgver=3.10.5
+_commit=69d744867f8847c91a126fa25e9a6a3d67b3be41  # v3.11.1^{}
+pkgver=3.11.1
 pkgrel=1
 # tests are tracked in a separate repo
 # https://github.com/nlohmann/json_test_data
-_test_pkgver=3.0.0
+_test_pkgver=3.1.0
 pkgdesc="JSON for Modern C++"
 arch=(any)
 url="https://github.com/nlohmann/json"
 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")
+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'
-            'd9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891')
+            'db6c411b37f2154f5dd1ed90f4e8fa0907f4a736cd0ff79943bcacf9da422285ff142bb6a7dc6022b236090083166ac1ab197be3f480d8dc50b26a91a9477821')
 b2sums=('SKIP'
-        'f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d')
+        '809be0728a0b9d007fcc752911bdf6f7e548d6e3ec59871ea2b16d87d8248ca4dd2f681a1d0f82c618463294188ad41d6d965b8bdc39c70fdcf4b939d4121e9c')
 validpgpkeys=('797167AE41C0A6D9232E48457F3CEA63AE251B69') # Niels Lohmann <mail at nlohmann.me>
 
 prepare() {
-  mkdir -vp "build-test/"
-  mv -v "json_test_data-${_test_pkgver}/" "build-test/json_test_data/"
+  mkdir -vp build-test/
+  mv -v json_test_data-${_test_pkgver}/ build-test/json_test_data/
 }
 
 build() {
@@ -33,7 +35,7 @@
         -DJSON_MultipleHeaders=ON \
         -Wno-dev \
         -B build \
-        -S "$pkgname"
+        -S $pkgname
   make VERBOSE=1 -C build
 
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
@@ -43,17 +45,17 @@
         -DJSON_BuildTests=ON \
         -DJSON_MultipleHeaders=ON \
         -Wno-dev \
-        -B "build-test" \
-        -S "$pkgname"
+        -B build-test \
+        -S $pkgname
   make VERBOSE=1 -C build-test
 }
 
 check() {
-  make -k test -C "build-test"
+  make -k test -C build-test
 }
 
 package() {
-  make DESTDIR="${pkgdir}" install -C build
-  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}"
+  make DESTDIR="$pkgdir" install -C build
+  install -vDm 644 $pkgname/README.md -t "$pkgdir/usr/share/doc/$pkgname/"
+  install -vDm 644 $pkgname/LICENSE.MIT -t "$pkgdir/usr/share/licenses/$pkgname/"
 }

Added: keys/pgp/797167AE41C0A6D9232E48457F3CEA63AE251B69.asc
===================================================================
(Binary files differ)

Index: nlohmann-json/trunk/keys/pgp/797167AE41C0A6D9232E48457F3CEA63AE251B69.asc
===================================================================
--- keys/pgp/797167AE41C0A6D9232E48457F3CEA63AE251B69.asc	2022-08-02 15:47:17 UTC (rev 1259824)
+++ keys/pgp/797167AE41C0A6D9232E48457F3CEA63AE251B69.asc	2022-08-02 15:53:18 UTC (rev 1259825)

Property changes on: nlohmann-json/trunk/keys/pgp/797167AE41C0A6D9232E48457F3CEA63AE251B69.asc
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pgp-keys
\ No newline at end of property


More information about the arch-commits mailing list