From b5e38f8515ae977a9e95b36b845ddd3a92c3012f Mon Sep 17 00:00:00 2001 From: TomIO Date: Wed, 16 Apr 2025 11:16:38 +0200 Subject: [PATCH 1/6] enhance(main/glow): ship completions and man page - chore: clean up build script - fix: `RECOMMENDS` -> `SUGGESTS` --- packages/glow/build.sh | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/packages/glow/build.sh b/packages/glow/build.sh index dc2d664808f2d9..e47140da9e9fde 100644 --- a/packages/glow/build.sh +++ b/packages/glow/build.sh @@ -3,25 +3,36 @@ TERMUX_PKG_DESCRIPTION="Render markdown on the CLI, with pizzazz!" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="2.1.0" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/charmbracelet/glow/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=f1875a73ed81e5d8e6c81443e9a9d18bd9d1489c563c9fa2ff5425f2f8e2af6f +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_AUTO_UPDATE=true -TERMUX_PKG_RECOMMENDS=git +TERMUX_PKG_SUGGESTS=git -termux_step_make() { +termux_step_pre_configure() { termux_setup_golang +} - cd "$TERMUX_PKG_SRCDIR" - +termux_step_make() { mkdir -p "${TERMUX_PKG_BUILDDIR}/src/github.com/charmbracelet" - cp -a "${TERMUX_PKG_SRCDIR}" "${TERMUX_PKG_BUILDDIR}/src/github.com/charmbracelet/glow" - cd "${TERMUX_PKG_BUILDDIR}/src/github.com/charmbracelet/glow" - go get -d -v + go get -v go build } termux_step_make_install() { - install -Dm700 ${TERMUX_PKG_BUILDDIR}/src/github.com/charmbracelet/glow/glow \ - $TERMUX_PREFIX/bin/glow + mkdir -p "${TERMUX_PREFIX}/share/man/man1" + mkdir -p "${TERMUX_PREFIX}/share/zsh/site-functions" + mkdir -p "${TERMUX_PREFIX}/share/fish/vendor_completions.d" + mkdir -p "${TERMUX_PREFIX}/share/bash-completion/completions" + + # borrowed from packages/gh + unset GOOS GOARCH CGO_LDFLAGS + unset CC CXX CFLAGS CXXFLAGS LDFLAGS + go run . man > "${TERMUX_PREFIX}/share/man/man1/${TERMUX_PKG_NAME}.1" + go run . completion zsh > "${TERMUX_PREFIX}/share/zsh/site-functions/_${TERMUX_PKG_NAME}" + go run . completion bash > "${TERMUX_PREFIX}/share/bash-completion/completions/${TERMUX_PKG_NAME}" + go run . completion fish > "${TERMUX_PREFIX}/share/fish/vendor_completions.d/${TERMUX_PKG_NAME}.fish" + install -Dm700 glow "$TERMUX_PREFIX/bin/glow" } From ce15cb9784b2284ab5266cf7992e2a750f166519 Mon Sep 17 00:00:00 2001 From: TomIO Date: Wed, 16 Apr 2025 11:16:38 +0200 Subject: [PATCH 2/6] fix(main/openssh): `RECOMMENDS` -> `SUGGESTS` --- packages/openssh/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/openssh/build.sh b/packages/openssh/build.sh index e40cdd07b65984..b2cad164138d2a 100644 --- a/packages/openssh/build.sh +++ b/packages/openssh/build.sh @@ -3,11 +3,12 @@ TERMUX_PKG_DESCRIPTION="Secure shell for logging into a remote machine" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_MAINTAINER="Joshua Kahn @TomJo2000" TERMUX_PKG_VERSION="10.0p2" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/openssh/openssh-portable/archive/refs/tags/V_$(sed 's/\./_/g; s/p/_P/g' <<< $TERMUX_PKG_VERSION).tar.gz TERMUX_PKG_SHA256=a25b32645dc6b474064b9deb07afc9d8e37b127d026a1170b54feb929145140c TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="krb5, ldns, libandroid-support, libedit, openssh-sftp-server, openssl, termux-auth, zlib" -TERMUX_PKG_RECOMMENDS="termux-services" +TERMUX_PKG_SUGGESTS="termux-services" TERMUX_PKG_CONFLICTS="dropbear" # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. From 198d313491e466b8ed92b85fd0cb1f3c5b57cf25 Mon Sep 17 00:00:00 2001 From: TomIO Date: Wed, 16 Apr 2025 11:16:38 +0200 Subject: [PATCH 3/6] fix(main/transmission): `RECOMMENDS` -> `SUGGESTS` --- packages/transmission/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/transmission/build.sh b/packages/transmission/build.sh index 4e9e44818e81d9..56b769435faaa2 100644 --- a/packages/transmission/build.sh +++ b/packages/transmission/build.sh @@ -5,14 +5,14 @@ TERMUX_PKG_LICENSE="GPL-2.0, GPL-3.0" TERMUX_PKG_LICENSE_FILE="COPYING, licenses/gpl-2.0.txt, licenses/gpl-3.0.txt" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="4.0.6" -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=git+https://github.com/transmission/transmission TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_TAG_TYPE="latest-release-tag" TERMUX_PKG_UPDATE_VERSION_REGEXP="\d+\.\d+\.\d+" TERMUX_PKG_GIT_BRANCH=$TERMUX_PKG_VERSION TERMUX_PKG_DEPENDS="libc++, libcurl, libevent, libpsl, miniupnpc, natpmpc, openssl" -TERMUX_PKG_RECOMMENDS="jackett" +TERMUX_PKG_SUGGESTS="jackett" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DENABLE_GTK=OFF -DENABLE_QT=OFF From cb7fc3906d77817f3dee479cf3f020e9ffc93719 Mon Sep 17 00:00:00 2001 From: TomIO Date: Wed, 16 Apr 2025 11:16:38 +0200 Subject: [PATCH 4/6] fix(main/w3m): `RECOMMENDS` -> `SUGGESTS` --- packages/w3m/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/w3m/build.sh b/packages/w3m/build.sh index 50aa2c422abe32..994d292dbf1c62 100644 --- a/packages/w3m/build.sh +++ b/packages/w3m/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_MAINTAINER="@termux" _MAJOR_VERSION=0.5.3 _MINOR_VERSION=20230121 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.${_MINOR_VERSION} -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 # The upstream w3m project is dead, but every linux distribution uses # this maintained fork in debian: TERMUX_PKG_SRCURL=https://github.com/tats/w3m/archive/v${_MAJOR_VERSION}+git${_MINOR_VERSION}.tar.gz @@ -15,8 +15,7 @@ TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_METHOD=repology TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_DEPENDS="libgc, ncurses, openssl, zlib" -TERMUX_PKG_RECOMMENDS="libsixel" -TERMUX_PKG_SUGGESTS="perl" +TERMUX_PKG_SUGGESTS="libsixel, perl" # ac_cv_func_bcopy=yes to avoid w3m defining it's own bcopy function, which # breaks 64-bit builds where NDK headers define bcopy as a macro: From 6f75bbf3fe6bf07909a75c41b0413e38db594052 Mon Sep 17 00:00:00 2001 From: TomIO Date: Wed, 16 Apr 2025 11:16:38 +0200 Subject: [PATCH 5/6] fix(x11/qbittorrent): `RECOMMENDS` -> `SUGGESTS` --- x11-packages/qbittorrent/build.sh | 4 +++- x11-packages/qbittorrent/qbittorrent-nox.subpackage.sh | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/x11-packages/qbittorrent/build.sh b/x11-packages/qbittorrent/build.sh index 4fc8dcf4618ebd..5cbabe57c98131 100644 --- a/x11-packages/qbittorrent/build.sh +++ b/x11-packages/qbittorrent/build.sh @@ -3,11 +3,13 @@ TERMUX_PKG_DESCRIPTION="A Qt6 based BitTorrent client" TERMUX_PKG_LICENSE="GPL-2.0, GPL-3.0" TERMUX_PKG_MAINTAINER="Joshua Kahn @TomJo2000" TERMUX_PKG_VERSION="5.0.5" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/qbittorrent/qBittorrent/archive/refs/tags/release-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=79b030565fa392a6bc267b24f538d7b8e762f607ee734b3d459b19c61c168b73 TERMUX_PKG_BUILD_DEPENDS="qt6-qtsvg, qt6-qttools, boost" TERMUX_PKG_DEPENDS="libc++, libtorrent-rasterbar, openssl, qt6-qtbase, zlib" -TERMUX_PKG_RECOMMENDS="jackett, python" +TERMUX_PKG_RECOMMENDS="python" +TERMUX_PKG_SUGGESTS="jackett" TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_TAG_TYPE=newest-tag TERMUX_PKG_UPDATE_VERSION_REGEXP='\d+\.\d+\.\d+' diff --git a/x11-packages/qbittorrent/qbittorrent-nox.subpackage.sh b/x11-packages/qbittorrent/qbittorrent-nox.subpackage.sh index cfe9c977f46dd9..4ddfebf8d01945 100644 --- a/x11-packages/qbittorrent/qbittorrent-nox.subpackage.sh +++ b/x11-packages/qbittorrent/qbittorrent-nox.subpackage.sh @@ -2,4 +2,5 @@ TERMUX_SUBPKG_DEPEND_ON_PARENT=false TERMUX_SUBPKG_INCLUDE='bin/qbittorrent-nox share/man/man1/qbittorrent-nox.1.gz' TERMUX_SUBPKG_DESCRIPTION='A Qt6 based BitTorrent client - headless version' TERMUX_SUBPKG_DEPENDS='libc++, libtorrent-rasterbar, openssl, qt6-qtbase, zlib' -TERMUX_SUBPKG_RECOMMENDS="jackett, python" +TERMUX_SUBPKG_RECOMMENDS="python" +TERMUX_SUBPKG_SUGGESTS="jackett" From 3fb9da0896c9b79a44ecef9818f20307f9a4186c Mon Sep 17 00:00:00 2001 From: TomIO Date: Wed, 16 Apr 2025 11:16:38 +0200 Subject: [PATCH 6/6] fix(x11/transmission-gtk): `RECOMMENDS` -> `SUGGESTS` --- x11-packages/transmission-gtk/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-packages/transmission-gtk/build.sh b/x11-packages/transmission-gtk/build.sh index 2c8383cdad9215..27efcb0a876dbc 100644 --- a/x11-packages/transmission-gtk/build.sh +++ b/x11-packages/transmission-gtk/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_LICENSE="GPL-2.0, GPL-3.0" TERMUX_PKG_LICENSE_FILE="COPYING, licenses/gpl-2.0.txt, licenses/gpl-3.0.txt" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="4.0.6" -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=git+https://github.com/transmission/transmission TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_TAG_TYPE="latest-release-tag" @@ -14,7 +14,7 @@ TERMUX_PKG_GIT_BRANCH=$TERMUX_PKG_VERSION TERMUX_PKG_DEPENDS="glib, gtk3, gtkmm3, libatkmm-1.6, libc++, libcairomm-1.0, libcurl, libevent, libglibmm-2.4, libpangomm-1.4, libpsl, libsigc++-2.0, miniupnpc, natpmpc, openssl" TERMUX_PKG_CONFLICTS="transmission" TERMUX_PKG_REPLACES="transmission" -TERMUX_PKG_RECOMMENDS="jackett" +TERMUX_PKG_SUGGESTS="jackett" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DENABLE_GTK=ON -DENABLE_QT=OFF