diff options
| author | Matěj Grabovský | 2021-03-01 12:31:00 +0100 |
|---|---|---|
| committer | Matěj Grabovský | 2021-03-01 12:31:00 +0100 |
| commit | 4d31e77a789b839a4a7a37d97ea7b2bd674366c7 (patch) | |
| tree | 4807e7197cc5d0456931ee985461af4f4bbfd163 | |
| parent | 1947ade0ad74a6b420d0a5deb718744b7b0fcb3b (diff) | |
| download | aur-4d31e77a789b839a4a7a37d97ea7b2bd674366c7.tar.gz | |
Update to 2.3
Also, remove Pervasives patch and move docs under /usr/share/doc.
| -rw-r--r-- | .SRCINFO | 16 | ||||
| -rw-r--r-- | PKGBUILD | 26 | ||||
| -rw-r--r-- | fix-pervasives.patch | 21 |
3 files changed, 17 insertions, 46 deletions
@@ -1,24 +1,20 @@ # Generated by mksrcinfo v8 -# Mon Jul 6 17:52:02 UTC 2020 +# Mon Mar 1 11:30:16 UTC 2021 pkgbase = ocaml-sedlex pkgdesc = Unicode-friendly OCaml lexer generator - pkgver = 2.2 + pkgver = 2.3 pkgrel = 1 url = https://github.com/ocaml-community/sedlex arch = i686 arch = x86_64 license = MIT - depends = ocaml>=4.02.3 + depends = ocaml>=4.04 depends = ocaml-gen - depends = ocaml-migrate-parsetree - depends = ocaml-ppx_tools_versioned>=5.2.3 - depends = ocaml-uchar + depends = ocaml-ppxlib>=0.18.0 options = !strip options = !makeflags - source = https://github.com/alainfrisch/sedlex/archive/v2.2.tar.gz - source = fix-pervasives.patch - sha256sums = de5459c98568cd1e2b96e8af61e428015d7f6650a1c0ec362d538d0874730841 - sha256sums = 39dcebebc8946c4cd192bd2662167b59f6e492e7394973bbea7ef23560e26f9d + source = https://github.com/alainfrisch/sedlex/archive/v2.3.tar.gz + sha256sums = f9b090eb5e583b40b0ce89f15b94e87bdc933b5652c7afc0b652a6ae227a0f58 pkgname = ocaml-sedlex @@ -1,28 +1,18 @@ # Maintainer: Matej Grabovsky <matej.grabovsky at gmail> # Contributor: Daniel Peukert <dan.peukert@gmail.com> pkgname=ocaml-sedlex -pkgver=2.2 +pkgver=2.3 pkgrel=1 pkgdesc='Unicode-friendly OCaml lexer generator' license=('MIT') arch=('i686' 'x86_64') url='https://github.com/ocaml-community/sedlex' -depends=('ocaml>=4.02.3' +depends=('ocaml>=4.04' 'ocaml-gen' - 'ocaml-migrate-parsetree' - 'ocaml-ppx_tools_versioned>=5.2.3' - 'ocaml-uchar') -source=("https://github.com/alainfrisch/sedlex/archive/v${pkgver}.tar.gz" - 'fix-pervasives.patch') + 'ocaml-ppxlib>=0.18.0') +source=("https://github.com/alainfrisch/sedlex/archive/v${pkgver}.tar.gz") options=(!strip !makeflags) -sha256sums=('de5459c98568cd1e2b96e8af61e428015d7f6650a1c0ec362d538d0874730841' - '39dcebebc8946c4cd192bd2662167b59f6e492e7394973bbea7ef23560e26f9d') - -prepare() { - cd "$srcdir/${pkgname/ocaml-/}-$pkgver" - - patch --forward -p1 < "$srcdir/fix-pervasives.patch" -} +sha256sums=('f9b090eb5e583b40b0ce89f15b94e87bdc933b5652c7afc0b652a6ae227a0f58') build() { cd "$srcdir/${pkgname/ocaml-/}-$pkgver" @@ -40,7 +30,13 @@ package() { cd "$srcdir/${pkgname/ocaml-/}-$pkgver" DESTDIR="$pkgdir" dune install --prefix /usr --libdir lib/ocaml --release + + install -dm755 "$pkgdir/usr/share/doc/$pkgname" + mv "$pkgdir/usr/doc/sedlex/"* "$pkgdir/usr/share/doc/$pkgname/" + rm -r "$pkgdir/usr/doc/" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + ln -sf "$pkgdir/usr/share/doc/$pkgname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } # vim:set et sw=4 sts=4 et: diff --git a/fix-pervasives.patch b/fix-pervasives.patch deleted file mode 100644 index df0c6cc991fa..000000000000 --- a/fix-pervasives.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/generator/gen_unicode.ml.inc b/src/generator/gen_unicode.ml.inc -index 44106a1..78415fc 100644 ---- a/src/generator/gen_unicode.ml.inc -+++ b/src/generator/gen_unicode.ml.inc -@@ -77,14 +77,14 @@ let split list n = - - let print_elements ch hashtbl = - let cats = -- List.sort_uniq Pervasives.compare -+ List.sort_uniq compare - (Hashtbl.fold (fun cat _ l -> cat::l) hashtbl []) - in - let len = List.length cats in - List.iter (fun c -> - let entries = - List.map (fun (b,e) -> Printf.sprintf "0x%x, 0x%x" b e) -- (List.sort_uniq Pervasives.compare -+ (List.sort_uniq compare - (Hashtbl.find_all hashtbl c)) - in - let entries = |