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

[Alexander Rødseth]

    Date: Tuesday, February 9, 2021 @ 21:52:10
  Author: arodseth
Revision: 851762

upgpkg: haxe 4.2.0-1

Modified:
  haxe/trunk/PKGBUILD

----------+
 PKGBUILD |   37 +++++++++++--------------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-02-09 21:51:42 UTC (rev 851761)
+++ PKGBUILD	2021-02-09 21:52:10 UTC (rev 851762)
@@ -6,8 +6,8 @@
 # Contributor: Michael Fellinger <mf at rubyists.com>
 
 pkgname=haxe
-pkgver=4.1.5
-pkgrel=2
+pkgver=4.2.0
+pkgrel=1
 pkgdesc='Cross-platform toolkit and programming language'
 arch=(x86_64)
 url='https://haxe.org/'
@@ -17,35 +17,22 @@
 makedepends=(camlp4 git neko ocaml opam zlib perl-string-shellquote perl-ipc-system-simple)
 provides=(haxe haxelib)
 options=(!makeflags !strip)
-source=("$pkgname-$pkgver::git+https://github.com/HaxeFoundation/haxe#commit=5e33a78aad9a6733f4aa3a4b99f7c14555523a36") # tag: 4.1.5
-sha256sums=('SKIP')
+source=("$pkgname-$pkgver::git+https://github.com/HaxeFoundation/haxe#commit=bfcbf809165b3b3df0bce4833bd90a7539f2ae56") # tag: 4.2.0
+sha256sums=(SKIP)
 
 prepare() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   git submodule update --init
 
-  # Patch the OCaml source files to use "Stdlib." instead of "Pervasives." (deprecated)
-  find . -name "*.ml" -type f -exec sed -i "s/Pervasives\./Stdlib./g" {} \;
-
   # Prepare opam and ocamlfind before building
   export HOME="$srcdir"
   opam init -a
   eval $(opam env)
 
-  # Install two ocaml packages that are used for building later on
-  opam install -y dune jbuilder
+  # Install required OCaml packages
+  opam install -y camlp5 dune extlib jbuilder luv ocamlfind ppx_tools_versioned ptmap sedlex sha xml-light
 
-  # Download and patch the sha package
-  opam install -y sha || true
-  find . -name "*.ml" -type f -exec sed -i "s/Pervasives\./Stdlib./g" {} \;
-
-  # Build and install the modified sha package
-  CCACHE_DISABLE=1 opam install -b --inplace-build --reuse-build-dir -y sha
-
-  # Install the other dependencies
-  opam install -y ocamlfind camlp5 sedlex ppx_tools_versioned xml-light extlib ptmap
-
-  # Create the script that is intended for /etc/profile.d
+  # Create the script that will be placed in /etc/profile.d/
   echo 'export HAXE_STD_PATH=/usr/share/haxe/std' > "$srcdir/haxe.sh"
 }
 
@@ -57,7 +44,7 @@
   # Prepare opam and ocamlfind before building
   eval $(opam env)
 
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make libs haxe
 
   # "make tools" did not work. These are the replacement commands:
@@ -68,8 +55,8 @@
 }
 
 check() {
-  "$pkgname-$pkgver/haxe" -version
-  "$pkgname-$pkgver/haxelib" version
+  $pkgname-$pkgver/haxe -version
+  $pkgname-$pkgver/haxelib version
 }
 
 package() {
@@ -80,5 +67,3 @@
     "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
   install -Dm 644 "$srcdir/haxe.sh" "$pkgdir/etc/profile.d/haxe.sh"
 }
-
-# vim: ts=2 sw=2 et: