Date: Thursday, March 12, 2015 @ 11:28:59 Author: mtorromeo Revision: 129105
upgpkg: pfff 0.28.1.20150303-1 Updated to last git commit as upstream still hasn't tagged a release Modified: pfff/trunk/PKGBUILD Deleted: pfff/trunk/414290b4e2593e8f32d014279bf04193ecd55a8b.patch pfff/trunk/e532fc97da64a646bb706a9fa812a047cc557987.patch pfff/trunk/f6a4cc7f93c687ced9da5b2d21f9bbb717e633e0.patch ------------------------------------------------+ 414290b4e2593e8f32d014279bf04193ecd55a8b.patch | 39 ---- PKGBUILD | 29 +-- e532fc97da64a646bb706a9fa812a047cc557987.patch | 22 -- f6a4cc7f93c687ced9da5b2d21f9bbb717e633e0.patch | 192 ----------------------- 4 files changed, 9 insertions(+), 273 deletions(-) Deleted: 414290b4e2593e8f32d014279bf04193ecd55a8b.patch =================================================================== --- 414290b4e2593e8f32d014279bf04193ecd55a8b.patch 2015-03-12 10:27:17 UTC (rev 129104) +++ 414290b4e2593e8f32d014279bf04193ecd55a8b.patch 2015-03-12 10:28:59 UTC (rev 129105) @@ -1,39 +0,0 @@ -From 414290b4e2593e8f32d014279bf04193ecd55a8b Mon Sep 17 00:00:00 2001 -From: pad <[email protected]> -Date: Mon, 8 Sep 2014 10:00:13 -0700 -Subject: [PATCH] * external/ocamlgraph/src/flow.ml: fix for ocaml 4.02, should - fix some of issue #94 - ---- - external/ocamlgraph/src/flow.ml | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/external/ocamlgraph/src/flow.ml b/external/ocamlgraph/src/flow.ml -index c061f8c..30ebd85 100644 ---- a/external/ocamlgraph/src/flow.ml -+++ b/external/ocamlgraph/src/flow.ml -@@ -50,7 +50,7 @@ struct - let hauteur = V.create 997 - let flot = E.create 997 - -- let fold_booleen f = List.fold_left (fun r x->(f x) or r) false -+ let fold_booleen f = List.fold_left (fun r x->(f x) || r) false - - let capacite_restante g e = - F.sub (F.max_capacity (G.E.label e)) (E.find flot (G.E.src e, G.E.dst e)) -@@ -133,12 +133,12 @@ struct - - let maxflow g s p = - let push_and_pull l x = -- G.fold_succ_e (fun e r->pousser g e l or r) g x false -- or G.fold_pred_e (fun e r->pousser g e l or r) g x false -+ G.fold_succ_e (fun e r->pousser g e l || r) g x false -+ || G.fold_pred_e (fun e r->pousser g e l || r) g x false - in - let todo = ref (init_preflot g s p) in - while -- (fold_booleen (elever g p) !todo) or -+ (fold_booleen (elever g p) !todo) || - (let l = ref Sv.empty in - let r = fold_booleen (push_and_pull l) !todo in - todo:=Sv.elements !l; r) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-03-12 10:27:17 UTC (rev 129104) +++ PKGBUILD 2015-03-12 10:28:59 UTC (rev 129105) @@ -4,33 +4,22 @@ # Contributor: Francisco Lopes <[email protected]> pkgname='pfff' -pkgver=0.28.1 -pkgrel=5 +pkgver=0.28.1.20150303 +pkgrel=1 +_commit=7edb85da40598e42ae8a55d3c108e629dcb8ac47 + pkgdesc='Tools and APIs for code analysis, visualization and transformation' arch=('i686' 'x86_64') url='https://github.com/facebook/pfff' license=('LGPL2.1') -depends=('ocaml' 'ocaml-findlib' 'camlp4') +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"; - 414290b4e2593e8f32d014279bf04193ecd55a8b.patch - e532fc97da64a646bb706a9fa812a047cc557987.patch - f6a4cc7f93c687ced9da5b2d21f9bbb717e633e0.patch) -sha256sums=('ed411376d975d14ceca10414f9d76b212d957b7a69aa393667fe5d5584c9927c' - 'ff73c3d2258b950fe381a270640f28cb919e47450e2e526d844b1e6b802cfb5f' - 'bcc115ce7f02d0898891ac036351cc907d03287826a5d3b99aacdd167cda36c8' - '8c48852ea4b99924eaf7cbeb03379327d1d3df06dc28531eebb3b84b2864b269') +source=("$pkgname-$pkgver.tar.gz::https://github.com/facebook/pfff/archive/$_commit.tar.gz";) +sha256sums=('15fb620b28f0bafa17479bda79a9641edae070048106ef24656f7d2f1b7af087') -prepare() { - cd "$srcdir"/$pkgname-$pkgver - patch -p1 -i "$srcdir"/414290b4e2593e8f32d014279bf04193ecd55a8b.patch - patch -p1 -i "$srcdir"/e532fc97da64a646bb706a9fa812a047cc557987.patch - patch -p1 -i "$srcdir"/f6a4cc7f93c687ced9da5b2d21f9bbb717e633e0.patch -} - build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$srcdir"/$pkgname-$_commit ./configure --prefix=/usr make clean make depend @@ -39,7 +28,7 @@ } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$srcdir"/$pkgname-$_commit make DESTDIR=$pkgdir install install -dm755 "$pkgdir"/usr/lib/ocaml make OCAMLFIND_LDCONF="$pkgdir"/tmp/ld.conf OCAMLFIND_DESTDIR="$pkgdir"/usr/lib/ocaml install-findlib Deleted: e532fc97da64a646bb706a9fa812a047cc557987.patch =================================================================== --- e532fc97da64a646bb706a9fa812a047cc557987.patch 2015-03-12 10:27:17 UTC (rev 129104) +++ e532fc97da64a646bb706a9fa812a047cc557987.patch 2015-03-12 10:28:59 UTC (rev 129105) @@ -1,22 +0,0 @@ -From e532fc97da64a646bb706a9fa812a047cc557987 Mon Sep 17 00:00:00 2001 -From: pad <[email protected]> -Date: Mon, 8 Sep 2014 10:03:20 -0700 -Subject: [PATCH] * h_program-lang/database_code.ml: another issue #94 fix - ---- - h_program-lang/database_code.ml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/h_program-lang/database_code.ml b/h_program-lang/database_code.ml -index 850e699..0745f58 100644 ---- a/h_program-lang/database_code.ml -+++ b/h_program-lang/database_code.ml -@@ -360,7 +360,7 @@ let save_database database file = - if File_type.is_json_filename file - then - database +> json_of_database -- +> Json_io.string_of_json ~compact:false ~recursive:false -+ +> Json_io.string_of_json ~compact:false ~recursive:false ~allow_nan:true - +> Common.write_file ~file - else Common2.write_value database file - Deleted: f6a4cc7f93c687ced9da5b2d21f9bbb717e633e0.patch =================================================================== --- f6a4cc7f93c687ced9da5b2d21f9bbb717e633e0.patch 2015-03-12 10:27:17 UTC (rev 129104) +++ f6a4cc7f93c687ced9da5b2d21f9bbb717e633e0.patch 2015-03-12 10:28:59 UTC (rev 129105) @@ -1,192 +0,0 @@ -From f6a4cc7f93c687ced9da5b2d21f9bbb717e633e0 Mon Sep 17 00:00:00 2001 -From: pad <[email protected]> -Date: Fri, 26 Sep 2014 13:53:38 -0700 -Subject: [PATCH] port to 4.02 (disabled lang_cmt/ for now in configure), fixed - some deprecated warnings (or added -w -3) should fix issue #94 - ---- - code_graph/Makefile | 7 +++++++ - code_map/Makefile | 9 +++++++++ - code_map/draw_microlevel.ml | 2 +- - configure | 5 +++++ - graph_code/dependencies_matrix_build.ml | 6 +++--- - graph_code/dependencies_matrix_code.ml | 8 ++++---- - graph_code/graph_code_opti.ml | 6 +++--- - install.txt | 2 +- - lang_php/analyze/tools/Makefile | 6 ++++-- - 9 files changed, 37 insertions(+), 14 deletions(-) - -diff --git a/code_graph/Makefile b/code_graph/Makefile -index 93eaabc..4670904 100644 ---- a/code_graph/Makefile -+++ b/code_graph/Makefile -@@ -48,6 +48,13 @@ $(TARGET).cmxa: $(OPTOBJS) $(LIBS:.cma=.cmxa) - clean:: - rm -f $(TARGET).top - -+EXTRA_FLAGS=-w -3 -+cairo_helpers3.cmo: cairo_helpers3.ml -+ $(OCAMLC) $(EXTRA_FLAGS) -c $< -+ -+cairo_helpers3.cmx: cairo_helpers3.ml -+ $(OCAMLOPT) $(PP) $(EXTRA_FLAGS) -c $< -+ - ############################################################################## - # Generic rules - ############################################################################## -diff --git a/code_map/Makefile b/code_map/Makefile -index 0ae7674..54d4ac9 100644 ---- a/code_map/Makefile -+++ b/code_map/Makefile -@@ -91,6 +91,15 @@ $(TARGET).cmxa: $(OPTOBJS) $(LIBS:.cma=.cmxa) - $(OCAMLOPT) -a -o $(TARGET).cmxa $(OPTOBJS) - - -+ -+EXTRA_FLAGS=-w -3 -+cairo_helpers.cmo: cairo_helpers.ml -+ $(OCAMLC) $(EXTRA_FLAGS) -c $< -+ -+cairo_helpers.cmx: cairo_helpers.ml -+ $(OCAMLOPT) $(PP) $(EXTRA_FLAGS) -c $< -+ -+ - clean:: - rm -f $(TARGET).top - -diff --git a/code_map/draw_microlevel.ml b/code_map/draw_microlevel.ml -index ee8f2fe..a6f01a0 100644 ---- a/code_map/draw_microlevel.ml -+++ b/code_map/draw_microlevel.ml -@@ -197,7 +197,7 @@ let glyphs_of_file ~font_size ~font_size_real model_async file - * returned by nblines_eff may be different - *) - let nblines = Common2.nblines_eff file in -- let arr = Array.create nblines [] in -+ let arr = Array.make nblines [] in - let tokens_with_categ = Parsing.tokens_with_categ_of_file file entities in - - let line = ref 0 in -diff --git a/configure b/configure -index 5913d32..074fdbf 100755 ---- a/configure -+++ b/configure -@@ -201,6 +201,11 @@ if (`which ocamlc.opt` && `which ocamlopt.opt`) { - # -absname is for tuareg mode under my mac, it also needs ocaml 4.00 - if($ocaml_version >= 4000) { - $ocamlc_flags="-bin-annot -absname"; -+} -+ -+#TODO: not yet ported to 4.02 -+if($ocaml_version >= 4000 && $ocaml_version < 4020) { -+ $cmt=1; - } else { - $cmt=0; - } -diff --git a/graph_code/dependencies_matrix_build.ml b/graph_code/dependencies_matrix_build.ml -index 4c33ada..36bb66f 100644 ---- a/graph_code/dependencies_matrix_build.ml -+++ b/graph_code/dependencies_matrix_build.ml -@@ -90,8 +90,8 @@ let build_with_tree2 tree gopti = - let n_nodes = G2.nb_nodes gopti in - - let name_to_idm = Hashtbl.create (n / 2) in -- let idm_to_name = Array.create n ("", E.Dir) in -- let igopti_to_idm = Array.create n_nodes (-1) in -+ let idm_to_name = Array.make n ("", E.Dir) in -+ let igopti_to_idm = Array.make n_nodes (-1) in - - let (i: idm idx ref) = ref 0 in - nodes +> List.iter (fun node -> -@@ -108,7 +108,7 @@ let build_with_tree2 tree gopti = - config = tree; - } - in -- let (projected_parent_of_igopti: idm idx array) = Array.create n_nodes (-1) in -+ let (projected_parent_of_igopti: idm idx array) = Array.make n_nodes (-1) in - let (iroot: igopti idx) = hashtbl_find_node gopti.G2.name_to_i G.root in - let rec depth parent igopti = - let children = gopti.G2.has_children.(igopti) in -diff --git a/graph_code/dependencies_matrix_code.ml b/graph_code/dependencies_matrix_code.ml -index 38d95f0..a29b4ee 100644 ---- a/graph_code/dependencies_matrix_code.ml -+++ b/graph_code/dependencies_matrix_code.ml -@@ -155,11 +155,11 @@ let explain_cell_list_use_edges (i, j) dm gopti = - let res = ref [] in - - let n_nodes = G2.nb_nodes gopti in -- let igopti_to_idm = Array.create n_nodes (-1) in -+ let igopti_to_idm = Array.make n_nodes (-1) in - dm.i_to_name +> Array.iteri (fun idm node -> - igopti_to_idm.(hashtbl_find_node gopti.G2.name_to_i node) <- idm; - ); -- let (projected_parent_of_igopti: idm idx array) = Array.create n_nodes (-1) in -+ let (projected_parent_of_igopti: idm idx array) = Array.make n_nodes (-1) in - let (iroot: igopti idx) = hashtbl_find_node gopti.G2.name_to_i G.root in - let rec depth parent igopti = - let children = gopti.G2.has_children.(igopti) in -@@ -326,7 +326,7 @@ let is_dead_line i dm = - - - let parents_of_indexes dm = -- let arr = Array.create (Array.length dm.matrix) [] in -+ let arr = Array.make (Array.length dm.matrix) [] in - let i = ref 0 in - let rec aux acc tree = - match tree with -@@ -408,7 +408,7 @@ let score_downer_triangle dm exclude_nodes = - !score - - let score_upper_triangle_nodes dm = -- let score = Array.create (Array.length dm.matrix) 0 in -+ let score = Array.make (Array.length dm.matrix) 0 in - for i = 0 to Array.length dm.matrix -1 do - for j = i + 1 to Array.length dm.matrix -1 do - let v = dm.matrix.(i).(j) in -diff --git a/graph_code/graph_code_opti.ml b/graph_code/graph_code_opti.ml -index 4904f2f..6568908 100644 ---- a/graph_code/graph_code_opti.ml -+++ b/graph_code/graph_code_opti.ml -@@ -66,9 +66,9 @@ let (convert2: Graph_code.graph -> graph) = fun g -> - - let h = { - name_to_i = Hashtbl.create (n / 2); -- i_to_name = Array.create n ("",E.Dir); -- has_children = Array.create n []; -- use = Array.create n []; -+ i_to_name = Array.make n ("",E.Dir); -+ has_children = Array.make n []; -+ use = Array.make n []; - } - in - let i = ref 0 in -diff --git a/install.txt b/install.txt -index 4247192..843f213 100644 ---- a/install.txt -+++ b/install.txt -@@ -1,6 +1,6 @@ - - You must first install a recent version of -- - OCaml (at least 4.00.1), -+ - OCaml (at least 4.00.1), and camlp4 (not part of OCaml since 4.02) - see http://caml.inria.fr/download.en.html - - GTK (at least gtk 2.10) and Cairo - if you want codemap and codegraph, the fancy graphics code visualizers -diff --git a/lang_php/analyze/tools/Makefile b/lang_php/analyze/tools/Makefile -index c5f9fca..e13c1c1 100644 ---- a/lang_php/analyze/tools/Makefile -+++ b/lang_php/analyze/tools/Makefile -@@ -60,9 +60,11 @@ clean:: - - PP=-pp camlp4o - -+EXTRA_FLAGS=-w -3 -+ - php_serialize.cmo: php_serialize.ml -- $(OCAMLC) $(PP) -c $< -+ $(OCAMLC) $(PP) $(EXTRA_FLAGS) -c $< - - php_serialize.cmx: php_serialize.ml -- $(OCAMLOPT) $(PP) -c $< -+ $(OCAMLOPT) $(PP) $(EXTRA_FLAGS) -c $< -
