Fix missing camlp-streams dependency for flow

3 files changed, 49 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b55993ec3314..642f2678455a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = flow-git
 	pkgdesc = A static type checker for JavaScript - git version
-	pkgver = 0.206.0.r15984.g30855cad7
+	pkgver = 0.206.0.r15989.ga83926f29
 	pkgrel = 1
 	url = https://flow.org
 	arch = x86_64
@@ -8,6 +8,7 @@ pkgbase = flow-git
 	license = MIT
 	makedepends = git
 	makedepends = ocaml>=4.14.0
+	makedepends = camlp-streams
 	makedepends = dune>=3.0.0
 	makedepends = ocaml-base>=0.14.1
 	makedepends = ocaml-core_kernel>=0.14.1
@@ -26,6 +27,8 @@ pkgbase = flow-git
 	provides = flow
 	conflicts = flow
 	source = flow-git::git+https://github.com/facebook/flow
+	source = add-streams-dep.diff
 	sha512sums = SKIP
+	sha512sums = 0b7359e263c113bf1e411a648d8ea754872cc7eef0c171d78a3053cf236642cb55314da5c1c283607fd08c0c3583d8e2f9d9536e9ff1b1892cd3ce6d5bb5c21a
 
 pkgname = flow-git
diff --git a/PKGBUILD b/PKGBUILD
index 574af5531bdb..fed4618b59c2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,21 +5,30 @@
 # Contributor: Andy Weidenbaum <archbaum@gmail.com>
 _pkgname='flow'
 pkgname="$_pkgname-git"
-pkgver='0.206.0.r15984.g30855cad7'
+pkgver='0.206.0.r15989.ga83926f29'
 pkgrel='1'
 pkgdesc='A static type checker for JavaScript - git version'
 # If you're running on aarch64, you have to add it to the arch array of the cppo, ocaml-biniou, ocaml-easy-format and ocaml-yojson AUR dependencies
 arch=('x86_64' 'aarch64')
 url="https://$_pkgname.org"
 license=('MIT')
-makedepends=('git' 'ocaml>=4.14.0' 'dune>=3.0.0' 'ocaml-base>=0.14.1' 'ocaml-core_kernel>=0.14.1' 'ocaml-dtoa>=0.3.2' 'ocaml-fileutils>=0.6.3' 'ocaml-inotify>=2.4.1' 'ocaml-lwt>=5.4.0' 'ocaml-lwt_log>=1.1.1' 'ocaml-ppx_deriving' 'ocaml-ppx_gen_rec' 'ocaml-ppx_let>=0.14.0' 'ocaml-ppxlib' 'ocaml-sedlex>=2.3' 'ocaml-visitors' 'ocaml-wtf8')
+makedepends=('git' 'ocaml>=4.14.0' 'camlp-streams' 'dune>=3.0.0' 'ocaml-base>=0.14.1' 'ocaml-core_kernel>=0.14.1' 'ocaml-dtoa>=0.3.2' 'ocaml-fileutils>=0.6.3' 'ocaml-inotify>=2.4.1' 'ocaml-lwt>=5.4.0' 'ocaml-lwt_log>=1.1.1' 'ocaml-ppx_deriving' 'ocaml-ppx_gen_rec' 'ocaml-ppx_let>=0.14.0' 'ocaml-ppxlib' 'ocaml-sedlex>=2.3' 'ocaml-visitors' 'ocaml-wtf8')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
-source=("$pkgname::git+https://github.com/facebook/$_pkgname")
-sha512sums=('SKIP')
+source=(
+	"$pkgname::git+https://github.com/facebook/$_pkgname"
+	'add-streams-dep.diff'
+)
+sha512sums=('SKIP'
+            '0b7359e263c113bf1e411a648d8ea754872cc7eef0c171d78a3053cf236642cb55314da5c1c283607fd08c0c3583d8e2f9d9536e9ff1b1892cd3ce6d5bb5c21a')
 
 _sourcedirectory="$pkgname"
 
+prepare() {
+	cd "$srcdir/$_sourcedirectory/"
+	patch --forward -p1 < '../add-streams-dep.diff'
+}
+
 pkgver() {
 	cd "$srcdir/$_sourcedirectory/"
 	printf '%s.r%s.g%s' "$(sed -nE 's/^version: "([0-9.]*)"$/\1/p' 'flowtype.opam')" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
diff --git a/add-streams-dep.diff b/add-streams-dep.diff
new file mode 100644
index 000000000000..b452497fe957
--- /dev/null
+++ b/add-streams-dep.diff
@@ -0,0 +1,32 @@
+diff --git a/flow_parser.opam b/flow_parser.opam
+index 68e0ab4b5..73f5f8976 100644
+--- a/flow_parser.opam
++++ b/flow_parser.opam
+@@ -15,6 +15,7 @@ depends: [
+   "ppx_gen_rec" {build}
+   "sedlex" {>= "2.3"}
+   "wtf8"
++  "camlp-streams"
+ ]
+ dev-repo: "git+https://github.com/facebook/flow.git"
+ synopsis: "The Flow parser is a JavaScript parser written in OCaml"
+diff --git a/src/third-party/ocaml-sourcemaps/src/dune b/src/third-party/ocaml-sourcemaps/src/dune
+index 9b920401d..fde1d33c6 100644
+--- a/src/third-party/ocaml-sourcemaps/src/dune
++++ b/src/third-party/ocaml-sourcemaps/src/dune
+@@ -1,4 +1,4 @@
+ (library
+  (name flow_third_party_sourcemaps)
+  (wrapped false)
+- (libraries flow_third_party_vlq))
++ (libraries flow_third_party_vlq camlp-streams))
+diff --git a/src/third-party/ocaml-vlq/src/dune b/src/third-party/ocaml-vlq/src/dune
+index ba49dfba4..70f766b39 100644
+--- a/src/third-party/ocaml-vlq/src/dune
++++ b/src/third-party/ocaml-vlq/src/dune
+@@ -1,3 +1,4 @@
+ (library
+  (name flow_third_party_vlq)
+- (wrapped false))
++ (wrapped false)
++ (libraries camlp-streams))