summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD35
2 files changed, 25 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2e775c36521c..4e6e0024c7aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,17 @@
pkgbase = lib32-jsoncpp
pkgdesc = A C++ library for interacting with JSON
- pkgver = 1.8.4
+ pkgver = 1.9.1
pkgrel = 1
url = https://github.com/open-source-parsers/jsoncpp
arch = x86_64
license = MIT
license = custom:Public_Domain
- makedepends = cmake
+ makedepends = meson
+ makedepends = python
depends = jsoncpp
depends = lib32-gcc-libs
- source = lib32-jsoncpp-1.8.4.tar.gz::https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz
- sha256sums = c49deac9e0933bcb7044f08516861a2d560988540b23de2ac1ad443b219afdb6
+ source = lib32-jsoncpp-1.9.1.tar.gz::https://github.com/open-source-parsers/jsoncpp/archive/1.9.1.tar.gz
+ sha256sums = c7b40f5605dd972108f503f031b20186f5e5bca2b65cd4b8bd6c3e4ba8126697
pkgname = lib32-jsoncpp
diff --git a/PKGBUILD b/PKGBUILD
index 6bcfd3904afb..7dbef4514259 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,42 @@
_pkgbasename=jsoncpp
pkgname=lib32-${_pkgbasename}
-pkgver=1.8.4
+pkgver=1.9.1
pkgrel=1
pkgdesc='A C++ library for interacting with JSON'
url='https://github.com/open-source-parsers/jsoncpp'
license=('MIT' 'custom:Public_Domain')
arch=('x86_64')
depends=("${_pkgbasename}" 'lib32-gcc-libs')
-makedepends=('cmake')
+makedepends=('meson' 'python')
source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/open-source-parsers/${_pkgbasename}/archive/${pkgver}.tar.gz")
-sha256sums=('c49deac9e0933bcb7044f08516861a2d560988540b23de2ac1ad443b219afdb6')
+sha256sums=('c7b40f5605dd972108f503f031b20186f5e5bca2b65cd4b8bd6c3e4ba8126697')
+
+prepare() {
+ cd ${_pkgbasename}-${pkgver}
+ echo "${pkgver}" > version
+ sed -E "s|(version : )'1.9.0'|\1'${pkgver}'|" -i meson.build
+}
build() {
cd ${_pkgbasename}-${pkgver}
- cmake \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib32 \
- -DCMAKE_CXX_FLAGS=-m32 \
- -DBUILD_SHARED_LIBS=ON \
- -DBUILD_STATIC_LIBS=OFF
- make
+ CXXFLAGS=-m32 arch-meson --default-library shared --libdir lib32 --optimization 2 build
+ ninja -C build
}
check() {
cd ${_pkgbasename}-${pkgver}
- make test
+ ninja -C build test
+ cd test
+ python runjsontests.py ../build/jsontestrunner
+ python rununittests.py ../build/jsoncpp_test
}
package() {
cd ${_pkgbasename}-${pkgver}
- make DESTDIR="${pkgdir}" install
- install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
- rm -rf "${pkgdir}"/usr/include
+
+ DESTDIR="${pkgdir}" ninja -C build install
+ install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+ rm -r "${pkgdir}/usr/include"
+ rm -r "${pkgdir}/usr/lib32/pkgconfig"
}