bump(main/libpluto): 0.9.5

termux · Oct 23, 2024 · 64dbd7f · 64dbd7f
1 parent 1c872b3
commit 64dbd7f
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 35 deletions.
diff --git a/packages/libpluto/build.sh b/packages/libpluto/build.sh
@@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://plutolang.github.io/
 TERMUX_PKG_DESCRIPTION="Shared library for the Pluto interpreter"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="Komo @cattokomo"
-TERMUX_PKG_VERSION="0.9.4"
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_VERSION="0.9.5"
 TERMUX_PKG_SRCURL=https://github.com/PlutoLang/Pluto/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=6a4fae052a9ad47e29a6767047c3e55ab5c887486d14e39248657ff43b45875c
+TERMUX_PKG_SHA256=31e223267e302c9b90425f39ada421b63706ee48ab00ec710ad883f05bfe57e1
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="libc++"
 TERMUX_PKG_BUILD_DEPENDS="readline"

diff --git a/packages/libpluto/scripts-common.php.patch b/packages/libpluto/scripts-common.php.patch
@@ -1,7 +1,4 @@
-diff --git a/scripts/common.php b/scripts/common.php
-index 66ea1d0..de32c6c 100644
---- a/scripts/common.php
-+++ b/scripts/common.php
++++ ./scripts/common.php
 @@ -44,12 +44,20 @@ function check_compiler()
  			}
  		}

diff --git a/packages/libpluto/scripts-link_pluto.php.patch b/packages/libpluto/scripts-link_pluto.php.patch
@@ -1,7 +1,4 @@
-diff --git a/scripts/link_pluto.php b/scripts/link_pluto.php
-index 8501821..a733c3a 100644
---- a/scripts/link_pluto.php
-+++ b/scripts/link_pluto.php
++++ ./scripts/link_pluto.php
 @@ -3,7 +3,7 @@ require __DIR__."/common.php";
  check_compiler();
 

diff --git a/packages/libpluto/scripts-link_shared.php.patch b/packages/libpluto/scripts-link_shared.php.patch
@@ -1,7 +1,4 @@
-diff --git a/scripts/link_shared.php b/scripts/link_shared.php
-index d2a6553..4de5ce5 100644
---- a/scripts/link_shared.php
-+++ b/scripts/link_shared.php
++++ ./scripts/link_shared.php
 @@ -3,7 +3,7 @@ require __DIR__."/common.php";
  check_compiler();
 

diff --git a/packages/libpluto/src-loslib.cpp.patch b/packages/libpluto/src-loslib.cpp.patch
@@ -1,7 +1,4 @@
-diff --git a/src/loslib.cpp b/src/loslib.cpp
-index e496940..3e4cb3d 100644
---- a/src/loslib.cpp
-+++ b/src/loslib.cpp
++++ ./src/loslib.cpp
 @@ -111,10 +111,10 @@
 
  #include <unistd.h>

diff --git a/packages/libpluto/src-luaconf.h.patch b/packages/libpluto/src-luaconf.h.patch
@@ -1,7 +1,4 @@
-diff --git a/src/luaconf.h b/src/luaconf.h
-index 5c80b94..1affdec 100644
---- a/src/luaconf.h
-+++ b/src/luaconf.h
++++ ./src/luaconf.h
 @@ -221,7 +221,7 @@
 
  #else			/* }{ */

diff --git a/packages/libpluto/src-vendor-Soup-build_common.php.patch b/packages/libpluto/src-vendor-Soup-build_common.php.patch
@@ -1,12 +1,9 @@
-diff --git a/src/vendor/Soup/build_common.php b/src/vendor/Soup/build_common.php
-index 3f0a7f4..8845a4b 100644
---- a/src/vendor/Soup/build_common.php
-+++ b/src/vendor/Soup/build_common.php
++++ ./src/vendor/Soup/build_common.php
 @@ -1,6 +1,6 @@
  <?php
  // Config
--$clang = "clang -std=c++17 -fno-rtti -DSOUP_USE_INTRIN -O3";
-+$clang = getenv("CXX")." -std=c++17 -fno-rtti -DSOUP_USE_INTRIN -O3";
+-$clang = $argv[1] ?? "clang";
++$clang = getenv("CXX");
+ $clang .= " -std=c++17 -fno-rtti -DSOUP_USE_INTRIN -O3";
  if (defined("PHP_WINDOWS_VERSION_MAJOR"))
  {
- 	$clang .= " -D_CRT_SECURE_NO_WARNINGS";
diff --git a/packages/libpluto/src-vendor-Soup-build_lib.php.patch b/packages/libpluto/src-vendor-Soup-build_lib.php.patch
@@ -1,8 +1,5 @@
-diff --git a/src/vendor/Soup/build_lib.php b/src/vendor/Soup/build_lib.php
-index e32b4ab..cab4f07 100644
---- a/src/vendor/Soup/build_lib.php
-+++ b/src/vendor/Soup/build_lib.php
-@@ -28,11 +28,11 @@ foreach(scandir(__DIR__."/soup") as $file)
++++ ./src/vendor/Soup/build_lib.php
+@@ -28,11 +28,11 @@
  }
  if(is_dir(__DIR__."/Intrin"))
  {

diff --git a/packages/libpluto/src-vendor-Soup-soup-base.hpp.patch b/packages/libpluto/src-vendor-Soup-soup-base.hpp.patch
@@ -0,0 +1,10 @@
++++ ./src/vendor/Soup/soup/base.hpp
+@@ -97,7 +97,7 @@
+ 	#define SOUP_X86 false
+ #endif
+
+-#if defined(__arm__) || defined(__aarch64__) || defined(_M_ARM) || defined(_M_ARM64)
++#if defined(__aarch64__) || defined(_M_ARM) || defined(_M_ARM64)
+ 	#define SOUP_ARM true
+ #else
+ 	#define SOUP_ARM false