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

[Alexander Rødseth]

    Date: Wednesday, September 16, 2020 @ 13:34:52
  Author: arodseth
Revision: 708029

upgpkg: haxe 4.1.4-1

Modified:
  haxe/trunk/PKGBUILD
Deleted:
  haxe/trunk/haxe.sh

----------+
 PKGBUILD |   20 ++++++++++----------
 haxe.sh  |    1 -
 2 files changed, 10 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-16 13:25:40 UTC (rev 708028)
+++ PKGBUILD	2020-09-16 13:34:52 UTC (rev 708029)
@@ -6,7 +6,7 @@
 # Contributor: Michael Fellinger <mf at rubyists.com>
 
 pkgname=haxe
-pkgver=4.1.3
+pkgver=4.1.4
 pkgrel=1
 pkgdesc='Cross-platform toolkit and programming language'
 arch=(x86_64)
@@ -13,14 +13,12 @@
 url='https://haxe.org/'
 license=(GPL MIT LGPL)
 depends=(neko)
-optdepends=(python php java-environment mono)
-makedepends=(git ocaml camlp4 zlib neko opam)
+optdepends=(java-environment mono php python)
+makedepends=(camlp4 git neko ocaml opam zlib)
 provides=(haxe haxelib)
-options=(!strip !makeflags)
-source=("$pkgname-$pkgver::git+https://github.com/HaxeFoundation/haxe.git#commit=c7d2c7aac5f8d280d694e46fc1c9de52e218b9c6" # tag: 4.1.3
-        haxe.sh)
-sha256sums=('SKIP'
-            'da08272cf61872f3401ad8b9f0bf94a4b2bfbaeb7b65644ee822f4ac8aaaed10')
+options=(!makeflags !strip)
+source=("$pkgname-$pkgver::git+https://github.com/HaxeFoundation/haxe#commit=7d0faa039ffe5e618587e2417323b59044282177") # tag: 4.1.4
+sha256sums=('SKIP')
 
 prepare() {
   cd "$pkgname-$pkgver"
@@ -39,8 +37,7 @@
 
   # Download and patch the sha package
   opam install -y sha || true
-  find . -name "*.ml" -type f \
-    -exec sed -i "s/Pervasives\./Stdlib./g" {} \;
+  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
@@ -47,6 +44,9 @@
 
   # 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
+  echo 'export HAXE_STD_PATH=/usr/share/haxe/std' > "$srcdir/haxe.sh"
 }
 
 build() {

Deleted: haxe.sh
===================================================================
--- haxe.sh	2020-09-16 13:25:40 UTC (rev 708028)
+++ haxe.sh	2020-09-16 13:34:52 UTC (rev 708029)
@@ -1 +0,0 @@
-export HAXE_STD_PATH=/usr/share/haxe/std