summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD50
2 files changed, 38 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index efdd6f9a450c..e4c2833a37e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,20 @@
-# Generated by mksrcinfo v8
-# Sun Feb 4 00:13:01 UTC 2018
pkgbase = ocaml-yojson
- pkgdesc = An optimized parsing and printing library for JSON
- pkgver = 1.4.0
- pkgrel = 3
- url = https://github.com/mjambon/yojson
- arch = i686
+ pkgdesc = Low level JSON binary for OCaml
+ pkgver = 1.4.1
+ pkgrel = 6
+ url = https://github.com/ocaml-community/yojson
arch = x86_64
- arch = armv7h
license = BSD
- makedepends = ocaml-findlib
makedepends = dune
makedepends = cppo
depends = ocaml-biniou
depends = ocaml-easy-format
- options = !makeflags
options = !strip
options = staticlibs
- source = https://github.com/mjambon/yojson/archive/v1.4.0.tar.gz
- sha256sums = 7d06340b769ed6ff5b2171a0e820d1e8f4337aef3929090fc976efe845639146
+ source = ocaml-yojson-1.4.1.tar.gz::https://github.com/ocaml-community/yojson/archive/v1.4.1.tar.gz
+ source = https://github.com/ocaml-community/yojson/commit/a8095892a38d2a4e98f963c2627ac8cc484e0bbf.patch
+ sha256sums = c081a8cb5a03bddbcac4614f468cf5edafe11805277572af4071e362be6611fb
+ sha256sums = 62aeecc4a880f59fcfaa51ad27826e0ad418adb59b3b125ec4d60fe7f671f1b9
pkgname = ocaml-yojson
diff --git a/PKGBUILD b/PKGBUILD
index 7dc91ab39621..f0b97c7c2710 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,39 @@
-# Maintainer: nerflad <nerflad@gmail.com>
+# Author: Bruno Pagani <archange@archlinux.org>
+# Maintainer: nerflad <nerflad@gmail.com)
-pkgname=ocaml-yojson
-_oname=yojson
-pkgver=1.4.0
-pkgrel=3
-pkgdesc='An optimized parsing and printing library for JSON'
-arch=('i686' 'x86_64' 'armv7h')
-options=('!makeflags' '!strip' 'staticlibs')
+_pkgname=yojson
+pkgname=ocaml-${_pkgname}
+pkgver=1.4.1
+pkgrel=6
+pkgdesc="Low level JSON binary for OCaml"
+arch=('x86_64')
+url="https://github.com/ocaml-community/${_pkgname}"
license=('BSD')
+options=('!strip' 'staticlibs')
depends=('ocaml-biniou' 'ocaml-easy-format')
-makedepends=('ocaml-findlib' 'dune' 'cppo')
-url="https://github.com/mjambon/yojson"
-source=("https://github.com/mjambon/${_oname}/archive/v${pkgver}.tar.gz")
-sha256sums=('7d06340b769ed6ff5b2171a0e820d1e8f4337aef3929090fc976efe845639146')
+makedepends=('dune' 'cppo')
+source=(${pkgname}-${pkgver}.tar.gz::"${url}/archive/v${pkgver}.tar.gz"
+ 'https://github.com/ocaml-community/yojson/commit/a8095892a38d2a4e98f963c2627ac8cc484e0bbf.patch')
+sha256sums=('c081a8cb5a03bddbcac4614f468cf5edafe11805277572af4071e362be6611fb' '62aeecc4a880f59fcfaa51ad27826e0ad418adb59b3b125ec4d60fe7f671f1b9')
+
+prepare() {
+ cd ${_pkgname}-${pkgver}
+ # fix jbuild dependencies for cppo generation
+ patch -p1 -i "${srcdir}/a8095892a38d2a4e98f963c2627ac8cc484e0bbf.patch"
+}
build() {
- cd ${srcdir}/${_oname}-${pkgver}
+ cd ${_pkgname}-${pkgver}
make all
}
+check() {
+ cd ${_pkgname}-${pkgver}
+ make test
+}
+
package() {
- cd ${srcdir}/${_oname}-${pkgver}
- export OPAMROOT="${srcdir}/.opam"
- opam init -n
- mkdir -p "${pkgdir}/usr/bin"
- export OCAMLFIND_DESTDIR="${pkgdir}/$(ocamlfind printconf destdir)"
- install -dm755 "$OCAMLFIND_DESTDIR"
- jbuilder install
+ cd ${_pkgname}-${pkgver}
+ DESTDIR="${pkgdir}" dune install --prefix=/usr --libdir="$(ocamlfind printconf destdir)"
+ install -Dm644 LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}/
+ rm -r "${pkgdir}"/usr/doc
}