diff options
| author | Daniel Peukert | 2024-05-29 23:25:33 +0200 |
|---|---|---|
| committer | Daniel Peukert | 2024-05-29 23:25:33 +0200 |
| commit | 6cdcec79b89aaed47926e2d188771cdbc6ec3310 (patch) | |
| tree | 6dbcdf18f202d15e41ed350e33fad4a3544fc7c3 | |
| parent | a6727d237a4fd5e898e4922aaee66e110faefbce (diff) | |
| download | aur-6cdcec79b89aaed47926e2d188771cdbc6ec3310.tar.gz | |
Get rid of unnecessary ocaml shims
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | PKGBUILD | 19 | ||||
| -rw-r--r-- | remove-result-dep.diff | 23 |
3 files changed, 43 insertions, 8 deletions
@@ -1,7 +1,7 @@ pkgbase = ocaml-mew pkgdesc = A general modal editing engine generator pkgver = 0.1.0 - pkgrel = 8 + pkgrel = 9 url = https://github.com/kandu/mew arch = x86_64 arch = aarch64 @@ -9,12 +9,13 @@ pkgbase = ocaml-mew checkdepends = ocaml-ppx_expect makedepends = git makedepends = dune>=1.1.0 - depends = ocaml>=4.02.3 - depends = ocaml-result + depends = ocaml>=4.03.0 depends = ocaml-trie options = !strip source = ocaml-mew-0.1.0::git+https://github.com/kandu/mew#commit=e2a5ca84d9c3c4142a47ef867b2bbc44083246c5?signed + source = remove-result-dep.diff validpgpkeys = 364216C4466A9E17A97CD5DBEECA66966D9E4261 - sha512sums = ddd64148ac9e746b03d96fa08505fe2b56d290703bbeb5658043c8a057222ff11bc61c188de6c6c42692e780e9a2b39019ff87e3ab2379bfc369f79f7827cf1e + b2sums = 8c70dce7f77bb7644d036dfeea03386bc23111573b7efef3fe80d486cb43ead33e6a7fe59c6c42b4663bbc01139708b2c37b8c420b5bdb0d85d41acef51e331b + b2sums = d8655aa2975030649c8115bbe1920be3764f9eba31205ff998a690e48839b4289747e057220be62713b521e57afde380dcc5ee52ad127458bd22bce6642e9c07 pkgname = ocaml-mew @@ -3,21 +3,32 @@ _projectname='mew' pkgname="ocaml-$_projectname" pkgver='0.1.0' _commit='e2a5ca84d9c3c4142a47ef867b2bbc44083246c5' -pkgrel='8' +pkgrel='9' pkgdesc='A general modal editing engine generator' arch=('x86_64' 'aarch64') url="https://github.com/kandu/$_projectname" license=('MIT') -depends=('ocaml>=4.02.3' 'ocaml-result' 'ocaml-trie') +depends=('ocaml>=4.03.0' 'ocaml-trie') makedepends=('git' 'dune>=1.1.0') checkdepends=('ocaml-ppx_expect') options=('!strip') -source=("$pkgname-$pkgver::git+$url#commit=$_commit?signed") -sha512sums=('ddd64148ac9e746b03d96fa08505fe2b56d290703bbeb5658043c8a057222ff11bc61c188de6c6c42692e780e9a2b39019ff87e3ab2379bfc369f79f7827cf1e') +source=( + "$pkgname-$pkgver::git+$url#commit=$_commit?signed" + 'remove-result-dep.diff' +) +b2sums=('8c70dce7f77bb7644d036dfeea03386bc23111573b7efef3fe80d486cb43ead33e6a7fe59c6c42b4663bbc01139708b2c37b8c420b5bdb0d85d41acef51e331b' + 'd8655aa2975030649c8115bbe1920be3764f9eba31205ff998a690e48839b4289747e057220be62713b521e57afde380dcc5ee52ad127458bd22bce6642e9c07') validpgpkeys=('364216C4466A9E17A97CD5DBEECA66966D9E4261') # ZAN DoYe <zandoye@gmail.com> (https://github.com/kandu.gpg) _sourcedirectory="$pkgname-$pkgver" +prepare() { + cd "$srcdir/$_sourcedirectory/" + + # Remove result dependency, as we're always running on OCaml >= 4.03.0 + patch --forward -p1 < '../remove-result-dep.diff' +} + build() { cd "$srcdir/$_sourcedirectory/" dune build --release --verbose diff --git a/remove-result-dep.diff b/remove-result-dep.diff new file mode 100644 index 000000000000..46bde75299ea --- /dev/null +++ b/remove-result-dep.diff @@ -0,0 +1,23 @@ +diff --git a/mew.opam b/mew.opam +index a12a0ec..5362848 100644 +--- a/mew.opam ++++ b/mew.opam +@@ -10,7 +10,6 @@ build: [ + ] + depends: [ + "ocaml" {>= "4.02.3"} +- "result" + "trie" + "dune" {>= "1.1.0"} + ] +diff --git a/src/dune b/src/dune +index 3725251..fd967c6 100644 +--- a/src/dune ++++ b/src/dune +@@ -1,5 +1,5 @@ + (library + (name mew) + (public_name mew) +- (libraries result trie) ++ (libraries trie) + (flags (:standard -safe-string))) |