Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=427d0980d461d6e2297df53a2c5f13868e36ee48
commit 427d0980d461d6e2297df53a2c5f13868e36ee48 Author: Elentir <elen...@frugalware.org> Date: Sun Feb 13 20:27:15 2011 +0100 camlp5-6.02.1-2-i686 * fix http://www.lix.polytechnique.fr/coq/bugs/show_bug.cgi?id=2468 diff --git a/source/devel-extra/camlp5/FrugalBuild b/source/devel-extra/camlp5/FrugalBuild index a15199d..9b94f43 100644 --- a/source/devel-extra/camlp5/FrugalBuild +++ b/source/devel-extra/camlp5/FrugalBuild @@ -3,18 +3,20 @@ pkgname=camlp5 pkgver=6.02.1 -pkgrel=1 +pkgrel=2 pkgdesc="Camlp5 is a preprocessor-pretty-printer of OCaml." url="http://pauillac.inria.fr/~ddr/camlp5"; -source=("$url/distrib/src/$pkgname-$pkgver.tgz") +source=("$url/distrib/src/$pkgname-$pkgver.tgz" fix-regression-2468.patch) depends=('ocaml>=3.12.0') groups=('devel-extra') archs=('i686' 'x86_64') up2date="Flasttar $url" Fconfopts="-prefix /usr" -sha1sums=('6d658988d89be00e90fcdccb31d615988b2e607c') +sha1sums=('6d658988d89be00e90fcdccb31d615988b2e607c' \ + '90e0126a0ced4883000aee01a9e2c718c1679576') build() { + Fpatchall Fmake make opt || Fdie Fmakeinstall diff --git a/source/devel-extra/camlp5/fix-regression-2468.patch b/source/devel-extra/camlp5/fix-regression-2468.patch new file mode 100644 index 0000000..abe7db3 --- /dev/null +++ b/source/devel-extra/camlp5/fix-regression-2468.patch @@ -0,0 +1,12 @@ +diff -Naur camlp5-6.02.1/etc/pr_o.ml camlp5-6.02.1/etc/pr_o.ml +--- camlp5-6.02.1/etc/pr_o.ml 2010-11-21 18:17:45.000000000 +0100 ++++ camlp5-6.02.1/etc/pr_o.ml 2011-02-13 20:09:38.817000010 +0100 +@@ -2080,7 +2080,7 @@ + value label_ipatt expr pc (p, oe) = + match Pcaml.unvala oe with + [ Some e -> pprintf pc "~%p:%p" patt p expr e +- | None -> patt pc p ] ++ | None -> pprintf pc "~%p" patt p ] + ; + + EXTEND_PRINTER _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
