Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
fornwall committed Dec 19, 2024
2 parents 0c6a8f8 + b36c712 commit 7ecc560
Show file tree
Hide file tree
Showing 15 changed files with 55 additions and 60 deletions.
4 changes: 2 additions & 2 deletions packages/cloudflared/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/cloudflare/cloudflared
TERMUX_PKG_DESCRIPTION="A tunneling daemon that proxies traffic from the Cloudflare network to your origins"
TERMUX_PKG_LICENSE="Apache-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="2024.12.1"
TERMUX_PKG_VERSION="2024.12.2"
TERMUX_PKG_SRCURL=https://github.com/cloudflare/cloudflared/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=74794fbcdd7b71131799100d493cf70a8e126cb109f3d9e2abce55593df6a737
TERMUX_PKG_SHA256=48b9c54d79419d0489baadb8cb54d5196e0ff17650fb9eff81de02989fa8b009
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_BUILD_IN_SRC=true

Expand Down
4 changes: 2 additions & 2 deletions packages/elixir/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://elixir-lang.org/
TERMUX_PKG_DESCRIPTION="Elixir is a dynamic, functional language designed for building scalable and maintainable applications"
TERMUX_PKG_LICENSE="Apache-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="1.17.3"
TERMUX_PKG_VERSION="1.18.0"
_ERLANG_MAJOR_VERSION=$(. "$TERMUX_SCRIPTDIR"/packages/erlang/build.sh; echo "${TERMUX_PKG_VERSION%%.*}")
TERMUX_PKG_SRCURL=https://github.com/elixir-lang/elixir/releases/download/v${TERMUX_PKG_VERSION}/elixir-otp-${_ERLANG_MAJOR_VERSION}.zip
TERMUX_PKG_SHA256=379d4d0e8215112b4a3904db1bec1ee93108c36010c81926814c741f241a3d9a
TERMUX_PKG_SHA256=3270d620a0f90dfcb150205cf894b994a1c830dd7c804151afde09b072e1c80f
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_DEPENDS="dash, erlang"
TERMUX_PKG_SUGGESTS="clang, make"
Expand Down
4 changes: 2 additions & 2 deletions packages/goose/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://pressly.github.io/goose
TERMUX_PKG_DESCRIPTION="A database migration tool. Supports SQL migrations and Go functions."
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="3.23.1"
TERMUX_PKG_VERSION="3.24.0"
TERMUX_PKG_SRCURL="https://github.com/pressly/goose/archive/v${TERMUX_PKG_VERSION}.tar.gz"
TERMUX_PKG_SHA256=0db063acea1ebc6fd205159028dab8bcdcb731e82fdeb4c6d4b2383783a16edf
TERMUX_PKG_SHA256=f7dd8dee34a6a5b3797a519f0c9ebf9afe0bd43faf04c94c87b03e41090de954
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_AUTO_UPDATE=true

Expand Down
9 changes: 6 additions & 3 deletions packages/libxau/build.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
# X11 package
TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
TERMUX_PKG_DESCRIPTION="X11 authorisation library"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=1.0.11
TERMUX_PKG_VERSION="1.0.12"
TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libXau-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=f3fa3282f5570c3f6bd620244438dbfbdd580fc80f02f549587a0f8ab329bbeb
TERMUX_PKG_SHA256=74d0e4dfa3d39ad8939e99bda37f5967aba528211076828464d2777d477fc0fb
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_BUILD_DEPENDS="xorgproto"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--disable-static
"
11 changes: 7 additions & 4 deletions packages/libxrender/build.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
# X11 package
TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
TERMUX_PKG_DESCRIPTION="X Rendering Extension client library"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=0.9.11
TERMUX_PKG_VERSION="0.9.12"
TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libXrender-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=bc53759a3a83d1ff702fb59641b3d2f7c56e05051fa0cfa93501166fa782dc24
TERMUX_PKG_SHA256=b832128da48b39c8d608224481743403ad1691bf4e554e4be9c174df171d1b97
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_DEPENDS="libx11"
TERMUX_PKG_BUILD_DEPENDS="xorgproto"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-malloc0returnsnull"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--disable-static
--enable-malloc0returnsnull
"
4 changes: 2 additions & 2 deletions packages/minio/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://min.io/
TERMUX_PKG_DESCRIPTION="Multi-Cloud Object Storage"
TERMUX_PKG_LICENSE="AGPL-V3"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="2024.12.13.22.19.12"
TERMUX_PKG_VERSION="2024.12.18.13.15.44"
_VERSION=$(sed 's/\./T/3;s/\./-/g' <<< $TERMUX_PKG_VERSION)
TERMUX_PKG_SRCURL=https://github.com/minio/minio/archive/refs/tags/RELEASE.${_VERSION}Z.tar.gz
TERMUX_PKG_SHA256=1ce743e5400479c5ed9db127319653d65fe3314ca8bacfb119625dfdc206d206
TERMUX_PKG_SHA256=d7d044f11a343389b1952c48a3e15feef6efa63c67b9f025c212a04016f05037
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_UPDATE_VERSION_SED_REGEXP='s/T/-/g;s/[^0-9-]//g;s/-/./g'
TERMUX_PKG_DEPENDS="resolv-conf"
Expand Down
4 changes: 2 additions & 2 deletions packages/o-editor/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/xyproto/o
TERMUX_PKG_DESCRIPTION="Small, fast and limited text editor"
TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_MAINTAINER="Alexander F. Rødseth <[email protected]>"
TERMUX_PKG_VERSION="2.68.5"
TERMUX_PKG_VERSION="2.68.6"
TERMUX_PKG_SRCURL=https://github.com/xyproto/o/archive/v$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=d9eea18c482248d725a478e8f57f5e99e08ef756b9f70312edc4ea0f7d21a194
TERMUX_PKG_SHA256=36510204d12f607dff6952ab80ee4fcad1cd5be873a41d2c8006a47ea5d9ebe9
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_BREAKS="o"
TERMUX_PKG_REPLACES="o"
Expand Down
4 changes: 2 additions & 2 deletions packages/ruff/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="An extremely fast Python linter, written in Rust"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_LICENSE_FILE="../../LICENSE"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="0.8.3"
TERMUX_PKG_VERSION="0.8.4"
TERMUX_PKG_SRCURL="https://github.com/charliermarsh/ruff/archive/refs/tags/$TERMUX_PKG_VERSION.tar.gz"
TERMUX_PKG_SHA256=ff00bb1ca1a9de60aed3965d671c6a3d448a87a9016ba6d6b3a396760422bc25
TERMUX_PKG_SHA256=f48c9e2479e72957ce5dfd3d0cc9d27f5aeb36d15ae2f97c9c116fc5c742dc5d
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_BUILD_IN_SRC=true

Expand Down
22 changes: 0 additions & 22 deletions packages/taskwarrior/0001-libcxx-18-sort.patch

This file was deleted.

6 changes: 4 additions & 2 deletions packages/taskwarrior/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,18 @@ TERMUX_PKG_HOMEPAGE=https://taskwarrior.org
TERMUX_PKG_DESCRIPTION="Utility for managing your TODO list"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="3.2.0"
TERMUX_PKG_VERSION="3.3.0"
TERMUX_PKG_SRCURL=https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v${TERMUX_PKG_VERSION}/task-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=1a543ba373a319f924a2242c8e0db9dac2691c4cf654c2d0c6827a06b3b32592
TERMUX_PKG_SHA256=7fd1e3571f673679758f001b5f44963eee59fd0d2cac887a5807cf2fd90856a1
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_DEPENDS="libc++, libgnutls, libuuid"
TERMUX_CMAKE_BUILD="Unix Makefiles"

termux_step_pre_configure() {
termux_setup_rust

CXXFLAGS+=" -Wno-c++11-narrowing"

if [ "$TERMUX_ARCH" = "arm" ]; then
# See https://cmake.org/cmake/help/latest/variable/CMAKE_ANDROID_ARM_MODE.html
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DCMAKE_ANDROID_ARM_MODE=ON"
Expand Down
4 changes: 2 additions & 2 deletions packages/vtm/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Terminal multiplexer with TUI window manager and multi-p
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_LICENSE_FILE="LICENSE"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="0.9.99.57"
TERMUX_PKG_VERSION="0.9.99.58"
TERMUX_PKG_SRCURL=https://github.com/netxs-group/vtm/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=33cb13c60f0e709f661f9dfb289cf5ec0c192899417c772f34c6118b6900a0a5
TERMUX_PKG_SHA256=05e410529413b7405ee15574c22f7ce3d210a0d3797bdfa1d30e365650aeeb9a
TERMUX_PKG_DEPENDS="libc++"
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_AUTO_UPDATE=true
Expand Down
6 changes: 3 additions & 3 deletions x11-packages/libxcvt/build.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# X11 package
TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
TERMUX_PKG_DESCRIPTION="A Library to generate VESA CVT standard timing modelines"
TERMUX_PKG_LICENSE="MIT, HPND"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=0.1.2
TERMUX_PKG_VERSION="0.1.3"
TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libxcvt-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=0561690544796e25cfbd71806ba1b0d797ffe464e9796411123e79450f71db38
TERMUX_PKG_SHA256=a929998a8767de7dfa36d6da4751cdbeef34ed630714f2f4a767b351f2442e01
TERMUX_PKG_AUTO_UPDATE=true
11 changes: 7 additions & 4 deletions x11-packages/libxshmfence/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
TERMUX_PKG_DESCRIPTION="A library that exposes a event API on top of Linux futexes"
TERMUX_PKG_LICENSE="HPND"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=1.3.2
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION="1.3.3"
TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libxshmfence-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=870df257bc40b126d91b5a8f1da6ca8a524555268c50b59c0acd1a27f361606f
TERMUX_PKG_SHA256=d4a4df096aba96fea02c029ee3a44e11a47eb7f7213c1a729be83e85ec3fde10
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_BUILD_DEPENDS="xorgproto, xorg-util-macros"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-futex"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--disable-futex
--disable-static
"
11 changes: 7 additions & 4 deletions x11-packages/libxv/build.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
# X11 package
TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
TERMUX_PKG_DESCRIPTION="Library for the X Video (Xv) extension to the X Window System"
TERMUX_PKG_LICENSE="HPND"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=1.0.12
TERMUX_PKG_VERSION="1.0.13"
TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libXv-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=aaf7fa09f689f7a2000fe493c0d64d1487a1210db154053e9e2336b860c63848
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-malloc0returnsnull"
TERMUX_PKG_SHA256=7d34910958e1c1f8d193d828fea1b7da192297280a35437af0692f003ba03755
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_DEPENDS="libx11, libxext"
TERMUX_PKG_BUILD_DEPENDS="xorgproto"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--disable-static
--enable-malloc0returnsnull
"
11 changes: 7 additions & 4 deletions x11-packages/libxxf86vm/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
TERMUX_PKG_DESCRIPTION="X11 XFree86 video mode extension library"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=1.1.5
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION="1.1.6"
TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libXxf86vm-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=247fef48b3e0e7e67129e41f1e789e8d006ba47dba1c0cdce684b9b703f888e7
TERMUX_PKG_SHA256=96af414c73ce1d5449ad04be7f9f27fa8330f844b6dda843ef22e3e1befb3ee3
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_DEPENDS="libx11, libxext"
TERMUX_PKG_BUILD_DEPENDS="xorgproto, xorg-util-macros"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-malloc0returnsnull"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--disable-static
--enable-malloc0returnsnull
"

0 comments on commit 7ecc560

Please sign in to comment.