Date: Monday, August 24, 2015 @ 12:19:26 Author: juergen Revision: 138722
add OCaml 4.02.3 build fixes Added: pfff/trunk/lang_js-analyze-module_js.ml-Fix-invalid-documentati.patch pfff/trunk/lang_js-analyze-utils_js.mli.patch Modified: pfff/trunk/PKGBUILD ------------------------------------------------------------+ PKGBUILD | 16 +- lang_js-analyze-module_js.ml-Fix-invalid-documentati.patch | 80 +++++++++++ lang_js-analyze-utils_js.mli.patch | 30 ++++ 3 files changed, 123 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-08-24 10:03:37 UTC (rev 138721) +++ PKGBUILD 2015-08-24 10:19:26 UTC (rev 138722) @@ -5,7 +5,7 @@ pkgname='pfff' pkgver=0.29 -pkgrel=1 +pkgrel=2 pkgdesc='Tools and APIs for code analysis, visualization and transformation' arch=('i686' 'x86_64') @@ -14,9 +14,19 @@ depends=('ocaml' 'ocaml-findlib' 'camlp4' 'zlib') optdepends=('gtk2: required by codegraph and codemap') options=(!makeflags staticlibs) # parallel build fails, need *.a files -source=("$pkgname-$pkgver.tar.gz::https://github.com/facebook/pfff/archive/v$pkgver.tar.gz") -sha256sums=('d31c68f1ebb1770297eb26441d21d83728c0fbdb9c7bb3be27625db45fae72d1') +source=("$pkgname-$pkgver.tar.gz::https://github.com/facebook/pfff/archive/v$pkgver.tar.gz" +"lang_js-analyze-module_js.ml-Fix-invalid-documentati.patch" +"lang_js-analyze-utils_js.mli.patch") +sha256sums=('d31c68f1ebb1770297eb26441d21d83728c0fbdb9c7bb3be27625db45fae72d1' + '28b220807087b9378e0fcab1187163cdeb8d3da80f53f00ec9af434467ace57f' + 'bb10f6b25afe0cd0df5084d9e3624f43cbf7489b148c67d99479d11cf90999b7') +prepare() { + cd "$srcdir"/$pkgname-$pkgver + patch -Np1 -i ../lang_js-analyze-utils_js.mli.patch + patch -Np1 -i ../lang_js-analyze-module_js.ml-Fix-invalid-documentati.patch +} + build() { cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr Added: lang_js-analyze-module_js.ml-Fix-invalid-documentati.patch =================================================================== --- lang_js-analyze-module_js.ml-Fix-invalid-documentati.patch (rev 0) +++ lang_js-analyze-module_js.ml-Fix-invalid-documentati.patch 2015-08-24 10:19:26 UTC (rev 138722) @@ -0,0 +1,80 @@ +From 90424f6a206b32c0995e043fe404e694c884b5d3 Mon Sep 17 00:00:00 2001 +From: Juergen Hoetzel <juer...@archlinux.org> +Date: Mon, 24 Aug 2015 13:55:44 +0200 +Subject: [PATCH] * lang_js/analyze/module_js.ml: Fix invalid documentation + comments. Refs #130 + +See: http://caml.inria.fr/mantis/view.php?id=6916 +--- + lang_js/analyze/module_js.ml | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/lang_js/analyze/module_js.ml b/lang_js/analyze/module_js.ml +index 1433bf0..3bf63b3 100644 +--- a/lang_js/analyze/module_js.ml ++++ b/lang_js/analyze/module_js.ml +@@ -48,50 +48,50 @@ type shape = + | LiteralShape + | ArrayShape + +- (** _((id,container,maps) ref) **) ++ (* _((id,container,maps) ref) *) + (* this is a ref to allow extensible representations *) + (* id is unique, and is used to prune infinite recursion *) + (* maps is an ObjectShape list *) + | ObjectShape of (int * shape smap * shape list) ref + +- (** _(block,constructor) **) ++ (* _(block,constructor) *) + (* block is an ObjectShape *) + (* constructor is a ClassShape *) + | FunctionShape of shape Common.smap ref * shape + +- (** _(module) **) ++ (* _(module) *) + | RequireShape of module_ + +- (** _(reason) **) ++ (* _(reason) *) + | UnknownShape of string + +- (** _(instance, static) **) ++ (* _(instance, static) *) + (* instance is a ObjectShape *) + (* static is a ObjectShape where static.prototype is a ObjectShape *) + | ClassShape of shape * shape + +- (** _(class) **) ++ (* _(class) *) + (* class is a ClassShape *) + (* returns an ObjectShape *) + | NewShape of shape + +- (** _(maps) **) ++ (* _(maps) *) + (* maps is an ObjectShape *) + (* returns a ClassShape *) + | MixinShape of shape + +- (** _(class,mixin) **) ++ (* _(class,mixin) *) + (* class is a ClassShape, mixin is a ClassShape *) + (* returns a ClassShape *) + | ClassWithMixinShape of shape * shape + +- (** _(object,prop) **) ++ (* _(object,prop) *) + | PropertyShape of shape * string + +- (** _(function) **) ++ (* _(function) *) + | ApplyShape of shape + +- (** _(array) **) ++ (* _(array) *) + | ElementShape of shape + + let fresh_id = +-- +2.5.0 + Added: lang_js-analyze-utils_js.mli.patch =================================================================== --- lang_js-analyze-utils_js.mli.patch (rev 0) +++ lang_js-analyze-utils_js.mli.patch 2015-08-24 10:19:26 UTC (rev 138722) @@ -0,0 +1,30 @@ +From 1658a7f55af6884644909901523a28d2df7416d7 Mon Sep 17 00:00:00 2001 +From: pad <yoann.padiol...@gmail.com> +Date: Thu, 20 Aug 2015 09:58:29 -0700 +Subject: [PATCH 68/72] * lang_js/analyze/utils_js.mli: fix issue #130 + +--- + lang_js/analyze/utils_js.mli | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/lang_js/analyze/utils_js.mli b/lang_js/analyze/utils_js.mli +index 637b832..19a8cbb 100644 +--- a/lang_js/analyze/utils_js.mli ++++ b/lang_js/analyze/utils_js.mli +@@ -1,8 +1,9 @@ + +-(** print utils **) ++(* print utils *) + val string_of_any : Ast_js.any -> string + +-(** Example: load file task **) +-(** if file exists, unmarshal data in the file and return it **) +-(** otherwise, run task to generate data, store it in the file, and return it **) ++(* Example: load file task ++ * if file exists, unmarshal data in the file and return it ++ * otherwise, run task to generate data, store it in the file, and return it ++ *) + val load : Common.filename -> (unit -> 'a) -> 'a +-- +2.5.0 +