Added ocaml-lwt and dependencies

5 files changed, 94 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 51b1fb2cf28e..077a2198d230 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,31 @@
 pkgbase = ocaml-lwt
 	pkgdesc = A library for cooperative threads in OCaml
-	pkgver = 4.3.0
+	pkgver = 5.2.0
 	pkgrel = 1
-	url = http://ocsigen.org/lwt/
-	arch = i686
+	url = https://github.com/ocsigen/lwt
 	arch = x86_64
+	arch = i686
+	arch = arm
+	arch = armv6h
+	arch = armv7h
+	arch = aarch64
 	license = MIT
-	makedepends = dune
-	makedepends = cppo
-	depends = ocaml
-	depends = ocaml-mmap
+	makedepends = cppo>=1.1.0
+	makedepends = dune>=1.7.0
+	makedepends = ocaml-findlib
+	depends = libev
+	depends = ocaml>=4.02.0
+	depends = ocaml-mmap>=1.1.0
 	depends = ocaml-ocplib-endian
 	depends = ocaml-result
 	depends = ocaml-seq
-	depends = ocaml-migrate-parsetree
-	depends = ocaml-ppx_tools_versioned
-	depends = ocaml-react
-	depends = libev
+	depends = ocaml-migrate-parsetree>=1.5.0
+	depends = ocaml-ppx_tools_versioned>=5.3.0
+	depends = ocaml-react>=1.0.0
 	options = !strip
-	options = staticlibs
-	source = https://github.com/ocsigen/lwt/archive/4.3.0.tar.gz
-	sha512sums = 8e66f5b2443b2cc2889cd3f425db6e7261165603f1c31f8800540900d944dc6ae99b5cf02a29244cfd40fa4b077f238a7a788ba970734faa47deec98b55ac252
+	source = ocaml-lwt-5.2.0-1.tar.gz::https://github.com/ocsigen/lwt/archive/5.2.0.tar.gz
+	source = no-bisect_ppx.diff
+	sha256sums = 97c12b3da3d0db019dbdb97950b72f6fd1226ded7519c36ebfe2787574a9b132
+	sha256sums = 23de90bf80e7985b5749043c2dddd913bf9a1c3f08fe7a8a86b5e542aa46e279
 
 pkgname = ocaml-lwt
-
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000000..a467ee9a97a6
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,8 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = tab
+tab_width = 4
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..82b3c183d5d4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,14 @@
+# from https://github.com/github/gitignore/blob/master/ArchLinuxPackages.gitignore
+*.tar
+*.tar.*
+*.rpm
+*.jar
+*.exe
+*.msi
+*.zip
+*.tgz
+*.log
+*.log.*
+*.sig
+
+*/
diff --git a/PKGBUILD b/PKGBUILD
index 0d38872d903b..66c326f391a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,54 @@
-# Maintainer: Jakob Gahde <j5lx@fmail.co.uk>
+# Maintainer: Daniel Peukert <dan.peukert@gmail.com>
+# Contributor: Jakob Gahde <j5lx@fmail.co.uk>
 # Contributor: Serge Zirukin <ftrvxmtrx@gmail.com>
 # Contributor: Sergei Lebedev <superbobry@gmail.com
 # Contributor: serp <serp256 at gmail dot com>
-
-pkgname=ocaml-lwt
-pkgver=4.3.0
-pkgrel=1
-pkgdesc="A library for cooperative threads in OCaml"
-arch=('i686' 'x86_64')
-url="http://ocsigen.org/lwt/"
+_projectname='lwt'
+pkgname="ocaml-$_projectname"
+pkgver='5.2.0'
+pkgrel='1'
+pkgdesc='A library for cooperative threads in OCaml'
+arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
+url="https://github.com/ocsigen/lwt"
 license=('MIT')
-depends=('ocaml' 'ocaml-mmap' 'ocaml-ocplib-endian' 'ocaml-result' 'ocaml-seq'
-         'ocaml-migrate-parsetree' 'ocaml-ppx_tools_versioned' 'ocaml-react'
-         'libev')
-makedepends=('dune' 'cppo')
-source=("https://github.com/ocsigen/lwt/archive/${pkgver}.tar.gz")
-sha512sums=('8e66f5b2443b2cc2889cd3f425db6e7261165603f1c31f8800540900d944dc6ae99b5cf02a29244cfd40fa4b077f238a7a788ba970734faa47deec98b55ac252')
-options=('!strip' 'staticlibs')
+depends=('libev' 'ocaml>=4.02.0' 'ocaml-mmap>=1.1.0' 'ocaml-ocplib-endian' 'ocaml-result' 'ocaml-seq' 'ocaml-migrate-parsetree>=1.5.0' 'ocaml-ppx_tools_versioned>=5.3.0' 'ocaml-react>=1.0.0')
+makedepends=('cppo>=1.1.0' 'dune>=1.7.0' 'ocaml-findlib')
+options=('!strip')
+source=(
+	"$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz"
+	'no-bisect_ppx.diff'
+)
+sha256sums=('97c12b3da3d0db019dbdb97950b72f6fd1226ded7519c36ebfe2787574a9b132'
+            '23de90bf80e7985b5749043c2dddd913bf9a1c3f08fe7a8a86b5e542aa46e279')
 
-build() {
-  cd "${srcdir}/lwt-${pkgver}"
+_sourcedirectory="$_projectname-$pkgver"
 
-  LWT_DISCOVER_ARGUMENTS="--use-libev true" dune build --profile release
+prepare() {
+	cd "$srcdir/$_sourcedirectory/"
+	# This is currently the only way to not have a runtime bisect_ppx dep
+	# https://github.com/aantron/bisect_ppx#dune
+	# https://github.com/ocaml/dune/issues/57
+	patch --forward -p1 < '../no-bisect_ppx.diff'
 }
 
+build() {
+	cd "$srcdir/$_sourcedirectory/"
+	LWT_DISCOVER_ARGUMENTS='--use-libev true' dune build -p "$_projectname,${_projectname}_ppx,${_projectname}_react" --verbose
+}
+
+check() {
+	cd "$srcdir/$_sourcedirectory/"
+	dune runtest -p "$_projectname,${_projectname}_ppx,${_projectname}_react" --verbose
+}
 
 package() {
-  cd "${srcdir}/lwt-${pkgver}"
+	cd "$srcdir/$_sourcedirectory/"
+	DESTDIR="$pkgdir" dune install --prefix '/usr' --libdir 'lib/ocaml'
+
+	install -dm755 "$pkgdir/usr/share/doc/$pkgname"
+	mv "$pkgdir/usr/doc/$_projectname/"* "$pkgdir/usr/share/doc/$pkgname/"
+	rm -r "$pkgdir/usr/doc/"
 
-  dune install --destdir "${pkgdir}"
-  install -Dm644 "LICENSE.md" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.md"
-  mv "${pkgdir}/usr/doc" "${pkgdir}/usr/share/"
+	install -dm755 "$pkgdir/usr/share/licenses/$pkgname"
+	ln -sf "/usr/share/doc/$pkgname/LICENSE.md" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md"
 }
diff --git a/no-bisect_ppx.diff b/no-bisect_ppx.diff
new file mode 100644
index 000000000000..86bd8c0b0ce5
--- /dev/null
+++ b/no-bisect_ppx.diff
@@ -0,0 +1,10 @@
+diff --git a/src/react/dune b/src/react/dune
+index 318cb3c75..7d1680b6c 100644
+--- a/src/react/dune
++++ b/src/react/dune
+@@ -10,5 +10,4 @@
+  (synopsis "Reactive programming helpers for Lwt")
+  (wrapped false)
+  (libraries lwt react)
+- (preprocess (pps bisect_ppx --conditional))
+  (flags (:standard -w +A)))