[arch-commits] Commit in haxe/trunk (PKGBUILD)

[Alexander Rødseth]

    Date: Wednesday, August 24, 2022 @ 11:49:18
  Author: arodseth
Revision: 1276105

upgpkg: haxe 4.2.5-1

Modified:
  haxe/trunk/PKGBUILD

----------+
 PKGBUILD |   25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-24 11:30:08 UTC (rev 1276104)
+++ PKGBUILD	2022-08-24 11:49:18 UTC (rev 1276105)
@@ -1,22 +1,22 @@
 # Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
+# Contributor: Andy Li <andy at onthewings.net>
 # Contributor: Daichi Shinozaki <dsdseg at gmail.com>
-# Contributor: Andy Li <andy at onthewings.net>
 # Contributor: Kyle Brady  <kyle at spark-gap dot com>
 # Contributor: Patrick Hof <courts at offensivethinking.org>
 # Contributor: Michael Fellinger <mf at rubyists.com>
 
 pkgname=haxe
-pkgver=4.2.4
-pkgrel=2
+pkgver=4.2.5
+pkgrel=1
 pkgdesc='Cross-platform toolkit and programming language'
 arch=(x86_64)
 url='https://haxe.org/'
 license=(GPL LGPL MIT)
 depends=(neko mbedtls)
-makedepends=(camlp5 dune git neko ocaml opam zlib perl-string-shellquote perl-ipc-system-simple)
+makedepends=(camlp5 git neko ocaml opam zlib perl-string-shellquote perl-ipc-system-simple)
 optdepends=(java-environment mono php python)
 options=(!strip)
-source=("$pkgname-$pkgver::git+https://github.com/HaxeFoundation/haxe#commit=ab0c0548ff80fcbbbc140a381a9031af13b5782c") # tag: 4.2.4
+source=("$pkgname-$pkgver::git+https://github.com/HaxeFoundation/haxe#commit=e5eec3122454bfc95412437d938d1d8d3e77ed68") # tag: 4.2.5
 b2sums=('SKIP')
 
 prepare() {
@@ -25,11 +25,11 @@
 
   # Prepare opam and ocamlfind before building
   export HOME="$srcdir"
-  opam init -a --disable-sandboxing
+  opam init -a --disable-sandboxing --compiler=ocaml-system
   eval $(opam env)
 
   # Install required OCaml packages
-  opam install -y extlib jbuilder luv ocamlfind ppx_tools_versioned ptmap sedlex sha xml-light
+  opam install -y extlib luv ocamlfind ptmap sedlex sha xml-light
 
   # Create the script that will be placed in /etc/profile.d
   echo 'export HAXE_STD_PATH=/usr/share/haxe/std' > haxe.sh
@@ -36,12 +36,8 @@
 }
 
 build() {
-  # Needed to make Haxe build with OCaml 4.06 and 4.07
-  # For more info, see: https://github.com/HaxeFoundation/haxe/issues/6883#issuecomment-370142073
-  export OCAMLPARAM='safe-string=0,_'
-
   # Prepare opam and ocamlfind before building
-  eval $(opam env)
+  eval $(opam env --switch=ocaml-system)
 
   cd $pkgname-$pkgver
   make libs haxe
@@ -54,8 +50,9 @@
 }
 
 check() {
-  $pkgname-$pkgver/haxe -version
-  $pkgname-$pkgver/haxelib version
+  cd $pkgname-$pkgver
+  ./haxe -version
+  ./haxelib version
 }
 
 package() {