Skip to content

Commit c1d2d0c

Browse files
Benjamin-LoisonBenjamin-Loison
authored
Merge branch 'master' into up-to-date
2 parents a268a0a + 197270b commit c1d2d0c

114 files changed

Lines changed: 1541 additions & 268 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/package_updates.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ on:
1414
- 'packages/**'
1515
- 'root-packages/**'
1616
- 'x11-packages/**'
17+
schedule:
18+
- cron: "0 */6 * * *"
1719
workflow_dispatch:
1820
inputs:
1921
packages:

‎build-package.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ for (( i=0; i < ${#PACKAGE_LIST[@]}; i++ )); do
660660
if [[ "$TERMUX_BUILD_IGNORE_LOCK" != "true" ]]; then
661661
flock -n 5 || termux_error_exit "Another build is already running within same environment."
662662
fi
663-
663+
(
664664
# Handle 'all' arch:
665665
if [[ "$TERMUX_ON_DEVICE_BUILD" == "false" && -n "${TERMUX_ARCH+x}" && "${TERMUX_ARCH}" == 'all' ]]; then
666666
_SELF_ARGS=()
@@ -791,6 +791,7 @@ for (( i=0; i < ${#PACKAGE_LIST[@]}; i++ )); do
791791
fi
792792
termux_add_package_to_built_packages_list "$TERMUX_PKG_NAME"
793793
termux_step_finish_build
794+
) 5>&-
794795
) 5< "$TERMUX_BUILD_LOCK_FILE"
795796
done
796797

‎packages/apache-orc/build.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://orc.apache.org/
22
TERMUX_PKG_DESCRIPTION="Columnar storage for Hadoop workloads"
33
TERMUX_PKG_LICENSE="Apache-2.0"
44
TERMUX_PKG_MAINTAINER="@termux"
5-
TERMUX_PKG_VERSION="2.2.2"
5+
TERMUX_PKG_VERSION="2.3.0"
66
TERMUX_PKG_SRCURL=https://dlcdn.apache.org/orc/orc-${TERMUX_PKG_VERSION}/orc-${TERMUX_PKG_VERSION}.tar.gz
7-
TERMUX_PKG_SHA256=4214bfc8e01316305e915a3bd7d2675bf3b95d79243aa5fb6c471ea0765add8e
7+
TERMUX_PKG_SHA256=6c9e2f6663ac9ef34ca4ae5ae4f004a651e5fe31f2e05b6eb5d99d105091d87c
88
TERMUX_PKG_AUTO_UPDATE=true
99
TERMUX_PKG_UPDATE_METHOD=repology
1010
TERMUX_PKG_DEPENDS="libc++, liblz4, libprotobuf, libsnappy, zlib, zstd"

‎packages/clamav/build.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.clamav.net/
22
TERMUX_PKG_DESCRIPTION="Anti-virus toolkit for Unix"
33
TERMUX_PKG_LICENSE="GPL-2.0"
44
TERMUX_PKG_MAINTAINER="@termux"
5-
TERMUX_PKG_VERSION="1.5.1"
5+
TERMUX_PKG_VERSION="1.5.2"
66
TERMUX_PKG_SRCURL="https://www.clamav.net/downloads/production/clamav-$TERMUX_PKG_VERSION.tar.gz"
7-
TERMUX_PKG_SHA256=64fe4a16a5622c1d71efe9ed7f2c2fbd37f8f237da9f11ff66b73038df71db91
7+
TERMUX_PKG_SHA256=f34018cf22f05bdd9d1a1574ca07193e3e030ca52050c3e5c220e23a32314965
88
TERMUX_PKG_AUTO_UPDATE=true
99
TERMUX_PKG_DEPENDS="json-c, libandroid-support, libbz2, libc++, libcurl, libiconv, libxml2, ncurses, openssl, pcre2, zlib"
1010
TERMUX_PKG_BREAKS="clamav-dev"

‎packages/cmake/Modules-Compiler-Clang.cmake.patch‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Fixes
2+
clang++: error: invalid linker name in argument '-fuse-ld=gold'
3+
in
4+
pip install levenshtein
5+
Termux does not have ld.gold anymore
6+
7+
--- a/Modules/Compiler/Clang.cmake
8+
+++ b/Modules/Compiler/Clang.cmake
9+
@@ -81,10 +81,6 @@ else()
10+
set(CMAKE_${lang}_COMPILE_OPTIONS_IPO "-flto")
11+
endif()
12+
13+
- if(ANDROID AND NOT CMAKE_ANDROID_NDK_VERSION VERSION_GREATER_EQUAL "22")
14+
- # https://github.com/android-ndk/ndk/issues/242
15+
- set(CMAKE_${lang}_LINK_OPTIONS_IPO "-fuse-ld=gold")
16+
- endif()
17+
18+
if(ANDROID OR __is_apple_clang)
19+
set(__ar "${CMAKE_AR}")

‎packages/cmake/build.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ TERMUX_PKG_LICENSE_FILE="LICENSE.rst"
55
TERMUX_PKG_MAINTAINER="@termux"
66
# When updating version here, please update termux_setup_cmake.sh as well.
77
TERMUX_PKG_VERSION="4.2.3"
8-
TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:3}/cmake-${TERMUX_PKG_VERSION}.tar.gz
8+
TERMUX_PKG_REVISION=1
9+
TERMUX_PKG_SRCURL="https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:3}/cmake-${TERMUX_PKG_VERSION}.tar.gz"
910
TERMUX_PKG_SHA256=7efaccde8c5a6b2968bad6ce0fe60e19b6e10701a12fce948c2bf79bac8a11e9
1011
TERMUX_PKG_AUTO_UPDATE=true
1112
TERMUX_PKG_DEPENDS="libarchive, libc++, libcurl, libexpat, jsoncpp, libuv, rhash, zlib"
@@ -23,7 +24,8 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
2324
-DCMAKE_USE_SYSTEM_LIBRHASH=ON
2425
-DCMAKE_USE_SYSTEM_LIBUV=ON
2526
-DCMAKE_USE_SYSTEM_ZLIB=ON
26-
-DBUILD_CursesDialog=ON"
27+
-DBUILD_CursesDialog=ON
28+
"
2729

2830
termux_pkg_auto_update() {
2931
local TERMUX_SETUP_CMAKE="${TERMUX_SCRIPTDIR}/scripts/build/setup/termux_setup_cmake.sh"

‎packages/codon/build.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ TERMUX_PKG_LICENSE="Apache-2.0"
44
TERMUX_PKG_LICENSE_FILE="LICENSE"
55
TERMUX_PKG_MAINTAINER="@termux"
66
_LLVM_VERSION=20.1.7
7-
TERMUX_PKG_VERSION="0.19.5"
7+
TERMUX_PKG_VERSION="0.19.6"
88
TERMUX_PKG_SRCURL=(
99
https://github.com/exaloop/codon/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz
1010
https://github.com/exaloop/codon/releases/download/v$TERMUX_PKG_VERSION/codon-linux-x86_64.tar.gz
1111
https://github.com/exaloop/llvm-project/archive/refs/tags/codon-$_LLVM_VERSION.tar.gz
1212
)
1313
TERMUX_PKG_SHA256=(
14-
e4bb2b21390bad2dab0010a9885aaf9ee9cdd9029ec3009197786f8fd610d6a4
15-
6df4a1c62ed31ef5d8351f4016a8ec0cac77420c10967a0148e53bad5357a5a0
14+
e33deefaf7ff3518c838db22d92b31f28cff4675a7ece70b79d5d31be1ce7420
15+
38befce9eb87244698014b1fbe56a4102660120f1b82b3c7777c2a98c109770a
1616
09df072c95628d9f59f67e0ad309bd3f4387f8cb06ae115f78c496c34f2c1e98
1717
)
1818
TERMUX_PKG_DEPENDS="libc++, libxml2, zlib, zstd"

‎packages/cookcli/build.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="A suite of tools to create shopping lists and maintain f
33
TERMUX_PKG_LICENSE="MIT"
44
TERMUX_PKG_LICENSE_FILE="LICENSE"
55
TERMUX_PKG_MAINTAINER="@termux"
6-
TERMUX_PKG_VERSION="0.23.0"
6+
TERMUX_PKG_VERSION="0.24.0"
77
TERMUX_PKG_SRCURL=https://github.com/cooklang/cookcli/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
8-
TERMUX_PKG_SHA256=1c978015c0cf1ae424d7e329a8fd54e9efed2509cd500507ee9b13876aa60456
8+
TERMUX_PKG_SHA256=e632e67690516256f0f5b6d643a8018b4fb48fd5d5aaf79ede4826ca33008c99
99
TERMUX_PKG_BUILD_IN_SRC=true
1010
TERMUX_PKG_AUTO_UPDATE=true
1111

‎packages/delve/build.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/go-delve/delve
22
TERMUX_PKG_DESCRIPTION="A debugger for the Go programming language"
33
TERMUX_PKG_LICENSE="MIT"
44
TERMUX_PKG_MAINTAINER="Krishna kanhaiya @kcubeterm"
5-
TERMUX_PKG_VERSION="1.26.0"
5+
TERMUX_PKG_VERSION="1.26.1"
66
TERMUX_PKG_DEPENDS="golang, git"
77
TERMUX_PKG_SRCURL=https://github.com/go-delve/delve/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
8-
TERMUX_PKG_SHA256=80c69d5bbfd80350fdf2022395877c013d14397f099c729b9f44b94d62d127ea
8+
TERMUX_PKG_SHA256=16bc1b7ae9277e109d4a8c3c607aa676ebd2ce07fd5fe44d4f4ac83fc12f9c20
99
TERMUX_PKG_AUTO_UPDATE=true
1010
TERMUX_PKG_EXCLUDED_ARCHES="arm, i686"
1111

‎packages/erlang/build.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.erlang.org/
22
TERMUX_PKG_DESCRIPTION="General-purpose concurrent functional programming language"
33
TERMUX_PKG_LICENSE="Apache-2.0"
44
TERMUX_PKG_MAINTAINER="@termux"
5-
TERMUX_PKG_VERSION="28.3.3"
5+
TERMUX_PKG_VERSION="28.4"
66
TERMUX_PKG_SRCURL=https://github.com/erlang/otp/archive/refs/tags/OTP-$TERMUX_PKG_VERSION.tar.gz
7-
TERMUX_PKG_SHA256=f4749bfb2f9d26acd1fda9496ae802b98dc0337d54b030c2354ea819366b7f5c
7+
TERMUX_PKG_SHA256=45d70c5f0cf0657db467fbe9dfeb07568787786a9c4f9adcedec3b17668f83e8
88
TERMUX_PKG_AUTO_UPDATE=true
99
TERMUX_PKG_UPDATE_VERSION_REGEXP='^OTP-[\d.]+$'
1010
TERMUX_PKG_DEPENDS="libc++, openssl, ncurses, zlib"

0 commit comments

Comments
 (0)