From 83a6bd827ae7ed6bb1bbba749671a3fa87a7ab82 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 22 Feb 2020 14:00:29 +0100 Subject: [PATCH 01/19] ocaml: update to 4.10.0. We use --disable-force-safe-string else just too much stuff breaks. --- .../patches/ocaml-4.08.0-elfv2-ppc64.patch | 40 +++++++++---------- srcpkgs/ocaml/template | 6 +-- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/srcpkgs/ocaml/patches/ocaml-4.08.0-elfv2-ppc64.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-elfv2-ppc64.patch index 144a555322a..65a6cea92ad 100644 --- a/srcpkgs/ocaml/patches/ocaml-4.08.0-elfv2-ppc64.patch +++ b/srcpkgs/ocaml/patches/ocaml-4.08.0-elfv2-ppc64.patch @@ -9,8 +9,8 @@ | "ppc64le" -> ELF64v2 | _ -> assert false ---- ocaml-4.08.0/runtime/power.S -+++ ocaml-4.08.0/runtime/power.S +--- ocaml-4.10.0/runtime/power.S ++++ ocaml-4.10.0/runtime/power.S @@ -13,7 +13,7 @@ /* */ /**************************************************************************/ @@ -20,7 +20,7 @@ .abiversion 2 #endif -@@ -41,8 +41,7 @@ +@@ -52,8 +52,7 @@ #define TRAP_PREVIOUS_OFFSET 4 #define CALLBACK_LINK_SIZE 16 #define CALLBACK_LINK_OFFSET 0 @@ -30,7 +30,7 @@ #define RESERVED_STACK 48 #define PARAM_SAVE_AREA (8*8) #define LR_SAVE 16 -@@ -53,8 +52,7 @@ +@@ -64,8 +63,7 @@ #define TRAP_PREVIOUS_OFFSET 64 #define CALLBACK_LINK_SIZE 32 #define CALLBACK_LINK_OFFSET 48 @@ -40,7 +40,7 @@ #define RESERVED_STACK 32 #define PARAM_SAVE_AREA 0 #define LR_SAVE 16 -@@ -80,9 +78,8 @@ +@@ -91,9 +89,8 @@ #define ENDFUNCTION(name) \ .size name, . - name @@ -51,7 +51,7 @@ #define FUNCTION(name) \ .section ".opd","aw"; \ .align 3; \ -@@ -96,9 +93,8 @@ +@@ -107,9 +104,8 @@ #define ENDFUNCTION(name) \ .size name, . - .L.name @@ -62,33 +62,33 @@ #define FUNCTION(name) \ .section ".text"; \ .globl name; \ -@@ -157,7 +153,7 @@ +@@ -151,7 +147,7 @@ - #endif + #define Caml_state(var) 8*domain_field_caml_##var(28) -#if defined(MODEL_ppc64) +#if _CALL_ELF == 1 .section ".opd","aw" #else .section ".text" -@@ -338,14 +334,14 @@ FUNCTION(caml_c_call) +@@ -332,14 +328,14 @@ #if defined(MODEL_ppc) - mtctr 28 + mtctr C_CALL_FUN bctrl -#elif defined(MODEL_ppc64) +#elif _CALL_ELF == 1 - ld 0, 0(28) - mr 26, 2 /* save current TOC in a callee-save register */ + ld 0, 0(C_CALL_FUN) + mr C_CALL_TOC, 2 /* save current TOC in a callee-save register */ mtctr 0 - ld 2, 8(28) + ld 2, 8(C_CALL_FUN) bctrl - mr 2, 26 /* restore current TOC */ + mr 2, C_CALL_TOC /* restore current TOC */ -#elif defined(MODEL_ppc64le) +#elif _CALL_ELF == 2 - mtctr 28 - mr 12, 28 - mr 26, 2 /* save current TOC in a callee-save register */ -@@ -514,14 +510,14 @@ FUNCTION(caml_start_program) + mtctr C_CALL_FUN + mr 12, C_CALL_FUN + mr C_CALL_TOC, 2 /* save current TOC in a callee-save register */ +@@ -515,14 +511,14 @@ #if defined(MODEL_ppc) mtctr 12 .L105: bctrl @@ -105,9 +105,9 @@ mtctr 12 std 2, TOC_SAVE(1) .L105: bctrl -@@ -634,7 +630,7 @@ FUNCTION(caml_callback3_exn) +@@ -641,7 +637,7 @@ b .L102 - ENDFUNCTION(caml_callback3_exn) + ENDFUNCTION(caml_callback3_asm) -#if defined(MODEL_ppc64) +#if _CALL_ELF == 1 diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template index 04858c4dd45..613e47c9547 100644 --- a/srcpkgs/ocaml/template +++ b/srcpkgs/ocaml/template @@ -1,9 +1,9 @@ # Template file for 'ocaml' pkgname=ocaml -version=4.09.0 +version=4.10.0 revision=1 build_style="gnu-configure" -configure_args="--with-pic" +configure_args="--with-pic --disable-force-safe-string" make_build_target="world.opt" makedepends="ncurses-devel libX11-devel" short_desc="Main implementation of the Caml language" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="QPL-1.0, LGPL-2.1-only" homepage="http://ocaml.org/" distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz" -checksum=a7bc044167e7d09f8e3ea84b88ec9d81392908ecdac861d3d5015e5f0fc496a3 +checksum=58bae0f0a79daf86ec755a173e593fef4ef588f15c6185993af88ceb9722bc39 nocross=yes patch_args="-Np1" From 3b525f1fe7ddc28d7d1a996b1f0c1e0ee15bdab9 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 22 Feb 2020 14:00:53 +0100 Subject: [PATCH 02/19] ocamlbuild: rebuild for ocaml-4.10.0. --- srcpkgs/ocamlbuild/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ocamlbuild/template b/srcpkgs/ocamlbuild/template index b5db3a6d844..6eb827ff68e 100644 --- a/srcpkgs/ocamlbuild/template +++ b/srcpkgs/ocamlbuild/template @@ -1,7 +1,7 @@ # Template file for 'ocamlbuild' pkgname=ocamlbuild version=0.14.0 -revision=3 +revision=4 build_style=gnu-makefile make_build_args="PREFIX=/usr" make_install_args="PREFIX=/usr" From a97320a6040115f2d09e8c2585c20f0f403545b7 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 22 Feb 2020 14:01:22 +0100 Subject: [PATCH 03/19] ocaml-num: rebuild for ocaml-4.10.0. --- srcpkgs/ocaml-num/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ocaml-num/template b/srcpkgs/ocaml-num/template index ecc76e5eb6e..8f72890d27f 100644 --- a/srcpkgs/ocaml-num/template +++ b/srcpkgs/ocaml-num/template @@ -1,7 +1,7 @@ # Template file for 'ocaml-num' pkgname=ocaml-num version=1.3 -revision=1 +revision=2 build_style=gnu-makefile makedepends="ocaml ocaml-findlib" make_install_target="findlib-install" From 1f27d49c08ca81d614f6dd462f446313a8d64a77 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 22 Feb 2020 14:02:16 +0100 Subject: [PATCH 04/19] ocaml-findlib: rebuild for ocaml-4.10.0. --- srcpkgs/ocaml-findlib/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template index c2f9d246dc2..a97ebe84e59 100644 --- a/srcpkgs/ocaml-findlib/template +++ b/srcpkgs/ocaml-findlib/template @@ -1,7 +1,7 @@ # Template file for 'ocaml-findlib' pkgname=ocaml-findlib version=1.8.1 -revision=2 +revision=3 build_style=configure configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man" make_build_args="all opt" From 21a9c5861bedd370dba9bbc646feea84ed6193a2 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 22 Feb 2020 14:02:34 +0100 Subject: [PATCH 05/19] supermin: rebuild for ocaml-4.10.0. --- srcpkgs/supermin/template | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/srcpkgs/supermin/template b/srcpkgs/supermin/template index 126ee0d8ccd..ecc5ae28ef8 100644 --- a/srcpkgs/supermin/template +++ b/srcpkgs/supermin/template @@ -1,7 +1,7 @@ # Template file for 'supermin' pkgname=supermin version=5.1.20 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="ocaml ocaml-findlib pkg-config e2fsprogs cpio perl" makedepends="e2fsprogs-devel" @@ -13,5 +13,3 @@ homepage="http://people.redhat.com/~rjones/supermin/" distfiles="http://libguestfs.org/download/supermin/supermin-${version}.tar.gz" checksum=9f0e2f277b118bbfe66fbe276028123e0befbf8696108b0255207a916338eff6 nocross=yes - -export OCAMLPARAM="safe-string=0,_" From 3e4f70e94a86bd4353db32183ab2018f7326e742 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 22 Feb 2020 14:08:41 +0100 Subject: [PATCH 06/19] ocaml-zarith: rebuild for ocaml-4.10.0. --- srcpkgs/ocaml-zarith/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ocaml-zarith/template b/srcpkgs/ocaml-zarith/template index 353005ac9b7..426e4894155 100644 --- a/srcpkgs/ocaml-zarith/template +++ b/srcpkgs/ocaml-zarith/template @@ -1,7 +1,7 @@ # Template file for 'ocaml-zarith' pkgname=ocaml-zarith version=1.9.1 -revision=1 +revision=2 wrksrc="Zarith-release-${version}" build_style=configure make_check_target="tests" From 41c97fe58baeb90e133262c68bce39ef7a12cdf4 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 22 Feb 2020 14:08:53 +0100 Subject: [PATCH 07/19] z3: rebuild for ocaml-4.10.0. --- srcpkgs/z3/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template index d7b9058096c..c8520555752 100644 --- a/srcpkgs/z3/template +++ b/srcpkgs/z3/template @@ -1,7 +1,7 @@ # Template file for 'z3' pkgname=z3 version=4.8.7 -revision=2 +revision=3 wrksrc="${pkgname}-${pkgname}-${version}" build_style=configure configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)" From c411138693c69d19f4c378673a86043499c5f78f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 22 Feb 2020 14:11:26 +0100 Subject: [PATCH 08/19] opam: rebuild for ocaml-4.10.0. --- srcpkgs/opam/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template index 989a6afac1a..c3b8edbf092 100644 --- a/srcpkgs/opam/template +++ b/srcpkgs/opam/template @@ -1,7 +1,7 @@ # Template file for 'opam' pkgname=opam version=2.0.6 -revision=1 +revision=2 build_style=gnu-configure configure_args="--docdir=/usr/share/doc/${pkgname}" make_build_args="lib-ext all" From dda0b1aa8b0b29d6dc6f44c9a2cbbbf439d00201 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 22 Feb 2020 14:14:58 +0100 Subject: [PATCH 09/19] camlp5: update to 7.11. --- srcpkgs/camlp5/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template index 09e214a685c..767ef17baae 100644 --- a/srcpkgs/camlp5/template +++ b/srcpkgs/camlp5/template @@ -1,7 +1,7 @@ # Template file for 'camlp5' pkgname=camlp5 -version=7.10 -revision=2 +version=7.11 +revision=1 build_style=configure configure_args="-mandir /usr/share/man" hostmakedepends="ocaml" @@ -13,7 +13,7 @@ distfiles="https://github.com/${pkgname}/${pkgname}/archive/rel${version//./}.ta wrksrc="camlp5-rel${version//./}" nocross=yes nopie=yes -checksum=83dff83d33ee9b70cd1b9d8d365db63a118201e5feb6aab49d9d3b1d62621784 +checksum=a048b8e0feb2a1058187824fc9cb6b55f2c5b788c43c15d6db090d789c7121ba post_install() { vinstall etc/META 0644 usr/lib/ocaml/camlp5 From b685bc1432a0b6a82e1993ff3f443f2416382003 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 22 Feb 2020 14:15:19 +0100 Subject: [PATCH 10/19] unison: rebuild for ocaml-4.10.0. --- srcpkgs/unison/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template index 0f561b50bc5..f93ac3aec79 100644 --- a/srcpkgs/unison/template +++ b/srcpkgs/unison/template @@ -1,7 +1,7 @@ # Template file for 'unison' pkgname="unison" version=2.51.2 -revision=4 +revision=5 hostmakedepends="ocaml" short_desc="A file-synchronization tool" maintainer="allan " @@ -10,7 +10,6 @@ homepage="http://www.cis.upenn.edu/~bcpierce/unison/" distfiles="https://github.com/bcpierce00/unison/archive/v${version}.tar.gz" checksum=a2efcbeab651be6df69cc9b253011a07955ecb91fb407a219719451197849d5e nocross=yes -export OCAMLPARAM="safe-string=0,_" do_build() { CFLAGS= make UISTYLE=text DEBUGGING=false THREADS=true From 8ef4985b8acb9fcc55adbf2edce430331a62c892 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 22 Feb 2020 14:24:12 +0100 Subject: [PATCH 11/19] polygen: rebuild for ocaml-4.10.0. --- srcpkgs/polygen/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/polygen/template b/srcpkgs/polygen/template index 0781c4b78ec..f36e9c8c008 100644 --- a/srcpkgs/polygen/template +++ b/srcpkgs/polygen/template @@ -1,7 +1,7 @@ # Template file for 'polygen' pkgname=polygen version=1.0.6.ds2 -revision=5 +revision=6 build_style=gnu-makefile build_wrksrc="src" hostmakedepends="ocaml unzip" From 8cf9cf137897f330a4d38ba4df0bbf5380eca54e Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 1 Mar 2020 14:11:52 +0100 Subject: [PATCH 12/19] ocaml-lablgtk2: update to 2.18.10. --- srcpkgs/ocaml-lablgtk2/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/ocaml-lablgtk2/template b/srcpkgs/ocaml-lablgtk2/template index 2bede4f1ce6..260aeddf528 100644 --- a/srcpkgs/ocaml-lablgtk2/template +++ b/srcpkgs/ocaml-lablgtk2/template @@ -1,19 +1,19 @@ # Template file for 'ocaml-lablgtk2' pkgname=ocaml-lablgtk2 -version=2.18.8 -revision=2 +version=2.18.10 +revision=1 wrksrc="lablgtk-${version}" build_style=gnu-configure configure_args="--without-glade --without-gnomeui --without-gtksourceview" make_build_args="world opt" -hostmakedepends="ocaml ocaml-findlib m4 camlp4 pkg-config" +hostmakedepends="ocaml ocaml-findlib m4 pkg-config" makedepends="gtk+-devel gtksourceview2-devel libgnomecanvas-devel gtkspell-devel" short_desc="OCaml interface to GTK2" maintainer="Tai Chi Minh Ralph Eastwood " license="LGPL-2.0-or-later" homepage="http://lablgtk.forge.ocamlcore.org/" -distfiles="https://github.com/garrigue/lablgtk/releases/download/lablgtk2188/lablgtk-${version}.tar.gz" -checksum=91f59bafd07989ea00080f4fd65512ce339878c7117bf5116bad3b93b64d4de3 +distfiles="https://github.com/garrigue/lablgtk/archive/${version}.tar.gz" +checksum=6f00f6b3114b468eb9e743d27511a6063936f6798f890e44b494f71a5cf95470 nocross=yes nopie=yes disable_parallel_build=yes From 580185244313f0ac8495798be3fd391da513ca0d Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 1 Mar 2020 14:23:35 +0100 Subject: [PATCH 13/19] coccinelle: rebuild for ocaml-4.10.0. --- srcpkgs/coccinelle/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/coccinelle/template b/srcpkgs/coccinelle/template index 507eb3fa3ac..20d0c536133 100644 --- a/srcpkgs/coccinelle/template +++ b/srcpkgs/coccinelle/template @@ -1,12 +1,12 @@ # Template file for 'coccinelle' pkgname=coccinelle version=1.0.8 -revision=1 +revision=3 build_style=gnu-configure configure_args="--without-pdflatex --enable-release --with-python=/usr/bin/python3" hostmakedepends="python3 automake libtool" -makedepends="ocaml ocaml-findlib ocaml-num camlp4 pcre-devel python3-devel" +makedepends="ocaml ocaml-findlib ocaml-num pcre-devel python3-devel" short_desc="Program matching and transformation engine" maintainer="Orphaned " license="GPL-2.0-only" @@ -17,7 +17,6 @@ checksum=9f994bf98bc88c333ac7a54a03d4fa1826122eec7016a1f22c6b2ef2a6a4347f export OCAMLPARAM="safe-string=0,_" disable_parallel_build=yes nocross=yes -conflicts="pfff" # /usr/bin/spatch pre_configure() { autoreconf -fi From 6f63f7a64f62ce56762f74af05c7325f1baceb68 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 1 Mar 2020 14:40:19 +0100 Subject: [PATCH 14/19] mldonkey: removed, upstream dead, does not work with OCaml 4.10 --- srcpkgs/mldonkey/template | 22 ---------------------- srcpkgs/mldonkey/update | 2 -- 2 files changed, 24 deletions(-) delete mode 100644 srcpkgs/mldonkey/template delete mode 100644 srcpkgs/mldonkey/update diff --git a/srcpkgs/mldonkey/template b/srcpkgs/mldonkey/template deleted file mode 100644 index f50e98fe950..00000000000 --- a/srcpkgs/mldonkey/template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'mldonkey' -pkgname=mldonkey -version=3.1.6 -revision=4 -_release="release-${version//./-}" -wrksrc="${pkgname}-${_release}" -build_style=gnu-configure -hostmakedepends="autoconf camlp4 ocaml ocamlbuild wget" -makedepends="bzip2-devel file-devel glib-devel ncurses-devel - ocaml-num zlib-devel" -depends="wget" -short_desc="Multi-platform, multi-network p2p daemon" -maintainer="Leah Neukirchen " -license="GPL-2" -homepage="http://mldonkey.sourceforge.net/" -distfiles="https://github.com/ygrek/${pkgname}/archive/${_release}.tar.gz" -checksum=632735d835c33d9815ae64aa8d4abb61b1bd8dd6c55ef66694f9254c97c2877d -nocross=yes -disable_parallel_build=yes -export OCAMLPARAM="safe-string=0,_" - -broken="ocaml 4.08" diff --git a/srcpkgs/mldonkey/update b/srcpkgs/mldonkey/update deleted file mode 100644 index 6e51dbf2aba..00000000000 --- a/srcpkgs/mldonkey/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://github.com/ygrek/mldonkey/releases" -pattern="release-\K[\d\-]*(?=\.tar\.gz)" From c1d2735520446f07076728de43d5305510915164 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 1 Mar 2020 14:41:41 +0100 Subject: [PATCH 15/19] wyrd: removed, upstream dead, does not work with OCaml 4.10 --- srcpkgs/wyrd/template | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 srcpkgs/wyrd/template diff --git a/srcpkgs/wyrd/template b/srcpkgs/wyrd/template deleted file mode 100644 index 2bdf69f9425..00000000000 --- a/srcpkgs/wyrd/template +++ /dev/null @@ -1,23 +0,0 @@ -# Template file for 'wyrd' -pkgname=wyrd -version=1.4.6 -revision=5 -build_style=gnu-configure -nocross="Tool ocamlmklib does not work well" -disable_parallel_build="Seems fragile, but uncertain if this is necessary." -hostmakedepends="ocaml camlp4" -makedepends="ncurses-devel" -depends="remind" -conf_files="/etc/wyrdrc" -short_desc="Ncurses front-end to Remind" -maintainer="Toyam Cox " -license="GPL-2.0-only" -homepage="http://pessimization.com/software/wyrd/" -distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz" -checksum=b2b51d6fb38f8b8b3ec30ee72093f791ba9b6fe35418191bc2011d2c8079997e -export OCAMLPARAM="safe-string=0,_" - -post_extract() { - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=868599 - sed -i 's/TERMINAL/TERMTYPE/' curses/configure -} From 8cc02e6169e1bea1300bf935dcb07bff7dd7cd7c Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 1 Mar 2020 14:42:27 +0100 Subject: [PATCH 16/19] verifast: removed, does not work with OCaml 4.10 --- srcpkgs/verifast/template | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 srcpkgs/verifast/template diff --git a/srcpkgs/verifast/template b/srcpkgs/verifast/template deleted file mode 100644 index 0d73b5e861f..00000000000 --- a/srcpkgs/verifast/template +++ /dev/null @@ -1,31 +0,0 @@ -# Template file for 'verifast' -pkgname=verifast -version=17.06 -revision=2 -build_style=gnu-makefile -make_build_args="-C src Z3V4DOT5=yes LD_LIBRARY_PATH=/usr/lib/ocaml/stublibs OCAMLCFLAGS=-unsafe-string build" -hostmakedepends="vala unzip ocaml ocaml-findlib m4 camlp4 pkg-config" -makedepends="ocaml-lablgtk2-gtksourceview2 ocaml-num z3-ocaml glib-devel gtksourceview2-devel" -short_desc="VeriFast code verifier in separation logic" -maintainer="Tai Chi Minh Ralph Eastwood " -license="MIT" -homepage="https://github.com/verifast" -distfiles="https://github.com/verifast/${pkgname}/archive/v${version}.tar.gz" -checksum=2cadc3d39730b5422373ebc642009d3efb84373a8fc61b1d51877063a1e4191a -nocross=yes - -broken="ocaml 4.08" - -do_install() { - vbin bin/verifast - vbin bin/vfide - vlicense LICENSE.md -} - -verifast-vfide_package() { - short_desc+=" - vfide" - depends="verifast>=${version}_${revision}" - pkg_install() { - vmove usr/bin/vfide - } -} From b9653207ff1d4aceff38b357f4e2705a010011e4 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 22 Feb 2020 14:11:35 +0100 Subject: [PATCH 17/19] camlp4: removed, obsolete, does not work with OCaml 4.10 --- srcpkgs/camlp4/patches/version-hack.patch | 11 --------- srcpkgs/camlp4/template | 27 ----------------------- srcpkgs/camlp4/update | 1 - 3 files changed, 39 deletions(-) delete mode 100644 srcpkgs/camlp4/patches/version-hack.patch delete mode 100644 srcpkgs/camlp4/template delete mode 100644 srcpkgs/camlp4/update diff --git a/srcpkgs/camlp4/patches/version-hack.patch b/srcpkgs/camlp4/patches/version-hack.patch deleted file mode 100644 index 34f7f48ff8c..00000000000 --- a/srcpkgs/camlp4/patches/version-hack.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig -+++ configure -@@ -39,7 +39,7 @@ - echo "The standalone Camlp4 requires OCaml >= 4.02." - echo "For previous versions of OCaml use the Camlp4 distributed with OCaml." - exit 2 --elif [ $major -ne 4 -o $minor -ne 8 ]; then -+elif [ $major -ne 4 -o $minor -ne 9 ]; then - echo "This version of Camlp4 is for OCaml 4.07 but you are using OCaml $ocaml_version." - if [ -d .git ] ; then - if [ $PINNED -eq 1 ] ; then diff --git a/srcpkgs/camlp4/template b/srcpkgs/camlp4/template deleted file mode 100644 index 64c324cb1a5..00000000000 --- a/srcpkgs/camlp4/template +++ /dev/null @@ -1,27 +0,0 @@ -# Template file for 'camlp4' -pkgname=camlp4 -version=4.08+1 -revision=2 -wrksrc="camlp4-${version/+/-}" -build_style=configure -hostmakedepends="ocaml ocamlbuild" -short_desc="Caml preprocessor and pretty-printer" -maintainer="Leah Neukirchen " -license="LGPL-2.0-only" -homepage="https://github.com/ocaml/camlp4" -distfiles="${homepage}/archive/${version}.tar.gz" -checksum=655cd3bdcafbf8435877f60f4b47dd2eb69feef5afd8881291ef01ba12bd9d88 -nocross=yes -nopie=yes - -do_build() { - make all camlp4/META -} - -do_install() { - make \ - BINDIR="$DESTDIR/usr/bin" \ - LIBDIR="$DESTDIR/usr/lib/ocaml" \ - PKGDIR="$DESTDIR/usr/lib/ocaml" \ - install install-META -} diff --git a/srcpkgs/camlp4/update b/srcpkgs/camlp4/update deleted file mode 100644 index 87f573d3999..00000000000 --- a/srcpkgs/camlp4/update +++ /dev/null @@ -1 +0,0 @@ -pattern="/archive/\K[\d.]+\+[\d]+(?=\.tar\.gz)" From 38b513423edefe8c0252dd205a57d802dbed0fe6 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 5 Apr 2020 17:13:21 +0200 Subject: [PATCH 18/19] coq: update to 8.11.1. --- srcpkgs/coq/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template index 29fb3eb73f5..95685736447 100644 --- a/srcpkgs/coq/template +++ b/srcpkgs/coq/template @@ -1,6 +1,6 @@ # Template file for 'coq' pkgname=coq -version=8.11.0 +version=8.11.1 revision=1 hostmakedepends="ocaml ocaml-findlib ocaml-num camlp5" short_desc="Proof assistant written in OCaml" @@ -8,7 +8,7 @@ maintainer="Leah Neukirchen " license="LGPL-2.1-only" homepage="https://coq.inria.fr" distfiles="https://github.com/coq/coq/archive/V${version}.tar.gz" -checksum=eea101eff5217dba6d11a8eb13033ed62acb4ee8a64d5cb15fd142e7fc5dc248 +checksum=994c9f5e0b1493c1682946f6154ef8853c9ddeb614902a7fa8403a3650d5377a nopie=yes nocross=yes From e9576d7b49c91d74a49e8ed41fd55fb8e35bc9f1 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 5 Apr 2020 17:13:47 +0200 Subject: [PATCH 19/19] mathcomp: rebuild for coq-8.11.1. --- srcpkgs/mathcomp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template index ac09e3cc6b2..b624f1da74d 100644 --- a/srcpkgs/mathcomp/template +++ b/srcpkgs/mathcomp/template @@ -1,7 +1,7 @@ # Template file for 'mathcomp' pkgname=mathcomp version=1.10.0 -revision=2 +revision=3 wrksrc="math-comp-mathcomp-${version}" build_wrksrc="mathcomp" build_style=gnu-makefile