From d3a7dd2b9c0dd4791a4358e598311edb03ed3c95 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Fri, 16 Dec 2022 18:12:30 +0000 Subject: [PATCH 001/244] bump(main/pocketbase): 0.10.0 This commit has been automatically submitted by Github Actions. --- packages/pocketbase/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/pocketbase/build.sh b/packages/pocketbase/build.sh index 2ca2174eba..0c36991515 100644 --- a/packages/pocketbase/build.sh +++ b/packages/pocketbase/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/pocketbase/pocketbase TERMUX_PKG_DESCRIPTION="An open source Go backend" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.9.2" +TERMUX_PKG_VERSION="0.10.0" TERMUX_PKG_SRCURL="https://github.com/pocketbase/pocketbase/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz" -TERMUX_PKG_SHA256=98d53344ff238ee377a4bc112b68087eaff126ecf6ff9059737c20ac7e4e5aef +TERMUX_PKG_SHA256=160e5b19b2ce515068877bcda24cb7a452fcb538aae644b42268f56ca0eb1c05 TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_AUTO_UPDATE=true From fe28a98aee6c7a556a9d8f5ea7c34ea379149951 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Fri, 16 Dec 2022 18:14:01 +0000 Subject: [PATCH 002/244] bump(main/restish): 0.15.2 This commit has been automatically submitted by Github Actions. --- packages/restish/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/restish/build.sh b/packages/restish/build.sh index 05febe86e3..d68a46e7ab 100644 --- a/packages/restish/build.sh +++ b/packages/restish/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="A CLI for interacting with REST-ish HTTP APIs" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_LICENSE_FILE="LICENSE.md" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.15.1" +TERMUX_PKG_VERSION="0.15.2" TERMUX_PKG_SRCURL="https://github.com/danielgtaylor/restish/archive/v$TERMUX_PKG_VERSION.tar.gz" -TERMUX_PKG_SHA256=17b09bceafd82ccecde05c6f41c8ad7432ca6fbd8c8b271847330014cecc64e2 +TERMUX_PKG_SHA256=098ecdd30fb2393627a50283518c9aa98686aa641d1c9bf37142f1541fd0f8c8 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true From 223ca7cc5e49d535ef7a4a5cbc1e66c83774b708 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Thu, 15 Dec 2022 12:08:38 +0900 Subject: [PATCH 003/244] qemu: Bump to 7.2.0 Include workaround for https://github.com/termux/termux-packages/issues/12261. --- .../0001-fix-hardcoded-paths.patch | 47 +-- .../0016-disable-signalfd.patch | 2 +- packages/qemu-system-x86-64-headless/build.sh | 31 +- .../qemu-7.2.0-linux-user-syscall.c.patch | 11 + .../setjmp-aarch64/private-bionic_asm.h | 94 ++++++ .../setjmp-aarch64/private-bionic_asm_arm64.h | 79 +++++ .../setjmp-aarch64/private-bionic_constants.h | 31 ++ .../setjmp-aarch64/setjmp.S | 295 ++++++++++++++++++ .../0001-fix-hardcoded-paths.patch | 47 +-- .../0016-disable-signalfd.patch | 2 +- x11-packages/qemu-system-x86-64/build.sh | 31 +- .../qemu-7.2.0-linux-user-syscall.c.patch | 11 + .../setjmp-aarch64/private-bionic_asm.h | 94 ++++++ .../setjmp-aarch64/private-bionic_asm_arm64.h | 79 +++++ .../setjmp-aarch64/private-bionic_constants.h | 31 ++ .../setjmp-aarch64/setjmp.S | 295 ++++++++++++++++++ 16 files changed, 1086 insertions(+), 94 deletions(-) create mode 100644 packages/qemu-system-x86-64-headless/qemu-7.2.0-linux-user-syscall.c.patch create mode 100644 packages/qemu-system-x86-64-headless/setjmp-aarch64/private-bionic_asm.h create mode 100644 packages/qemu-system-x86-64-headless/setjmp-aarch64/private-bionic_asm_arm64.h create mode 100644 packages/qemu-system-x86-64-headless/setjmp-aarch64/private-bionic_constants.h create mode 100644 packages/qemu-system-x86-64-headless/setjmp-aarch64/setjmp.S create mode 100644 x11-packages/qemu-system-x86-64/qemu-7.2.0-linux-user-syscall.c.patch create mode 100644 x11-packages/qemu-system-x86-64/setjmp-aarch64/private-bionic_asm.h create mode 100644 x11-packages/qemu-system-x86-64/setjmp-aarch64/private-bionic_asm_arm64.h create mode 100644 x11-packages/qemu-system-x86-64/setjmp-aarch64/private-bionic_constants.h create mode 100644 x11-packages/qemu-system-x86-64/setjmp-aarch64/setjmp.S diff --git a/packages/qemu-system-x86-64-headless/0001-fix-hardcoded-paths.patch b/packages/qemu-system-x86-64-headless/0001-fix-hardcoded-paths.patch index 021ac6b198..8405acd29c 100644 --- a/packages/qemu-system-x86-64-headless/0001-fix-hardcoded-paths.patch +++ b/packages/qemu-system-x86-64-headless/0001-fix-hardcoded-paths.patch @@ -2,14 +2,14 @@ diff -uNr qemu-6.1.0/block.c qemu-6.1.0.mod/block.c --- qemu-6.1.0/block.c 2021-08-24 20:35:40.000000000 +0300 +++ qemu-6.1.0.mod/block.c 2021-08-25 15:22:26.469952602 +0300 @@ -833,7 +833,7 @@ - const char *tmpdir; - tmpdir = getenv("TMPDIR"); - if (!tmpdir) { + * /var/tmp is usually on a disk, so more appropriate for disk images. + */ + if (!g_strcmp0(tmpdir, "/tmp")) { - tmpdir = "/var/tmp"; + tmpdir = "@TERMUX_PREFIX@/tmp"; } - if (snprintf(filename, size, "%s/vl.XXXXXX", tmpdir) >= size) { - return -EOVERFLOW; + #endif + diff -uNr qemu-6.1.0/hw/hppa/machine.c qemu-6.1.0.mod/hw/hppa/machine.c --- qemu-6.1.0/hw/hppa/machine.c 2021-08-24 20:35:40.000000000 +0300 +++ qemu-6.1.0.mod/hw/hppa/machine.c 2021-08-25 15:22:26.469952602 +0300 @@ -122,31 +122,6 @@ diff -uNr qemu-6.1.0/qemu-nbd.c qemu-6.1.0.mod/qemu-nbd.c } server = qio_net_listener_new(); -diff -uNr qemu-6.1.0/slirp/src/slirp.c qemu-6.1.0.mod/slirp/src/slirp.c ---- qemu-6.1.0/slirp/src/slirp.c 2021-08-24 20:36:28.000000000 +0300 -+++ qemu-6.1.0.mod/slirp/src/slirp.c 2021-08-25 15:23:17.110356661 +0300 -@@ -221,7 +221,7 @@ - #if defined(__HAIKU__) - #define RESOLV_CONF_PATH "/boot/system/settings/network/resolv.conf" - #else --#define RESOLV_CONF_PATH "/etc/resolv.conf" -+#define RESOLV_CONF_PATH "@TERMUX_PREFIX@/etc/resolv.conf" - #endif - - static int get_dns_addr_cached(void *pdns_addr, void *cached_addr, -diff -uNr qemu-6.1.0/tcg/tcg.c qemu-6.1.0.mod/tcg/tcg.c ---- qemu-6.1.0/tcg/tcg.c 2021-08-24 20:35:41.000000000 +0300 -+++ qemu-6.1.0.mod/tcg/tcg.c 2021-08-25 15:22:26.485952693 +0300 -@@ -4684,7 +4684,8 @@ - /* Enable this block to be able to debug the ELF image file creation. - One can use readelf, objdump, or other inspection utilities. */ - { -- FILE *f = fopen("/tmp/qemu.jit", "w+b"); -+ FILE *f = fopen("@TERMUX_PREFIX@/tmp/qemu.jit", "w+b"); -+ - if (f) { - if (fwrite(img, img_size, 1, f) != img_size) { - /* Avoid stupid unused return value warning for fwrite. */ diff -uNr qemu-6.1.0/util/module.c qemu-6.1.0.mod/util/module.c --- qemu-6.1.0/util/module.c 2021-08-24 20:35:41.000000000 +0300 +++ qemu-6.1.0.mod/util/module.c 2021-08-25 15:22:26.485952693 +0300 @@ -159,15 +134,3 @@ diff -uNr qemu-6.1.0/util/module.c qemu-6.1.0.mod/util/module.c #endif assert(n_dirs <= ARRAY_SIZE(dirs)); -diff -uNr qemu-6.1.0/util/qemu-sockets.c qemu-6.1.0.mod/util/qemu-sockets.c ---- qemu-6.1.0/util/qemu-sockets.c 2021-08-24 20:35:41.000000000 +0300 -+++ qemu-6.1.0.mod/util/qemu-sockets.c 2021-08-25 15:22:26.485952693 +0300 -@@ -923,7 +923,7 @@ - path = saddr->path; - } else { - const char *tmpdir = getenv("TMPDIR"); -- tmpdir = tmpdir ? tmpdir : "/tmp"; -+ tmpdir = tmpdir ? tmpdir : "@TERMUX_PREFIX@/tmp"; - path = pathbuf = g_strdup_printf("%s/qemu-socket-XXXXXX", tmpdir); - } - diff --git a/packages/qemu-system-x86-64-headless/0016-disable-signalfd.patch b/packages/qemu-system-x86-64-headless/0016-disable-signalfd.patch index dcfd227b35..2d2f43fd65 100644 --- a/packages/qemu-system-x86-64-headless/0016-disable-signalfd.patch +++ b/packages/qemu-system-x86-64-headless/0016-disable-signalfd.patch @@ -2,9 +2,9 @@ diff -uNr qemu-6.1.0/meson.build qemu-6.1.0.mod/meson.build --- qemu-6.1.0/meson.build 2021-08-25 21:20:39.873631512 +0300 +++ qemu-6.1.0.mod/meson.build 2021-08-25 21:21:35.135670419 +0300 @@ -1785,10 +1785,6 @@ + CPU_FREE(cpuset); return 0; }''', dependencies: threads)) - -config_host_data.set('CONFIG_SIGNALFD', cc.links(gnu_source_prefix + ''' - #include - #include diff --git a/packages/qemu-system-x86-64-headless/build.sh b/packages/qemu-system-x86-64-headless/build.sh index 6df42879af..88db1480b6 100644 --- a/packages/qemu-system-x86-64-headless/build.sh +++ b/packages/qemu-system-x86-64-headless/build.sh @@ -2,11 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.qemu.org TERMUX_PKG_DESCRIPTION="A generic and open source machine emulator and virtualizer (headless)" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1:7.1.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=1:7.2.0 TERMUX_PKG_SRCURL=https://download.qemu.org/qemu-${TERMUX_PKG_VERSION:2}.tar.xz -TERMUX_PKG_SHA256=a0634e536bded57cf38ec8a751adb124b89c776fe0846f21ab6c6728f1cbbbe6 -TERMUX_PKG_DEPENDS="glib, libbz2, libc++, libcurl, libgnutls, libiconv, libjpeg-turbo, liblzo, libnettle, libnfs, libpixman, libpng, libspice-server, libssh, libusb, libusbredir, ncurses, pulseaudio, qemu-common, resolv-conf, zlib, zstd" +TERMUX_PKG_SHA256=5b49ce2687744dad494ae90a898c52204a3406e84d072482a1e1be854eeb2157 +TERMUX_PKG_DEPENDS="glib, libbz2, libc++, libcurl, libgnutls, libiconv, libjpeg-turbo, liblzo, libnettle, libnfs, libpixman, libpng, libslirp, libspice-server, libssh, libusb, libusbredir, ncurses, pulseaudio, qemu-common, resolv-conf, zlib, zstd" # Required by configuration script, but I can't find any binary that uses it. TERMUX_PKG_BUILD_DEPENDS="libtasn1" @@ -16,6 +15,29 @@ TERMUX_PKG_REPLACES="qemu-system-x86_64-headless" TERMUX_PKG_PROVIDES="qemu-system-x86_64-headless" TERMUX_PKG_BUILD_IN_SRC=true +termux_step_pre_configure() { + # Workaround for https://github.com/termux/termux-packages/issues/12261. + if [ $TERMUX_ARCH = "aarch64" ]; then + rm -f $TERMUX_PKG_BUILDDIR/_lib + mkdir -p $TERMUX_PKG_BUILDDIR/_lib + + cd $TERMUX_PKG_BUILDDIR + mkdir -p _setjmp-aarch64 + pushd _setjmp-aarch64 + mkdir -p private + local s + for s in $TERMUX_PKG_BUILDER_DIR/setjmp-aarch64/{setjmp.S,private-*.h}; do + local f=$(basename ${s}) + cp ${s} ./${f/-//} + done + $CC $CFLAGS $CPPFLAGS -I. setjmp.S -c + $AR cru $TERMUX_PKG_BUILDDIR/_lib/libandroid-setjmp.a setjmp.o + popd + + LDFLAGS+=" -L$TERMUX_PKG_BUILDDIR/_lib -l:libandroid-setjmp.a" + fi +} + termux_step_configure() { termux_setup_ninja @@ -100,6 +122,7 @@ termux_step_configure() { --enable-dmg \ --enable-parallels \ --enable-qed \ + --enable-slirp \ --enable-spice \ --enable-libusb \ --enable-usb-redir \ diff --git a/packages/qemu-system-x86-64-headless/qemu-7.2.0-linux-user-syscall.c.patch b/packages/qemu-system-x86-64-headless/qemu-7.2.0-linux-user-syscall.c.patch new file mode 100644 index 0000000000..e1082b95dc --- /dev/null +++ b/packages/qemu-system-x86-64-headless/qemu-7.2.0-linux-user-syscall.c.patch @@ -0,0 +1,11 @@ +--- a/linux-user/syscall.c ++++ b/linux-user/syscall.c +@@ -102,7 +102,7 @@ + #include + #include + +-#ifdef HAVE_SYS_MOUNT_FSCONFIG ++#if defined HAVE_SYS_MOUNT_FSCONFIG && !defined __ANDROID__ + /* + * glibc >= 2.36 linux/mount.h conflicts with sys/mount.h, + * which in turn prevents use of linux/fs.h. So we have to diff --git a/packages/qemu-system-x86-64-headless/setjmp-aarch64/private-bionic_asm.h b/packages/qemu-system-x86-64-headless/setjmp-aarch64/private-bionic_asm.h new file mode 100644 index 0000000000..b97df5c9d8 --- /dev/null +++ b/packages/qemu-system-x86-64-headless/setjmp-aarch64/private-bionic_asm.h @@ -0,0 +1,94 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#pragma once + +/* https://github.com/android/ndk/issues/1422 */ +#if 0 +#include +#endif + +#include /* For system call numbers. */ +#define MAX_ERRNO 4095 /* For recognizing system call error returns. */ + +#define __bionic_asm_custom_entry(f) +#define __bionic_asm_custom_end(f) +#define __bionic_asm_function_type @function +#define __bionic_asm_custom_note_gnu_section() + +#if defined(__aarch64__) +#include +#elif defined(__arm__) +#include +#elif defined(__i386__) +#include +#elif defined(__riscv) +#include +#elif defined(__x86_64__) +#include +#endif + +#define ENTRY_NO_DWARF(f) \ + .text; \ + .globl f; \ + .balign __bionic_asm_align; \ + .type f, __bionic_asm_function_type; \ + f: \ + __bionic_asm_custom_entry(f); \ + +#define ENTRY(f) \ + ENTRY_NO_DWARF(f) \ + .cfi_startproc \ + +#define END_NO_DWARF(f) \ + .size f, .-f; \ + __bionic_asm_custom_end(f) \ + +#define END(f) \ + .cfi_endproc; \ + END_NO_DWARF(f) \ + +/* Like ENTRY, but with hidden visibility. */ +#define ENTRY_PRIVATE(f) \ + ENTRY(f); \ + .hidden f \ + +/* Like ENTRY_NO_DWARF, but with hidden visibility. */ +#define ENTRY_PRIVATE_NO_DWARF(f) \ + ENTRY_NO_DWARF(f); \ + .hidden f \ + +#define __BIONIC_WEAK_ASM_FOR_NATIVE_BRIDGE(f) \ + .weak f; \ + +#define ALIAS_SYMBOL(alias, original) \ + .globl alias; \ + .equ alias, original + +#define NOTE_GNU_PROPERTY() \ + __bionic_asm_custom_note_gnu_section() diff --git a/packages/qemu-system-x86-64-headless/setjmp-aarch64/private-bionic_asm_arm64.h b/packages/qemu-system-x86-64-headless/setjmp-aarch64/private-bionic_asm_arm64.h new file mode 100644 index 0000000000..ffc7181447 --- /dev/null +++ b/packages/qemu-system-x86-64-headless/setjmp-aarch64/private-bionic_asm_arm64.h @@ -0,0 +1,79 @@ +/* $OpenBSD: asm.h,v 1.1 2004/02/01 05:09:49 drahn Exp $ */ +/* $NetBSD: asm.h,v 1.4 2001/07/16 05:43:32 matt Exp $ */ + +/* + * Copyright (c) 1990 The Regents of the University of California. + * All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * William Jolitz. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * from: @(#)asm.h 5.5 (Berkeley) 5/7/91 + */ + +#pragma once + +#define __bionic_asm_align 16 + +#undef __bionic_asm_function_type +#define __bionic_asm_function_type %function + +#if defined(__ARM_FEATURE_BTI_DEFAULT) +#define __bionic_asm_aarch64_feature_bti (1 << 0) +#undef __bionic_asm_custom_entry +#define __bionic_asm_custom_entry(f) bti c +#else +#define __bionic_asm_aarch64_feature_bti 0 +#endif + +#if defined(__ARM_FEATURE_PAC_DEFAULT) +#define __bionic_asm_aarch64_feature_pac (1 << 1) +#else +#define __bionic_asm_aarch64_feature_pac 0 +#endif + +#undef __bionic_asm_custom_note_gnu_section +#define __bionic_asm_custom_note_gnu_section() \ + .pushsection .note.gnu.property, "a"; \ + .balign 8; \ + .long 4; \ + .long 0x10; \ + .long 0x5; /* NT_GNU_PROPERTY_TYPE_0 */ \ + .asciz "GNU"; \ + .long 0xc0000000; /* GNU_PROPERTY_AARCH64_FEATURE_1_AND */ \ + .long 4; \ + .long (__bionic_asm_aarch64_feature_pac | \ + __bionic_asm_aarch64_feature_bti); \ + .long 0; \ + .popsection; + +#define NT_MEMTAG_LEVEL_MASK 3 +#define NT_MEMTAG_LEVEL_NONE 0 +#define NT_MEMTAG_LEVEL_ASYNC 1 +#define NT_MEMTAG_LEVEL_SYNC 2 +#define NT_MEMTAG_HEAP 4 +#define NT_MEMTAG_STACK 8 diff --git a/packages/qemu-system-x86-64-headless/setjmp-aarch64/private-bionic_constants.h b/packages/qemu-system-x86-64-headless/setjmp-aarch64/private-bionic_constants.h new file mode 100644 index 0000000000..09294b64a7 --- /dev/null +++ b/packages/qemu-system-x86-64-headless/setjmp-aarch64/private-bionic_constants.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef _BIONIC_CONSTANTS_H_ +#define _BIONIC_CONSTANTS_H_ + +#define NS_PER_S 1000000000 + +// Size of the shadow call stack. This must be a power of 2. +#define SCS_SIZE (8 * 1024) + +// The shadow call stack is allocated at an aligned address within a guard region of this size. The +// guard region must be large enough that we can allocate an SCS_SIZE-aligned SCS while ensuring +// that there is at least one guard page after the SCS so that a stack overflow results in a SIGSEGV +// instead of corrupting the allocation that comes after it. +#define SCS_GUARD_REGION_SIZE (16 * 1024 * 1024) + +#endif // _BIONIC_CONSTANTS_H_ diff --git a/packages/qemu-system-x86-64-headless/setjmp-aarch64/setjmp.S b/packages/qemu-system-x86-64-headless/setjmp-aarch64/setjmp.S new file mode 100644 index 0000000000..f97bb254e6 --- /dev/null +++ b/packages/qemu-system-x86-64-headless/setjmp-aarch64/setjmp.S @@ -0,0 +1,295 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include + +// According to AARCH64 PCS document we need to save the following +// registers: +// +// Core x19 - x30, sp (see section 5.1.1) +// VFP d8 - d15 (see section 5.1.2) +// +// NOTE: All the registers saved here will have 64 bit vales. +// AAPCS mandates that the higher part of q registers do not need to +// be saved by the callee. +// +// The internal structure of a jmp_buf is totally private. +// Current layout (changes from release to release): +// +// word name description +// 0 sigflag/cookie setjmp cookie in top 31 bits, signal mask flag in low bit +// 1 sigmask signal mask (not used with _setjmp / _longjmp) +// 2 core_base base of core registers (x18-x30, sp) +// (We only store the low bits of x18 to avoid leaking the +// shadow call stack address into memory.) +// 16 float_base base of float registers (d8-d15) +// 24 checksum checksum of core registers +// 25 reserved reserved entries (room to grow) +// 32 + +#define _JB_SIGFLAG 0 +#define _JB_SIGMASK (_JB_SIGFLAG + 1) +#define _JB_X30_SP (_JB_SIGMASK + 1) +#define _JB_X28_X29 (_JB_X30_SP + 2) +#define _JB_X26_X27 (_JB_X28_X29 + 2) +#define _JB_X24_X25 (_JB_X26_X27 + 2) +#define _JB_X22_X23 (_JB_X24_X25 + 2) +#define _JB_X20_X21 (_JB_X22_X23 + 2) +#define _JB_SCS_X19 (_JB_X20_X21 + 2) +#define _JB_D14_D15 (_JB_SCS_X19 + 2) +#define _JB_D12_D13 (_JB_D14_D15 + 2) +#define _JB_D10_D11 (_JB_D12_D13 + 2) +#define _JB_D8_D9 (_JB_D10_D11 + 2) +#define _JB_CHECKSUM (_JB_D8_D9 + 2) + +#define SCS_MASK (SCS_SIZE - 1) +#define MANGLE_REGISTERS 1 +#define USE_CHECKSUM 1 + +.macro m_mangle_registers reg, sp_reg +#if MANGLE_REGISTERS + eor x3, x3, \reg + eor x19, x19, \reg + eor x20, x20, \reg + eor x21, x21, \reg + eor x22, x22, \reg + eor x23, x23, \reg + eor x24, x24, \reg + eor x25, x25, \reg + eor x26, x26, \reg + eor x27, x27, \reg + eor x28, x28, \reg + eor x29, x29, \reg + eor x30, x30, \reg + eor \sp_reg, \sp_reg, \reg +#endif +.endm + +.macro m_calculate_checksum dst, src, scratch + mov \dst, #0 + .irp i,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23 + ldr \scratch, [\src, #(\i * 8)] + eor \dst, \dst, \scratch + .endr +.endm + +.macro m_unmangle_registers reg, sp_reg + m_mangle_registers \reg, sp_reg=\sp_reg +.endm + +ENTRY_PRIVATE(setjmp) + mov w1, #1 + b sigsetjmp +END(setjmp) + +ENTRY_PRIVATE(_setjmp) + mov w1, #0 + b sigsetjmp +END(_setjmp) + +// int sigsetjmp(sigjmp_buf env, int save_signal_mask); +ENTRY_PRIVATE(sigsetjmp) + stp x0, x30, [sp, #-16]! + .cfi_def_cfa_offset 16 + .cfi_rel_offset x0, 0 + .cfi_rel_offset x30, 8 + + // Get the cookie and store it along with the signal flag. + mov x0, x1 + //bl __bionic_setjmp_cookie_get + mov x1, x0 + ldr x0, [sp, #0] + str x1, [x0, #(_JB_SIGFLAG * 8)] + + // Do we need to save the signal mask? + tbz w1, #0, 1f + + // Save the cookie for later. + stp x1, xzr, [sp, #-16]! + .cfi_adjust_cfa_offset 16 + + // Save current signal mask. + // The 'how' argument is ignored if new_mask is NULL. + mov x1, #0 // NULL. + add x2, x0, #(_JB_SIGMASK * 8) // old_mask. + bl sigprocmask + + ldp x1, xzr, [sp], #16 + .cfi_adjust_cfa_offset -16 + +1: + // Restore original x0 and lr. + ldp x0, x30, [sp], #16 + .cfi_adjust_cfa_offset -16 + .cfi_restore x0 + .cfi_restore x30 + + // Mask off the signal flag bit. + bic x1, x1, #1 + + // Mask off the high bits of the shadow call stack pointer. + and x3, x18, #SCS_MASK + + // Save core registers. + mov x10, sp + m_mangle_registers x1, sp_reg=x10 + stp x30, x10, [x0, #(_JB_X30_SP * 8)] + stp x28, x29, [x0, #(_JB_X28_X29 * 8)] + stp x26, x27, [x0, #(_JB_X26_X27 * 8)] + stp x24, x25, [x0, #(_JB_X24_X25 * 8)] + stp x22, x23, [x0, #(_JB_X22_X23 * 8)] + stp x20, x21, [x0, #(_JB_X20_X21 * 8)] + stp x3, x19, [x0, #(_JB_SCS_X19 * 8)] + m_unmangle_registers x1, sp_reg=x10 + + // Save floating point registers. + stp d14, d15, [x0, #(_JB_D14_D15 * 8)] + stp d12, d13, [x0, #(_JB_D12_D13 * 8)] + stp d10, d11, [x0, #(_JB_D10_D11 * 8)] + stp d8, d9, [x0, #(_JB_D8_D9 * 8)] + +#if USE_CHECKSUM + // Calculate the checksum. + m_calculate_checksum x12, x0, x2 + str x12, [x0, #(_JB_CHECKSUM * 8)] +#endif + + mov w0, #0 + ret +END(sigsetjmp) + +// void siglongjmp(sigjmp_buf env, int value); +ENTRY_PRIVATE(siglongjmp) +#if USE_CHECKSUM + // Check the checksum before doing anything. + m_calculate_checksum x12, x0, x2 + ldr x2, [x0, #(_JB_CHECKSUM * 8)] + + cmp x2, x12 + //bne __bionic_setjmp_checksum_mismatch +#endif + +#if __has_feature(hwaddress_sanitizer) + stp x0, x30, [sp, #-16]! + .cfi_adjust_cfa_offset 16 + .cfi_rel_offset x0, 0 + .cfi_rel_offset x30, 8 + mov x19, x1 // Save 'value'. + + // load and unmangle destination SP + ldr x2, [x0, #(_JB_SIGFLAG * 8)] + bic x2, x2, #1 + ldr x0, [x0, #(_JB_X30_SP * 8 + 8)] + eor x0, x0, x2 + bl __hwasan_handle_longjmp + + mov x1, x19 // Restore 'value'. + // Restore original x0 and lr. + ldp x0, x30, [sp], #16 + .cfi_adjust_cfa_offset -16 + .cfi_restore x0 + .cfi_restore x30 +#endif + + // Do we need to restore the signal mask? + ldr x2, [x0, #(_JB_SIGFLAG * 8)] + tbz w2, #0, 1f + + stp x0, x30, [sp, #-16]! + .cfi_adjust_cfa_offset 16 + .cfi_rel_offset x0, 0 + .cfi_rel_offset x30, 8 + + // Restore signal mask. + mov x19, x1 // Save 'value'. + + mov x2, x0 + mov x0, #2 // SIG_SETMASK + add x1, x2, #(_JB_SIGMASK * 8) // new_mask. + mov x2, #0 // NULL. + bl sigprocmask + mov x1, x19 // Restore 'value'. + + // Restore original x0 and lr. + ldp x0, x30, [sp], #16 + .cfi_adjust_cfa_offset -16 + .cfi_restore x0 + .cfi_restore x30 + + ldr x2, [x0, #(_JB_SIGFLAG * 8)] +1: + // Restore core registers. + bic x2, x2, #1 + ldp x30, x10, [x0, #(_JB_X30_SP * 8)] + ldp x28, x29, [x0, #(_JB_X28_X29 * 8)] + ldp x26, x27, [x0, #(_JB_X26_X27 * 8)] + ldp x24, x25, [x0, #(_JB_X24_X25 * 8)] + ldp x22, x23, [x0, #(_JB_X22_X23 * 8)] + ldp x20, x21, [x0, #(_JB_X20_X21 * 8)] + ldp x3, x19, [x0, #(_JB_SCS_X19 * 8)] + m_unmangle_registers x2, sp_reg=x10 + mov sp, x10 + + // Restore the low bits of the shadow call stack pointer. + and x18, x18, #~SCS_MASK + orr x18, x3, x18 + + stp x0, x1, [sp, #-16]! + .cfi_adjust_cfa_offset 16 + .cfi_rel_offset x0, 0 + .cfi_rel_offset x1, 8 + stp x30, xzr, [sp, #-16]! + .cfi_adjust_cfa_offset 16 + .cfi_rel_offset x30, 0 + ldr x0, [x0, #(_JB_SIGFLAG * 8)] + //bl __bionic_setjmp_cookie_check + ldp x30, xzr, [sp], #16 + .cfi_adjust_cfa_offset -16 + .cfi_restore x30 + ldp x0, x1, [sp], #16 + .cfi_adjust_cfa_offset -16 + .cfi_restore x0 + .cfi_restore x1 + + // Restore floating point registers. + ldp d14, d15, [x0, #(_JB_D14_D15 * 8)] + ldp d12, d13, [x0, #(_JB_D12_D13 * 8)] + ldp d10, d11, [x0, #(_JB_D10_D11 * 8)] + ldp d8, d9, [x0, #(_JB_D8_D9 * 8)] + + // Set return value. + cmp w1, wzr + csinc w0, w1, wzr, ne + ret +END(siglongjmp) + +ALIAS_SYMBOL(longjmp, siglongjmp) +.hidden longjmp +ALIAS_SYMBOL(_longjmp, siglongjmp) +.hidden _longjmp diff --git a/x11-packages/qemu-system-x86-64/0001-fix-hardcoded-paths.patch b/x11-packages/qemu-system-x86-64/0001-fix-hardcoded-paths.patch index 021ac6b198..8405acd29c 100644 --- a/x11-packages/qemu-system-x86-64/0001-fix-hardcoded-paths.patch +++ b/x11-packages/qemu-system-x86-64/0001-fix-hardcoded-paths.patch @@ -2,14 +2,14 @@ diff -uNr qemu-6.1.0/block.c qemu-6.1.0.mod/block.c --- qemu-6.1.0/block.c 2021-08-24 20:35:40.000000000 +0300 +++ qemu-6.1.0.mod/block.c 2021-08-25 15:22:26.469952602 +0300 @@ -833,7 +833,7 @@ - const char *tmpdir; - tmpdir = getenv("TMPDIR"); - if (!tmpdir) { + * /var/tmp is usually on a disk, so more appropriate for disk images. + */ + if (!g_strcmp0(tmpdir, "/tmp")) { - tmpdir = "/var/tmp"; + tmpdir = "@TERMUX_PREFIX@/tmp"; } - if (snprintf(filename, size, "%s/vl.XXXXXX", tmpdir) >= size) { - return -EOVERFLOW; + #endif + diff -uNr qemu-6.1.0/hw/hppa/machine.c qemu-6.1.0.mod/hw/hppa/machine.c --- qemu-6.1.0/hw/hppa/machine.c 2021-08-24 20:35:40.000000000 +0300 +++ qemu-6.1.0.mod/hw/hppa/machine.c 2021-08-25 15:22:26.469952602 +0300 @@ -122,31 +122,6 @@ diff -uNr qemu-6.1.0/qemu-nbd.c qemu-6.1.0.mod/qemu-nbd.c } server = qio_net_listener_new(); -diff -uNr qemu-6.1.0/slirp/src/slirp.c qemu-6.1.0.mod/slirp/src/slirp.c ---- qemu-6.1.0/slirp/src/slirp.c 2021-08-24 20:36:28.000000000 +0300 -+++ qemu-6.1.0.mod/slirp/src/slirp.c 2021-08-25 15:23:17.110356661 +0300 -@@ -221,7 +221,7 @@ - #if defined(__HAIKU__) - #define RESOLV_CONF_PATH "/boot/system/settings/network/resolv.conf" - #else --#define RESOLV_CONF_PATH "/etc/resolv.conf" -+#define RESOLV_CONF_PATH "@TERMUX_PREFIX@/etc/resolv.conf" - #endif - - static int get_dns_addr_cached(void *pdns_addr, void *cached_addr, -diff -uNr qemu-6.1.0/tcg/tcg.c qemu-6.1.0.mod/tcg/tcg.c ---- qemu-6.1.0/tcg/tcg.c 2021-08-24 20:35:41.000000000 +0300 -+++ qemu-6.1.0.mod/tcg/tcg.c 2021-08-25 15:22:26.485952693 +0300 -@@ -4684,7 +4684,8 @@ - /* Enable this block to be able to debug the ELF image file creation. - One can use readelf, objdump, or other inspection utilities. */ - { -- FILE *f = fopen("/tmp/qemu.jit", "w+b"); -+ FILE *f = fopen("@TERMUX_PREFIX@/tmp/qemu.jit", "w+b"); -+ - if (f) { - if (fwrite(img, img_size, 1, f) != img_size) { - /* Avoid stupid unused return value warning for fwrite. */ diff -uNr qemu-6.1.0/util/module.c qemu-6.1.0.mod/util/module.c --- qemu-6.1.0/util/module.c 2021-08-24 20:35:41.000000000 +0300 +++ qemu-6.1.0.mod/util/module.c 2021-08-25 15:22:26.485952693 +0300 @@ -159,15 +134,3 @@ diff -uNr qemu-6.1.0/util/module.c qemu-6.1.0.mod/util/module.c #endif assert(n_dirs <= ARRAY_SIZE(dirs)); -diff -uNr qemu-6.1.0/util/qemu-sockets.c qemu-6.1.0.mod/util/qemu-sockets.c ---- qemu-6.1.0/util/qemu-sockets.c 2021-08-24 20:35:41.000000000 +0300 -+++ qemu-6.1.0.mod/util/qemu-sockets.c 2021-08-25 15:22:26.485952693 +0300 -@@ -923,7 +923,7 @@ - path = saddr->path; - } else { - const char *tmpdir = getenv("TMPDIR"); -- tmpdir = tmpdir ? tmpdir : "/tmp"; -+ tmpdir = tmpdir ? tmpdir : "@TERMUX_PREFIX@/tmp"; - path = pathbuf = g_strdup_printf("%s/qemu-socket-XXXXXX", tmpdir); - } - diff --git a/x11-packages/qemu-system-x86-64/0016-disable-signalfd.patch b/x11-packages/qemu-system-x86-64/0016-disable-signalfd.patch index dcfd227b35..2d2f43fd65 100644 --- a/x11-packages/qemu-system-x86-64/0016-disable-signalfd.patch +++ b/x11-packages/qemu-system-x86-64/0016-disable-signalfd.patch @@ -2,9 +2,9 @@ diff -uNr qemu-6.1.0/meson.build qemu-6.1.0.mod/meson.build --- qemu-6.1.0/meson.build 2021-08-25 21:20:39.873631512 +0300 +++ qemu-6.1.0.mod/meson.build 2021-08-25 21:21:35.135670419 +0300 @@ -1785,10 +1785,6 @@ + CPU_FREE(cpuset); return 0; }''', dependencies: threads)) - -config_host_data.set('CONFIG_SIGNALFD', cc.links(gnu_source_prefix + ''' - #include - #include diff --git a/x11-packages/qemu-system-x86-64/build.sh b/x11-packages/qemu-system-x86-64/build.sh index 0bb2fec8e7..ae3030dfe6 100644 --- a/x11-packages/qemu-system-x86-64/build.sh +++ b/x11-packages/qemu-system-x86-64/build.sh @@ -2,11 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.qemu.org TERMUX_PKG_DESCRIPTION="A generic and open source machine emulator and virtualizer" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1:7.1.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=1:7.2.0 TERMUX_PKG_SRCURL=https://download.qemu.org/qemu-${TERMUX_PKG_VERSION:2}.tar.xz -TERMUX_PKG_SHA256=a0634e536bded57cf38ec8a751adb124b89c776fe0846f21ab6c6728f1cbbbe6 -TERMUX_PKG_DEPENDS="glib, gtk3, libbz2, libc++, libcurl, libgnutls, libiconv, libjpeg-turbo, liblzo, libnettle, libnfs, libpixman, libpng, libspice-server, libssh, libusb, libusbredir, libx11, ncurses, pulseaudio, qemu-common, resolv-conf, sdl2, sdl2-image, zlib, zstd" +TERMUX_PKG_SHA256=5b49ce2687744dad494ae90a898c52204a3406e84d072482a1e1be854eeb2157 +TERMUX_PKG_DEPENDS="glib, gtk3, libbz2, libc++, libcurl, libgnutls, libiconv, libjpeg-turbo, liblzo, libnettle, libnfs, libpixman, libpng, libslirp, libspice-server, libssh, libusb, libusbredir, libx11, ncurses, pulseaudio, qemu-common, resolv-conf, sdl2, sdl2-image, zlib, zstd" # Required by configuration script, but I can't find any binary that uses it. TERMUX_PKG_BUILD_DEPENDS="libtasn1" @@ -42,6 +41,29 @@ TERMUX_PKG_REPLACES="qemu-system-x86_64, qemu-system-x86_64-headless, qemu-syste TERMUX_PKG_PROVIDES="qemu-system-x86_64" TERMUX_PKG_BUILD_IN_SRC=true +termux_step_pre_configure() { + # Workaround for https://github.com/termux/termux-packages/issues/12261. + if [ $TERMUX_ARCH = "aarch64" ]; then + rm -f $TERMUX_PKG_BUILDDIR/_lib + mkdir -p $TERMUX_PKG_BUILDDIR/_lib + + cd $TERMUX_PKG_BUILDDIR + mkdir -p _setjmp-aarch64 + pushd _setjmp-aarch64 + mkdir -p private + local s + for s in $TERMUX_PKG_BUILDER_DIR/setjmp-aarch64/{setjmp.S,private-*.h}; do + local f=$(basename ${s}) + cp ${s} ./${f/-//} + done + $CC $CFLAGS $CPPFLAGS -I. setjmp.S -c + $AR cru $TERMUX_PKG_BUILDDIR/_lib/libandroid-setjmp.a setjmp.o + popd + + LDFLAGS+=" -L$TERMUX_PKG_BUILDDIR/_lib -l:libandroid-setjmp.a" + fi +} + termux_step_configure() { termux_setup_ninja @@ -115,6 +137,7 @@ termux_step_configure() { --enable-dmg \ --enable-parallels \ --enable-qed \ + --enable-slirp \ --enable-spice \ --enable-libusb \ --enable-usb-redir \ diff --git a/x11-packages/qemu-system-x86-64/qemu-7.2.0-linux-user-syscall.c.patch b/x11-packages/qemu-system-x86-64/qemu-7.2.0-linux-user-syscall.c.patch new file mode 100644 index 0000000000..e1082b95dc --- /dev/null +++ b/x11-packages/qemu-system-x86-64/qemu-7.2.0-linux-user-syscall.c.patch @@ -0,0 +1,11 @@ +--- a/linux-user/syscall.c ++++ b/linux-user/syscall.c +@@ -102,7 +102,7 @@ + #include + #include + +-#ifdef HAVE_SYS_MOUNT_FSCONFIG ++#if defined HAVE_SYS_MOUNT_FSCONFIG && !defined __ANDROID__ + /* + * glibc >= 2.36 linux/mount.h conflicts with sys/mount.h, + * which in turn prevents use of linux/fs.h. So we have to diff --git a/x11-packages/qemu-system-x86-64/setjmp-aarch64/private-bionic_asm.h b/x11-packages/qemu-system-x86-64/setjmp-aarch64/private-bionic_asm.h new file mode 100644 index 0000000000..b97df5c9d8 --- /dev/null +++ b/x11-packages/qemu-system-x86-64/setjmp-aarch64/private-bionic_asm.h @@ -0,0 +1,94 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#pragma once + +/* https://github.com/android/ndk/issues/1422 */ +#if 0 +#include +#endif + +#include /* For system call numbers. */ +#define MAX_ERRNO 4095 /* For recognizing system call error returns. */ + +#define __bionic_asm_custom_entry(f) +#define __bionic_asm_custom_end(f) +#define __bionic_asm_function_type @function +#define __bionic_asm_custom_note_gnu_section() + +#if defined(__aarch64__) +#include +#elif defined(__arm__) +#include +#elif defined(__i386__) +#include +#elif defined(__riscv) +#include +#elif defined(__x86_64__) +#include +#endif + +#define ENTRY_NO_DWARF(f) \ + .text; \ + .globl f; \ + .balign __bionic_asm_align; \ + .type f, __bionic_asm_function_type; \ + f: \ + __bionic_asm_custom_entry(f); \ + +#define ENTRY(f) \ + ENTRY_NO_DWARF(f) \ + .cfi_startproc \ + +#define END_NO_DWARF(f) \ + .size f, .-f; \ + __bionic_asm_custom_end(f) \ + +#define END(f) \ + .cfi_endproc; \ + END_NO_DWARF(f) \ + +/* Like ENTRY, but with hidden visibility. */ +#define ENTRY_PRIVATE(f) \ + ENTRY(f); \ + .hidden f \ + +/* Like ENTRY_NO_DWARF, but with hidden visibility. */ +#define ENTRY_PRIVATE_NO_DWARF(f) \ + ENTRY_NO_DWARF(f); \ + .hidden f \ + +#define __BIONIC_WEAK_ASM_FOR_NATIVE_BRIDGE(f) \ + .weak f; \ + +#define ALIAS_SYMBOL(alias, original) \ + .globl alias; \ + .equ alias, original + +#define NOTE_GNU_PROPERTY() \ + __bionic_asm_custom_note_gnu_section() diff --git a/x11-packages/qemu-system-x86-64/setjmp-aarch64/private-bionic_asm_arm64.h b/x11-packages/qemu-system-x86-64/setjmp-aarch64/private-bionic_asm_arm64.h new file mode 100644 index 0000000000..ffc7181447 --- /dev/null +++ b/x11-packages/qemu-system-x86-64/setjmp-aarch64/private-bionic_asm_arm64.h @@ -0,0 +1,79 @@ +/* $OpenBSD: asm.h,v 1.1 2004/02/01 05:09:49 drahn Exp $ */ +/* $NetBSD: asm.h,v 1.4 2001/07/16 05:43:32 matt Exp $ */ + +/* + * Copyright (c) 1990 The Regents of the University of California. + * All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * William Jolitz. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * from: @(#)asm.h 5.5 (Berkeley) 5/7/91 + */ + +#pragma once + +#define __bionic_asm_align 16 + +#undef __bionic_asm_function_type +#define __bionic_asm_function_type %function + +#if defined(__ARM_FEATURE_BTI_DEFAULT) +#define __bionic_asm_aarch64_feature_bti (1 << 0) +#undef __bionic_asm_custom_entry +#define __bionic_asm_custom_entry(f) bti c +#else +#define __bionic_asm_aarch64_feature_bti 0 +#endif + +#if defined(__ARM_FEATURE_PAC_DEFAULT) +#define __bionic_asm_aarch64_feature_pac (1 << 1) +#else +#define __bionic_asm_aarch64_feature_pac 0 +#endif + +#undef __bionic_asm_custom_note_gnu_section +#define __bionic_asm_custom_note_gnu_section() \ + .pushsection .note.gnu.property, "a"; \ + .balign 8; \ + .long 4; \ + .long 0x10; \ + .long 0x5; /* NT_GNU_PROPERTY_TYPE_0 */ \ + .asciz "GNU"; \ + .long 0xc0000000; /* GNU_PROPERTY_AARCH64_FEATURE_1_AND */ \ + .long 4; \ + .long (__bionic_asm_aarch64_feature_pac | \ + __bionic_asm_aarch64_feature_bti); \ + .long 0; \ + .popsection; + +#define NT_MEMTAG_LEVEL_MASK 3 +#define NT_MEMTAG_LEVEL_NONE 0 +#define NT_MEMTAG_LEVEL_ASYNC 1 +#define NT_MEMTAG_LEVEL_SYNC 2 +#define NT_MEMTAG_HEAP 4 +#define NT_MEMTAG_STACK 8 diff --git a/x11-packages/qemu-system-x86-64/setjmp-aarch64/private-bionic_constants.h b/x11-packages/qemu-system-x86-64/setjmp-aarch64/private-bionic_constants.h new file mode 100644 index 0000000000..09294b64a7 --- /dev/null +++ b/x11-packages/qemu-system-x86-64/setjmp-aarch64/private-bionic_constants.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef _BIONIC_CONSTANTS_H_ +#define _BIONIC_CONSTANTS_H_ + +#define NS_PER_S 1000000000 + +// Size of the shadow call stack. This must be a power of 2. +#define SCS_SIZE (8 * 1024) + +// The shadow call stack is allocated at an aligned address within a guard region of this size. The +// guard region must be large enough that we can allocate an SCS_SIZE-aligned SCS while ensuring +// that there is at least one guard page after the SCS so that a stack overflow results in a SIGSEGV +// instead of corrupting the allocation that comes after it. +#define SCS_GUARD_REGION_SIZE (16 * 1024 * 1024) + +#endif // _BIONIC_CONSTANTS_H_ diff --git a/x11-packages/qemu-system-x86-64/setjmp-aarch64/setjmp.S b/x11-packages/qemu-system-x86-64/setjmp-aarch64/setjmp.S new file mode 100644 index 0000000000..f97bb254e6 --- /dev/null +++ b/x11-packages/qemu-system-x86-64/setjmp-aarch64/setjmp.S @@ -0,0 +1,295 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include + +// According to AARCH64 PCS document we need to save the following +// registers: +// +// Core x19 - x30, sp (see section 5.1.1) +// VFP d8 - d15 (see section 5.1.2) +// +// NOTE: All the registers saved here will have 64 bit vales. +// AAPCS mandates that the higher part of q registers do not need to +// be saved by the callee. +// +// The internal structure of a jmp_buf is totally private. +// Current layout (changes from release to release): +// +// word name description +// 0 sigflag/cookie setjmp cookie in top 31 bits, signal mask flag in low bit +// 1 sigmask signal mask (not used with _setjmp / _longjmp) +// 2 core_base base of core registers (x18-x30, sp) +// (We only store the low bits of x18 to avoid leaking the +// shadow call stack address into memory.) +// 16 float_base base of float registers (d8-d15) +// 24 checksum checksum of core registers +// 25 reserved reserved entries (room to grow) +// 32 + +#define _JB_SIGFLAG 0 +#define _JB_SIGMASK (_JB_SIGFLAG + 1) +#define _JB_X30_SP (_JB_SIGMASK + 1) +#define _JB_X28_X29 (_JB_X30_SP + 2) +#define _JB_X26_X27 (_JB_X28_X29 + 2) +#define _JB_X24_X25 (_JB_X26_X27 + 2) +#define _JB_X22_X23 (_JB_X24_X25 + 2) +#define _JB_X20_X21 (_JB_X22_X23 + 2) +#define _JB_SCS_X19 (_JB_X20_X21 + 2) +#define _JB_D14_D15 (_JB_SCS_X19 + 2) +#define _JB_D12_D13 (_JB_D14_D15 + 2) +#define _JB_D10_D11 (_JB_D12_D13 + 2) +#define _JB_D8_D9 (_JB_D10_D11 + 2) +#define _JB_CHECKSUM (_JB_D8_D9 + 2) + +#define SCS_MASK (SCS_SIZE - 1) +#define MANGLE_REGISTERS 1 +#define USE_CHECKSUM 1 + +.macro m_mangle_registers reg, sp_reg +#if MANGLE_REGISTERS + eor x3, x3, \reg + eor x19, x19, \reg + eor x20, x20, \reg + eor x21, x21, \reg + eor x22, x22, \reg + eor x23, x23, \reg + eor x24, x24, \reg + eor x25, x25, \reg + eor x26, x26, \reg + eor x27, x27, \reg + eor x28, x28, \reg + eor x29, x29, \reg + eor x30, x30, \reg + eor \sp_reg, \sp_reg, \reg +#endif +.endm + +.macro m_calculate_checksum dst, src, scratch + mov \dst, #0 + .irp i,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23 + ldr \scratch, [\src, #(\i * 8)] + eor \dst, \dst, \scratch + .endr +.endm + +.macro m_unmangle_registers reg, sp_reg + m_mangle_registers \reg, sp_reg=\sp_reg +.endm + +ENTRY_PRIVATE(setjmp) + mov w1, #1 + b sigsetjmp +END(setjmp) + +ENTRY_PRIVATE(_setjmp) + mov w1, #0 + b sigsetjmp +END(_setjmp) + +// int sigsetjmp(sigjmp_buf env, int save_signal_mask); +ENTRY_PRIVATE(sigsetjmp) + stp x0, x30, [sp, #-16]! + .cfi_def_cfa_offset 16 + .cfi_rel_offset x0, 0 + .cfi_rel_offset x30, 8 + + // Get the cookie and store it along with the signal flag. + mov x0, x1 + //bl __bionic_setjmp_cookie_get + mov x1, x0 + ldr x0, [sp, #0] + str x1, [x0, #(_JB_SIGFLAG * 8)] + + // Do we need to save the signal mask? + tbz w1, #0, 1f + + // Save the cookie for later. + stp x1, xzr, [sp, #-16]! + .cfi_adjust_cfa_offset 16 + + // Save current signal mask. + // The 'how' argument is ignored if new_mask is NULL. + mov x1, #0 // NULL. + add x2, x0, #(_JB_SIGMASK * 8) // old_mask. + bl sigprocmask + + ldp x1, xzr, [sp], #16 + .cfi_adjust_cfa_offset -16 + +1: + // Restore original x0 and lr. + ldp x0, x30, [sp], #16 + .cfi_adjust_cfa_offset -16 + .cfi_restore x0 + .cfi_restore x30 + + // Mask off the signal flag bit. + bic x1, x1, #1 + + // Mask off the high bits of the shadow call stack pointer. + and x3, x18, #SCS_MASK + + // Save core registers. + mov x10, sp + m_mangle_registers x1, sp_reg=x10 + stp x30, x10, [x0, #(_JB_X30_SP * 8)] + stp x28, x29, [x0, #(_JB_X28_X29 * 8)] + stp x26, x27, [x0, #(_JB_X26_X27 * 8)] + stp x24, x25, [x0, #(_JB_X24_X25 * 8)] + stp x22, x23, [x0, #(_JB_X22_X23 * 8)] + stp x20, x21, [x0, #(_JB_X20_X21 * 8)] + stp x3, x19, [x0, #(_JB_SCS_X19 * 8)] + m_unmangle_registers x1, sp_reg=x10 + + // Save floating point registers. + stp d14, d15, [x0, #(_JB_D14_D15 * 8)] + stp d12, d13, [x0, #(_JB_D12_D13 * 8)] + stp d10, d11, [x0, #(_JB_D10_D11 * 8)] + stp d8, d9, [x0, #(_JB_D8_D9 * 8)] + +#if USE_CHECKSUM + // Calculate the checksum. + m_calculate_checksum x12, x0, x2 + str x12, [x0, #(_JB_CHECKSUM * 8)] +#endif + + mov w0, #0 + ret +END(sigsetjmp) + +// void siglongjmp(sigjmp_buf env, int value); +ENTRY_PRIVATE(siglongjmp) +#if USE_CHECKSUM + // Check the checksum before doing anything. + m_calculate_checksum x12, x0, x2 + ldr x2, [x0, #(_JB_CHECKSUM * 8)] + + cmp x2, x12 + //bne __bionic_setjmp_checksum_mismatch +#endif + +#if __has_feature(hwaddress_sanitizer) + stp x0, x30, [sp, #-16]! + .cfi_adjust_cfa_offset 16 + .cfi_rel_offset x0, 0 + .cfi_rel_offset x30, 8 + mov x19, x1 // Save 'value'. + + // load and unmangle destination SP + ldr x2, [x0, #(_JB_SIGFLAG * 8)] + bic x2, x2, #1 + ldr x0, [x0, #(_JB_X30_SP * 8 + 8)] + eor x0, x0, x2 + bl __hwasan_handle_longjmp + + mov x1, x19 // Restore 'value'. + // Restore original x0 and lr. + ldp x0, x30, [sp], #16 + .cfi_adjust_cfa_offset -16 + .cfi_restore x0 + .cfi_restore x30 +#endif + + // Do we need to restore the signal mask? + ldr x2, [x0, #(_JB_SIGFLAG * 8)] + tbz w2, #0, 1f + + stp x0, x30, [sp, #-16]! + .cfi_adjust_cfa_offset 16 + .cfi_rel_offset x0, 0 + .cfi_rel_offset x30, 8 + + // Restore signal mask. + mov x19, x1 // Save 'value'. + + mov x2, x0 + mov x0, #2 // SIG_SETMASK + add x1, x2, #(_JB_SIGMASK * 8) // new_mask. + mov x2, #0 // NULL. + bl sigprocmask + mov x1, x19 // Restore 'value'. + + // Restore original x0 and lr. + ldp x0, x30, [sp], #16 + .cfi_adjust_cfa_offset -16 + .cfi_restore x0 + .cfi_restore x30 + + ldr x2, [x0, #(_JB_SIGFLAG * 8)] +1: + // Restore core registers. + bic x2, x2, #1 + ldp x30, x10, [x0, #(_JB_X30_SP * 8)] + ldp x28, x29, [x0, #(_JB_X28_X29 * 8)] + ldp x26, x27, [x0, #(_JB_X26_X27 * 8)] + ldp x24, x25, [x0, #(_JB_X24_X25 * 8)] + ldp x22, x23, [x0, #(_JB_X22_X23 * 8)] + ldp x20, x21, [x0, #(_JB_X20_X21 * 8)] + ldp x3, x19, [x0, #(_JB_SCS_X19 * 8)] + m_unmangle_registers x2, sp_reg=x10 + mov sp, x10 + + // Restore the low bits of the shadow call stack pointer. + and x18, x18, #~SCS_MASK + orr x18, x3, x18 + + stp x0, x1, [sp, #-16]! + .cfi_adjust_cfa_offset 16 + .cfi_rel_offset x0, 0 + .cfi_rel_offset x1, 8 + stp x30, xzr, [sp, #-16]! + .cfi_adjust_cfa_offset 16 + .cfi_rel_offset x30, 0 + ldr x0, [x0, #(_JB_SIGFLAG * 8)] + //bl __bionic_setjmp_cookie_check + ldp x30, xzr, [sp], #16 + .cfi_adjust_cfa_offset -16 + .cfi_restore x30 + ldp x0, x1, [sp], #16 + .cfi_adjust_cfa_offset -16 + .cfi_restore x0 + .cfi_restore x1 + + // Restore floating point registers. + ldp d14, d15, [x0, #(_JB_D14_D15 * 8)] + ldp d12, d13, [x0, #(_JB_D12_D13 * 8)] + ldp d10, d11, [x0, #(_JB_D10_D11 * 8)] + ldp d8, d9, [x0, #(_JB_D8_D9 * 8)] + + // Set return value. + cmp w1, wzr + csinc w0, w1, wzr, ne + ret +END(siglongjmp) + +ALIAS_SYMBOL(longjmp, siglongjmp) +.hidden longjmp +ALIAS_SYMBOL(_longjmp, siglongjmp) +.hidden _longjmp From fb19fd18c6d1d21ee458fbdf4a84a4355cf51f6d Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sat, 17 Dec 2022 00:20:40 +0000 Subject: [PATCH 004/244] bump(main/esbuild): 0.16.8 This commit has been automatically submitted by Github Actions. --- packages/esbuild/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/esbuild/build.sh b/packages/esbuild/build.sh index 456400a61a..5bed7f5d3e 100644 --- a/packages/esbuild/build.sh +++ b/packages/esbuild/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://esbuild.github.io/ TERMUX_PKG_DESCRIPTION="An extremely fast JavaScript bundler" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.16.7" +TERMUX_PKG_VERSION="0.16.8" TERMUX_PKG_SRCURL=https://github.com/evanw/esbuild/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=b59db890a745fbeee1891aabe3710ef7093a6fdfa2910da029f5e8028a2514e0 +TERMUX_PKG_SHA256=a5643a69fe5c2b5ee33cecf31a7251b35b404f5c544ea5ae65841bfe210af368 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true From 148cff05702313a5d810be13baaf946247bf929e Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sat, 17 Dec 2022 00:23:02 +0000 Subject: [PATCH 005/244] bump(main/flyctl): 0.0.441 This commit has been automatically submitted by Github Actions. --- packages/flyctl/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/flyctl/build.sh b/packages/flyctl/build.sh index ed2ce7d6ff..558ff23790 100644 --- a/packages/flyctl/build.sh +++ b/packages/flyctl/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://fly.io TERMUX_PKG_DESCRIPTION="Command line tools for fly.io services" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="Yaksh Bariya " -TERMUX_PKG_VERSION="0.0.440" +TERMUX_PKG_VERSION="0.0.441" TERMUX_PKG_SRCURL=https://github.com/superfly/flyctl/archive/v$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=aa35190dcafd11dbb314ead2824f8edf68f19ea440a106d1fdbf1c24961972f9 +TERMUX_PKG_SHA256=3d3c560c72e1c087940c71904f88dba77e1c1186319e7bba5c5a6563696187a4 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_BLACKLISTED_ARCHES="i686, arm" From 5f80fb6e0e0d7c21ea7195f3d24e68f417f042dd Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sat, 17 Dec 2022 00:26:08 +0000 Subject: [PATCH 006/244] bump(main/mautrix-whatsapp): 0.8.0 This commit has been automatically submitted by Github Actions. --- packages/mautrix-whatsapp/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mautrix-whatsapp/build.sh b/packages/mautrix-whatsapp/build.sh index 0391619a23..d752eb897b 100644 --- a/packages/mautrix-whatsapp/build.sh +++ b/packages/mautrix-whatsapp/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://maunium.net/go/mautrix-whatsapp/ TERMUX_PKG_DESCRIPTION="A Matrix-WhatsApp puppeting bridge" TERMUX_PKG_LICENSE="AGPL-V3" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.7.2" +TERMUX_PKG_VERSION="0.8.0" TERMUX_PKG_SRCURL=https://github.com/mautrix/whatsapp/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=545ebd9610744ea3dc2fd6ce552f0f1cda64a80a1611dd590cf905491903e89e +TERMUX_PKG_SHA256=2417943a5f7e2799c1a4f74f57a5311a183413c0c3a63cfcfaaa0dcaa8c3b9f8 TERMUX_PKG_DEPENDS="libolm" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_AUTO_UPDATE=true From 2218a768627d3e3eedebeb2a2416a441e6b266bb Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 16 Dec 2022 10:12:53 +0900 Subject: [PATCH 007/244] rust: Bump to 1.66.0 --- packages/rust/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/rust/build.sh b/packages/rust/build.sh index 839694ec4c..a3b86118e6 100644 --- a/packages/rust/build.sh +++ b/packages/rust/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.rust-lang.org/ TERMUX_PKG_DESCRIPTION="Systems programming language focused on safety, speed and concurrency" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.65.0 +TERMUX_PKG_VERSION=1.66.0 TERMUX_PKG_SRCURL=https://static.rust-lang.org/dist/rustc-$TERMUX_PKG_VERSION-src.tar.xz -TERMUX_PKG_SHA256=2d6aa2ea3fedd55acbbd65f78349385f9daa9c14e25db7a8df5d015588eee1cf +TERMUX_PKG_SHA256=0dc176e34fae9871f855a6ba4cb30fa19d69c5b4428d29281a07419c4950715c _LLVM_MAJOR_VERSION=$(. $TERMUX_SCRIPTDIR/packages/libllvm/build.sh; echo $LLVM_MAJOR_VERSION) _LLVM_MAJOR_VERSION_NEXT=$((_LLVM_MAJOR_VERSION + 1)) TERMUX_PKG_DEPENDS="libc++, clang, openssl, lld, zlib, libllvm (<< $_LLVM_MAJOR_VERSION_NEXT)" @@ -67,7 +67,7 @@ termux_step_configure() { # like 30 to 40 + minutes ... so lets get it right # upstream only tests build ver one version behind $TERMUX_PKG_VERSION - local BOOTSTRAP_VERSION=1.64.0 + local BOOTSTRAP_VERSION=1.65.0 rustup install $BOOTSTRAP_VERSION rustup default $BOOTSTRAP_VERSION-x86_64-unknown-linux-gnu export PATH=$HOME/.rustup/toolchains/$BOOTSTRAP_VERSION-x86_64-unknown-linux-gnu/bin:$PATH @@ -87,7 +87,7 @@ termux_step_configure() { export RUST_LIBDIR=$TERMUX_PKG_BUILDDIR/_lib export CARGO_TARGET_${env_host}_RUSTFLAGS="-L$RUST_LIBDIR -C link-arg=-l:libgetloadavg.a" - if [ "$TERMUX_ARCH" == "x86_64" ]; then + if [ "$TERMUX_ARCH" = "aarch64" ] || [ "$TERMUX_ARCH" = "x86_64" ]; then export CARGO_TARGET_${env_host}_RUSTFLAGS+=" -C link-arg=$($CC -print-libgcc-file-name) -C link-arg=-l:libunwind.a" fi From 28f2d6886f2783887366cf8e23ecd527e5f57276 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sat, 17 Dec 2022 00:34:56 +0000 Subject: [PATCH 008/244] bump(main/ruff): 0.0.184 This commit has been automatically submitted by Github Actions. --- packages/ruff/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ruff/build.sh b/packages/ruff/build.sh index 8f13606640..7e91e61e3d 100644 --- a/packages/ruff/build.sh +++ b/packages/ruff/build.sh @@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE="https://github.com/charliermarsh/ruff" TERMUX_PKG_DESCRIPTION="An extremely fast Python linter, written in Rust" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.0.183" +TERMUX_PKG_VERSION="0.0.184" TERMUX_PKG_SRCURL="https://github.com/charliermarsh/ruff/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz" -TERMUX_PKG_SHA256=e69b2c5e49147df95c97322d80d9a520b4fdfceb88f6bd3b2c375c0047e26049 +TERMUX_PKG_SHA256=d1bfeea6b044e29f81581bd9231f14abe3f62d001b30c72bcf2d578fd45e7ae2 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true From 1af302beea7117caf270f14768fbcb02f0be09d9 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sat, 17 Dec 2022 00:37:17 +0000 Subject: [PATCH 009/244] bump(x11/gl4es): 1.1.4.20221216.213930g3e1a3557 This commit has been automatically submitted by Github Actions. --- x11-packages/gl4es/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/x11-packages/gl4es/build.sh b/x11-packages/gl4es/build.sh index e286a4017d..88d40cefb7 100644 --- a/x11-packages/gl4es/build.sh +++ b/x11-packages/gl4es/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://ptitseb.github.io/gl4es/ TERMUX_PKG_DESCRIPTION="OpenGL driver for GLES devices" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -_COMMIT=30f4d0631d28b84a7858fc58278324f87ac008b4 -_COMMIT_DATE=20221205 -_COMMIT_TIME=214747 -TERMUX_PKG_VERSION="1.1.4.20221205.214747g30f4d063" +_COMMIT=3e1a355713d82978c9bcf467aab2e3b273b77384 +_COMMIT_DATE=20221216 +_COMMIT_TIME=213930 +TERMUX_PKG_VERSION="1.1.4.20221216.213930g3e1a3557" TERMUX_PKG_SRCURL=https://github.com/ptitSeb/gl4es.git TERMUX_PKG_GIT_BRANCH=master TERMUX_PKG_DEPENDS="libx11" From 8316853a86e8dcbdbd6dbe1334bd3407ce8c7170 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sat, 17 Dec 2022 08:58:11 +0900 Subject: [PATCH 010/244] libmpc: Bump to 1.3.1 --- packages/libmpc/build.sh | 4 +-- packages/libmpc/mpc-1.3.0-mpc.h.patch | 35 --------------------------- 2 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 packages/libmpc/mpc-1.3.0-mpc.h.patch diff --git a/packages/libmpc/build.sh b/packages/libmpc/build.sh index 833038345d..028fd96651 100644 --- a/packages/libmpc/build.sh +++ b/packages/libmpc/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=http://www.multiprecision.org/ TERMUX_PKG_DESCRIPTION="Library for the arithmetic of complex numbers with arbitrarily high precision" TERMUX_PKG_LICENSE="LGPL-3.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.3.0 +TERMUX_PKG_VERSION=1.3.1 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/mpc/mpc-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=0e3b12181d37207230f5a7a7ddcfc22abfc5fc9c05825e1a65401a489a432a2a +TERMUX_PKG_SHA256=ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8 TERMUX_PKG_DEPENDS="libgmp, libmpfr" TERMUX_PKG_BREAKS="libmpc-dev" TERMUX_PKG_REPLACES="libmpc-dev" diff --git a/packages/libmpc/mpc-1.3.0-mpc.h.patch b/packages/libmpc/mpc-1.3.0-mpc.h.patch deleted file mode 100644 index 22899ccfb1..0000000000 --- a/packages/libmpc/mpc-1.3.0-mpc.h.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://gitlab.inria.fr/mpc/mpc/-/commit/e944aa454e60cbff8ab4e8c70dd974083398378f - -From e944aa454e60cbff8ab4e8c70dd974083398378f Mon Sep 17 00:00:00 2001 -From: Paul Zimmermann -Date: Sat, 10 Dec 2022 08:47:51 +0100 -Subject: [PATCH] functions with FILE arguments should be defined only when - stdio.h is included - ---- - src/mpc.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/mpc.h b/src/mpc.h -index bb1334f..31c7990 100644 ---- a/src/mpc.h -+++ b/src/mpc.h -@@ -270,6 +270,7 @@ __MPC_DECLSPEC long double _Complex mpc_get_ldc (mpc_srcptr, mpc_rnd_t); - __MPC_DECLSPEC int mpc_inp_str (mpc_ptr, FILE *, size_t *, int, mpc_rnd_t); - __MPC_DECLSPEC size_t mpc_out_str (FILE *, int, size_t, mpc_srcptr, mpc_rnd_t); - __MPC_DECLSPEC void mpcb_out_str (FILE *f, mpcb_srcptr); -+__MPC_DECLSPEC void mpcr_out_str (FILE *f, mpcr_srcptr r); - #endif - - __MPC_DECLSPEC int mpcr_inf_p (mpcr_srcptr r); -@@ -284,7 +285,6 @@ __MPC_DECLSPEC void mpcr_set_ui64_2si64 (mpcr_ptr r, uint64_t mant, - int64_t exp); - __MPC_DECLSPEC void mpcr_max (mpcr_ptr r, mpcr_srcptr s, mpcr_srcptr t); - __MPC_DECLSPEC int64_t mpcr_get_exp (mpcr_srcptr r); --__MPC_DECLSPEC void mpcr_out_str (FILE *f, mpcr_srcptr r); - __MPC_DECLSPEC void mpcr_mul (mpcr_ptr r, mpcr_srcptr s, mpcr_srcptr t); - __MPC_DECLSPEC void mpcr_mul_2ui (mpcr_ptr r, mpcr_srcptr s, - unsigned long int e); --- -GitLab - From 0a687caa5a2c0a347192bda88eaa634dcd48a8e1 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sat, 17 Dec 2022 08:56:20 +0900 Subject: [PATCH 011/244] harfbuzz: Bump to 6.0.0 --- packages/harfbuzz/build.sh | 5 ++--- packages/harfbuzz/gir/{5.3.1 => 6.0.0}/HarfBuzz-0.0.xml | 0 2 files changed, 2 insertions(+), 3 deletions(-) rename packages/harfbuzz/gir/{5.3.1 => 6.0.0}/HarfBuzz-0.0.xml (100%) diff --git a/packages/harfbuzz/build.sh b/packages/harfbuzz/build.sh index 661bfb47b1..4c021e61db 100644 --- a/packages/harfbuzz/build.sh +++ b/packages/harfbuzz/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz/ TERMUX_PKG_DESCRIPTION="OpenType text shaping engine" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="5.3.1" -TERMUX_PKG_REVISION=2 +TERMUX_PKG_VERSION=6.0.0 TERMUX_PKG_SRCURL=https://github.com/harfbuzz/harfbuzz/archive/${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=77c8c903f4539b050a6d3a5be79705c7ccf7b1cb66d68152a651486e261edbd2 +TERMUX_PKG_SHA256=6d753948587db3c7c3ba8cc4f8e6bf83f5c448d2591a9f7ec306467f3a4fe4fa TERMUX_PKG_AUTO_UPDATE=false TERMUX_PKG_DEPENDS="freetype, glib, libbz2, libc++, libpng, libgraphite" TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner" diff --git a/packages/harfbuzz/gir/5.3.1/HarfBuzz-0.0.xml b/packages/harfbuzz/gir/6.0.0/HarfBuzz-0.0.xml similarity index 100% rename from packages/harfbuzz/gir/5.3.1/HarfBuzz-0.0.xml rename to packages/harfbuzz/gir/6.0.0/HarfBuzz-0.0.xml From eb12cd95953228fdc5d601ffd929be9b098eb8f9 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sat, 17 Dec 2022 08:59:16 +0900 Subject: [PATCH 012/244] ristretto: Bump to 0.12.4 --- x11-packages/ristretto/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-packages/ristretto/build.sh b/x11-packages/ristretto/build.sh index db9796d87a..4dc2435e4d 100644 --- a/x11-packages/ristretto/build.sh +++ b/x11-packages/ristretto/build.sh @@ -3,8 +3,8 @@ TERMUX_PKG_DESCRIPTION="The Ristretto Image Viewer is an application that can be TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" _MAJOR_VERSION=0.12 -TERMUX_PKG_VERSION=${_MAJOR_VERSION}.3 +TERMUX_PKG_VERSION=${_MAJOR_VERSION}.4 TERMUX_PKG_SRCURL=https://archive.xfce.org/src/apps/ristretto/${_MAJOR_VERSION}/ristretto-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=868f7021225fa170a2f4716c1d7823bf25ad7aab237687755855799588cd3f3e +TERMUX_PKG_SHA256=e4005c9743e5ecf329fb93d1171746c4250aecb2bd411dcf8d8e9cb904e87930 TERMUX_PKG_DEPENDS="file, gdk-pixbuf, glib, gtk3, libcairo, libexif, libx11, libxfce4ui, libxfce4util, pango, xfconf" TERMUX_PKG_RECOMMENDS="tumbler" From b47980cc7d00f1f237c5b7c5ec29c1740a8e5ff0 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sat, 17 Dec 2022 09:01:42 +0900 Subject: [PATCH 013/244] xfce4-notifyd: Bump to 0.6.5 --- x11-packages/xfce4-notifyd/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/x11-packages/xfce4-notifyd/build.sh b/x11-packages/xfce4-notifyd/build.sh index 7a59740a09..518ca3b6f5 100644 --- a/x11-packages/xfce4-notifyd/build.sh +++ b/x11-packages/xfce4-notifyd/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://docs.xfce.org/apps/notifyd/start TERMUX_PKG_DESCRIPTION="simple, visually-appealing notification daemon for Xfce" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Yisus7u7 " -TERMUX_PKG_VERSION=0.6.4 -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SRCURL="http://deb.debian.org/debian/pool/main/x/xfce4-notifyd/xfce4-notifyd_${TERMUX_PKG_VERSION}.orig.tar.bz2" -TERMUX_PKG_SHA256=0ece78f091f895374aad81a3bdc00701080b4ed07f7322fb680c4234319120f6 +_MAJOR_VERSION=0.6 +TERMUX_PKG_VERSION=${_MAJOR_VERSION}.5 +TERMUX_PKG_SRCURL=https://archive.xfce.org/src/apps/xfce4-notifyd/${_MAJOR_VERSION}/xfce4-notifyd-${TERMUX_PKG_VERSION}.tar.bz2 +TERMUX_PKG_SHA256=5b7130e49905e760231c918843a42f72f04911893b0d7c0e57ed040faebb4510 TERMUX_PKG_DEPENDS="atk, gdk-pixbuf, glib, gtk3, harfbuzz, libcairo, libnotify, libx11, libxfce4ui, libxfce4util, pango, xfce4-panel, xfconf" TERMUX_PKG_BUILD_IN_SRC=true From fb5aa4d6048479fe377cfe9c1626f67908bdc95a Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sat, 17 Dec 2022 10:17:04 +0900 Subject: [PATCH 014/244] xfce4-taskmanager: Bump to 1.5.5 --- x11-packages/xfce4-taskmanager/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-packages/xfce4-taskmanager/build.sh b/x11-packages/xfce4-taskmanager/build.sh index 1a742a40d0..5c30ab7255 100644 --- a/x11-packages/xfce4-taskmanager/build.sh +++ b/x11-packages/xfce4-taskmanager/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Easy to use task manager" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" _MAJOR_VERSION=1.5 -TERMUX_PKG_VERSION=${_MAJOR_VERSION}.4 +TERMUX_PKG_VERSION=${_MAJOR_VERSION}.5 TERMUX_PKG_SRCURL=https://archive.xfce.org/src/apps/xfce4-taskmanager/${_MAJOR_VERSION}/xfce4-taskmanager-$TERMUX_PKG_VERSION.tar.bz2 -TERMUX_PKG_SHA256=25b13e890d14ce453ece19eb6201b4a9a4f3e3b324b947db9047ce79cc3ae62a +TERMUX_PKG_SHA256=f64f01ba241a0b8bbf2ed3274e5decc2313c9f8b0e4d160db3ba69b331558ae5 TERMUX_PKG_DEPENDS="gdk-pixbuf, glib, gtk3, libcairo, libwnck, libx11, libxfce4ui, libxfce4util, libxmu, xfconf" From 620ab2363c9c9d5784a48073de6a269dd3fbf36a Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sat, 17 Dec 2022 12:11:12 +0900 Subject: [PATCH 015/244] yq: Bump to 4.30.6 --- packages/yq/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/yq/build.sh b/packages/yq/build.sh index 15658a3f25..8406b58dce 100644 --- a/packages/yq/build.sh +++ b/packages/yq/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://mikefarah.gitbook.io/yq/ TERMUX_PKG_DESCRIPTION="A lightweight and portable command-line YAML, JSON and XML processor" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="4.30.5" +TERMUX_PKG_VERSION=4.30.6 TERMUX_PKG_SRCURL=https://github.com/mikefarah/yq/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=54706926e44ca8f28c74c0165c4746f372daafd4db885b709fdaf5e8f2e4502c +TERMUX_PKG_SHA256=320d0ce36d1dbe703b4cbdb28e9a927c1e87b157e8c05aeb078d6c9c1b0138ea TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_AUTO_UPDATE=true From 017c88a2ff4124cfa5d65bfa8638638c2bac783c Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sat, 17 Dec 2022 12:23:44 +0900 Subject: [PATCH 016/244] docker-compose: Bump to 2.14.1 --- root-packages/docker-compose/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root-packages/docker-compose/build.sh b/root-packages/docker-compose/build.sh index 17a12232a9..d11ebdcccd 100644 --- a/root-packages/docker-compose/build.sh +++ b/root-packages/docker-compose/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/docker/compose TERMUX_PKG_DESCRIPTION="Compose is a tool for defining and running multi-container Docker applications." TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=2.14.0 +TERMUX_PKG_VERSION=2.14.1 TERMUX_PKG_SRCURL="https://github.com/docker/compose/archive/v${TERMUX_PKG_VERSION}.tar.gz" -TERMUX_PKG_SHA256=003efb3139298aa4795f7a9fa4723ef43c12b401c235fe0c93dd23cc2c6b5f2e +TERMUX_PKG_SHA256=4e3e92169ad9142718a168b71dc5027f173be4cdb6563f42c60677818efd7509 TERMUX_PKG_DEPENDS=docker termux_step_make() { From 9fb0a0e9b461e590aabba14cdfcd6e03243ce684 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sat, 17 Dec 2022 12:22:10 +0900 Subject: [PATCH 017/244] docker: Bump to 20.10.22 --- root-packages/docker/build.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/root-packages/docker/build.sh b/root-packages/docker/build.sh index b4ca0a4058..1baf83bc90 100644 --- a/root-packages/docker/build.sh +++ b/root-packages/docker/build.sh @@ -2,15 +2,15 @@ TERMUX_PKG_HOMEPAGE=https://docker.com TERMUX_PKG_DESCRIPTION="Set of products that use OS-level virtualization to deliver software in packages called containers." TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=20.10.21 -LIBNETWORK_COMMIT=399a3439d84b3b6ba6077ba08cadea506b52547c -DOCKER_GITCOMMIT=baeda1f +TERMUX_PKG_VERSION=20.10.22 +LIBNETWORK_COMMIT=dcdf8f176d1e13ad719e913e796fb698d846de98 +DOCKER_GITCOMMIT=3a2c30b TERMUX_PKG_SRCURL=(https://github.com/moby/moby/archive/v${TERMUX_PKG_VERSION}.tar.gz https://github.com/docker/cli/archive/v${TERMUX_PKG_VERSION}.tar.gz https://github.com/moby/libnetwork/archive/${LIBNETWORK_COMMIT}.tar.gz) -TERMUX_PKG_SHA256=(61f4c3a2d0426e1bbbda1b0e5dd33ec203776f7d99d1a61522c77c04c4ed09fe - f0f62ca1c80e8fd5b9e140ca64ef3e75dc7cf7a28040b3d10b260307128946e8 - 953b909f31c40b434980de180b81b8f7371bafd35888ec0cfd3fa26c7df45977) +TERMUX_PKG_SHA256=(ee0e2168e27ec87f1b0650e86af5d3e167a07fd2ff8c1ce3bb588f0b4f9a4658 + 84d71ac2b508b54e8df9f3ea425aa33e254fd3645fe9bad5619b98eaffb33408 + dbe30210e00fd4fcc63ade49ab3b00ba8fa5a1e90d34b92c1ecc25f8b78149ba) TERMUX_PKG_DEPENDS="containerd, libdevmapper" TERMUX_PKG_CONFFILES="etc/docker/daemon.json" TERMUX_PKG_BUILD_IN_SRC=true From af428a76b2d008e5ae74a9a1c0bc7fb83ab0b1e9 Mon Sep 17 00:00:00 2001 From: s00se <95649696+s00se@users.noreply.github.com> Date: Fri, 16 Dec 2022 22:30:46 -0700 Subject: [PATCH 018/244] proxmark3-git: update to latest master --- packages/proxmark3-git/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/proxmark3-git/build.sh b/packages/proxmark3-git/build.sh index 142cfd494e..8a0e9b5c2e 100644 --- a/packages/proxmark3-git/build.sh +++ b/packages/proxmark3-git/build.sh @@ -1,10 +1,10 @@ TERMUX_PKG_HOMEPAGE="https://github.com/RfidResearchGroup/proxmark3" TERMUX_PKG_DESCRIPTION="The Swiss Army Knife of RFID Research - RRG/Iceman repo" TERMUX_PKG_LICENSE="GPL-3.0" -TERMUX_PKG_MAINTAINER="Marlin Sööse " -_COMMIT=b8ef82e5174a3e74879c337a717a8174c363e99a -TERMUX_PKG_VERSION="2022.12.10-${_COMMIT:0:8}" -TERMUX_PKG_SHA256="3630cbf6b9e81cbfc22e8a5ef6ba9ac470e84088981582f1f8423bd96a0ae0f2" +TERMUX_PKG_MAINTAINER="Marlin Sööse " +_COMMIT=e049a7c5a38ad6e04607614553a6b4989df8724f +TERMUX_PKG_VERSION="2022.12.16-${_COMMIT:0:8}" +TERMUX_PKG_SHA256="0a685416d97873877bc490f19d3531984ca475a32b833f254d89a8025c34abbc" TERMUX_PKG_SRCURL="https://github.com/RfidResearchGroup/proxmark3/archive/${_COMMIT}.tar.gz" TERMUX_PKG_DEPENDS="libbz2, libc++, readline" TERMUX_PKG_BUILD_IN_SRC="true" From 5dbc64437f32b34688b01b97f61936afab581582 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sat, 17 Dec 2022 14:54:53 +0900 Subject: [PATCH 019/244] pipewire: Bump to 0.3.63 --- packages/pipewire/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/pipewire/build.sh b/packages/pipewire/build.sh index 1f621a1b71..13724dc6c9 100644 --- a/packages/pipewire/build.sh +++ b/packages/pipewire/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="A server and user space API to deal with multimedia pipe TERMUX_PKG_LICENSE="MIT, LGPL-2.1, LGPL-3.0, GPL-2.0" TERMUX_PKG_LICENSE_FILE="COPYING, LICENSE" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=0.3.62 +TERMUX_PKG_VERSION=0.3.63 TERMUX_PKG_SRCURL="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${TERMUX_PKG_VERSION}/pipewire-${TERMUX_PKG_VERSION}.tar.bz2" -TERMUX_PKG_SHA256=24b218cf3bb1fb279c8c489c14cc9ae483e1da7b4c8215b2ee5a5ee831bae94f +TERMUX_PKG_SHA256=b7f27a2c45b3317daf8f8d72e78b457b3cf2991f455678678a382e9fce3dad62 TERMUX_PKG_DEPENDS="avahi, ffmpeg, glib, libc++, liblua54, libsndfile, libwebrtc-audio-processing, lilv, openssl, pulseaudio" # 'media-session' session-managers is disabled as it requires alsa. From d6819862d196d963eb1ab636412a02d6cd3ba69f Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sat, 17 Dec 2022 14:55:55 +0900 Subject: [PATCH 020/244] redis: Bump to 7.0.7 --- packages/redis/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/redis/build.sh b/packages/redis/build.sh index 6450a6c21b..54189108fa 100644 --- a/packages/redis/build.sh +++ b/packages/redis/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://redis.io/ TERMUX_PKG_DESCRIPTION="In-memory data structure store used as a database, cache and message broker" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=7.0.6 +TERMUX_PKG_VERSION=7.0.7 TERMUX_PKG_SRCURL=https://download.redis.io/releases/redis-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=7b33a7e890d13e27af1f246acb16312669ad8a1d56ce8f807dfbcd3c09aa7bb3 +TERMUX_PKG_SHA256=8d327d7e887d1bb308fc37aaf717a0bf79f58129e3739069aaeeae88955ac586 TERMUX_PKG_DEPENDS="libandroid-execinfo, libandroid-glob" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_CONFFILES="etc/redis.conf" From 11b98bdeffa8050886d01ae69782a1d92dd87c28 Mon Sep 17 00:00:00 2001 From: s00se <95649696+s00se@users.noreply.github.com> Date: Fri, 16 Dec 2022 23:06:54 -0700 Subject: [PATCH 021/244] proxmark3: update contact --- packages/proxmark3/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/proxmark3/build.sh b/packages/proxmark3/build.sh index 2fbb712db0..6570292dc2 100644 --- a/packages/proxmark3/build.sh +++ b/packages/proxmark3/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE="https://github.com/RfidResearchGroup/proxmark3" TERMUX_PKG_DESCRIPTION="The Swiss Army Knife of RFID Research - RRG/Iceman repo" TERMUX_PKG_LICENSE="GPL-3.0" -TERMUX_PKG_MAINTAINER="Marlin Sööse " +TERMUX_PKG_MAINTAINER="Marlin Sööse " TERMUX_PKG_VERSION=1:4.15864 TERMUX_PKG_SRCURL=https://github.com/RfidResearchGroup/proxmark3/archive/v${TERMUX_PKG_VERSION:2}.tar.gz TERMUX_PKG_SHA256=0fb778f238813b3b6fbf3bf6901a6699c2e38cee7cf8d65dc8ec5951e65cc0ea From 1572c8c993e769b7f035857c91b2f01f160eff3f Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sat, 17 Dec 2022 06:17:52 +0000 Subject: [PATCH 022/244] bump(main/neovim-nightly): 0.9.0-dev-519+g2d8bbe468 This commit has been automatically submitted by Github Actions. --- packages/neovim-nightly/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/neovim-nightly/build.sh b/packages/neovim-nightly/build.sh index 2942d4e293..ec35aeb30b 100644 --- a/packages/neovim-nightly/build.sh +++ b/packages/neovim-nightly/build.sh @@ -5,9 +5,9 @@ TERMUX_PKG_MAINTAINER="Aditya Alok " # Upstream now has version number like "0.8.0-dev-698-ga5920e98f", but actually # "0.8.0-dev-698-g1ef84547a" < "0.8.0-dev-nightly-10-g1a07044c1", we need to bump # the epoch of the package version. -TERMUX_PKG_VERSION="1:0.9.0-dev-514+g72a19b2ff" +TERMUX_PKG_VERSION="1:0.9.0-dev-519+g2d8bbe468" TERMUX_PKG_SRCURL="https://github.com/neovim/neovim/archive/nightly.tar.gz" -TERMUX_PKG_SHA256=29b549c50c00a057c48681dbc423caa06e9efab39ca47aa458e07c81385dd62a +TERMUX_PKG_SHA256=c773c92b219b3e3565c2298d44cc6f09639087ce91b6ab8f707a6d72bf185f7e TERMUX_PKG_DEPENDS="libiconv, libuv, luv, libmsgpack, libandroid-support, libvterm, libtermkey, libluajit, libunibilium, libtreesitter" TERMUX_PKG_HOSTBUILD=true From c8e6621d80a28578a33ca86e3c0a75b72383dbd1 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sat, 17 Dec 2022 06:26:28 +0000 Subject: [PATCH 023/244] bump(main/ruff): 0.0.185 This commit has been automatically submitted by Github Actions. --- packages/ruff/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ruff/build.sh b/packages/ruff/build.sh index 7e91e61e3d..65cb86dcbd 100644 --- a/packages/ruff/build.sh +++ b/packages/ruff/build.sh @@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE="https://github.com/charliermarsh/ruff" TERMUX_PKG_DESCRIPTION="An extremely fast Python linter, written in Rust" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.0.184" +TERMUX_PKG_VERSION="0.0.185" TERMUX_PKG_SRCURL="https://github.com/charliermarsh/ruff/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz" -TERMUX_PKG_SHA256=d1bfeea6b044e29f81581bd9231f14abe3f62d001b30c72bcf2d578fd45e7ae2 +TERMUX_PKG_SHA256=34c209f9ae9c7e8608f787283f41edf1e28c291003d5029968a56352fa2b0de7 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true From e3273f165393ac8d3c67bde4a655b44a69174fc0 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 16 Dec 2022 10:59:36 +0900 Subject: [PATCH 024/244] libtiff: Bump to 4.5.0 Involves SOVERSION change (from 5 to 6). Revdep rebuild follows. --- packages/libtiff/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/libtiff/build.sh b/packages/libtiff/build.sh index 39acbf66c8..3346906f60 100644 --- a/packages/libtiff/build.sh +++ b/packages/libtiff/build.sh @@ -1,11 +1,11 @@ TERMUX_PKG_HOMEPAGE=http://www.simplesystems.org/libtiff/ # Note that http://libtiff.org/ is hijacked TERMUX_PKG_DESCRIPTION="Support for the Tag Image File Format (TIFF) for storing image data" TERMUX_PKG_LICENSE="custom" -TERMUX_PKG_LICENSE_FILE="COPYRIGHT" +TERMUX_PKG_LICENSE_FILE="LICENSE.md" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=4.4.0 +TERMUX_PKG_VERSION=4.5.0 TERMUX_PKG_SRCURL=https://download.osgeo.org/libtiff/tiff-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=49307b510048ccc7bc40f2cba6e8439182fe6e654057c1a1683139bf2ecb1dc1 +TERMUX_PKG_SHA256=dafac979c5e7b6c650025569c5a4e720995ba5f17bc17e6276d1f12427be267c TERMUX_PKG_DEPENDS="libc++, libjpeg-turbo, liblzma, zlib, zstd" TERMUX_PKG_BREAKS="libtiff-dev" TERMUX_PKG_REPLACES="libtiff-dev" From ec4eb507e152aeaee742ecbf5c31617ed2061dd8 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 16 Dec 2022 11:27:04 +0900 Subject: [PATCH 025/244] libtiff: Revbump revdeps to rebuild --- packages/chafa/build.sh | 1 + packages/dcmtk/build.sh | 5 +++-- packages/djvulibre/build.sh | 2 +- packages/enblend/build.sh | 2 +- packages/gdk-pixbuf/build.sh | 1 + packages/gegl/build.sh | 1 + packages/ghostscript/build.sh | 1 + packages/gmic/build.sh | 2 +- packages/go-findimagedupes/build.sh | 1 + packages/graphicsmagick/build.sh | 4 ++-- packages/imagemagick/build.sh | 3 ++- packages/imlib2/build.sh | 4 ++-- packages/jbig2enc/build.sh | 4 +++- packages/leptonica/build.sh | 2 +- packages/libdevil/build.sh | 2 +- packages/libgd/build.sh | 6 +++-- packages/libgeotiff/build.sh | 1 + packages/libgxps/build.sh | 1 + packages/libpano13/build.sh | 1 + packages/libvigra/build.sh | 2 +- packages/libvips/build.sh | 3 ++- packages/libwebp/build.sh | 1 + packages/links/build.sh | 3 ++- packages/littlecms/build.sh | 1 + packages/netpbm/build.sh | 6 +++-- .../netpbm/buildtools-installnetpbm.pl.patch | 22 +++++++++++++++++++ packages/netpbm/config.mk.in.patch | 11 ++++++++++ packages/opencv/build.sh | 4 ++-- packages/opencv/opencv-python.subpackage.sh | 2 +- packages/openjpeg/build.sh | 1 + packages/poppler/build.sh | 1 + packages/povray/build.sh | 2 +- packages/proj/build.sh | 1 + packages/python-pillow/build.sh | 1 + x11-packages/azpainter/build.sh | 8 ++++++- x11-packages/emacs-x/build.sh | 1 + x11-packages/evince/build.sh | 1 + x11-packages/fontforge-gtk/build.sh | 2 +- x11-packages/gimp/build.sh | 4 ++-- x11-packages/gtk4/build.sh | 1 + x11-packages/hugin/build.sh | 2 +- x11-packages/mtpaint/build.sh | 6 ++--- x11-packages/sdl-image/build.sh | 3 ++- x11-packages/sdl2-image/build.sh | 3 ++- x11-packages/wmaker/build.sh | 8 +++---- x11-packages/wxwidgets/build.sh | 1 + 46 files changed, 106 insertions(+), 39 deletions(-) create mode 100644 packages/netpbm/config.mk.in.patch diff --git a/packages/chafa/build.sh b/packages/chafa/build.sh index f81ac8827e..24da4e13cc 100644 --- a/packages/chafa/build.sh +++ b/packages/chafa/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Image-to-text converter supporting a wide range of symbo TERMUX_PKG_LICENSE="LGPL-3.0" TERMUX_PKG_MAINTAINER="Yonle " TERMUX_PKG_VERSION=1.12.4 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL="https://github.com/hpjansson/chafa/releases/download/${TERMUX_PKG_VERSION}/chafa-${TERMUX_PKG_VERSION}.tar.xz" TERMUX_PKG_SHA256=9774bd1a7076ea3124f7fea811e371d0e1da2e76b7ac06260d63a86c7b1a573f TERMUX_PKG_DEPENDS="freetype, glib, imagemagick, libcairo, libjpeg-turbo, librsvg, libtiff, libwebp" diff --git a/packages/dcmtk/build.sh b/packages/dcmtk/build.sh index ce453f6820..365a370a10 100644 --- a/packages/dcmtk/build.sh +++ b/packages/dcmtk/build.sh @@ -5,10 +5,11 @@ TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_LICENSE_FILE="COPYRIGHT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="3.6.7" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL="https://github.com/DCMTK/dcmtk/archive/refs/tags/DCMTK-$TERMUX_PKG_VERSION.tar.gz" TERMUX_PKG_SHA256=17705dcdb2047d1266bb4e92dbf4aa6d4967819e8e3e94f39b7df697661b4860 -TERMUX_PKG_DEPENDS="libc++, zlib, libpng, libtiff, libxml2, openssl, libiconv, libjpeg-turbo, libsndfile" +TERMUX_PKG_DEPENDS="libc++, libiconv, libjpeg-turbo, libpng, libtiff, libxml2, openssl, zlib" +TERMUX_PKG_BUILD_DEPENDS="libsndfile" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DDCMTK_NO_TRY_RUN=ON diff --git a/packages/djvulibre/build.sh b/packages/djvulibre/build.sh index 0d6688887e..ae353d815c 100644 --- a/packages/djvulibre/build.sh +++ b/packages/djvulibre/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Suite to create, manipulate and view DjVu ('déjà vu') TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=3.5.28 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/djvu/djvulibre-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=fcd009ea7654fde5a83600eb80757bd3a76998e47d13c66b54c8db849f8f2edc TERMUX_PKG_DEPENDS="libc++, libtiff" diff --git a/packages/enblend/build.sh b/packages/enblend/build.sh index 384eed42f5..653b659ecd 100644 --- a/packages/enblend/build.sh +++ b/packages/enblend/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" _VERSION=4.2.0_p20161007 TERMUX_PKG_VERSION=${_VERSION//_/} -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://dev.gentoo.org/~soap/distfiles/enblend-${_VERSION}.tar.xz TERMUX_PKG_SHA256=4fe05af3d697bd6b2797facc8ba5aeabdc91e233156552301f1c7686232ff4c3 TERMUX_PKG_DEPENDS="gsl, libandroid-glob, libc++, libtiff, libvigra, littlecms" diff --git a/packages/gdk-pixbuf/build.sh b/packages/gdk-pixbuf/build.sh index 70a9d70f26..cb32699c98 100644 --- a/packages/gdk-pixbuf/build.sh +++ b/packages/gdk-pixbuf/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" _MAJOR_VERSION=2.42 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.10 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/${_MAJOR_VERSION}/gdk-pixbuf-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=ee9b6c75d13ba096907a2e3c6b27b61bcd17f5c7ebeab5a5b439d2f2e39fe44b TERMUX_PKG_DEPENDS="glib, libpng, libtiff, libjpeg-turbo, zstd" diff --git a/packages/gegl/build.sh b/packages/gegl/build.sh index 5d709645b3..f3a069ca72 100644 --- a/packages/gegl/build.sh +++ b/packages/gegl/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" _MAJOR_VERSION=0.4 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.40 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://download.gimp.org/pub/gegl/${_MAJOR_VERSION}/gegl-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=cdde80d15a49dab9a614ef98f804c8ce6e4cfe1339a3c240c34f3fb45436b85d TERMUX_PKG_DEPENDS="babl, ffmpeg, gdk-pixbuf, glib, json-glib, libandroid-support, libc++, libcairo, libjasper, libjpeg-turbo, libpng, librsvg, libtiff, libwebp, littlecms, openexr, pango, poppler" diff --git a/packages/ghostscript/build.sh b/packages/ghostscript/build.sh index 20fd790c9d..943ea86372 100644 --- a/packages/ghostscript/build.sh +++ b/packages/ghostscript/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Interpreter for the PostScript language and for PDF" TERMUX_PKG_LICENSE="AGPL-V3" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=10.0.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${TERMUX_PKG_VERSION//.}/ghostpdl-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=f30283f01a6966009a2e7b7553decdb5ec805501f3e24e5d86b0017fe16fbdba TERMUX_PKG_DEPENDS="fontconfig, freetype, jbig2dec, libandroid-support, libc++, libiconv, libidn, libjpeg-turbo, libpng, libtiff, littlecms, openjpeg, zlib" diff --git a/packages/gmic/build.sh b/packages/gmic/build.sh index 29141b1d48..c81a397e68 100644 --- a/packages/gmic/build.sh +++ b/packages/gmic/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Full-featured framework for image processing" TERMUX_PKG_LICENSE="CeCILL-2.1" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2.9.9 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://gmic.eu/files/source/gmic_$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0 TERMUX_PKG_DEPENDS="libc++, libcurl, fftw, libpng, libjpeg-turbo, libtiff, zlib" diff --git a/packages/go-findimagedupes/build.sh b/packages/go-findimagedupes/build.sh index 0f2b6b02e5..482fba6347 100644 --- a/packages/go-findimagedupes/build.sh +++ b/packages/go-findimagedupes/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" _COMMIT=47ca1d51be2bc1d437261d82157b84fe977ec934 TERMUX_PKG_VERSION=2022.07.22 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://gitlab.com/opennota/findimagedupes.git TERMUX_PKG_GIT_BRANCH=master TERMUX_PKG_DEPENDS="file, libc++, libheif, libjpeg-turbo, libpng, libtiff" diff --git a/packages/graphicsmagick/build.sh b/packages/graphicsmagick/build.sh index b18a81b1c1..ac1abb0997 100644 --- a/packages/graphicsmagick/build.sh +++ b/packages/graphicsmagick/build.sh @@ -3,11 +3,11 @@ TERMUX_PKG_DESCRIPTION="Collection of image processing tools" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.3.38 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 # Bandwith limited on main ftp site, so it's asked to use sourceforge instead: TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/${TERMUX_PKG_VERSION}/GraphicsMagick-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=d60cd9db59351d2b9cb19beb443170acaa28f073d13d258f67b3627635e32675 -TERMUX_PKG_DEPENDS="freetype, libbz2, libc++, libjasper, libjpeg-turbo, liblzma, libpng, libtiff, libwebp, libxml2, littlecms, zlib, zstd" +TERMUX_PKG_DEPENDS="freetype, libbz2, libc++, libde265, libheif, libjasper, libjpeg-turbo, liblzma, libpng, libtiff, libwebp, libxml2, littlecms, zlib, zstd" TERMUX_PKG_BREAKS="graphicsmagick-dev" TERMUX_PKG_REPLACES="graphicsmagick++, graphicsmagick-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/packages/imagemagick/build.sh b/packages/imagemagick/build.sh index ceee33a101..1904ec076c 100644 --- a/packages/imagemagick/build.sh +++ b/packages/imagemagick/build.sh @@ -4,10 +4,11 @@ TERMUX_PKG_LICENSE="ImageMagick" TERMUX_PKG_MAINTAINER="@termux" _VERSION=7.1.0-54 TERMUX_PKG_VERSION=${_VERSION//-/.} +TERMUX_PKG_REVISION=1 #TERMUX_PKG_SRCURL=https://github.com/ImageMagick/ImageMagick/archive/refs/tags/${_VERSION}.tar.gz TERMUX_PKG_SRCURL=https://imagemagick.org/archive/releases/ImageMagick-${_VERSION}.tar.xz TERMUX_PKG_SHA256=6d0d952000217b677276a342a4c609776386d0daf2ccf354b6ed8dbc07d22ef7 -TERMUX_PKG_DEPENDS="fftw, fontconfig, freetype, gdk-pixbuf, glib, harfbuzz, libandroid-support, libbz2, libc++, libcairo, libheif, libjpeg-turbo, libjxl, liblzma, libpng, librsvg, libtiff, libwebp, libx11, libxext, libxml2, littlecms, openexr, openjpeg, pango, zlib" +TERMUX_PKG_DEPENDS="fftw, fontconfig, freetype, gdk-pixbuf, glib, harfbuzz, libandroid-support, libbz2, libc++, libcairo, libheif, libjpeg-turbo, libjxl, liblzma, libpng, librsvg, libtiff, libwebp, libx11, libxext, libxml2, littlecms, openexr, openjpeg, pango, zlib, zstd" TERMUX_PKG_BREAKS="imagemagick-dev, imagemagick-x" TERMUX_PKG_REPLACES="imagemagick-dev, imagemagick-x" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/packages/imlib2/build.sh b/packages/imlib2/build.sh index b04d2847cf..fc0ece5157 100644 --- a/packages/imlib2/build.sh +++ b/packages/imlib2/build.sh @@ -4,8 +4,8 @@ TERMUX_PKG_LICENSE="custom" TERMUX_PKG_LICENSE_FILE="COPYING, COPYING-PLAIN" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.9.1 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/enlightenment/imlib2-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=4a224038bfffbe5d4d250c44e05f4ee5ae24dcfef8395b1677c715c58f764d43 -TERMUX_PKG_DEPENDS="freetype, gdk-pixbuf, giflib, glib, libandroid-shmem, libbz2, libcairo, libheif, libid3tag, libjpeg-turbo, libjxl, liblzma, libpng, librsvg, libtiff, libwebp, libx11, libxcb, libxext, openjpeg, zlib" +TERMUX_PKG_DEPENDS="freetype, gdk-pixbuf, giflib, glib, libandroid-shmem, libbz2, libcairo, libheif, libid3tag, libjpeg-turbo, libjxl, liblzma, libpng, librsvg, libtiff, libwebp, libx11, libxcb, libxext, openjpeg, zlib, zstd" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="LIBS=-landroid-shmem" diff --git a/packages/jbig2enc/build.sh b/packages/jbig2enc/build.sh index b375c28cde..55b4c3c72b 100644 --- a/packages/jbig2enc/build.sh +++ b/packages/jbig2enc/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" _COMMIT=ea6a40a2cbf05efb00f3418f2d0ad71232565beb TERMUX_PKG_VERSION=2019.09.08 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/agl/jbig2enc.git TERMUX_PKG_GIT_BRANCH=master TERMUX_PKG_DEPENDS="giflib, leptonica, libc++, libjpeg-turbo, libpng, libtiff, libwebp, python, zlib" @@ -23,4 +23,6 @@ termux_step_post_get_source() { termux_step_pre_configure() { sh autogen.sh + + LDFLAGS+=" $($CC -print-libgcc-file-name)" } diff --git a/packages/leptonica/build.sh b/packages/leptonica/build.sh index 2ad2004b07..25fa10d400 100644 --- a/packages/leptonica/build.sh +++ b/packages/leptonica/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_LICENSE_FILE="leptonica-license.txt" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.82.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/DanBloomberg/leptonica/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=40fa9ac1e815b91e0fa73f0737e60c9eec433a95fa123f95f2573dd3127dd669 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/libdevil/build.sh b/packages/libdevil/build.sh index c3c857d411..ce8e7f5137 100644 --- a/packages/libdevil/build.sh +++ b/packages/libdevil/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A cross-platform image library utilizing a simple syntax TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.8.0 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://github.com/DentonW/DevIL/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=52129f247b26fcb5554643c9e6bbee75c4b9717735fdbf3c6ebff08cee38ad37 TERMUX_PKG_DEPENDS="libc++, libjasper, libjpeg-turbo, libpng, libtiff, littlecms" diff --git a/packages/libgd/build.sh b/packages/libgd/build.sh index 0ba9d1d5c0..842bd528b5 100644 --- a/packages/libgd/build.sh +++ b/packages/libgd/build.sh @@ -1,11 +1,13 @@ TERMUX_PKG_HOMEPAGE=https://libgd.github.io/ TERMUX_PKG_DESCRIPTION="GD is an open source code library for the dynamic creation of images by programmers" -TERMUX_PKG_LICENSE="BSD" +TERMUX_PKG_LICENSE="custom" +TERMUX_PKG_LICENSE_FILE="COPYING" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1:2.3.3 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/libgd/libgd/releases/download/gd-${TERMUX_PKG_VERSION:2}/libgd-${TERMUX_PKG_VERSION:2}.tar.gz TERMUX_PKG_SHA256=dd3f1f0bb016edcc0b2d082e8229c822ad1d02223511997c80461481759b1ed2 -TERMUX_PKG_DEPENDS="freetype, fontconfig, libiconv, libjpeg-turbo, libpng, libtiff, libwebp, zlib" +TERMUX_PKG_DEPENDS="fontconfig, freetype, libheif, libiconv, libjpeg-turbo, libpng, libtiff, libwebp, zlib" TERMUX_PKG_BREAKS="libgd-dev" TERMUX_PKG_REPLACES="libgd-dev" diff --git a/packages/libgeotiff/build.sh b/packages/libgeotiff/build.sh index 7fceeb985f..36454f3a46 100644 --- a/packages/libgeotiff/build.sh +++ b/packages/libgeotiff/build.sh @@ -5,6 +5,7 @@ TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_LICENSE_FILE="LICENSE" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="1.7.1" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL="https://github.com/OSGeo/libgeotiff/archive/refs/tags/$TERMUX_PKG_VERSION.tar.gz" TERMUX_PKG_SHA256=09a0cae5352030011b994a60237743a1327ab95ce482318d45bf9fcb5e5f76b5 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/libgxps/build.sh b/packages/libgxps/build.sh index 3c19ee500b..6a0a744978 100644 --- a/packages/libgxps/build.sh +++ b/packages/libgxps/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" _MAJOR_VERSION=0.3 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://download.gnome.org/sources/libgxps/${_MAJOR_VERSION}/libgxps-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c TERMUX_PKG_DEPENDS="freetype, glib, libarchive, libcairo, libgxps, libjpeg-turbo, libpng, libtiff, littlecms" diff --git a/packages/libpano13/build.sh b/packages/libpano13/build.sh index 8809e1d318..f808e672b6 100644 --- a/packages/libpano13/build.sh +++ b/packages/libpano13/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Part of the Panorama Tools by Helmut Dersch" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2.9.21 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/panotools/libpano13-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=79e5a1452199305e2961462720ef5941152779c127c5b96fc340d2492e633590 TERMUX_PKG_DEPENDS="libjpeg-turbo, libpng, libtiff, zlib" diff --git a/packages/libvigra/build.sh b/packages/libvigra/build.sh index bb2e55a43d..d86b3c1c32 100644 --- a/packages/libvigra/build.sh +++ b/packages/libvigra/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Computer vision library" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.11.1 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://github.com/ukoethe/vigra/releases/download/Version-${TERMUX_PKG_VERSION//./-}/vigra-${TERMUX_PKG_VERSION}-src.tar.gz TERMUX_PKG_SHA256=a5564e1083f6af6a885431c1ee718bad77d11f117198b277557f8558fa461aaf TERMUX_PKG_DEPENDS="libc++, libhdf5, libjpeg-turbo, libpng, libtiff, openexr, zlib" diff --git a/packages/libvips/build.sh b/packages/libvips/build.sh index 1b46058bf0..a112a205d8 100644 --- a/packages/libvips/build.sh +++ b/packages/libvips/build.sh @@ -3,10 +3,11 @@ TERMUX_PKG_DESCRIPTION="A fast image processing library with low memory needs" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="Thibault Meyer " TERMUX_PKG_VERSION="8.13.3" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/libvips/libvips/releases/download/v${TERMUX_PKG_VERSION}/vips-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=4eff5cdc8dbe1a05a926290a99014e20ba386f5dcca38d9774bef61413435d4c TERMUX_PKG_AUTO_UPDATE=true -TERMUX_PKG_DEPENDS="fftw, fontconfig, freetype, giflib, glib, harfbuzz, imagemagick, libc++, libcairo, libexif, libexpat, libheif, libjpeg-turbo, libjxl, libpng, librsvg, libtiff, libwebp, littlecms, openjpeg, pango" +TERMUX_PKG_DEPENDS="fftw, fontconfig, freetype, giflib, glib, harfbuzz, imagemagick, libc++, libcairo, libexif, libexpat, libheif, libjpeg-turbo, libjxl, libpng, librsvg, libtiff, libwebp, littlecms, openexr, openjpeg, pango, poppler" TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner" TERMUX_PKG_DISABLE_GIR=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/packages/libwebp/build.sh b/packages/libwebp/build.sh index ec5a331186..b1432ad85e 100644 --- a/packages/libwebp/build.sh +++ b/packages/libwebp/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Library to encode and decode images in WebP format" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.2.4 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/webmproject/libwebp/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=dfe7bff3390cd4958da11e760b65318f0a48c32913e4d5bc5e8d55abaaa2d32e TERMUX_PKG_DEPENDS="giflib, libjpeg-turbo, libpng, libtiff" diff --git a/packages/links/build.sh b/packages/links/build.sh index 61fb990017..eb645ca6f4 100644 --- a/packages/links/build.sh +++ b/packages/links/build.sh @@ -3,9 +3,10 @@ TERMUX_PKG_DESCRIPTION="Links is a text and graphics mode WWW browser" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2.28 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://links.twibright.com/download/links-$TERMUX_PKG_VERSION.tar.bz2 TERMUX_PKG_SHA256=2fd5499b13dee59457c132c167b8495c40deda75389489c6cccb683193f454b4 -TERMUX_PKG_DEPENDS="brotli, fontconfig, freetype, glib, libbz2, libcairo, libevent, libjpeg-turbo, liblzma, libpng, librsvg, libtiff, libx11, openssl, zlib, zstd" +TERMUX_PKG_DEPENDS="brotli, fontconfig, freetype, glib, libbz2, libcairo, libevent, libjpeg-turbo, liblzma, libpng, librsvg, libtiff, libwebp, libx11, openssl, zlib, zstd" TERMUX_PKG_BUILD_DEPENDS="libxt" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/packages/littlecms/build.sh b/packages/littlecms/build.sh index b1a682dd3d..b74cca9f4e 100644 --- a/packages/littlecms/build.sh +++ b/packages/littlecms/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Color management library" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2.14 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/mm2/Little-CMS/archive/refs/tags/lcms${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=05869269f14e589b0b6d05a76f510c68c67fabb304904d16c6bd818abec80a83 TERMUX_PKG_BREAKS="littlecms-dev" diff --git a/packages/netpbm/build.sh b/packages/netpbm/build.sh index cd2c90596b..5e02bbef7e 100644 --- a/packages/netpbm/build.sh +++ b/packages/netpbm/build.sh @@ -1,11 +1,13 @@ TERMUX_PKG_HOMEPAGE=http://netpbm.sourceforge.net/ TERMUX_PKG_DESCRIPTION="Toolkit for manipulation of graphic images of different formats" -TERMUX_PKG_LICENSE="LGPL-2.0" +TERMUX_PKG_LICENSE="non-free" +TERMUX_PKG_LICENSE_FILE="doc/copyright_summary" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1:10.73.41 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/netpbm/super_stable/${TERMUX_PKG_VERSION:2}/netpbm-${TERMUX_PKG_VERSION:2}.tgz TERMUX_PKG_SHA256=f572625514b52dde4e2b6e567b8e2738b133e50ee3c5b31d80016117440311fe -TERMUX_PKG_DEPENDS="libpng, libxml2, libjpeg-turbo, libtiff, zlib" +TERMUX_PKG_DEPENDS="libjpeg-turbo, libpng, libtiff, libx11, libxml2" TERMUX_PKG_BREAKS="netpbm-dev" TERMUX_PKG_REPLACES="netpbm-dev" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/netpbm/buildtools-installnetpbm.pl.patch b/packages/netpbm/buildtools-installnetpbm.pl.patch index 7e0c97e425..d679f662d2 100644 --- a/packages/netpbm/buildtools-installnetpbm.pl.patch +++ b/packages/netpbm/buildtools-installnetpbm.pl.patch @@ -38,6 +38,28 @@ diff -uNr netpbm-10.73.31/buildtools/installnetpbm.pl netpbm-10.73.31.mod/buildt if (uc($response) eq "Y") { execLdconfig(); +@@ -766,7 +756,7 @@ + my $manDir; + + while (!$manDir) { +- my $default = "$prefix/man"; ++ my $default = "$prefix/share/man"; + + my $response = prompt("man page directory", $default); + +@@ -954,10 +944,10 @@ + + print("Installing man pages...\n"); + +- my $rc = system("$cpCommand $pkgdir/man/* $manDir/"); ++ my $rc = system("$cpCommand $pkgdir/share/man/* $manDir/"); + + if ($rc != 0) { +- print("copy of man pages from $pkgdir/man to $manDir failed.\n"); ++ print("copy of man pages from $pkgdir/share/man to $manDir failed.\n"); + print("cp exit code is $rc\n"); + } else { + print("done.\n"); @@ -967,8 +957,6 @@ removeObsoleteManPage($manDir); diff --git a/packages/netpbm/config.mk.in.patch b/packages/netpbm/config.mk.in.patch new file mode 100644 index 0000000000..57e218ee5c --- /dev/null +++ b/packages/netpbm/config.mk.in.patch @@ -0,0 +1,11 @@ +--- a/config.mk.in ++++ b/config.mk.in +@@ -552,7 +552,7 @@ + + # Subdirectory of the package directory ($(pkgdir)) in which man pages + # go. +-PKGMANDIR = man ++PKGMANDIR = share/man + + # File permissions for installed files. + # Note that on some systems (e.g. Solaris), 'install' can't use the diff --git a/packages/opencv/build.sh b/packages/opencv/build.sh index 3bc8e170d6..0fe4db228a 100644 --- a/packages/opencv/build.sh +++ b/packages/opencv/build.sh @@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="Open Source Computer Vision Library" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=4.6.0 -TERMUX_PKG_REVISION=9 +TERMUX_PKG_REVISION=10 TERMUX_PKG_SRCURL=https://github.com/opencv/opencv/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277 -TERMUX_PKG_DEPENDS="libc++, libjpeg-turbo, libopenblas, libpng, libprotobuf, libtiff, libwebp, openjpeg, openjpeg-tools, zlib, python-numpy" +TERMUX_PKG_DEPENDS="ffmpeg, libc++, libjpeg-turbo, libopenblas, libpng, libprotobuf, libtiff, libwebp, openjpeg, openjpeg-tools, zlib" TERMUX_PKG_BUILD_DEPENDS="python-numpy-static" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DANDROID_NO_TERMUX=OFF diff --git a/packages/opencv/opencv-python.subpackage.sh b/packages/opencv/opencv-python.subpackage.sh index ecb0b2d941..cac2ede865 100644 --- a/packages/opencv/opencv-python.subpackage.sh +++ b/packages/opencv/opencv-python.subpackage.sh @@ -1,6 +1,6 @@ TERMUX_SUBPKG_INCLUDE="lib/python*" TERMUX_SUBPKG_DESCRIPTION="Python bindings for OpenCV" -TERMUX_SUBPKG_DEPENDS="python" +TERMUX_SUBPKG_DEPENDS="python, python-numpy" termux_step_create_subpkg_debscripts() { _NUMPY_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python-numpy/build.sh; echo $TERMUX_PKG_VERSION) diff --git a/packages/openjpeg/build.sh b/packages/openjpeg/build.sh index 4c65f0aef1..8f8056caa9 100644 --- a/packages/openjpeg/build.sh +++ b/packages/openjpeg/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="JPEG 2000 image compression library" TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="2.5.0" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/uclouvain/openjpeg/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=0333806d6adecc6f7a91243b2b839ff4d2053823634d4f6ed7a59bc87409122a TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/poppler/build.sh b/packages/poppler/build.sh index 8a0c9c6c08..a1ed9cd9f4 100644 --- a/packages/poppler/build.sh +++ b/packages/poppler/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" # Please align the version with `poppler-qt` package. TERMUX_PKG_VERSION=22.11.0 +TERMUX_PKG_REVISION=1 # Do not forget to bump revision of reverse dependencies and rebuild them # when SOVERSION is changed. _POPPLER_SOVERSION=125 diff --git a/packages/povray/build.sh b/packages/povray/build.sh index 73d8b25e8d..5c83a19cdb 100644 --- a/packages/povray/build.sh +++ b/packages/povray/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="AGPL-V3" TERMUX_PKG_MAINTAINER="@termux" _POVRAY_VERSION_BASE=3.8 TERMUX_PKG_VERSION=${_POVRAY_VERSION_BASE}.0-beta.2 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=https://github.com/POV-Ray/povray/releases/download/v${TERMUX_PKG_VERSION}/povunix-v${TERMUX_PKG_VERSION}-src.tar.gz TERMUX_PKG_SHA256=4717c9bed114deec47cf04a8175cc4060dafc159f26e7896480a60f4411ca5ad TERMUX_PKG_DEPENDS="boost, libc++, libjpeg-turbo, libpng, libtiff, openexr, povray-data, zlib" diff --git a/packages/proj/build.sh b/packages/proj/build.sh index 92fb943289..99ec4ec9ab 100644 --- a/packages/proj/build.sh +++ b/packages/proj/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Generic coordinate transformation software" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91" TERMUX_PKG_VERSION="9.1.1" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/OSGeo/proj.4/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=31d7d953837b3bc57fa83df057affa17a3ff7d488ce83784eb53cffbe734463a TERMUX_PKG_DEPENDS="libc++, libsqlite, sqlite, libtiff, libcurl" diff --git a/packages/python-pillow/build.sh b/packages/python-pillow/build.sh index ce0dfbc0ba..a75e366cac 100644 --- a/packages/python-pillow/build.sh +++ b/packages/python-pillow/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Python Imaging Library" TERMUX_PKG_LICENSE="custom" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=9.3.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=188b2a5fd445b2afa05bc0c1318ce49d4335ebbb69417fbb79acaf0a0784709e TERMUX_PKG_SRCURL=https://github.com/python-pillow/Pillow/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="freetype, libimagequant, libjpeg-turbo, libraqm, libtiff, libwebp, libxcb, littlecms, openjpeg, python, zlib" diff --git a/x11-packages/azpainter/build.sh b/x11-packages/azpainter/build.sh index 79658b6252..3e8109db4e 100644 --- a/x11-packages/azpainter/build.sh +++ b/x11-packages/azpainter/build.sh @@ -3,10 +3,12 @@ TERMUX_PKG_DESCRIPTION="Full color painting software for Unix-like systems for i TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1:3.0.6 +TERMUX_PKG_REVISION=1 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_SRCURL=https://gitlab.com/azelpg/azpainter/-/archive/v${TERMUX_PKG_VERSION:2}/azpainter-${TERMUX_PKG_VERSION:2}.tar.bz2 TERMUX_PKG_SHA256=fdc79466a5232a5c7152e506d1141f24dafe015945ac9420e407c458c661571b -TERMUX_PKG_DEPENDS="libandroid-shmem, iconv, fontconfig, freetype, hicolor-icon-theme, libxfixes, libxi, libxcursor, libpng, libjpeg-turbo, libtiff, libwebp, zlib" +TERMUX_PKG_DEPENDS="fontconfig, freetype, libandroid-shmem, libiconv, libjpeg-turbo, libpng, libtiff, libwebp, libx11, libxcursor, libxext, libxi, zlib" +TERMUX_PKG_RECOMMENDS="hicolor-icon-theme" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_RM_AFTER_INSTALL=" share/icons/hicolor/icon-theme.cache @@ -24,6 +26,10 @@ share/mime/types share/mime/version " +termux_step_pre_configure() { + CPPFLAGS="-I$TERMUX_PKG_SRCDIR/src/include $CPPFLAGS" +} + termux_step_configure() { termux_setup_ninja ./configure --prefix="$TERMUX_PREFIX" \ diff --git a/x11-packages/emacs-x/build.sh b/x11-packages/emacs-x/build.sh index f0fdf28a0d..e9e6103a7a 100644 --- a/x11-packages/emacs-x/build.sh +++ b/x11-packages/emacs-x/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=28.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://ftp.gnu.org/gnu/emacs/emacs-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=ee21182233ef3232dc97b486af2d86e14042dbb65bbc535df562c3a858232488 TERMUX_PKG_DEPENDS="fontconfig, freetype, gdk-pixbuf, giflib, glib, harfbuzz, libgmp, libgnutls, libice, libjansson, libjpeg-turbo, libpng, librsvg, libsm, libtiff, libx11, libxaw, libxcb, libxext, libxfixes, libxft, libxinerama, libxml2, libxmu, libxpm, libxrandr, libxrender, libxt, littlecms, ncurses, zlib" diff --git a/x11-packages/evince/build.sh b/x11-packages/evince/build.sh index e5015f4a29..43042c814e 100644 --- a/x11-packages/evince/build.sh +++ b/x11-packages/evince/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" _MAJOR_VERSION=43 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://download.gnome.org/sources/evince/${_MAJOR_VERSION}/evince-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=6d75ca62b73bfbb600f718a098103dc6b813f9050b9594be929e29b4589d2335 TERMUX_PKG_DEPENDS="atk, djvulibre, gdk-pixbuf, glib, gnome-desktop3, gst-plugins-base, gst-plugins-good, gstreamer, gtk3, libarchive, libcairo, libgxps, libhandy, libsecret, libspectre, libtiff, libxml2, pango, poppler, poppler-data, texlive-bin" diff --git a/x11-packages/fontforge-gtk/build.sh b/x11-packages/fontforge-gtk/build.sh index f1553724ec..b31448f445 100644 --- a/x11-packages/fontforge-gtk/build.sh +++ b/x11-packages/fontforge-gtk/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="GPL-3.0, BSD 3-Clause" TERMUX_PKG_LICENSE_FILE="COPYING.gplv3, LICENSE" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=20220308 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/fontforge/fontforge/releases/download/${TERMUX_PKG_VERSION}/fontforge-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=01e4017f7a0ccecf436c74b8e1f6b374fc04a5283c1d68967996782e15618e59 TERMUX_PKG_DEPENDS="freetype, giflib, glib, gtk3, libc++, libcairo, libiconv, libjpeg-turbo, libpng, libtiff, libxml2, pango, readline, woff2, zlib" diff --git a/x11-packages/gimp/build.sh b/x11-packages/gimp/build.sh index 906bd47c55..beedeb3e93 100644 --- a/x11-packages/gimp/build.sh +++ b/x11-packages/gimp/build.sh @@ -4,10 +4,10 @@ TERMUX_PKG_LICENSE="GPL-3.0, LGPL-3.0" TERMUX_PKG_MAINTAINER="@termux" _MAJOR_VERSION=2.10 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.32 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://download.gimp.org/mirror/pub/gimp/v${_MAJOR_VERSION}/gimp-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=3f15c70554af5dcc1b46e6dc68f3d8f0a6cc9fe56b6d78ac08c0fd859ab89a25 -TERMUX_PKG_DEPENDS="aalib, atk, babl, fontconfig, freetype, gdk-pixbuf, gegl, gexiv2, ghostscript, gimp-data, glib, glib-networking, gtk2, harfbuzz, hicolor-icon-theme, json-glib, libandroid-shmem, libc++, libcairo, libheif, libjpeg-turbo, libjxl, libmypaint, libpng, librsvg, libtiff, libwebp, libxcursor, libxml2, libxpm, libxslt, littlecms, mypaint-brushes, openexr, openjpeg, pango, poppler, poppler-data, zlib" +TERMUX_PKG_DEPENDS="aalib, atk, babl, fontconfig, freetype, gdk-pixbuf, gegl, gexiv2, ghostscript, gimp-data, glib, glib-networking, gtk2, harfbuzz, hicolor-icon-theme, json-glib, libandroid-execinfo, libandroid-shmem, libc++, libcairo, libheif, libjpeg-turbo, libjxl, libmypaint, libpng, librsvg, libtiff, libwebp, libxcursor, libxml2, libxmu, libxpm, libxslt, littlecms, mypaint-brushes, openexr, openjpeg, pango, poppler, poppler-data, zlib" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-python --disable-vector-icons diff --git a/x11-packages/gtk4/build.sh b/x11-packages/gtk4/build.sh index 21bdaafba0..8b3c79d9bb 100644 --- a/x11-packages/gtk4/build.sh +++ b/x11-packages/gtk4/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_MAINTAINER="@termux" _MAJOR_VERSION=4.8 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://download.gnome.org/sources/gtk/${_MAJOR_VERSION}/gtk-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=85b7a160b6e02eafa4e7d38f046f8720fab537d3fe73c01c864333a983a692a9 TERMUX_PKG_DEPENDS="adwaita-icon-theme, fontconfig, fribidi, gdk-pixbuf, glib, glib-bin, graphene, gtk-update-icon-cache, harfbuzz, libcairo, libepoxy, libjpeg-turbo, libpng, libtiff, libx11, libxcursor, libxdamage, libxext, libxfixes, libxi, libxinerama, libxrandr, pango, shared-mime-info" diff --git a/x11-packages/hugin/build.sh b/x11-packages/hugin/build.sh index ade8605316..aba936137c 100644 --- a/x11-packages/hugin/build.sh +++ b/x11-packages/hugin/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Toolchain to create panoramic images for every occasion" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2021.0.0 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/hugin/hugin-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=047aea8a7fa47844b34ef27c19d3b697e84939dcb1fdbbeb2c204621b66eead9 TERMUX_PKG_DEPENDS="boost, enblend, exiftool, exiv2, fftw, glew, glu, libc++, libflann, libjpeg-turbo, liblz4, libpano13, libpng, libsqlite, libtiff, libvigra, libx11, littlecms, mesa, openexr, wxwidgets, zlib" diff --git a/x11-packages/mtpaint/build.sh b/x11-packages/mtpaint/build.sh index 9c1ab93239..efc115b01b 100644 --- a/x11-packages/mtpaint/build.sh +++ b/x11-packages/mtpaint/build.sh @@ -3,15 +3,15 @@ TERMUX_PKG_DESCRIPTION="Simple paint program for creating icons and pixel based TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=3.50.09 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 _COMMIT=5272e2b1e773c8e02ac3506b2d3bde82ad946b21 TERMUX_PKG_SRCURL=https://github.com/wjaguar/mtPaint/archive/${_COMMIT}.zip TERMUX_PKG_SHA256=6ed73fc7ac18499c7e83c8077c85dfc0bf778f0663c051515da408e2fcfea512 -TERMUX_PKG_DEPENDS="atk, fontconfig, freetype, gdk-pixbuf, giflib, glib, gtk2, libandroid-glob, libandroid-shmem, libcairo, libjpeg-turbo, littlecms, pango, libpng, libtiff, libwebp, libx11, zlib" +TERMUX_PKG_DEPENDS="atk, fontconfig, freetype, gdk-pixbuf, giflib, glib, gtk2, harfbuzz, libandroid-glob, libcairo, libiconv, libjpeg-turbo, libpng, libtiff, libwebp, libx11, libxcomposite, libxcursor, libxdamage, libxext, libxfixes, libxinerama, libxrandr, libxrender, littlecms, openjpeg, pango, zlib" TERMUX_PKG_RECOMMENDS="gifsicle" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--mandir=${TERMUX_PREFIX}/share/man man GIF jpeg tiff cflags lcms2" termux_step_pre_configure() { - export LDFLAGS="${LDFLAGS} -Wl,--no-as-needed -landroid-glob -landroid-shmem" + LDFLAGS+=" -landroid-glob" } diff --git a/x11-packages/sdl-image/build.sh b/x11-packages/sdl-image/build.sh index 5656d14afc..3e70c8664b 100644 --- a/x11-packages/sdl-image/build.sh +++ b/x11-packages/sdl-image/build.sh @@ -5,9 +5,10 @@ TERMUX_PKG_MAINTAINER="@termux" _COMMIT=633dc522f5114f6d473c910dace62e8ca27a1f7d _COMMIT_DATE=20220527 TERMUX_PKG_VERSION=1.2.12-p${_COMMIT_DATE} +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/libsdl-org/SDL_image.git TERMUX_PKG_GIT_BRANCH=SDL-1.2 -TERMUX_PKG_DEPENDS="libjpeg-turbo, libpng, libtiff, sdl" +TERMUX_PKG_DEPENDS="libjpeg-turbo, liblzma, libpng, libtiff, libwebp, sdl, zlib, zstd" termux_step_post_get_source() { git fetch --unshallow diff --git a/x11-packages/sdl2-image/build.sh b/x11-packages/sdl2-image/build.sh index a9f8d1b9d7..1bc08b2330 100644 --- a/x11-packages/sdl2-image/build.sh +++ b/x11-packages/sdl2-image/build.sh @@ -4,9 +4,10 @@ TERMUX_PKG_LICENSE="ZLIB" TERMUX_PKG_LICENSE_FILE="LICENSE.txt" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2.6.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/libsdl-org/SDL_image/releases/download/release-${TERMUX_PKG_VERSION}/SDL2_image-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=48355fb4d8d00bac639cd1c4f4a7661c4afef2c212af60b340e06b7059814777 -TERMUX_PKG_DEPENDS="libjpeg-turbo, libjxl, libpng, libtiff, libwebp, sdl2" +TERMUX_PKG_DEPENDS="libjpeg-turbo, libjxl, liblzma, libpng, libtiff, libwebp, sdl2, zlib, zstd" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-stb-image --disable-jpg-shared diff --git a/x11-packages/wmaker/build.sh b/x11-packages/wmaker/build.sh index b1276609b4..92ffe3a6a3 100644 --- a/x11-packages/wmaker/build.sh +++ b/x11-packages/wmaker/build.sh @@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="An X11 window manager that reproduces the look and feel TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.95.9 -TERMUX_PKG_REVISION=11 +TERMUX_PKG_REVISION=12 TERMUX_PKG_SRCURL=https://github.com/window-maker/wmaker/releases/download/wmaker-${TERMUX_PKG_VERSION}/WindowMaker-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=f22358ff60301670e1e2b502faad0f2da7ff8976632d538f95fe4638e9c6b714 -TERMUX_PKG_DEPENDS="libandroid-shmem, libxmu, libxft, pango, libtiff, giflib, libxpm, libexif, libwebp, imagemagick" +TERMUX_PKG_DEPENDS="fontconfig, freetype, giflib, glib, harfbuzz, imagemagick, libandroid-shmem, libexif, libjpeg-turbo, libpng, libtiff, libwebp, libx11, libxext, libxft, libxinerama, libxmu, libxpm, pango" TERMUX_PKG_BUILD_DEPENDS="xorgproto" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --enable-pango @@ -14,8 +14,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --x-libraries=${TERMUX_PREFIX}/lib" termux_step_pre_configure() { - # `-Wl,--no-as-needed` may not be needed after fix in libandroid-shmem - # by commit 92668b208de7802da97221ace1107c4b5ae6cfc4. - export LIBS="-Wl,--no-as-needed -landroid-shmem" + export LIBS="-landroid-shmem" export LDFLAGS="$LDFLAGS -XCClinker -static-openmp" } diff --git a/x11-packages/wxwidgets/build.sh b/x11-packages/wxwidgets/build.sh index f86abc22a3..cc06afe81b 100644 --- a/x11-packages/wxwidgets/build.sh +++ b/x11-packages/wxwidgets/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="custom" TERMUX_PKG_LICENSE_FILE="docs/gpl.txt, docs/lgpl.txt, docs/licence.txt, docs/licendoc.txt, docs/preamble.txt" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=3.2.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/wxWidgets/wxWidgets/releases/download/v${TERMUX_PKG_VERSION}/wxWidgets-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=c229976bb413eb88e45cb5dfb68b27890d450149c09b331abd751e7ae0f5fa66 TERMUX_PKG_DEPENDS="fontconfig, gdk-pixbuf, glib, glu, gtk3, libandroid-execinfo, libc++, libcairo, libcurl, libexpat, libiconv, libjpeg-turbo, libnotify, libpng, libsecret, libsm, libtiff, libx11, libxtst, libxxf86vm, mesa, pango, pcre2, sdl2, zlib" From 5d02d0c76e81d3573aea23efb133fb482c53b4e2 Mon Sep 17 00:00:00 2001 From: Jia Yuan Lo Date: Thu, 29 Sep 2022 01:58:03 +0800 Subject: [PATCH 026/244] addpkg(main): opencl-vendor-driver --- packages/opencl-vendor-driver/build.sh | 41 ++++++ packages/opencl-vendor-driver/postinst.sh | 150 ++++++++++++++++++++++ 2 files changed, 191 insertions(+) create mode 100644 packages/opencl-vendor-driver/build.sh create mode 100644 packages/opencl-vendor-driver/postinst.sh diff --git a/packages/opencl-vendor-driver/build.sh b/packages/opencl-vendor-driver/build.sh new file mode 100644 index 0000000000..fede717617 --- /dev/null +++ b/packages/opencl-vendor-driver/build.sh @@ -0,0 +1,41 @@ +TERMUX_PKG_HOMEPAGE=https://termux.dev +TERMUX_PKG_DESCRIPTION="OpenCL driver from system vendor" +TERMUX_PKG_LICENSE="Apache-2.0" +TERMUX_PKG_MAINTAINER="@termux" +TERMUX_PKG_VERSION=0.1 +TERMUX_PKG_RECOMMENDS="binutils | binutils-is-llvm, patchelf" +TERMUX_PKG_SUGGESTS="ocl-icd" +TERMUX_PKG_SKIP_SRC_EXTRACT=true + +# Goal of this package is to allow Termux to use on-device OpenCL drivers +# without export LD_LIBRARY_PATH=/vendor/lib64 + +# Currently it copies libOpenCL.so from /vendor or /system and patch it +# on the fly. Then ocl-icd detects it. This works for Mali. + +# Adreno requires export var as its missing cl_khr_icd which ocl-icd needs. +# But export var will replace ocl-icd altogether. + +# List of libOpenCL.so drivers from different vendors: +# GPU SONAME cl_khr_icd Supported +# Arm Mali libGLES_mali.so y y +# Qualcomm Adreno libOpenCL.so n n + +termux_step_make_install() { + echo "${TERMUX_PREFIX}/opt/vendor/lib/libOpenCL.so" > vendor.icd + install -Dm644 vendor.icd "${TERMUX_PREFIX}/etc/OpenCL/vendors/vendor.icd" + install -Dm644 /dev/null "${TERMUX_PREFIX}/opt/vendor/lib/libOpenCL.so" +} + +termux_step_create_debscripts() { + cp -f "${TERMUX_PKG_BUILDER_DIR}/postinst.sh" postinst + sed -i postinst -e "s|@TERMUX_PREFIX@|${TERMUX_PREFIX}|g" + + cat <<- EOF > prerm + #!${TERMUX_PREFIX}/bin/sh + case "\$1" in + purge|remove) + rm -fr "${TERMUX_PREFIX}/opt/vendor/lib" + esac + EOF +} diff --git a/packages/opencl-vendor-driver/postinst.sh b/packages/opencl-vendor-driver/postinst.sh new file mode 100644 index 0000000000..41f80a780e --- /dev/null +++ b/packages/opencl-vendor-driver/postinst.sh @@ -0,0 +1,150 @@ +#!@TERMUX_PREFIX@/bin/sh +PREFIX=@TERMUX_PREFIX@ + +check_cmd_status() { + [ -n "$(command -v "$1")" ] && echo 0 && return + [ -e "${PREFIX}/bin/$1" ] && echo 1 && return + echo 2 +} + +check_cmd() { + status=$(check_cmd_status "$1") + [ "${status}" = 0 ] && echo "OK" && return + [ "${status}" = 1 ] && echo "NOT WORKING" + [ "${status}" = 2 ] && echo "NOT FOUND" + echo "error" > "${DEPS_STATUS}" +} + +DEPS_STATUS=$(mktemp) +DEPS=" +basename +grep +install +ls +patchelf +readelf +sed +sort +uname +" +for dep in ${DEPS}; do + echo "INFO: Checking command ${dep} ... $(check_cmd "${dep}" "${DEPS_STATUS}")" +done +if [ "$(cat "${DEPS_STATUS}")" = "error" ]; then + rm -f "${DEPS_STATUS}" + echo "WARN: One or more dependencies are not installed. Install them then try again. Exiting ..." >&2 + exit +fi +rm -f "${DEPS_STATUS}" + +UNAME=$(uname -m) +BIT="" +case "${UNAME}" in +aarch64|x86_64) + BIT="64" + ;; +armv*|i*86) + ;; +*) + echo "WARN: Unknown arch ${UNAME}" >&2 +esac + +TARGET_LIBOPENCL="${PREFIX}/opt/vendor/lib/libOpenCL.so" +VENDOR_LIBOPENCL="" +HAS_OPENCL="0" +HAS_MALI="0" + +# user override +if [ -n "${OVERRIDE_LIBOPENCL}" ]; then + echo "WARN: Forcing to use ${OVERRIDE_LIBOPENCL} as vendor OpenCL ..." >&2 + if [ -e "${OVERRIDE_LIBOPENCL}" ]; then + VENDOR_LIBOPENCL="${OVERRIDE_LIBOPENCL}" + else + echo "INFO: Falling back to autodetect as provided path is invalid." + fi +fi + +if [ -z "${VENDOR_LIBOPENCL}" ]; then + # autodetect + VENDOR_LIBDIR="" + if [ -e "/vendor/lib${BIT}" ]; then + VENDOR_LIBDIR="/vendor/lib${BIT}" + elif [ -e "/system/vendor/lib${BIT}" ]; then + VENDOR_LIBDIR="/system/vendor/lib${BIT}" + else + echo "WARN: /vendor and /system are not accessible. This package is now useless." >&2 + exit + fi + + [ -e "${VENDOR_LIBDIR}/libOpenCL.so" ] && HAS_OPENCL="1" + [ -e "${VENDOR_LIBDIR}/egl/libGLES_mali.so" ] && HAS_MALI="1" + + # autopick + if [ "${HAS_OPENCL}" = "1" ] && [ "${HAS_MALI}" = "1" ]; then + VENDOR_LIBOPENCL="${VENDOR_LIBDIR}/egl/libGLES_mali.so" + elif [ "${HAS_OPENCL}" = "0" ] && [ "${HAS_MALI}" = "1" ]; then + VENDOR_LIBOPENCL="${VENDOR_LIBDIR}/egl/libGLES_mali.so" + elif [ "${HAS_OPENCL}" = "1" ] && [ "${HAS_MALI}" = "0" ]; then + VENDOR_LIBOPENCL="${VENDOR_LIBDIR}/libOpenCL.so" + else + echo "WARN: No drivers found! This package is now useless." >&2 + exit + fi +fi + +echo "INFO: Found ${VENDOR_LIBOPENCL}, installing as ${TARGET_LIBOPENCL} ..." +install -Dm644 "${VENDOR_LIBOPENCL}" "${TARGET_LIBOPENCL}" + +install_deps() { ( + LIB=$(basename "$1") + NEEDED_LIBS=$(readelf -d "$1" | grep NEEDED | sed "s|.* \[\(.*\)\]|\1|g" | sort) + SET_RPATH="0" + NOT_SYSTEM_LIBS="" + echo "INFO: Checking ${LIB} for missing dependencies ..." + for needed_lib in ${NEEDED_LIBS}; do + IS_SYSTEM_LIB="0" + for system_lib in ${SYSTEM_LIBS}; do + [ "${DEBUG}" = "1" ] && echo "DEBUG: ${LIB} ... ${needed_lib} ... ${system_lib}" + [ "${needed_lib}" = "${system_lib}" ] && IS_SYSTEM_LIB="1" && break + done + if [ "${IS_SYSTEM_LIB}" != "1" ]; then + NOT_SYSTEM_LIBS="${NOT_SYSTEM_LIBS} ${needed_lib}" + fi + done + for needed_lib in ${NOT_SYSTEM_LIBS}; do + target_needed_lib="${PREFIX}/opt/vendor/lib/${needed_lib}" + vendor_needed_lib="" + if [ -e "${VENDOR_LIBDIR}/${needed_lib}" ]; then + vendor_needed_lib="${VENDOR_LIBDIR}/${needed_lib}" + else + echo "WARN: Unable to find ${needed_lib}. This package may not work properly." >&2 + fi + if [ -n "${vendor_needed_lib}" ]; then + echo "INFO: Installing missing dependency ${vendor_needed_lib} ..." + install -Dm644 "${vendor_needed_lib}" "${target_needed_lib}" + install_deps "${target_needed_lib}" + SET_RPATH="1" + fi + done + if [ "${SET_RPATH}" = "1" ]; then + echo "INFO: Patching rpath for $1 ..." + patchelf --set-rpath '$ORIGIN' "$1" + else + echo "INFO: Removing rpath for $1 ..." + patchelf --remove-rpath "$1" + fi +) } + +if [ -n "${VENDOR_LIBOPENCL}" ]; then + SYSTEM_LIBS=$(ls /system/lib${BIT}) + install_deps "${TARGET_LIBOPENCL}" + echo " +==================== +Post install notice: +If there's any ROM upgrades taken place after +installing opencl-vendor-driver package, +reinstall of the package is required to use the +updated OpenCL drivers. +==================== +" +fi From 1a33abd674ea640dfe6bf2baa872715448c5f097 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Wed, 14 Dec 2022 13:03:32 +0900 Subject: [PATCH 027/244] firefox: Bump to 108.0.1 --- x11-packages/firefox/build.sh | 5 +++-- x11-packages/firefox/firefox.patch | 30 +++++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/x11-packages/firefox/build.sh b/x11-packages/firefox/build.sh index d4e206829c..81886e3d68 100644 --- a/x11-packages/firefox/build.sh +++ b/x11-packages/firefox/build.sh @@ -2,10 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://www.mozilla.org/firefox TERMUX_PKG_DESCRIPTION="Mozilla Firefox web browser" TERMUX_PKG_LICENSE="MPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=107.0.1 +TERMUX_PKG_VERSION=108.0.1 TERMUX_PKG_SRCURL=https://ftp.mozilla.org/pub/firefox/releases/${TERMUX_PKG_VERSION}/source/firefox-${TERMUX_PKG_VERSION}.source.tar.xz -TERMUX_PKG_SHA256=e29950b9ba9143b0d683dc18779bbe70bbd082533aff8f6a7af69b19533e0647 +TERMUX_PKG_SHA256=9821ac130dad01383e03276bf6cc92d41329d351da1fa7fa238168f8890611ea TERMUX_PKG_DEPENDS="at-spi2-atk, fontconfig, freetype, gdk-pixbuf, glib, gtk3, libandroid-shmem, libandroid-sysv-semaphore, libc++, libcairo, libcpufeatures, libevent, libffi, libice, libicu, libjpeg-turbo, libnspr, libnss, libpixman, libsm, libvpx, libwebp, libx11, libxcb, libxcomposite, libxcursor, libxdamage, libxext, libxfixes, libxi, libxrandr, libxrender, libxtst, pango, pulseaudio" +TERMUX_MAKE_PROCESSES=1 termux_step_post_get_source() { local f="media/ffvpx/config_unix_aarch64.h" diff --git a/x11-packages/firefox/firefox.patch b/x11-packages/firefox/firefox.patch index 954ad15d22..c0474e44d0 100644 --- a/x11-packages/firefox/firefox.patch +++ b/x11-packages/firefox/firefox.patch @@ -240,9 +240,37 @@ diff -uNr firefox-105.0.3/toolkit/components/moz.build firefox-105.0.3.mod/toolk "narrate", "reader", - "viaduct", + "uniffi-js", + "uniffi-bindgen-gecko-js/components", ] +--- a/toolkit/library/rust/shared/Cargo.toml ++++ b/toolkit/library/rust/shared/Cargo.toml +@@ -111,10 +111,11 @@ + # This happens to work around issues the older code has with 1.65. + fallible_collections = { version = "0.4", features = ["rust_1_57"] } - if CONFIG["BUILD_CTYPES"]: ++tabs = { version = "0.1" } ++ + [target.'cfg(not(target_os = "android"))'.dependencies] + viaduct = "0.1" + webext_storage_bridge = { path = "../../../components/extensions/storage/webext_storage_bridge" } +-tabs = { version = "0.1" } + + [target.'cfg(target_os = "windows")'.dependencies] + detect_win32k_conflicts = { path = "../../../xre/detect_win32k_conflicts" } +--- a/toolkit/library/rust/shared/lib.rs ++++ b/toolkit/library/rust/shared/lib.rs +@@ -57,10 +57,8 @@ + #[cfg(not(target_os = "android"))] + extern crate webext_storage_bridge; + +-#[cfg(not(target_os = "android"))] + extern crate tabs; + +-#[cfg(not(target_os = "android"))] + mod reexport_tabs { + tabs::uniffi_reexport_scaffolding!(); + } diff -uNr firefox-105.0.3/toolkit/moz.configure firefox-105.0.3.mod/toolkit/moz.configure --- firefox-105.0.3/toolkit/moz.configure 2022-10-08 00:40:08.000000000 +0900 +++ firefox-105.0.3.mod/toolkit/moz.configure 2022-10-18 01:42:19.379553089 +0900 From 6a7de20f2ff106165f577dec48bb6df1f3cd940c Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sat, 17 Dec 2022 22:17:01 +0900 Subject: [PATCH 028/244] deadbeef: Bump to 1.9.4 --- x11-packages/deadbeef/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-packages/deadbeef/build.sh b/x11-packages/deadbeef/build.sh index c999f6c61e..49da25fd1b 100644 --- a/x11-packages/deadbeef/build.sh +++ b/x11-packages/deadbeef/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="A modular cross-platform audio player" TERMUX_PKG_LICENSE="ZLIB, GPL-2.0, LGPL-2.1, BSD 3-Clause, MIT" TERMUX_PKG_LICENSE_FILE="COPYING" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.9.3 +TERMUX_PKG_VERSION=1.9.4 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/deadbeef/deadbeef-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=c2c3a78c9e85b06a30b45b0432a830253bff71b458927dcb23ac90681e863e2f +TERMUX_PKG_SHA256=f2e413eef762ae80d61feb1a10214ee09e77d0be8bad56444c0eb1013084ca09 TERMUX_PKG_DEPENDS="atk, dbus, ffmpeg, gdk-pixbuf, glib, gtk3, harfbuzz, libblocksruntime, libc++, libcairo, libcurl, libdispatch, libflac, libiconv, libjansson, libmad, libogg, libsamplerate, libsndfile, libvorbis, libwavpack, libx11, libzip, mpg123, opusfile, pango, pulseaudio, zlib" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" ax_cv_c_flags__msse2=no From 438f1641a83ac8df6158c559d284caaaad8a6423 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sat, 17 Dec 2022 18:15:08 +0000 Subject: [PATCH 029/244] bump(main/mdbook): 0.4.25 This commit has been automatically submitted by Github Actions. --- packages/mdbook/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mdbook/build.sh b/packages/mdbook/build.sh index c1b5211a66..4d3afae13d 100644 --- a/packages/mdbook/build.sh +++ b/packages/mdbook/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://rust-lang.github.io/mdBook/ TERMUX_PKG_DESCRIPTION="Creates book from markdown files" TERMUX_PKG_LICENSE="MPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.4.24" +TERMUX_PKG_VERSION="0.4.25" TERMUX_PKG_SRCURL=https://github.com/rust-lang/mdBook/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=fe291fb8eea8afece79d83c465f4e9ae2f0094aca0fb11ab2eb34601b436895f +TERMUX_PKG_SHA256=c0faf07ff45d4d1bd45c35f2211dec9fd29edb7782e13dc2572e072f08919773 TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_AUTO_UPDATE=true From 63ba6abc4ef22e7ea6b9cac552d6e4f7a929d488 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sun, 18 Dec 2022 00:19:59 +0000 Subject: [PATCH 030/244] bump(main/box86): 0.2.8.20221217.145445g3313d7a1 This commit has been automatically submitted by Github Actions. --- packages/box86/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/box86/build.sh b/packages/box86/build.sh index eaacbb9cf6..7ba0ff7b61 100644 --- a/packages/box86/build.sh +++ b/packages/box86/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://ptitseb.github.io/box86/ TERMUX_PKG_DESCRIPTION="Linux Userspace x86 Emulator" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -_COMMIT=89e55179615206503f9d1076c91cb7fac1063741 -_COMMIT_DATE=20221211 -_COMMIT_TIME=115233 -TERMUX_PKG_VERSION="0.2.8.20221211.115233g89e55179" +_COMMIT=3313d7a1589c022dcd392d02416195b1d8170fb4 +_COMMIT_DATE=20221217 +_COMMIT_TIME=145445 +TERMUX_PKG_VERSION="0.2.8.20221217.145445g3313d7a1" TERMUX_PKG_SRCURL=https://github.com/ptitSeb/box86.git TERMUX_PKG_GIT_BRANCH=master TERMUX_PKG_DEPENDS="libandroid-complex-math, libandroid-glob, libandroid-spawn, libandroid-sysv-semaphore" From 97c33a89edf8b2fb382809a56bc3ff31f8108a90 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sun, 18 Dec 2022 01:22:25 +0000 Subject: [PATCH 031/244] bump(main/clvk): 0.0.20221217.163536gaa063509 This commit has been automatically submitted by Github Actions. --- packages/clvk/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/clvk/build.sh b/packages/clvk/build.sh index bc283dd94b..bc8f839a05 100644 --- a/packages/clvk/build.sh +++ b/packages/clvk/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/kpet/clvk TERMUX_PKG_DESCRIPTION="Experimental implementation of OpenCL on Vulkan" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" -_COMMIT=5b66888f414dc4943cd0e870f911cb76b3d55d16 -_COMMIT_DATE=20221211 -_COMMIT_TIME=131547 -TERMUX_PKG_VERSION="0.0.20221211.131547g5b66888f" +_COMMIT=aa063509312b49d3bab6fd1d30c9fb744e624b9d +_COMMIT_DATE=20221217 +_COMMIT_TIME=163536 +TERMUX_PKG_VERSION="0.0.20221217.163536gaa063509" TERMUX_PKG_SRCURL=https://github.com/kpet/clvk.git TERMUX_PKG_GIT_BRANCH=main TERMUX_PKG_BUILD_DEPENDS="vulkan-headers, vulkan-loader-android" From 318a0c7cd93cc721a0e53d0776d9221ad82c749a Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sun, 18 Dec 2022 06:10:53 +0000 Subject: [PATCH 032/244] bump(main/esbuild): 0.16.9 This commit has been automatically submitted by Github Actions. --- packages/esbuild/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/esbuild/build.sh b/packages/esbuild/build.sh index 5bed7f5d3e..bdd545c4ac 100644 --- a/packages/esbuild/build.sh +++ b/packages/esbuild/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://esbuild.github.io/ TERMUX_PKG_DESCRIPTION="An extremely fast JavaScript bundler" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.16.8" +TERMUX_PKG_VERSION="0.16.9" TERMUX_PKG_SRCURL=https://github.com/evanw/esbuild/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=a5643a69fe5c2b5ee33cecf31a7251b35b404f5c544ea5ae65841bfe210af368 +TERMUX_PKG_SHA256=9633f9c565ba5f4ef4095a72d783e71c2b0027dd42f52f329b40c5ec37bf2f2f TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true From 2acd3c7b63f71e0a8263bf2ddee335fb5cb7a1c8 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sun, 18 Dec 2022 06:18:48 +0000 Subject: [PATCH 033/244] bump(main/neovim-nightly): 0.9.0-dev-522+g174335923 This commit has been automatically submitted by Github Actions. --- packages/neovim-nightly/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/neovim-nightly/build.sh b/packages/neovim-nightly/build.sh index ec35aeb30b..e1fd42b425 100644 --- a/packages/neovim-nightly/build.sh +++ b/packages/neovim-nightly/build.sh @@ -5,9 +5,9 @@ TERMUX_PKG_MAINTAINER="Aditya Alok " # Upstream now has version number like "0.8.0-dev-698-ga5920e98f", but actually # "0.8.0-dev-698-g1ef84547a" < "0.8.0-dev-nightly-10-g1a07044c1", we need to bump # the epoch of the package version. -TERMUX_PKG_VERSION="1:0.9.0-dev-519+g2d8bbe468" +TERMUX_PKG_VERSION="1:0.9.0-dev-522+g174335923" TERMUX_PKG_SRCURL="https://github.com/neovim/neovim/archive/nightly.tar.gz" -TERMUX_PKG_SHA256=c773c92b219b3e3565c2298d44cc6f09639087ce91b6ab8f707a6d72bf185f7e +TERMUX_PKG_SHA256=a6c8dce36cfbeaccb61633a8cd1e1a9700609d75eda92a8fcdef21321364c038 TERMUX_PKG_DEPENDS="libiconv, libuv, luv, libmsgpack, libandroid-support, libvterm, libtermkey, libluajit, libunibilium, libtreesitter" TERMUX_PKG_HOSTBUILD=true From 9a87854e82fa70dd6943484d138c9ccb3ce695cf Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sun, 18 Dec 2022 19:53:55 +0900 Subject: [PATCH 034/244] imagemagick: Bump to 7.1.0.55 --- packages/imagemagick/build.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/imagemagick/build.sh b/packages/imagemagick/build.sh index 1904ec076c..3116cbb5c6 100644 --- a/packages/imagemagick/build.sh +++ b/packages/imagemagick/build.sh @@ -2,13 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.imagemagick.org/ TERMUX_PKG_DESCRIPTION="Suite to create, edit, compose, or convert images in a variety of formats" TERMUX_PKG_LICENSE="ImageMagick" TERMUX_PKG_MAINTAINER="@termux" -_VERSION=7.1.0-54 +_VERSION=7.1.0-55 TERMUX_PKG_VERSION=${_VERSION//-/.} -TERMUX_PKG_REVISION=1 #TERMUX_PKG_SRCURL=https://github.com/ImageMagick/ImageMagick/archive/refs/tags/${_VERSION}.tar.gz TERMUX_PKG_SRCURL=https://imagemagick.org/archive/releases/ImageMagick-${_VERSION}.tar.xz -TERMUX_PKG_SHA256=6d0d952000217b677276a342a4c609776386d0daf2ccf354b6ed8dbc07d22ef7 -TERMUX_PKG_DEPENDS="fftw, fontconfig, freetype, gdk-pixbuf, glib, harfbuzz, libandroid-support, libbz2, libc++, libcairo, libheif, libjpeg-turbo, libjxl, liblzma, libpng, librsvg, libtiff, libwebp, libx11, libxext, libxml2, littlecms, openexr, openjpeg, pango, zlib, zstd" +TERMUX_PKG_SHA256=ee06d385bb5c92a57aefb1c64abe5107728b8f8448195843e6d8cf142a5b3191 +TERMUX_PKG_DEPENDS="fftw, fontconfig, freetype, gdk-pixbuf, glib, harfbuzz, libandroid-support, libbz2, libc++, libcairo, libheif, libjpeg-turbo, libjxl, liblzma, libpng, librsvg, libtiff, libwebp, libx11, libxext, libxml2, littlecms, openexr, openjpeg, pango, zlib" TERMUX_PKG_BREAKS="imagemagick-dev, imagemagick-x" TERMUX_PKG_REPLACES="imagemagick-dev, imagemagick-x" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" From a948f83570ade3d7a89f8cd8b0b107229c4b4c4e Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sun, 18 Dec 2022 20:01:52 +0900 Subject: [PATCH 035/244] haproxy: Bump to 2.4.20 --- packages/haproxy/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/haproxy/build.sh b/packages/haproxy/build.sh index dbda8aa5e4..dcbc41ed42 100644 --- a/packages/haproxy/build.sh +++ b/packages/haproxy/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="The Reliable, High Performance TCP/HTTP Load Balancer" TERMUX_PKG_LICENSE="GPL-2.0, LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" _MAJOR_VERSION=2.4 -TERMUX_PKG_VERSION=${_MAJOR_VERSION}.19 +TERMUX_PKG_VERSION=${_MAJOR_VERSION}.20 TERMUX_PKG_SRCURL=https://www.haproxy.org/download/${_MAJOR_VERSION}/src/haproxy-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=99bd348a2b0ec58ce99510c4b6a2316e1f88137e59c4d8e0f39a2ecb3415a682 +TERMUX_PKG_SHA256=415c62d2159941a17c443941aa85e7353047d79f3b72a0e7062473f7e753cacc TERMUX_PKG_DEPENDS="liblua53, openssl, pcre2, zlib" TERMUX_PKG_BUILD_IN_SRC=true From 149f3ddc45c6bd97d1219a443ebf2aff010463e6 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sun, 18 Dec 2022 19:58:32 +0900 Subject: [PATCH 036/244] rdiff-backup: Bump to 2.2.0 --- packages/rdiff-backup/build.sh | 5 +-- .../rdiff-backup-2.0.5-python-3.11.patch | 45 ------------------- 2 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 packages/rdiff-backup/rdiff-backup-2.0.5-python-3.11.patch diff --git a/packages/rdiff-backup/build.sh b/packages/rdiff-backup/build.sh index 763ae1a71e..4afa8445c4 100644 --- a/packages/rdiff-backup/build.sh +++ b/packages/rdiff-backup/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://rdiff-backup.net TERMUX_PKG_DESCRIPTION="A utility for local/remote mirroring and incremental backups" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=2.0.5 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_VERSION=2.2.0 TERMUX_PKG_SRCURL=https://github.com/rdiff-backup/rdiff-backup/releases/download/v${TERMUX_PKG_VERSION/\~/}/rdiff-backup-${TERMUX_PKG_VERSION/\~/}.tar.gz -TERMUX_PKG_SHA256=2bb7837b4a9712b6efaebfa7da8ed6348ffcb02fcecff0e19d8fff732e933b87 +TERMUX_PKG_SHA256=951779e051f5f0a1da8c6608e4aa87e60649751c8f291e388f6292577eb1f494 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="librsync, python" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/rdiff-backup/rdiff-backup-2.0.5-python-3.11.patch b/packages/rdiff-backup/rdiff-backup-2.0.5-python-3.11.patch deleted file mode 100644 index 489d232c79..0000000000 --- a/packages/rdiff-backup/rdiff-backup-2.0.5-python-3.11.patch +++ /dev/null @@ -1,45 +0,0 @@ -https://github.com/rdiff-backup/rdiff-backup/commit/066066b3957fd5a53ca21f0ced3ca0831bd3d4e6 - -From 066066b3957fd5a53ca21f0ced3ca0831bd3d4e6 Mon Sep 17 00:00:00 2001 -From: Frank Crawford -Date: Sun, 2 Jan 2022 20:28:40 +1100 -Subject: [PATCH] Added patch for Python3.11 as per bpo-39573. (#655) - -DEV: Added patch for Python 3.11 as per bpo-39573 to replace Py_TYPE with Py_SET_TYPE, closes #633 ---- - src/_librsyncmodule.c | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) - -diff --git a/src/_librsyncmodule.c b/src/_librsyncmodule.c -index a46567fc4..158104d2e 100644 ---- a/src/_librsyncmodule.c -+++ b/src/_librsyncmodule.c -@@ -25,6 +25,16 @@ - #include - #define RSM_JOB_BLOCKSIZE 65536 - -+/* ----------------------------------------------------------------------- * -+ * Update for Python 3.11 - Contributed by Victor Stinner in bpo-39573. -+ * Compatibility macro for older Python versions. -+ * ----------------------------------------------------------------------- */ -+#if PY_VERSION_HEX < 0x030900A4 && !defined(Py_SET_TYPE) -+static inline void _Py_SET_TYPE(PyObject *ob, PyTypeObject *type) -+{ ob->ob_type = type; } -+#define Py_SET_TYPE(ob, type) _Py_SET_TYPE((PyObject*)(ob), type) -+#endif -+ - static PyObject *librsyncError; - - /* Sets python error string from result */ -@@ -540,8 +550,9 @@ PyMODINIT_FUNC PyInit__librsync(void) - { - PyObject *m, *d; - -- Py_TYPE(&_librsync_SigMakerType) = &PyType_Type; -- Py_TYPE(&_librsync_DeltaMakerType) = &PyType_Type; -+ /* Update for Python 3.11 - bpo-39573. */ -+ Py_SET_TYPE(&_librsync_SigMakerType, &PyType_Type); -+ Py_SET_TYPE(&_librsync_DeltaMakerType, &PyType_Type); - static struct PyModuleDef librsync_def = { - PyModuleDef_HEAD_INIT, "_librsync", "RSync Lib", -1, _librsyncMethods, }; - m = PyModule_Create(&librsync_def); From 3c02b6b69728f6301ee9dfeddd93d76c73cf4d38 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sun, 18 Dec 2022 20:04:07 +0900 Subject: [PATCH 037/244] praat: Bump to 6.3.03 --- x11-packages/praat/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-packages/praat/build.sh b/x11-packages/praat/build.sh index 833e763a7d..8edc15c7fc 100644 --- a/x11-packages/praat/build.sh +++ b/x11-packages/praat/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.praat.org TERMUX_PKG_DESCRIPTION="Doing phonetics by computer" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=6.3.02 +TERMUX_PKG_VERSION=6.3.03 TERMUX_PKG_SRCURL=https://github.com/praat/praat/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=2f97b36a94211ecaedfd635306218d55bfbd1d4637511c32568bf16dc26e3425 +TERMUX_PKG_SHA256=f7e94afab17030ea90a17f84e810aedde0cdc6493ce4b1d39c97106d365c1b30 TERMUX_PKG_DEPENDS="atk, gdk-pixbuf, glib, gtk3, harfbuzz, libc++, libcairo, pango, pulseaudio" TERMUX_PKG_BUILD_IN_SRC=true From 2184920eb1a368d7681f632d8d3e7b4a99b52894 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sun, 18 Dec 2022 20:00:38 +0900 Subject: [PATCH 038/244] gdal: Bump to 3.6.1 --- packages/gdal/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/gdal/build.sh b/packages/gdal/build.sh index b6451be2d0..beea8060c2 100644 --- a/packages/gdal/build.sh +++ b/packages/gdal/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="A translator library for raster and vector geospatial da TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_LICENSE_FILE="LICENSE.TXT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=3.6.0 +TERMUX_PKG_VERSION=3.6.1 TERMUX_PKG_SRCURL=https://download.osgeo.org/gdal/${TERMUX_PKG_VERSION}/gdal-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=f7afa4aa8d32d0799e011a9f573c6a67e9471f78e70d3d0d0b45b45c8c0c1a94 +TERMUX_PKG_SHA256=68f1c03547ff7152289789db7f67ee634167c9b7bfec4872b88406b236f9c230 TERMUX_PKG_DEPENDS="json-c, libc++, libcurl, libexpat, libfreexl, libgeos, libiconv, libjxl, liblzma, libpng, libspatialite, libsqlite, libwebp, netcdf-c, openjpeg, openssl, proj, postgresql" TERMUX_PKG_BUILD_DEPENDS="json-c-static" TERMUX_PKG_BREAKS="gdal-dev" From fb02bf5d97a7b96c106fc74aedb9bbd3881ca508 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sun, 18 Dec 2022 12:10:57 +0000 Subject: [PATCH 039/244] bump(main/frp): 0.46.0 This commit has been automatically submitted by Github Actions. --- packages/frp/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/frp/build.sh b/packages/frp/build.sh index 8893ec0767..cb7206107f 100644 --- a/packages/frp/build.sh +++ b/packages/frp/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://gofrp.org/doc TERMUX_PKG_DESCRIPTION="A fast reverse proxy to expose a local server behind a NAT or firewall to the internet" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="2096779623 " -TERMUX_PKG_VERSION="0.45.0" +TERMUX_PKG_VERSION="0.46.0" TERMUX_PKG_SRCURL=https://github.com/fatedier/frp/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=829cf9f14861ab1b074de6995282f30292f53513824372cfec4084a2e8de7123 +TERMUX_PKG_SHA256=bf617b7c5b3f9a34b4edbac73ca2b7b6781c4f09f33666a7d331d9fe8302679e # Depend on its subpackages. TERMUX_PKG_DEPENDS="frpc, frps" TERMUX_PKG_BUILD_IN_SRC=true From 661a521c72ba3532b6dbb39da28c1db82160db4e Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sun, 18 Dec 2022 12:14:24 +0000 Subject: [PATCH 040/244] bump(main/pocketbase): 0.10.1 This commit has been automatically submitted by Github Actions. --- packages/pocketbase/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/pocketbase/build.sh b/packages/pocketbase/build.sh index 0c36991515..fd962520cf 100644 --- a/packages/pocketbase/build.sh +++ b/packages/pocketbase/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/pocketbase/pocketbase TERMUX_PKG_DESCRIPTION="An open source Go backend" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.10.0" +TERMUX_PKG_VERSION="0.10.1" TERMUX_PKG_SRCURL="https://github.com/pocketbase/pocketbase/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz" -TERMUX_PKG_SHA256=160e5b19b2ce515068877bcda24cb7a452fcb538aae644b42268f56ca0eb1c05 +TERMUX_PKG_SHA256=03d9fe97522d1363cbb2dae6f9671b847eaca968bd3306c2267911a1a8dadc25 TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_AUTO_UPDATE=true From 74631e34d2517fe4bfb64d79f6cd137d79c74c42 Mon Sep 17 00:00:00 2001 From: Sunlight <73415680+SunPodder@users.noreply.github.com> Date: Wed, 14 Dec 2022 15:40:46 +0600 Subject: [PATCH 041/244] new package: gitoxide --- packages/gitoxide/build.sh | 42 +++++++++++++++++++++++ packages/gitoxide/trust-dns-resolver.diff | 12 +++++++ 2 files changed, 54 insertions(+) create mode 100644 packages/gitoxide/build.sh create mode 100644 packages/gitoxide/trust-dns-resolver.diff diff --git a/packages/gitoxide/build.sh b/packages/gitoxide/build.sh new file mode 100644 index 0000000000..620b280fb3 --- /dev/null +++ b/packages/gitoxide/build.sh @@ -0,0 +1,42 @@ +TERMUX_PKG_HOMEPAGE=https://github.com/Byron/gitoxide +TERMUX_PKG_DESCRIPTION="Rust implementation of Git" +TERMUX_PKG_LICENSE="MIT,Apache-2.0" +TERMUX_PKG_MAINTAINER="@termux" +TERMUX_PKG_VERSION=0.1.0 +_RELEASE_PREFIX="git-hashtable" +TERMUX_PKG_SRCURL=https://github.com/Byron/gitoxide/archive/refs/tags/${_RELEASE_PREFIX}-v${TERMUX_PKG_VERSION}.tar.gz +TERMUX_PKG_SHA256=33f761b9e6bb268a2ad725bf88e85808e4a9c7e06cface2fd637ac14dc2382fc +TERMUX_PKG_AUTO_UPDATE=true +TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_LICENSE_FILE="LICENSE-APACHE, LICENSE-MIT" + +termux_step_pre_configure() { + termux_setup_cmake + termux_setup_rust + + : "${CARGO_HOME:=$HOME/.cargo}" + export CARGO_HOME + + cargo fetch --target "${CARGO_TARGET_NAME}" + + for d in $CARGO_HOME/registry/src/github.com-*/trust-dns-resolver-*; do + sed -e "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|" \ + $TERMUX_PKG_BUILDER_DIR/trust-dns-resolver.diff \ + | patch --silent -p1 -d ${d} || : + done +} + +termux_step_make() { + cargo build \ + --jobs $TERMUX_MAKE_PROCESSES \ + --target $CARGO_TARGET_NAME \ + --release \ + --no-default-features \ + --features max-pure +} + +termux_step_make_install() { + install -Dm755 -t $TERMUX_PREFIX/bin target/${CARGO_TARGET_NAME}/release/gix + install -Dm755 -t $TERMUX_PREFIX/bin target/${CARGO_TARGET_NAME}/release/ein +} + diff --git a/packages/gitoxide/trust-dns-resolver.diff b/packages/gitoxide/trust-dns-resolver.diff new file mode 100644 index 0000000000..6d4be97e7c --- /dev/null +++ b/packages/gitoxide/trust-dns-resolver.diff @@ -0,0 +1,12 @@ +--- a/src/system_conf/unix.rs ++++ b/src/system_conf/unix.rs +@@ -27,7 +27,7 @@ + const DEFAULT_PORT: u16 = 53; + + pub fn read_system_conf() -> io::Result<(ResolverConfig, ResolverOpts)> { +- read_resolv_conf("/etc/resolv.conf") ++ read_resolv_conf("@TERMUX_PREFIX@/etc/resolv.conf") + } + + fn read_resolv_conf>(path: P) -> io::Result<(ResolverConfig, ResolverOpts)> { + From 262d2b17a8be4aa27ba987835c716df2ae6fea10 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sun, 18 Dec 2022 22:00:07 +0900 Subject: [PATCH 042/244] otter-browser: Disabled for security purposes. See https://github.com/termux/termux-packages/issues/12813. --- .../otter-browser/3rdparty_fhs_termux_prefix.patch | 0 {x11-packages => disabled-packages}/otter-browser/build.sh | 1 + 2 files changed, 1 insertion(+) rename {x11-packages => disabled-packages}/otter-browser/3rdparty_fhs_termux_prefix.patch (100%) rename {x11-packages => disabled-packages}/otter-browser/build.sh (98%) diff --git a/x11-packages/otter-browser/3rdparty_fhs_termux_prefix.patch b/disabled-packages/otter-browser/3rdparty_fhs_termux_prefix.patch similarity index 100% rename from x11-packages/otter-browser/3rdparty_fhs_termux_prefix.patch rename to disabled-packages/otter-browser/3rdparty_fhs_termux_prefix.patch diff --git a/x11-packages/otter-browser/build.sh b/disabled-packages/otter-browser/build.sh similarity index 98% rename from x11-packages/otter-browser/build.sh rename to disabled-packages/otter-browser/build.sh index 320c4cd2e8..e0a8905e8a 100644 --- a/x11-packages/otter-browser/build.sh +++ b/disabled-packages/otter-browser/build.sh @@ -1,3 +1,4 @@ +# x11-packages TERMUX_PKG_HOMEPAGE=https://otter-browser.org TERMUX_PKG_DESCRIPTION="Web browser with aspects of Opera (12.x)" TERMUX_PKG_LICENSE="GPL-3.0" From f4674d4dee281dd5bd696f223c2f9def043532e2 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sun, 18 Dec 2022 18:14:08 +0000 Subject: [PATCH 043/244] bump(main/jql): 5.1.4 This commit has been automatically submitted by Github Actions. --- packages/jql/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/jql/build.sh b/packages/jql/build.sh index f4c092837f..10a040f6aa 100644 --- a/packages/jql/build.sh +++ b/packages/jql/build.sh @@ -3,8 +3,8 @@ TERMUX_PKG_DESCRIPTION="A JSON Query Language CLI tool" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_LICENSE_FILE="LICENSE-MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="5.1.3" +TERMUX_PKG_VERSION="5.1.4" TERMUX_PKG_SRCURL="https://github.com/yamafaktory/jql/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz" -TERMUX_PKG_SHA256=776cfabacc51c6f3eca950db77b329246570a000b42757c1cffcc0846445eee6 +TERMUX_PKG_SHA256=a640b41cb04a7bedf098b86859c8295277cec0e6f295bd5688a1cf94de5c4774 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true From c6c32910325f9f5440a2e731d34c6e01628d0b51 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sun, 18 Dec 2022 18:18:25 +0000 Subject: [PATCH 044/244] bump(main/mdbook-open-on-gh): 2.3.1 This commit has been automatically submitted by Github Actions. --- packages/mdbook-open-on-gh/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mdbook-open-on-gh/build.sh b/packages/mdbook-open-on-gh/build.sh index d6e103c00c..4b4eba2931 100644 --- a/packages/mdbook-open-on-gh/build.sh +++ b/packages/mdbook-open-on-gh/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://github.com/badboy/mdbook-open-on-gh TERMUX_PKG_DESCRIPTION="A preprocessor for mdbook to add a open-on-github link on every page" TERMUX_PKG_LICENSE="MPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="2.3.0" +TERMUX_PKG_VERSION="2.3.1" TERMUX_PKG_SRCURL=https://github.com/badboy/mdbook-open-on-gh.git TERMUX_PKG_GIT_BRANCH=$TERMUX_PKG_VERSION TERMUX_PKG_BUILD_IN_SRC=true From ad37ffa57b818ed4d82b316c90176c90d0187b6d Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sun, 18 Dec 2022 18:23:05 +0000 Subject: [PATCH 045/244] bump(main/topgrade): 10.2.4 This commit has been automatically submitted by Github Actions. --- packages/topgrade/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/topgrade/build.sh b/packages/topgrade/build.sh index 86075afef1..cbd969d9f1 100644 --- a/packages/topgrade/build.sh +++ b/packages/topgrade/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/topgrade-rs/topgrade/ TERMUX_PKG_DESCRIPTION="Upgrade all the things" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@laurentlbm" -TERMUX_PKG_VERSION="10.2.2" +TERMUX_PKG_VERSION="10.2.4" TERMUX_PKG_SRCURL="https://github.com/topgrade-rs/topgrade/archive/v${TERMUX_PKG_VERSION}.tar.gz" -TERMUX_PKG_SHA256=00dd0afa9ba166d61e63ea7387b3c6dfd6c905f5a42c1cefc394e7d0a869a6a1 +TERMUX_PKG_SHA256=b7390d609259a4fa4b4c2db6fdc685e12e65d2f9bc98d442d713bf1c9bce7677 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true From 10506cd222078ea3c3a452ca21ed5e60d35217f3 Mon Sep 17 00:00:00 2001 From: Lucy Phipps Date: Sun, 18 Dec 2022 22:55:46 +0000 Subject: [PATCH 046/244] numpy: update to v1.24.0 (#13975) --- packages/python-numpy/build.sh | 2 +- packages/python-numpy/test.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/python-numpy/build.sh b/packages/python-numpy/build.sh index 606d339300..37b30dda6b 100644 --- a/packages/python-numpy/build.sh +++ b/packages/python-numpy/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://numpy.org/ TERMUX_PKG_DESCRIPTION="The fundamental package for scientific computing with Python" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="1.23.5" +TERMUX_PKG_VERSION="1.24.0" TERMUX_PKG_SRCURL=https://github.com/numpy/numpy.git TERMUX_PKG_DEPENDS="libc++, libopenblas, python" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/python-numpy/test.patch b/packages/python-numpy/test.patch index 7b069ec6ab..460aa323e8 100644 --- a/packages/python-numpy/test.patch +++ b/packages/python-numpy/test.patch @@ -6,6 +6,6 @@ pytest.skip('link fails on cygwin') + if os.path.exists("/system/bin/app_process"): + pytest.skip('link fails on Android') + if IS_WASM: + pytest.skip("Can't build module inside Wasm") functions = [ - ("get_default_policy", "METH_NOARGS", """ - Py_INCREF(PyDataMem_DefaultHandler); From ae8be87c24556a6035247b53bb3591d34baf963b Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Mon, 19 Dec 2022 00:21:46 +0000 Subject: [PATCH 047/244] bump(main/chezmoi): 2.28.0 This commit has been automatically submitted by Github Actions. --- packages/chezmoi/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/chezmoi/build.sh b/packages/chezmoi/build.sh index af80d379d8..29945d91c8 100644 --- a/packages/chezmoi/build.sh +++ b/packages/chezmoi/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://chezmoi.io TERMUX_PKG_DESCRIPTION="Manage your dotfiles across multiple machines" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91" -TERMUX_PKG_VERSION="2.27.3" +TERMUX_PKG_VERSION="2.28.0" TERMUX_PKG_SRCURL=https://github.com/twpayne/chezmoi/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=18311299a1449d6cfc070989ce5d616e8c5852f10b1c4619e65116a7065d3acb +TERMUX_PKG_SHA256=00118648ecbff7b951534a80b0c33b73c42b070706bfec58c7b35c85e34cd04d TERMUX_PKG_AUTO_UPDATE=true termux_step_make() { From 74492bc0141f67c1ceeb6fe25651a7dcbba6d240 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Mon, 19 Dec 2022 00:24:58 +0000 Subject: [PATCH 048/244] bump(main/gopass): 1.15.2 This commit has been automatically submitted by Github Actions. --- packages/gopass/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/gopass/build.sh b/packages/gopass/build.sh index 7c52c987cc..f318f7e57c 100644 --- a/packages/gopass/build.sh +++ b/packages/gopass/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/gopasspw/gopass TERMUX_PKG_DESCRIPTION="The slightly more awesome standard unix password manager for teams" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="1.15.1" +TERMUX_PKG_VERSION="1.15.2" TERMUX_PKG_SRCURL=https://github.com/gopasspw/gopass/archive/v$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=8d9f989a7bd0fb3586de1e2ab5c33a592d40c55de0a71b143c50300057300db1 +TERMUX_PKG_SHA256=c4eb5b8c28b0cb339581e1ef9f19612f6d523d7fa8a24554365ee72dc331d8d9 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="git, gnupg" TERMUX_PKG_SUGGESTS="termux-api, openssh" From 36cabaa77af4ba7f2542b68565c1bd69d563b72d Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Mon, 19 Dec 2022 00:36:54 +0000 Subject: [PATCH 049/244] bump(main/ruff): 0.0.186 This commit has been automatically submitted by Github Actions. --- packages/ruff/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ruff/build.sh b/packages/ruff/build.sh index 65cb86dcbd..26a8448609 100644 --- a/packages/ruff/build.sh +++ b/packages/ruff/build.sh @@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE="https://github.com/charliermarsh/ruff" TERMUX_PKG_DESCRIPTION="An extremely fast Python linter, written in Rust" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.0.185" +TERMUX_PKG_VERSION="0.0.186" TERMUX_PKG_SRCURL="https://github.com/charliermarsh/ruff/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz" -TERMUX_PKG_SHA256=34c209f9ae9c7e8608f787283f41edf1e28c291003d5029968a56352fa2b0de7 +TERMUX_PKG_SHA256=3e7167225e7e0124584b8745eb68b6b46015ef2d23cccd85608b4685ac50a26d TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true From e8b148fe059a958db4482f3f811e0ed316dbb5fc Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Mon, 19 Dec 2022 00:38:07 +0000 Subject: [PATCH 050/244] bump(main/tut): 1.0.28 This commit has been automatically submitted by Github Actions. --- packages/tut/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tut/build.sh b/packages/tut/build.sh index 9757000f04..fb1a1e1f86 100644 --- a/packages/tut/build.sh +++ b/packages/tut/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/RasmusLindroth/tut TERMUX_PKG_DESCRIPTION="A TUI for Mastodon with vim inspired keys" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="1.0.26" +TERMUX_PKG_VERSION="1.0.28" TERMUX_PKG_SRCURL=https://github.com/RasmusLindroth/tut/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=693fd151640127d3f90aec5b8766cacb0317d8e3609e4ca1b7fd460da0b01dfe +TERMUX_PKG_SHA256=6dbc41e0615e1e2a2e1d56ecf2a3a9f555bb39ab16fabc8f4a0cdc35735188bf TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true From b8fa3221a3aa08785a8fbd201343d6d0acbae54e Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Mon, 19 Dec 2022 14:22:09 +0900 Subject: [PATCH 051/244] speedtest-go: Enable auto-update %ci:no-build --- packages/speedtest-go/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/speedtest-go/build.sh b/packages/speedtest-go/build.sh index f8ce550dcc..483cc81f6e 100644 --- a/packages/speedtest-go/build.sh +++ b/packages/speedtest-go/build.sh @@ -5,6 +5,7 @@ TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.2.1 TERMUX_PKG_SRCURL=https://github.com/showwin/speedtest-go/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=b3fd66317ff567e139ceb1332e0363c3bc6c1958b3d6dd977b30b22de99b1a19 +TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { From 9bd9cfe0095429b4fe0f9bd51d37c2cdb423df78 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Mon, 19 Dec 2022 06:16:22 +0000 Subject: [PATCH 052/244] bump(main/neovim-nightly): 0.9.0-dev-525+ga7332ba9b This commit has been automatically submitted by Github Actions. --- packages/neovim-nightly/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/neovim-nightly/build.sh b/packages/neovim-nightly/build.sh index e1fd42b425..86df24a736 100644 --- a/packages/neovim-nightly/build.sh +++ b/packages/neovim-nightly/build.sh @@ -5,9 +5,9 @@ TERMUX_PKG_MAINTAINER="Aditya Alok " # Upstream now has version number like "0.8.0-dev-698-ga5920e98f", but actually # "0.8.0-dev-698-g1ef84547a" < "0.8.0-dev-nightly-10-g1a07044c1", we need to bump # the epoch of the package version. -TERMUX_PKG_VERSION="1:0.9.0-dev-522+g174335923" +TERMUX_PKG_VERSION="1:0.9.0-dev-525+ga7332ba9b" TERMUX_PKG_SRCURL="https://github.com/neovim/neovim/archive/nightly.tar.gz" -TERMUX_PKG_SHA256=a6c8dce36cfbeaccb61633a8cd1e1a9700609d75eda92a8fcdef21321364c038 +TERMUX_PKG_SHA256=4dad93bfbe81cb7e7425805e09d546fe70a461bd7321e44251ced786a6c18417 TERMUX_PKG_DEPENDS="libiconv, libuv, luv, libmsgpack, libandroid-support, libvterm, libtermkey, libluajit, libunibilium, libtreesitter" TERMUX_PKG_HOSTBUILD=true From 6828077ba87144f2bf79dd82063eb1b57815801f Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Mon, 19 Dec 2022 06:23:50 +0000 Subject: [PATCH 053/244] bump(main/ruff): 0.0.187 This commit has been automatically submitted by Github Actions. --- packages/ruff/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ruff/build.sh b/packages/ruff/build.sh index 26a8448609..78636e25f6 100644 --- a/packages/ruff/build.sh +++ b/packages/ruff/build.sh @@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE="https://github.com/charliermarsh/ruff" TERMUX_PKG_DESCRIPTION="An extremely fast Python linter, written in Rust" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.0.186" +TERMUX_PKG_VERSION="0.0.187" TERMUX_PKG_SRCURL="https://github.com/charliermarsh/ruff/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz" -TERMUX_PKG_SHA256=3e7167225e7e0124584b8745eb68b6b46015ef2d23cccd85608b4685ac50a26d +TERMUX_PKG_SHA256=5ee0039a4e115a906abad55ba38ed85d3f74321ad723554e5d96fa6227068bef TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true From caae917415feb504d4993fa643247b5f0a0f2da5 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Mon, 19 Dec 2022 06:24:34 +0000 Subject: [PATCH 054/244] bump(main/speedtest-go): 1.3.1 This commit has been automatically submitted by Github Actions. --- packages/speedtest-go/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/speedtest-go/build.sh b/packages/speedtest-go/build.sh index 483cc81f6e..5e46b4bc37 100644 --- a/packages/speedtest-go/build.sh +++ b/packages/speedtest-go/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/showwin/speedtest-go/ TERMUX_PKG_DESCRIPTION="Command line interface to test internet speed using speedtest.net" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.2.1 +TERMUX_PKG_VERSION="1.3.1" TERMUX_PKG_SRCURL=https://github.com/showwin/speedtest-go/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=b3fd66317ff567e139ceb1332e0363c3bc6c1958b3d6dd977b30b22de99b1a19 +TERMUX_PKG_SHA256=8ab904f4e631a0b4c56731ce5cf2e915bbf83626b7a93454b5a9fcbc3fb7cd21 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true From 90cf224d1d1374ea73258b5ebc0eeef8b023f005 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 19 Dec 2022 00:33:17 +0100 Subject: [PATCH 055/244] gap: update to 4.12.2 Several workarounds are not needed anymore --- packages/gap/Makefile.rules.patch | 20 ------------ packages/gap/build.sh | 18 +++-------- packages/gap/compiled.h-path.patch | 51 ------------------------------ 3 files changed, 4 insertions(+), 85 deletions(-) delete mode 100644 packages/gap/Makefile.rules.patch diff --git a/packages/gap/Makefile.rules.patch b/packages/gap/Makefile.rules.patch deleted file mode 100644 index bdba41ed43..0000000000 --- a/packages/gap/Makefile.rules.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ../gap-4.12.1/Makefile.rules 2022-10-20 19:53:39.000000000 +0000 -+++ ./Makefile.rules 2022-10-26 08:09:47.012253589 +0000 -@@ -586,7 +586,7 @@ - install-bin: gap - # install the real GAP executable as $(libdir)/gap/gap - $(INSTALL) -d -m 0755 $(DESTDIR)$(libdir)/gap -- $(LTINSTALL) -s gap $(DESTDIR)$(libdir)/gap -+ $(LTINSTALL) gap $(DESTDIR)$(libdir)/gap - - # install a wrapper shell script invoking the real GAP executable as $(bindir)/gap - $(INSTALL) -d -m 0755 $(DESTDIR)$(bindir) -@@ -658,8 +658,6 @@ - $(INSTALL) -m 0644 $(builddir)/build/version.h $(DESTDIR)$(includedir)/gap - $(INSTALL) -d -m 0755 $(DESTDIR)$(includedir)/gap/hpc - $(INSTALL) -m 0644 $(srcdir)/src/hpc/*.h $(DESTDIR)$(includedir)/gap/hpc -- # Create a symlink to support packages using `#include "src/compiled.h"` -- ln -sfn . $(DESTDIR)$(includedir)/gap/src - - install-libgap: libgap.la - $(INSTALL) -d -m 0755 $(DESTDIR)$(libdir) diff --git a/packages/gap/build.sh b/packages/gap/build.sh index 2323ba4411..9ac3064a49 100644 --- a/packages/gap/build.sh +++ b/packages/gap/build.sh @@ -2,22 +2,14 @@ TERMUX_PKG_HOMEPAGE=https://www.gap-system.org/ TERMUX_PKG_DESCRIPTION="GAP is a system for computational discrete algebra, with particular emphasis on Computational Group Theory" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=4.12.1 +TERMUX_PKG_VERSION=4.12.2 TERMUX_PKG_SRCURL=https://github.com/gap-system/gap/releases/download/v${TERMUX_PKG_VERSION}/gap-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=f9ebef11ee31b210ce36e3c70960742b4e253282bbd5270adc9324273c92b016 +TERMUX_PKG_SHA256=672308745eb78a222494ee8dd6786edd5bc331456fcc6456ac064bdb28d587a8 TERMUX_PKG_DEPENDS="readline, libgmp, zlib, gap-packages" TERMUX_PKG_BREAKS="gap-dev" TERMUX_PKG_REPLACES="gap-dev" TERMUX_PKG_GROUPS="science" -termux_step_post_configure() { - # workaround build system bug that occurs when doing - # an out-of-tree cross compilation build - mkdir -p src - cp $TERMUX_PKG_SRCDIR/src/ffdata.* src/ - cp $TERMUX_PKG_SRCDIR/src/c_*.c src/ -} - termux_step_post_make_install() { mkdir -p $TERMUX_PREFIX/lib/gap/pkg # install at least gapdoc, smallgrp, transgrp, primgrp or else @@ -27,9 +19,7 @@ termux_step_post_make_install() { cp -r $TERMUX_PKG_SRCDIR/pkg/transgrp $TERMUX_PREFIX/lib/gap/pkg/ cp -r $TERMUX_PKG_SRCDIR/pkg/primgrp $TERMUX_PREFIX/lib/gap/pkg/ - # To get them to be small enough, could gzip them in place + # To save some disk space, compress transgrp data in place # (GAP transparently allows read access to those) - gzip -9 -n -f $TERMUX_PREFIX/lib/gap/pkg/*/data/*.* - gzip -9 -n -f $TERMUX_PREFIX/lib/gap/pkg/smallgrp/id*/*.* - gzip -9 -n -f $TERMUX_PREFIX/lib/gap/pkg/smallgrp/small*/*.* + gzip -9 -n -f $TERMUX_PREFIX/lib/gap/pkg/transgrp/data/*.* } diff --git a/packages/gap/compiled.h-path.patch b/packages/gap/compiled.h-path.patch index c7d8d117ce..2379e02f87 100644 --- a/packages/gap/compiled.h-path.patch +++ b/packages/gap/compiled.h-path.patch @@ -1,54 +1,3 @@ -diff --git ./pkg/caratinterface/src/setcaratdir.c b/pkg/caratinterface/src/setcaratdir.c -index b4010465..5e2a0eea 100644 ---- ./pkg/caratinterface/src/setcaratdir.c -+++ ./pkg/caratinterface/src/setcaratdir.c -@@ -1,6 +1,6 @@ - #include - #include --#include "src/compiled.h" -+#include "compiled.h" - - Obj FuncSET_CARAT_DIR( Obj self, Obj str ) { - setenv("CARAT_DIR", CSTR_STRING(str), 1); -diff --git ./pkg/cddinterface/src/CddInterface.c b/pkg/cddinterface/src/CddInterface.c -index 9c931ba0..19e7eb75 100644 ---- ./pkg/cddinterface/src/CddInterface.c -+++ ./pkg/cddinterface/src/CddInterface.c -@@ -2,7 +2,7 @@ - * CddInterface: Gap interface to Cdd package - */ - --#include "src/compiled.h" /* GAP headers */ -+#include "compiled.h" /* GAP headers */ - - #include "setoper.h" - #include "cdd.h" -diff --git ./pkg/digraphs/src/cliques.c b/pkg/digraphs/src/cliques.c -index 4bcf8219..f7f34728 100644 ---- ./pkg/digraphs/src/cliques.c -+++ ./pkg/digraphs/src/cliques.c -@@ -15,7 +15,7 @@ - #include // for malloc, NULL - - // GAP headers --#include "src/compiled.h" -+#include "compiled.h" - - // Digraphs package headers - #include "bitarray.h" // for BitArray -diff --git ./pkg/digraphs/src/cliques.h b/pkg/digraphs/src/cliques.h -index d953121b..909c7919 100644 ---- ./pkg/digraphs/src/cliques.h -+++ ./pkg/digraphs/src/cliques.h -@@ -12,7 +12,7 @@ - #define DIGRAPHS_SRC_CLIQUES_H_ - - // GAP headers --#include "src/compiled.h" -+#include "compiled.h" - - Obj FuncDigraphsCliquesFinder(Obj self, Obj args); - diff --git ./pkg/edim/src/compstat_with_ediv.c b/pkg/edim/src/compstat_with_ediv.c index 0b335b25..010122d1 100644 --- ./pkg/edim/src/compstat_with_ediv.c From 8f89c8490e31948db29d4b62a9491c6548791539 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Mon, 19 Dec 2022 14:13:15 +0900 Subject: [PATCH 056/244] gap: Mark gap-packages as platform-independent --- packages/gap/gap-packages.subpackage.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/gap/gap-packages.subpackage.sh b/packages/gap/gap-packages.subpackage.sh index 6b975bd987..e3e813e22f 100644 --- a/packages/gap/gap-packages.subpackage.sh +++ b/packages/gap/gap-packages.subpackage.sh @@ -1,2 +1,3 @@ TERMUX_SUBPKG_DESCRIPTION="Packages for gap" TERMUX_SUBPKG_INCLUDE="lib/gap/pkg/" +TERMUX_SUBPKG_PLATFORM_INDEPENDENT=true From 895b9ba62f42c9a9436ee85a3366f56548f6af90 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Mon, 19 Dec 2022 14:24:20 +0900 Subject: [PATCH 057/244] libvncserver: Bump to 0.9.14 --- x11-packages/libvncserver/build.sh | 20 +++++++++++++++---- .../libvncclient.pc.cmakein.patch | 10 ++++++++++ .../libvncserver.pc.cmakein.patch | 10 ++++++++++ 3 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 x11-packages/libvncserver/libvncclient.pc.cmakein.patch create mode 100644 x11-packages/libvncserver/libvncserver.pc.cmakein.patch diff --git a/x11-packages/libvncserver/build.sh b/x11-packages/libvncserver/build.sh index a228c22776..bb37245ca6 100644 --- a/x11-packages/libvncserver/build.sh +++ b/x11-packages/libvncserver/build.sh @@ -2,8 +2,20 @@ TERMUX_PKG_HOMEPAGE=https://libvnc.github.io/ TERMUX_PKG_DESCRIPTION="Cross-platform C libraries that allow you to easily implement VNC server or client functionality" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=0.9.13 -TERMUX_PKG_REVISION=7 +TERMUX_PKG_VERSION=0.9.14 TERMUX_PKG_SRCURL=https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=0ae5bb9175dc0a602fe85c1cf591ac47ee5247b87f2bf164c16b05f87cbfa81a -TERMUX_PKG_DEPENDS="libgcrypt, libgnutls, libjpeg-turbo, libpng, openssl" +TERMUX_PKG_SHA256=83104e4f7e28b02f8bf6b010d69b626fae591f887e949816305daebae527c9a5 +TERMUX_PKG_DEPENDS="libgcrypt, libgnutls, libjpeg-turbo, liblzo, libpng, zlib" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DWITH_OPENSSL=OFF +-DWITH_SASL=OFF +" + +termux_step_post_massage() { + local f + for f in ./lib/pkgconfig/libvnc{client,server}.pc; do + if [ -e "${f}" ]; then + sed -i '/^Libs\.private:/s/ -l\(-pthread\)/ \1/' "${f}" + fi + done +} diff --git a/x11-packages/libvncserver/libvncclient.pc.cmakein.patch b/x11-packages/libvncserver/libvncclient.pc.cmakein.patch new file mode 100644 index 0000000000..d7c4081752 --- /dev/null +++ b/x11-packages/libvncserver/libvncclient.pc.cmakein.patch @@ -0,0 +1,10 @@ +--- a/libvncclient.pc.cmakein ++++ b/libvncclient.pc.cmakein +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ ++libdir=@CMAKE_INSTALL_LIBDIR@ + includedir=@CMAKE_INSTALL_PREFIX@/include + + Name: LibVNCClient diff --git a/x11-packages/libvncserver/libvncserver.pc.cmakein.patch b/x11-packages/libvncserver/libvncserver.pc.cmakein.patch new file mode 100644 index 0000000000..f582888807 --- /dev/null +++ b/x11-packages/libvncserver/libvncserver.pc.cmakein.patch @@ -0,0 +1,10 @@ +--- a/libvncserver.pc.cmakein ++++ b/libvncserver.pc.cmakein +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ ++libdir=@CMAKE_INSTALL_LIBDIR@ + includedir=@CMAKE_INSTALL_PREFIX@/include + + Name: LibVNCServer From 9033452f085995c5133f7d99f9684791f9acd1e4 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Mon, 19 Dec 2022 17:01:58 +0900 Subject: [PATCH 058/244] python-apsw: Bump to 3.40.0.0 --- packages/python-apsw/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/python-apsw/build.sh b/packages/python-apsw/build.sh index 9135c42547..041c00bfcc 100644 --- a/packages/python-apsw/build.sh +++ b/packages/python-apsw/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/rogerbinns/apsw/ TERMUX_PKG_DESCRIPTION="Another Python SQLite Wrapper" TERMUX_PKG_LICENSE="ZLIB" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=3.39.4.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=3.40.0.0 TERMUX_PKG_SRCURL=https://github.com/rogerbinns/apsw/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=8c4336c1ab3470ac43a6ea9e11646c5296d63577c210cf89daf870cd72d80906 +TERMUX_PKG_SHA256=c4ebd4c7008bcefe1112386496523bd8433035f9f8a8b1369b1c02923e763e73 TERMUX_PKG_DEPENDS="libsqlite, python" TERMUX_PKG_BUILD_IN_SRC=true From 90913be9d38dfd7ed347555d328e38ebe6a65e1b Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Mon, 19 Dec 2022 17:29:08 +0900 Subject: [PATCH 059/244] python-apt: Bump to 2.5.0 --- packages/python-apt/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/python-apt/build.sh b/packages/python-apt/build.sh index 378eee8b10..4f87a6d080 100644 --- a/packages/python-apt/build.sh +++ b/packages/python-apt/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://apt-team.pages.debian.net/python-apt/ TERMUX_PKG_DESCRIPTION="Python bindings for APT" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=2.3.0 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_VERSION=2.5.0 TERMUX_PKG_SRCURL=https://ftp.debian.org/debian/pool/main/p/python-apt/python-apt_${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=de4a284bc7a738793615631d451524f42404034f4d787953b7621b25bc29e474 +TERMUX_PKG_SHA256=07ece069cdc9f5523a405f46ab5437260dca5e34909601c4540f160c476bb982 TERMUX_PKG_DEPENDS="apt, build-essential, libc++, python, texinfo" TERMUX_PKG_BUILD_IN_SRC=true From cf769edf183613764b0cb23987ed20daa7aaa60a Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Mon, 19 Dec 2022 12:10:37 +0000 Subject: [PATCH 060/244] bump(main/cloudflared): 2022.12.0 This commit has been automatically submitted by Github Actions. --- packages/cloudflared/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/cloudflared/build.sh b/packages/cloudflared/build.sh index eb69e397fc..83397456af 100644 --- a/packages/cloudflared/build.sh +++ b/packages/cloudflared/build.sh @@ -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="2022.11.1" +TERMUX_PKG_VERSION="2022.12.0" TERMUX_PKG_SRCURL=https://github.com/cloudflare/cloudflared/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=d4b1133057a721087a0a5387ea6d4d1ebf3b1f5135396da25a1e88e873cd5203 +TERMUX_PKG_SHA256=0c7f3f1d48c5b676e2555c8dea2168f09c7500993cbfc351ddb743eee0744630 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true From 2f11afbabe4ebb10525d030669ad82b2e8e70832 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Mon, 19 Dec 2022 12:10:54 +0000 Subject: [PATCH 061/244] bump(main/vulkan-headers): 1.3.238 This commit has been automatically submitted by Github Actions. --- packages/vulkan-headers/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/vulkan-headers/build.sh b/packages/vulkan-headers/build.sh index de6cf8d4f5..1c5fab5745 100644 --- a/packages/vulkan-headers/build.sh +++ b/packages/vulkan-headers/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Headers TERMUX_PKG_DESCRIPTION="Vulkan Header files and API registry" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="1.3.237" +TERMUX_PKG_VERSION="1.3.238" TERMUX_PKG_SRCURL=https://github.com/KhronosGroup/Vulkan-Headers/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=3f0d9a01a7859efbf312f34140259fc90aa0ba04f635e98f8f36321de4bd509b +TERMUX_PKG_SHA256=c2b72c5e94bcabb5c276c0d55344f66d3486c9465beb74397aeb7d5bcf537143 TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag" From d1d65a224daade52517967c2c640504635c26a88 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Mon, 19 Dec 2022 12:18:46 +0000 Subject: [PATCH 062/244] bump(main/difftastic): 0.39.0 This commit has been automatically submitted by Github Actions. --- packages/difftastic/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/difftastic/build.sh b/packages/difftastic/build.sh index 57b0fd16f1..f0fc17cadb 100644 --- a/packages/difftastic/build.sh +++ b/packages/difftastic/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="difft: A structural diff that understands syntax" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_LICENSE_FILE="LICENSE" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.38.0" +TERMUX_PKG_VERSION="0.39.0" TERMUX_PKG_SRCURL="https://github.com/Wilfred/difftastic/archive/refs/tags/$TERMUX_PKG_VERSION.tar.gz" -TERMUX_PKG_SHA256=0f7bc54875939a6a4d2d695f2e94d30573818d72b88c00f38b0bc502f79671c3 +TERMUX_PKG_SHA256=ba05464d8a5c77374cb9a07d901eda56c67f4d558def515454bc4b7431c8ca38 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="libc++" TERMUX_PKG_BUILD_IN_SRC=true From 4fedff7b1d8725c5acf42e1694e92ec26c9b8cd1 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Mon, 19 Dec 2022 12:22:37 +0000 Subject: [PATCH 063/244] bump(main/mdbook-mermaid): 0.12.6 This commit has been automatically submitted by Github Actions. --- packages/mdbook-mermaid/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mdbook-mermaid/build.sh b/packages/mdbook-mermaid/build.sh index 305523c7bb..542820556b 100644 --- a/packages/mdbook-mermaid/build.sh +++ b/packages/mdbook-mermaid/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://github.com/badboy/mdbook-mermaid TERMUX_PKG_DESCRIPTION="A preprocessor for mdbook to add mermaid support" TERMUX_PKG_LICENSE="MPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.12.5" +TERMUX_PKG_VERSION="0.12.6" TERMUX_PKG_SRCURL=https://github.com/badboy/mdbook-mermaid.git TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_AUTO_UPDATE=true From 040796c34af9a00ccfc1a2ca5b4a577f7e4dba28 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Mon, 19 Dec 2022 18:16:06 +0000 Subject: [PATCH 064/244] bump(main/qalc): 4.5.0 This commit has been automatically submitted by Github Actions. --- packages/qalc/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/qalc/build.sh b/packages/qalc/build.sh index fef5db536a..7e05d97540 100644 --- a/packages/qalc/build.sh +++ b/packages/qalc/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://qalculate.github.io/ TERMUX_PKG_DESCRIPTION="Powerful and easy to use command line calculator" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="4.4.0" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION="4.5.0" TERMUX_PKG_SRCURL=https://github.com/Qalculate/libqalculate/releases/download/v$TERMUX_PKG_VERSION/libqalculate-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=79cfdc4d4af9dfcd6902c2ec680ed1f3d5845d07b5ee1c76255fdca731a8b758 +TERMUX_PKG_SHA256=b5d64ac3c524630a066855a403b284a14c78c77c6601bc67caf25d2e04d9d79f TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="libc++, libcurl, libgmp, libiconv, libmpfr, libxml2, readline" TERMUX_PKG_BREAKS="qalc-dev" From 023b9739e6a3382597ec291c90914f525d97f412 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Mon, 19 Dec 2022 18:23:07 +0000 Subject: [PATCH 065/244] bump(main/ruff): 0.0.188 This commit has been automatically submitted by Github Actions. --- packages/ruff/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ruff/build.sh b/packages/ruff/build.sh index 78636e25f6..5a13377572 100644 --- a/packages/ruff/build.sh +++ b/packages/ruff/build.sh @@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE="https://github.com/charliermarsh/ruff" TERMUX_PKG_DESCRIPTION="An extremely fast Python linter, written in Rust" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.0.187" +TERMUX_PKG_VERSION="0.0.188" TERMUX_PKG_SRCURL="https://github.com/charliermarsh/ruff/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz" -TERMUX_PKG_SHA256=5ee0039a4e115a906abad55ba38ed85d3f74321ad723554e5d96fa6227068bef +TERMUX_PKG_SHA256=a7201e9bc44590906a6f87caa1919070dc0baea1a08687454998724a5857ed5b TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true From 8bec38d42d9b2de9a01e17eaf50a760d7ee3b5d0 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Tue, 20 Dec 2022 00:21:57 +0000 Subject: [PATCH 066/244] bump(main/buf): 1.11.0 This commit has been automatically submitted by Github Actions. --- packages/buf/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/buf/build.sh b/packages/buf/build.sh index 8e46cff364..de00b31bf6 100644 --- a/packages/buf/build.sh +++ b/packages/buf/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://buf.build TERMUX_PKG_DESCRIPTION="A new way of working with Protocol Buffers" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.10.0 +TERMUX_PKG_VERSION="1.11.0" TERMUX_PKG_SRCURL=https://github.com/bufbuild/buf/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=0fb3f1796164f86912e83c2e16c5a5f13d92589969661b1dc6cd6ee7f3670b1d +TERMUX_PKG_SHA256=1bbeeaf741105bcafca8f0c59140cc60c237970c375cbd8e72ac9eb932fc2fc5 TERMUX_PKG_AUTO_UPDATE=true termux_step_make() { From df07c62532e2091c072fdf2bf41beac8e7fb5d9b Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Tue, 20 Dec 2022 00:23:03 +0000 Subject: [PATCH 067/244] bump(main/esbuild): 0.16.10 This commit has been automatically submitted by Github Actions. --- packages/esbuild/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/esbuild/build.sh b/packages/esbuild/build.sh index bdd545c4ac..3ceebb0055 100644 --- a/packages/esbuild/build.sh +++ b/packages/esbuild/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://esbuild.github.io/ TERMUX_PKG_DESCRIPTION="An extremely fast JavaScript bundler" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.16.9" +TERMUX_PKG_VERSION="0.16.10" TERMUX_PKG_SRCURL=https://github.com/evanw/esbuild/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=9633f9c565ba5f4ef4095a72d783e71c2b0027dd42f52f329b40c5ec37bf2f2f +TERMUX_PKG_SHA256=edd43991a3169393f978598889fd81faa5db54551a32682c2c8249655799e805 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true From 19e06a218a8a72dbd250177806beff053c1ff7f6 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Tue, 20 Dec 2022 14:50:20 +0900 Subject: [PATCH 068/244] mdbook-katex: Enable auto-update %ci:no-build --- packages/mdbook-katex/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/mdbook-katex/build.sh b/packages/mdbook-katex/build.sh index a3e8502a1d..eb874399bb 100644 --- a/packages/mdbook-katex/build.sh +++ b/packages/mdbook-katex/build.sh @@ -5,6 +5,7 @@ TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.2.17 TERMUX_PKG_SRCURL=https://github.com/lzanini/mdbook-katex/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=ce980c2d6a3cb870c05371030f7f189044d5199b56c5c134c3c858ce9edcca07 +TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="openssl" TERMUX_PKG_BUILD_IN_SRC=true From 7000b8c1442161802bf8c7aa10246eb9154372b7 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Tue, 20 Dec 2022 14:43:15 +0900 Subject: [PATCH 069/244] imlib2: Bump to 1.10.0 --- packages/imlib2/0000-fix-mblen.patch | 6 +++--- packages/imlib2/build.sh | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/imlib2/0000-fix-mblen.patch b/packages/imlib2/0000-fix-mblen.patch index 32716ffd84..00cff150b5 100644 --- a/packages/imlib2/0000-fix-mblen.patch +++ b/packages/imlib2/0000-fix-mblen.patch @@ -3,16 +3,16 @@ diff -uNr imlib2-1.6.1/src/bin/imlib2_show.c imlib2-1.6.1.mod/src/bin/imlib2_sho +++ imlib2-1.6.1.mod/src/bin/imlib2_show.c 2019-12-16 14:53:36.307439115 +0200 @@ -12,6 +12,11 @@ - #include "Imlib2.h" + #include "prog_x11.h" +static int android_mblen(const char *s, size_t n) +{ + return mbtowc(0, s, n); +} + - Display *disp; - Window win; + static Window win; + void progress(Imlib_Image * im, char percent, int update_x, @@ -1262,7 +1267,7 @@ char tmp[16]; int len; diff --git a/packages/imlib2/build.sh b/packages/imlib2/build.sh index fc0ece5157..26e2639ac9 100644 --- a/packages/imlib2/build.sh +++ b/packages/imlib2/build.sh @@ -3,9 +3,8 @@ TERMUX_PKG_DESCRIPTION="Library that does image file loading and saving as well TERMUX_PKG_LICENSE="custom" TERMUX_PKG_LICENSE_FILE="COPYING, COPYING-PLAIN" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.9.1 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_VERSION=1.10.0 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/enlightenment/imlib2-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=4a224038bfffbe5d4d250c44e05f4ee5ae24dcfef8395b1677c715c58f764d43 -TERMUX_PKG_DEPENDS="freetype, gdk-pixbuf, giflib, glib, libandroid-shmem, libbz2, libcairo, libheif, libid3tag, libjpeg-turbo, libjxl, liblzma, libpng, librsvg, libtiff, libwebp, libx11, libxcb, libxext, openjpeg, zlib, zstd" +TERMUX_PKG_SHA256=727c1a937c885c080c37217e476dc88b5a3e60d737f1bf040b343520b781cbba +TERMUX_PKG_DEPENDS="freetype, gdk-pixbuf, giflib, glib, libandroid-shmem, libbz2, libcairo, libheif, libid3tag, libjpeg-turbo, libjxl, liblzma, libpng, librsvg, libtiff, libwebp, libx11, libxcb, libxext, openjpeg, zlib" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="LIBS=-landroid-shmem" From 3397e43d9e5dc4dc2095f917fade7239fb985f08 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Tue, 20 Dec 2022 14:46:11 +0900 Subject: [PATCH 070/244] xcb-util: Bump to 0.4.1 --- x11-packages/xcb-util/build.sh | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/x11-packages/xcb-util/build.sh b/x11-packages/xcb-util/build.sh index 21d260175b..f3f1ab58e6 100644 --- a/x11-packages/xcb-util/build.sh +++ b/x11-packages/xcb-util/build.sh @@ -2,23 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://xcb.freedesktop.org/ TERMUX_PKG_DESCRIPTION="Utility libraries for XC Binding" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=0.4.0 -TERMUX_PKG_REVISION=29 -TERMUX_PKG_SRCURL=https://xcb.freedesktop.org/dist/xcb-util-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=0ed0934e2ef4ddff53fcc70fc64fb16fe766cd41ee00330312e20a985fd927a7 +TERMUX_PKG_VERSION=0.4.1 +TERMUX_PKG_SRCURL=https://xcb.freedesktop.org/dist/xcb-util-${TERMUX_PKG_VERSION}.tar.xz +TERMUX_PKG_SHA256=5abe3bbbd8e54f0fa3ec945291b7e8fa8cfd3cccc43718f8758430f94126e512 TERMUX_PKG_DEPENDS="libxcb" TERMUX_PKG_BUILD_DEPENDS="xorg-util-macros" - -termux_step_pre_configure() { - autoreconf -fi -} - -termux_step_post_massage() { - local _SOVERSION_SUFFIXED_SO_FILES="lib/libxcb-util.so.1" - local f - for f in ${_SOVERSION_SUFFIXED_SO_FILES}; do - if [ -e "${f}" ]; then - termux_error_exit "File ${f} should not be contained in this package." - fi - done -} From 57121b2c67fad3c80f77adfd2697f07ad0513e1a Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Tue, 20 Dec 2022 14:44:30 +0900 Subject: [PATCH 071/244] libsm: Bump to 1.2.4 --- packages/libsm/build.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/libsm/build.sh b/packages/libsm/build.sh index bde25f5053..79b331a581 100644 --- a/packages/libsm/build.sh +++ b/packages/libsm/build.sh @@ -3,9 +3,8 @@ TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/ TERMUX_PKG_DESCRIPTION="X11 Session Management library" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.2.3 -TERMUX_PKG_REVISION=17 -TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libSM-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=2d264499dcb05f56438dee12a1b4b71d76736ce7ba7aa6efbf15ebb113769cbb +TERMUX_PKG_VERSION=1.2.4 +TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libSM-${TERMUX_PKG_VERSION}.tar.xz +TERMUX_PKG_SHA256=fdcbe51e4d1276b1183da77a8a4e74a137ca203e0bcfb20972dd5f3347e97b84 TERMUX_PKG_DEPENDS="libice, libuuid" TERMUX_PKG_BUILD_DEPENDS="xorg-util-macros, xtrans" From 5371cd058a6a5fd63fbcefdde0db2a088b89e2ea Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Tue, 20 Dec 2022 06:13:14 +0000 Subject: [PATCH 072/244] bump(main/gping): 1.6.2 This commit has been automatically submitted by Github Actions. --- packages/gping/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/gping/build.sh b/packages/gping/build.sh index f80b8a2e1b..709b6a08a2 100644 --- a/packages/gping/build.sh +++ b/packages/gping/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/orf/gping TERMUX_PKG_DESCRIPTION="Ping, but with a graph" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Krishna kanhaiya @kcubeterm" -TERMUX_PKG_VERSION="1.6.1" +TERMUX_PKG_VERSION="1.6.2" TERMUX_PKG_SRCURL=https://github.com/orf/gping/archive/refs/tags/gping-v$TERMUX_PKG_VERSION.zip -TERMUX_PKG_SHA256=854aff1d1a2f517e0a4dd2c9b86aab4bd5c4d3c297f1058f8b3920e8373b5910 +TERMUX_PKG_SHA256=b62286debb14689c0fcbefae9999a1715529479fa04e4aadaf1bf11ff26bfa6b TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_VERSION_REGEXP="\d+\.\d+\.\d+" TERMUX_PKG_BUILD_DEPENDS="zlib" From 5096dd70506c61b5a6456eb2fb353dc61808ac1d Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Tue, 20 Dec 2022 06:18:42 +0000 Subject: [PATCH 073/244] bump(main/mdbook-katex): 0.2.24 This commit has been automatically submitted by Github Actions. --- packages/mdbook-katex/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mdbook-katex/build.sh b/packages/mdbook-katex/build.sh index eb874399bb..2c7d8efe97 100644 --- a/packages/mdbook-katex/build.sh +++ b/packages/mdbook-katex/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/lzanini/mdbook-katex TERMUX_PKG_DESCRIPTION="A preprocessor for mdBook, pre-rendering LaTex equations to HTML at build time" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=0.2.17 +TERMUX_PKG_VERSION="0.2.24" TERMUX_PKG_SRCURL=https://github.com/lzanini/mdbook-katex/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=ce980c2d6a3cb870c05371030f7f189044d5199b56c5c134c3c858ce9edcca07 +TERMUX_PKG_SHA256=9bbe10a2adc14cd95254f2c4945c7943ec8bb7133c6bee33da9d62bf02168aa4 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="openssl" TERMUX_PKG_BUILD_IN_SRC=true From 7a76cb9e571d56caacc04c4f97139703999259dc Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Tue, 20 Dec 2022 06:26:36 +0000 Subject: [PATCH 074/244] bump(main/neovim-nightly): 0.9.0-dev-530+gde90a8bfe This commit has been automatically submitted by Github Actions. --- packages/neovim-nightly/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/neovim-nightly/build.sh b/packages/neovim-nightly/build.sh index 86df24a736..ecc3d07fec 100644 --- a/packages/neovim-nightly/build.sh +++ b/packages/neovim-nightly/build.sh @@ -5,9 +5,9 @@ TERMUX_PKG_MAINTAINER="Aditya Alok " # Upstream now has version number like "0.8.0-dev-698-ga5920e98f", but actually # "0.8.0-dev-698-g1ef84547a" < "0.8.0-dev-nightly-10-g1a07044c1", we need to bump # the epoch of the package version. -TERMUX_PKG_VERSION="1:0.9.0-dev-525+ga7332ba9b" +TERMUX_PKG_VERSION="1:0.9.0-dev-530+gde90a8bfe" TERMUX_PKG_SRCURL="https://github.com/neovim/neovim/archive/nightly.tar.gz" -TERMUX_PKG_SHA256=4dad93bfbe81cb7e7425805e09d546fe70a461bd7321e44251ced786a6c18417 +TERMUX_PKG_SHA256=61240766916ea8f13544a997b62eb19e088734a2957e854f6f31538d4f2112d0 TERMUX_PKG_DEPENDS="libiconv, libuv, luv, libmsgpack, libandroid-support, libvterm, libtermkey, libluajit, libunibilium, libtreesitter" TERMUX_PKG_HOSTBUILD=true From 787f708c6c1041628464ab2e48b71061fa7f9c72 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Tue, 20 Dec 2022 14:37:42 +0900 Subject: [PATCH 075/244] gstreamer, gst-*: Bump to 1.20.5 --- packages/gst-libav/build.sh | 4 ++-- packages/gst-plugins-bad/build.sh | 4 ++-- packages/gst-plugins-base/build.sh | 4 ++-- .../gir/{1.20.4 => 1.20.5}/GstAllocators-1.0.xml | 0 .../gst-plugins-base/gir/{1.20.4 => 1.20.5}/GstApp-1.0.xml | 0 .../gst-plugins-base/gir/{1.20.4 => 1.20.5}/GstAudio-1.0.xml | 0 .../gst-plugins-base/gir/{1.20.4 => 1.20.5}/GstGL-1.0.xml | 0 .../gst-plugins-base/gir/{1.20.4 => 1.20.5}/GstGLEGL-1.0.xml | 0 .../gst-plugins-base/gir/{1.20.4 => 1.20.5}/GstGLX11-1.0.xml | 0 .../gir/{1.20.4 => 1.20.5}/GstPbutils-1.0.xml | 0 .../gst-plugins-base/gir/{1.20.4 => 1.20.5}/GstRtp-1.0.xml | 0 .../gst-plugins-base/gir/{1.20.4 => 1.20.5}/GstRtsp-1.0.xml | 0 .../gst-plugins-base/gir/{1.20.4 => 1.20.5}/GstSdp-1.0.xml | 0 .../gst-plugins-base/gir/{1.20.4 => 1.20.5}/GstTag-1.0.xml | 0 .../gst-plugins-base/gir/{1.20.4 => 1.20.5}/GstVideo-1.0.xml | 0 packages/gst-plugins-good/build.sh | 4 ++-- packages/gst-plugins-ugly/build.sh | 4 ++-- packages/gst-python/build.sh | 4 ++-- packages/gstreamer/build.sh | 4 ++-- packages/gstreamer/gir/{1.20.4 => 1.20.5}/Gst-1.0.xml | 0 packages/gstreamer/gir/{1.20.4 => 1.20.5}/GstBase-1.0.xml | 0 .../gstreamer/gir/{1.20.4 => 1.20.5}/GstController-1.0.xml | 0 packages/gstreamer/gir/{1.20.4 => 1.20.5}/GstNet-1.0.xml | 0 23 files changed, 14 insertions(+), 14 deletions(-) rename packages/gst-plugins-base/gir/{1.20.4 => 1.20.5}/GstAllocators-1.0.xml (100%) rename packages/gst-plugins-base/gir/{1.20.4 => 1.20.5}/GstApp-1.0.xml (100%) rename packages/gst-plugins-base/gir/{1.20.4 => 1.20.5}/GstAudio-1.0.xml (100%) rename packages/gst-plugins-base/gir/{1.20.4 => 1.20.5}/GstGL-1.0.xml (100%) rename packages/gst-plugins-base/gir/{1.20.4 => 1.20.5}/GstGLEGL-1.0.xml (100%) rename packages/gst-plugins-base/gir/{1.20.4 => 1.20.5}/GstGLX11-1.0.xml (100%) rename packages/gst-plugins-base/gir/{1.20.4 => 1.20.5}/GstPbutils-1.0.xml (100%) rename packages/gst-plugins-base/gir/{1.20.4 => 1.20.5}/GstRtp-1.0.xml (100%) rename packages/gst-plugins-base/gir/{1.20.4 => 1.20.5}/GstRtsp-1.0.xml (100%) rename packages/gst-plugins-base/gir/{1.20.4 => 1.20.5}/GstSdp-1.0.xml (100%) rename packages/gst-plugins-base/gir/{1.20.4 => 1.20.5}/GstTag-1.0.xml (100%) rename packages/gst-plugins-base/gir/{1.20.4 => 1.20.5}/GstVideo-1.0.xml (100%) rename packages/gstreamer/gir/{1.20.4 => 1.20.5}/Gst-1.0.xml (100%) rename packages/gstreamer/gir/{1.20.4 => 1.20.5}/GstBase-1.0.xml (100%) rename packages/gstreamer/gir/{1.20.4 => 1.20.5}/GstController-1.0.xml (100%) rename packages/gstreamer/gir/{1.20.4 => 1.20.5}/GstNet-1.0.xml (100%) diff --git a/packages/gst-libav/build.sh b/packages/gst-libav/build.sh index f269a48f87..97b33a3ed4 100644 --- a/packages/gst-libav/build.sh +++ b/packages/gst-libav/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://gstreamer.freedesktop.org/modules/gst-libav.html TERMUX_PKG_DESCRIPTION="GStreamer Libav plug-in contains one plugin with a set of elements using the Libav library code" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="Yisus7u7 " -TERMUX_PKG_VERSION=1.20.4 +TERMUX_PKG_VERSION=1.20.5 TERMUX_PKG_SRCURL=https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=04ccbdd58fb31dd94098da599209834a0e7661638c5703381dd0a862c56fc532 +TERMUX_PKG_SHA256=b152e3cc49d014899f53c39d8a6224a44e1399b4cf76aa5f9a903fdf9793c3cc TERMUX_PKG_DEPENDS="ffmpeg, glib, gst-plugins-base, gstreamer" diff --git a/packages/gst-plugins-bad/build.sh b/packages/gst-plugins-bad/build.sh index b53b92aa3b..448f691203 100644 --- a/packages/gst-plugins-bad/build.sh +++ b/packages/gst-plugins-bad/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://gstreamer.freedesktop.org/ TERMUX_PKG_DESCRIPTION="GStreamer Bad Plug-ins" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.20.4 +TERMUX_PKG_VERSION=1.20.5 TERMUX_PKG_SRCURL=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=a1a3f53b3604d9a04fdd0bf9a1a616c3d2dab5320489e9ecee1178e81e33a16a +TERMUX_PKG_SHA256=f431214b0754d7037adcde93c3195106196588973e5b32dcb24938805f866363 TERMUX_PKG_DEPENDS="game-music-emu, glib, gst-plugins-base, gstreamer, libaom, libass, libbz2, libcairo, libcurl, libopus, librsvg, libsndfile, libx11, libxml2, littlecms, openal-soft, openjpeg, openssl, pango" TERMUX_PKG_BREAKS="gst-plugins-bad-dev" TERMUX_PKG_REPLACES="gst-plugins-bad-dev" diff --git a/packages/gst-plugins-base/build.sh b/packages/gst-plugins-base/build.sh index 7ab3c2e38c..847a4567e7 100644 --- a/packages/gst-plugins-base/build.sh +++ b/packages/gst-plugins-base/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://gstreamer.freedesktop.org/ TERMUX_PKG_DESCRIPTION="GStreamer base plug-ins" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.20.4 +TERMUX_PKG_VERSION=1.20.5 TERMUX_PKG_SRCURL=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=8d181b7abe4caf23ee9f9ec5b4d3e232640452464e39495bfffb6d776fc97225 +TERMUX_PKG_SHA256=11f911ef65f3095d7cf698a1ad1fc5242ac3ad6c9270465fb5c9e7f4f9c19b35 TERMUX_PKG_DEPENDS="glib, graphene, gstreamer, libandroid-shmem, libjpeg-turbo, libogg, libopus, libpng, libtheora, libvorbis, libx11, libxcb, libxext, libxv, zlib" TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner, mesa-dev" TERMUX_PKG_BREAKS="gst-plugins-base-dev" diff --git a/packages/gst-plugins-base/gir/1.20.4/GstAllocators-1.0.xml b/packages/gst-plugins-base/gir/1.20.5/GstAllocators-1.0.xml similarity index 100% rename from packages/gst-plugins-base/gir/1.20.4/GstAllocators-1.0.xml rename to packages/gst-plugins-base/gir/1.20.5/GstAllocators-1.0.xml diff --git a/packages/gst-plugins-base/gir/1.20.4/GstApp-1.0.xml b/packages/gst-plugins-base/gir/1.20.5/GstApp-1.0.xml similarity index 100% rename from packages/gst-plugins-base/gir/1.20.4/GstApp-1.0.xml rename to packages/gst-plugins-base/gir/1.20.5/GstApp-1.0.xml diff --git a/packages/gst-plugins-base/gir/1.20.4/GstAudio-1.0.xml b/packages/gst-plugins-base/gir/1.20.5/GstAudio-1.0.xml similarity index 100% rename from packages/gst-plugins-base/gir/1.20.4/GstAudio-1.0.xml rename to packages/gst-plugins-base/gir/1.20.5/GstAudio-1.0.xml diff --git a/packages/gst-plugins-base/gir/1.20.4/GstGL-1.0.xml b/packages/gst-plugins-base/gir/1.20.5/GstGL-1.0.xml similarity index 100% rename from packages/gst-plugins-base/gir/1.20.4/GstGL-1.0.xml rename to packages/gst-plugins-base/gir/1.20.5/GstGL-1.0.xml diff --git a/packages/gst-plugins-base/gir/1.20.4/GstGLEGL-1.0.xml b/packages/gst-plugins-base/gir/1.20.5/GstGLEGL-1.0.xml similarity index 100% rename from packages/gst-plugins-base/gir/1.20.4/GstGLEGL-1.0.xml rename to packages/gst-plugins-base/gir/1.20.5/GstGLEGL-1.0.xml diff --git a/packages/gst-plugins-base/gir/1.20.4/GstGLX11-1.0.xml b/packages/gst-plugins-base/gir/1.20.5/GstGLX11-1.0.xml similarity index 100% rename from packages/gst-plugins-base/gir/1.20.4/GstGLX11-1.0.xml rename to packages/gst-plugins-base/gir/1.20.5/GstGLX11-1.0.xml diff --git a/packages/gst-plugins-base/gir/1.20.4/GstPbutils-1.0.xml b/packages/gst-plugins-base/gir/1.20.5/GstPbutils-1.0.xml similarity index 100% rename from packages/gst-plugins-base/gir/1.20.4/GstPbutils-1.0.xml rename to packages/gst-plugins-base/gir/1.20.5/GstPbutils-1.0.xml diff --git a/packages/gst-plugins-base/gir/1.20.4/GstRtp-1.0.xml b/packages/gst-plugins-base/gir/1.20.5/GstRtp-1.0.xml similarity index 100% rename from packages/gst-plugins-base/gir/1.20.4/GstRtp-1.0.xml rename to packages/gst-plugins-base/gir/1.20.5/GstRtp-1.0.xml diff --git a/packages/gst-plugins-base/gir/1.20.4/GstRtsp-1.0.xml b/packages/gst-plugins-base/gir/1.20.5/GstRtsp-1.0.xml similarity index 100% rename from packages/gst-plugins-base/gir/1.20.4/GstRtsp-1.0.xml rename to packages/gst-plugins-base/gir/1.20.5/GstRtsp-1.0.xml diff --git a/packages/gst-plugins-base/gir/1.20.4/GstSdp-1.0.xml b/packages/gst-plugins-base/gir/1.20.5/GstSdp-1.0.xml similarity index 100% rename from packages/gst-plugins-base/gir/1.20.4/GstSdp-1.0.xml rename to packages/gst-plugins-base/gir/1.20.5/GstSdp-1.0.xml diff --git a/packages/gst-plugins-base/gir/1.20.4/GstTag-1.0.xml b/packages/gst-plugins-base/gir/1.20.5/GstTag-1.0.xml similarity index 100% rename from packages/gst-plugins-base/gir/1.20.4/GstTag-1.0.xml rename to packages/gst-plugins-base/gir/1.20.5/GstTag-1.0.xml diff --git a/packages/gst-plugins-base/gir/1.20.4/GstVideo-1.0.xml b/packages/gst-plugins-base/gir/1.20.5/GstVideo-1.0.xml similarity index 100% rename from packages/gst-plugins-base/gir/1.20.4/GstVideo-1.0.xml rename to packages/gst-plugins-base/gir/1.20.5/GstVideo-1.0.xml diff --git a/packages/gst-plugins-good/build.sh b/packages/gst-plugins-good/build.sh index 16f915b457..e5e23fb0b9 100644 --- a/packages/gst-plugins-good/build.sh +++ b/packages/gst-plugins-good/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://gstreamer.freedesktop.org/ TERMUX_PKG_DESCRIPTION="GStreamer Good Plug-ins" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.20.4 +TERMUX_PKG_VERSION=1.20.5 TERMUX_PKG_SRCURL=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=b16130fbe632fa8547c2147a0ef575b0140fb521065c5cb121c72ddbd23b64da +TERMUX_PKG_SHA256=e83ab4d12ca24959489bbb0ec4fac9b90e32f741d49cda357cb554b2cb8b97f9 TERMUX_PKG_DEPENDS="gst-plugins-base, libandroid-shmem, libcaca, libsoup, libjpeg-turbo, libpng, libflac, libbz2, libvpx, pulseaudio, libmp3lame, gstreamer, libogg, zlib" # pcre2 needed by glib. libxml2 needed by libsoup TERMUX_PKG_BUILD_DEPENDS="glib, pcre2, libxml2" diff --git a/packages/gst-plugins-ugly/build.sh b/packages/gst-plugins-ugly/build.sh index 97dd4278d1..633854c733 100644 --- a/packages/gst-plugins-ugly/build.sh +++ b/packages/gst-plugins-ugly/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://gstreamer.freedesktop.org/ TERMUX_PKG_DESCRIPTION="GStreamer Ugly Plug-ins" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.20.4 +TERMUX_PKG_VERSION=1.20.5 TERMUX_PKG_SRCURL=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=5c9ec6bab96517e438b3f9bae0ceb84d3436f3da9bbe180cf4d28e32a7251b59 +TERMUX_PKG_SHA256=af67d8ba7cab230f64d0594352112c2c443e2aa36a87c35f9f98a43d11430b87 TERMUX_PKG_DEPENDS="glib, gst-plugins-base" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -Dtests=disabled diff --git a/packages/gst-python/build.sh b/packages/gst-python/build.sh index 7a27aa6ebd..a9faa9f616 100644 --- a/packages/gst-python/build.sh +++ b/packages/gst-python/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://gstreamer.freedesktop.org/ TERMUX_PKG_DESCRIPTION="Python bindings for GStreamer" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.20.4 +TERMUX_PKG_VERSION=1.20.5 TERMUX_PKG_SRCURL=https://gstreamer.freedesktop.org/src/gst-python/gst-python-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=5eb4136d03e2a495f4499c8b2e6d9d3e7b5e73c5a8b8acf9213d57bc6a7bd3c1 +TERMUX_PKG_SHA256=27487652318659cfd7dc42784b713c78d29cc7a7df4fb397134c8c125f65e3b2 TERMUX_PKG_DEPENDS="gst-plugins-base, gstreamer, pygobject, python" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -Dtests=disabled diff --git a/packages/gstreamer/build.sh b/packages/gstreamer/build.sh index 4b159fd9f3..33bcef8591 100644 --- a/packages/gstreamer/build.sh +++ b/packages/gstreamer/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://gstreamer.freedesktop.org/ TERMUX_PKG_DESCRIPTION="Open source multimedia framework" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.20.4 +TERMUX_PKG_VERSION=1.20.5 TERMUX_PKG_SRCURL=https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=67c1edf8c3c339cda5dde85f4f7b953bb9607c2d13ae970e2491c5c4c055ef5f +TERMUX_PKG_SHA256=5a19083faaf361d21fc391124f78ba6d609be55845a82fa8f658230e5fa03dff TERMUX_PKG_DEPENDS="glib" TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner" TERMUX_PKG_BREAKS="gstreamer-dev" diff --git a/packages/gstreamer/gir/1.20.4/Gst-1.0.xml b/packages/gstreamer/gir/1.20.5/Gst-1.0.xml similarity index 100% rename from packages/gstreamer/gir/1.20.4/Gst-1.0.xml rename to packages/gstreamer/gir/1.20.5/Gst-1.0.xml diff --git a/packages/gstreamer/gir/1.20.4/GstBase-1.0.xml b/packages/gstreamer/gir/1.20.5/GstBase-1.0.xml similarity index 100% rename from packages/gstreamer/gir/1.20.4/GstBase-1.0.xml rename to packages/gstreamer/gir/1.20.5/GstBase-1.0.xml diff --git a/packages/gstreamer/gir/1.20.4/GstController-1.0.xml b/packages/gstreamer/gir/1.20.5/GstController-1.0.xml similarity index 100% rename from packages/gstreamer/gir/1.20.4/GstController-1.0.xml rename to packages/gstreamer/gir/1.20.5/GstController-1.0.xml diff --git a/packages/gstreamer/gir/1.20.4/GstNet-1.0.xml b/packages/gstreamer/gir/1.20.5/GstNet-1.0.xml similarity index 100% rename from packages/gstreamer/gir/1.20.4/GstNet-1.0.xml rename to packages/gstreamer/gir/1.20.5/GstNet-1.0.xml From 93e9278fddfb0a9245616502a322b9171e87a93f Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Tue, 20 Dec 2022 14:31:14 +0900 Subject: [PATCH 076/244] dpkg: Bump to 1.21.13 --- packages/dpkg/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/dpkg/build.sh b/packages/dpkg/build.sh index 91cbcfe14d..4bd8620f08 100644 --- a/packages/dpkg/build.sh +++ b/packages/dpkg/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://packages.debian.org/dpkg TERMUX_PKG_DESCRIPTION="Debian package management system" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.21.12 +TERMUX_PKG_VERSION=1.21.13 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/debian/pool/main/d/dpkg/dpkg_${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=ec7a0e29898f457ea21cc89826601059bce2433d2b4e578a38b2a66d8768559a +TERMUX_PKG_SHA256=04bf5e1884612553c7ff2d81dd290ec7be3526594a02262227ae162640f7e5d8 TERMUX_PKG_DEPENDS="bzip2, coreutils, diffutils, gzip, less, libbz2, liblzma, libmd, tar, xz-utils, zlib" TERMUX_PKG_BREAKS="dpkg-dev" TERMUX_PKG_REPLACES="dpkg-dev" From c02c61b942e85191ea03fa2cf17191903bcb7fdb Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Tue, 20 Dec 2022 16:44:59 +0900 Subject: [PATCH 077/244] libheif: Append SOVERSION suffix to shared libs to avoid conflict with system libs. --- packages/libheif/build.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/libheif/build.sh b/packages/libheif/build.sh index 8b553fa037..58d6e42883 100644 --- a/packages/libheif/build.sh +++ b/packages/libheif/build.sh @@ -4,11 +4,23 @@ TERMUX_PKG_LICENSE="LGPL-3.0, MIT" TERMUX_PKG_LICENSE_FILE="COPYING" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="1.14.0" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/strukturag/libheif/releases/download/v${TERMUX_PKG_VERSION}/libheif-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=9a2b969d827e162fa9eba582ebd0c9f6891f16e426ef608d089b1f24962295b5 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="libaom, libc++, libdav1d, librav1e, libde265, libx265" termux_step_pre_configure() { + # SOVERSION suffix is needed for SONAME of shared libs to avoid conflict + # with system ones (in /system/lib64 or /system/lib): + sed -i 's/^\(linux\*android\)\*)/\1-notermux)/' configure + LDFLAGS+=" $($CC -print-libgcc-file-name)" } + +termux_step_post_massage() { + # Check if SONAME is properly set: + if readelf -d lib/libheif.so | grep -q '(SONAME).*\[libheif\.so\]'; then + termux_error_exit "SONAME for libheif.so is not properly set." + fi +} From b74ed725fc2f5801e9096e99efe0181c2735c5f1 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Tue, 20 Dec 2022 16:46:24 +0900 Subject: [PATCH 078/244] libheif: Revbump revdeps to rebuild after SONAME change. Rebuild should be manually triggered separately from libheif itself to avoid overlinking. %ci:no-build --- packages/go-findimagedupes/build.sh | 2 +- packages/graphicsmagick/build.sh | 2 +- packages/imagemagick/build.sh | 1 + packages/imlib2/build.sh | 1 + packages/libgd/build.sh | 2 +- packages/libvips/build.sh | 2 +- x11-packages/gimp/build.sh | 2 +- 7 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/go-findimagedupes/build.sh b/packages/go-findimagedupes/build.sh index 482fba6347..143c5722e1 100644 --- a/packages/go-findimagedupes/build.sh +++ b/packages/go-findimagedupes/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" _COMMIT=47ca1d51be2bc1d437261d82157b84fe977ec934 TERMUX_PKG_VERSION=2022.07.22 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://gitlab.com/opennota/findimagedupes.git TERMUX_PKG_GIT_BRANCH=master TERMUX_PKG_DEPENDS="file, libc++, libheif, libjpeg-turbo, libpng, libtiff" diff --git a/packages/graphicsmagick/build.sh b/packages/graphicsmagick/build.sh index ac1abb0997..576371310d 100644 --- a/packages/graphicsmagick/build.sh +++ b/packages/graphicsmagick/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Collection of image processing tools" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.3.38 -TERMUX_PKG_REVISION=5 +TERMUX_PKG_REVISION=6 # Bandwith limited on main ftp site, so it's asked to use sourceforge instead: TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/${TERMUX_PKG_VERSION}/GraphicsMagick-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=d60cd9db59351d2b9cb19beb443170acaa28f073d13d258f67b3627635e32675 diff --git a/packages/imagemagick/build.sh b/packages/imagemagick/build.sh index 3116cbb5c6..a92d4344de 100644 --- a/packages/imagemagick/build.sh +++ b/packages/imagemagick/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="ImageMagick" TERMUX_PKG_MAINTAINER="@termux" _VERSION=7.1.0-55 TERMUX_PKG_VERSION=${_VERSION//-/.} +TERMUX_PKG_REVISION=1 #TERMUX_PKG_SRCURL=https://github.com/ImageMagick/ImageMagick/archive/refs/tags/${_VERSION}.tar.gz TERMUX_PKG_SRCURL=https://imagemagick.org/archive/releases/ImageMagick-${_VERSION}.tar.xz TERMUX_PKG_SHA256=ee06d385bb5c92a57aefb1c64abe5107728b8f8448195843e6d8cf142a5b3191 diff --git a/packages/imlib2/build.sh b/packages/imlib2/build.sh index 26e2639ac9..04a17654b2 100644 --- a/packages/imlib2/build.sh +++ b/packages/imlib2/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="custom" TERMUX_PKG_LICENSE_FILE="COPYING, COPYING-PLAIN" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.10.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/enlightenment/imlib2-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=727c1a937c885c080c37217e476dc88b5a3e60d737f1bf040b343520b781cbba TERMUX_PKG_DEPENDS="freetype, gdk-pixbuf, giflib, glib, libandroid-shmem, libbz2, libcairo, libheif, libid3tag, libjpeg-turbo, libjxl, liblzma, libpng, librsvg, libtiff, libwebp, libx11, libxcb, libxext, openjpeg, zlib" diff --git a/packages/libgd/build.sh b/packages/libgd/build.sh index 842bd528b5..6107d50e0b 100644 --- a/packages/libgd/build.sh +++ b/packages/libgd/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="custom" TERMUX_PKG_LICENSE_FILE="COPYING" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1:2.3.3 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/libgd/libgd/releases/download/gd-${TERMUX_PKG_VERSION:2}/libgd-${TERMUX_PKG_VERSION:2}.tar.gz TERMUX_PKG_SHA256=dd3f1f0bb016edcc0b2d082e8229c822ad1d02223511997c80461481759b1ed2 TERMUX_PKG_DEPENDS="fontconfig, freetype, libheif, libiconv, libjpeg-turbo, libpng, libtiff, libwebp, zlib" diff --git a/packages/libvips/build.sh b/packages/libvips/build.sh index a112a205d8..d95c597a0d 100644 --- a/packages/libvips/build.sh +++ b/packages/libvips/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A fast image processing library with low memory needs" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="Thibault Meyer " TERMUX_PKG_VERSION="8.13.3" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/libvips/libvips/releases/download/v${TERMUX_PKG_VERSION}/vips-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=4eff5cdc8dbe1a05a926290a99014e20ba386f5dcca38d9774bef61413435d4c TERMUX_PKG_AUTO_UPDATE=true diff --git a/x11-packages/gimp/build.sh b/x11-packages/gimp/build.sh index beedeb3e93..d09fcf42b8 100644 --- a/x11-packages/gimp/build.sh +++ b/x11-packages/gimp/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="GPL-3.0, LGPL-3.0" TERMUX_PKG_MAINTAINER="@termux" _MAJOR_VERSION=2.10 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.32 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=https://download.gimp.org/mirror/pub/gimp/v${_MAJOR_VERSION}/gimp-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=3f15c70554af5dcc1b46e6dc68f3d8f0a6cc9fe56b6d78ac08c0fd859ab89a25 TERMUX_PKG_DEPENDS="aalib, atk, babl, fontconfig, freetype, gdk-pixbuf, gegl, gexiv2, ghostscript, gimp-data, glib, glib-networking, gtk2, harfbuzz, hicolor-icon-theme, json-glib, libandroid-execinfo, libandroid-shmem, libc++, libcairo, libheif, libjpeg-turbo, libjxl, libmypaint, libpng, librsvg, libtiff, libwebp, libxcursor, libxml2, libxmu, libxpm, libxslt, littlecms, mypaint-brushes, openexr, openjpeg, pango, poppler, poppler-data, zlib" From be675de95c3013eae89b4c1f083b1efba02ffb63 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Tue, 20 Dec 2022 12:14:28 +0000 Subject: [PATCH 079/244] bump(main/pocketbase): 0.10.2 This commit has been automatically submitted by Github Actions. --- packages/pocketbase/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/pocketbase/build.sh b/packages/pocketbase/build.sh index fd962520cf..cd92b64116 100644 --- a/packages/pocketbase/build.sh +++ b/packages/pocketbase/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/pocketbase/pocketbase TERMUX_PKG_DESCRIPTION="An open source Go backend" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.10.1" +TERMUX_PKG_VERSION="0.10.2" TERMUX_PKG_SRCURL="https://github.com/pocketbase/pocketbase/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz" -TERMUX_PKG_SHA256=03d9fe97522d1363cbb2dae6f9671b847eaca968bd3306c2267911a1a8dadc25 +TERMUX_PKG_SHA256=80998a333b394f1c6dbf087f04043602ecdbfbd18bcb6349cf641944408a02e0 TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_AUTO_UPDATE=true From d65dcd46c2133aeb49e085c916bad79e9886472c Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Tue, 20 Dec 2022 22:56:25 +0900 Subject: [PATCH 080/244] cloneit: Bump to 20221024 --- packages/cloneit/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/cloneit/build.sh b/packages/cloneit/build.sh index ae7f2a6229..0bf7999d10 100644 --- a/packages/cloneit/build.sh +++ b/packages/cloneit/build.sh @@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://github.com/alok8bb/cloneit TERMUX_PKG_DESCRIPTION="A cli tool to download specific GitHub directories or files" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -_COMMIT=02a4942c35aa9f490e456a4617f4a333715d898b -_COMMIT_DATE=2022.09.16 +_COMMIT=62c433f0b1c54a977d585f3b84b8c43213095474 +_COMMIT_DATE=2022.10.24 TERMUX_PKG_VERSION=${_COMMIT_DATE//./} TERMUX_PKG_SRCURL=https://github.com/alok8bb/cloneit.git TERMUX_PKG_GIT_BRANCH="master" From 087ca985d1a406113d46a939a7fb85bbec1c9b0d Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Tue, 20 Dec 2022 23:02:48 +0900 Subject: [PATCH 081/244] weechat-matrix-rs: Bump to 2022.10.04 --- packages/weechat-matrix-rs/build.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/weechat-matrix-rs/build.sh b/packages/weechat-matrix-rs/build.sh index 059770d6e4..9fcc4f4637 100644 --- a/packages/weechat-matrix-rs/build.sh +++ b/packages/weechat-matrix-rs/build.sh @@ -3,11 +3,10 @@ TERMUX_PKG_DESCRIPTION="Rust rewrite of the python weechat-matrix script" TERMUX_PKG_LICENSE="ISC" TERMUX_PKG_LICENSE_FILE="LICENSE" TERMUX_PKG_MAINTAINER="@termux" +_COMMIT=ca23e1745e6e2ba235550360e1def1457e2f3857 +TERMUX_PKG_VERSION=2022.10.04 TERMUX_PKG_SRCURL="https://github.com/poljar/weechat-matrix-rs.git" -TERMUX_PKG_GIT_BRANCH="master" -_COMMIT="dd6701910e687ed1ea3d768844a902cfd2ff8231" -TERMUX_PKG_VERSION="2022.04.17" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_GIT_BRANCH=main TERMUX_PKG_DEPENDS="weechat, openssl" TERMUX_PKG_BUILD_IN_SRC=true # There are compile errors for 32-bit platforms in weechat-rust dependency @@ -17,7 +16,7 @@ termux_step_post_get_source() { git fetch --unshallow git checkout $_COMMIT - local version="$(git log -1 --date=format:"%Y.%m.%d" --format="%ad")" + local version="$(git log -1 --format=%cs | sed 's/-/./g')" if [ "$version" != "$TERMUX_PKG_VERSION" ]; then echo -n "ERROR: The specified version \"$TERMUX_PKG_VERSION\"" echo " is different from what is expected to be: \"$version\"" From 867fc9823c1a83238e75b1600905186223d88120 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Tue, 20 Dec 2022 23:00:36 +0900 Subject: [PATCH 082/244] mazter: Bump to 2022.08.13 --- packages/mazter/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/mazter/build.sh b/packages/mazter/build.sh index 511d605046..0fb699fa3a 100644 --- a/packages/mazter/build.sh +++ b/packages/mazter/build.sh @@ -4,17 +4,17 @@ TERMUX_PKG_GROUPS="games" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_LICENSE_FILE="LICENSE" TERMUX_PKG_MAINTAINER="@termux" +_COMMIT=a02de683f93a61690d1a4f3b845f654f5e026484 +TERMUX_PKG_VERSION=2022.08.13 TERMUX_PKG_SRCURL="https://github.com/Canop/mazter.git" TERMUX_PKG_GIT_BRANCH=main -TERMUX_PKG_VERSION=2022.07.28 -_COMMIT=a85d8973eca07b5bf5e239721940b1739c323529 TERMUX_PKG_BUILD_IN_SRC=true termux_step_post_get_source() { git fetch --unshallow git checkout $_COMMIT - local version="$(git log -1 --date=format:"%Y.%m.%d" --format="%ad")" + local version="$(git log -1 --format=%cs | sed 's/-/./g')" if [ "$version" != "$TERMUX_PKG_VERSION" ]; then echo -n "ERROR: The specified version \"$TERMUX_PKG_VERSION\"" echo " is different from what is expected to be: \"$version\"" From 0c5c7ddceaeeefe5530451af23a1bd63c28c7a47 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Tue, 20 Dec 2022 23:10:14 +0900 Subject: [PATCH 083/244] gdrive-downloader: Bump to 1.0 --- packages/gdrive-downloader/build.sh | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/packages/gdrive-downloader/build.sh b/packages/gdrive-downloader/build.sh index 32f2105630..492f74d4ab 100644 --- a/packages/gdrive-downloader/build.sh +++ b/packages/gdrive-downloader/build.sh @@ -1,26 +1,14 @@ TERMUX_PKG_HOMEPAGE=https://github.com/Akianonymus/gdrive-downloader TERMUX_PKG_DESCRIPTION="Download a gdrive folder or file easily, shell ftw" TERMUX_PKG_LICENSE="Unlicense" -_COMMIT=c29e82b8635fa0dda3e93ad019d2ce58ebaa5656 TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=2022.07.14 -TERMUX_PKG_SRCURL=$TERMUX_PKG_HOMEPAGE.git -TERMUX_PKG_GIT_BRANCH=master +TERMUX_PKG_VERSION=1:1.0 +TERMUX_PKG_SRCURL=https://github.com/Akianonymus/gdrive-downloader/archive/refs/tags/v${TERMUX_PKG_VERSION#*:}.tar.gz +TERMUX_PKG_SHA256=26c726bce41bff3b58c1f819a5c1f2e54d66b4ee3d592a5d52088de605c48d95 TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_DEPENDS='bash, curl' TERMUX_PKG_PLATFORM_INDEPENDENT=true -termux_step_post_get_source() { - git fetch --unshallow - git checkout $_COMMIT - local version="$(git log -1 --format=%cs | sed 's/-/./g')" - if [ "$version" != "$TERMUX_PKG_VERSION" ]; then - echo -n "ERROR: The specified version \"$TERMUX_PKG_VERSION\"" - echo " is different from what is expected to be: \"$version\"" - return 1 - fi -} - termux_step_make_install() { install -D release/bash/* -t "$TERMUX_PREFIX/bin" } From d97625c40434ac9204ef371ad39560d23e55019d Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Tue, 20 Dec 2022 23:19:39 +0900 Subject: [PATCH 084/244] unpaper: Bump to 7.0.0 --- packages/unpaper/build.sh | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/packages/unpaper/build.sh b/packages/unpaper/build.sh index f09b4fcdff..9a68967903 100644 --- a/packages/unpaper/build.sh +++ b/packages/unpaper/build.sh @@ -2,21 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.flameeyes.com/projects/unpaper TERMUX_PKG_DESCRIPTION="A post-processing tool for scanned sheets of paper" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -_COMMIT=e5154081c1c944719ff6ba70a8c114d1656ea799 -TERMUX_PKG_VERSION=2022.01.21 -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SRCURL=https://github.com/unpaper/unpaper.git +TERMUX_PKG_VERSION=1:7.0.0 +TERMUX_PKG_SRCURL=https://github.com/unpaper/unpaper/archive/refs/tags/unpaper-${TERMUX_PKG_VERSION#*:}.tar.gz +TERMUX_PKG_SHA256=601b64b030edb4a734510a7bdcab371c7a33c4501f9a0e231e3d326df50e2313 TERMUX_PKG_DEPENDS="ffmpeg" -TERMUX_PKG_GIT_BRANCH=main - -termux_step_post_get_source() { - git fetch --unshallow - git checkout $_COMMIT - - local version="$(git log -1 --format=%cs | sed 's/-/./g')" - if [ "$version" != "$TERMUX_PKG_VERSION" ]; then - echo -n "ERROR: The specified version \"$TERMUX_PKG_VERSION\"" - echo " is different from what is expected to be: \"$version\"" - return 1 - fi -} From 831c39c706d41d4481c6e87e66081b313a6cb482 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Tue, 20 Dec 2022 23:22:50 +0900 Subject: [PATCH 085/244] tsmuxer{,gui}: Bump to 2022.11.23 --- packages/tsmuxer/build.sh | 4 ++-- x11-packages/tsmuxergui/build.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/tsmuxer/build.sh b/packages/tsmuxer/build.sh index 1e2b9d3088..97e3a121c0 100644 --- a/packages/tsmuxer/build.sh +++ b/packages/tsmuxer/build.sh @@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://github.com/justdan96/tsMuxer TERMUX_PKG_DESCRIPTION="A transport stream muxer for remuxing/muxing elementary streams" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" -_VERSION_REAL=nightly-2022-10-24-03-55-50 +_VERSION_REAL=nightly-2022-11-23-02-43-45 TERMUX_PKG_VERSION=$(cut -d- -f2,3,4 <<< "$_VERSION_REAL" | tr '-' '.') TERMUX_PKG_SRCURL=https://github.com/justdan96/tsMuxer/archive/refs/tags/${_VERSION_REAL}.tar.gz -TERMUX_PKG_SHA256=fcfbfa4678da25c8058bf7cede77ef676239ffc74bd7628c92a2c55ff842bf6d +TERMUX_PKG_SHA256=049e908d2b8d886cc2b75ef582f6000027db71e22accf9797463fc0841ab01a7 TERMUX_PKG_DEPENDS="freetype, libc++, zlib" diff --git a/x11-packages/tsmuxergui/build.sh b/x11-packages/tsmuxergui/build.sh index 103d65102a..33270815bf 100644 --- a/x11-packages/tsmuxergui/build.sh +++ b/x11-packages/tsmuxergui/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/justdan96/tsMuxer TERMUX_PKG_DESCRIPTION="A transport stream muxer for remuxing/muxing elementary streams" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" -_VERSION_REAL=nightly-2022-10-24-03-55-50 +_VERSION_REAL=nightly-2022-11-23-02-43-45 TERMUX_PKG_VERSION=$(cut -d- -f2,3,4 <<< "$_VERSION_REAL" | tr '-' '.') TERMUX_PKG_SRCURL=https://github.com/justdan96/tsMuxer/archive/refs/tags/${_VERSION_REAL}.tar.gz -TERMUX_PKG_SHA256=fcfbfa4678da25c8058bf7cede77ef676239ffc74bd7628c92a2c55ff842bf6d +TERMUX_PKG_SHA256=049e908d2b8d886cc2b75ef582f6000027db71e22accf9797463fc0841ab01a7 TERMUX_PKG_DEPENDS="libc++, qt5-qtbase, qt5-qtmultimedia" TERMUX_PKG_BUILD_DEPENDS="freetype, qt5-qtbase-cross-tools, qt5-qttools-cross-tools, zlib" TERMUX_PKG_RM_AFTER_INSTALL="bin/tsmuxer" From c4331d651edc71656f2dd0201cd5729164d8a149 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Tue, 20 Dec 2022 23:24:42 +0900 Subject: [PATCH 086/244] gpac: Bump to 2.2.0 --- packages/ccextractor/build.sh | 2 +- packages/gpac/build.sh | 8 +++----- packages/gpac/configure.patch | 11 +++++++++++ 3 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 packages/gpac/configure.patch diff --git a/packages/ccextractor/build.sh b/packages/ccextractor/build.sh index d6ec72d05b..4a412a5a31 100644 --- a/packages/ccextractor/build.sh +++ b/packages/ccextractor/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A tool used to produce subtitles for TV recordings" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.94 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/CCExtractor/ccextractor/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=9c7be386257c69b5d8cd9d7466dbf20e3a45cea950cc8ca7486a956c3be54a42 TERMUX_PKG_DEPENDS="freetype, gpac, libiconv, libmd, libpng, libprotobuf-c, utf8proc" diff --git a/packages/gpac/build.sh b/packages/gpac/build.sh index d9df84db8b..d67e2366ec 100644 --- a/packages/gpac/build.sh +++ b/packages/gpac/build.sh @@ -3,12 +3,10 @@ TERMUX_PKG_DESCRIPTION="An open-source multimedia framework focused on modularit # License: LGPL-2.1-or-later TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=2.0.0 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_VERSION=2.2.0 TERMUX_PKG_SRCURL=https://github.com/gpac/gpac/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=c820386f9d583c740fc3f57cb93864a8164838516dabc96de2f61d5b7429e0b6 -TERMUX_PKG_DEPENDS="ffmpeg, freetype, liba52, libjpeg-turbo, liblzma, libmad, libnghttp2, libpng, libtheora, libvorbis, openjpeg, openssl, pulseaudio, xvidcore, zlib" -TERMUX_PKG_BUILD_DEPENDS="libogg" +TERMUX_PKG_SHA256=c20c204b57da76e4726109993c1abcdb3231a9b2ee2c8e21126d000cda7fc00d +TERMUX_PKG_DEPENDS="ffmpeg, freetype, liba52, libjpeg-turbo, liblzma, libmad, libnghttp2, libogg, libpng, libtheora, libvorbis, openjpeg, openssl, pulseaudio, xvidcore, zlib" TERMUX_PKG_EXTRA_MAKE_ARGS="STRIP=:" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-x11" diff --git a/packages/gpac/configure.patch b/packages/gpac/configure.patch new file mode 100644 index 0000000000..847ed8e0d5 --- /dev/null +++ b/packages/gpac/configure.patch @@ -0,0 +1,11 @@ +--- a/configure ++++ b/configure +@@ -2790,7 +2790,7 @@ + generate_pkgconfig () { + echo "prefix=$prefix" + echo "exec_prefix=\${prefix}" +- echo "libdir=\${exec_prefix}/$libdir" ++ echo "libdir=$libdir" + echo "includedir=\${exec_prefix}/include" + echo "" + echo "Name: gpac" From 19b92f3274646565763f514e796d53c31040413e Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Tue, 20 Dec 2022 23:26:47 +0900 Subject: [PATCH 087/244] jira-go: Bump to 1.0.28 --- packages/jira-go/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/jira-go/build.sh b/packages/jira-go/build.sh index a53d370a3f..3fe10de5de 100644 --- a/packages/jira-go/build.sh +++ b/packages/jira-go/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/go-jira/jira TERMUX_PKG_DESCRIPTION="Simple jira command line client written in Go" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="1.0.27" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=1.0.28 TERMUX_PKG_SRCURL=https://github.com/go-jira/jira/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=c5bcf7b61300b67a8f4e42ab60e462204130c352050e8551b1c23ab2ecafefc7 +TERMUX_PKG_SHA256=179abe90458281175a482cbd2e1ad662bdf563ef5acfc2cadf215ae32e0bd1e6 TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_AUTO_UPDATE=true From 6c699fab80ae27c036a4ce393a2628f4c0afe8ed Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Tue, 20 Dec 2022 23:28:58 +0900 Subject: [PATCH 088/244] libblosc: Bump to 1.21.3 --- packages/libblosc/blosc.pc.in.patch | 10 ++++++++++ packages/libblosc/build.sh | 15 ++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 packages/libblosc/blosc.pc.in.patch diff --git a/packages/libblosc/blosc.pc.in.patch b/packages/libblosc/blosc.pc.in.patch new file mode 100644 index 0000000000..d3c9c8b4a2 --- /dev/null +++ b/packages/libblosc/blosc.pc.in.patch @@ -0,0 +1,10 @@ +--- a/blosc.pc.in ++++ b/blosc.pc.in +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ ++libdir=@CMAKE_INSTALL_LIBDIR@ + sharedlibdir=${libdir} + includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ + diff --git a/packages/libblosc/build.sh b/packages/libblosc/build.sh index 2ca2422233..d9af2f3568 100644 --- a/packages/libblosc/build.sh +++ b/packages/libblosc/build.sh @@ -10,7 +10,16 @@ LICENSES/SNAPPY.txt LICENSES/STDINT.txt LICENSES/ZLIB.txt" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.21.1 +TERMUX_PKG_VERSION=1.21.3 TERMUX_PKG_SRCURL=https://github.com/Blosc/c-blosc/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=f387149eab24efa01c308e4cba0f59f64ccae57292ec9c794002232f7903b55b -TERMUX_PKG_DEPENDS="libsnappy, zstd" +TERMUX_PKG_SHA256=941016c4564bca662080bb01aea74f06630bd665e598c6f6967fd91b2e2e0bb6 +TERMUX_PKG_DEPENDS="liblz4, libsnappy, zlib, zstd" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DDEACTIVATE_LZ4=OFF +-DDEACTIVATE_SNAPPY=OFF +-DDEACTIVATE_ZLIB=OFF +-DDEACTIVATE_ZSTD=OFF +-DPREFER_EXTERNAL_LZ4=ON +-DPREFER_EXTERNAL_ZLIB=ON +-DPREFER_EXTERNAL_ZSTD=ON +" From 4100ffab5353b67f4b6de917c0fd824f4fc68300 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Tue, 20 Dec 2022 23:30:54 +0900 Subject: [PATCH 089/244] libmdbx: Bump to 0.12.2 --- packages/libmdbx/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/libmdbx/build.sh b/packages/libmdbx/build.sh index 7e71a02dd1..9a4ecbc994 100644 --- a/packages/libmdbx/build.sh +++ b/packages/libmdbx/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="An extremely fast, compact, powerful, embedded, transact TERMUX_PKG_LICENSE="OpenLDAP" TERMUX_PKG_LICENSE_FILE="COPYRIGHT, LICENSE" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=0.11.9 +TERMUX_PKG_VERSION=0.12.2 TERMUX_PKG_SRCURL=https://gitflic.ru/project/erthink/libmdbx.git TERMUX_PKG_DEPENDS="libc++" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" From 707cf95aac97bfe0a2c0daaa10db96d2e4addc11 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Tue, 20 Dec 2022 23:33:55 +0900 Subject: [PATCH 090/244] libspice-server: Bump to 0.15.1 --- packages/libspice-server/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/libspice-server/build.sh b/packages/libspice-server/build.sh index f3b8f7d11d..238e9f5dfa 100644 --- a/packages/libspice-server/build.sh +++ b/packages/libspice-server/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.spice-space.org/ TERMUX_PKG_DESCRIPTION="Implements the server side of the SPICE protocol" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=0.15.0 -TERMUX_PKG_REVISION=6 +TERMUX_PKG_VERSION=0.15.1 TERMUX_PKG_SRCURL=https://www.spice-space.org/download/releases/spice-server/spice-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=b320cf8f4bd2852750acb703c15b72856027e5a8554f8217dfbb3cc09deba0f5 +TERMUX_PKG_SHA256=ada9af67ab321916bd7eb59e3d619a4a7796c08a28c732edfc7f02fc80b1a37a TERMUX_PKG_DEPENDS="glib, gst-plugins-base, gstreamer, libc++, libiconv, libjpeg-turbo, liblz4, libopus, liborc, libpixman, libsasl, libspice-protocol, openssl, zlib" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" From fb76b9059fabdfe7b8557721ec26af210c96579c Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Tue, 20 Dec 2022 23:35:55 +0900 Subject: [PATCH 091/244] libvxl: Bump to 3.5.0 --- packages/libvxl/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/libvxl/build.sh b/packages/libvxl/build.sh index fa7d620f9c..3114272f79 100644 --- a/packages/libvxl/build.sh +++ b/packages/libvxl/build.sh @@ -4,11 +4,11 @@ TERMUX_PKG_GROUPS="science" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_LICENSE_FILE="core/vxl_copyright.h" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="3.3.2" +TERMUX_PKG_VERSION=3.5.0 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_SRCURL="https://github.com/vxl/vxl/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz" -TERMUX_PKG_SHA256=95ecde4b02bbe00aec0d656fd2c43373de2a5d41487a68135f0b565254919411 -TERMUX_PKG_DEPENDS="libc++, libgeotiff, zlib, libpng, libjpeg-turbo, libexpat, dcmtk" +TERMUX_PKG_SHA256=f044d2a9336f45cd4586d68ef468c0d9539f9f1b30ceb4db85bd9b6fdb012776 +TERMUX_PKG_DEPENDS="dcmtk, libc++, libgeotiff, libjpeg-turbo, libpng, libtiff, zlib" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DBUILD_SHARED_LIBS=ON -DVCL_HAS_LFS=NO From 9364f3f5244c02ed9bed3b5b030a4f83e9523287 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Wed, 21 Dec 2022 01:40:43 +0900 Subject: [PATCH 092/244] libksba: Bump to 1.6.3 --- packages/libksba/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/libksba/build.sh b/packages/libksba/build.sh index 602b01cac6..15100891d6 100644 --- a/packages/libksba/build.sh +++ b/packages/libksba/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://gnupg.org/related_software/libksba/ TERMUX_PKG_DESCRIPTION="Library for using X.509 certificates and CMS (Cryptographic Message Syntax) easily accessible" TERMUX_PKG_LICENSE="LGPL-3.0, GPL-3.0, GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.6.2 +TERMUX_PKG_VERSION=1.6.3 TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/libksba/libksba-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=fce01ccac59812bddadffacff017dac2e4762bdb6ebc6ffe06f6ed4f6192c971 +TERMUX_PKG_SHA256=3f72c68db30971ebbf14367527719423f0a4d5f8103fc9f4a1c01a9fa440de5c TERMUX_PKG_DEPENDS="libgpg-error" TERMUX_PKG_BREAKS="libksba-dev" TERMUX_PKG_REPLACES="libksba-dev" From 7c6d7938e25e700bfabe99111c15f331cd2465c1 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Tue, 20 Dec 2022 23:40:58 +0900 Subject: [PATCH 093/244] mkbootimg: Bump to 2022.11.09 --- packages/mkbootimg/build.sh | 4 +-- packages/mkbootimg/unpackbootimg.c.patch | 38 ------------------------ 2 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 packages/mkbootimg/unpackbootimg.c.patch diff --git a/packages/mkbootimg/build.sh b/packages/mkbootimg/build.sh index 7f4b26a253..c4579b43f4 100644 --- a/packages/mkbootimg/build.sh +++ b/packages/mkbootimg/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Maintained fork with android's mkbootimg and unpackbooti TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_LICENSE_FILE="NOTICE" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=2021.08.06 +TERMUX_PKG_VERSION=2022.11.09 TERMUX_PKG_SRCURL=https://github.com/osm0sis/mkbootimg/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=ce754bf13ceeac7f12581862c07ee5ad80b9648e464dca698dd4569bac088659 +TERMUX_PKG_SHA256=33c03adf318482b8ffa624b18c8c9ba605eba71a0cd9515409328b63e2add8b5 TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/mkbootimg/unpackbootimg.c.patch b/packages/mkbootimg/unpackbootimg.c.patch deleted file mode 100644 index 9eb56e99a1..0000000000 --- a/packages/mkbootimg/unpackbootimg.c.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- ./unpackbootimg.c.orig 2022-07-12 22:50:11.666837511 +0200 -+++ ./unpackbootimg.c 2022-07-12 22:51:03.806772364 +0200 -@@ -191,7 +191,7 @@ - fseek(f, i, SEEK_SET); - if(fread(&header, sizeof(header), 1, f)) {}; - -- if(magic == BOOT_MAGIC) { -+ if(strncmp(magic, BOOT_MAGIC, BOOT_MAGIC_SIZE) == 0) { - if((header.header_version < 3) || (header.header_version > hdr_ver_max)) { - // boot_img_hdr_v2 in the backported header supports all boot_img_hdr versions and cross-compatible variants below 3 - -@@ -298,7 +298,7 @@ - write_string_to_file("hashtype", hash_type); - - total_read += sizeof(header); -- if(debug > 1) fprintf(stderr, "read: %ld\n", sizeof(header)); // this will harmlessly always show 1660 since it uses boot_img_hdr_v2 for all < v3 -+ if(debug > 1) fprintf(stderr, "read: %ld\n", (long)sizeof(header)); // this will harmlessly always show 1660 since it uses boot_img_hdr_v2 for all < v3 - total_read += read_padding(f, sizeof(header)); - - write_buffer_to_file("kernel", f, header.kernel_size); -@@ -350,7 +350,7 @@ - write_string_to_file("header_version", hdrvertmp); - - total_read += sizeof(header); -- if(debug > 1) fprintf(stderr, "read: %ld\n", sizeof(header)); -+ if(debug > 1) fprintf(stderr, "read: %ld\n", (long)sizeof(header)); - total_read += read_padding(f, sizeof(header)); - - write_buffer_to_file("kernel", f, header.kernel_size); -@@ -417,7 +417,7 @@ - write_string_to_file("dtb_offset", dtbofftmp); - - total_read += sizeof(header); -- if(debug > 1) fprintf(stderr, "read: %ld\n", sizeof(header)); -+ if(debug > 1) fprintf(stderr, "read: %ld\n", (long)sizeof(header)); - total_read += read_padding(f, sizeof(header)); - - write_buffer_to_file("vendor_ramdisk", f, header.vendor_ramdisk_size); From b43dbca74a89cba237805c5853f7f19f8ba3066e Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Tue, 20 Dec 2022 23:42:47 +0900 Subject: [PATCH 094/244] perl-rename: Bump to 1.12 --- packages/perl-rename/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/perl-rename/build.sh b/packages/perl-rename/build.sh index a1bbd8e8c6..e3e245625f 100644 --- a/packages/perl-rename/build.sh +++ b/packages/perl-rename/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://search.cpan.org/~pederst/rename/ TERMUX_PKG_DESCRIPTION="renames multiple files using perl expressions." TERMUX_PKG_LICENSE="Artistic-License-2.0, GPL-2.0" # https://metacpan.org/pod/Software::License::Perl_5 TERMUX_PKG_MAINTAINER="@ELWAER-M" -TERMUX_PKG_VERSION=1.11 +TERMUX_PKG_VERSION=1.12 TERMUX_PKG_SRCURL=https://cpan.metacpan.org/authors/id/P/PE/PEDERST/rename-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=2f03f33d3a17d3a3599c83f514f0694fd833b606920132925e3fdbd8a1a3e44b +TERMUX_PKG_SHA256=bca72eda72a8e826c0050738a5f5a69a289785aeb2ffc6d71f389da04fbcedd2 TERMUX_PKG_DEPENDS="perl" TERMUX_PKG_BUILD_IN_SRC=true From 6ef62c9f8335702fda1a505ba90485c51ae5f58e Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Tue, 20 Dec 2022 23:46:35 +0900 Subject: [PATCH 095/244] sssnake: Bump to 0.3.2 --- packages/sssnake/build.sh | 4 ++-- packages/sssnake/makefile.patch | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/sssnake/build.sh b/packages/sssnake/build.sh index 19c2768920..88231957d5 100644 --- a/packages/sssnake/build.sh +++ b/packages/sssnake/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/AngelJumbo/sssnake TERMUX_PKG_DESCRIPTION="cli snake game that plays itself" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.2.0" +TERMUX_PKG_VERSION=0.3.2 TERMUX_PKG_SRCURL=https://github.com/AngelJumbo/sssnake/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=5e7dd572cec18417d6a839188156b47ae36e7d2350220bd25ffc304aa8d7fcc5 +TERMUX_PKG_SHA256=ffd5f012ed664d4d72df03af858c8984c60985ef680b760bb3f37d4948f2a3c0 TERMUX_PKG_DEPENDS="ncurses" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_GROUPS="games" diff --git a/packages/sssnake/makefile.patch b/packages/sssnake/makefile.patch index df911ffe53..d6e97cc457 100644 --- a/packages/sssnake/makefile.patch +++ b/packages/sssnake/makefile.patch @@ -5,9 +5,9 @@ +PREFIX = @TERMUX_PREFIX@ MANDIR = $(PREFIX)/share/man - sssnake: main.c autopilot.c xymap.c essentials.c snake.c -- $(CC) -w $(ncursesw5-config --cflags --libs) main.c autopilot.c xymap.c essentials.c snake.c -lncursesw -o sssnake -+ $(CC) -w $(CPPFLAGS) $(CFLAGS) main.c autopilot.c xymap.c essentials.c snake.c $(LDFLAGS) -lncursesw -o sssnake - #autopilot.o: autopilot.c xymap.c essentials.c snake.c - # gcc -c autopilot.c xymap.c essentials.c snake.c + sssnake: main.c autopilot.c xymap.c structs.c snake.c draw.c +- $(CC) -w $(ncursesw5-config --cflags --libs) main.c autopilot.c xymap.c structs.c snake.c draw.c -lncursesw -o sssnake ++ $(CC) -w $(CPPFLAGS) $(CFLAGS) main.c autopilot.c xymap.c structs.c snake.c draw.c $(LDFLAGS) -lncursesw -o sssnake + debug: main.c autopilot.c xymap.c structs.c snake.c draw.c + $(CC) -w $(ncursesw5-config --cflags --libs) -Wall -g main.c autopilot.c xymap.c structs.c snake.c draw.c -lncursesw -o sssnake From 3e0af281e94d705228332d4506c4c4814d5b2631 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Tue, 20 Dec 2022 23:56:47 +0900 Subject: [PATCH 096/244] containerd: Bump to 1.6.14 --- root-packages/containerd/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-packages/containerd/build.sh b/root-packages/containerd/build.sh index 60c737911a..967e3686fc 100644 --- a/root-packages/containerd/build.sh +++ b/root-packages/containerd/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://containerd.io/ TERMUX_PKG_DESCRIPTION="An open and reliable container runtime" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.6.13 +TERMUX_PKG_VERSION=1.6.14 TERMUX_PKG_SRCURL=https://github.com/containerd/containerd.git TERMUX_PKG_DEPENDS="runc" TERMUX_PKG_CONFFILES="etc/containerd/config.toml" From 1236e4203cdfdeaaff4d830bcd836fc268178fde Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Tue, 20 Dec 2022 23:59:02 +0900 Subject: [PATCH 097/244] fluent-gtk-theme: Bump to 2022.12.15 --- x11-packages/fluent-gtk-theme/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-packages/fluent-gtk-theme/build.sh b/x11-packages/fluent-gtk-theme/build.sh index f38225b87c..ed014e2234 100644 --- a/x11-packages/fluent-gtk-theme/build.sh +++ b/x11-packages/fluent-gtk-theme/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/vinceliuice/Fluent-gtk-theme TERMUX_PKG_DESCRIPTION="Fluent is a Fluent design theme for GNOME/GTK based desktop environments" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@Yisus7u7 " -TERMUX_PKG_VERSION=2022.06.15 +TERMUX_PKG_VERSION=2022.12.15 TERMUX_PKG_SRCURL=https://github.com/vinceliuice/Fluent-gtk-theme/archive/refs/tags/${TERMUX_PKG_VERSION//./-}.tar.gz -TERMUX_PKG_SHA256=fddbd5e41f2419d2d654d2ef300a1f2588bc832598720a6c1340d7ffc2084626 +TERMUX_PKG_SHA256=0b6865214868057b3e10f90a6ee0b76bd152a72c67642e8fefec549e94410732 TERMUX_PKG_DEPENDS="gnome-themes-extra, gtk2-engines-murrine, gtk3" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_PLATFORM_INDEPENDENT=true From bf3b69742541273a67aa457e5300273a490df347 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Wed, 21 Dec 2022 00:00:27 +0900 Subject: [PATCH 098/244] hugin: Bump to 2022.0.0 --- x11-packages/hugin/build.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/x11-packages/hugin/build.sh b/x11-packages/hugin/build.sh index aba936137c..d0f38267ac 100644 --- a/x11-packages/hugin/build.sh +++ b/x11-packages/hugin/build.sh @@ -2,11 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://hugin.sourceforge.net/ TERMUX_PKG_DESCRIPTION="Toolchain to create panoramic images for every occasion" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=2021.0.0 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_VERSION=2022.0.0 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/hugin/hugin-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=047aea8a7fa47844b34ef27c19d3b697e84939dcb1fdbbeb2c204621b66eead9 -TERMUX_PKG_DEPENDS="boost, enblend, exiftool, exiv2, fftw, glew, glu, libc++, libflann, libjpeg-turbo, liblz4, libpano13, libpng, libsqlite, libtiff, libvigra, libx11, littlecms, mesa, openexr, wxwidgets, zlib" +TERMUX_PKG_SHA256=97c8562a0ba9a743e0b955a43dfde048b1c60cd9e5f2ee2b69de1a81646e05a7 +TERMUX_PKG_DEPENDS="boost, enblend, exiftool, exiv2, fftw, glew, glu, imath, libc++, libflann, libjpeg-turbo, liblz4, libpano13, libpng, libsqlite, libtiff, libvigra, libx11, littlecms, mesa, openexr, wxwidgets, zlib" TERMUX_PKG_BUILD_DEPENDS="boost-headers" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DwxWidgets_CONFIG_EXECUTABLE=$TERMUX_PREFIX/bin/wx-config From 904084b3fc5a95419a9e9c064ca878d2878f65c8 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Wed, 21 Dec 2022 00:01:50 +0900 Subject: [PATCH 099/244] jove: Bump to 4.17.4.9 --- packages/jove/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/jove/build.sh b/packages/jove/build.sh index dfd7ff2684..a9e48fcdf0 100644 --- a/packages/jove/build.sh +++ b/packages/jove/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Jove is a compact, powerful, Emacs-style text-editor." TERMUX_PKG_LICENSE="custom" TERMUX_PKG_LICENSE_FILE="LICENSE" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=4.17.4.8 +TERMUX_PKG_VERSION=4.17.4.9 TERMUX_PKG_SRCURL=https://github.com/jonmacs/jove/archive/${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=39995f970604a67cadd0f87ad9ac88562f40b680135116f53597c0d4413f318e +TERMUX_PKG_SHA256=6d9aeb85c04fedac7e3df2a1716e014dc53d6938f665fc32a9facd40c117102d TERMUX_PKG_DEPENDS="ncurses" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_MAKE_ARGS=" From 8cba4b93ab82d481c1e2dddaefa564ba3f67a3e8 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Wed, 21 Dec 2022 01:42:29 +0900 Subject: [PATCH 100/244] heimer: Bump to 3.6.4 --- x11-packages/heimer/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-packages/heimer/build.sh b/x11-packages/heimer/build.sh index e0860ef7dd..9711ad8b27 100644 --- a/x11-packages/heimer/build.sh +++ b/x11-packages/heimer/build.sh @@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://github.com/juzzlin/Heimer TERMUX_PKG_DESCRIPTION="Heimer is a simple cross-platform mind map, diagram, and note-taking tool written in Qt." TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="Yisus7u7 " -TERMUX_PKG_VERSION=3.6.3 +TERMUX_PKG_VERSION=3.6.4 TERMUX_PKG_SRCURL=https://github.com/juzzlin/Heimer/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=0bba6cd8f07ae51dcefdeae5ad5e6180d86d2cb720d274b68df9df49c8ff2113 +TERMUX_PKG_SHA256=b5acfad220cb05642657616b4ae13edef28f0e854f7ee69ba61412c3e1c81f05 TERMUX_PKG_DEPENDS="libc++, qt5-qtbase, qt5-qtsvg" TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase-cross-tools, qt5-qttools-cross-tools" From df849068819d7ccc7e974091153ad724b6fee759 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Wed, 21 Dec 2022 02:17:47 +0900 Subject: [PATCH 101/244] matterbridge: Enable arm build --- packages/matterbridge/build.sh | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/packages/matterbridge/build.sh b/packages/matterbridge/build.sh index 7b72607b2b..8bbe9a42da 100644 --- a/packages/matterbridge/build.sh +++ b/packages/matterbridge/build.sh @@ -3,28 +3,19 @@ TERMUX_PKG_DESCRIPTION="A simple chat bridge" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="1.25.2" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/42wim/matterbridge/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=e078a4776b1082230ea0b8146613679c23d3b0d322706c987261df987a04bfc5 TERMUX_PKG_DEPENDS="libc++" +TERMUX_PKG_BUILD_DEPENDS="binutils-cross" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_AUTO_UPDATE=true -# ``` -# # github.com/Benau/go_rlottie -# :1:1: error: unknown directive -# .func fname -# ^ -# :2:5: note: while in macro instantiation -# pixman_asm_function fname -# ^ -# vector_pixman_pixman-arm-neon-asm.S:337:1: note: while in macro instantiation -# generate_composite_function pixman_composite_over_8888_8888_asm_neon, 32, 0, 32, FLAG_DST_READWRITE | FLAG_DEINTERLEAVE_32BPP, 8, 5, default_init, default_cleanup, pixman_composite_over_8888_8888_process_pixblock_head, pixman_composite_over_8888_8888_process_pixblock_tail, pixman_composite_over_8888_8888_process_pixblock_tail_head -# ^ -# ``` -TERMUX_PKG_BLACKLISTED_ARCHES="arm" - termux_step_pre_configure() { + if [ "$TERMUX_ARCH" = arm ]; then + termux_setup_no_integrated_as + fi + termux_setup_golang go mod init || : From bbb47f36f9b2be8a75d760b227f45f97f213c484 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Tue, 20 Dec 2022 18:10:00 +0000 Subject: [PATCH 102/244] bump(main/cloudflared): 2022.12.1 This commit has been automatically submitted by Github Actions. --- packages/cloudflared/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/cloudflared/build.sh b/packages/cloudflared/build.sh index 83397456af..a244fe80bc 100644 --- a/packages/cloudflared/build.sh +++ b/packages/cloudflared/build.sh @@ -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="2022.12.0" +TERMUX_PKG_VERSION="2022.12.1" TERMUX_PKG_SRCURL=https://github.com/cloudflare/cloudflared/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=0c7f3f1d48c5b676e2555c8dea2168f09c7500993cbfc351ddb743eee0744630 +TERMUX_PKG_SHA256=8cc5c41ea98a9d72687d5f62e733a9033191e834e4fa9b2aecc557f0ccfbda56 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true From 2a521c010015e41bdc431893056e2e4933098d3c Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Tue, 20 Dec 2022 18:15:05 +0000 Subject: [PATCH 103/244] bump(main/sqlcipher): 4.5.3 This commit has been automatically submitted by Github Actions. --- packages/sqlcipher/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sqlcipher/build.sh b/packages/sqlcipher/build.sh index d5a4f966e8..6a15e48861 100644 --- a/packages/sqlcipher/build.sh +++ b/packages/sqlcipher/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/sqlcipher/sqlcipher TERMUX_PKG_DESCRIPTION="SQLCipher is an SQLite extension that provides 256 bit AES encryption of database files" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=4.5.2 +TERMUX_PKG_VERSION="4.5.3" TERMUX_PKG_SRCURL=https://github.com/sqlcipher/sqlcipher/archive/v$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=6925f012deb5582e39761a7d4816883cc15b41851a8e70b447c223b8ef406e2a +TERMUX_PKG_SHA256=5c9d672eba6be4d05a9a8170f70170e537ae735a09c3de444a8ad629b595d5e2 TERMUX_PKG_DEPENDS="openssl" TERMUX_PKG_BUILD_DEPENDS="tcl" TERMUX_PKG_AUTO_UPDATE=true From 5f3e5ae963f30495ed986d7ab9a72813bb2bf42f Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Wed, 21 Dec 2022 02:23:43 +0900 Subject: [PATCH 104/244] gnupg: Bump to 2.4.0 --- packages/gnupg/build.sh | 4 +-- packages/gnupg/gnupg-2.3.8-no-ldap.patch | 35 ------------------------ 2 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 packages/gnupg/gnupg-2.3.8-no-ldap.patch diff --git a/packages/gnupg/build.sh b/packages/gnupg/build.sh index cf4e0ab9a4..b2c0834712 100644 --- a/packages/gnupg/build.sh +++ b/packages/gnupg/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.gnupg.org/ TERMUX_PKG_DESCRIPTION="Implementation of the OpenPGP standard for encrypting and signing data and communication" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=2.3.8 +TERMUX_PKG_VERSION=2.4.0 TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=540b7a40e57da261fb10ef521a282e0021532a80fd023e75fb71757e8a4969ed +TERMUX_PKG_SHA256=1d79158dd01d992431dd2e3facb89fdac97127f89784ea2cb610c600fb0c1483 TERMUX_PKG_DEPENDS="libassuan, libbz2, libgcrypt, libgnutls, libgpg-error, libksba, libnpth, libsqlite, readline, pinentry, resolv-conf, zlib" TERMUX_PKG_CONFLICTS="gnupg2 (<< 2.2.9-1), dirmngr (<< 2.2.17-1)" TERMUX_PKG_REPLACES="gnupg2 (<< 2.2.9-1), dirmngr (<< 2.2.17-1)" diff --git a/packages/gnupg/gnupg-2.3.8-no-ldap.patch b/packages/gnupg/gnupg-2.3.8-no-ldap.patch deleted file mode 100644 index 2614e5cead..0000000000 --- a/packages/gnupg/gnupg-2.3.8-no-ldap.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=7011286ce6e1fb56c2989fdafbd11b931c489faa - -From 7011286ce6e1fb56c2989fdafbd11b931c489faa Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Fri, 14 Oct 2022 09:58:41 +0900 -Subject: [PATCH] dirmngr: Fix build with no LDAP support. - -* dirmngr/server.c [USE_LDAP] (start_command_handler): Conditionalize. - --- - -GnuPG-bug-id: 6239 -Signed-off-by: NIIBE Yutaka ---- - dirmngr/server.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/dirmngr/server.c b/dirmngr/server.c -index 04ebfd317..98f354300 100644 ---- a/dirmngr/server.c -+++ b/dirmngr/server.c -@@ -3137,8 +3137,10 @@ start_command_handler (assuan_fd_t fd, unsigned int session_id) - ctrl->refcount); - else - { -+#if USE_LDAP - ks_ldap_free_state (ctrl->ks_get_state); - ctrl->ks_get_state = NULL; -+#endif - release_ctrl_ocsp_certs (ctrl); - xfree (ctrl->server_local); - dirmngr_deinit_default_ctrl (ctrl); --- -2.11.0 - From 50ee46b7b3341afbb9d7de1dbde88a67432ab9ad Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Tue, 20 Dec 2022 23:51:02 +0900 Subject: [PATCH 105/244] w3m: Bump to 0.5.3.20220429 --- packages/w3m/Str.h.patch | 2 +- packages/w3m/build.sh | 8 ++-- packages/w3m/fix-hardcoded-paths.patch | 51 ++++++++++++++++++++++++++ packages/w3m/gc.h | 1 + 4 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 packages/w3m/fix-hardcoded-paths.patch diff --git a/packages/w3m/Str.h.patch b/packages/w3m/Str.h.patch index 9701680634..4777115f66 100644 --- a/packages/w3m/Str.h.patch +++ b/packages/w3m/Str.h.patch @@ -6,6 +6,6 @@ diff -u -r ../w3m-0.5.3-git20170102/Str.h ./Str.h #include #include +#include + #include #ifdef __EMX__ #define strcasecmp stricmp - #define strncasecmp strnicmp diff --git a/packages/w3m/build.sh b/packages/w3m/build.sh index 3347438413..03db759b31 100644 --- a/packages/w3m/build.sh +++ b/packages/w3m/build.sh @@ -1,15 +1,15 @@ TERMUX_PKG_HOMEPAGE=http://w3m.sourceforge.net/ TERMUX_PKG_DESCRIPTION="Text based Web browser and pager" -TERMUX_PKG_LICENSE="BSD" +TERMUX_PKG_LICENSE="custom" +TERMUX_PKG_LICENSE_FILE="LICENSE" TERMUX_PKG_MAINTAINER="@termux" _MAJOR_VERSION=0.5.3 -_MINOR_VERSION=20190105 +_MINOR_VERSION=20220429 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.${_MINOR_VERSION} -TERMUX_PKG_REVISION=9 # 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 -TERMUX_PKG_SHA256=0467bb5429b75749205a3f57b9f5e8abba49929272aeab6fce94ff17953f0784 +TERMUX_PKG_SHA256=6d76fcccb7c94658f2753f0777f69283d5cb447004a0d0d3087c1d873edc0af3 TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_DEPENDS="libgc, ncurses, openssl, zlib" TERMUX_PKG_RECOMMENDS="libsixel" diff --git a/packages/w3m/fix-hardcoded-paths.patch b/packages/w3m/fix-hardcoded-paths.patch new file mode 100644 index 0000000000..79010fa389 --- /dev/null +++ b/packages/w3m/fix-hardcoded-paths.patch @@ -0,0 +1,51 @@ +--- a/etc.c ++++ b/etc.c +@@ -1431,7 +1431,7 @@ void + myExec(char *command) + { + mySignal(SIGINT, SIG_DFL); +- execl("/bin/sh", "sh", "-c", command, NULL); ++ execl("@TERMUX_PREFIX@/bin/sh", "sh", "-c", command, NULL); + exit(127); + } + +--- a/rc.c ++++ b/rc.c +@@ -1368,7 +1368,7 @@ init_rc(void) + if (((tmp_dir = getenv("TMPDIR")) == NULL || *tmp_dir == '\0') && + ((tmp_dir = getenv("TMP")) == NULL || *tmp_dir == '\0') && + ((tmp_dir = getenv("TEMP")) == NULL || *tmp_dir == '\0')) +- tmp_dir = "/tmp"; ++ tmp_dir = "@TERMUX_PREFIX@/tmp"; + #ifdef HAVE_MKDTEMP + tmp_dir = mkdtemp(Strnew_m_charp(tmp_dir, "/w3m-XXXXXX", NULL)->ptr); + if (tmp_dir == NULL) +--- a/scripts/w3mman/w3mman.in ++++ b/scripts/w3mman/w3mman.in +@@ -1,7 +1,7 @@ + #!@PERL@ + + @W3M = split(' ', $ENV{'W3MMAN_W3M'} || '@W3M@'); +-$ENV{'W3MMAN_MAN'} ||= '@MAN@'; ++$ENV{'W3MMAN_MAN'} ||= '@TERMUX_PREFIX@/bin/man'; + $SCRIPT = 'file:///$LIB/w3mman2html.cgi'; + + sub usage { +--- a/scripts/w3mman/w3mman2html.cgi.in ++++ b/scripts/w3mman/w3mman2html.cgi.in +@@ -255,12 +255,9 @@ sub include_ref { + local($d); + + for $d ( +- "/usr/include", +- "/usr/local/include", +- "/usr/X11R6/include", +- "/usr/X11/include", +- "/usr/X/include", +- "/usr/include/X11" ++ "@TERMUX_PREFIX@/include", ++ "@TERMUX_PREFIX@/local/include", ++ "@TERMUX_PREFIX@/include/X11" + ) { + -f "$d/$_" && return "$_"; + } diff --git a/packages/w3m/gc.h b/packages/w3m/gc.h index a8fe5f528e..42dc1fd67f 100644 --- a/packages/w3m/gc.h +++ b/packages/w3m/gc.h @@ -3,6 +3,7 @@ #define GC_INIT() #define GC_MALLOC(arg) malloc(arg) #define GC_malloc(arg) malloc(arg) +#define GC_REALLOC(arg1,arg2) realloc(arg1,arg2) #define GC_MALLOC_ATOMIC(arg) malloc(arg) #define GC_free(arg) free(arg) From 802f768aec79c36374b4c1839594c281f400b14d Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Wed, 21 Dec 2022 00:22:19 +0000 Subject: [PATCH 106/244] bump(main/gping): 1.6.3 This commit has been automatically submitted by Github Actions. --- packages/gping/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/gping/build.sh b/packages/gping/build.sh index 709b6a08a2..6a0e9d86a3 100644 --- a/packages/gping/build.sh +++ b/packages/gping/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/orf/gping TERMUX_PKG_DESCRIPTION="Ping, but with a graph" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Krishna kanhaiya @kcubeterm" -TERMUX_PKG_VERSION="1.6.2" +TERMUX_PKG_VERSION="1.6.3" TERMUX_PKG_SRCURL=https://github.com/orf/gping/archive/refs/tags/gping-v$TERMUX_PKG_VERSION.zip -TERMUX_PKG_SHA256=b62286debb14689c0fcbefae9999a1715529479fa04e4aadaf1bf11ff26bfa6b +TERMUX_PKG_SHA256=17f33ab6098c576489cd87b108625dd3251438d12c8ff8d712901f6394bf5199 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_VERSION_REGEXP="\d+\.\d+\.\d+" TERMUX_PKG_BUILD_DEPENDS="zlib" From af04660424f8d3bf301d1c98490ba250225ac791 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Wed, 21 Dec 2022 00:31:15 +0000 Subject: [PATCH 107/244] bump(main/nushell): 0.73.0 This commit has been automatically submitted by Github Actions. --- packages/nushell/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nushell/build.sh b/packages/nushell/build.sh index 077e76ce0f..ad2ed321fd 100644 --- a/packages/nushell/build.sh +++ b/packages/nushell/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.nushell.sh TERMUX_PKG_DESCRIPTION="A new type of shell operating on structured data" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.72.1" +TERMUX_PKG_VERSION="0.73.0" TERMUX_PKG_SRCURL=https://github.com/nushell/nushell/archive/$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=9f921243512702bd02845a58f8d9225e432667084f4d5e3a8d6375bec2f92f31 +TERMUX_PKG_SHA256=02e63edb99e50c32a334a157bc82486990aebfd6bdae03d6852c30612bb39c22 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="openssl, zlib" TERMUX_PKG_AUTO_UPDATE=true From 68e9ddb7719e212defff0e61a1bb57a3df86db0b Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Wed, 21 Dec 2022 00:33:24 +0000 Subject: [PATCH 108/244] bump(main/tut): 1.0.29 This commit has been automatically submitted by Github Actions. --- packages/tut/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tut/build.sh b/packages/tut/build.sh index fb1a1e1f86..90c6a6b70c 100644 --- a/packages/tut/build.sh +++ b/packages/tut/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/RasmusLindroth/tut TERMUX_PKG_DESCRIPTION="A TUI for Mastodon with vim inspired keys" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="1.0.28" +TERMUX_PKG_VERSION="1.0.29" TERMUX_PKG_SRCURL=https://github.com/RasmusLindroth/tut/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=6dbc41e0615e1e2a2e1d56ecf2a3a9f555bb39ab16fabc8f4a0cdc35735188bf +TERMUX_PKG_SHA256=f4c9ba33d999924689eebad055b512308ac3aaf03167b3ec50a5a420ae0645f0 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true From 4625b4616ab4c976eb87eacdb6a39df8697bf519 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Wed, 21 Dec 2022 06:16:52 +0000 Subject: [PATCH 109/244] bump(main/neovim-nightly): 0.9.0-dev-533+ga6747545b This commit has been automatically submitted by Github Actions. --- packages/neovim-nightly/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/neovim-nightly/build.sh b/packages/neovim-nightly/build.sh index ecc3d07fec..6ce4510321 100644 --- a/packages/neovim-nightly/build.sh +++ b/packages/neovim-nightly/build.sh @@ -5,9 +5,9 @@ TERMUX_PKG_MAINTAINER="Aditya Alok " # Upstream now has version number like "0.8.0-dev-698-ga5920e98f", but actually # "0.8.0-dev-698-g1ef84547a" < "0.8.0-dev-nightly-10-g1a07044c1", we need to bump # the epoch of the package version. -TERMUX_PKG_VERSION="1:0.9.0-dev-530+gde90a8bfe" +TERMUX_PKG_VERSION="1:0.9.0-dev-533+ga6747545b" TERMUX_PKG_SRCURL="https://github.com/neovim/neovim/archive/nightly.tar.gz" -TERMUX_PKG_SHA256=61240766916ea8f13544a997b62eb19e088734a2957e854f6f31538d4f2112d0 +TERMUX_PKG_SHA256=9440ac43a26d6ddbbfad11e247b75566216070546d6eeb48658a5a3c8705d7f0 TERMUX_PKG_DEPENDS="libiconv, libuv, luv, libmsgpack, libandroid-support, libvterm, libtermkey, libluajit, libunibilium, libtreesitter" TERMUX_PKG_HOSTBUILD=true From fc0f5b0539a274af18bfcad09b0a71e28047131a Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sun, 18 Dec 2022 23:13:51 +0900 Subject: [PATCH 110/244] new package: gvfs --- x11-packages/gvfs/build.sh | 37 +++++++++++++++++++++++++++++ x11-packages/gvfs/meson.build.patch | 14 +++++++++++ 2 files changed, 51 insertions(+) create mode 100644 x11-packages/gvfs/build.sh create mode 100644 x11-packages/gvfs/meson.build.patch diff --git a/x11-packages/gvfs/build.sh b/x11-packages/gvfs/build.sh new file mode 100644 index 0000000000..f999504a2b --- /dev/null +++ b/x11-packages/gvfs/build.sh @@ -0,0 +1,37 @@ +TERMUX_PKG_HOMEPAGE=https://wiki.gnome.org/Projects/gvfs +TERMUX_PKG_DESCRIPTION="A userspace virtual filesystem implementation for GIO" +TERMUX_PKG_LICENSE="LGPL-2.0" +TERMUX_PKG_MAINTAINER="@termux" +_MAJOR_VERSION=1.50 +TERMUX_PKG_VERSION=${_MAJOR_VERSION}.2 +TERMUX_PKG_SRCURL=https://download.gnome.org/sources/gvfs/${_MAJOR_VERSION}/gvfs-${TERMUX_PKG_VERSION}.tar.xz +TERMUX_PKG_SHA256=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e +TERMUX_PKG_DEPENDS="dbus, gcr, glib, gsettings-desktop-schemas, libarchive, libsoup3, libxml2" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-Dsystemduserunitdir=no +-Dtmpfilesdir=no +-Dprivileged_group=system +-Dadmin=false +-Dafc=false +-Dafp=false +-Darchive=true +-Dcdda=false +-Ddnssd=false +-Dgoa=false +-Dgoogle=false +-Dgphoto2=false +-Dhttp=true +-Dmtp=false +-Dnfs=false +-Dsftp=false +-Dsmb=false +-Dudisks2=false +-Dbluray=false +-Dfuse=false +-Dgcr=true +-Dgcrypt=false +-Dgudev=false +-Dkeyring=false +-Dlogind=false +-Dlibusb=false +" diff --git a/x11-packages/gvfs/meson.build.patch b/x11-packages/gvfs/meson.build.patch new file mode 100644 index 0000000000..a35382756c --- /dev/null +++ b/x11-packages/gvfs/meson.build.patch @@ -0,0 +1,14 @@ +--- a/meson.build ++++ b/meson.build +@@ -485,11 +485,6 @@ + configuration: config_h, + ) + +-meson.add_install_script( +- 'meson_post_install.py', +- gio_schemasdir, +- gio_giomoduledir, +-) + + summary({ + 'systemduserunitdir': systemd_systemduserunitdir, From 88849e91147999655b60f9bfbe0d8d1824b4167b Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Wed, 14 Dec 2022 14:12:17 +0100 Subject: [PATCH 111/244] enchance(main/libandroid-support): remove pre-depends on dpkg It was added to fix a particular package dependency issue when libiconv was added (see termux/termux-packages/issues/3762). It is however not correct, libandroid-support does not (pre-)depend on dpkg and specifying that it does can lead to cyclic dependency issues. Remove this workaround since it by now has been several years since the original issue was fixed. --- packages/libandroid-support/build.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/libandroid-support/build.sh b/packages/libandroid-support/build.sh index 11a257480d..367ca56273 100644 --- a/packages/libandroid-support/build.sh +++ b/packages/libandroid-support/build.sh @@ -3,14 +3,13 @@ TERMUX_PKG_DESCRIPTION="Library extending the Android C library (Bionic) for add TERMUX_PKG_LICENSE="Apache-2.0, MIT" TERMUX_PKG_VERSION=(28 3) -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_LICENSE_FILE="LICENSE.txt, wcwidth-${TERMUX_PKG_VERSION[1]}/LICENSE.txt" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_SRCURL=(https://github.com/termux/libandroid-support/archive/v${TERMUX_PKG_VERSION[0]}.tar.gz https://github.com/termux/wcwidth/archive/v${TERMUX_PKG_VERSION[1]}.tar.gz) TERMUX_PKG_SHA256=(ef35260994ffa3bd054be66068dfc28934c823ac8de2394796d94d1cd5de3be4 d38062a53edb2545b9988be41bd8d217f803fa985158b7cadf95d804761dd1f6) -TERMUX_PKG_PRE_DEPENDS="dpkg (>= 1.19.4-3)" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_ESSENTIAL=true From 2d6635f0b2981e1885e6d359480846401e9b58bf Mon Sep 17 00:00:00 2001 From: Chongyun Lee <45286352+licy183@users.noreply.github.com> Date: Wed, 14 Dec 2022 08:16:34 +0800 Subject: [PATCH 112/244] scripts(toolchain): don't include EGL headers --- scripts/build/toolchain/termux_setup_toolchain_25b.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build/toolchain/termux_setup_toolchain_25b.sh b/scripts/build/toolchain/termux_setup_toolchain_25b.sh index eb683cf395..d2f653ebb5 100644 --- a/scripts/build/toolchain/termux_setup_toolchain_25b.sh +++ b/scripts/build/toolchain/termux_setup_toolchain_25b.sh @@ -197,13 +197,13 @@ termux_setup_toolchain_25b() { # Remove and as we build our own zlib. # Remove unicode headers provided by libicu. # Remove KHR/khrplatform.h provided by mesa. - # Remove GLES, GLES2, and GLES3 provided by mesa. + # Remove EGL, GLES, GLES2, and GLES3 provided by mesa. # Remove execinfo provided by libandroid-execinfo. # Remove NDK vulkan headers. rm usr/include/{sys/{capability,shm,sem},{glob,iconv,spawn,zlib,zconf},KHR/khrplatform,execinfo}.h rm usr/include/unicode/{char16ptr,platform,ptypes,putil,stringoptions,ubidi,ubrk,uchar,uconfig,ucpmap,udisplaycontext,uenum,uldnames,ulocdata,uloc,umachine,unorm2,urename,uscript,ustring,utext,utf16,utf8,utf,utf_old,utypes,uvernum,uversion}.h rm -Rf usr/include/vulkan - rm -Rf usr/include/GLES{,2,3} + rm -Rf usr/include/{EGL,GLES{,2,3}} sed -i "s/define __ANDROID_API__ __ANDROID_API_FUTURE__/define __ANDROID_API__ $TERMUX_PKG_API_LEVEL/" \ usr/include/android/api-level.h From 54ed8ece335951b76285d3e4085d1f5cdb5dda72 Mon Sep 17 00:00:00 2001 From: Chongyun Lee <45286352+licy183@users.noreply.github.com> Date: Sat, 10 Dec 2022 01:36:38 +0800 Subject: [PATCH 113/244] scripts(toolchain): bump after removing EGL headers --- scripts/build/termux_step_setup_toolchain.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build/termux_step_setup_toolchain.sh b/scripts/build/termux_step_setup_toolchain.sh index cdd667ddba..21bfc5b7b3 100644 --- a/scripts/build/termux_step_setup_toolchain.sh +++ b/scripts/build/termux_step_setup_toolchain.sh @@ -6,7 +6,7 @@ termux_step_setup_toolchain() { # toolchain setup to ensure that everyone gets an updated # toolchain if [ "${TERMUX_NDK_VERSION}" = 25b ]; then - TERMUX_STANDALONE_TOOLCHAIN+="-v2" + TERMUX_STANDALONE_TOOLCHAIN+="-v3" termux_setup_toolchain_25b elif [ "${TERMUX_NDK_VERSION}" = 23c ]; then TERMUX_STANDALONE_TOOLCHAIN+="-v3" From 897905665ffb360b08ba896fc4f9e924ed10b47d Mon Sep 17 00:00:00 2001 From: Chongyun Lee <45286352+licy183@users.noreply.github.com> Date: Sat, 10 Dec 2022 01:37:43 +0800 Subject: [PATCH 114/244] revbump(ndk-sysroot): EGL header removal --- packages/ndk-sysroot/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ndk-sysroot/build.sh b/packages/ndk-sysroot/build.sh index 35d9f1843d..6df57fff49 100644 --- a/packages/ndk-sysroot/build.sh +++ b/packages/ndk-sysroot/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="System header and library files from the Android NDK nee TERMUX_PKG_LICENSE="NCSA" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SKIP_SRC_EXTRACT=true # This package has taken over from the previous libutil-dev # and iconv.h from libandroid-support-dev: From e6e7873f86889c2645a7785f251c6c38a2756785 Mon Sep 17 00:00:00 2001 From: Chongyun Lee <45286352+licy183@users.noreply.github.com> Date: Wed, 14 Dec 2022 08:18:38 +0800 Subject: [PATCH 115/244] mesa: enable egl support --- packages/mesa/build.sh | 22 +++++++++++++--------- packages/mesa/egl-not-android.diff | 11 +++++++++++ packages/mesa/mesa-dev.subpackage.sh | 11 +++++++---- 3 files changed, 31 insertions(+), 13 deletions(-) create mode 100644 packages/mesa/egl-not-android.diff diff --git a/packages/mesa/build.sh b/packages/mesa/build.sh index 4acb98a460..642f43e343 100644 --- a/packages/mesa/build.sh +++ b/packages/mesa/build.sh @@ -4,9 +4,10 @@ TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_LICENSE_FILE="docs/license.rst" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=22.3.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://archive.mesa3d.org/mesa-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=644bf936584548c2b88762111ad58b4aa3e4688874200e5a4eb74e53ce301746 -TERMUX_PKG_DEPENDS="libandroid-shmem, libc++, libexpat, libx11, libxext, ncurses, zlib, zstd" +TERMUX_PKG_DEPENDS="libandroid-shmem, libc++, libdrm, libexpat, libx11, libxext, libxfixes, libxshmfence, libxxf86vm, ncurses, zlib, zstd" TERMUX_PKG_SUGGESTS="mesa-dev" TERMUX_PKG_BUILD_DEPENDS="libdrm, libllvm-static, libxrandr, llvm, llvm-tools, mlir, xorgproto" TERMUX_PKG_CONFLICTS="libmesa, ndk-sysroot (<= 25b)" @@ -16,15 +17,16 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --cmake-prefix-path $TERMUX_PREFIX -Dcpp_rtti=false -Dgbm=disabled --Degl=disabled +-Dopengl=true +-Degl=enabled +-Degl-native-platform=x11 -Dgles1=enabled -Dgles2=enabled -Ddri3=enabled +-Dglx=dri -Dllvm=enabled -Dshared-llvm=disabled --Dglx=xlib -Dplatforms=x11 --Ddri-drivers= -Dgallium-drivers=swrast -Dvulkan-drivers= -Dosmesa=true @@ -51,12 +53,14 @@ termux_step_post_configure() { rm -f $_WRAPPER_BIN/cmake } -termux_step_post_massage() { +termux_step_post_make_install() { # A bunch of programs in the wild assume that the name of OpenGL shared # library is `libGL.so.1` and try to dlopen(3) it. In fact `sdl2` does # this. So please do not ever remove the symlink. - cd ${TERMUX_PKG_MASSAGEDIR}/${TERMUX_PREFIX}/lib || exit 1 - if [ ! -e "./libGL.so.1" ]; then - ln -sf libGL.so libGL.so.1 - fi + ln -sf libGL.so ${TERMUX_PREFIX}/lib/libGL.so.1 + ln -sf libEGL.so ${TERMUX_PREFIX}/lib/libEGL.so.1 + ln -sf libGLESv1_CM.so ${TERMUX_PREFIX}/lib/libGLESv1_CM.so.1 + ln -sf libGLESv2.so ${TERMUX_PREFIX}/lib/libGLESv2.so.2 + + patch -p1 -d $TERMUX_PREFIX/include < $TERMUX_PKG_BUILDER_DIR/egl-not-android.diff } diff --git a/packages/mesa/egl-not-android.diff b/packages/mesa/egl-not-android.diff new file mode 100644 index 0000000000..b49af86572 --- /dev/null +++ b/packages/mesa/egl-not-android.diff @@ -0,0 +1,11 @@ +--- a/EGL/eglplatform.h ++++ b/EGL/eglplatform.h +@@ -88,7 +88,7 @@ + typedef struct gbm_bo *EGLNativePixmapType; + typedef void *EGLNativeWindowType; + +-#elif defined(__ANDROID__) || defined(ANDROID) ++#elif (defined(__ANDROID__) || defined(ANDROID)) && !defined(__TERMUX__) + + struct ANativeWindow; + struct egl_native_pixmap_t; diff --git a/packages/mesa/mesa-dev.subpackage.sh b/packages/mesa/mesa-dev.subpackage.sh index 1e7c63c351..5e75a5687a 100644 --- a/packages/mesa/mesa-dev.subpackage.sh +++ b/packages/mesa/mesa-dev.subpackage.sh @@ -1,6 +1,9 @@ -TERMUX_SUBPKG_DESCRIPTION="Mesa's GLES headers" -TERMUX_SUBPKG_INCLUDE="include/GLES*" +TERMUX_SUBPKG_DESCRIPTION="Mesa's EGL and GLES headers" TERMUX_SUBPKG_DEPEND_ON_PARENT="no" -TERMUX_SUBPKG_BREAKS="mesa (<< 22.2.2-1)" -TERMUX_SUBPKG_REPLACES="mesa (<< 22.2.2-1)" +TERMUX_SUBPKG_BREAKS="mesa (<< 22.2.2-1), ndk-sysroot (<< 25b-3)" +TERMUX_SUBPKG_REPLACES="mesa (<< 22.2.2-1), ndk-sysroot (<< 25b-3)" TERMUX_SUBPKG_PLATFORM_INDEPENDENT=true +TERMUX_SUBPKG_INCLUDE=" +include/EGL +include/GLES* +" From bdc3b1a770bc3f8e49390d491d9c4827f42cdcf5 Mon Sep 17 00:00:00 2001 From: Chongyun Lee <45286352+licy183@users.noreply.github.com> Date: Wed, 14 Dec 2022 02:23:57 +0800 Subject: [PATCH 116/244] xorg-server: enable dri3 and glx support --- x11-packages/xorg-server/build.sh | 6 +- .../xorg-server/statifiing-all-modules.patch | 147 ------------------ 2 files changed, 3 insertions(+), 150 deletions(-) delete mode 100644 x11-packages/xorg-server/statifiing-all-modules.patch diff --git a/x11-packages/xorg-server/build.sh b/x11-packages/xorg-server/build.sh index 6f8461a1df..3b4248bd1b 100644 --- a/x11-packages/xorg-server/build.sh +++ b/x11-packages/xorg-server/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Xorg server" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.20.14 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=5cc5b70b9be89443e2594b93656c60bd5e82cd7f01deb4ce4faf81dcf546a16b @@ -28,10 +28,10 @@ ac_cv_path_RAWCPP=/usr/bin/cpp --enable-dga --enable-screensaver --enable-xdmcp ---disable-glx +--enable-glx --disable-dri --disable-dri2 ---disable-dri3 +--enable-dri3 --enable-present --disable-tests --enable-xinerama diff --git a/x11-packages/xorg-server/statifiing-all-modules.patch b/x11-packages/xorg-server/statifiing-all-modules.patch deleted file mode 100644 index f02b0a93fc..0000000000 --- a/x11-packages/xorg-server/statifiing-all-modules.patch +++ /dev/null @@ -1,147 +0,0 @@ -+++ ./hw/xfree86/Makefile.am 2018-01-28 10:03:56.740173910 +0200 -@@ -36,8 +36,8 @@ - - SUBDIRS = common ddc x86emu $(INT10_SUBDIR) os-support parser \ - ramdac $(VGAHW_SUBDIR) loader modes $(DRI_SUBDIR) \ -- $(DRI2_SUBDIR) . $(VBE_SUBDIR) i2c dixmods xkb \ -- fbdevhw shadowfb exa $(XF86UTILS_SUBDIR) doc man \ -+ $(DRI2_SUBDIR) fbdevhw shadowfb . $(VBE_SUBDIR) i2c \ -+ dixmods xkb exa $(XF86UTILS_SUBDIR) doc man \ - $(GLAMOR_EGL_SUBDIR) drivers - - DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \ -@@ -45,8 +45,8 @@ - loader dixmods xkb dri dri2 exa modes \ - utils doc man glamor_egl drivers - -+lib_LTLIBRARIES = libXFree86.la - bin_PROGRAMS = Xorg --nodist_Xorg_SOURCES = sdksyms.c - - AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@ - AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/parser \ -@@ -75,11 +75,35 @@ - $(top_builddir)/os/libos.la \ - $(top_builddir)/Xext/libXvidmode.la - --Xorg_LDADD = \ -- $(LOCAL_LIBS) \ -- $(XORG_SYS_LIBS) \ -- $(XSERVER_SYS_LIBS) --Xorg_DEPENDENCIES = $(LOCAL_LIBS) -+LIBXFREE86_LIBS = \ -+ $(MAIN_LIB) \ -+ $(XSERVER_LIBS) \ -+ loader/libloader.la \ -+ common/libcommon.la \ -+ os-support/libxorgos.la \ -+ parser/libxf86config.la \ -+ dixmods/libdixmods.la \ -+ modes/libxf86modes.la \ -+ ramdac/libramdac.la \ -+ ddc/libddc.la \ -+ i2c/libi2c.la \ -+ $(XORG_LIBS) \ -+ xkb/libxorgxkb.la \ -+ fbdevhw/libfbdevhw.la \ -+ $(top_builddir)/Xext/libXvidmode.la \ -+ $(top_builddir)/fb/libfb.la \ -+ $(top_builddir)/miext/shadow/libshadow.la -+ -+ -+libXFree86_la_LDFLAGS = $(Xorg_LDFLAGS) -module -avoid-version -Wl,--unresolved-symbols=report-all -rdynamic -+nodist_libXFree86_la_SOURCES = sdksyms.c -+libXFree86_la_SOURCES = -+libXFree86_la_LIBADD = $(LIBXFREE86_LIBS) $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) -+libXFree86_la_CFLAGS = $(AM_CFLAGS) -+libXFree86_la_DEPENDENCIES = $(LOCAL_LIBS) -+ -+Xorg_LDADD = libXFree86.la -+Xorg_SOURCES = $(top_srcdir)/dix/stubmain.c - - Xorg_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) - -+++ ./hw/xfree86/shadowfb/Makefile.am 2018-01-28 15:18:06.191501835 +0200 -@@ -1,5 +1,5 @@ - module_LTLIBRARIES = libshadowfb.la --libshadowfb_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) -+libshadowfb_la_LDFLAGS = -module -avoid-version -static $(LD_NO_UNDEFINED_FLAG) - libshadowfb_la_SOURCES = sfbmodule.c shadowfb.c - libshadowfb_la_LIBADD = $(PIXMAN_LIBS) - - -+++ ./miext/shadow/Makefile.am 2018-01-28 15:24:22.836598681 +0200 -@@ -6,6 +6,7 @@ - sdk_HEADERS = shadow.h - endif - -+libshadow_la_LDFLAGS = -module -avoid-version -static - libshadow_la_SOURCES = \ - c2p_core.h \ - shadow.c \ - -+++ ./hw/xfree86/fbdevhw/Makefile.am 2018-01-28 16:04:05.242414784 +0200 -@@ -1,17 +1,11 @@ - SUBDIRS = man - --module_LTLIBRARIES = libfbdevhw.la -+noinst_LTLIBRARIES = libfbdevhw.la - --libfbdevhw_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) -+libfbdevhw_la_LDFLAGS = -module -avoid-version -static $(LD_NO_UNDEFINED_FLAG) -- --if FBDEVHW - libfbdevhw_la_SOURCES = fbdevhw.c --else --libfbdevhw_la_SOURCES = fbdevhwstub.c --endif - - AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../i2c -I$(srcdir)/../modes -I$(srcdir)/../ddc -I$(srcdir)/../parser -- - AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) - - sdk_HEADERS = fbdevhw.h - -+++ ./hw/xfree86/dixmods/Makefile.am 2018-01-30 00:09:07.250483502 +0200 -@@ -17,17 +17,17 @@ - -I$(top_srcdir)/miext/shadow \ - -I$(top_srcdir)/glx - --libfb_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) -+libfb_la_LDFLAGS = -module -avoid-version -static $(LD_NO_UNDEFINED_FLAG) - libfb_la_LIBADD = $(top_builddir)/fb/libfb.la - libfb_la_SOURCES = fbmodule.c - libfb_la_CFLAGS = $(AM_CFLAGS) - --libwfb_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) -+libwfb_la_LDFLAGS = -module -avoid-version -static $(LD_NO_UNDEFINED_FLAG) - libwfb_la_LIBADD = $(top_builddir)/fb/libwfb.la - libwfb_la_SOURCES = fbmodule.c - libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER - --libglx_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) -+libglx_la_LDFLAGS = -module -avoid-version -static $(LD_NO_UNDEFINED_FLAG) - libglx_la_LIBADD = $(top_builddir)/glx/libglx.la $(GLX_SYS_LIBS) - if DRI2 - libglx_la_LIBADD += $(top_builddir)/glx/libglxdri.la -@@ -37,7 +37,7 @@ - endif - libglx_la_SOURCES = glxmodule.c - --libshadow_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) -+libshadow_la_LDFLAGS = -module -avoid-version -static $(LD_NO_UNDEFINED_FLAG) - libshadow_la_LIBADD = $(top_builddir)/miext/shadow/libshadow.la - if NO_UNDEFINED - libshadow_la_LIBADD += libfb.la - -+++ ./include/dix.h 2018-01-25 00:43:05.367766278 +0200 -@@ -307,7 +307,7 @@ - extern _X_EXPORT void - SetVendorString(const char *string); - --int -+_X_EXPORT int - dix_main(int argc, char *argv[], char *envp[]); - - /* events.c */ - From f13d7766cce0556e46bee7944d00ade3c37a7f95 Mon Sep 17 00:00:00 2001 From: Chongyun Lee <45286352+licy183@users.noreply.github.com> Date: Wed, 14 Dec 2022 00:36:22 +0800 Subject: [PATCH 117/244] xorg-server-xvfb: enable dri3 and glx support --- x11-packages/xorg-server-xvfb/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/x11-packages/xorg-server-xvfb/build.sh b/x11-packages/xorg-server-xvfb/build.sh index 5e83a2eecd..2112ed3c7c 100644 --- a/x11-packages/xorg-server-xvfb/build.sh +++ b/x11-packages/xorg-server-xvfb/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="X virtual framebuffer" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.20.14 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=5cc5b70b9be89443e2594b93656c60bd5e82cd7f01deb4ce4faf81dcf546a16b @@ -22,10 +22,10 @@ ac_cv_path_RAWCPP=/usr/bin/cpp --enable-dga --enable-screensaver --enable-xdmcp ---disable-glx +--enable-glx --disable-dri --disable-dri2 ---disable-dri3 +--enable-dri3 --enable-present --enable-xinerama --enable-xf86vidmode From e43cb4947d3912f376173827e624a6f525d07641 Mon Sep 17 00:00:00 2001 From: Chongyun Lee <45286352+licy183@users.noreply.github.com> Date: Wed, 14 Dec 2022 01:01:54 +0800 Subject: [PATCH 118/244] xwayland: enable dri3 and glx support --- x11-packages/xwayland/build.sh | 6 +++--- .../xwayland/xwayland_disable_glx.patch | 20 ------------------- 2 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 x11-packages/xwayland/xwayland_disable_glx.patch diff --git a/x11-packages/xwayland/build.sh b/x11-packages/xwayland/build.sh index 4b44388933..49b340ea5b 100644 --- a/x11-packages/xwayland/build.sh +++ b/x11-packages/xwayland/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Wayland X11 server" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.20.5 -TERMUX_PKG_REVISION=15 +TERMUX_PKG_REVISION=16 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d TERMUX_PKG_DEPENDS="libandroid-shmem, libdrm, libpciaccess, libpixman, libx11, libxau, libxfont2, libxinerama, libxkbfile, libxshmfence, mesa, openssl, xkeyboard-config, xorg-xkbcomp, libwayland, libwayland-protocols, libepoxy" @@ -21,10 +21,10 @@ ac_cv_path_WAYLAND_SCANNER=$TERMUX_PREFIX/opt/libwayland/cross/bin/wayland-scann --enable-dga --enable-screensaver --enable-xdmcp ---disable-glx +--enable-glx --disable-dri --disable-dri2 ---disable-dri3 +--enable-dri3 --enable-present --enable-xinerama --enable-xf86vidmode diff --git a/x11-packages/xwayland/xwayland_disable_glx.patch b/x11-packages/xwayland/xwayland_disable_glx.patch deleted file mode 100644 index e1a61d7e55..0000000000 --- a/x11-packages/xwayland/xwayland_disable_glx.patch +++ /dev/null @@ -1,20 +0,0 @@ -+++ ./hw/xwayland/Makefile.am 2019-06-26 02:44:24.968986945 +0300 -@@ -24,7 +24,6 @@ - Xwayland_LDADD = \ - $(glamor_lib) \ - $(XWAYLAND_LIBS) \ -- $(top_builddir)/glx/libglxvnd.la \ - $(XWAYLAND_SYS_LIBS) \ - $(top_builddir)/Xext/libXvidmode.la \ - $(XSERVER_SYS_LIBS) - -+++ ./hw/xwayland/Makefile.in 2019-06-26 02:46:04.650920429 +0300 -@@ -640,7 +640,7 @@ - $(top_srcdir)/mi/miinitext.c $(am__append_1) $(am__append_2) \ - $(am__append_3) - Xwayland_LDADD = $(glamor_lib) $(XWAYLAND_LIBS) \ -- $(top_builddir)/glx/libglxvnd.la $(XWAYLAND_SYS_LIBS) \ -+ $(XWAYLAND_SYS_LIBS) \ - $(top_builddir)/Xext/libXvidmode.la $(XSERVER_SYS_LIBS) \ - $(am__append_5) - Xwayland_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) From b78f90d8c8a8e6dbcf9d158853db7bf7b077f077 Mon Sep 17 00:00:00 2001 From: Chongyun Lee <45286352+licy183@users.noreply.github.com> Date: Wed, 14 Dec 2022 00:38:08 +0800 Subject: [PATCH 119/244] mesa-demos: patch include headers --- x11-packages/mesa-demos/0001-fix-KHR-define.patch | 11 +++++++++++ x11-packages/mesa-demos/build.sh | 1 + 2 files changed, 12 insertions(+) create mode 100644 x11-packages/mesa-demos/0001-fix-KHR-define.patch diff --git a/x11-packages/mesa-demos/0001-fix-KHR-define.patch b/x11-packages/mesa-demos/0001-fix-KHR-define.patch new file mode 100644 index 0000000000..5b2e96e4a8 --- /dev/null +++ b/x11-packages/mesa-demos/0001-fix-KHR-define.patch @@ -0,0 +1,11 @@ +--- a/src/glad/include/KHR/khrplatform.h ++++ b/src/glad/include/KHR/khrplatform.h +@@ -101,7 +101,7 @@ + # define KHRONOS_APICALL __declspec(dllimport) + #elif defined (__SYMBIAN32__) + # define KHRONOS_APICALL IMPORT_C +-#elif defined(__ANDROID__) ++#elif defined(__ANDROID__) && !defined(__TERMUX__) + # include + # define KHRONOS_APICALL __attribute__((visibility("default"))) __NDK_FPABI__ + #else diff --git a/x11-packages/mesa-demos/build.sh b/x11-packages/mesa-demos/build.sh index 5a57b0230d..bf92f4ab21 100644 --- a/x11-packages/mesa-demos/build.sh +++ b/x11-packages/mesa-demos/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="OpenGL demonstration and test programs" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Rafael Kitover " TERMUX_PKG_VERSION=8.5.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://mesa.freedesktop.org/archive/demos/${TERMUX_PKG_VERSION}/mesa-demos-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=cea2df0a80f09a30f635c4eb1a672bf90c5ddee0b8e77f4d70041668ef71aac1 TERMUX_PKG_DEPENDS="freeglut, glu, libx11, libxext, mesa" From 5eaa2bfce1a095757a04fd90e42d305ea92713de Mon Sep 17 00:00:00 2001 From: Chongyun Lee <45286352+licy183@users.noreply.github.com> Date: Sat, 17 Dec 2022 18:56:30 +0800 Subject: [PATCH 120/244] revbump(tigervnc): xorg-server-xvfb changes --- x11-packages/tigervnc/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-packages/tigervnc/build.sh b/x11-packages/tigervnc/build.sh index c332189c70..2c001513e9 100644 --- a/x11-packages/tigervnc/build.sh +++ b/x11-packages/tigervnc/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_MAINTAINER="@termux" # No update anymore. v1.11.x requires support of PAM. TERMUX_PKG_VERSION=(1.10.1 1.20.14) -TERMUX_PKG_REVISION=29 +TERMUX_PKG_REVISION=30 TERMUX_PKG_SRCURL=(https://github.com/TigerVNC/tigervnc/archive/v${TERMUX_PKG_VERSION}.tar.gz https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${TERMUX_PKG_VERSION[1]}.tar.xz) TERMUX_PKG_SHA256=(19fcc80d7d35dd58115262e53cac87d8903180261d94c2a6b0c19224f50b58c4 From 78f44e5f05e03034578efdef18542d35534c4c2d Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Wed, 21 Dec 2022 12:09:37 +0000 Subject: [PATCH 121/244] bump(main/libcurl): 7.87.0 This commit has been automatically submitted by Github Actions. --- packages/libcurl/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/libcurl/build.sh b/packages/libcurl/build.sh index 3791fa10a9..c7caacb33a 100644 --- a/packages/libcurl/build.sh +++ b/packages/libcurl/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://curl.se/ TERMUX_PKG_DESCRIPTION="Easy-to-use client-side URL transfer library" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="7.86.0" +TERMUX_PKG_VERSION="7.87.0" TERMUX_PKG_SRCURL=https://github.com/curl/curl/releases/download/curl-${TERMUX_PKG_VERSION//./_}/curl-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49fb627b +TERMUX_PKG_SHA256=ee5f1a1955b0ed413435ef79db28b834ea5f0fb7c8cfb1ce47175cc3bee08fff TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_VERSION_REGEXP="\d+.\d+.\d+" TERMUX_PKG_DEPENDS="libnghttp2, libssh2, openssl (>= 3.0.3), zlib" From f977930b5771bea1a651d1d0af7169a5b49b84e0 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Wed, 21 Dec 2022 12:14:02 +0000 Subject: [PATCH 122/244] bump(main/mangal): 4.0.5 This commit has been automatically submitted by Github Actions. --- packages/mangal/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mangal/build.sh b/packages/mangal/build.sh index a00d38b614..b9064af5f8 100644 --- a/packages/mangal/build.sh +++ b/packages/mangal/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://github.com/metafates/mangal TERMUX_PKG_DESCRIPTION="Cli manga downloader" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="4.0.4" +TERMUX_PKG_VERSION="4.0.5" TERMUX_PKG_SRCURL=https://github.com/metafates/mangal.git TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_AUTO_UPDATE=true From 7b37a6be4a6d2e2a610c8549518a7e59ce38698a Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Thu, 22 Dec 2022 00:21:23 +0900 Subject: [PATCH 123/244] panda3d: Bump to 1.10.13 --- packages/panda3d/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/panda3d/build.sh b/packages/panda3d/build.sh index fd4b1fb038..40ae0d073e 100644 --- a/packages/panda3d/build.sh +++ b/packages/panda3d/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.panda3d.org/ TERMUX_PKG_DESCRIPTION="A framework for 3D rendering and game development for Python and C++ programs" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.10.12 +TERMUX_PKG_VERSION=1.10.13 TERMUX_PKG_SRCURL=https://github.com/panda3d/panda3d/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=023046fb5bde770a6b41500fee5bf9aa5d99166bf5c95f454cfd46cd2edc9254 +TERMUX_PKG_SHA256=b865882d8cbb44e7a9b1e030ecc071e689391644eb68b0d8ed78b970e8d4d2c7 TERMUX_PKG_DEPENDS="libc++, python" TERMUX_PKG_BUILD_DEPENDS="libandroid-glob" TERMUX_PKG_BUILD_IN_SRC=true From 075c7406af92077d58fc34762250fa1fe9a7446a Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Thu, 22 Dec 2022 00:24:11 +0900 Subject: [PATCH 124/244] rclone: Bump to 1.61.0 --- packages/rclone/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/rclone/build.sh b/packages/rclone/build.sh index dbf0f99156..c634a89856 100644 --- a/packages/rclone/build.sh +++ b/packages/rclone/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://rclone.org/ TERMUX_PKG_DESCRIPTION="rsync for cloud storage" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="1.60.1" +TERMUX_PKG_VERSION=1.61.0 TERMUX_PKG_SRCURL=https://github.com/rclone/rclone/releases/download/v${TERMUX_PKG_VERSION}/rclone-v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=51b8d39b8fd419868d91ed5d0d0a22fb80d943f3fd3bab645c5498a3ad8b3dd9 +TERMUX_PKG_SHA256=dedc5cd6e34d8636eab14c6ea858d1b83de7b546b69eb5538ea6a2ec69a8b5d5 TERMUX_PKG_AUTO_UPDATE=true termux_step_make_install() { From b972502a82f89b2e3049b71c25664d773c12f4c8 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Thu, 22 Dec 2022 00:19:35 +0900 Subject: [PATCH 125/244] docker-compose: Bump to 2.14.2 --- root-packages/docker-compose/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root-packages/docker-compose/build.sh b/root-packages/docker-compose/build.sh index d11ebdcccd..30679aa9cf 100644 --- a/root-packages/docker-compose/build.sh +++ b/root-packages/docker-compose/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/docker/compose TERMUX_PKG_DESCRIPTION="Compose is a tool for defining and running multi-container Docker applications." TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=2.14.1 +TERMUX_PKG_VERSION=2.14.2 TERMUX_PKG_SRCURL="https://github.com/docker/compose/archive/v${TERMUX_PKG_VERSION}.tar.gz" -TERMUX_PKG_SHA256=4e3e92169ad9142718a168b71dc5027f173be4cdb6563f42c60677818efd7509 +TERMUX_PKG_SHA256=72f25596fdaf3bfbb685460c6003acd7ea904b95f12151f892bb199f985fa285 TERMUX_PKG_DEPENDS=docker termux_step_make() { From def668d39e47dbd1fb43c2067a8707d1a30d8da3 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Thu, 22 Dec 2022 00:22:43 +0900 Subject: [PATCH 126/244] parallel: Bump to 20221222 --- packages/parallel/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/parallel/build.sh b/packages/parallel/build.sh index b2ea44fa8c..982dbb90ab 100644 --- a/packages/parallel/build.sh +++ b/packages/parallel/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/parallel/ TERMUX_PKG_DESCRIPTION="GNU Parallel is a shell tool for executing jobs in parallel using one or more machines" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=20221122 +TERMUX_PKG_VERSION=20221222 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/parallel/parallel-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=aa3d9d22434df148d693f1a6232331a126729b6a22d2f7261b17fba9ad99539d +TERMUX_PKG_SHA256=4da90c7bec18a94431b4e3db49dd563f65cf20ceafd245f7cc7b42ef8bf8597f TERMUX_PKG_DEPENDS="perl" TERMUX_PKG_PLATFORM_INDEPENDENT=true From 4966c9c5393d78a66a6bf339c29e0a3864c37b24 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Thu, 22 Dec 2022 01:25:51 +0900 Subject: [PATCH 127/244] rubberband: Separate plugins as subpackages Co-authored-by: Tom Yan --- packages/rubberband/build.sh | 3 ++- packages/rubberband/rubberband-ladspa.subpackage.sh | 5 +++++ packages/rubberband/rubberband-lv2.subpackage.sh | 5 +++++ packages/rubberband/rubberband-vamp.subpackage.sh | 5 +++++ 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 packages/rubberband/rubberband-ladspa.subpackage.sh create mode 100644 packages/rubberband/rubberband-lv2.subpackage.sh create mode 100644 packages/rubberband/rubberband-vamp.subpackage.sh diff --git a/packages/rubberband/build.sh b/packages/rubberband/build.sh index 162d17b988..87c4d43962 100644 --- a/packages/rubberband/build.sh +++ b/packages/rubberband/build.sh @@ -3,9 +3,10 @@ TERMUX_PKG_DESCRIPTION="An audio time-stretching and pitch-shifting library and TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=3.1.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://breakfastquay.com/files/releases/rubberband-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=dda7e257b14c59a1f59c5ccc4d6f19412039f77834275955aa0ff511779b98d2 -TERMUX_PKG_DEPENDS="fftw, ladspa-sdk, libc++, libsamplerate, libsndfile, lv2, vamp-plugin-sdk" +TERMUX_PKG_DEPENDS="fftw, libc++, libsamplerate, libsndfile" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -Dfft=fftw -Dresampler=libsamplerate diff --git a/packages/rubberband/rubberband-ladspa.subpackage.sh b/packages/rubberband/rubberband-ladspa.subpackage.sh new file mode 100644 index 0000000000..85383a3974 --- /dev/null +++ b/packages/rubberband/rubberband-ladspa.subpackage.sh @@ -0,0 +1,5 @@ +TERMUX_SUBPKG_DESCRIPTION="LADSPA plugin for Rubber Band" +TERMUX_SUBPKG_INCLUDE="lib/ladspa/ share/ladspa/" +TERMUX_SUBPKG_DEPENDS="ladspa-sdk" +TERMUX_SUBPKG_BREAKS="rubberband (<< 3.1.2-1)" +TERMUX_SUBPKG_REPLACES="rubberband (<< 3.1.2-1)" diff --git a/packages/rubberband/rubberband-lv2.subpackage.sh b/packages/rubberband/rubberband-lv2.subpackage.sh new file mode 100644 index 0000000000..0a61c749b1 --- /dev/null +++ b/packages/rubberband/rubberband-lv2.subpackage.sh @@ -0,0 +1,5 @@ +TERMUX_SUBPKG_DESCRIPTION="LV2 plugin for Rubber Band" +TERMUX_SUBPKG_INCLUDE="lib/lv2/" +TERMUX_SUBPKG_DEPENDS="lv2" +TERMUX_SUBPKG_BREAKS="rubberband (<< 3.1.2-1)" +TERMUX_SUBPKG_REPLACES="rubberband (<< 3.1.2-1)" diff --git a/packages/rubberband/rubberband-vamp.subpackage.sh b/packages/rubberband/rubberband-vamp.subpackage.sh new file mode 100644 index 0000000000..d681aaead4 --- /dev/null +++ b/packages/rubberband/rubberband-vamp.subpackage.sh @@ -0,0 +1,5 @@ +TERMUX_SUBPKG_DESCRIPTION="Vamp plugin for Rubber Band" +TERMUX_SUBPKG_INCLUDE="lib/vamp/" +TERMUX_SUBPKG_DEPENDS="vamp-plugin-sdk" +TERMUX_SUBPKG_BREAKS="rubberband (<< 3.1.2-1)" +TERMUX_SUBPKG_REPLACES="rubberband (<< 3.1.2-1)" From 0004bdf0faa210a9c7fef8394de4a4273cf95a72 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Wed, 14 Dec 2022 16:53:33 +0900 Subject: [PATCH 128/244] pypy{,3}: Bump to 7.3.10 --- packages/pypy/build.sh | 5 ++--- packages/pypy/termux-build.patch | 12 ++++++------ packages/pypy3/build.sh | 5 ++--- packages/pypy3/termux-build.patch | 12 ++++++------ 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/packages/pypy/build.sh b/packages/pypy/build.sh index 892a307966..a47ee74184 100644 --- a/packages/pypy/build.sh +++ b/packages/pypy/build.sh @@ -3,10 +3,9 @@ TERMUX_PKG_DESCRIPTION="A fast, compliant alternative implementation of Python" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@licy183" _MAJOR_VERSION=2.7 -TERMUX_PKG_VERSION=7.3.9 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=7.3.10 TERMUX_PKG_SRCURL=https://downloads.python.org/pypy/pypy$_MAJOR_VERSION-v$TERMUX_PKG_VERSION-src.tar.bz2 -TERMUX_PKG_SHA256=39b0972956f6548ce5828019dbae12503c32d6cbe91a2becf88d3e42cc52197b +TERMUX_PKG_SHA256=35e2cf4519cb51c4d5ffb4493ee24f0c7f42b4b04944903ca4b33981a04a3bc5 TERMUX_PKG_DEPENDS="gdbm, libandroid-posix-semaphore, libandroid-support, libbz2, libcrypt, libexpat, libffi, liblzma, libsqlite, libxml2, ncurses, ncurses-ui-libs, openssl, readline, zlib" TERMUX_PKG_BUILD_DEPENDS="binutils, clang, dash, make, ndk-multilib, pkg-config, python2, tk, xorgproto" TERMUX_PKG_RECOMMENDS="clang, make, pkg-config" diff --git a/packages/pypy/termux-build.patch b/packages/pypy/termux-build.patch index 8f4937af34..b906a6f55b 100644 --- a/packages/pypy/termux-build.patch +++ b/packages/pypy/termux-build.patch @@ -41,7 +41,7 @@ diff -uNr pypy2.7-v7.3.6-src/rpython/translator/platform/__init__.py pypy2.7-v7. raise ValueError('unknown sys.platform "%s"', sys.platform) +# Android always requires compiling with -fPIC -+host_factory = LinuxPIC ++host_factory = Linux platform = host = host_factory() def pick_platform(new_platform, cc): @@ -69,7 +69,7 @@ diff -uNr pypy2.7-v7.3.6-src/rpython/translator/platform/__init__.py pypy2.7-v7. --- pypy3.7-v7.3.7-src/rpython/translator/platform/termux.py 1970-01-01 08:00:00.000000000 +0800 +++ pypy3.7-v7.3.7-src.mod/rpython/translator/platform/termux.py 2022-03-10 16:49:35.071701000 +0800 @@ -0,0 +1,179 @@ -+from rpython.translator.platform.linux import LinuxPIC ++from rpython.translator.platform.linux import Linux +from rpython.translator.platform.posix import _run_subprocess, GnuMakefile +from rpython.translator.platform import ExecutionResult, log +import os @@ -103,11 +103,11 @@ diff -uNr pypy2.7-v7.3.6-src/rpython/translator/platform/__init__.py pypy2.7-v7. + assert isinstance(rpath_flags, list) + return ["-Wl,-rpath=@TERMUX_PREFIX@/lib"] + rpath_flags + -+class BaseTermux(LinuxPIC): -+ cflags = _update_cflags_for_termux(LinuxPIC.cflags) ++class BaseTermux(Linux): ++ cflags = _update_cflags_for_termux(Linux.cflags) + extra_libs = () -+ link_flags = _update_link_flags_for_termux(LinuxPIC.link_flags) -+ rpath_flags = _update_rpath_flags(LinuxPIC.rpath_flags) ++ link_flags = _update_link_flags_for_termux(Linux.link_flags) ++ rpath_flags = _update_rpath_flags(Linux.rpath_flags) + available_includedirs = [] + available_librarydirs = [] + diff --git a/packages/pypy3/build.sh b/packages/pypy3/build.sh index d5d342efbb..7790eeeab9 100644 --- a/packages/pypy3/build.sh +++ b/packages/pypy3/build.sh @@ -3,10 +3,9 @@ TERMUX_PKG_DESCRIPTION="A fast, compliant alternative implementation of Python 3 TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@licy183" _MAJOR_VERSION=3.8 -TERMUX_PKG_VERSION=7.3.9 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=7.3.10 TERMUX_PKG_SRCURL=https://downloads.python.org/pypy/pypy$_MAJOR_VERSION-v$TERMUX_PKG_VERSION-src.tar.bz2 -TERMUX_PKG_SHA256=5b5d9d9256f12a129af8384e2f581bdfab3bc0fbbe3a0a480d9c1d2e95490eb1 +TERMUX_PKG_SHA256=218a1e062f17aba89f61bc398e8498f13c048b9fcf294343f5d9d56c3ac9b882 TERMUX_PKG_DEPENDS="gdbm, libandroid-posix-semaphore, libandroid-support, libbz2, libcrypt, libexpat, libffi, liblzma, libsqlite, libxml2, ncurses, ncurses-ui-libs, openssl, readline, zlib" TERMUX_PKG_BUILD_DEPENDS="binutils, clang, dash, make, ndk-multilib, pkg-config, python2, tk, xorgproto" TERMUX_PKG_RECOMMENDS="clang, make, pkg-config" diff --git a/packages/pypy3/termux-build.patch b/packages/pypy3/termux-build.patch index 8f4937af34..b906a6f55b 100644 --- a/packages/pypy3/termux-build.patch +++ b/packages/pypy3/termux-build.patch @@ -41,7 +41,7 @@ diff -uNr pypy2.7-v7.3.6-src/rpython/translator/platform/__init__.py pypy2.7-v7. raise ValueError('unknown sys.platform "%s"', sys.platform) +# Android always requires compiling with -fPIC -+host_factory = LinuxPIC ++host_factory = Linux platform = host = host_factory() def pick_platform(new_platform, cc): @@ -69,7 +69,7 @@ diff -uNr pypy2.7-v7.3.6-src/rpython/translator/platform/__init__.py pypy2.7-v7. --- pypy3.7-v7.3.7-src/rpython/translator/platform/termux.py 1970-01-01 08:00:00.000000000 +0800 +++ pypy3.7-v7.3.7-src.mod/rpython/translator/platform/termux.py 2022-03-10 16:49:35.071701000 +0800 @@ -0,0 +1,179 @@ -+from rpython.translator.platform.linux import LinuxPIC ++from rpython.translator.platform.linux import Linux +from rpython.translator.platform.posix import _run_subprocess, GnuMakefile +from rpython.translator.platform import ExecutionResult, log +import os @@ -103,11 +103,11 @@ diff -uNr pypy2.7-v7.3.6-src/rpython/translator/platform/__init__.py pypy2.7-v7. + assert isinstance(rpath_flags, list) + return ["-Wl,-rpath=@TERMUX_PREFIX@/lib"] + rpath_flags + -+class BaseTermux(LinuxPIC): -+ cflags = _update_cflags_for_termux(LinuxPIC.cflags) ++class BaseTermux(Linux): ++ cflags = _update_cflags_for_termux(Linux.cflags) + extra_libs = () -+ link_flags = _update_link_flags_for_termux(LinuxPIC.link_flags) -+ rpath_flags = _update_rpath_flags(LinuxPIC.rpath_flags) ++ link_flags = _update_link_flags_for_termux(Linux.link_flags) ++ rpath_flags = _update_rpath_flags(Linux.rpath_flags) + available_includedirs = [] + available_librarydirs = [] + From 802cc94fcf101e3fe06d5e2b50d20176972e05dd Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Wed, 21 Dec 2022 18:14:36 +0000 Subject: [PATCH 129/244] bump(main/tut): 1.0.30 This commit has been automatically submitted by Github Actions. --- packages/tut/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tut/build.sh b/packages/tut/build.sh index 90c6a6b70c..06c32ca3b9 100644 --- a/packages/tut/build.sh +++ b/packages/tut/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/RasmusLindroth/tut TERMUX_PKG_DESCRIPTION="A TUI for Mastodon with vim inspired keys" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="1.0.29" +TERMUX_PKG_VERSION="1.0.30" TERMUX_PKG_SRCURL=https://github.com/RasmusLindroth/tut/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=f4c9ba33d999924689eebad055b512308ac3aaf03167b3ec50a5a420ae0645f0 +TERMUX_PKG_SHA256=404f1d6647920fc32fab02c92ee23ab4a7e2c7507d535669c4e5a29075d480b1 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true From 01bae5d216adcba04ba8616514d6b75758ade15a Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Thu, 22 Dec 2022 05:25:28 +0900 Subject: [PATCH 130/244] libsoxr: Rebuild to align SONAME with pacman package. --- packages/libsoxr/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/libsoxr/build.sh b/packages/libsoxr/build.sh index 42f995ccc8..0eaeae7409 100644 --- a/packages/libsoxr/build.sh +++ b/packages/libsoxr/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="High quality, one-dimensional sample-rate conversion lib TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.1.3 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://sourceforge.net/projects/soxr/files/soxr-$TERMUX_PKG_VERSION-Source.tar.xz TERMUX_PKG_SHA256=b111c15fdc8c029989330ff559184198c161100a59312f5dc19ddeb9b5a15889 TERMUX_PKG_BREAKS="libsoxr-dev" From 58fa8c60b42f461afc0f3d441c687174b52367ff Mon Sep 17 00:00:00 2001 From: Chongyun Lee <45286352+licy183@users.noreply.github.com> Date: Wed, 7 Dec 2022 02:20:45 +0800 Subject: [PATCH 131/244] ffmpeg: add `av_stream_get_first_dt` This symbol is needed to build chromium with system's ffmpeg. --- ...av_stream_get_first_dts-for-chromium.patch | 32 +++++++++++++++++++ packages/ffmpeg/build.sh | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 packages/ffmpeg/add-av_stream_get_first_dts-for-chromium.patch diff --git a/packages/ffmpeg/add-av_stream_get_first_dts-for-chromium.patch b/packages/ffmpeg/add-av_stream_get_first_dts-for-chromium.patch new file mode 100644 index 0000000000..acb58b5986 --- /dev/null +++ b/packages/ffmpeg/add-av_stream_get_first_dts-for-chromium.patch @@ -0,0 +1,32 @@ +Origin: https://github.com/archlinux/svntogit-packages/blob/packages/ffmpeg/trunk/add-av_stream_get_first_dts-for-chromium.patch +diff '--color=auto' -rupN ffmpeg.orig/libavformat/avformat.h ffmpeg/libavformat/avformat.h +--- ffmpeg.orig/libavformat/avformat.h 2022-08-19 17:42:47.323422603 +0200 ++++ ffmpeg/libavformat/avformat.h 2022-08-19 17:42:51.347130436 +0200 +@@ -1128,6 +1128,10 @@ struct AVCodecParserContext *av_stream_g + */ + int64_t av_stream_get_end_pts(const AVStream *st); + ++// Chromium: We use the internal field first_dts vvv ++int64_t av_stream_get_first_dts(const AVStream *st); ++// Chromium: We use the internal field first_dts ^^^ ++ + #define AV_PROGRAM_RUNNING 1 + + /** +diff '--color=auto' -rupN ffmpeg.orig/libavformat/mux_utils.c ffmpeg/libavformat/mux_utils.c +--- ffmpeg.orig/libavformat/mux_utils.c 2022-08-19 17:42:47.346758108 +0200 ++++ ffmpeg/libavformat/mux_utils.c 2022-08-19 17:47:28.549589002 +0200 +@@ -37,6 +37,13 @@ int64_t av_stream_get_end_pts(const AVSt + return AV_NOPTS_VALUE; + } + ++// Chromium: We use the internal field first_dts vvv ++int64_t av_stream_get_first_dts(const AVStream *st) ++{ ++ return cffstream(st)->first_dts; ++} ++// Chromium: We use the internal field first_dts ^^^ ++ + int avformat_query_codec(const AVOutputFormat *ofmt, enum AVCodecID codec_id, + int std_compliance) + { diff --git a/packages/ffmpeg/build.sh b/packages/ffmpeg/build.sh index 634ee551be..c40b97d302 100644 --- a/packages/ffmpeg/build.sh +++ b/packages/ffmpeg/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Tools and libraries to manipulate a wide range of multim TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=5.1.2 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://www.ffmpeg.org/releases/ffmpeg-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=619e706d662c8420859832ddc259cd4d4096a48a2ce1eefd052db9e440eef3dc TERMUX_PKG_DEPENDS="freetype, game-music-emu, libaom, libandroid-glob, libass, libbluray, libbz2, libdav1d, libgnutls, libiconv, liblzma, libmp3lame, libopus, librav1e, libsoxr, libtheora, libvorbis, libvpx, libvidstab, libwebp, libx264, libx265, libxml2, littlecms, ocl-icd, xvidcore, zlib" From e958b6c8cd06e1c94da0ee9dbf8150691719197a Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Thu, 22 Dec 2022 05:36:03 +0900 Subject: [PATCH 132/244] libsoxr: Revbump revdeps to rebuild due to SONAME change. --- packages/mpd/build.sh | 1 + packages/pulseaudio/build.sh | 4 ++-- packages/shairport-sync/build.sh | 2 +- packages/snapcast-server/build.sh | 2 +- packages/vlc/build.sh | 1 + x11-packages/audacious-plugins/build.sh | 1 + x11-packages/audacity/build.sh | 2 +- x11-packages/vlc-qt/build.sh | 1 + 8 files changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/mpd/build.sh b/packages/mpd/build.sh index 1356452842..c6c1d1d8b5 100644 --- a/packages/mpd/build.sh +++ b/packages/mpd/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Music player daemon" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="0.23.11" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/MusicPlayerDaemon/MPD/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=ab5204b0ba6bfd7008823bac47d50b02f223eee45553f3cfe71ea7da6e00c9ed TERMUX_PKG_DEPENDS="dbus, ffmpeg, game-music-emu, libao, libbz2, libc++, libcurl, libexpat, libflac, libicu, libid3tag, libmad, libmp3lame, libmpdclient, libnfs, libogg, libopus, libsndfile, libsoxr, libsqlite, libvorbis, openal-soft, pulseaudio, zlib" diff --git a/packages/pulseaudio/build.sh b/packages/pulseaudio/build.sh index 955452f286..43448ee4a7 100644 --- a/packages/pulseaudio/build.sh +++ b/packages/pulseaudio/build.sh @@ -4,8 +4,8 @@ TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_SRCURL=https://github.com/pulseaudio/pulseaudio.git TERMUX_PKG_VERSION=16.1 -TERMUX_PKG_REVISION=2 -TERMUX_PKG_DEPENDS="libandroid-execinfo, libandroid-glob, libc++, libltdl, libsndfile, libsoxr, libwebrtc-audio-processing, speexdsp" +TERMUX_PKG_REVISION=3 +TERMUX_PKG_DEPENDS="dbus, libandroid-execinfo, libandroid-glob, libc++, libltdl, libsndfile, libsoxr, libwebrtc-audio-processing, speexdsp" TERMUX_PKG_BREAKS="libpulseaudio-dev, libpulseaudio" TERMUX_PKG_REPLACES="libpulseaudio-dev, libpulseaudio" # glib is only a runtime dependency of pulseaudio-glib subpackage diff --git a/packages/shairport-sync/build.sh b/packages/shairport-sync/build.sh index c3a297d56a..0b1ca52cb9 100644 --- a/packages/shairport-sync/build.sh +++ b/packages/shairport-sync/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_LICENSE_FILE="LICENSES" TERMUX_PKG_MAINTAINER="@termux" # Cannot simply be updated to a newer version due to `pthread_cancel` being used TERMUX_PKG_VERSION=3.1.2 -TERMUX_PKG_REVISION=5 +TERMUX_PKG_REVISION=6 TERMUX_PKG_SRCURL=https://github.com/mikebrady/shairport-sync/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=8c13f7ebbd417e8cab07ea9f74392ced0f54315d8697d4513580f472859a9c65 TERMUX_PKG_DEPENDS="libconfig, libdaemon, libpopt, libsoxr, openssl, pulseaudio" diff --git a/packages/snapcast-server/build.sh b/packages/snapcast-server/build.sh index d7dbd8508f..30a45ddbb7 100644 --- a/packages/snapcast-server/build.sh +++ b/packages/snapcast-server/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A multiroom client-server audio player (server)" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.26.0 -TERMUX_PKG_REVISION=5 +TERMUX_PKG_REVISION=6 TERMUX_PKG_SRCURL=https://github.com/badaix/snapcast/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=166353267a5c461a3a0e7cbd05d78c4bfdaebeda078801df3b76820b54f27683 TERMUX_PKG_DEPENDS="libc++, libexpat, libflac, libopus, libsoxr, libvorbis" diff --git a/packages/vlc/build.sh b/packages/vlc/build.sh index b130036ac4..af1638d396 100644 --- a/packages/vlc/build.sh +++ b/packages/vlc/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A popular libre and open source media player and multime TERMUX_PKG_LICENSE="GPL-2.0, LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=3.0.18 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://download.videolan.org/pub/videolan/vlc/${TERMUX_PKG_VERSION}/vlc-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=57094439c365d8aa8b9b41fa3080cc0eef2befe6025bb5cef722accc625aedec TERMUX_PKG_DEPENDS="avahi, chromaprint, dbus, ffmpeg, fluidsynth, fontconfig, freetype, fribidi, gdk-pixbuf, glib, gst-plugins-base, gstreamer, harfbuzz, liba52, libandroid-shmem, libandroid-spawn, libaom, libarchive, libass, libbluray, libc++, libcaca, libcairo, libcddb, libdav1d, libdvbpsi, libdvdnav, libdvdread, libebml, libflac, libgcrypt, libgnutls, libgpg-error, libiconv, libidn, libjpeg-turbo, liblua52, libmad, libmatroska, libnfs, libogg, libopus, libpng, librsvg, libsecret, libsoxr, libssh2, libtheora, libtwolame, libvorbis, libvpx, libx11, libx264, libx265, libxcb, libxml2, mpg123, ncurses, pulseaudio, samba, taglib, zlib" diff --git a/x11-packages/audacious-plugins/build.sh b/x11-packages/audacious-plugins/build.sh index d89c1be664..79a5345b66 100644 --- a/x11-packages/audacious-plugins/build.sh +++ b/x11-packages/audacious-plugins/build.sh @@ -6,6 +6,7 @@ TERMUX_PKG_LICENSE="custom" TERMUX_PKG_LICENSE_FILE="COPYING" TERMUX_PKG_MAINTAINER="Simeon Huang " TERMUX_PKG_VERSION=4.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://distfiles.audacious-media-player.org/audacious-plugins-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=6fa0f69c3a1041eb877c37109513ab4a2a0a56a77d9e8c13a1581cf1439a417f TERMUX_PKG_DEPENDS="audacious, ffmpeg, fluidsynth, glib, libc++, libcue, libcurl, libflac, libmp3lame, libogg, libsndfile, libsoxr, libvorbis, libx11, libxml2, mpg123, pulseaudio, qt5-qtbase, qt5-qtmultimedia, qt5-qtx11extras, zlib" diff --git a/x11-packages/audacity/build.sh b/x11-packages/audacity/build.sh index 79fe826f44..bcc34586b6 100644 --- a/x11-packages/audacity/build.sh +++ b/x11-packages/audacity/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" # Version 3.0.0 or higher does not work with vanilla wxWidgets. TERMUX_PKG_VERSION=2.4.2 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 _FFMPEG_VERSION=4.4.2 TERMUX_PKG_SRCURL=(https://github.com/audacity/audacity/archive/Audacity-${TERMUX_PKG_VERSION}.tar.gz https://www.ffmpeg.org/releases/ffmpeg-${_FFMPEG_VERSION}.tar.xz) diff --git a/x11-packages/vlc-qt/build.sh b/x11-packages/vlc-qt/build.sh index 2d5c880d9a..cd0c44a2ed 100644 --- a/x11-packages/vlc-qt/build.sh +++ b/x11-packages/vlc-qt/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A popular libre and open source media player and multime TERMUX_PKG_LICENSE="GPL-2.0, LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=3.0.18 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://download.videolan.org/pub/videolan/vlc/${TERMUX_PKG_VERSION}/vlc-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=57094439c365d8aa8b9b41fa3080cc0eef2befe6025bb5cef722accc625aedec TERMUX_PKG_DEPENDS="avahi, chromaprint, dbus, ffmpeg, fluidsynth, fontconfig, freetype, fribidi, gdk-pixbuf, glib, gst-plugins-base, gstreamer, harfbuzz, liba52, libandroid-shmem, libandroid-spawn, libaom, libarchive, libass, libbluray, libc++, libcaca, libcairo, libcddb, libdav1d, libdvbpsi, libdvdnav, libdvdread, libebml, libflac, libgcrypt, libgnutls, libgpg-error, libice, libiconv, libidn, libjpeg-turbo, liblua52, libmad, libmatroska, libnfs, libogg, libopus, libpng, librsvg, libsecret, libsm, libsoxr, libssh2, libtheora, libtwolame, libvorbis, libvpx, libx11, libx264, libx265, libxcb, libxml2, mesa, mpg123, ncurses, pulseaudio, qt5-qtbase, qt5-qtsvg, qt5-qtx11extras, samba, taglib, xcb-util-keysyms, zlib" From a0b400cfb613949dfa92c855f921b4f310c12708 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Thu, 22 Dec 2022 00:29:06 +0000 Subject: [PATCH 133/244] bump(main/gitea): 1.17.4 This commit has been automatically submitted by Github Actions. --- packages/gitea/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/gitea/build.sh b/packages/gitea/build.sh index 393772d6b7..1861ae6df2 100644 --- a/packages/gitea/build.sh +++ b/packages/gitea/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://gitea.io TERMUX_PKG_DESCRIPTION="Git with a cup of tea, painless self-hosted git service" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="1.17.3" +TERMUX_PKG_VERSION="1.17.4" TERMUX_PKG_SRCURL=https://github.com/go-gitea/gitea/archive/v$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=37c5357802395d7c0684b5a09cd2c2cbf426be20a7fa91178f4e8923584f7feb +TERMUX_PKG_SHA256=fe57576ad0225ff6af824c444e571310c97125d53a3de5b7bf33ae7a4a04fafe TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="dash, git" TERMUX_PKG_CONFFILES="etc/gitea/app.ini" From 4063e05c33fc351cc900ae282e7c6a40eeaf0657 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Thu, 22 Dec 2022 00:39:02 +0000 Subject: [PATCH 134/244] bump(main/ruff): 0.0.190 This commit has been automatically submitted by Github Actions. --- packages/ruff/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ruff/build.sh b/packages/ruff/build.sh index 5a13377572..e2cadc91fe 100644 --- a/packages/ruff/build.sh +++ b/packages/ruff/build.sh @@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE="https://github.com/charliermarsh/ruff" TERMUX_PKG_DESCRIPTION="An extremely fast Python linter, written in Rust" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.0.188" +TERMUX_PKG_VERSION="0.0.190" TERMUX_PKG_SRCURL="https://github.com/charliermarsh/ruff/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz" -TERMUX_PKG_SHA256=a7201e9bc44590906a6f87caa1919070dc0baea1a08687454998724a5857ed5b +TERMUX_PKG_SHA256=3b97903df88d9121a758da469682f24b68ae210948d5cd4bccb1c5f035da87a9 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true From 50e4e6c9e8ec1b4fa5d079a79fd01bf6c912fedf Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Thu, 22 Dec 2022 06:17:55 +0000 Subject: [PATCH 135/244] bump(main/neovim-nightly): 0.9.0-dev-538+gf9c62ce34 This commit has been automatically submitted by Github Actions. --- packages/neovim-nightly/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/neovim-nightly/build.sh b/packages/neovim-nightly/build.sh index 6ce4510321..cc78a7a4f5 100644 --- a/packages/neovim-nightly/build.sh +++ b/packages/neovim-nightly/build.sh @@ -5,9 +5,9 @@ TERMUX_PKG_MAINTAINER="Aditya Alok " # Upstream now has version number like "0.8.0-dev-698-ga5920e98f", but actually # "0.8.0-dev-698-g1ef84547a" < "0.8.0-dev-nightly-10-g1a07044c1", we need to bump # the epoch of the package version. -TERMUX_PKG_VERSION="1:0.9.0-dev-533+ga6747545b" +TERMUX_PKG_VERSION="1:0.9.0-dev-538+gf9c62ce34" TERMUX_PKG_SRCURL="https://github.com/neovim/neovim/archive/nightly.tar.gz" -TERMUX_PKG_SHA256=9440ac43a26d6ddbbfad11e247b75566216070546d6eeb48658a5a3c8705d7f0 +TERMUX_PKG_SHA256=5d56de1d97355ba1eb27284c179eaef6a1fe29fc8d51367490b2d23d0e5348a2 TERMUX_PKG_DEPENDS="libiconv, libuv, luv, libmsgpack, libandroid-support, libvterm, libtermkey, libluajit, libunibilium, libtreesitter" TERMUX_PKG_HOSTBUILD=true From 322075817b72c473216b029f6867555b9d3142c1 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Thu, 22 Dec 2022 06:24:20 +0000 Subject: [PATCH 136/244] bump(main/ruff): 0.0.191 This commit has been automatically submitted by Github Actions. --- packages/ruff/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ruff/build.sh b/packages/ruff/build.sh index e2cadc91fe..a99309d2e3 100644 --- a/packages/ruff/build.sh +++ b/packages/ruff/build.sh @@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE="https://github.com/charliermarsh/ruff" TERMUX_PKG_DESCRIPTION="An extremely fast Python linter, written in Rust" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.0.190" +TERMUX_PKG_VERSION="0.0.191" TERMUX_PKG_SRCURL="https://github.com/charliermarsh/ruff/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz" -TERMUX_PKG_SHA256=3b97903df88d9121a758da469682f24b68ae210948d5cd4bccb1c5f035da87a9 +TERMUX_PKG_SHA256=73cf8b8b1a2c51e5b24e5854c5cf0e359d13a2d8a2cffa6085d14a2e2b659386 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true From 750932ed3574bc17fed05fefc4a49bb56ee54d1f Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Wed, 21 Dec 2022 20:54:20 +0900 Subject: [PATCH 137/244] mesa: Bump to 22.3.1 * Separate osmesa as a subpackage --- packages/mesa/build.sh | 7 +++---- packages/mesa/mesa-22.2.0-llvm-15.patch | 6 +++--- packages/mesa/osmesa.subpackage.sh | 8 ++++++++ 3 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 packages/mesa/osmesa.subpackage.sh diff --git a/packages/mesa/build.sh b/packages/mesa/build.sh index 642f43e343..4b467549df 100644 --- a/packages/mesa/build.sh +++ b/packages/mesa/build.sh @@ -3,13 +3,12 @@ TERMUX_PKG_DESCRIPTION="An open-source implementation of the OpenGL specificatio TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_LICENSE_FILE="docs/license.rst" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=22.3.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=22.3.1 TERMUX_PKG_SRCURL=https://archive.mesa3d.org/mesa-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=644bf936584548c2b88762111ad58b4aa3e4688874200e5a4eb74e53ce301746 +TERMUX_PKG_SHA256=3c9cd611c0859d307aba0659833386abdca4c86162d3c275ba5be62d16cf31eb TERMUX_PKG_DEPENDS="libandroid-shmem, libc++, libdrm, libexpat, libx11, libxext, libxfixes, libxshmfence, libxxf86vm, ncurses, zlib, zstd" TERMUX_PKG_SUGGESTS="mesa-dev" -TERMUX_PKG_BUILD_DEPENDS="libdrm, libllvm-static, libxrandr, llvm, llvm-tools, mlir, xorgproto" +TERMUX_PKG_BUILD_DEPENDS="libllvm-static, libxrandr, llvm, llvm-tools, mlir, xorgproto" TERMUX_PKG_CONFLICTS="libmesa, ndk-sysroot (<= 25b)" TERMUX_PKG_REPLACES="libmesa" diff --git a/packages/mesa/mesa-22.2.0-llvm-15.patch b/packages/mesa/mesa-22.2.0-llvm-15.patch index a03c069e13..7d83c3c918 100644 --- a/packages/mesa/mesa-22.2.0-llvm-15.patch +++ b/packages/mesa/mesa-22.2.0-llvm-15.patch @@ -2,11 +2,11 @@ https://gitlab.freedesktop.org/mesa/mesa/-/issues/6505 --- a/meson.build +++ b/meson.build -@@ -1733,6 +1733,7 @@ +@@ -1749,6 +1749,7 @@ draw_with_llvm = get_option('draw-use-ll if draw_with_llvm llvm_modules += 'native' endif +llvm_modules += 'passes' - if with_amd_vk or with_gallium_radeonsi - _llvm_version = '>= 11.0.0' + if with_intel_clc + _llvm_version = '>= 13.0.0' diff --git a/packages/mesa/osmesa.subpackage.sh b/packages/mesa/osmesa.subpackage.sh new file mode 100644 index 0000000000..e7972169f0 --- /dev/null +++ b/packages/mesa/osmesa.subpackage.sh @@ -0,0 +1,8 @@ +TERMUX_SUBPKG_INCLUDE=" +include/GL/osmesa.h +lib/libOSMesa.so +lib/pkgconfig/osmesa.pc +" +TERMUX_SUBPKG_DESCRIPTION="Mesa Off-screen Rendering Library" +TERMUX_SUBPKG_BREAKS="mesa (<< 22.3.1)" +TERMUX_SUBPKG_REPLACES="mesa (<< 22.3.1)" From 772db8cd959424d590380b3ac33dee73d09dbc7c Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Thu, 22 Dec 2022 06:14:55 +0900 Subject: [PATCH 138/244] fex: Bump to 2212 --- packages/fex/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fex/build.sh b/packages/fex/build.sh index f6ecd5f095..d094d8dfa8 100644 --- a/packages/fex/build.sh +++ b/packages/fex/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://fex-emu.com/ TERMUX_PKG_DESCRIPTION="Fast x86 emulation frontend" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=2211 +TERMUX_PKG_VERSION=2212 TERMUX_PKG_SRCURL=https://github.com/FEX-Emu/FEX.git TERMUX_PKG_GIT_BRANCH=FEX-${TERMUX_PKG_VERSION} TERMUX_PKG_DEPENDS="libandroid-shmem, libc++" From dabd1e073e3d1c6a48b9db6b6407c748a6b99845 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Thu, 22 Dec 2022 23:12:06 +0900 Subject: [PATCH 139/244] glib: Bump to 2.74.4 --- packages/glib/build.sh | 4 ++-- packages/glib/glib-gthreadprivate.h.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 packages/glib/glib-gthreadprivate.h.patch diff --git a/packages/glib/build.sh b/packages/glib/build.sh index 292e104136..3815f02be2 100644 --- a/packages/glib/build.sh +++ b/packages/glib/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Library providing core building blocks for libraries and TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" _MAJOR_VERSION=2.74 -TERMUX_PKG_VERSION=${_MAJOR_VERSION}.3 +TERMUX_PKG_VERSION=${_MAJOR_VERSION}.4 TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/gnome/sources/glib/${_MAJOR_VERSION}/glib-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=e9bc41ecd9690d9bc6a970cc7380119b828e5b6a4b16c393c638b3dc2b87cbcb +TERMUX_PKG_SHA256=0e82da5ea129b4444227c7e4a9e598f7288d1994bf63f129c44b90cfd2432172 TERMUX_PKG_DEPENDS="libffi, libiconv, pcre2, libandroid-support, zlib" TERMUX_PKG_BREAKS="glib-dev" TERMUX_PKG_REPLACES="glib-dev" diff --git a/packages/glib/glib-gthreadprivate.h.patch b/packages/glib/glib-gthreadprivate.h.patch new file mode 100644 index 0000000000..0363243eeb --- /dev/null +++ b/packages/glib/glib-gthreadprivate.h.patch @@ -0,0 +1,13 @@ +--- a/glib/gthreadprivate.h ++++ b/glib/gthreadprivate.h +@@ -45,6 +45,10 @@ + #include + #include + ++#ifndef __LP64__ ++#include ++#endif ++ + #ifndef FUTEX_WAIT_PRIVATE + #define FUTEX_WAIT_PRIVATE FUTEX_WAIT + #define FUTEX_WAKE_PRIVATE FUTEX_WAKE From 06ee25355333ff53a207f18c2a798e8357f08377 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 01:02:19 +0900 Subject: [PATCH 140/244] leptonica: Disable auto-update until at least SOVERSION guard is implemented. %ci:no-build --- packages/leptonica/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/leptonica/build.sh b/packages/leptonica/build.sh index 25fa10d400..f76477726c 100644 --- a/packages/leptonica/build.sh +++ b/packages/leptonica/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_VERSION=1.82.0 TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/DanBloomberg/leptonica/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=40fa9ac1e815b91e0fa73f0737e60c9eec433a95fa123f95f2573dd3127dd669 -TERMUX_PKG_AUTO_UPDATE=true +TERMUX_PKG_AUTO_UPDATE=false TERMUX_PKG_DEPENDS="giflib, libjpeg-turbo, libpng, libtiff, libwebp, openjpeg, zlib" TERMUX_PKG_BREAKS="leptonica-dev" TERMUX_PKG_REPLACES="leptonica-dev" From 6c40fd491419f045274474327bbb836a97ffaeda Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Thu, 22 Dec 2022 23:38:00 +0900 Subject: [PATCH 141/244] gjots2: Bump to 3.2.0 --- x11-packages/gjots2/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/x11-packages/gjots2/build.sh b/x11-packages/gjots2/build.sh index 8838c38ca2..6da675a3e8 100644 --- a/x11-packages/gjots2/build.sh +++ b/x11-packages/gjots2/build.sh @@ -2,11 +2,11 @@ TERMUX_PKG_HOMEPAGE=http://bhepple.freeshell.org/gjots TERMUX_PKG_DESCRIPTION="A hierarchical note jotter" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=3.1.9 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=3.2.0 TERMUX_PKG_SRCURL=https://sourceforge.net/projects/gjots2/files/gjots2/${TERMUX_PKG_VERSION}/gjots2-${TERMUX_PKG_VERSION}.tgz -TERMUX_PKG_SHA256=2bfed1dfbb7c209ff132d736269389397bc3cea7505e2166e78ae33531baa2bf +TERMUX_PKG_SHA256=accb68b9040642ba5c3924754c440efe7a1a07116b83bbc78a61b049b712259f TERMUX_PKG_DEPENDS="gtksourceview4, pygobject, python" +TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { From 05735f98e939a62fb254b234002bf6b4d2a0aeb3 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 00:04:12 +0900 Subject: [PATCH 142/244] broot: Bump to 1.18.0 --- packages/broot/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/broot/build.sh b/packages/broot/build.sh index e03c8ad09c..c0a659d69e 100644 --- a/packages/broot/build.sh +++ b/packages/broot/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/Canop/broot TERMUX_PKG_DESCRIPTION="A better way to navigate directories" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.17.1 +TERMUX_PKG_VERSION=1.18.0 TERMUX_PKG_SRCURL=https://github.com/Canop/broot/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=acde4ddfff0875506c4f91346895c5b554d44a91f46a6918de6086d3884857d7 +TERMUX_PKG_SHA256=b195fa6b47b282a8f4baa3b7eb69fa6fd2f3fde80238bd5fe70c4dd4ae288610 TERMUX_PKG_DEPENDS="zlib" TERMUX_PKG_BUILD_IN_SRC=true From b0062d88aaf78e8d56232002a38799542f9271b0 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 00:21:26 +0900 Subject: [PATCH 143/244] nasm: Bump to 2.16.01 --- packages/nasm/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nasm/build.sh b/packages/nasm/build.sh index 75be00d6b6..ec827af856 100644 --- a/packages/nasm/build.sh +++ b/packages/nasm/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://nasm.us TERMUX_PKG_DESCRIPTION="A cross-platform x86 assembler with an Intel-like syntax" TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=2.15.05 +TERMUX_PKG_VERSION=2.16.01 TERMUX_PKG_SRCURL=https://www.nasm.us/pub/nasm/releasebuilds/${TERMUX_PKG_VERSION}/nasm-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=9182a118244b058651c576baa9d0366ee05983c4d4ae1d9ddd3236a9f2304997 +TERMUX_PKG_SHA256=d833bf0f5716e89dbcd345b7f545f25fe348c6e2ef16dbc293e1027bcd22d881 TERMUX_PKG_BUILD_IN_SRC=true From e2f14107e33cb9bacaeb061a5abf787a5b322ab5 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 00:22:38 +0900 Subject: [PATCH 144/244] recoll: Bump to 1.33.4 --- packages/recoll/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/recoll/build.sh b/packages/recoll/build.sh index 95f738b58c..ebde8bf51b 100644 --- a/packages/recoll/build.sh +++ b/packages/recoll/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.lesbonscomptes.com/recoll/index.html TERMUX_PKG_DESCRIPTION="Full-text search for your desktop" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.33.3 +TERMUX_PKG_VERSION=1.33.4 TERMUX_PKG_SRCURL=https://www.lesbonscomptes.com/recoll/recoll-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=756a27a472088d8ac9d33363be8f34c67b4ffdc9f13333b8613e3d5daa08bb8e +TERMUX_PKG_SHA256=7df0f8f6c1985981160053d1b69c8353f09816f92b1032f6d4376add0b170af7 TERMUX_PKG_DEPENDS="aspell, libc++, libiconv, libxapian, libxml2, libxslt, zlib" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-userdoc --disable-python-chm --disable-x11mon --disable-qtgui" From 9df495d690be86013d22492efae4cb866dd0f424 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 00:23:53 +0900 Subject: [PATCH 145/244] rust-analyzer: Bump to 20221219 --- packages/rust-analyzer/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/rust-analyzer/build.sh b/packages/rust-analyzer/build.sh index 4d2e1e918b..255e8a20fd 100644 --- a/packages/rust-analyzer/build.sh +++ b/packages/rust-analyzer/build.sh @@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="A Rust compiler front-end for IDEs" TERMUX_PKG_LICENSE="MIT, Apache-2.0" TERMUX_PKG_LICENSE_FILE="LICENSE-MIT, LICENSE-APACHE" TERMUX_PKG_MAINTAINER="@termux" -_VERSION=2022-11-14 +_VERSION=2022-12-19 TERMUX_PKG_VERSION=${_VERSION//-/} TERMUX_PKG_SRCURL=https://github.com/rust-analyzer/rust-analyzer/archive/refs/tags/${_VERSION}.tar.gz -TERMUX_PKG_SHA256=4e6e723e6d70391f1557c7a89cb991791f4fd46fde82d76b95482c393a1341c1 +TERMUX_PKG_SHA256=e0d851d62154f5dc6f19d06168d83d4e93f6aa72906b24b4c6b40053d1b7c518 TERMUX_PKG_BUILD_IN_SRC=true termux_step_make() { From 51e5ece5503457fbef84f1161b08538a8aa44508 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 00:24:40 +0900 Subject: [PATCH 146/244] tcsh: Bump to 6.24.07 --- packages/tcsh/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tcsh/build.sh b/packages/tcsh/build.sh index 88f969b958..bb4fe0d986 100644 --- a/packages/tcsh/build.sh +++ b/packages/tcsh/build.sh @@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://www.tcsh.org TERMUX_PKG_DESCRIPTION="TENEX C Shell, an enhanced version of Berkeley csh" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=6.24.06 +TERMUX_PKG_VERSION=6.24.07 TERMUX_PKG_SRCURL=https://github.com/tcsh-org/tcsh/archive/TCSH${TERMUX_PKG_VERSION//./_}.tar.gz -TERMUX_PKG_SHA256=4c87aa8e9ab9f3c534153b4ceabaaecc16f25c6f27bbe71399f75af8178b719d +TERMUX_PKG_SHA256=c853f235508e9b66b2fc99c38d28d6af7e3ed6baa3f8ac9563f6a1012b27c380 TERMUX_PKG_BUILD_DEPENDS="libcrypt, ncurses" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-nls --disable-nls-catalogs" From f58ae0f2770a2064d0563ff5c0e301bb9a3d40df Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 00:25:27 +0900 Subject: [PATCH 147/244] wasmtime: Bump to 4.0.0 --- packages/wasmtime/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/wasmtime/build.sh b/packages/wasmtime/build.sh index f1cf931745..a350eeb5c6 100644 --- a/packages/wasmtime/build.sh +++ b/packages/wasmtime/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A standalone runtime for WebAssembly" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_LICENSE_FILE="LICENSE" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=3.0.1 +TERMUX_PKG_VERSION=4.0.0 TERMUX_PKG_SRCURL=https://github.com/bytecodealliance/wasmtime.git TERMUX_PKG_BUILD_IN_SRC=true From 2484a596d1b383fb8b182433d797473eeab3cc5e Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 00:27:09 +0900 Subject: [PATCH 148/244] xfce4-screenshooter: Bump to 1.10.1 --- x11-packages/xfce4-screenshooter/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/x11-packages/xfce4-screenshooter/build.sh b/x11-packages/xfce4-screenshooter/build.sh index 803044ef66..505b8745ae 100644 --- a/x11-packages/xfce4-screenshooter/build.sh +++ b/x11-packages/xfce4-screenshooter/build.sh @@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="The Xfce4-screenshooter is an application that can be us TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Yisus7u7 " _MAJOR_VERSION=1.10 -TERMUX_PKG_VERSION=${_MAJOR_VERSION}.0 +TERMUX_PKG_VERSION=${_MAJOR_VERSION}.1 TERMUX_PKG_SRCURL=https://archive.xfce.org/src/apps/xfce4-screenshooter/${_MAJOR_VERSION}/xfce4-screenshooter-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=a64884a6936f0fe54074bbfd1d73ed0759efbb5594a456073d16915155347b53 -TERMUX_PKG_DEPENDS="atk, exo, gdk-pixbuf, glib, gtk3, harfbuzz, libcairo, libice, libsm, libsoup, libx11, libxext, libxfce4ui, libxfce4util, libxfixes, libxml2, pango, xfce4-panel, xfconf" +TERMUX_PKG_SHA256=8ab7161e2d599e1f16891b9901d5849c2b9923b0a218b66d87179f224bc437d6 +TERMUX_PKG_DEPENDS="atk, exo, gdk-pixbuf, glib, gtk3, harfbuzz, libcairo, libice, libsm, libsoup3, libx11, libxext, libxfce4ui, libxfce4util, libxfixes, libxml2, pango, xfce4-panel, xfconf" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" ac_cv_prog_HELP2MAN= From 0cc3a9f2e463da463d88904889aa93445fefde55 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 00:20:17 +0900 Subject: [PATCH 149/244] magic-wormhole-rs: Bump to 0.6.0 --- packages/magic-wormhole-rs/build.sh | 6 +- .../magic-wormhole-rs/remove-clipboard.patch | 57 +++++++++---------- 2 files changed, 30 insertions(+), 33 deletions(-) diff --git a/packages/magic-wormhole-rs/build.sh b/packages/magic-wormhole-rs/build.sh index 2924522f1c..265d2b3f7b 100644 --- a/packages/magic-wormhole-rs/build.sh +++ b/packages/magic-wormhole-rs/build.sh @@ -3,11 +3,11 @@ TERMUX_PKG_DESCRIPTION=" Rust implementation of Magic Wormhole, with new feature TERMUX_PKG_LICENSE="EUPL-1.2" TERMUX_PKG_LICENSE_FILE="LICENSE" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.5.0" +TERMUX_PKG_VERSION=0.6.0 TERMUX_PKG_SRCURL="https://github.com/magic-wormhole/magic-wormhole.rs/archive/refs/tags/$TERMUX_PKG_VERSION.tar.gz" -TERMUX_PKG_SHA256=fdd1d0bd00948f9bdce28b7d21e84bebd25d08502efe30408ded91a150afa5ce +TERMUX_PKG_SHA256=cfa72215b1b0f519b9986523d0c41d6b3e562c41668f28ee80c23ce0aa3fe685 TERMUX_PKG_BUILD_IN_SRC=true -# disable auto-update since 'remove-clipboard' patch was maually crafted for v0.5.0 +# disable auto-update since 'remove-clipboard' patch was maually crafted for v0.6.0 TERMUX_PKG_AUTO_UPDATE=false termux_step_make() { diff --git a/packages/magic-wormhole-rs/remove-clipboard.patch b/packages/magic-wormhole-rs/remove-clipboard.patch index e4ddaee64c..ebe80106b1 100644 --- a/packages/magic-wormhole-rs/remove-clipboard.patch +++ b/packages/magic-wormhole-rs/remove-clipboard.patch @@ -1,25 +1,22 @@ -diff --git a/cli/Cargo.toml b/cli/Cargo.toml -index a613541..d1b903f 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml -@@ -22,4 +22,3 @@ dialoguer = "0.10.0" +@@ -23,5 +23,4 @@ dialoguer = "0.10.0" color-eyre = "0.6.0" number_prefix = "0.4.0" ctrlc = "3.2.1" --cli-clipboard = { git = "https://github.com/ActuallyAllie/cli-clipboard" } -diff --git a/cli/src/main.rs b/cli/src/main.rs -index 86d3150..9cb822e 100644 +-cli-clipboard = "0.4.0" + qr2term = "0.3.0" --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -8,7 +8,6 @@ use std::{ use async_std::{fs::OpenOptions, sync::Arc}; - use clap::{crate_description, crate_name, crate_version, Arg, Args, Command, Parser, Subcommand}; + use clap::{Args, CommandFactory, Parser, Subcommand}; -use cli_clipboard::{ClipboardContext, ClipboardProvider}; use color_eyre::{eyre, eyre::Context}; use console::{style, Term}; use futures::{future::Either, Future, FutureExt}; -@@ -276,12 +275,6 @@ async fn main() -> eyre::Result<()> { +@@ -283,12 +282,6 @@ async fn main() -> eyre::Result<()> { .try_init()?; } @@ -32,55 +29,55 @@ index 86d3150..9cb822e 100644 let concat_file_name = |file_path: &Path, file_name: Option<_>| { // TODO this has gotten out of hand (it ugly) // The correct solution would be to make `file_name` an Option everywhere and -@@ -330,7 +323,6 @@ async fn main() -> eyre::Result<()> { +@@ -337,7 +330,6 @@ async fn main() -> eyre::Result<()> { true, transfer::APP_CONFIG, Some(&sender_print_code), - clipboard.as_mut(), - ), + )), ctrl_c(), ) -@@ -368,7 +360,6 @@ async fn main() -> eyre::Result<()> { +@@ -375,7 +367,6 @@ async fn main() -> eyre::Result<()> { true, transfer::APP_CONFIG, Some(&sender_print_code), - clipboard.as_mut(), - ); - futures::pin_mut!(connect_fut); + )); match futures::future::select(connect_fut, ctrl_c()).await { -@@ -415,7 +406,6 @@ async fn main() -> eyre::Result<()> { + Either::Left((result, _)) => result?, +@@ -421,7 +412,6 @@ async fn main() -> eyre::Result<()> { false, transfer::APP_CONFIG, None, - clipboard.as_mut(), - ); - futures::pin_mut!(connect_fut); + )); match futures::future::select(connect_fut, ctrl_c()).await { -@@ -491,7 +481,6 @@ async fn main() -> eyre::Result<()> { + Either::Left((result, _)) => result?, +@@ -496,7 +486,6 @@ async fn main() -> eyre::Result<()> { true, app_config, Some(&server_print_code), - clipboard.as_mut(), - ); - futures::pin_mut!(connect_fut); - let (wormhole, _code, relay_server) = -@@ -529,7 +518,6 @@ async fn main() -> eyre::Result<()> { + )); + let (wormhole, _code, relay_hints) = + match futures::future::select(connect_fut, ctrl_c()).await { +@@ -532,7 +521,6 @@ async fn main() -> eyre::Result<()> { false, app_config, None, - clipboard.as_mut(), ) .await?; - let relay_server = vec![transit::RelayHint::from_urls(None, [relay_server])]; -@@ -587,7 +575,6 @@ async fn parse_and_connect( - is_send: bool, - mut app_config: magic_wormhole::AppConfig, - print_code: Option<&dyn Fn(&mut Term, &magic_wormhole::Code) -> eyre::Result<()>>, + +@@ -618,7 +606,6 @@ async fn parse_and_connect( + print_code: Option< + &dyn Fn(&mut Term, &magic_wormhole::Code, &Option) -> eyre::Result<()>, + >, - clipboard: Option<&mut ClipboardContext>, - ) -> eyre::Result<(Wormhole, magic_wormhole::Code, url::Url)> { - // TODO handle multiple relay servers correctly - let relay_server: url::Url = common_args -@@ -626,15 +613,8 @@ async fn parse_and_connect( + ) -> eyre::Result<(Wormhole, magic_wormhole::Code, Vec)> { + // TODO handle relay servers with multiple endpoints better + let mut relay_hints: Vec = common_args +@@ -666,15 +653,8 @@ async fn parse_and_connect( let (server_welcome, connector) = magic_wormhole::Wormhole::connect_without_code(app_config, numwords).await?; print_welcome(term, &server_welcome)?; From a1971e5350466a66823c25fb82273eb0fa983a4f Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 02:33:49 +0900 Subject: [PATCH 150/244] xfce4-settings: Bump to 4.18.1 --- x11-packages/xfce4-settings/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-packages/xfce4-settings/build.sh b/x11-packages/xfce4-settings/build.sh index 14b8413226..e502634958 100644 --- a/x11-packages/xfce4-settings/build.sh +++ b/x11-packages/xfce4-settings/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Settings manager for XFCE environment" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" _MAJOR_VERSION=4.18 -TERMUX_PKG_VERSION=${_MAJOR_VERSION}.0 +TERMUX_PKG_VERSION=${_MAJOR_VERSION}.1 TERMUX_PKG_SRCURL=https://archive.xfce.org/src/xfce/xfce4-settings/${_MAJOR_VERSION}/xfce4-settings-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=ed3f75837cb33cd694610fc87cd569c4782b7ac4e099143a3dbe8fff1f1c6a9d +TERMUX_PKG_SHA256=d5750e68fad2dcb821fd37eb7919cacf78237df7d9f2c928efc3174037651d90 TERMUX_PKG_DEPENDS="atk, exo, fontconfig, garcon, gdk-pixbuf, glib, gtk3, libcairo, libnotify, libx11, libxcursor, libxfce4ui, libxfce4util, libxi, libxklavier, libxrandr, pango, xfconf" TERMUX_PKG_RECOMMENDS="gsettings-desktop-schemas, libcanberra, lxde-icon-theme" TERMUX_PKG_RM_AFTER_INSTALL=" From 10eb6f32db9991fca102b0b24a545e362456b3cd Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 02:35:44 +0900 Subject: [PATCH 151/244] ethtool: Bump to 6.1 --- root-packages/ethtool/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root-packages/ethtool/build.sh b/root-packages/ethtool/build.sh index 04177c73fc..65351f26bf 100644 --- a/root-packages/ethtool/build.sh +++ b/root-packages/ethtool/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://mirrors.edge.kernel.org/pub/software/network/ethtool TERMUX_PKG_DESCRIPTION="standard Linux utility for controlling network drivers and hardware, particularly for wired Ethernet devices" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=5.19 +TERMUX_PKG_VERSION=6.1 TERMUX_PKG_SRCURL=https://mirrors.edge.kernel.org/pub/software/network/ethtool/ethtool-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=3b752a3329827907ac3812f2831dfecf51c8c41c55d2d69cfb9c53ca06449fc6 +TERMUX_PKG_SHA256=c41fc881ffa5a40432d2dd829eb44c64a49dee482e716baacf9262c64daa8f90 TERMUX_PKG_DEPENDS="libmnl" From 8eaef654620b7d4d4972a2adcd5698bd49d41a00 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 02:36:56 +0900 Subject: [PATCH 152/244] dnsutils: Bump to 9.6.36 --- packages/dnsutils/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/dnsutils/build.sh b/packages/dnsutils/build.sh index 227d63c8a3..bed7b8ee1b 100644 --- a/packages/dnsutils/build.sh +++ b/packages/dnsutils/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.isc.org/downloads/bind/ TERMUX_PKG_DESCRIPTION="Clients provided with BIND" TERMUX_PKG_LICENSE="MPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=9.16.35 +TERMUX_PKG_VERSION=9.16.36 TERMUX_PKG_SRCURL="https://ftp.isc.org/isc/bind9/${TERMUX_PKG_VERSION}/bind-${TERMUX_PKG_VERSION}.tar.xz" -TERMUX_PKG_SHA256=3e159617f182465c300a917eef880492c37183341b1091cc6654710c1d8d7b3e +TERMUX_PKG_SHA256=508c94e8c9884f6075fa820a51efae04a1758dbdd157b01695ea6cd07049c221 TERMUX_PKG_DEPENDS="openssl, readline, resolv-conf, zlib, libuv" TERMUX_PKG_BREAKS="dnsutils-dev" TERMUX_PKG_REPLACES="dnsutils-dev" From 76142df58e1d271f743bcd4f02c25138a6da6415 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Thu, 22 Dec 2022 18:13:26 +0000 Subject: [PATCH 153/244] bump(main/pocketbase): 0.10.3 This commit has been automatically submitted by Github Actions. --- packages/pocketbase/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/pocketbase/build.sh b/packages/pocketbase/build.sh index cd92b64116..b2e60ac9ac 100644 --- a/packages/pocketbase/build.sh +++ b/packages/pocketbase/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/pocketbase/pocketbase TERMUX_PKG_DESCRIPTION="An open source Go backend" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.10.2" +TERMUX_PKG_VERSION="0.10.3" TERMUX_PKG_SRCURL="https://github.com/pocketbase/pocketbase/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz" -TERMUX_PKG_SHA256=80998a333b394f1c6dbf087f04043602ecdbfbd18bcb6349cf641944408a02e0 +TERMUX_PKG_SHA256=03ad29f414035a03f92b325ab1b52d8d331cf4df61a3ad752eacb6ef89fdb756 TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_AUTO_UPDATE=true From 47654a32525eda756ca0fc8e669187db9f23b924 Mon Sep 17 00:00:00 2001 From: Lucy Phipps Date: Thu, 22 Dec 2022 18:16:06 +0000 Subject: [PATCH 154/244] remove myself from codeowners i think getting this many emails actually makes me less productive --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index d847e210f8..5138631ffe 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,5 +1,5 @@ # Default assignment: frequent contributors from @termux. -* @buttaface @Grimler91 @landfillbaby @2096779623 +* @buttaface @Grimler91 @2096779623 # Build system. /build-all.sh @Grimler91 From 6eb5ea35be6e49a3a8e8b1dbe9a6f7306ce6feb2 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 02:34:46 +0900 Subject: [PATCH 155/244] thunar: Bump to 4.18.1 --- x11-packages/thunar/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/x11-packages/thunar/build.sh b/x11-packages/thunar/build.sh index a8db2aa0d4..1c41dc96d1 100644 --- a/x11-packages/thunar/build.sh +++ b/x11-packages/thunar/build.sh @@ -3,12 +3,12 @@ TERMUX_PKG_DESCRIPTION="Modern file manager for XFCE environment" TERMUX_PKG_LICENSE="GPL-2.0, LGPL-2.0" TERMUX_PKG_MAINTAINER="@termux" _MAJOR_VERSION=4.18 -TERMUX_PKG_VERSION=${_MAJOR_VERSION}.0 +TERMUX_PKG_VERSION=${_MAJOR_VERSION}.1 TERMUX_PKG_SRCURL=https://archive.xfce.org/src/xfce/thunar/${_MAJOR_VERSION}/thunar-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=d1f4b080c97b9e390eff199aaaac7562fb20f031686f8d5ee5207e953bfc2feb +TERMUX_PKG_SHA256=2b0e91802ca4d5f4e25cc8a76a6c362f47d02d00b0184344945b33d0c43a3166 TERMUX_PKG_DEPENDS="atk, desktop-file-utils, exo, gdk-pixbuf, glib, gtk3, harfbuzz, libcairo, libexif, libice, libnotify, libsm, libx11, libxfce4ui, libxfce4util, pango, pcre2, shared-mime-info, xfce4-panel, xfconf" TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner" -TERMUX_PKG_RECOMMENDS="hicolor-icon-theme, thunar-archive-plugin, tumbler" +TERMUX_PKG_RECOMMENDS="gvfs, hicolor-icon-theme, thunar-archive-plugin, tumbler" TERMUX_PKG_DISABLE_GIR=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --enable-gtk-doc-html=no From af80b39995e48d730a5e6de472d7cc5c57ded6c8 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 00:16:04 +0900 Subject: [PATCH 156/244] leptonica: Bump to 1.83.0 --- packages/leptonica/build.sh | 9 +- .../leptonica/silence-tmpfile-warnings.patch | 199 ------------------ packages/leptonica/src-recogbasic.c.patch | 11 - 3 files changed, 6 insertions(+), 213 deletions(-) delete mode 100644 packages/leptonica/silence-tmpfile-warnings.patch delete mode 100644 packages/leptonica/src-recogbasic.c.patch diff --git a/packages/leptonica/build.sh b/packages/leptonica/build.sh index f76477726c..f85bc25702 100644 --- a/packages/leptonica/build.sh +++ b/packages/leptonica/build.sh @@ -3,15 +3,18 @@ TERMUX_PKG_DESCRIPTION="Library for image processing and image analysis" TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_LICENSE_FILE="leptonica-license.txt" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.82.0 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_VERSION=1.83.0 TERMUX_PKG_SRCURL=https://github.com/DanBloomberg/leptonica/archive/${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=40fa9ac1e815b91e0fa73f0737e60c9eec433a95fa123f95f2573dd3127dd669 +TERMUX_PKG_SHA256=14cf531c2219a1414e8e3c51a3caa5cf021a52e782c4a6561bf64d0ef2119282 TERMUX_PKG_AUTO_UPDATE=false TERMUX_PKG_DEPENDS="giflib, libjpeg-turbo, libpng, libtiff, libwebp, openjpeg, zlib" TERMUX_PKG_BREAKS="leptonica-dev" TERMUX_PKG_REPLACES="leptonica-dev" termux_step_pre_configure() { + # Silence tmpfile warnings: + find src -name '*.c' | xargs -n 1 \ + sed -i 's/L_INFO("work-around: writing to a temp file\\n", __func__)/((void)0)/' + ./autogen.sh } diff --git a/packages/leptonica/silence-tmpfile-warnings.patch b/packages/leptonica/silence-tmpfile-warnings.patch deleted file mode 100644 index a84e09e01e..0000000000 --- a/packages/leptonica/silence-tmpfile-warnings.patch +++ /dev/null @@ -1,199 +0,0 @@ -diff -u -r ../leptonica-1.74.1/src/boxbasic.c ./src/boxbasic.c ---- ../leptonica-1.74.1/src/boxbasic.c 2016-12-02 20:42:49.000000000 +0100 -+++ ./src/boxbasic.c 2017-01-29 22:11:16.276072146 +0100 -@@ -2066,7 +2066,6 @@ - return ERROR_INT("stream not opened", procName, 1); - ret = boxaaWriteStream(fp, baa); - #else -- L_INFO("work-around: writing to a temp file\n", procName); - #ifdef _WIN32 - if ((fp = fopenWriteWinTempfile()) == NULL) - return ERROR_INT("tmpfile stream not opened", procName, 1); -@@ -2287,7 +2286,6 @@ - return ERROR_INT("stream not opened", procName, 1); - ret = boxaWriteStream(fp, boxa); - #else -- L_INFO("work-around: writing to a temp file\n", procName); - #ifdef _WIN32 - if ((fp = fopenWriteWinTempfile()) == NULL) - return ERROR_INT("tmpfile stream not opened", procName, 1); -diff -u -r ../leptonica-1.74.1/src/colormap.c ./src/colormap.c ---- ../leptonica-1.74.1/src/colormap.c 2016-12-02 20:42:53.000000000 +0100 -+++ ./src/colormap.c 2017-01-29 22:11:16.316071650 +0100 -@@ -1715,7 +1715,6 @@ - return ERROR_INT("stream not opened", procName, 1); - ret = pixcmapWriteStream(fp, cmap); - #else -- L_INFO("work-around: writing to a temp file\n", procName); - #ifdef _WIN32 - if ((fp = fopenWriteWinTempfile()) == NULL) - return ERROR_INT("tmpfile stream not opened", procName, 1); -diff -u -r ../leptonica-1.74.1/src/dewarp1.c ./src/dewarp1.c ---- ../leptonica-1.74.1/src/dewarp1.c 2016-12-02 20:42:57.000000000 +0100 -+++ ./src/dewarp1.c 2017-01-29 22:11:16.352071204 +0100 -@@ -1401,7 +1401,6 @@ - return ERROR_INT("stream not opened", procName, 1); - ret = dewarpWriteStream(fp, dew); - #else -- L_INFO("work-around: writing to a temp file\n", procName); - #ifdef _WIN32 - if ((fp = fopenWriteWinTempfile()) == NULL) - return ERROR_INT("tmpfile stream not opened", procName, 1); -@@ -1673,7 +1672,6 @@ - return ERROR_INT("stream not opened", procName, 1); - ret = dewarpaWriteStream(fp, dewa); - #else -- L_INFO("work-around: writing to a temp file\n", procName); - #ifdef _WIN32 - if ((fp = fopenWriteWinTempfile()) == NULL) - return ERROR_INT("tmpfile stream not opened", procName, 1); -diff -u -r ../leptonica-1.74.1/src/fpix1.c ./src/fpix1.c ---- ../leptonica-1.74.1/src/fpix1.c 2016-12-02 20:43:01.000000000 +0100 -+++ ./src/fpix1.c 2017-01-29 22:11:16.400070608 +0100 -@@ -1904,7 +1904,6 @@ - return ERROR_INT("stream not opened", procName, 1); - ret = fpixWriteStream(fp, fpix); - #else -- L_INFO("work-around: writing to a temp file\n", procName); - #ifdef _WIN32 - if ((fp = fopenWriteWinTempfile()) == NULL) - return ERROR_INT("tmpfile stream not opened", procName, 1); -@@ -2203,7 +2202,6 @@ - return ERROR_INT("stream not opened", procName, 1); - ret = dpixWriteStream(fp, dpix); - #else -- L_INFO("work-around: writing to a temp file\n", procName); - #ifdef _WIN32 - if ((fp = fopenWriteWinTempfile()) == NULL) - return ERROR_INT("tmpfile stream not opened", procName, 1); -diff -u -r ../leptonica-1.74.1/src/jp2kio.c ./src/jp2kio.c ---- ../leptonica-1.74.1/src/jp2kio.c 2016-12-02 20:43:11.000000000 +0100 -+++ ./src/jp2kio.c 2017-01-29 22:11:16.424070311 +0100 -@@ -847,7 +847,6 @@ - return ERROR_INT("stream not opened", procName, 1); - ret = pixWriteStreamJp2k(fp, pix, quality, nlevels, hint, debug); - #else -- L_INFO("work-around: writing to a temp file\n", procName); - #ifdef _WIN32 - if ((fp = fopenWriteWinTempfile()) == NULL) - return ERROR_INT("tmpfile stream not opened", procName, 1); -diff -u -r ../leptonica-1.74.1/src/jpegio.c ./src/jpegio.c ---- ../leptonica-1.74.1/src/jpegio.c 2016-12-02 20:43:18.000000000 +0100 -+++ ./src/jpegio.c 2017-01-29 22:11:16.428070261 +0100 -@@ -1091,7 +1091,6 @@ - return ERROR_INT("stream not opened", procName, 1); - ret = pixWriteStreamJpeg(fp, pix, quality, progressive); - #else -- L_INFO("work-around: writing to a temp file\n", procName); - #ifdef _WIN32 - if ((fp = fopenWriteWinTempfile()) == NULL) - return ERROR_INT("tmpfile stream not opened", procName, 1); -diff -u -r ../leptonica-1.74.1/src/numabasic.c ./src/numabasic.c ---- ../leptonica-1.74.1/src/numabasic.c 2016-12-02 20:43:25.000000000 +0100 -+++ ./src/numabasic.c 2017-01-29 22:11:16.444070062 +0100 -@@ -1276,7 +1276,6 @@ - return ERROR_INT("stream not opened", procName, 1); - ret = numaWriteStream(fp, na); - #else -- L_INFO("work-around: writing to a temp file\n", procName); - #ifdef _WIN32 - if ((fp = fopenWriteWinTempfile()) == NULL) - return ERROR_INT("tmpfile stream not opened", procName, 1); -@@ -1962,7 +1961,6 @@ - return ERROR_INT("stream not opened", procName, 1); - ret = numaaWriteStream(fp, naa); - #else -- L_INFO("work-around: writing to a temp file\n", procName); - #ifdef _WIN32 - if ((fp = fopenWriteWinTempfile()) == NULL) - return ERROR_INT("tmpfile stream not opened", procName, 1); -diff -u -r ../leptonica-1.74.1/src/pixabasic.c ./src/pixabasic.c ---- ../leptonica-1.74.1/src/pixabasic.c 2016-12-02 20:43:29.000000000 +0100 -+++ ./src/pixabasic.c 2017-01-29 22:11:16.488069517 +0100 -@@ -2626,7 +2626,6 @@ - return ERROR_INT("stream not opened", procName, 1); - ret = pixaWriteStream(fp, pixa); - #else -- L_INFO("work-around: writing to a temp file\n", procName); - #ifdef _WIN32 - if ((fp = fopenWriteWinTempfile()) == NULL) - return ERROR_INT("tmpfile stream not opened", procName, 1); -@@ -2998,7 +2997,6 @@ - return ERROR_INT("stream not opened", procName, 1); - ret = pixaaWriteStream(fp, paa); - #else -- L_INFO("work-around: writing to a temp file\n", procName); - #ifdef _WIN32 - if ((fp = fopenWriteWinTempfile()) == NULL) - return ERROR_INT("tmpfile stream not opened", procName, 1); -diff -u -r ../leptonica-1.74.1/src/pixcomp.c ./src/pixcomp.c ---- ../leptonica-1.74.1/src/pixcomp.c 2016-12-02 20:43:33.000000000 +0100 -+++ ./src/pixcomp.c 2017-01-29 22:11:16.500069368 +0100 -@@ -1841,7 +1841,6 @@ - return ERROR_INT("stream not opened", procName, 1); - ret = pixacompWriteStream(fp, pixac); - #else -- L_INFO("work-around: writing to a temp file\n", procName); - #ifdef _WIN32 - if ((fp = fopenWriteWinTempfile()) == NULL) - return ERROR_INT("tmpfile stream not opened", procName, 1); -diff -u -r ../leptonica-1.74.1/src/pnmio.c ./src/pnmio.c ---- ../leptonica-1.74.1/src/pnmio.c 2016-12-27 19:30:34.000000000 +0100 -+++ ./src/pnmio.c 2017-01-29 22:11:16.512069219 +0100 -@@ -1179,7 +1179,6 @@ - return ERROR_INT("stream not opened", procName, 1); - ret = pixWriteStreamPnm(fp, pix); - #else -- L_INFO("work-around: writing to a temp file\n", procName); - #ifdef _WIN32 - if ((fp = fopenWriteWinTempfile()) == NULL) - return ERROR_INT("tmpfile stream not opened", procName, 1); -@@ -1234,7 +1233,6 @@ - return ERROR_INT("stream not opened", procName, 1); - ret = pixWriteStreamPam(fp, pix); - #else -- L_INFO("work-around: writing to a temp file\n", procName); - #ifdef _WIN32 - if ((fp = fopenWriteWinTempfile()) == NULL) - return ERROR_INT("tmpfile stream not opened", procName, 1); -diff -u -r ../leptonica-1.74.1/src/ptabasic.c ./src/ptabasic.c ---- ../leptonica-1.74.1/src/ptabasic.c 2016-12-02 20:43:49.000000000 +0100 -+++ ./src/ptabasic.c 2017-01-29 22:11:16.520069120 +0100 -@@ -871,7 +871,6 @@ - return ERROR_INT("stream not opened", procName, 1); - ret = ptaWriteStream(fp, pta, type); - #else -- L_INFO("work-around: writing to a temp file\n", procName); - #ifdef _WIN32 - if ((fp = fopenWriteWinTempfile()) == NULL) - return ERROR_INT("tmpfile stream not opened", procName, 1); -@@ -1463,7 +1462,6 @@ - return ERROR_INT("stream not opened", procName, 1); - ret = ptaaWriteStream(fp, ptaa, type); - #else -- L_INFO("work-around: writing to a temp file\n", procName); - #ifdef _WIN32 - if ((fp = fopenWriteWinTempfile()) == NULL) - return ERROR_INT("tmpfile stream not opened", procName, 1); -diff -u -r ../leptonica-1.74.1/src/sarray1.c ./src/sarray1.c ---- ../leptonica-1.74.1/src/sarray1.c 2016-12-21 21:11:34.000000000 +0100 -+++ ./src/sarray1.c 2017-01-29 22:11:16.552068723 +0100 -@@ -1567,7 +1567,6 @@ - return ERROR_INT("stream not opened", procName, 1); - ret = sarrayWriteStream(fp, sa); - #else -- L_INFO("work-around: writing to a temp file\n", procName); - #ifdef _WIN32 - if ((fp = fopenWriteWinTempfile()) == NULL) - return ERROR_INT("tmpfile stream not opened", procName, 1); -diff -u -r ../leptonica-1.74.1/src/utils2.c ./src/utils2.c ---- ../leptonica-1.74.1/src/utils2.c 2016-12-21 21:11:53.000000000 +0100 -+++ ./src/utils2.c 2017-01-29 22:11:16.584068326 +0100 -@@ -1635,7 +1635,6 @@ - if ((fp = fmemopen((void *)data, size, "rb")) == NULL) - return (FILE *)ERROR_PTR("stream not opened", procName, NULL); - #else /* write to tmp file */ -- L_INFO("work-around: writing to a temp file\n", procName); - #ifdef _WIN32 - if ((fp = fopenWriteWinTempfile()) == NULL) - return (FILE *)ERROR_PTR("tmpfile stream not opened", procName, NULL); diff --git a/packages/leptonica/src-recogbasic.c.patch b/packages/leptonica/src-recogbasic.c.patch deleted file mode 100644 index 55f5efec12..0000000000 --- a/packages/leptonica/src-recogbasic.c.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -u -r ../leptonica-1.74.2/src/recogbasic.c ./src/recogbasic.c ---- ../leptonica-1.74.2/src/recogbasic.c 2017-05-20 03:30:27.000000000 +0200 -+++ ./src/recogbasic.c 2017-06-07 01:17:15.994340419 +0200 -@@ -1065,7 +1065,6 @@ - return ERROR_INT("stream not opened", procName, 1); - ret = recogWriteStream(fp, recog); - #else -- L_INFO("work-around: writing to a temp file\n", procName); - #ifdef _WIN32 - if ((fp = fopenWriteWinTempfile()) == NULL) - return ERROR_INT("tmpfile stream not opened", procName, 1); From 48c04ad503fcb24dc9501f686c796e6e26e04a6a Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 00:33:42 +0900 Subject: [PATCH 157/244] leptonica: Revbump revdeps to rebuild due to SOVERSION bump and SONAME change. --- packages/jbig2enc/build.sh | 2 +- packages/jbig2enc/configure.ac.patch | 9 ++++ ...jbig2enc-2019.09.08-leptonica-1.83.0.patch | 42 +++++++++++++++++++ packages/k2pdfopt/build.sh | 2 +- .../k2pdfopt-2.53-leptonica-1.83.0.patch | 20 +++++++++ packages/mupdf/build.sh | 1 + packages/tesseract/build.sh | 2 +- 7 files changed, 75 insertions(+), 3 deletions(-) create mode 100644 packages/jbig2enc/jbig2enc-2019.09.08-leptonica-1.83.0.patch create mode 100644 packages/k2pdfopt/k2pdfopt-2.53-leptonica-1.83.0.patch diff --git a/packages/jbig2enc/build.sh b/packages/jbig2enc/build.sh index 55b4c3c72b..bb30cdea83 100644 --- a/packages/jbig2enc/build.sh +++ b/packages/jbig2enc/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" _COMMIT=ea6a40a2cbf05efb00f3418f2d0ad71232565beb TERMUX_PKG_VERSION=2019.09.08 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://github.com/agl/jbig2enc.git TERMUX_PKG_GIT_BRANCH=master TERMUX_PKG_DEPENDS="giflib, leptonica, libc++, libjpeg-turbo, libpng, libtiff, libwebp, python, zlib" diff --git a/packages/jbig2enc/configure.ac.patch b/packages/jbig2enc/configure.ac.patch index 511a650631..0f3908d931 100644 --- a/packages/jbig2enc/configure.ac.patch +++ b/packages/jbig2enc/configure.ac.patch @@ -9,3 +9,12 @@ # this should fix automake 1.12 build and compatible with automake 1.11 m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) +@@ -73,7 +73,7 @@ + fi], + [libtool_patch_use_rpath=$enable_rpath]) + +-AC_CHECK_LIB([lept], [findFileFormatStream], [], [ ++AC_CHECK_LIB([leptonica], [findFileFormatStream], [], [ + echo "Error! Leptonica not detected." + exit -1 + ]) diff --git a/packages/jbig2enc/jbig2enc-2019.09.08-leptonica-1.83.0.patch b/packages/jbig2enc/jbig2enc-2019.09.08-leptonica-1.83.0.patch new file mode 100644 index 0000000000..f80d41ccdd --- /dev/null +++ b/packages/jbig2enc/jbig2enc-2019.09.08-leptonica-1.83.0.patch @@ -0,0 +1,42 @@ +--- a/src/jbig2.cc ++++ b/src/jbig2.cc +@@ -29,6 +29,8 @@ + #endif + + #include ++#include ++#include + + #include "jbig2enc.h" + +--- a/src/jbig2enc.cc ++++ b/src/jbig2enc.cc +@@ -24,6 +24,8 @@ + #include + + #include ++#include ++#include + + #include + #if defined(sun) +@@ -206,7 +208,7 @@ + numaSetValue(ctx->classer->naclass, i, new_representant); + } + } +- pixChangeRefcount(ctx->classer->pixat->pix[new_representant],pixGetRefcount(ctx->classer->pixat->pix[second_template])); ++ ctx->classer->pixat->pix[new_representant]->refcount += ctx->classer->pixat->pix[second_template]->refcount; + } + return 0; + } +--- a/src/jbig2sym.cc ++++ b/src/jbig2sym.cc +@@ -29,6 +29,8 @@ + #include + + #include ++#include ++#include + + #include + diff --git a/packages/k2pdfopt/build.sh b/packages/k2pdfopt/build.sh index c53a66cba0..acfc64401a 100644 --- a/packages/k2pdfopt/build.sh +++ b/packages/k2pdfopt/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A tool that optimizes PDF files for viewing on mobile re TERMUX_PKG_LICENSE="AGPL-V3" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2.53 -TERMUX_PKG_REVISION=6 +TERMUX_PKG_REVISION=7 TERMUX_PKG_SRCURL=https://www.willus.com/k2pdfopt/src/k2pdfopt_v${TERMUX_PKG_VERSION}_src.zip TERMUX_PKG_SHA256=58c1b0647be5237570c110b0bb77eb78fab384282a2648edb59eac673070959b TERMUX_PKG_DEPENDS="djvulibre, gsl, leptonica, libjasper, libjpeg-turbo, libpng, mupdf, zlib" diff --git a/packages/k2pdfopt/k2pdfopt-2.53-leptonica-1.83.0.patch b/packages/k2pdfopt/k2pdfopt-2.53-leptonica-1.83.0.patch new file mode 100644 index 0000000000..232c197800 --- /dev/null +++ b/packages/k2pdfopt/k2pdfopt-2.53-leptonica-1.83.0.patch @@ -0,0 +1,20 @@ +--- a/willuslib/ocrtess.c ++++ b/willuslib/ocrtess.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include "willus.h" + + #ifdef HAVE_TESSERACT_LIB +--- a/willuslib/wleptonica.c ++++ b/willuslib/wleptonica.c +@@ -24,6 +24,7 @@ + + #ifdef HAVE_LEPTONICA_LIB + #include ++#include + + static void wlept_pix_from_bmp(PIX **pixptr,WILLUSBITMAP *bmp); + static void wlept_bmp_from_pix(WILLUSBITMAP *bmp,PIX *pix); diff --git a/packages/mupdf/build.sh b/packages/mupdf/build.sh index b382445c0f..ed1af1dfc1 100644 --- a/packages/mupdf/build.sh +++ b/packages/mupdf/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Lightweight PDF and XPS viewer (library)" TERMUX_PKG_LICENSE="AGPL-V3" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.21.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://mupdf.com/downloads/archive/mupdf-${TERMUX_PKG_VERSION}-source.tar.gz TERMUX_PKG_SHA256=b24ddbe12506cc82de08d5cd494614ba08346f8175db1d98bcf938ff94925a54 TERMUX_PKG_DEPENDS="freetype, gumbo-parser, harfbuzz, jbig2dec, leptonica, libc++, libjpeg-turbo, openjpeg, tesseract, zlib" diff --git a/packages/tesseract/build.sh b/packages/tesseract/build.sh index 37aced7493..26c94f14ed 100644 --- a/packages/tesseract/build.sh +++ b/packages/tesseract/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Tesseract is probably the most accurate open source OCR TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=5.2.0 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://github.com/tesseract-ocr/tesseract/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=eba4deb2f92a3f89a6623812074af8c53b772079525b3c263aa70bbf7b748b3c TERMUX_PKG_AUTO_UPDATE=true From 435f1410e58f6dd9b7ee7cca1a258d676ff550ec Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 04:26:30 +0900 Subject: [PATCH 158/244] libxklavier: Specify xkb-bin-base --- x11-packages/libxklavier/build.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/x11-packages/libxklavier/build.sh b/x11-packages/libxklavier/build.sh index b0f5a884df..0ecd24e24d 100644 --- a/x11-packages/libxklavier/build.sh +++ b/x11-packages/libxklavier/build.sh @@ -1,14 +1,22 @@ TERMUX_PKG_HOMEPAGE=https://www.freedesktop.org/wiki/Software/LibXklavier/ TERMUX_PKG_DESCRIPTION="High-level API for X Keyboard Extension" -TERMUX_PKG_LICENSE="LGPL-2.1" +TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=5.4 -TERMUX_PKG_REVISION=21 +TERMUX_PKG_REVISION=22 TERMUX_PKG_SRCURL=https://gitlab.freedesktop.org/archived-projects/libxklavier/-/archive/libxklavier-${TERMUX_PKG_VERSION}/libxklavier-libxklavier-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=e1638599e9229e6f6267b70b02e41940b98ba29b3a37e221f6e59ff90100c3da -TERMUX_PKG_DEPENDS="glib, iso-codes, libxi, libxkbfile, libxml2, xkeyboard-config" -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-xkb-base=$TERMUX_PREFIX/share/X11/xkb" +TERMUX_PKG_DEPENDS="glib, iso-codes, libx11, libxi, libxkbfile, libxml2, xkeyboard-config, xorg-xkbcomp" +TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner, valac" +TERMUX_PKG_DISABLE_GIR=true +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +--enable-introspection +--with-xkb-base=$TERMUX_PREFIX/share/X11/xkb +--with-xkb-bin-base=$TERMUX_PREFIX/bin +" termux_step_pre_configure() { + termux_setup_gir + NOCONFIGURE=1 ./autogen.sh } From 6d87359352dd6e06cd877854074423d28b8fcb11 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 05:00:05 +0900 Subject: [PATCH 159/244] leptonica: Add SOVERSION guard %ci:no-build --- packages/leptonica/build.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/packages/leptonica/build.sh b/packages/leptonica/build.sh index f85bc25702..a1e9b0e08c 100644 --- a/packages/leptonica/build.sh +++ b/packages/leptonica/build.sh @@ -6,11 +6,23 @@ TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.83.0 TERMUX_PKG_SRCURL=https://github.com/DanBloomberg/leptonica/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=14cf531c2219a1414e8e3c51a3caa5cf021a52e782c4a6561bf64d0ef2119282 -TERMUX_PKG_AUTO_UPDATE=false +TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="giflib, libjpeg-turbo, libpng, libtiff, libwebp, openjpeg, zlib" TERMUX_PKG_BREAKS="leptonica-dev" TERMUX_PKG_REPLACES="leptonica-dev" +termux_step_post_get_source() { + # Do not forget to bump revision of reverse dependencies and rebuild them + # after SOVERSION is changed. + local _SOVERSION=6 + + local v=$(sed -En 's/^.*set_target_properties\s*\(leptonica PROPERTIES SOVERSION ([0-9]+).*$/\1/p' \ + src/CMakeLists.txt) + if [ "${_SOVERSION}" != "${v}" ]; then + termux_error_exit "SOVERSION guard check failed." + fi +} + termux_step_pre_configure() { # Silence tmpfile warnings: find src -name '*.c' | xargs -n 1 \ From ea388f5b9b9529b17167dc0cef807f65bf7cdc26 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 05:51:29 +0900 Subject: [PATCH 160/244] tesseract: Add SOVERSION guard %ci:no-build --- packages/tesseract/build.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/packages/tesseract/build.sh b/packages/tesseract/build.sh index 26c94f14ed..0753090fdf 100644 --- a/packages/tesseract/build.sh +++ b/packages/tesseract/build.sh @@ -18,6 +18,17 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DOPENMP_BUILD=ON " +termux_step_post_get_source() { + # Do not forget to bump revision of reverse dependencies and rebuild them + # after SOVERSION is changed. + local _SOVERSION=5 + + local v=$(sed -n 's/^\([^.]*\)\..*/\1/p' VERSION) + if [ "${_SOVERSION}" != "${v}" ]; then + termux_error_exit "SOVERSION guard check failed." + fi +} + termux_step_pre_configure() { LDFLAGS+=" -landroid-posix-semaphore" } From 0d93a2433a0e45c036d30dec4f7cf8b43ba89c3f Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 06:35:51 +0900 Subject: [PATCH 161/244] lvm2: Bump to 2.03.18 --- root-packages/lvm2/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/root-packages/lvm2/build.sh b/root-packages/lvm2/build.sh index 3470622bd5..315203fa71 100644 --- a/root-packages/lvm2/build.sh +++ b/root-packages/lvm2/build.sh @@ -3,10 +3,9 @@ TERMUX_PKG_DESCRIPTION="A device-mapper library from LVM2 package" TERMUX_PKG_LICENSE="GPL-2.0, LGPL-2.1, BSD 2-Clause" TERMUX_PKG_LICENSE_FILE="COPYING, COPYING.BSD, COPYING.LIB" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=2.03.17 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=2.03.18 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/sourceware/lvm2/releases/LVM2.${TERMUX_PKG_VERSION}.tgz -TERMUX_PKG_SHA256=7286cfa9651828c589389509546333b8da965dfa84a1a4c8ab3e681a47fabae7 +TERMUX_PKG_SHA256=9f683e2980d95c0dcebbd25c7c177032c5615d7267bfc885eabfce59280f4769 TERMUX_PKG_DEPENDS="libandroid-support, libaio, readline" TERMUX_PKG_BREAKS="libdevmapper-dev" TERMUX_PKG_REPLACES="libdevmapper-dev" From d4129ab4ed8f6448d2adb462554df8b147fecf5e Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 06:37:59 +0900 Subject: [PATCH 162/244] scrcpy: Bump to 1.25 --- packages/scrcpy/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/scrcpy/build.sh b/packages/scrcpy/build.sh index 5884094636..643fd54802 100644 --- a/packages/scrcpy/build.sh +++ b/packages/scrcpy/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/Genymobile/scrcpy TERMUX_PKG_DESCRIPTION="Provides display and control of Android devices connected via USB or over TCP/IP" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.24 +TERMUX_PKG_VERSION=1.25 TERMUX_PKG_SRCURL=https://github.com/Genymobile/scrcpy/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=e3054ad453ac577b941f8df0eabc94e842affc6e1d10ba8d21cededfa2eacc73 +TERMUX_PKG_SHA256=dfecc9dcffd45540bef88a7e346d37bead3665a5c868a5a95c5ec7bfed43ad07 TERMUX_PKG_DEPENDS="ffmpeg, libusb, sdl2" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -Dprebuilt_server=$TERMUX_PKG_SRCDIR/scrcpy-server-v${TERMUX_PKG_VERSION} @@ -12,6 +12,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" termux_step_post_get_source() { local _url=https://github.com/Genymobile/scrcpy/releases/download/v${TERMUX_PKG_VERSION}/scrcpy-server-v${TERMUX_PKG_VERSION} - local _sha256=ae74a81ea79c0dc7250e586627c278c0a9a8c5de46c9fb5c38c167fb1a36f056 + local _sha256=ce0306c7bbd06ae72f6d06f7ec0ee33774995a65de71e0a83813ecb67aec9bdb termux_download ${_url} $(basename ${_url}) ${_sha256} } From 4f5afc4082583cd7255051dc09d03bc36c759537 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 06:22:43 +0900 Subject: [PATCH 163/244] gtk4: Bump to 4.8.3 --- x11-packages/gtk4/build.sh | 5 ++--- x11-packages/gtk4/gir/{4.8.2 => 4.8.3}/Gdk-4.0.xml | 0 x11-packages/gtk4/gir/{4.8.2 => 4.8.3}/GdkX11-4.0.xml | 0 x11-packages/gtk4/gir/{4.8.2 => 4.8.3}/Gsk-4.0.xml | 0 x11-packages/gtk4/gir/{4.8.2 => 4.8.3}/Gtk-4.0.xml | 0 5 files changed, 2 insertions(+), 3 deletions(-) rename x11-packages/gtk4/gir/{4.8.2 => 4.8.3}/Gdk-4.0.xml (100%) rename x11-packages/gtk4/gir/{4.8.2 => 4.8.3}/GdkX11-4.0.xml (100%) rename x11-packages/gtk4/gir/{4.8.2 => 4.8.3}/Gsk-4.0.xml (100%) rename x11-packages/gtk4/gir/{4.8.2 => 4.8.3}/Gtk-4.0.xml (100%) diff --git a/x11-packages/gtk4/build.sh b/x11-packages/gtk4/build.sh index 8b3c79d9bb..38bb587fcc 100644 --- a/x11-packages/gtk4/build.sh +++ b/x11-packages/gtk4/build.sh @@ -3,10 +3,9 @@ TERMUX_PKG_DESCRIPTION="GObject-based multi-platform GUI toolkit" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_MAINTAINER="@termux" _MAJOR_VERSION=4.8 -TERMUX_PKG_VERSION=${_MAJOR_VERSION}.2 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=${_MAJOR_VERSION}.3 TERMUX_PKG_SRCURL=https://download.gnome.org/sources/gtk/${_MAJOR_VERSION}/gtk-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=85b7a160b6e02eafa4e7d38f046f8720fab537d3fe73c01c864333a983a692a9 +TERMUX_PKG_SHA256=b362f968d085b4d3d9340d4d38c706377ded9d5374e694a2b6b7e6292e3cba74 TERMUX_PKG_DEPENDS="adwaita-icon-theme, fontconfig, fribidi, gdk-pixbuf, glib, glib-bin, graphene, gtk-update-icon-cache, harfbuzz, libcairo, libepoxy, libjpeg-turbo, libpng, libtiff, libx11, libxcursor, libxdamage, libxext, libxfixes, libxi, libxinerama, libxrandr, pango, shared-mime-info" TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner, xorgproto" TERMUX_PKG_RECOMMENDS="desktop-file-utils, librsvg, ttf-dejavu" diff --git a/x11-packages/gtk4/gir/4.8.2/Gdk-4.0.xml b/x11-packages/gtk4/gir/4.8.3/Gdk-4.0.xml similarity index 100% rename from x11-packages/gtk4/gir/4.8.2/Gdk-4.0.xml rename to x11-packages/gtk4/gir/4.8.3/Gdk-4.0.xml diff --git a/x11-packages/gtk4/gir/4.8.2/GdkX11-4.0.xml b/x11-packages/gtk4/gir/4.8.3/GdkX11-4.0.xml similarity index 100% rename from x11-packages/gtk4/gir/4.8.2/GdkX11-4.0.xml rename to x11-packages/gtk4/gir/4.8.3/GdkX11-4.0.xml diff --git a/x11-packages/gtk4/gir/4.8.2/Gsk-4.0.xml b/x11-packages/gtk4/gir/4.8.3/Gsk-4.0.xml similarity index 100% rename from x11-packages/gtk4/gir/4.8.2/Gsk-4.0.xml rename to x11-packages/gtk4/gir/4.8.3/Gsk-4.0.xml diff --git a/x11-packages/gtk4/gir/4.8.2/Gtk-4.0.xml b/x11-packages/gtk4/gir/4.8.3/Gtk-4.0.xml similarity index 100% rename from x11-packages/gtk4/gir/4.8.2/Gtk-4.0.xml rename to x11-packages/gtk4/gir/4.8.3/Gtk-4.0.xml From 604ecd3fe6eaa771f90a087aa29004dc84cde8f1 Mon Sep 17 00:00:00 2001 From: Alexandre Ancel Date: Wed, 14 Dec 2022 23:20:15 +0100 Subject: [PATCH 164/244] enhance(x11/gtk3): add broadway backend --- x11-packages/gtk3/broadway-server.patch | 28 ++++++++++++++ x11-packages/gtk3/build.sh | 2 + x11-packages/gtk3/gdkbroadway-server.patch | 45 ++++++++++++++++++++++ 3 files changed, 75 insertions(+) create mode 100644 x11-packages/gtk3/broadway-server.patch create mode 100644 x11-packages/gtk3/gdkbroadway-server.patch diff --git a/x11-packages/gtk3/broadway-server.patch b/x11-packages/gtk3/broadway-server.patch new file mode 100644 index 0000000000..c06089de54 --- /dev/null +++ b/x11-packages/gtk3/broadway-server.patch @@ -0,0 +1,28 @@ +--- a/gdk/broadway/broadway-server.c 2022-12-12 14:17:52.598502580 +0000 ++++ b/gdk/broadway/broadway-server.c 2022-12-12 14:18:54.758683298 +0000 +@@ -829,9 +829,6 @@ + void *ptr; + char *filename = NULL; + +- fd = shm_open (name, O_RDONLY, 0600); +- if (fd == -1) +- { + filename = g_build_filename (g_get_tmp_dir (), name, NULL); + fd = open (filename, O_RDONLY); + if (fd == -1) +@@ -841,7 +838,6 @@ + + return NULL; + } +- } + + ptr = mmap (0, size, PROT_READ, MAP_SHARED, fd, 0); + +@@ -852,8 +848,6 @@ + unlink (filename); + g_free (filename); + } +- else +- shm_unlink (name); + + return ptr; diff --git a/x11-packages/gtk3/build.sh b/x11-packages/gtk3/build.sh index c433cb983f..65b606441f 100644 --- a/x11-packages/gtk3/build.sh +++ b/x11-packages/gtk3/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="GObject-based multi-platform GUI toolkit" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=3.24.35 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://gitlab.gnome.org/GNOME/gtk/-/archive/$TERMUX_PKG_VERSION/gtk-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=8b08020b183729fbc14c959c46124de10e43563334f4811a283ded0e8ba5463e TERMUX_PKG_BUILD_IN_SRC=true @@ -19,6 +20,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --enable-xcomposite --enable-xdamage --enable-x11-backend +--enable-broadway-backend --disable-wayland-backend " TERMUX_PKG_RM_AFTER_INSTALL="share/glib-2.0/schemas/gschemas.compiled" diff --git a/x11-packages/gtk3/gdkbroadway-server.patch b/x11-packages/gtk3/gdkbroadway-server.patch new file mode 100644 index 0000000000..a7deb48128 --- /dev/null +++ b/x11-packages/gtk3/gdkbroadway-server.patch @@ -0,0 +1,45 @@ +--- a/gdk/broadway/gdkbroadway-server.c.org 2022-12-12 14:29:27.452591178 +0000 ++++ b/gdk/broadway/gdkbroadway-server.c 2022-12-12 14:30:43.176824600 +0000 +@@ -533,9 +533,6 @@ + void *ptr; + int res; + +- fd = shm_open(name, O_RDWR|O_CREAT|O_EXCL, 0600); +- if (fd == -1) +- { + if (errno == EEXIST) + return NULL; + +@@ -551,9 +548,6 @@ + } + else + *is_shm = FALSE; +- } +- else +- *is_shm = TRUE; + + res = ftruncate (fd, size); + g_assert (res != -1); +@@ -564,8 +558,6 @@ + { + if (filename) + unlink (filename); +- else +- shm_unlink (name); + g_error ("Not enough shared memory for window surface"); + } + #endif +@@ -680,14 +672,9 @@ + #ifdef G_OS_UNIX + + munmap (data->data, data->data_size); +- if (data->is_shm) +- shm_unlink (data->name); +- else +- { + char *filename = g_build_filename (g_get_tmp_dir (), data->name, NULL); + unlink (filename); + g_free (filename); +- } + + #elif defined(G_OS_WIN32) From efd333238bffe86bfaa382fa118e0a908edac1ac Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 06:24:02 +0900 Subject: [PATCH 165/244] gtk3: Bump to 3.24.36 --- x11-packages/gtk3/0000-no-introspection.patch | 16 ---- x11-packages/gtk3/0001-no-atk-bridge.patch | 16 ---- .../gtk3/0002-dont-update-icon-cache.patch | 31 ++----- .../gtk3/0005-fix-immodules-linking.patch | 28 +++--- x11-packages/gtk3/0006-fix-libintl.patch | 11 +++ x11-packages/gtk3/0006-glib-tools-fix.patch | 90 ------------------- x11-packages/gtk3/build.sh | 36 +++----- .../gtk3/gir/{3.24.35 => 3.24.36}/Gdk-3.0.xml | 0 .../gir/{3.24.35 => 3.24.36}/GdkX11-3.0.xml | 0 .../gtk3/gir/{3.24.35 => 3.24.36}/Gtk-3.0.xml | 0 10 files changed, 41 insertions(+), 187 deletions(-) delete mode 100644 x11-packages/gtk3/0000-no-introspection.patch create mode 100644 x11-packages/gtk3/0006-fix-libintl.patch delete mode 100644 x11-packages/gtk3/0006-glib-tools-fix.patch rename x11-packages/gtk3/gir/{3.24.35 => 3.24.36}/Gdk-3.0.xml (100%) rename x11-packages/gtk3/gir/{3.24.35 => 3.24.36}/GdkX11-3.0.xml (100%) rename x11-packages/gtk3/gir/{3.24.35 => 3.24.36}/Gtk-3.0.xml (100%) diff --git a/x11-packages/gtk3/0000-no-introspection.patch b/x11-packages/gtk3/0000-no-introspection.patch deleted file mode 100644 index 373c2bb849..0000000000 --- a/x11-packages/gtk3/0000-no-introspection.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -uNr gtk-3.24.8/autogen.sh gtk-3.24.8.mod/autogen.sh ---- gtk-3.24.8/autogen.sh 2019-04-11 00:12:29.000000000 +0300 -+++ gtk-3.24.8.mod/autogen.sh 2019-05-20 01:01:58.516541976 +0300 -@@ -23,12 +23,6 @@ - exit 1 - fi - --pkg-config --print-errors gobject-introspection-1.0 --if [ $? != 0 ]; then -- echo "You probably need to install 'libgirepository1.0-dev'" -- exit 1 --fi -- - # README and INSTALL are required by automake, but may be deleted by clean - # up rules. to get automake to work, simply touch these here, they will be - # regenerated from their corresponding *.in files by ./configure anyway. diff --git a/x11-packages/gtk3/0001-no-atk-bridge.patch b/x11-packages/gtk3/0001-no-atk-bridge.patch index 7f378438a8..6d9fa6b169 100644 --- a/x11-packages/gtk3/0001-no-atk-bridge.patch +++ b/x11-packages/gtk3/0001-no-atk-bridge.patch @@ -1,19 +1,3 @@ -diff -uNr gtk-3.22.30/configure.ac gtk-3.22.30.mod/configure.ac ---- gtk-3.22.30/configure.ac 2018-04-16 21:06:02.000000000 +0300 -+++ gtk-3.22.30.mod/configure.ac 2018-06-22 20:55:46.617959590 +0300 -@@ -1393,11 +1393,7 @@ - # Check for Accessibility Toolkit flags - ######################################## - --if test x$enable_x11_backend = xyes; then -- ATK_PACKAGES="atk atk-bridge-2.0" --else -- ATK_PACKAGES="atk" --fi -+ATK_PACKAGES="atk" - - PKG_CHECK_MODULES(ATK, $ATK_PACKAGES) - diff -uNr gtk-3.22.30/gtk/a11y/gtkaccessibility.c gtk-3.22.30.mod/gtk/a11y/gtkaccessibility.c --- gtk-3.22.30/gtk/a11y/gtkaccessibility.c 2018-04-16 21:06:02.000000000 +0300 +++ gtk-3.22.30.mod/gtk/a11y/gtkaccessibility.c 2018-06-22 20:55:46.611292924 +0300 diff --git a/x11-packages/gtk3/0002-dont-update-icon-cache.patch b/x11-packages/gtk3/0002-dont-update-icon-cache.patch index 0f212b457f..554c158681 100644 --- a/x11-packages/gtk3/0002-dont-update-icon-cache.patch +++ b/x11-packages/gtk3/0002-dont-update-icon-cache.patch @@ -1,24 +1,11 @@ -diff -uNr gtk-3.22.30/demos/gtk-demo/Makefile.am gtk-3.22.30.mod/demos/gtk-demo/Makefile.am ---- gtk-3.22.30/demos/gtk-demo/Makefile.am 2018-04-16 21:06:02.000000000 +0300 -+++ gtk-3.22.30.mod/demos/gtk-demo/Makefile.am 2018-06-22 20:55:46.621292924 +0300 -@@ -176,7 +176,7 @@ - dist_appsicon48_DATA = data/48x48/gtk3-demo.png data/48x48/gtk3-demo-symbolic.symbolic.png - dist_appsicon256_DATA = data/256x256/gtk3-demo.png data/256x256/gtk3-demo-symbolic.symbolic.png +--- a/meson.build ++++ b/meson.build +@@ -995,7 +995,7 @@ --update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force -+update_icon_cache = true + install_data('m4macros/gtk-3.0.m4', install_dir: join_paths(get_option('datadir'), 'aclocal')) - install-data-hook: install-update-icon-cache - uninstall-hook: uninstall-update-icon-cache -diff -uNr gtk-3.22.30/demos/widget-factory/Makefile.am gtk-3.22.30.mod/demos/widget-factory/Makefile.am ---- gtk-3.22.30/demos/widget-factory/Makefile.am 2018-04-16 21:06:02.000000000 +0300 -+++ gtk-3.22.30.mod/demos/widget-factory/Makefile.am 2018-06-22 20:55:46.624626257 +0300 -@@ -47,7 +47,7 @@ - dist_appsicon48_DATA = data/48x48/gtk3-widget-factory.png data/48x48/gtk3-widget-factory-symbolic.symbolic.png - dist_appsicon256_DATA = data/256x256/gtk3-widget-factory.png data/256x256/gtk3-widget-factory-symbolic.symbolic.png - --update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force -+update_icon_cache = true - - install-data-hook: install-update-icon-cache - uninstall-hook: uninstall-update-icon-cache +-if not meson.is_cross_build() ++if false + gnome.post_install( + glib_compile_schemas: true, + gio_querymodules: gio_module_dirs, diff --git a/x11-packages/gtk3/0005-fix-immodules-linking.patch b/x11-packages/gtk3/0005-fix-immodules-linking.patch index 38d1a85c5d..3e229a5bb6 100644 --- a/x11-packages/gtk3/0005-fix-immodules-linking.patch +++ b/x11-packages/gtk3/0005-fix-immodules-linking.patch @@ -1,17 +1,11 @@ -diff -uNr gtk-3.24.8/modules/input/Makefile.am gtk-3.24.8.mod/modules/input/Makefile.am ---- gtk-3.24.8/modules/input/Makefile.am 2019-04-11 00:12:29.000000000 +0300 -+++ gtk-3.24.8.mod/modules/input/Makefile.am 2019-05-26 21:56:54.467063059 +0300 -@@ -13,10 +13,12 @@ - $(INCLUDED_IMMODULE_DEFINE) - - DEPS = \ -- $(top_builddir)/gtk/libgtk-3.la -+ $(top_builddir)/gtk/libgtk-3.la \ -+ $(top_builddir)/gdk/libgdk-3.la - - LDADDS = \ - $(top_builddir)/gtk/libgtk-3.la \ -+ $(top_builddir)/gdk/libgdk-3.la \ - $(GTK_DEP_LIBS) - - moduledir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/immodules +--- a/modules/input/meson.build ++++ b/modules/input/meson.build +@@ -14,7 +14,7 @@ + shared_module('im-@0@'.format(name), + immod_sources, + c_args: common_cflags + cflags, +- dependencies: [ libgtk_dep ], ++ dependencies: [ libgtk_dep, libgdk_dep ], + install_dir: immodules_install_dir, + include_directories: [confinc, gtkinc], + install : true, diff --git a/x11-packages/gtk3/0006-fix-libintl.patch b/x11-packages/gtk3/0006-fix-libintl.patch new file mode 100644 index 0000000000..0b451a6160 --- /dev/null +++ b/x11-packages/gtk3/0006-fix-libintl.patch @@ -0,0 +1,11 @@ +--- a/meson.build ++++ b/meson.build +@@ -769,7 +769,7 @@ + # Check for bind_textdomain_codeset, including -lintl if GLib brings it in by + # doing the same check as glib. We can't check that by linking to glib because + # it might be a subproject and hence not built yet. +-if cc.has_function('ngettext') ++if true + libintl_dep = [] + cdata.set('HAVE_BIND_TEXTDOMAIN_CODESET', 1) + else diff --git a/x11-packages/gtk3/0006-glib-tools-fix.patch b/x11-packages/gtk3/0006-glib-tools-fix.patch deleted file mode 100644 index 19d58a1c11..0000000000 --- a/x11-packages/gtk3/0006-glib-tools-fix.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -uNr gtk-3.24.10/gdk/Makefile.am gtk-3.24.10.mod/gdk/Makefile.am ---- gtk-3.24.10/gdk/Makefile.am 2019-07-03 23:25:10.000000000 +0300 -+++ gtk-3.24.10.mod/gdk/Makefile.am 2019-07-23 00:25:53.122144498 +0300 -@@ -434,13 +434,13 @@ - gdkenumtypes.h: stamp-gdkenumtypes.h - @true - stamp-gdkenumtypes.h: $(gdk_h_sources) gdkenumtypes.h.template -- $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.h.template \ -+ $(AM_V_GEN) ( cd $(srcdir) && glib-mkenums --template gdkenumtypes.h.template \ - $(gdk_h_sources) ) >> xgen-geth \ - && (cmp -s xgen-geth gdkenumtypes.h || cp xgen-geth gdkenumtypes.h ) \ - && rm -f xgen-geth \ - && echo timestamp > $(@F) - gdkenumtypes.c: $(gdk_h_sources) gdkenumtypes.c.template -- $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.c.template \ -+ $(AM_V_GEN) ( cd $(srcdir) && glib-mkenums --template gdkenumtypes.c.template \ - $(gdk_h_sources) ) > xgen-getc \ - && cp xgen-getc gdkenumtypes.c \ - && rm -f xgen-getc -@@ -449,7 +449,7 @@ - # Marshaller generation - # - gdkmarshalers.h: gdkmarshalers.list -- $(AM_V_GEN) $(GLIB_GENMARSHAL) \ -+ $(AM_V_GEN) glib-genmarshal \ - --prefix=_gdk_marshal \ - --valist-marshallers \ - --header \ -@@ -457,7 +457,7 @@ - && mv gdkmarshalers-h.tmp gdkmarshalers.h \ - || ( rm -f gdkmarshalers-h.tmp && exit 1) - gdkmarshalers.c: gdkmarshalers.list -- $(AM_V_GEN) $(GLIB_GENMARSHAL) \ -+ $(AM_V_GEN) glib-genmarshal \ - --prefix=_gdk_marshal \ - --valist-marshallers \ - --body \ -diff -uNr gtk-3.24.10/gtk/Makefile.am gtk-3.24.10.mod/gtk/Makefile.am ---- gtk-3.24.10/gtk/Makefile.am 2019-07-03 23:25:10.000000000 +0300 -+++ gtk-3.24.10.mod/gtk/Makefile.am 2019-07-23 00:24:47.805264300 +0300 -@@ -1252,7 +1252,7 @@ - gtkmarshalers.h: stamp-gtkmarshalers.h - @true - stamp-gtkmarshalers.h: gtkmarshalers.list -- $(AM_V_GEN) $(GLIB_GENMARSHAL) \ -+ $(AM_V_GEN) glib-genmarshal \ - --prefix=_gtk_marshal \ - --header \ - --valist-marshallers \ -@@ -1262,7 +1262,7 @@ - && echo timestamp > $(@F) - gtkmarshalers.c: gtkmarshalers.list - $(AM_V_GEN) (echo "#undef G_ENABLE_DEBUG"; \ -- $(GLIB_GENMARSHAL) \ -+ glib-genmarshal \ - --prefix=_gtk_marshal \ - --body \ - --valist-marshallers $(srcdir)/gtkmarshalers.list) >> xgen-gmlc \ -@@ -1272,13 +1272,13 @@ - gtktypebuiltins.h: stamp-gtktypebuiltins.h - @true - stamp-gtktypebuiltins.h: $(gtk_public_h_sources) $(a11y_h_sources) $(gtk_deprecated_h_sources) gtktypebuiltins.h.template -- $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.h.template \ -+ $(AM_V_GEN) ( cd $(srcdir) && glib-mkenums --template gtktypebuiltins.h.template \ - $(gtk_public_h_sources) $(a11y_h_sources) $(gtk_deprecated_h_sources) ) > xgen-gtbh \ - && (cmp -s xgen-gtbh gtktypebuiltins.h || cp xgen-gtbh gtktypebuiltins.h ) \ - && rm -f xgen-gtbh \ - && echo timestamp > $(@F) - gtktypebuiltins.c: $(gtk_public_h_sources) $(a11y_h_sources) $(gtk_deprecated_h_sources) gtktypebuiltins.c.template -- $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.c.template \ -+ $(AM_V_GEN) ( cd $(srcdir) && glib-mkenums --template gtktypebuiltins.c.template \ - $(gtk_public_h_sources) $(a11y_h_sources) $(gtk_deprecated_h_sources) ) > xgen-gtbc \ - && cp xgen-gtbc gtktypebuiltins.c \ - && rm -f xgen-gtbc -@@ -1430,13 +1430,13 @@ - gtkprivatetypebuiltins.h: stamp-gtkprivatetypebuiltins.h - @true - stamp-gtkprivatetypebuiltins.h: $(gtk_private_type_h_sources) gtkprivatetypebuiltins.h.template -- $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtkprivatetypebuiltins.h.template \ -+ $(AM_V_GEN) ( cd $(srcdir) && glib-mkenums --template gtkprivatetypebuiltins.h.template \ - $(gtk_private_type_h_sources) ) > xgen-gptbh \ - && (cmp -s xgen-gptbh gtkprivatetypebuiltins.h || cp xgen-gptbh gtkprivatetypebuiltins.h ) \ - && rm -f xgen-gptbh \ - && echo timestamp > $(@F) - gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources) gtkprivatetypebuiltins.c.template -- $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtkprivatetypebuiltins.c.template \ -+ $(AM_V_GEN) ( cd $(srcdir) && glib-mkenums --template gtkprivatetypebuiltins.c.template \ - $(gtk_private_type_h_sources) ) > xgen-gptbc \ - && cp xgen-gptbc gtkprivatetypebuiltins.c \ - && rm -f xgen-gptbc diff --git a/x11-packages/gtk3/build.sh b/x11-packages/gtk3/build.sh index 65b606441f..05f8bf5677 100644 --- a/x11-packages/gtk3/build.sh +++ b/x11-packages/gtk3/build.sh @@ -2,42 +2,26 @@ TERMUX_PKG_HOMEPAGE=https://www.gtk.org/ TERMUX_PKG_DESCRIPTION="GObject-based multi-platform GUI toolkit" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=3.24.35 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=3.24.36 TERMUX_PKG_SRCURL=https://gitlab.gnome.org/GNOME/gtk/-/archive/$TERMUX_PKG_VERSION/gtk-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=8b08020b183729fbc14c959c46124de10e43563334f4811a283ded0e8ba5463e -TERMUX_PKG_BUILD_IN_SRC=true -TERMUX_PKG_DEPENDS="adwaita-icon-theme, atk, coreutils, desktop-file-utils, fontconfig, freetype, fribidi, gdk-pixbuf, glib, glib-bin, gtk-update-icon-cache, harfbuzz, libcairo, libepoxy, libxcomposite, libxcursor, libxdamage, libxfixes, libxi, libxinerama, libxrandr, pango, shared-mime-info, ttf-dejavu" +TERMUX_PKG_SHA256=8c5c6f56da1a6700662853279ef68602fd24733677cd1bcf346b88318c88a991 +TERMUX_PKG_DEPENDS="adwaita-icon-theme, atk, coreutils, desktop-file-utils, fontconfig, fribidi, gdk-pixbuf, glib, glib-bin, gtk-update-icon-cache, harfbuzz, libcairo, libepoxy, libxcomposite, libxcursor, libxdamage, libxfixes, libxi, libxinerama, libxrandr, pango, shared-mime-info, ttf-dejavu" TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner, xorgproto" TERMUX_PKG_CONFLICTS="libgtk3" TERMUX_PKG_REPLACES="libgtk3" TERMUX_PKG_DISABLE_GIR=false TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" ---enable-introspection ---disable-cups ---enable-xinerama ---enable-xfixes ---enable-xcomposite ---enable-xdamage ---enable-x11-backend ---enable-broadway-backend ---disable-wayland-backend +-Dx11_backend=true +-Dwayland_backend=false +-Dbroadway_backend=true +-Dxinerama=yes +-Dprint_backends=file,lpr +-Dman=true +-Dintrospection=true " -TERMUX_PKG_RM_AFTER_INSTALL="share/glib-2.0/schemas/gschemas.compiled" termux_step_pre_configure() { - # prevent permission denied on build scripts - find . -type f | xargs chmod u+x - - NOCONFIGURE=1 ./autogen.sh - termux_setup_gir - - export GLIB_COMPILE_RESOURCES=glib-compile-resources -} - -termux_step_post_configure() { - touch ./gtk/g-ir-scanner } termux_step_create_debscripts() { diff --git a/x11-packages/gtk3/gir/3.24.35/Gdk-3.0.xml b/x11-packages/gtk3/gir/3.24.36/Gdk-3.0.xml similarity index 100% rename from x11-packages/gtk3/gir/3.24.35/Gdk-3.0.xml rename to x11-packages/gtk3/gir/3.24.36/Gdk-3.0.xml diff --git a/x11-packages/gtk3/gir/3.24.35/GdkX11-3.0.xml b/x11-packages/gtk3/gir/3.24.36/GdkX11-3.0.xml similarity index 100% rename from x11-packages/gtk3/gir/3.24.35/GdkX11-3.0.xml rename to x11-packages/gtk3/gir/3.24.36/GdkX11-3.0.xml diff --git a/x11-packages/gtk3/gir/3.24.35/Gtk-3.0.xml b/x11-packages/gtk3/gir/3.24.36/Gtk-3.0.xml similarity index 100% rename from x11-packages/gtk3/gir/3.24.35/Gtk-3.0.xml rename to x11-packages/gtk3/gir/3.24.36/Gtk-3.0.xml From 645bdd0357ed5466ca5e2d025f91a5b70b83d524 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Fri, 23 Dec 2022 00:23:56 +0000 Subject: [PATCH 166/244] bump(main/gh): 2.21.0 This commit has been automatically submitted by Github Actions. --- packages/gh/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/gh/build.sh b/packages/gh/build.sh index 9c9fdec51a..c3cc3e2220 100644 --- a/packages/gh/build.sh +++ b/packages/gh/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://cli.github.com/ TERMUX_PKG_DESCRIPTION="GitHub’s official command line tool" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Krishna kanhaiya @kcubeterm" -TERMUX_PKG_VERSION="2.20.2" +TERMUX_PKG_VERSION="2.21.0" TERMUX_PKG_SRCURL=https://github.com/cli/cli/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=221380a32559984b64cdda81fabb60e5d4ed00db49ffe8390ddc149bef25c5a7 +TERMUX_PKG_SHA256=081d3c203b37068e0df47f05832c8154b969ffbea30c72ea7073514130d23d71 TERMUX_PKG_AUTO_UPDATE=true termux_step_make() { From 8109e37500d95d7ac79c108551b5c3fd61eb0972 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Fri, 23 Dec 2022 00:28:59 +0000 Subject: [PATCH 167/244] bump(main/radare2): 5.8.0 This commit has been automatically submitted by Github Actions. --- packages/radare2/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/radare2/build.sh b/packages/radare2/build.sh index e08026711e..cf90c45560 100644 --- a/packages/radare2/build.sh +++ b/packages/radare2/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://rada.re TERMUX_PKG_DESCRIPTION="Advanced Hexadecimal Editor" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="5.7.8" +TERMUX_PKG_VERSION="5.8.0" TERMUX_PKG_SRCURL=https://github.com/radare/radare2/archive/$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=084f262873f7ebbb54cfe01ebf14b43136e5a7442df8ecf01b37e7060a49b432 +TERMUX_PKG_SHA256=df9ed1ed488a13dd5de39469313d7a81f68608068a7e798409ba37db4c15a41c TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="libuv" TERMUX_PKG_BREAKS="radare2-dev" From 1ad9b1d32cd5d71506bf9629ae85b21516a58144 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Fri, 23 Dec 2022 00:34:43 +0000 Subject: [PATCH 168/244] bump(main/ruff): 0.0.192 This commit has been automatically submitted by Github Actions. --- packages/ruff/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ruff/build.sh b/packages/ruff/build.sh index a99309d2e3..d6296a9003 100644 --- a/packages/ruff/build.sh +++ b/packages/ruff/build.sh @@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE="https://github.com/charliermarsh/ruff" TERMUX_PKG_DESCRIPTION="An extremely fast Python linter, written in Rust" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.0.191" +TERMUX_PKG_VERSION="0.0.192" TERMUX_PKG_SRCURL="https://github.com/charliermarsh/ruff/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz" -TERMUX_PKG_SHA256=73cf8b8b1a2c51e5b24e5854c5cf0e359d13a2d8a2cffa6085d14a2e2b659386 +TERMUX_PKG_SHA256=6b17d644599399b4883d21257b977d2f04141a46078aa9c090468030813251e8 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true From a79d28ab1afbfa83a08835c559f802cc732aa8fe Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 09:57:58 +0900 Subject: [PATCH 169/244] tesseract: Bump to 5.3.0 --- packages/tesseract/build.sh | 5 ++--- .../tesseract/src-training-CMakeLists.txt.patch | 13 +++---------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/packages/tesseract/build.sh b/packages/tesseract/build.sh index 0753090fdf..6b46fc4b8b 100644 --- a/packages/tesseract/build.sh +++ b/packages/tesseract/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/tesseract-ocr/tesseract TERMUX_PKG_DESCRIPTION="Tesseract is probably the most accurate open source OCR engine available" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=5.2.0 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_VERSION=5.3.0 TERMUX_PKG_SRCURL=https://github.com/tesseract-ocr/tesseract/archive/${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=eba4deb2f92a3f89a6623812074af8c53b772079525b3c263aa70bbf7b748b3c +TERMUX_PKG_SHA256=7e70870f8341e5ea228af2836ce79a36eefa11b01b56177b4a8997f330c014b8 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="leptonica, libandroid-glob, libandroid-posix-semaphore, libcpufeatures, libc++, libicu, libtool, libuuid, openmpi, pango, zstd" TERMUX_PKG_BREAKS="tesseract-dev" diff --git a/packages/tesseract/src-training-CMakeLists.txt.patch b/packages/tesseract/src-training-CMakeLists.txt.patch index 93f0c7ccba..b8bda785d1 100644 --- a/packages/tesseract/src-training-CMakeLists.txt.patch +++ b/packages/tesseract/src-training-CMakeLists.txt.patch @@ -1,7 +1,7 @@ diff -uNr tesseract-5.2.0/src/training/CMakeLists.txt tesseract-5.2.0.mod/src/training/CMakeLists.txt --- tesseract-5.2.0/src/training/CMakeLists.txt 2022-07-07 05:15:49.000000000 +0900 +++ tesseract-5.2.0.mod/src/training/CMakeLists.txt 2022-09-30 13:12:18.222593892 +0900 -@@ -108,13 +108,14 @@ +@@ -115,7 +115,7 @@ common/trainingsampleset.h) endif() @@ -10,13 +10,6 @@ diff -uNr tesseract-5.2.0/src/training/CMakeLists.txt tesseract-5.2.0.mod/src/tr target_include_directories(common_training PUBLIC common ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(common_training PUBLIC libtesseract) - generate_export_header(common_training EXPORT_MACRO_NAME - TESS_COMMON_TRAINING_API) - project_group(common_training "Training Tools") -+install(TARGETS common_training DESTINATION lib) - - # ############################################################################## - # EXECUTABLE ambiguous_words @@ -242,7 +243,7 @@ file(GLOB unicharset_training_src unicharset/*) @@ -30,8 +23,8 @@ diff -uNr tesseract-5.2.0/src/training/CMakeLists.txt tesseract-5.2.0.mod/src/tr PkgConfig::ICU) else() target_link_libraries(unicharset_training PUBLIC common_training -- ${ICU_LINK_LIBRARIES}) -+ ${ICU_LINK_LIBRARIES} libandroid-glob.so) +- ${ICU_LIBRARIES}) ++ ${ICU_LIBRARIES} libandroid-glob.so) endif() endif() target_include_directories(unicharset_training From 2815a4a0d9abf37eadd45c276a65168db43f316d Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 10:04:27 +0900 Subject: [PATCH 170/244] colordiff: Bump to 1.0.21 --- packages/colordiff/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/colordiff/build.sh b/packages/colordiff/build.sh index 05bb8cc4b3..84ae71f33d 100644 --- a/packages/colordiff/build.sh +++ b/packages/colordiff/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.colordiff.org/ TERMUX_PKG_DESCRIPTION="Tool to colorize 'diff' output" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli" -TERMUX_PKG_VERSION=1.0.20 +TERMUX_PKG_VERSION=1.0.21 TERMUX_PKG_SRCURL=https://www.colordiff.org/colordiff-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=e3b2017beeb9f619ebc3b15392f22810c882d1b657aab189623cffef351d7bcd +TERMUX_PKG_SHA256=9b30f4257ef0f0806dea5a27c9ad8edc3f7999f05ddaff6f0627064dc927e615 TERMUX_PKG_DEPENDS="perl" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_PLATFORM_INDEPENDENT=true From 172eafbd2d5ed2c75c34d57b74a80d649fc0e40b Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 10:06:25 +0900 Subject: [PATCH 171/244] manpages: Bump to 6.02 --- packages/manpages/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/manpages/build.sh b/packages/manpages/build.sh index 9479d4ec5e..9e15328405 100644 --- a/packages/manpages/build.sh +++ b/packages/manpages/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Man pages for linux kernel and C library interfaces" TERMUX_PKG_LICENSE="custom" TERMUX_PKG_LICENSE_FILE="LICENSES/Linux-man-pages-copyleft.txt, _man-pages-posix/POSIX-COPYRIGHT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=(6.01 +TERMUX_PKG_VERSION=(6.02 2017) -TERMUX_PKG_SHA256=(8be5177b2788c480a984517947d602ffaa64edeaed83edf4bd04f35163cb5c0b +TERMUX_PKG_SHA256=(66d809b62ba8681ebcbd1a8d0a0670776924ab93bfbbb54e1c31170e14303795 ce67bb25b5048b20dad772e405a83f4bc70faf051afa289361c81f9660318bc3) TERMUX_PKG_SRCURL=(https://www.kernel.org/pub/linux/docs/man-pages/man-pages-${TERMUX_PKG_VERSION}.tar.xz https://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/man-pages-posix-${TERMUX_PKG_VERSION[1]}-a.tar.xz) From 49f9afe9ea1dc1064e1fc2d056cfa2b45ab12843 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 11:01:56 +0900 Subject: [PATCH 172/244] libcurl: Add SOVERSION guard %ci:no-build --- packages/libcurl/build.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/packages/libcurl/build.sh b/packages/libcurl/build.sh index c7caacb33a..03263539d3 100644 --- a/packages/libcurl/build.sh +++ b/packages/libcurl/build.sh @@ -31,6 +31,22 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" # conflict with previous versions to avoid broken installations. TERMUX_PKG_CONFLICTS="apt (<< 1.4.8-8)" +termux_step_post_get_source() { + # Do not forget to bump revision of reverse dependencies and rebuild them + # after SOVERSION is changed. + local _SOVERSION=4 + + local a + for a in VERSIONCHANGE VERSIONDEL; do + local _${a}=$(sed -En 's/^'"${a}"'=([0-9]+).*/\1/p' \ + lib/Makefile.soname) + done + local v=$(( _VERSIONCHANGE - _VERSIONDEL )) + if [ "${v}" != "${_SOVERSION}" ]; then + termux_error_exit "SOVERSION guard check failed." + fi +} + termux_step_pre_configure() { LDFLAGS+=" -Wl,-z,nodelete" } From 9382ccad0e78435fa46868bca632be0775394067 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 11:26:18 +0900 Subject: [PATCH 173/244] liblz4: Add SOVERSION guard %ci:no-build --- packages/liblz4/build.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/liblz4/build.sh b/packages/liblz4/build.sh index 00b7c451de..4adab288ba 100644 --- a/packages/liblz4/build.sh +++ b/packages/liblz4/build.sh @@ -9,6 +9,18 @@ TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BREAKS="liblz4-dev" TERMUX_PKG_REPLACES="liblz4-dev" +termux_step_post_get_source() { + # Do not forget to bump revision of reverse dependencies and rebuild them + # after SOVERSION is changed. + local _SOVERSION=1 + + local v=$(sed -En 's/^#define LZ4_VERSION_MAJOR +([0-9]+) +.*$/\1/p' \ + lib/lz4.h) + if [ "${_SOVERSION}" != "${v}" ]; then + termux_error_exit "SOVERSION guard check failed." + fi +} + termux_step_pre_configure() { TERMUX_PKG_SRCDIR+=/build/cmake } From 32188486c57da190d7b856553aedb9d5850bca23 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 11:29:24 +0900 Subject: [PATCH 174/244] xxhash: Add SOVERSION guard %ci:no-build --- packages/xxhash/build.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/xxhash/build.sh b/packages/xxhash/build.sh index ef3c80c5b2..204798e09b 100644 --- a/packages/xxhash/build.sh +++ b/packages/xxhash/build.sh @@ -7,3 +7,15 @@ TERMUX_PKG_SRCURL=https://github.com/Cyan4973/xxHash/archive/v${TERMUX_PKG_VERSI TERMUX_PKG_SHA256=3bb6b7d6f30c591dd65aaaff1c8b7a5b94d81687998ca9400082c739a690436c TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true + +termux_step_post_massage() { + # Do not forget to bump revision of reverse dependencies and rebuild them + # after SOVERSION is changed. + local _SOVERSION_GUARD_FILES="lib/libxxhash.so.0" + local f + for f in ${_SOVERSION_GUARD_FILES}; do + if [ ! -e "${f}" ]; then + termux_error_exit "SOVERSION guard check failed." + fi + done +} From 261fc6d2382aa01633fb06af82a8a04bae513209 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 11:58:19 +0900 Subject: [PATCH 175/244] libevent: Add SOVERSION guard %ci:no-build --- packages/libevent/build.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/packages/libevent/build.sh b/packages/libevent/build.sh index 1a25a134ad..485e39d3e9 100644 --- a/packages/libevent/build.sh +++ b/packages/libevent/build.sh @@ -23,3 +23,21 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DEVENT__HAVE_WAITPID_WITH_WNOWAIT=ON -DEVENT__SIZEOF_PTHREAD_T=$((TERMUX_ARCH_BITS/8)) " + +termux_step_post_get_source() { + # Do not forget to bump revision of reverse dependencies and rebuild them + # after RELEASE / SOVERSION is changed. + local _RELEASE=2.1 + local _SOVERSION=7 + + for a in LIBVERSION_CURRENT LIBVERSION_AGE; do + local _${a}=$(sed -En 's/.*set\(EVENT_ABI_'"${a}"'\s+([0-9])\).*/\1/p' \ + CMakeLists.txt) + done + local r=$(sed -En 's/.*set\(EVENT_PACKAGE_RELEASE\s+([0-9.]+)\).*/\1/p' \ + CMakeLists.txt) + local v=$(( _LIBVERSION_CURRENT - _LIBVERSION_AGE )) + if [ "${_RELEASE}" != "${r}" ] || [ "${_SOVERSION}" != "${v}" ]; then + termux_error_exit "SOVERSION guard check failed." + fi +} From c65447b6f9de84878d78ae4973f5901ca56879e3 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 12:08:59 +0900 Subject: [PATCH 176/244] libexpat: Add SOVERSION guard %ci:no-build --- packages/libexpat/build.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/packages/libexpat/build.sh b/packages/libexpat/build.sh index 461e7759c0..ffef21df6b 100644 --- a/packages/libexpat/build.sh +++ b/packages/libexpat/build.sh @@ -11,6 +11,20 @@ TERMUX_PKG_BREAKS="libexpat-dev" TERMUX_PKG_REPLACES="libexpat-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-xmlwf --without-docbook" +termux_step_post_get_source() { + # Do not forget to bump revision of reverse dependencies and rebuild them + # after SOVERSION is changed. + local _SOVERSION=1 + + local a + for a in LIBCURRENT LIBAGE; do + local _${a}=$(sed -En 's/^'"${a}"'=([0-9]+).*/\1/p' configure.ac) + done + local v=$(( _LIBCURRENT - _LIBAGE )) + if [ "${v}" != "${_SOVERSION}" ]; then + termux_error_exit "SOVERSION guard check failed." + fi +} termux_step_post_make_install() { sed -r 's/.[0-9]+(\.[0-9]+)*//' -i $TERMUX_PREFIX/lib/cmake/expat-$TERMUX_PKG_VERSION/expat-noconfig.cmake From d3c1670db931260f534c5c91a16945123e915a25 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 12:15:55 +0900 Subject: [PATCH 177/244] libnghttp2: Add SOVERSION guard %ci:no-build --- packages/libnghttp2/build.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/packages/libnghttp2/build.sh b/packages/libnghttp2/build.sh index 468c6ddc9a..404462efb7 100644 --- a/packages/libnghttp2/build.sh +++ b/packages/libnghttp2/build.sh @@ -11,3 +11,19 @@ TERMUX_PKG_REPLACES="libnghttp2-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-lib-only" # The tools are not built due to --enable-lib-only: TERMUX_PKG_RM_AFTER_INSTALL="share/man/man1 share/nghttp2/fetch-ocsp-response" + +termux_step_post_get_source() { + # Do not forget to bump revision of reverse dependencies and rebuild them + # after SOVERSION is changed. + local _SOVERSION=14 + + local a + for a in LT_CURRENT LT_AGE; do + local _${a}=$(sed -En 's/^AC_SUBST\('"${a}"',\s*([0-9]+).*/\1/p' \ + configure.ac) + done + local v=$(( _LT_CURRENT - _LT_AGE )) + if [ "${v}" != "${_SOVERSION}" ]; then + termux_error_exit "SOVERSION guard check failed." + fi +} From 55e08cdf4bd5b6c7e6de64a860725f87a8bdbb67 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 12:34:05 +0900 Subject: [PATCH 178/244] pcre2: Add SOVERSION guard %ci:no-build --- packages/pcre2/build.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/packages/pcre2/build.sh b/packages/pcre2/build.sh index 2c076b3fa0..6cf6c39699 100644 --- a/packages/pcre2/build.sh +++ b/packages/pcre2/build.sh @@ -18,3 +18,20 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --enable-pcre2-16 --enable-pcre2-32 " +termux_step_post_get_source() { + # Do not forget to bump revision of reverse dependencies and rebuild them + # after SOVERSION is changed. + local _SOVER_libpcre2_8=0 + local _SOVER_libpcre2_16=0 + local _SOVER_libpcre2_32=0 + local _SOVER_libpcre2_posix=3 + + local a + for a in libpcre2_{8,16,32,posix}; do + local e=$(sed -En 's/^m4_define\('"${a}"'_version,\s*\[([0-9]+):([0-9]+):([0-9]+)\].*/\1-\3/p' \ + configure.ac) + if [ ! "${e}" ] || [ "$(eval echo \$_SOVER_${a})" != "$(( "${e}" ))" ]; then + termux_error_exit "SOVERSION guard check failed for ${a/_/-}.so." + fi + done +} From 2db283089c58bac219dec88ace59b142bc633ac1 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 14:25:51 +0900 Subject: [PATCH 179/244] setup-ubuntu.sh: Install libyaml-dev --- scripts/setup-ubuntu.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh index f50e76c99a..d826c8461e 100755 --- a/scripts/setup-ubuntu.sh +++ b/scripts/setup-ubuntu.sh @@ -123,7 +123,10 @@ PACKAGES+=" libncurses5-dev" PACKAGES+=" lua-lpeg" PACKAGES+=" lua-mpack" -# Needed by packages mkvtoolnix and ruby. +# Needed by host build of package ruby. +PACKAGES+=" libyaml-dev" + +# Needed by package mkvtoolnix. PACKAGES+=" ruby" # Needed by host build of package nodejs. From 2fb815958cac85ca385703ad7f139751f638dd66 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Fri, 23 Dec 2022 06:16:20 +0000 Subject: [PATCH 180/244] bump(main/neovim-nightly): 0.9.0-dev-546+g98daaa798 This commit has been automatically submitted by Github Actions. --- packages/neovim-nightly/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/neovim-nightly/build.sh b/packages/neovim-nightly/build.sh index cc78a7a4f5..765075ac70 100644 --- a/packages/neovim-nightly/build.sh +++ b/packages/neovim-nightly/build.sh @@ -5,9 +5,9 @@ TERMUX_PKG_MAINTAINER="Aditya Alok " # Upstream now has version number like "0.8.0-dev-698-ga5920e98f", but actually # "0.8.0-dev-698-g1ef84547a" < "0.8.0-dev-nightly-10-g1a07044c1", we need to bump # the epoch of the package version. -TERMUX_PKG_VERSION="1:0.9.0-dev-538+gf9c62ce34" +TERMUX_PKG_VERSION="1:0.9.0-dev-546+g98daaa798" TERMUX_PKG_SRCURL="https://github.com/neovim/neovim/archive/nightly.tar.gz" -TERMUX_PKG_SHA256=5d56de1d97355ba1eb27284c179eaef6a1fe29fc8d51367490b2d23d0e5348a2 +TERMUX_PKG_SHA256=e4dec862d17eb908bc996fdf624f82aeb11c034ff9205b5c5ed66ebc18134f1c TERMUX_PKG_DEPENDS="libiconv, libuv, luv, libmsgpack, libandroid-support, libvterm, libtermkey, libluajit, libunibilium, libtreesitter" TERMUX_PKG_HOSTBUILD=true From 04fcb83f716b177e376683d70d77c8868f7da287 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Fri, 23 Dec 2022 06:18:33 +0000 Subject: [PATCH 181/244] bump(x11/gl4es): 1.1.4.20221217.193318gf5dda93a This commit has been automatically submitted by Github Actions. --- x11-packages/gl4es/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/x11-packages/gl4es/build.sh b/x11-packages/gl4es/build.sh index 88d40cefb7..e8bcb155fa 100644 --- a/x11-packages/gl4es/build.sh +++ b/x11-packages/gl4es/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://ptitseb.github.io/gl4es/ TERMUX_PKG_DESCRIPTION="OpenGL driver for GLES devices" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -_COMMIT=3e1a355713d82978c9bcf467aab2e3b273b77384 -_COMMIT_DATE=20221216 -_COMMIT_TIME=213930 -TERMUX_PKG_VERSION="1.1.4.20221216.213930g3e1a3557" +_COMMIT=f5dda93ac7eaf1e3a44b1ee5585a6bf61d0656c5 +_COMMIT_DATE=20221217 +_COMMIT_TIME=193318 +TERMUX_PKG_VERSION="1.1.4.20221217.193318gf5dda93a" TERMUX_PKG_SRCURL=https://github.com/ptitSeb/gl4es.git TERMUX_PKG_GIT_BRANCH=master TERMUX_PKG_DEPENDS="libx11" From 3129b907b1474b419ed316d9c63decd4679a3f99 Mon Sep 17 00:00:00 2001 From: aicynide <97217381+aicynide@users.noreply.github.com> Date: Thu, 22 Dec 2022 20:58:38 +0000 Subject: [PATCH 182/244] matterbridge: build with whatsapp multiple devices support --- packages/matterbridge/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/matterbridge/build.sh b/packages/matterbridge/build.sh index 8bbe9a42da..cc86849cc2 100644 --- a/packages/matterbridge/build.sh +++ b/packages/matterbridge/build.sh @@ -23,7 +23,7 @@ termux_step_pre_configure() { } termux_step_make() { - go build + go build -tags whatsappmulti } termux_step_make_install() { From 83cc96d9a6249adf50fef2571817c9eb91094282 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 16:26:10 +0900 Subject: [PATCH 183/244] matterbridge: Revbump as a follow-up of commit 3129b907b1474b419ed316d9c63decd4679a3f99. --- packages/matterbridge/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/matterbridge/build.sh b/packages/matterbridge/build.sh index cc86849cc2..7f18947590 100644 --- a/packages/matterbridge/build.sh +++ b/packages/matterbridge/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A simple chat bridge" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="1.25.2" -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://github.com/42wim/matterbridge/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=e078a4776b1082230ea0b8146613679c23d3b0d322706c987261df987a04bfc5 TERMUX_PKG_DEPENDS="libc++" From 0600adf783ab0dcb7683ccc7872754bad96a1d8a Mon Sep 17 00:00:00 2001 From: Uchiha Kakashi <45286352+licy183@users.noreply.github.com> Date: Fri, 23 Dec 2022 00:16:37 +0800 Subject: [PATCH 184/244] mesa: enable gbm --- packages/mesa/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/mesa/build.sh b/packages/mesa/build.sh index 4b467549df..453acea4e3 100644 --- a/packages/mesa/build.sh +++ b/packages/mesa/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_LICENSE_FILE="docs/license.rst" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=22.3.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://archive.mesa3d.org/mesa-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=3c9cd611c0859d307aba0659833386abdca4c86162d3c275ba5be62d16cf31eb TERMUX_PKG_DEPENDS="libandroid-shmem, libc++, libdrm, libexpat, libx11, libxext, libxfixes, libxshmfence, libxxf86vm, ncurses, zlib, zstd" @@ -15,7 +16,7 @@ TERMUX_PKG_REPLACES="libmesa" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --cmake-prefix-path $TERMUX_PREFIX -Dcpp_rtti=false --Dgbm=disabled +-Dgbm=enabled -Dopengl=true -Degl=enabled -Degl-native-platform=x11 From 88df3a3aa42a26a3a1b133baa5029390cca596b3 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Thu, 22 Dec 2022 22:49:18 +0900 Subject: [PATCH 185/244] new package: xorg-setxkbmap --- x11-packages/xorg-setxkbmap/build.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 x11-packages/xorg-setxkbmap/build.sh diff --git a/x11-packages/xorg-setxkbmap/build.sh b/x11-packages/xorg-setxkbmap/build.sh new file mode 100644 index 0000000000..80eb8d4594 --- /dev/null +++ b/x11-packages/xorg-setxkbmap/build.sh @@ -0,0 +1,10 @@ +TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/ +TERMUX_PKG_DESCRIPTION="Set the keyboard using the X Keyboard Extension" +# License: HPND +TERMUX_PKG_LICENSE="custom" +TERMUX_PKG_LICENSE_FILE="COPYING" +TERMUX_PKG_MAINTAINER="@termux" +TERMUX_PKG_VERSION=1.3.3 +TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/app/setxkbmap-${TERMUX_PKG_VERSION}.tar.xz +TERMUX_PKG_SHA256=b560c678da6930a0da267304fa3a41cc5df39a96a5e23d06f14984c87b6f587b +TERMUX_PKG_DEPENDS="libx11, libxkbfile, libxrandr" From 6c61f1321e2cb4f0e8a26cb19bf6e575f5e38ac0 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 15:22:04 +0900 Subject: [PATCH 186/244] {lib,}mediainfo: Bump to 22.12 --- packages/libmediainfo/build.sh | 4 ++-- packages/mediainfo/build.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/libmediainfo/build.sh b/packages/libmediainfo/build.sh index 520983e7eb..54f5453b78 100644 --- a/packages/libmediainfo/build.sh +++ b/packages/libmediainfo/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Library for reading information from media files" TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_LICENSE_FILE="../../../LICENSE" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=22.09 +TERMUX_PKG_VERSION=22.12 TERMUX_PKG_SRCURL=https://mediaarea.net/download/source/libmediainfo/${TERMUX_PKG_VERSION}/libmediainfo_${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=ea797dfc3d1f41408915945b22eba2d6d4d9f27ab2b31a37fe907cf7ab1e3384 +TERMUX_PKG_SHA256=fd8f69a74ff66e057b94e9fc3450adb9679f85655d73e5fef335f3f554de0cfc TERMUX_PKG_DEPENDS="libc++, libcurl, libzen, zlib" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-shared --enable-static --with-libcurl" diff --git a/packages/mediainfo/build.sh b/packages/mediainfo/build.sh index 365ea5fcd7..9f52abfff8 100644 --- a/packages/mediainfo/build.sh +++ b/packages/mediainfo/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Command-line utility for reading information from media TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_LICENSE_FILE="../../../LICENSE" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=22.09 +TERMUX_PKG_VERSION=22.12 TERMUX_PKG_SRCURL=https://mediaarea.net/download/source/mediainfo/${TERMUX_PKG_VERSION}/mediainfo_${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=67f301276a2b82d76cb9f4bd525caa51d2dc6d4359fce774fbd5f25f1d513044 +TERMUX_PKG_SHA256=932b82739f738e7db603cf5bb170720731a9e7c61d145c2a54aabb3cd0b753bc TERMUX_PKG_DEPENDS="libandroid-support, libc++, libmediainfo, libzen" termux_step_pre_configure() { From 01194a1fe48c72e417fc68b72492af5e13466803 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 15:46:31 +0900 Subject: [PATCH 187/244] libzen: Backport `BitStream_Fast: Resize()` --- packages/libzen/build.sh | 2 +- .../libzen-0.4.39-BitStream_Fast-Resize.patch | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 packages/libzen/libzen-0.4.39-BitStream_Fast-Resize.patch diff --git a/packages/libzen/build.sh b/packages/libzen/build.sh index b7a6ec875b..6c7e6ffc2f 100644 --- a/packages/libzen/build.sh +++ b/packages/libzen/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="ZLIB" TERMUX_PKG_LICENSE_FILE="../../../License.txt" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.4.39 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://mediaarea.net/download/source/libzen/${TERMUX_PKG_VERSION}/libzen_${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=bbf877062227828ccca63d36af04a16789f3f1013e0c99f6dfd908bf5f2dbe43 TERMUX_PKG_DEPENDS="libandroid-support, libc++" diff --git a/packages/libzen/libzen-0.4.39-BitStream_Fast-Resize.patch b/packages/libzen/libzen-0.4.39-BitStream_Fast-Resize.patch new file mode 100644 index 0000000000..10aa45fa27 --- /dev/null +++ b/packages/libzen/libzen-0.4.39-BitStream_Fast-Resize.patch @@ -0,0 +1,30 @@ +From 47cee723de9616f1a4b406b17dbd1c75d7a4b0aa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Martinez?= +Date: Tue, 13 Dec 2022 09:30:32 +0100 +Subject: [PATCH] + BitStream_Fast: Resize() + +--- + Source/ZenLib/BitStream_Fast.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/Source/ZenLib/BitStream_Fast.h b/Source/ZenLib/BitStream_Fast.h +index 8f579f3..bbf6f39 100644 +--- a/Source/ZenLib/BitStream_Fast.h ++++ b/Source/ZenLib/BitStream_Fast.h +@@ -403,6 +403,13 @@ public: + return Buffer_Size%8; + } + ++ inline void Resize(size_t Size_) //Size_ is the new count of remaining bits, must have the same alignment as Remain() ++ { ++ if (BufferUnderRun && Size_>Buffer_Size) ++ BufferUnderRun=false; ++ Buffer_Size=Size_; ++ } ++ + private : + const int8u* Buffer; + size_t Buffer_Size; +-- +2.38.0 + From dcb56559818c82bf0549b50ab0686f50cb2294cc Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Thu, 22 Dec 2022 23:28:35 +0900 Subject: [PATCH 188/244] ffmpeg: Enable libzimg --- packages/ffmpeg/build.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/ffmpeg/build.sh b/packages/ffmpeg/build.sh index c40b97d302..a65051d2a9 100644 --- a/packages/ffmpeg/build.sh +++ b/packages/ffmpeg/build.sh @@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="Tools and libraries to manipulate a wide range of multim TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=5.1.2 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://www.ffmpeg.org/releases/ffmpeg-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=619e706d662c8420859832ddc259cd4d4096a48a2ce1eefd052db9e440eef3dc -TERMUX_PKG_DEPENDS="freetype, game-music-emu, libaom, libandroid-glob, libass, libbluray, libbz2, libdav1d, libgnutls, libiconv, liblzma, libmp3lame, libopus, librav1e, libsoxr, libtheora, libvorbis, libvpx, libvidstab, libwebp, libx264, libx265, libxml2, littlecms, ocl-icd, xvidcore, zlib" +TERMUX_PKG_DEPENDS="freetype, game-music-emu, libaom, libandroid-glob, libass, libbluray, libbz2, libdav1d, libgnutls, libiconv, liblzma, libmp3lame, libopus, librav1e, libsoxr, libtheora, libvorbis, libvpx, libvidstab, libwebp, libx264, libx265, libxml2, libzimg, littlecms, ocl-icd, xvidcore, zlib" TERMUX_PKG_BUILD_DEPENDS="opencl-headers" TERMUX_PKG_CONFLICTS="libav" TERMUX_PKG_BREAKS="ffmpeg-dev" @@ -56,21 +56,22 @@ termux_step_configure() { --enable-libass \ --enable-libbluray \ --enable-libdav1d \ + --enable-libfreetype \ --enable-libgme \ --enable-libmp3lame \ - --enable-libfreetype \ - --enable-libvorbis \ --enable-libopus \ --enable-librav1e \ --enable-libsoxr \ - --enable-libx264 \ - --enable-libx265 \ - --enable-libxvid \ + --enable-libtheora \ --enable-libvidstab \ + --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ + --enable-libx264 \ + --enable-libx265 \ --enable-libxml2 \ - --enable-libtheora \ + --enable-libxvid \ + --enable-libzimg \ --enable-opencl \ --enable-shared \ --prefix="$TERMUX_PREFIX" \ From e557d27fb7e9917f67de6a281defa528dd2c317c Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 05:37:37 +0900 Subject: [PATCH 189/244] ffmpeg: Add SOVERSION guard --- packages/ffmpeg/build.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/packages/ffmpeg/build.sh b/packages/ffmpeg/build.sh index a65051d2a9..daed651dff 100644 --- a/packages/ffmpeg/build.sh +++ b/packages/ffmpeg/build.sh @@ -12,6 +12,23 @@ TERMUX_PKG_CONFLICTS="libav" TERMUX_PKG_BREAKS="ffmpeg-dev" TERMUX_PKG_REPLACES="ffmpeg-dev" +termux_step_post_get_source() { + # Do not forget to bump revision of reverse dependencies and rebuild them + # after SOVERSION is changed. + local _SOVER_avutil=57 + local _SOVER_avcodec=59 + local _SOVER_avformat=59 + + local f + for f in util codec format; do + local v=$(sh ffbuild/libversion.sh av${f} \ + libav${f}/version.h libav${f}/version_major.h \ + | sed -En 's/^libav'"${f}"'_VERSION_MAJOR=([0-9]+)$/\1/p') + if [ ! "${v}" ] || [ "$(eval echo \$_SOVER_av${f})" != "${v}" ]; then + termux_error_exit "SOVERSION guard check failed for libav${f}.so." + fi + done +} termux_step_configure() { cd $TERMUX_PKG_BUILDDIR From bff9c85883c386c4046fbf20e1edcac569d91502 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Fri, 23 Dec 2022 12:20:54 +0000 Subject: [PATCH 190/244] bump(main/hugo): 0.109.0 This commit has been automatically submitted by Github Actions. --- packages/hugo/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/hugo/build.sh b/packages/hugo/build.sh index ab08f6b08b..b865530e6a 100644 --- a/packages/hugo/build.sh +++ b/packages/hugo/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://gohugo.io/ TERMUX_PKG_DESCRIPTION="A fast and flexible static site generator" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.108.0" +TERMUX_PKG_VERSION="0.109.0" TERMUX_PKG_SRCURL=https://github.com/gohugoio/hugo/archive/v$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=dc90e9de22ce87c22063ce9c309cefacba89269a21eb369ed556b90b22b190c5 +TERMUX_PKG_SHA256=35a5ba92057fe2c20b2218c374e762887021e978511d19bbe81ce4d9c21f0c78 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="libc++" From ae51441d7457f58f40d4e1e3c20b961b6a180316 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Fri, 23 Dec 2022 18:12:08 +0000 Subject: [PATCH 191/244] bump(main/gh): 2.21.1 This commit has been automatically submitted by Github Actions. --- packages/gh/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/gh/build.sh b/packages/gh/build.sh index c3cc3e2220..6ca9b766c4 100644 --- a/packages/gh/build.sh +++ b/packages/gh/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://cli.github.com/ TERMUX_PKG_DESCRIPTION="GitHub’s official command line tool" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Krishna kanhaiya @kcubeterm" -TERMUX_PKG_VERSION="2.21.0" +TERMUX_PKG_VERSION="2.21.1" TERMUX_PKG_SRCURL=https://github.com/cli/cli/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=081d3c203b37068e0df47f05832c8154b969ffbea30c72ea7073514130d23d71 +TERMUX_PKG_SHA256=7c57f77ce5c8f1f418582b891224cedb364672f397251a1c593b8875f7c34f87 TERMUX_PKG_AUTO_UPDATE=true termux_step_make() { From bb0401cebd1067e53227767c758835e39b18717c Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sat, 24 Dec 2022 00:16:44 +0000 Subject: [PATCH 192/244] bump(main/box86): 0.2.8.20221222.073809gc83f21cc This commit has been automatically submitted by Github Actions. --- packages/box86/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/box86/build.sh b/packages/box86/build.sh index 7ba0ff7b61..46cacb6222 100644 --- a/packages/box86/build.sh +++ b/packages/box86/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://ptitseb.github.io/box86/ TERMUX_PKG_DESCRIPTION="Linux Userspace x86 Emulator" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -_COMMIT=3313d7a1589c022dcd392d02416195b1d8170fb4 -_COMMIT_DATE=20221217 -_COMMIT_TIME=145445 -TERMUX_PKG_VERSION="0.2.8.20221217.145445g3313d7a1" +_COMMIT=c83f21cc38150d4859084d0d66de5222a80c70eb +_COMMIT_DATE=20221222 +_COMMIT_TIME=073809 +TERMUX_PKG_VERSION="0.2.8.20221222.073809gc83f21cc" TERMUX_PKG_SRCURL=https://github.com/ptitSeb/box86.git TERMUX_PKG_GIT_BRANCH=master TERMUX_PKG_DEPENDS="libandroid-complex-math, libandroid-glob, libandroid-spawn, libandroid-sysv-semaphore" From d15d237a8d65ed3f4c5cc89b759a2c12cace5966 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sat, 24 Dec 2022 01:21:43 +0000 Subject: [PATCH 193/244] bump(main/clvk): 0.0.20221218.130921g6ccb8a03 This commit has been automatically submitted by Github Actions. --- packages/clvk/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/clvk/build.sh b/packages/clvk/build.sh index bc8f839a05..c46ec3de8b 100644 --- a/packages/clvk/build.sh +++ b/packages/clvk/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/kpet/clvk TERMUX_PKG_DESCRIPTION="Experimental implementation of OpenCL on Vulkan" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" -_COMMIT=aa063509312b49d3bab6fd1d30c9fb744e624b9d -_COMMIT_DATE=20221217 -_COMMIT_TIME=163536 -TERMUX_PKG_VERSION="0.0.20221217.163536gaa063509" +_COMMIT=6ccb8a03069c0a92edf9aa0c22a9fa64274f7f21 +_COMMIT_DATE=20221218 +_COMMIT_TIME=130921 +TERMUX_PKG_VERSION="0.0.20221218.130921g6ccb8a03" TERMUX_PKG_SRCURL=https://github.com/kpet/clvk.git TERMUX_PKG_GIT_BRANCH=main TERMUX_PKG_BUILD_DEPENDS="vulkan-headers, vulkan-loader-android" From a25fb0df2135d11c1093bf2363b494d89b39afd6 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sat, 24 Dec 2022 01:27:34 +0000 Subject: [PATCH 194/244] bump(main/rclone): 1.61.1 This commit has been automatically submitted by Github Actions. --- packages/rclone/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/rclone/build.sh b/packages/rclone/build.sh index c634a89856..250625bf5f 100644 --- a/packages/rclone/build.sh +++ b/packages/rclone/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://rclone.org/ TERMUX_PKG_DESCRIPTION="rsync for cloud storage" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.61.0 +TERMUX_PKG_VERSION="1.61.1" TERMUX_PKG_SRCURL=https://github.com/rclone/rclone/releases/download/v${TERMUX_PKG_VERSION}/rclone-v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=dedc5cd6e34d8636eab14c6ea858d1b83de7b546b69eb5538ea6a2ec69a8b5d5 +TERMUX_PKG_SHA256=34b5f52047741c7bbf54572c02cc9998489c4736a753af3c99255296b1af125d TERMUX_PKG_AUTO_UPDATE=true termux_step_make_install() { From 865c3aa0435de8a3ff05dd81a50964d9572c4937 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 06:33:38 +0900 Subject: [PATCH 195/244] webkit2gtk-4.1: Bump to 2.38.3 --- x11-packages/webkit2gtk-4.1/build.sh | 4 ++-- .../gir/{2.38.2 => 2.38.3}/JavaScriptCore-4.1.xml | 0 .../webkit2gtk-4.1/gir/{2.38.2 => 2.38.3}/WebKit2-4.1.xml | 0 .../gir/{2.38.2 => 2.38.3}/WebKit2WebExtension-4.1.xml | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename x11-packages/webkit2gtk-4.1/gir/{2.38.2 => 2.38.3}/JavaScriptCore-4.1.xml (100%) rename x11-packages/webkit2gtk-4.1/gir/{2.38.2 => 2.38.3}/WebKit2-4.1.xml (100%) rename x11-packages/webkit2gtk-4.1/gir/{2.38.2 => 2.38.3}/WebKit2WebExtension-4.1.xml (100%) diff --git a/x11-packages/webkit2gtk-4.1/build.sh b/x11-packages/webkit2gtk-4.1/build.sh index 85a4d71cfe..74e25a13f4 100644 --- a/x11-packages/webkit2gtk-4.1/build.sh +++ b/x11-packages/webkit2gtk-4.1/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://webkitgtk.org TERMUX_PKG_DESCRIPTION="A full-featured port of the WebKit rendering engine" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=2.38.2 +TERMUX_PKG_VERSION=2.38.3 TERMUX_PKG_SRCURL=https://webkitgtk.org/releases/webkitgtk-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=f3eb82899651f583b4d99cacd16af784a1a7710fce9e7b6807bd6ccde909fe3e +TERMUX_PKG_SHA256=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a TERMUX_PKG_DEPENDS="atk, enchant, fontconfig, freetype, glib, gst-plugins-base, gst-plugins-good, gstreamer, gtk3, harfbuzz, harfbuzz-icu, libc++, libcairo, libgcrypt, libhyphen, libicu, libjpeg-turbo, libpng, libsoup3, libtasn1, libwebp, libxml2, libx11, libxcomposite, libxdamage, libxslt, libxt, littlecms, openjpeg, pango, woff2" TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner, xorgproto" TERMUX_PKG_DISABLE_GIR=false diff --git a/x11-packages/webkit2gtk-4.1/gir/2.38.2/JavaScriptCore-4.1.xml b/x11-packages/webkit2gtk-4.1/gir/2.38.3/JavaScriptCore-4.1.xml similarity index 100% rename from x11-packages/webkit2gtk-4.1/gir/2.38.2/JavaScriptCore-4.1.xml rename to x11-packages/webkit2gtk-4.1/gir/2.38.3/JavaScriptCore-4.1.xml diff --git a/x11-packages/webkit2gtk-4.1/gir/2.38.2/WebKit2-4.1.xml b/x11-packages/webkit2gtk-4.1/gir/2.38.3/WebKit2-4.1.xml similarity index 100% rename from x11-packages/webkit2gtk-4.1/gir/2.38.2/WebKit2-4.1.xml rename to x11-packages/webkit2gtk-4.1/gir/2.38.3/WebKit2-4.1.xml diff --git a/x11-packages/webkit2gtk-4.1/gir/2.38.2/WebKit2WebExtension-4.1.xml b/x11-packages/webkit2gtk-4.1/gir/2.38.3/WebKit2WebExtension-4.1.xml similarity index 100% rename from x11-packages/webkit2gtk-4.1/gir/2.38.2/WebKit2WebExtension-4.1.xml rename to x11-packages/webkit2gtk-4.1/gir/2.38.3/WebKit2WebExtension-4.1.xml From 5829aee3f5d73a0e4f505dea0959b49c94a921e1 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sat, 24 Dec 2022 13:29:52 +0900 Subject: [PATCH 196/244] graphviz: Bump to 7.0.5 --- packages/graphviz/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/graphviz/build.sh b/packages/graphviz/build.sh index 8d1fa84762..4bef39a890 100644 --- a/packages/graphviz/build.sh +++ b/packages/graphviz/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.graphviz.org/ TERMUX_PKG_DESCRIPTION="Rich set of graph drawing tools" TERMUX_PKG_LICENSE="EPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=7.0.4 +TERMUX_PKG_VERSION=7.0.5 TERMUX_PKG_SRCURL=https://gitlab.com/graphviz/graphviz/-/archive/$TERMUX_PKG_VERSION/graphviz-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=85b74fa020984b7439c0373c88590a43a4a28934e54643afe8f18d32ae4bf438 +TERMUX_PKG_SHA256=8ec9ada2159ef530defba608ad9b9fa569b58d44f4781a34eee5c2601c3e5b61 TERMUX_PKG_DEPENDS="fontconfig, freetype, gdk-pixbuf, glib, harfbuzz, libandroid-glob, libc++, libcairo, libexpat, libgd, libltdl, librsvg, libwebp, pango, zlib" TERMUX_PKG_BREAKS="graphviz-dev" TERMUX_PKG_REPLACES="graphviz-dev" From dab07aae1308fad98c1f7bef9145960d0917864a Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sat, 24 Dec 2022 13:31:22 +0900 Subject: [PATCH 197/244] libsigc++-3.0: Bump to 3.4.0 --- packages/libsigc++-3.0/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/libsigc++-3.0/build.sh b/packages/libsigc++-3.0/build.sh index 3e23b718cc..07e6625b0a 100644 --- a/packages/libsigc++-3.0/build.sh +++ b/packages/libsigc++-3.0/build.sh @@ -2,11 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://libsigcplusplus.github.io/libsigcplusplus/ TERMUX_PKG_DESCRIPTION="Implements a typesafe callback system for standard C++" TERMUX_PKG_LICENSE="LGPL-3.0" TERMUX_PKG_MAINTAINER="@termux" -_MAJOR_VERSION=3.2 +_MAJOR_VERSION=3.4 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.0 -TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://download.gnome.org/sources/libsigc++/${_MAJOR_VERSION}/libsigc++-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=8cdcb986e3f0a7c5b4474aa3c833d676e62469509f4899110ddf118f04082651 +TERMUX_PKG_SHA256=02e2630ffb5ce93cd52c38423521dfe7063328863a6e96d41d765a6116b8707e TERMUX_PKG_DEPENDS="libc++" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -Dbuild-examples=false From cfa4ece023598f228aeeaaa13b4b4969a2479f4d Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sat, 24 Dec 2022 13:34:09 +0900 Subject: [PATCH 198/244] libzen: Bump to 0.4.40 --- packages/libzen/build.sh | 5 ++-- .../libzen-0.4.39-BitStream_Fast-Resize.patch | 30 ------------------- 2 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 packages/libzen/libzen-0.4.39-BitStream_Fast-Resize.patch diff --git a/packages/libzen/build.sh b/packages/libzen/build.sh index 6c7e6ffc2f..77c54871bd 100644 --- a/packages/libzen/build.sh +++ b/packages/libzen/build.sh @@ -3,10 +3,9 @@ TERMUX_PKG_DESCRIPTION="ZenLib C++ utility library" TERMUX_PKG_LICENSE="ZLIB" TERMUX_PKG_LICENSE_FILE="../../../License.txt" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=0.4.39 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_VERSION=0.4.40 TERMUX_PKG_SRCURL=https://mediaarea.net/download/source/libzen/${TERMUX_PKG_VERSION}/libzen_${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=bbf877062227828ccca63d36af04a16789f3f1013e0c99f6dfd908bf5f2dbe43 +TERMUX_PKG_SHA256=54d492552d97004d5323a9f1bdf397af4ffe20ae633c5f7874d073a21388c805 TERMUX_PKG_DEPENDS="libandroid-support, libc++" TERMUX_PKG_BUILD_DEPENDS="libandroid-glob" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-shared --enable-static" diff --git a/packages/libzen/libzen-0.4.39-BitStream_Fast-Resize.patch b/packages/libzen/libzen-0.4.39-BitStream_Fast-Resize.patch deleted file mode 100644 index 10aa45fa27..0000000000 --- a/packages/libzen/libzen-0.4.39-BitStream_Fast-Resize.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 47cee723de9616f1a4b406b17dbd1c75d7a4b0aa Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Martinez?= -Date: Tue, 13 Dec 2022 09:30:32 +0100 -Subject: [PATCH] + BitStream_Fast: Resize() - ---- - Source/ZenLib/BitStream_Fast.h | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/Source/ZenLib/BitStream_Fast.h b/Source/ZenLib/BitStream_Fast.h -index 8f579f3..bbf6f39 100644 ---- a/Source/ZenLib/BitStream_Fast.h -+++ b/Source/ZenLib/BitStream_Fast.h -@@ -403,6 +403,13 @@ public: - return Buffer_Size%8; - } - -+ inline void Resize(size_t Size_) //Size_ is the new count of remaining bits, must have the same alignment as Remain() -+ { -+ if (BufferUnderRun && Size_>Buffer_Size) -+ BufferUnderRun=false; -+ Buffer_Size=Size_; -+ } -+ - private : - const int8u* Buffer; - size_t Buffer_Size; --- -2.38.0 - From cd3711936d70a1497ae6183e3887f26fc9706792 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 00:56:43 +0900 Subject: [PATCH 199/244] gitoxide: Fix auto-update %ci:no-build --- packages/gitoxide/build.sh | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/packages/gitoxide/build.sh b/packages/gitoxide/build.sh index 620b280fb3..f2b2670723 100644 --- a/packages/gitoxide/build.sh +++ b/packages/gitoxide/build.sh @@ -1,14 +1,27 @@ TERMUX_PKG_HOMEPAGE=https://github.com/Byron/gitoxide TERMUX_PKG_DESCRIPTION="Rust implementation of Git" -TERMUX_PKG_LICENSE="MIT,Apache-2.0" +TERMUX_PKG_LICENSE="Apache-2.0, MIT" +TERMUX_PKG_LICENSE_FILE="LICENSE-APACHE, LICENSE-MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.1.0 _RELEASE_PREFIX="git-hashtable" TERMUX_PKG_SRCURL=https://github.com/Byron/gitoxide/archive/refs/tags/${_RELEASE_PREFIX}-v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=33f761b9e6bb268a2ad725bf88e85808e4a9c7e06cface2fd637ac14dc2382fc TERMUX_PKG_AUTO_UPDATE=true +TERMUX_PKG_UPDATE_VERSION_REGEXP="\d+\.\d+\.\d+" TERMUX_PKG_BUILD_IN_SRC=true -TERMUX_PKG_LICENSE_FILE="LICENSE-APACHE, LICENSE-MIT" + +termux_pkg_auto_update() { + # Get latest release tag: + local tag + tag="$(termux_github_api_get_tag "${TERMUX_PKG_SRCURL}")" + # check if this is not a ${_RELEASE_PREFIX} release: + if grep -qP "^${_RELEASE_PREFIX}-v${TERMUX_PKG_UPDATE_VERSION_REGEXP}\$" <<<"$tag"; then + termux_pkg_upgrade_version "$tag" + else + echo "WARNING: Skipping auto-update: Not a ${_RELEASE_PREFIX} release($tag)" + fi +} termux_step_pre_configure() { termux_setup_cmake From 6fcf5b8beab839f25da94dc7c38e54a79bd91187 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sat, 24 Dec 2022 14:41:03 +0900 Subject: [PATCH 200/244] libsigc++-2.0: Bump to 2.12.0 --- packages/libsigc++-2.0/build.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/libsigc++-2.0/build.sh b/packages/libsigc++-2.0/build.sh index 5139789e83..7350dd12b2 100644 --- a/packages/libsigc++-2.0/build.sh +++ b/packages/libsigc++-2.0/build.sh @@ -2,11 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://libsigcplusplus.github.io/libsigcplusplus/ TERMUX_PKG_DESCRIPTION="Implements a typesafe callback system for standard C++" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" -_MAJOR_VERSION=2.10 -TERMUX_PKG_VERSION=${_MAJOR_VERSION}.8 -TERMUX_PKG_REVISION=1 +_MAJOR_VERSION=2.12 +TERMUX_PKG_VERSION=${_MAJOR_VERSION}.0 TERMUX_PKG_SRCURL=https://download.gnome.org/sources/libsigc++/${_MAJOR_VERSION}/libsigc++-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=235a40bec7346c7b82b6a8caae0456353dc06e71f14bc414bcc858af1838719a +TERMUX_PKG_SHA256=1c466d2e64b34f9b118976eb21b138c37ed124d0f61497df2a90ce6c3d9fa3b5 TERMUX_PKG_DEPENDS="libc++" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -Dbuild-examples=false From 0d7b5c03e1480c3ad285220b77a17de66a51e487 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sat, 24 Dec 2022 06:22:09 +0000 Subject: [PATCH 201/244] bump(main/neovim-nightly): 0.9.0-dev-552+g4d4e697ef This commit has been automatically submitted by Github Actions. --- packages/neovim-nightly/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/neovim-nightly/build.sh b/packages/neovim-nightly/build.sh index 765075ac70..adc2023dbc 100644 --- a/packages/neovim-nightly/build.sh +++ b/packages/neovim-nightly/build.sh @@ -5,9 +5,9 @@ TERMUX_PKG_MAINTAINER="Aditya Alok " # Upstream now has version number like "0.8.0-dev-698-ga5920e98f", but actually # "0.8.0-dev-698-g1ef84547a" < "0.8.0-dev-nightly-10-g1a07044c1", we need to bump # the epoch of the package version. -TERMUX_PKG_VERSION="1:0.9.0-dev-546+g98daaa798" +TERMUX_PKG_VERSION="1:0.9.0-dev-552+g4d4e697ef" TERMUX_PKG_SRCURL="https://github.com/neovim/neovim/archive/nightly.tar.gz" -TERMUX_PKG_SHA256=e4dec862d17eb908bc996fdf624f82aeb11c034ff9205b5c5ed66ebc18134f1c +TERMUX_PKG_SHA256=88b4626160e3eac00ba211d514aaaf508c10dd0c947c2fe94c47e8c7fc968477 TERMUX_PKG_DEPENDS="libiconv, libuv, luv, libmsgpack, libandroid-support, libvterm, libtermkey, libluajit, libunibilium, libtreesitter" TERMUX_PKG_HOSTBUILD=true From ba9f933204aa1e96b3f6eef19f47759ea2af433e Mon Sep 17 00:00:00 2001 From: Raven Ravener Date: Sat, 24 Dec 2022 06:15:51 +0000 Subject: [PATCH 202/244] libenet: add package --- packages/libenet/build.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/libenet/build.sh diff --git a/packages/libenet/build.sh b/packages/libenet/build.sh new file mode 100644 index 0000000000..6c896b6bc4 --- /dev/null +++ b/packages/libenet/build.sh @@ -0,0 +1,11 @@ +TERMUX_PKG_HOMEPAGE=http://enet.bespin.org +TERMUX_PKG_DESCRIPTION="ENet reliable UDP networking library" +TERMUX_PKG_LICENSE="MIT" +TERMUX_PKG_MAINTAINER="@ravener" +TERMUX_PKG_VERSION=1.3.17 +TERMUX_PKG_SRCURL=http://enet.bespin.org/download/enet-${TERMUX_PKG_VERSION}.tar.gz +TERMUX_PKG_SHA256=a38f0f194555d558533b8b15c0c478e946310022d0ec7b34334e19e4574dcedc + +termux_step_pre_configure() { + autoreconf -vfi +} From c33fa7bcb9121e1400080063f80c626548813c3c Mon Sep 17 00:00:00 2001 From: xtkoba <69125751+xtkoba@users.noreply.github.com> Date: Sat, 24 Dec 2022 08:11:11 +0000 Subject: [PATCH 203/244] stale.yml: Add additional label to exemptLabels --- .github/stale.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/stale.yml b/.github/stale.yml index 9a4e9b047d..8e3ec5f701 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -2,6 +2,8 @@ daysUntilStale: 45 daysUntilClose: 14 exemptLabels: + - "WIP" + - "discussion" - "not stale" - "package request" From 430697aa2a41c1af5615ef7147e303f9d1d7b447 Mon Sep 17 00:00:00 2001 From: xtkoba <69125751+xtkoba@users.noreply.github.com> Date: Sat, 24 Dec 2022 17:21:59 +0900 Subject: [PATCH 204/244] stale.yml: And more --- .github/stale.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/stale.yml b/.github/stale.yml index 8e3ec5f701..00dfe241c1 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -4,6 +4,7 @@ daysUntilClose: 14 exemptLabels: - "WIP" - "discussion" + - "information" - "not stale" - "package request" From d1acd807dc4ec9d0de5d95de7463d5b6d77eea1f Mon Sep 17 00:00:00 2001 From: xtkoba <69125751+xtkoba@users.noreply.github.com> Date: Sat, 24 Dec 2022 17:27:13 +0900 Subject: [PATCH 205/244] stale.yml: And more --- .github/stale.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/stale.yml b/.github/stale.yml index 00dfe241c1..e3bc5c23f3 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -7,6 +7,7 @@ exemptLabels: - "information" - "not stale" - "package request" + - "tracker" markComment: > This issue/PR has been automatically marked as stale because it has not had From 8644a96173c364153eadabb33be7696ffbb5fa4f Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sat, 24 Dec 2022 17:47:01 +0900 Subject: [PATCH 206/244] bug-report template: Add "untriaged" label --- .github/ISSUE_TEMPLATE/01-bug-report.yml | 2 +- .github/stale.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/01-bug-report.yml b/.github/ISSUE_TEMPLATE/01-bug-report.yml index 3f6cfe6216..976df06045 100644 --- a/.github/ISSUE_TEMPLATE/01-bug-report.yml +++ b/.github/ISSUE_TEMPLATE/01-bug-report.yml @@ -1,7 +1,7 @@ name: "Bug report" description: "Create a report to help us improve" title: "[Bug]: " -labels: ["bug report"] +labels: [untriaged, "bug report"] body: - type: markdown attributes: diff --git a/.github/stale.yml b/.github/stale.yml index e3bc5c23f3..f70079447a 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -8,6 +8,7 @@ exemptLabels: - "not stale" - "package request" - "tracker" + - "untriaged" markComment: > This issue/PR has been automatically marked as stale because it has not had From 9f7e772ba09ddbf55b16ce9e6511b49b071528cd Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sat, 24 Dec 2022 18:27:58 +0900 Subject: [PATCH 207/244] stale.yml: Ignore issues with an assignee --- .github/stale.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/stale.yml b/.github/stale.yml index f70079447a..cc2c53a522 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -10,6 +10,8 @@ exemptLabels: - "tracker" - "untriaged" +exemptAssignees: true + markComment: > This issue/PR has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you From 6f62779076cbd67821054694d0cbe57204cc09c3 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sat, 24 Dec 2022 18:39:19 +0900 Subject: [PATCH 208/244] stale.yml: Only issues --- .github/stale.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/stale.yml b/.github/stale.yml index cc2c53a522..e7de0df2e9 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -17,5 +17,7 @@ markComment: > recent activity. It will be closed if no further activity occurs. Thank you for your contributions. +only: issues + staleLabel: wontfix From 042f720729429c7a67286b64862aef07d772b0e3 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sat, 24 Dec 2022 19:14:13 +0900 Subject: [PATCH 209/244] stale.yml: Do not close issues automatically Also change the label to "stale" for stale issues as they still have chances to be fixed. --- .github/stale.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/stale.yml b/.github/stale.yml index e7de0df2e9..d7279f6127 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -1,5 +1,5 @@ daysUntilStale: 45 -daysUntilClose: 14 +daysUntilClose: false exemptLabels: - "WIP" @@ -12,12 +12,9 @@ exemptLabels: exemptAssignees: true -markComment: > - This issue/PR has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. +markComment: false only: issues -staleLabel: wontfix +staleLabel: stale From e1f91b3533088b42712ecc145bbf3adf829daa4d Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sat, 24 Dec 2022 12:12:35 +0000 Subject: [PATCH 210/244] bump(main/pocketbase): 0.10.4 This commit has been automatically submitted by Github Actions. --- packages/pocketbase/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/pocketbase/build.sh b/packages/pocketbase/build.sh index b2e60ac9ac..470223d2dc 100644 --- a/packages/pocketbase/build.sh +++ b/packages/pocketbase/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/pocketbase/pocketbase TERMUX_PKG_DESCRIPTION="An open source Go backend" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.10.3" +TERMUX_PKG_VERSION="0.10.4" TERMUX_PKG_SRCURL="https://github.com/pocketbase/pocketbase/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz" -TERMUX_PKG_SHA256=03ad29f414035a03f92b325ab1b52d8d331cf4df61a3ad752eacb6ef89fdb756 +TERMUX_PKG_SHA256=6189b7831cc03b30f467dc3622386d22c81be0120a5c3be774a501930402c31a TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_AUTO_UPDATE=true From c1f178cd6b337855406f5a19cd8556cc99f01875 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sun, 25 Dec 2022 03:23:28 +0900 Subject: [PATCH 211/244] stale.yml: Deprecate "not stale" label which is useless now that stale bot does not close issues automatically. --- .github/stale.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/stale.yml b/.github/stale.yml index d7279f6127..876d573de8 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -5,7 +5,6 @@ exemptLabels: - "WIP" - "discussion" - "information" - - "not stale" - "package request" - "tracker" - "untriaged" From 7bd8dd752eab9dd94f628a934a26d9ce1a310786 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sun, 25 Dec 2022 00:23:29 +0000 Subject: [PATCH 212/244] bump(main/lf): 28 This commit has been automatically submitted by Github Actions. --- packages/lf/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/lf/build.sh b/packages/lf/build.sh index e7019536bf..9a99b154b5 100644 --- a/packages/lf/build.sh +++ b/packages/lf/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/gokcehan/lf TERMUX_PKG_DESCRIPTION="Terminal file manager" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="27" +TERMUX_PKG_VERSION="28" TERMUX_PKG_SRCURL=https://github.com/gokcehan/lf/archive/r$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=cdd132e33387423ef9f9448e21d3f1e5c9a5319b34fdfb53cb5f49351ebac005 +TERMUX_PKG_SHA256=0ccfd2a024a3718d53ec1ed2470053b81bf824fa8b7e824d3b96eb796fc73ab6 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_VERSION_REGEXP="\d+" TERMUX_PKG_CONFFILES="etc/lf/lfrc" From 9a25355f6958f08d920c74d2d3c50cd49b8fa152 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sun, 25 Dec 2022 00:31:11 +0000 Subject: [PATCH 213/244] bump(main/ruff): 0.0.193 This commit has been automatically submitted by Github Actions. --- packages/ruff/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ruff/build.sh b/packages/ruff/build.sh index d6296a9003..4f53417ed8 100644 --- a/packages/ruff/build.sh +++ b/packages/ruff/build.sh @@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE="https://github.com/charliermarsh/ruff" TERMUX_PKG_DESCRIPTION="An extremely fast Python linter, written in Rust" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.0.192" +TERMUX_PKG_VERSION="0.0.193" TERMUX_PKG_SRCURL="https://github.com/charliermarsh/ruff/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz" -TERMUX_PKG_SHA256=6b17d644599399b4883d21257b977d2f04141a46078aa9c090468030813251e8 +TERMUX_PKG_SHA256=ed29800ca1087ceeb046483ba8914c7441fc2b561d4e5ba71d57935b8b5268bb TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true From 1a1f776c2dfec7b939538674009ddf259a13f01a Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sun, 25 Dec 2022 13:58:06 +0900 Subject: [PATCH 214/244] megacmd: Fix hardcoded paths --- packages/megacmd/build.sh | 8 +++++++- packages/megacmd/sdk-src-posix-fs.cpp.patch | 13 +++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/packages/megacmd/build.sh b/packages/megacmd/build.sh index df30cbb7b8..b072650693 100644 --- a/packages/megacmd/build.sh +++ b/packages/megacmd/build.sh @@ -3,9 +3,11 @@ TERMUX_PKG_DESCRIPTION="Provides non UI access to MEGA services" TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.5.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/meganz/MEGAcmd.git TERMUX_PKG_GIT_BRANCH=${TERMUX_PKG_VERSION}_Linux -TERMUX_PKG_DEPENDS="c-ares, cryptopp, ffmpeg, freeimage, libc++, libcurl, libsodium, libsqlite, libuv, mediainfo, openssl, pcre, readline, zlib" +# dbus is required for $PREFIX/var/lib/dbus/machine-id +TERMUX_PKG_DEPENDS="c-ares, cryptopp, dbus, ffmpeg, freeimage, libc++, libcurl, libsodium, libsqlite, libuv, mediainfo, openssl, pcre, readline, zlib" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-static @@ -34,3 +36,7 @@ termux_step_post_make_install() { rm -f $_LIBPTHREAD_A fi } + +termux_step_post_massage() { + find lib -name '*.la' -delete +} diff --git a/packages/megacmd/sdk-src-posix-fs.cpp.patch b/packages/megacmd/sdk-src-posix-fs.cpp.patch index 81f18d7776..4790ed4a28 100644 --- a/packages/megacmd/sdk-src-posix-fs.cpp.patch +++ b/packages/megacmd/sdk-src-posix-fs.cpp.patch @@ -18,3 +18,16 @@ if (!MEGAjvm) { LOG_err << "No JVM found"; +@@ -1787,10 +1787,10 @@ + uuid_unparse(uuid, uuid_str); + id->append(uuid_str); + #else +- int fd = open("/etc/machine-id", O_RDONLY); ++ int fd = open("@TERMUX_PREFIX@/etc/machine-id", O_RDONLY); + if (fd < 0) + { +- fd = open("/var/lib/dbus/machine-id", O_RDONLY); ++ fd = open("@TERMUX_PREFIX@/var/lib/dbus/machine-id", O_RDONLY); + if (fd < 0) + { + return; From a8d636a2e36c14b0765c7f830a2f5ef1f8351f38 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 25 Dec 2022 13:35:31 +0800 Subject: [PATCH 215/244] xmake: 2.7.4 --- packages/xmake/build.sh | 8 ++++-- packages/xmake/configure.patch | 45 ++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 packages/xmake/configure.patch diff --git a/packages/xmake/build.sh b/packages/xmake/build.sh index 2941b543e5..1a470670bb 100644 --- a/packages/xmake/build.sh +++ b/packages/xmake/build.sh @@ -2,8 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://xmake.io/ TERMUX_PKG_DESCRIPTION="A cross-platform build utility based on Lua" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="Ruki Wang @waruqi" -TERMUX_PKG_VERSION="2.7.3" +TERMUX_PKG_VERSION="2.7.4" TERMUX_PKG_SRCURL=https://github.com/xmake-io/xmake/releases/download/v${TERMUX_PKG_VERSION}/xmake-v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=3e71437ad2a59d1fbbc9fba75ab4ca8d428c49beefcce86c11f6c4710dd4b6f2 +TERMUX_PKG_SHA256=d490ff8825fa53fe5abfb549310cb54a2dfef1ebd3f82e24548483772994e06a TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true + +termux_step_configure () { + $TERMUX_PKG_SRCDIR/configure --prefix=$TERMUX_PREFIX +} diff --git a/packages/xmake/configure.patch b/packages/xmake/configure.patch new file mode 100644 index 0000000000..ab56d8eced --- /dev/null +++ b/packages/xmake/configure.patch @@ -0,0 +1,45 @@ +diff --git a/configure b/configure +index 8e304282a..354bfda29 100755 +--- a/configure ++++ b/configure +@@ -612,20 +612,26 @@ if test_eq "${os_arch}" "i686"; then + os_arch="i386" + fi + +-# set the default target platform and architecture ++# set the default target platform + _target_plat_default=${os_host} + if is_host "msys"; then + _target_plat_default="mingw" + elif is_host "freebsd"; then + _target_plat_default="bsd" + fi ++ ++# set the default target architecture + _target_arch_default=${os_arch} + if is_host "msys" && test_nz "${MSYSTEM_CARCH}"; then + _target_arch_default="${MSYSTEM_CARCH}" ++elif test_nz "${TERMUX_ARCH}"; then ++ _target_arch_default="${TERMUX_ARCH}" + fi + if test_eq "${_target_arch_default}" "i686"; then + _target_arch_default="i386" + fi ++ ++# set the default target mode + _target_mode_default="release" + + # set the default project generator and build program +diff --git a/core/src/demo/xmake.sh b/core/src/demo/xmake.sh +index 0a04b8bfb..2f091b6ef 100755 +--- a/core/src/demo/xmake.sh ++++ b/core/src/demo/xmake.sh +@@ -34,6 +34,8 @@ target "demo" + add_syslinks "ws2_32" "pthread" "m" + elif is_plat "bsd"; then + add_syslinks "pthread" "m" ++ elif test_nz "${TERMUX_ARCH}"; then ++ add_syslinks "m" "dl" + else + add_syslinks "pthread" "dl" "m" "c" + fi From 2b22dbbb934fe7e4e70c741b27d29a8e9a9c8e6c Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sun, 25 Dec 2022 06:16:32 +0000 Subject: [PATCH 216/244] bump(main/neovim-nightly): 0.9.0-dev-554+g6f25623e7 This commit has been automatically submitted by Github Actions. --- packages/neovim-nightly/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/neovim-nightly/build.sh b/packages/neovim-nightly/build.sh index adc2023dbc..f48bd5b31c 100644 --- a/packages/neovim-nightly/build.sh +++ b/packages/neovim-nightly/build.sh @@ -5,9 +5,9 @@ TERMUX_PKG_MAINTAINER="Aditya Alok " # Upstream now has version number like "0.8.0-dev-698-ga5920e98f", but actually # "0.8.0-dev-698-g1ef84547a" < "0.8.0-dev-nightly-10-g1a07044c1", we need to bump # the epoch of the package version. -TERMUX_PKG_VERSION="1:0.9.0-dev-552+g4d4e697ef" +TERMUX_PKG_VERSION="1:0.9.0-dev-554+g6f25623e7" TERMUX_PKG_SRCURL="https://github.com/neovim/neovim/archive/nightly.tar.gz" -TERMUX_PKG_SHA256=88b4626160e3eac00ba211d514aaaf508c10dd0c947c2fe94c47e8c7fc968477 +TERMUX_PKG_SHA256=735b88f0b7cfdaedf3bde8250caf031c7444231c534860f5d274dece4e3f03b7 TERMUX_PKG_DEPENDS="libiconv, libuv, luv, libmsgpack, libandroid-support, libvterm, libtermkey, libluajit, libunibilium, libtreesitter" TERMUX_PKG_HOSTBUILD=true From 18d9ee845e112f90dcc78e032dd89216b45b99d3 Mon Sep 17 00:00:00 2001 From: xtkoba <69125751+xtkoba@users.noreply.github.com> Date: Sun, 25 Dec 2022 06:56:26 +0000 Subject: [PATCH 217/244] CI: Build custom Docker image properly when `scripts/properties.sh` is modified. --- .github/workflows/packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index 6f2a57ada7..0cbc57d7be 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -75,7 +75,7 @@ jobs: # Build local Docker image if setup scripts were changed. # Useful for pull requests submitting changes for both build environment and packages. - if grep -qP '^scripts/(Dockerfile|setup-android-sdk\.sh|setup-ubuntu\.sh)$' <<< "$CHANGED_FILES"; then + if grep -qP '^scripts/(Dockerfile|properties\.sh|setup-android-sdk\.sh|setup-ubuntu\.sh)$' <<< "$CHANGED_FILES"; then echo "Detected changes for environment setup scripts. Building custom Docker image now." cd ./scripts docker build -t ghcr.io/termux/package-builder:latest . From e3f0f5c17cfad0358d076985b916e4d718960dec Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sun, 25 Dec 2022 16:39:21 +0900 Subject: [PATCH 218/244] groovy: Bump to 4.0.7 --- packages/groovy/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/groovy/build.sh b/packages/groovy/build.sh index 0f6ead2747..606f84f37c 100644 --- a/packages/groovy/build.sh +++ b/packages/groovy/build.sh @@ -2,8 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://groovy-lang.org/ TERMUX_PKG_DESCRIPTION="A powerful multi-faceted programming language for the JVM platform" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=4.0.6 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=4.0.7 _JANSI_VERSION=2.4.0 _JLINE_VERSION=2.14.6 _JANSI_TAGNAME="jansi-${_JANSI_VERSION}" @@ -11,7 +10,7 @@ _JLINE2_TAGNAME="jline-${_JLINE_VERSION}" TERMUX_PKG_SRCURL=(https://groovy.jfrog.io/artifactory/dist-release-local/groovy-zips/apache-groovy-binary-$TERMUX_PKG_VERSION.zip https://github.com/fusesource/jansi/archive/refs/tags/${_JANSI_TAGNAME}.tar.gz https://github.com/jline/jline2/archive/refs/tags/${_JLINE2_TAGNAME}.tar.gz) -TERMUX_PKG_SHA256=(e3b541567e65787279f02031206589bcdf3cdaab9328d9e4d72ad23a86aa1053 +TERMUX_PKG_SHA256=(efae81322fc28b63f30edb27aa308600f08bda73fb63b51c92a89825be87fade ba18c50770eebb0b6f472254ada8608138e70045a564efa43626a09691dcf553 c6205afb214288cd8ef53f1ea1243ba9388c84b55c929f0b9e6cee7757c6efac) TERMUX_PKG_DEPENDS="libjansi (>= 2.4.0-1), openjdk-17" From 2b0164e30327785756317cca64a527fcce82a8f8 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sun, 25 Dec 2022 16:51:05 +0900 Subject: [PATCH 219/244] libretls: Bump to 3.7.0 --- packages/catgirl/build.sh | 1 + packages/libretls/build.sh | 4 ++-- packages/pounce/build.sh | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/catgirl/build.sh b/packages/catgirl/build.sh index 92d18462f3..b3359b0ce4 100644 --- a/packages/catgirl/build.sh +++ b/packages/catgirl/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A TLS-only terminal IRC client" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://git.causal.agency/catgirl/snapshot/catgirl-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=a68bfb82f625bcdf7bc5b7a6e1528fe3559bcded41f0d3c972f8b7e918bcee8e TERMUX_PKG_DEPENDS="libandroid-support, libretls, ncurses, openssl" diff --git a/packages/libretls/build.sh b/packages/libretls/build.sh index 6e895709e7..eec31ffc5f 100644 --- a/packages/libretls/build.sh +++ b/packages/libretls/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://git.causal.agency/libretls/about/ TERMUX_PKG_DESCRIPTION="libtls for OpenSSL" TERMUX_PKG_LICENSE="ISC" TERMUX_PKG_MAINTAINER="@Yonle " -TERMUX_PKG_VERSION=3.5.2 +TERMUX_PKG_VERSION=3.7.0 TERMUX_PKG_SRCURL=https://git.causal.agency/libretls/snapshot/libretls-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=3cbf2e75a6d617fb98d7cf433d1eb4aa105befee6c12971a20b3410bd150bc53 +TERMUX_PKG_SHA256=cd72a37e93f8376c2e6310d30d39cda3d0f358bf3763d3ff22faf2454c3b25ed TERMUX_PKG_DEPENDS="openssl" TERMUX_PKG_REPLACES="libtls" TERMUX_PKG_PROVIDES="libtls" diff --git a/packages/pounce/build.sh b/packages/pounce/build.sh index 82518179be..a33ce8b738 100644 --- a/packages/pounce/build.sh +++ b/packages/pounce/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A multi-client, TLS-only IRC bouncer" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=3.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://git.causal.agency/pounce/snapshot/pounce-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=f776f7f170493697a97923e7dce9597dff5577fd40ba756e9a1bcfab17199df0 TERMUX_PKG_DEPENDS="libcrypt, libretls" From dd160923e749fd7ee05522657862aa4aee0313c7 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sun, 25 Dec 2022 16:42:59 +0900 Subject: [PATCH 220/244] sleuthkit: Bump to 4.12.0 --- packages/sleuthkit/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/sleuthkit/build.sh b/packages/sleuthkit/build.sh index a408ba09bc..fa277e7ec2 100644 --- a/packages/sleuthkit/build.sh +++ b/packages/sleuthkit/build.sh @@ -3,12 +3,12 @@ TERMUX_PKG_DESCRIPTION="The Sleuth Kit® (TSK) is a library for digital forensic TERMUX_PKG_LICENSE="custom" TERMUX_PKG_LICENSE_FILE="licenses/README.md, licenses/GNUv2-COPYING, licenses/GNUv3-COPYING, licenses/IBM-LICENSE, licenses/Apache-LICENSE-2.0.txt, licenses/cpl1.0.txt, licenses/bsd.txt, licenses/mit.txt" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=4.11.1 +TERMUX_PKG_VERSION=4.12.0 TERMUX_PKG_SRCURL=https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=81432c57458e9369dbdfbade096f8e779b0f169683a833675e787c34014d4d3f +TERMUX_PKG_SHA256=0ca819723b08620e60e97083dc1727d3b6ab69b75b2b0eb421c27d6a0e0e5b57 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_VERSION_REGEXP="\d+\.\d+\.\d+" -TERMUX_PKG_DEPENDS="libc++, libsqlite, ncurses" +TERMUX_PKG_DEPENDS="libc++, libsqlite, zlib" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-java" From 5a27cae55c510134b8f1589b4c7ad7b5c2302e76 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sun, 25 Dec 2022 15:34:52 +0900 Subject: [PATCH 221/244] properties.sh: Bump build-tools to 33.0.1 --- packages/apksigner/build.sh | 10 ++++++++-- packages/d8/build.sh | 10 ++++++++-- scripts/properties.sh | 6 +++++- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/packages/apksigner/build.sh b/packages/apksigner/build.sh index b407a227e2..8b07e52b3f 100644 --- a/packages/apksigner/build.sh +++ b/packages/apksigner/build.sh @@ -2,7 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://developer.android.com/studio/command-line/apksigner TERMUX_PKG_DESCRIPTION="APK signing tool from Android SDK" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=${TERMUX_ANDROID_BUILD_TOOLS_VERSION} +# Do not use the TERMUX_ANDROID_BUILD_TOOLS_VERSION variable when specifying: +TERMUX_PKG_VERSION=33.0.1 TERMUX_PKG_DEPENDS="openjdk-17" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_PLATFORM_INDEPENDENT=true @@ -13,10 +14,15 @@ termux_step_pre_configure() { if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not available for on-device builds." fi + + # Version guard + if [ "${TERMUX_PKG_VERSION#*:}" != "${TERMUX_ANDROID_BUILD_TOOLS_VERSION}" ]; then + termux_error_exit "Version mismatch between TERMUX_PKG_VERSION and TERMUX_ANDROID_BUILD_TOOLS_VERSION." + fi } termux_step_make_install() { - install -Dm600 $ANDROID_HOME/build-tools/${TERMUX_PKG_VERSION}/lib/apksigner.jar \ + install -Dm600 $ANDROID_HOME/build-tools/${TERMUX_ANDROID_BUILD_TOOLS_VERSION}/lib/apksigner.jar \ $TERMUX_PREFIX/share/java/apksigner.jar cat <<- EOF > $TERMUX_PREFIX/bin/apksigner #!${TERMUX_PREFIX}/bin/sh diff --git a/packages/d8/build.sh b/packages/d8/build.sh index 0302fb16bc..da19772ee2 100644 --- a/packages/d8/build.sh +++ b/packages/d8/build.sh @@ -2,7 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://developer.android.com/studio/command-line/d8 TERMUX_PKG_DESCRIPTION="DEX bytecode compiler from Android SDK" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=${TERMUX_ANDROID_BUILD_TOOLS_VERSION} +# Do not use the TERMUX_ANDROID_BUILD_TOOLS_VERSION variable when specifying: +TERMUX_PKG_VERSION=33.0.1 TERMUX_PKG_DEPENDS="openjdk-17" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_PLATFORM_INDEPENDENT=true @@ -13,10 +14,15 @@ termux_step_pre_configure() { if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not available for on-device builds." fi + + # Version guard + if [ "${TERMUX_PKG_VERSION#*:}" != "${TERMUX_ANDROID_BUILD_TOOLS_VERSION}" ]; then + termux_error_exit "Version mismatch between TERMUX_PKG_VERSION and TERMUX_ANDROID_BUILD_TOOLS_VERSION." + fi } termux_step_make_install() { - install -Dm600 $ANDROID_HOME/build-tools/${TERMUX_PKG_VERSION}/lib/d8.jar \ + install -Dm600 $ANDROID_HOME/build-tools/${TERMUX_ANDROID_BUILD_TOOLS_VERSION}/lib/d8.jar \ $TERMUX_PREFIX/share/java/d8.jar cat <<- EOF > $TERMUX_PREFIX/bin/d8 diff --git a/scripts/properties.sh b/scripts/properties.sh index a9859c3f1a..9e86b2fe96 100644 --- a/scripts/properties.sh +++ b/scripts/properties.sh @@ -4,7 +4,11 @@ # or sourcing any other script in our build directories. TERMUX_SDK_REVISION=9123335 -TERMUX_ANDROID_BUILD_TOOLS_VERSION=33.0.0 +TERMUX_ANDROID_BUILD_TOOLS_VERSION=33.0.1 +# when changing the above: +# change TERMUX_PKG_VERSION (and remove TERMUX_PKG_REVISION if necessary) in: +# apksigner, d8 +# and trigger rebuild of them : "${TERMUX_NDK_VERSION_NUM:="25"}" : "${TERMUX_NDK_REVISION:="b"}" TERMUX_NDK_VERSION=$TERMUX_NDK_VERSION_NUM$TERMUX_NDK_REVISION From a5211296ec186a9331133938df3cfca81fb62cf5 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Sun, 25 Dec 2022 12:08:54 +0000 Subject: [PATCH 222/244] bump(main/libsndfile): 1.2.0 This commit has been automatically submitted by Github Actions. --- packages/libsndfile/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/libsndfile/build.sh b/packages/libsndfile/build.sh index 16d9922911..80a96d5f48 100644 --- a/packages/libsndfile/build.sh +++ b/packages/libsndfile/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=http://www.mega-nerd.com/libsndfile TERMUX_PKG_DESCRIPTION="Library for reading/writing audio files" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.1.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION="1.2.0" TERMUX_PKG_SRCURL=https://github.com/libsndfile/libsndfile/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=642a876bd61b63f9346628dba5f8a0356a3ad750c7f6f42019d26ce60ba6a15b +TERMUX_PKG_SHA256=62dc4e2bcd45f6f0e89cbc3522cc90eb174dca0eef0a0d19ead289833b390cd7 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="libflac, libogg, libopus, libvorbis" TERMUX_PKG_BREAKS="libsndfile-dev" From 3607fca6b8fbf1de95879bf69b97d09a2ca69f89 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 23 Dec 2022 14:03:54 +0900 Subject: [PATCH 223/244] ruby: Bump to 3.2.0 --- packages/ruby/build.sh | 33 +++++++-- packages/ruby/common.mk.patch | 13 ++++ packages/ruby/fix-paths.patch | 68 ++++++++----------- ...nstall.rb.patch => tool-rbinstall.rb.diff} | 4 +- 4 files changed, 68 insertions(+), 50 deletions(-) create mode 100644 packages/ruby/common.mk.patch rename packages/ruby/{tool-rbinstall.rb.patch => tool-rbinstall.rb.diff} (79%) diff --git a/packages/ruby/build.sh b/packages/ruby/build.sh index 2938925fbf..c8fd479412 100644 --- a/packages/ruby/build.sh +++ b/packages/ruby/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.ruby-lang.org/ TERMUX_PKG_DESCRIPTION="Dynamic programming language with a focus on simplicity and productivity" TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=3.1.3 -TERMUX_PKG_SRCURL=https://cache.ruby-lang.org/pub/ruby/${TERMUX_PKG_VERSION:0:3}/ruby-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=4ee161939826bcdfdafa757cf8e293a7f14e357f62be7144f040335cc8c7371a +TERMUX_PKG_VERSION=3.2.0 +TERMUX_PKG_SRCURL=https://cache.ruby-lang.org/pub/ruby/$(echo $TERMUX_PKG_VERSION | cut -d . -f 1-2)/ruby-${TERMUX_PKG_VERSION}.tar.xz +TERMUX_PKG_SHA256=d2f4577306e6dd932259693233141e5c3ec13622c95b75996541b8d5b68b28b4 # libbffi is used by the fiddle extension module: TERMUX_PKG_DEPENDS="libandroid-execinfo, libandroid-support, libffi, libgmp, readline, openssl, libyaml, zlib" TERMUX_PKG_RECOMMENDS="clang, make, pkg-config" @@ -19,14 +19,29 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" rb_cv_type_deprecated=x" # getresuid(2) does not work on ChromeOS - https://github.com/termux/termux-app/issues/147: # TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_getresuid=no" TERMUX_PKG_HOSTBUILD=true +TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS=" +--prefix=$TERMUX_PKG_HOSTBUILD_DIR/ruby-host +--disable-install-doc +--disable-install-rdoc +--disable-install-capi +" termux_step_host_build() { - "$TERMUX_PKG_SRCDIR/configure" --prefix=$TERMUX_PKG_HOSTBUILD_DIR/ruby-host + "$TERMUX_PKG_SRCDIR/configure" ${TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS} make -j $TERMUX_MAKE_PROCESSES make install } termux_step_pre_configure() { + _RUBY_API_VERSION=$(echo $TERMUX_PKG_VERSION | cut -d . -f 1-2).0 + test ${_RUBY_ABI_VERSION:=} && _RUBY_API_VERSION+=+${_RUBY_ABI_VERSION} + + echo "Applying tool-rbinstall.rb.diff" + sed -e "s|@TERMUX_PREFIX@|${TERMUX_PREFIX}|g" \ + -e "s|@RUBY_API_VERSION@|${_RUBY_API_VERSION}|g" \ + $TERMUX_PKG_BUILDER_DIR/tool-rbinstall.rb.diff \ + | patch --silent -p1 + autoreconf -fi export PATH=$TERMUX_PKG_HOSTBUILD_DIR/ruby-host/bin:$PATH @@ -45,7 +60,7 @@ termux_step_make_install() { make uninstall # remove possible remains to get fresh timestamps make install - local RBCONFIG=$TERMUX_PREFIX/lib/ruby/${TERMUX_PKG_VERSION:0:3}.0/${TERMUX_HOST_PLATFORM}/rbconfig.rb + local RBCONFIG=$TERMUX_PREFIX/lib/ruby/${_RUBY_API_VERSION}/${TERMUX_HOST_PLATFORM}/rbconfig.rb # Fix absolute paths to executables: perl -p -i -e 's/^.*CONFIG\["INSTALL"\].*$/ CONFIG["INSTALL"] = "install -c"/' $RBCONFIG @@ -57,7 +72,11 @@ termux_step_make_install() { } termux_step_post_massage() { - if [ ! -f $TERMUX_PREFIX/lib/ruby/${TERMUX_PKG_VERSION:0:3}.0/${TERMUX_HOST_PLATFORM}/readline.so ]; then - echo "Error: The readline extension was not built" + if [ ! -f ./lib/ruby/${_RUBY_API_VERSION}/${TERMUX_HOST_PLATFORM}/readline.so ]; then + termux_error_exit "The readline extension was not installed." + fi + local _RUBYGEMS_ARCH=${TERMUX_HOST_PLATFORM/i686-/x86-} + if [ ! -d ./lib/ruby/gems/${_RUBY_API_VERSION}/extensions/${_RUBYGEMS_ARCH} ]; then + termux_error_exit "Extensions for bundled gems were not installed." fi } diff --git a/packages/ruby/common.mk.patch b/packages/ruby/common.mk.patch new file mode 100644 index 0000000000..4e1422b8b6 --- /dev/null +++ b/packages/ruby/common.mk.patch @@ -0,0 +1,13 @@ +As of writing, extensions for bundled gems are not installed without this patch. +We have a guard for that in build.sh and you can remove this without extra care. + +--- a/common.mk ++++ b/common.mk +@@ -1375,7 +1375,6 @@ + + refresh-gems: update-bundled_gems prepare-gems + prepare-gems: $(HAVE_BASERUBY:yes=update-gems) $(HAVE_BASERUBY:yes=extract-gems) +-prepare-gems: $(DOT_WAIT) $(HAVE_BASERUBY:yes=outdate-bundled-gems) + extract-gems: $(HAVE_BASERUBY:yes=update-gems) + + update-gems$(gnumake:yes=-sequential): PHONY diff --git a/packages/ruby/fix-paths.patch b/packages/ruby/fix-paths.patch index afce393a10..0485ee25a2 100644 --- a/packages/ruby/fix-paths.patch +++ b/packages/ruby/fix-paths.patch @@ -25,13 +25,13 @@ diff -uNr ruby-3.0.0/dln_find.c ruby-3.0.0.mod/dln_find.c @@ -72,10 +72,7 @@ if (!path) { - path = -- "/usr/local/bin" PATH_SEP -- "/usr/ucb" PATH_SEP -- "/usr/bin" PATH_SEP -- "/bin" PATH_SEP -+ "@TERMUX_PREFIX@/bin" PATH_SEP - "."; + path = +- "/usr/local/bin" PATH_SEP +- "/usr/ucb" PATH_SEP +- "/usr/bin" PATH_SEP +- "/bin" PATH_SEP ++ "@TERMUX_PREFIX@/bin" PATH_SEP + "."; } buf = dln_find_1(fname, path, buf, size, 1 DLN_FIND_EXTRA_ARG); diff -uNr ruby-3.0.0/ext/etc/etc.c ruby-3.0.0.mod/ext/etc/etc.c @@ -46,20 +46,6 @@ diff -uNr ruby-3.0.0/ext/etc/etc.c ruby-3.0.0.mod/ext/etc/etc.c const char *tmpstr = default_tmp; size_t tmplen = strlen(default_tmp); # if defined _CS_DARWIN_USER_TEMP_DIR -diff -uNr ruby-3.0.0/ext/fiddle/libffi-3.2.1/src/closures.c ruby-3.0.0.mod/ext/fiddle/libffi-3.2.1/src/closures.c ---- ruby-3.0.0/ext/fiddle/libffi-3.2.1/src/closures.c 2014-11-08 14:47:24.000000000 +0200 -+++ ruby-3.0.0.mod/ext/fiddle/libffi-3.2.1/src/closures.c 2021-02-09 17:40:07.564105731 +0200 -@@ -391,8 +391,8 @@ - int repeat; - } open_temp_exec_file_opts[] = { - { open_temp_exec_file_env, "TMPDIR", 0 }, -- { open_temp_exec_file_dir, "/tmp", 0 }, -- { open_temp_exec_file_dir, "/var/tmp", 0 }, -+ { open_temp_exec_file_dir, "@TERMUX_PREFIX@/tmp", 0 }, -+ { open_temp_exec_file_dir, "@TERMUX_PREFIX@/var/tmp", 0 }, - { open_temp_exec_file_dir, "/dev/shm", 0 }, - { open_temp_exec_file_env, "HOME", 0 }, - #ifdef HAVE_MNTENT diff -uNr ruby-3.0.0/ext/pty/pty.c ruby-3.0.0.mod/ext/pty/pty.c --- ruby-3.0.0/ext/pty/pty.c 2020-12-25 05:33:01.000000000 +0200 +++ ruby-3.0.0.mod/ext/pty/pty.c 2021-02-09 17:45:16.473977053 +0200 @@ -67,11 +53,11 @@ diff -uNr ruby-3.0.0/ext/pty/pty.c ruby-3.0.0.mod/ext/pty/pty.c char errbuf[32]; if (argc == 0) { -- const char *shellname = "/bin/sh"; -+ const char *shellname = "@TERMUX_PREFIX@/bin/sh"; +- const char *shellname = "/bin/sh"; ++ const char *shellname = "@TERMUX_PREFIX@/bin/sh"; - if ((p = getenv("SHELL")) != NULL) { - shellname = p; + if ((p = getenv("SHELL")) != NULL) { + shellname = p; diff -uNr ruby-3.0.0/hash.c ruby-3.0.0.mod/hash.c --- ruby-3.0.0/hash.c 2020-12-25 05:33:01.000000000 +0200 +++ ruby-3.0.0.mod/hash.c 2021-02-09 17:43:01.683876134 +0200 @@ -172,6 +158,15 @@ diff -uNr ruby-3.0.0/mjit.c ruby-3.0.0.mod/mjit.c # undef RETURN_ENV } +@@ -1741,7 +1741,7 @@ + M("--mjit-warnings", "", "Enable printing JIT warnings"), + M("--mjit-debug", "", "Enable JIT debugging (very slow), or add cflags if specified"), + M("--mjit-wait", "", "Wait until JIT compilation finishes every time (for testing)"), +- M("--mjit-save-temps", "", "Save JIT temporary files in $TMP or /tmp (for testing)"), ++ M("--mjit-save-temps", "", "Save JIT temporary files in $TMP or @TERMUX_PREFIX@/tmp (for testing)"), + M("--mjit-verbose=num", "", "Print JIT logs of level num or less to stderr (default: 0)"), + M("--mjit-max-cache=num", "", "Max number of methods to be JIT-ed in a cache (default: " + STRINGIZE(DEFAULT_MAX_CACHE_SIZE) ")"), diff -uNr ruby-3.0.0/process.c ruby-3.0.0.mod/process.c --- ruby-3.0.0/process.c 2020-12-25 05:33:01.000000000 +0200 +++ ruby-3.0.0.mod/process.c 2021-02-09 17:49:30.716668413 +0200 @@ -202,24 +197,15 @@ diff -uNr ruby-3.0.0/process.c ruby-3.0.0.mod/process.c diff -uNr ruby-3.1.0/ruby.c ruby-3.1.0.mod/ruby.c --- ruby-3.1.0/ruby.c +++ ruby-3.1.0.mod/ruby.c -@@ -359,7 +359,7 @@ - M("--mjit-warnings", "", "Enable printing JIT warnings"), - M("--mjit-debug", "", "Enable JIT debugging (very slow), or add cflags if specified"), - M("--mjit-wait", "", "Wait until JIT compilation finishes every time (for testing)"), -- M("--mjit-save-temps", "", "Save JIT temporary files in $TMP or /tmp (for testing)"), -+ M("--mjit-save-temps", "", "Save JIT temporary files in $TMP or @TERMUX_PREFIX@/tmp (for testing)"), - M("--mjit-verbose=num", "", "Print JIT logs of level num or less to stderr (default: 0)"), - M("--mjit-max-cache=num", "", "Max number of methods to be JIT-ed in a cache (default: 100)"), - M("--mjit-min-calls=num", "", "Number of calls to trigger JIT (for testing, default: 10000)"), @@ -684,7 +684,7 @@ - RUBY_ARCH_PATH; - const ptrdiff_t libdir_len = (ptrdiff_t)sizeof(libdir) - - rb_strlen_lit(RUBY_ARCH_PATH) - 1; -- static const char bindir[] = "/bin"; -+ static const char bindir[] = "@TERMUX_PREFIX@/bin"; - const ptrdiff_t bindir_len = (ptrdiff_t)sizeof(bindir) - 1; + RUBY_ARCH_PATH; + const ptrdiff_t libdir_len = (ptrdiff_t)sizeof(libdir) + - rb_strlen_lit(RUBY_ARCH_PATH) - 1; +- static const char bindir[] = "/bin"; ++ static const char bindir[] = "@TERMUX_PREFIX@/bin"; + const ptrdiff_t bindir_len = (ptrdiff_t)sizeof(bindir) - 1; - const char *p2 = NULL; + const char *p2 = NULL; diff -uNr ruby-3.0.0/spec/bundler/commands/exec_spec.rb ruby-3.0.0.mod/spec/bundler/commands/exec_spec.rb --- ruby-3.0.0/spec/bundler/commands/exec_spec.rb 2020-12-25 05:33:01.000000000 +0200 +++ ruby-3.0.0.mod/spec/bundler/commands/exec_spec.rb 2021-02-09 17:50:58.332721054 +0200 diff --git a/packages/ruby/tool-rbinstall.rb.patch b/packages/ruby/tool-rbinstall.rb.diff similarity index 79% rename from packages/ruby/tool-rbinstall.rb.patch rename to packages/ruby/tool-rbinstall.rb.diff index c259a157a7..0871942cd0 100644 --- a/packages/ruby/tool-rbinstall.rb.patch +++ b/packages/ruby/tool-rbinstall.rb.diff @@ -5,7 +5,7 @@ def install_default_gem(dir, srcdir, bindir) - gem_dir = Gem.default_dir -+ gem_dir = "@TERMUX_PREFIX@/lib/ruby/gems/3.1.0" ++ gem_dir = "@TERMUX_PREFIX@/lib/ruby/gems/@RUBY_API_VERSION@" install_dir = with_destdir(gem_dir) prepare "default gems from #{dir}", gem_dir RbInstall.no_write do @@ -14,7 +14,7 @@ install?(:ext, :comm, :gem, :'bundled-gems') do - gem_dir = Gem.default_dir -+ gem_dir = "@TERMUX_PREFIX@/lib/ruby/gems/3.1.0" ++ gem_dir = "@TERMUX_PREFIX@/lib/ruby/gems/@RUBY_API_VERSION@" install_dir = with_destdir(gem_dir) prepare "bundled gems", gem_dir RbInstall.no_write do From 575aa35a2b07c5ca96008a34ba0eb448c3a208ae Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Sun, 25 Dec 2022 17:05:17 +0200 Subject: [PATCH 224/244] upgpkg(main/proot-distro): v3.4.0 --- packages/proot-distro/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/proot-distro/build.sh b/packages/proot-distro/build.sh index 5a26ca6db8..8e799e9a54 100644 --- a/packages/proot-distro/build.sh +++ b/packages/proot-distro/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/termux/proot-distro TERMUX_PKG_DESCRIPTION="Termux official utility for managing proot'ed Linux distributions" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=3.3.0 +TERMUX_PKG_VERSION=3.4.0 TERMUX_PKG_SRCURL=https://github.com/termux/proot-distro/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=896e1e70ffaafc1d7ac8374d9bb9c5cd320cb63e800585e4b71b75e3a255f5fa +TERMUX_PKG_SHA256=b67e3cf3511eda48e3529864ebe98a609b1175d47a9b514a769a7ce0790d7904 TERMUX_PKG_DEPENDS="bash, bzip2, coreutils, curl, findutils, gzip, ncurses-utils, proot (>= 5.1.107-32), sed, tar, xz-utils" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_PLATFORM_INDEPENDENT=true From 228b6aca1106125fbaf9a632b04597e41dc1fc09 Mon Sep 17 00:00:00 2001 From: Kevin Williams Date: Sun, 25 Dec 2022 23:12:40 +0800 Subject: [PATCH 225/244] upgpkg(main/termux-apt-repo): v0.5 --- packages/termux-apt-repo/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/termux-apt-repo/build.sh b/packages/termux-apt-repo/build.sh index 03823cc06d..69696ec3ad 100644 --- a/packages/termux-apt-repo/build.sh +++ b/packages/termux-apt-repo/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/termux/termux-apt-repo TERMUX_PKG_DESCRIPTION="Script to create Termux apt repositories" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=0.4 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=0.5 TERMUX_PKG_SRCURL=https://github.com/termux/termux-apt-repo/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=54ea18d06d234d18ab8f7b264c4bd045651eb7908fa3850974b6560c7fb34af3 +TERMUX_PKG_SHA256=22c2ad46e548a9b73179da072b798cbbe6767f2dcc99cc476fa88641f8595434 TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_PLATFORM_INDEPENDENT=true # binutils for ar: From 21ad739b039535ee668aa3c9f8356f8d56a0b921 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Mon, 26 Dec 2022 00:42:36 +0900 Subject: [PATCH 226/244] new package: gnome-desktop4 --- x11-packages/gnome-desktop4/build.sh | 29 +++++++++++++++++ .../gnome-desktop4/gir/43/GnomeBG-4.0.xml | 15 +++++++++ .../gir/43/GnomeDesktop-4.0.xml | 19 +++++++++++ .../gnome-desktop4/gir/43/GnomeRR-4.0.xml | 32 +++++++++++++++++++ 4 files changed, 95 insertions(+) create mode 100644 x11-packages/gnome-desktop4/build.sh create mode 100644 x11-packages/gnome-desktop4/gir/43/GnomeBG-4.0.xml create mode 100644 x11-packages/gnome-desktop4/gir/43/GnomeDesktop-4.0.xml create mode 100644 x11-packages/gnome-desktop4/gir/43/GnomeRR-4.0.xml diff --git a/x11-packages/gnome-desktop4/build.sh b/x11-packages/gnome-desktop4/build.sh new file mode 100644 index 0000000000..8fafe79e03 --- /dev/null +++ b/x11-packages/gnome-desktop4/build.sh @@ -0,0 +1,29 @@ +TERMUX_PKG_HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-desktop +TERMUX_PKG_DESCRIPTION="Utility library for loading .desktop files" +TERMUX_PKG_LICENSE="GPL-2.0, LGPL-2.0" +TERMUX_PKG_MAINTAINER="@termux" +_MAJOR_VERSION=43 +TERMUX_PKG_VERSION=${_MAJOR_VERSION} +TERMUX_PKG_SRCURL=https://download.gnome.org/sources/gnome-desktop/${_MAJOR_VERSION}/gnome-desktop-${TERMUX_PKG_VERSION}.tar.xz +TERMUX_PKG_SHA256=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69 +TERMUX_PKG_DEPENDS="gdk-pixbuf, glib, gsettings-desktop-schemas, gtk4, iso-codes, libcairo, libxkbcommon, xkeyboard-config" +TERMUX_PKG_BUILD_DEPENDS="fontconfig, g-ir-scanner" +TERMUX_PKG_DISABLE_GIR=false +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-Ddesktop_docs=false +-Ddebug_tools=false +-Dintrospection=true +-Dbuild_gtk4=true +-Dlegacy_library=false +" + +termux_step_pre_configure() { + termux_setup_gir +} + +termux_step_post_massage() { + local _GUARD_FILE="lib/libgnome-desktop-4.so" + if [ ! -e "${_GUARD_FILE}" ]; then + termux_error_exit "Error: file ${_GUARD_FILE} not found." + fi +} diff --git a/x11-packages/gnome-desktop4/gir/43/GnomeBG-4.0.xml b/x11-packages/gnome-desktop4/gir/43/GnomeBG-4.0.xml new file mode 100644 index 0000000000..9aa18aae5c --- /dev/null +++ b/x11-packages/gnome-desktop4/gir/43/GnomeBG-4.0.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/x11-packages/gnome-desktop4/gir/43/GnomeDesktop-4.0.xml b/x11-packages/gnome-desktop4/gir/43/GnomeDesktop-4.0.xml new file mode 100644 index 0000000000..3dbfc61ddb --- /dev/null +++ b/x11-packages/gnome-desktop4/gir/43/GnomeDesktop-4.0.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/x11-packages/gnome-desktop4/gir/43/GnomeRR-4.0.xml b/x11-packages/gnome-desktop4/gir/43/GnomeRR-4.0.xml new file mode 100644 index 0000000000..5a8b5ba9f0 --- /dev/null +++ b/x11-packages/gnome-desktop4/gir/43/GnomeRR-4.0.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From e785eaadbc040b1847ec1e4e077f877cb2f57c9a Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Mon, 26 Dec 2022 01:54:04 +0900 Subject: [PATCH 227/244] ceu-lang: Use committer date instead of author date %ci:no-build --- packages/ceu-lang/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ceu-lang/build.sh b/packages/ceu-lang/build.sh index 27cb8ad967..f1ab7f2b93 100644 --- a/packages/ceu-lang/build.sh +++ b/packages/ceu-lang/build.sh @@ -14,7 +14,7 @@ termux_step_post_get_source() { git fetch --unshallow git checkout $_COMMIT - local version="$(git log -1 --date=format:"%Y.%m.%d" --format="%ad")" + local version="$(git log -1 --format=%cs | sed 's/-/./g')" if [ "$version" != "$TERMUX_PKG_VERSION" ]; then echo -n "ERROR: The specified version \"$TERMUX_PKG_VERSION\"" echo " is different from what is expected to be: \"$version\"" From 74cd8c60ec4f4dc80de117b7891795fa23a29b25 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Mon, 26 Dec 2022 01:48:36 +0900 Subject: [PATCH 228/244] simulavr: Refactor build.sh --- packages/simulavr/build.sh | 25 +++++++++---------- ...mment_docs.patch => hardcode-version.diff} | 15 ++--------- packages/simulavr/no-doc.patch | 11 ++++++++ 3 files changed, 25 insertions(+), 26 deletions(-) rename packages/simulavr/{hardcode_version_and_comment_docs.patch => hardcode-version.diff} (54%) create mode 100644 packages/simulavr/no-doc.patch diff --git a/packages/simulavr/build.sh b/packages/simulavr/build.sh index 144a5c6b90..5576e90d45 100644 --- a/packages/simulavr/build.sh +++ b/packages/simulavr/build.sh @@ -2,11 +2,12 @@ TERMUX_PKG_HOMEPAGE="https://www.nongnu.org/simulavr" TERMUX_PKG_DESCRIPTION="Simulator for Microchip AVR (formerly Atmel) microcontrollers" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" +_VERSION_MAJOR=1 +_VERSION_MINOR=1 +_VERSION_PATCH=0 +TERMUX_PKG_VERSION=1:${_VERSION_MAJOR}.${_VERSION_MINOR}.${_VERSION_PATCH} TERMUX_PKG_SRCURL="https://git.savannah.nongnu.org/git/simulavr.git" -TERMUX_PKG_GIT_BRANCH="master" -# tag: release-1.1.0 -_COMMIT="e6eac877e8eb497e1620adfd48f5bc85099d306f" -TERMUX_PKG_VERSION="2019.12.20" +TERMUX_PKG_GIT_BRANCH=release-${TERMUX_PKG_VERSION#*:} TERMUX_PKG_DEPENDS="libc++" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=' @@ -17,13 +18,11 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=' ' termux_step_post_get_source() { - git fetch --unshallow - git checkout $_COMMIT - - local version="$(git log -1 --date=format:"%Y.%m.%d" --format="%ad")" - if [ "$version" != "$TERMUX_PKG_VERSION" ]; then - echo -n "ERROR: The specified version \"$TERMUX_PKG_VERSION\"" - echo " is different from what is expected to be: \"$version\"" - return 1 - fi + echo "Applying hardcode-version.diff" + sed \ + -e "s|@VERSION_MAJOR@|${_VERSION_MAJOR}|g" \ + -e "s|@VERSION_MINOR@|${_VERSION_MINOR}|g" \ + -e "s|@VERSION_PATCH@|${_VERSION_PATCH}|g" \ + $TERMUX_PKG_BUILDER_DIR/hardcode-version.diff \ + | patch --silent -p1 } diff --git a/packages/simulavr/hardcode_version_and_comment_docs.patch b/packages/simulavr/hardcode-version.diff similarity index 54% rename from packages/simulavr/hardcode_version_and_comment_docs.patch rename to packages/simulavr/hardcode-version.diff index 4bd42a4b26..817694a001 100644 --- a/packages/simulavr/hardcode_version_and_comment_docs.patch +++ b/packages/simulavr/hardcode-version.diff @@ -1,5 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 98f80df..12386ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,10 +12,11 @@ include(FindPythonModule) @@ -9,20 +7,11 @@ index 98f80df..12386ff 100644 -get_git_info() -set(PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") +# get_git_info() -+set(PACKAGE_VERSION "1.1.0") ++set(PACKAGE_VERSION "@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@") + -+message(STATUS "version major 1 / minor 1 / patch 0") ++message(STATUS "version major @VERSION_MAJOR@ / minor @VERSION_MINOR@ / patch @VERSION_PATCH@") -message(STATUS "version major ${VERSION_MAJOR} / minor ${VERSION_MINOR} / patch ${VERSION_PATCH}") # build options option(BUILD_TCL "build TCL SWIG module" OFF) -@@ -81,7 +82,7 @@ endif() - if(BUILD_PYTHON) - add_subdirectory(pysimulavr) - endif() --add_subdirectory(doc) -+# add_subdirectory(doc) - add_subdirectory(kbdgentables) - - # check targets diff --git a/packages/simulavr/no-doc.patch b/packages/simulavr/no-doc.patch new file mode 100644 index 0000000000..d662ea7454 --- /dev/null +++ b/packages/simulavr/no-doc.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -81,7 +82,7 @@ endif() + if(BUILD_PYTHON) + add_subdirectory(pysimulavr) + endif() +-add_subdirectory(doc) ++# add_subdirectory(doc) + add_subdirectory(kbdgentables) + + # check targets From a66c1c7da4c262037dfd7ef9436756424bab0ab4 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Mon, 26 Dec 2022 02:18:20 +0900 Subject: [PATCH 229/244] boost: Backport patch to fix error with Python 3.11 --- packages/boost/boost-1.80.0-python-3.11.patch | 37 +++++++++++++++++++ packages/boost/build.sh | 1 + 2 files changed, 38 insertions(+) create mode 100644 packages/boost/boost-1.80.0-python-3.11.patch diff --git a/packages/boost/boost-1.80.0-python-3.11.patch b/packages/boost/boost-1.80.0-python-3.11.patch new file mode 100644 index 0000000000..71555b19d1 --- /dev/null +++ b/packages/boost/boost-1.80.0-python-3.11.patch @@ -0,0 +1,37 @@ +https://github.com/boostorg/python/commit/a218babc8daee904a83f550fb66e5cb3f1cb3013 + +From a218babc8daee904a83f550fb66e5cb3f1cb3013 Mon Sep 17 00:00:00 2001 +From: Victor Stinner +Date: Mon, 25 Apr 2022 10:51:46 +0200 +Subject: [PATCH] Fix enum_type_object type on Python 3.11 + +The enum_type_object type inherits from PyLong_Type which is not tracked +by the GC. Instances doesn't have to be tracked by the GC: remove the +Py_TPFLAGS_HAVE_GC flag. + +The Python C API documentation says: + + "To create a container type, the tp_flags field of the type object + must include the Py_TPFLAGS_HAVE_GC and provide an implementation of + the tp_traverse handler." + +https://docs.python.org/dev/c-api/gcsupport.html + +The new exception was introduced in Python 3.11 by: +https://github.com/python/cpython/issues/88429 +--- + src/object/enum.cpp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/object/enum.cpp b/src/object/enum.cpp +index 293e705899..5753b32e07 100644 +--- a/src/object/enum.cpp ++++ b/libs/python/src/object/enum.cpp +@@ -113,7 +113,6 @@ static PyTypeObject enum_type_object = { + #if PY_VERSION_HEX < 0x03000000 + | Py_TPFLAGS_CHECKTYPES + #endif +- | Py_TPFLAGS_HAVE_GC + | Py_TPFLAGS_BASETYPE, /* tp_flags */ + 0, /* tp_doc */ + 0, /* tp_traverse */ diff --git a/packages/boost/build.sh b/packages/boost/build.sh index 93dfb3efc8..9e4f7db063 100644 --- a/packages/boost/build.sh +++ b/packages/boost/build.sh @@ -5,6 +5,7 @@ TERMUX_PKG_MAINTAINER="@termux" # Never forget to always bump revision of reverse dependencies and rebuild them # when bumping version. TERMUX_PKG_VERSION=1.80.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://boostorg.jfrog.io/artifactory/main/release/$TERMUX_PKG_VERSION/source/boost_${TERMUX_PKG_VERSION//./_}.tar.bz2 TERMUX_PKG_SHA256=1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0 TERMUX_PKG_DEPENDS="libc++, libbz2, libiconv, liblzma, zlib" From 935e393add509398a573ca79a69406ae6db96032 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Mon, 26 Dec 2022 03:47:10 +0900 Subject: [PATCH 230/244] wiz: Bump to 2022.06.02 --- packages/wiz/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/wiz/build.sh b/packages/wiz/build.sh index 5eb6cdec3a..60bde8aebb 100644 --- a/packages/wiz/build.sh +++ b/packages/wiz/build.sh @@ -2,9 +2,8 @@ TERMUX_PKG_HOMEPAGE=http://wiz-lang.org/ TERMUX_PKG_DESCRIPTION="A high-level assembly language for writing homebrew software for retro console platforms" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -_COMMIT=b25ba2d90288fc8a380d99b3ad08a5b48caaa484 -TERMUX_PKG_VERSION=2021.06.02 -TERMUX_PKG_REVISION=1 +_COMMIT=a174205e1694ab225c11813d3a3ab9e81742869d +TERMUX_PKG_VERSION=2022.06.02 TERMUX_PKG_SRCURL=https://github.com/wiz-lang/wiz.git TERMUX_PKG_GIT_BRANCH=master TERMUX_PKG_DEPENDS="libc++" From a16cb8cb417eb5cf0c78a9e724e9a9687cd9a3f9 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Mon, 26 Dec 2022 00:21:24 +0000 Subject: [PATCH 231/244] bump(main/elinks): 0.16.0 This commit has been automatically submitted by Github Actions. --- packages/elinks/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/elinks/build.sh b/packages/elinks/build.sh index f6d78d86b9..a3efcd7e22 100644 --- a/packages/elinks/build.sh +++ b/packages/elinks/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/rkd77/elinks TERMUX_PKG_DESCRIPTION="Full-Featured Text WWW Browser" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.15.1" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION="0.16.0" TERMUX_PKG_SRCURL=https://github.com/rkd77/elinks/releases/download/v${TERMUX_PKG_VERSION}/elinks-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=cca1864d472f2314dc6ffb40d1f20126f09866a55a0d154961907f054095944f +TERMUX_PKG_SHA256=4d65b78563af39ba1d0a9ab1c081e129ef2ed541009e6ff11c465ba9d8f0f234 TERMUX_PKG_DEPENDS="libexpat, libiconv, libidn, openssl, libbz2, zlib" TERMUX_PKG_AUTO_UPDATE=true From b3b1092640bcb575b14a5f2207026378e3c0fa38 Mon Sep 17 00:00:00 2001 From: Chongyun Lee <45286352+licy183@users.noreply.github.com> Date: Mon, 26 Dec 2022 03:13:45 +0800 Subject: [PATCH 232/244] python-numpy: link against libandroid-complex-math To fix the following error on Android 7. dlopen failed: cannot locate symbol "csinl" referenced by "@TERMUX_PREFIX@/python3.11/site-packages/numpy/core/_multiarray_umath.cpython-311.so" --- packages/python-numpy/build.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/python-numpy/build.sh b/packages/python-numpy/build.sh index 37b30dda6b..01ff9ea9ff 100644 --- a/packages/python-numpy/build.sh +++ b/packages/python-numpy/build.sh @@ -3,8 +3,9 @@ TERMUX_PKG_DESCRIPTION="The fundamental package for scientific computing with Py TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="1.24.0" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/numpy/numpy.git -TERMUX_PKG_DEPENDS="libc++, libopenblas, python" +TERMUX_PKG_DEPENDS="libandroid-complex-math, libc++, libopenblas, python" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_TAG_TYPE="latest-release-tag" @@ -31,7 +32,7 @@ termux_step_configure() { . ${_CROSSENV_PREFIX}/bin/activate build-pip install wheel - LDFLAGS+=" -lpython${_PYTHON_VERSION} -lm" + LDFLAGS+=" -lpython${_PYTHON_VERSION} -landroid-complex-math -lm" build-pip install pybind11 Cython pythran wheel } From b74f9dce79e7b0dd4a51e51826e886a4ea3adb0b Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Mon, 26 Dec 2022 06:10:10 +0000 Subject: [PATCH 233/244] bump(main/kubelogin): 1.26.0 This commit has been automatically submitted by Github Actions. --- packages/kubelogin/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/kubelogin/build.sh b/packages/kubelogin/build.sh index 95768e5738..6e9c725294 100644 --- a/packages/kubelogin/build.sh +++ b/packages/kubelogin/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/int128/kubelogin TERMUX_PKG_DESCRIPTION="A kubectl plugin for Kubernetes OpenID Connect (OIDC) authentication" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="Steeve Chailloux" -TERMUX_PKG_VERSION="1.25.4" +TERMUX_PKG_VERSION="1.26.0" TERMUX_PKG_SRCURL=https://github.com/int128/kubelogin/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=14032818d181d4e103a3b57e641dac21da9c3a8465eabd3eefbcfa5fa58401bc +TERMUX_PKG_SHA256=30c0fb5ce91252e008aa90f82ee6fc6fd0ce646ade851f0634912e914def21fa TERMUX_PKG_AUTO_UPDATE=true termux_step_make() { From 26bd8c849612f5a049625be00d4c2db3c069ff2a Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Mon, 26 Dec 2022 06:17:13 +0000 Subject: [PATCH 234/244] bump(main/neovim-nightly): 0.9.0-dev-555+g357aab4c6 This commit has been automatically submitted by Github Actions. --- packages/neovim-nightly/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/neovim-nightly/build.sh b/packages/neovim-nightly/build.sh index f48bd5b31c..93b0597937 100644 --- a/packages/neovim-nightly/build.sh +++ b/packages/neovim-nightly/build.sh @@ -5,9 +5,9 @@ TERMUX_PKG_MAINTAINER="Aditya Alok " # Upstream now has version number like "0.8.0-dev-698-ga5920e98f", but actually # "0.8.0-dev-698-g1ef84547a" < "0.8.0-dev-nightly-10-g1a07044c1", we need to bump # the epoch of the package version. -TERMUX_PKG_VERSION="1:0.9.0-dev-554+g6f25623e7" +TERMUX_PKG_VERSION="1:0.9.0-dev-555+g357aab4c6" TERMUX_PKG_SRCURL="https://github.com/neovim/neovim/archive/nightly.tar.gz" -TERMUX_PKG_SHA256=735b88f0b7cfdaedf3bde8250caf031c7444231c534860f5d274dece4e3f03b7 +TERMUX_PKG_SHA256=ed238346296ca0494bb2a4bc4d5e58a8aff8b5d932f04bd0507d62a58afff3af TERMUX_PKG_DEPENDS="libiconv, libuv, luv, libmsgpack, libandroid-support, libvterm, libtermkey, libluajit, libunibilium, libtreesitter" TERMUX_PKG_HOSTBUILD=true From 3d1cefe38e1a903ac70df7270187cc19fca21ca6 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Mon, 26 Dec 2022 06:23:33 +0000 Subject: [PATCH 235/244] bump(main/ruff): 0.0.194 This commit has been automatically submitted by Github Actions. --- packages/ruff/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ruff/build.sh b/packages/ruff/build.sh index 4f53417ed8..26c43e80a7 100644 --- a/packages/ruff/build.sh +++ b/packages/ruff/build.sh @@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE="https://github.com/charliermarsh/ruff" TERMUX_PKG_DESCRIPTION="An extremely fast Python linter, written in Rust" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.0.193" +TERMUX_PKG_VERSION="0.0.194" TERMUX_PKG_SRCURL="https://github.com/charliermarsh/ruff/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz" -TERMUX_PKG_SHA256=ed29800ca1087ceeb046483ba8914c7441fc2b561d4e5ba71d57935b8b5268bb +TERMUX_PKG_SHA256=d07a30c2e7fc554a0efdb0861e0c7b34fde33699f66c0d6c140b3647e85573df TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true From 72e3ae34e2d763dc62a3c368c857095a3482cb5e Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Mon, 26 Dec 2022 14:54:29 +0900 Subject: [PATCH 236/244] nala: Bump to 0.12.0 --- packages/nala/build.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/nala/build.sh b/packages/nala/build.sh index 878f11adc7..5e8be39ad7 100644 --- a/packages/nala/build.sh +++ b/packages/nala/build.sh @@ -2,20 +2,18 @@ TERMUX_PKG_HOMEPAGE=https://gitlab.com/volian/nala TERMUX_PKG_DESCRIPTION="Commandline frontend for the apt package manager" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=0.11.1 +TERMUX_PKG_VERSION=0.12.0 TERMUX_PKG_SRCURL=https://gitlab.com/volian/nala/-/archive/v${TERMUX_PKG_VERSION}/nala-v${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=4ce87d75e785e45b1638817077797a3fcd4a15059615455fc1af0127c70cf5cd +TERMUX_PKG_SHA256=fbd8d35759cb17045ae31766ef94d35ab8009dc0d52759e9fd1d4a5f8a3420b3 TERMUX_PKG_DEPENDS="python-apt" TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_AUTO_UPDATE=true termux_step_pre_configure() { - _PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION) + rm -rf nala/__init__.py.orig - TERMUX_PKG_RM_AFTER_INSTALL=" - lib/python${_PYTHON_VERSION}/site-packages/nala/__pycache__ - " + _PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION) termux_setup_python_crossenv pushd $TERMUX_PYTHON_CROSSENV_SRCDIR @@ -30,7 +28,7 @@ termux_step_pre_configure() { } termux_step_make_install() { - python${_PYTHON_VERSION} -m pip install . --no-deps --prefix $TERMUX_PREFIX + pip install . --no-deps --prefix $TERMUX_PREFIX install -Dm600 -t $TERMUX_PREFIX/etc/nala debian/nala.conf } From 506669b5a2c8183e4baeca543d72774e4f77e43d Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Mon, 26 Dec 2022 14:56:09 +0900 Subject: [PATCH 237/244] newsboat: Bump to 2.30 --- packages/newsboat/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/newsboat/build.sh b/packages/newsboat/build.sh index 52886ebe0a..b18437fd68 100644 --- a/packages/newsboat/build.sh +++ b/packages/newsboat/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://newsboat.org/ TERMUX_PKG_DESCRIPTION="RSS/Atom feed reader for the text console" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=2.29 +TERMUX_PKG_VERSION=2.30 TERMUX_PKG_SRCURL=https://newsboat.org/releases/${TERMUX_PKG_VERSION}/newsboat-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=18b9801e0c2948f29248bfd8f319a9f9f670993fdbd494c6464aaab9e325fd6b -TERMUX_PKG_DEPENDS="json-c, libandroid-glob, libandroid-support, libc++, libcurl, libiconv, libsqlite, libxml2, ncurses, stfl" +TERMUX_PKG_SHA256=e0ac957487d444cc6c4674e0dc82bbc8129b56a43ecd7ea9fc726c65e3b471d5 +TERMUX_PKG_DEPENDS="json-c, libandroid-glob, libandroid-support, libc++, libcurl, libsqlite, libxml2, ncurses, stfl" TERMUX_PKG_BUILD_DEPENDS="openssl" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_RM_AFTER_INSTALL="share/locale" From fb785b4473a256e249ef334c6ac9a51ec19aa5e9 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Mon, 26 Dec 2022 16:29:17 +0900 Subject: [PATCH 238/244] glib: Do not use `futex_time64` syscall which is forbidden by seccomp rule. --- packages/glib/build.sh | 1 + packages/glib/glib-gthread-posix.c.patch | 11 +++++++++++ packages/glib/glib-gthreadprivate.h.patch | 18 ++++++++++++++++++ packages/glib/meson.build.patch | 9 +++++++++ 4 files changed, 39 insertions(+) create mode 100644 packages/glib/glib-gthread-posix.c.patch diff --git a/packages/glib/build.sh b/packages/glib/build.sh index 3815f02be2..bc5acf04f0 100644 --- a/packages/glib/build.sh +++ b/packages/glib/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" _MAJOR_VERSION=2.74 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.4 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/gnome/sources/glib/${_MAJOR_VERSION}/glib-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=0e82da5ea129b4444227c7e4a9e598f7288d1994bf63f129c44b90cfd2432172 TERMUX_PKG_DEPENDS="libffi, libiconv, pcre2, libandroid-support, zlib" diff --git a/packages/glib/glib-gthread-posix.c.patch b/packages/glib/glib-gthread-posix.c.patch new file mode 100644 index 0000000000..7aed05c0f0 --- /dev/null +++ b/packages/glib/glib-gthread-posix.c.patch @@ -0,0 +1,11 @@ +--- a/glib/gthread-posix.c ++++ b/glib/gthread-posix.c +@@ -1647,7 +1647,7 @@ + sampled = cond->i[0]; + g_mutex_unlock (mutex); + +-#ifdef __NR_futex_time64 ++#if defined __NR_futex_time64 && !defined __ANDROID__ + { + struct + { diff --git a/packages/glib/glib-gthreadprivate.h.patch b/packages/glib/glib-gthreadprivate.h.patch index 0363243eeb..910250959f 100644 --- a/packages/glib/glib-gthreadprivate.h.patch +++ b/packages/glib/glib-gthreadprivate.h.patch @@ -11,3 +11,21 @@ #ifndef FUTEX_WAIT_PRIVATE #define FUTEX_WAIT_PRIVATE FUTEX_WAIT #define FUTEX_WAKE_PRIVATE FUTEX_WAKE +@@ -60,7 +60,7 @@ + * This must not be called with a timeout parameter as that differs + * in size between the two syscall variants! + */ +-#if defined(__NR_futex) && defined(__NR_futex_time64) ++#if defined(__NR_futex) && defined(__NR_futex_time64) && !defined(__ANDROID__) + #define g_futex_simple(uaddr, futex_op, ...) \ + G_STMT_START \ + { \ +@@ -69,7 +69,7 @@ + syscall (__NR_futex, uaddr, (gsize) futex_op, __VA_ARGS__); \ + } \ + G_STMT_END +-#elif defined(__NR_futex_time64) ++#elif defined(__NR_futex_time64) && !defined(__ANDROID__) + #define g_futex_simple(uaddr, futex_op, ...) \ + G_STMT_START \ + { \ diff --git a/packages/glib/meson.build.patch b/packages/glib/meson.build.patch index fda5ed91a8..f0d4ad18ee 100644 --- a/packages/glib/meson.build.patch +++ b/packages/glib/meson.build.patch @@ -16,6 +16,15 @@ 'inotify_init1', 'issetugid', 'kevent', +@@ -900,7 +898,7 @@ + int main (int argc, char ** argv) { + syscall (__NR_futex_time64, NULL, FUTEX_WAKE, FUTEX_WAIT); + return 0; +- }''', name : 'futex(2) system call') ++ }''', name : 'futex(2) system call') and host_system != 'android' + glib_conf.set('HAVE_FUTEX_TIME64', 1) + endif + @@ -907,7 +905,7 @@ syscall (SYS_pidfd_open, 0, 0); waitid (P_PIDFD, 0, &child_info, WEXITED | WNOHANG); From 6deae8fd0a155ec46c2fb6a5b341a151463ccee7 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Mon, 26 Dec 2022 11:29:00 +0100 Subject: [PATCH 239/244] scripts: disable uploads to grimler.se Grimler.se will mirror packages.termux.dev from now on, so that we have a single origin repo and can use tools like mirrorbits. --- .github/workflows/packages.yml | 46 ---------------------------------- 1 file changed, 46 deletions(-) diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index 0cbc57d7be..5866b0f02b 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -288,49 +288,3 @@ jobs: fi fi done - - name: Upload to grimler.se - # Run even if upload to packages.termux.dev failed: - if: always() - env: - REPOSITORY_URL: https://aptly-api.grimler.se - run: | - GITHUB_SHA=${{ github.sha }} - APTLY_API_AUTH=${{ secrets.APTLY_API_AUTH }} - - source scripts/aptly_api.sh - - for repo in $(jq --raw-output 'keys | .[]' repo.json); do - export REPOSITORY_NAME=$(jq --raw-output '.["'$repo'"].name' repo.json) - export REPOSITORY_DISTRIBUTION=$(jq --raw-output '.["'$repo'"].distribution' repo.json) - - # Upload file to temporary directory. - uploaded_files=false - shopt -s nullglob - - if [ -f debs/built_${REPOSITORY_NAME}_packages.txt ]; then - for filename in $(cat debs/built_${REPOSITORY_NAME}_packages.txt | sed -E 's/(..*)/debs\/\1_\*.deb debs\/\1-static_\*.deb/g'); do - if ! aptly_upload_file "$filename"; then - exit 1 - fi - - uploaded_files=true - done - shopt -u nullglob - - # Publishing repository changes. - if [ "$uploaded_files" = "true" ]; then - if ! aptly_add_to_repo; then - exit 1 - fi - - # Usually temporary directory is deleted automatically, but in certain cases it is left. - aptly_delete_dir - - # grimler.se mirror is signed manually, can't publish - # through CI - # if ! aptly_publish_repo; then - # exit 1 - # fi - fi - fi - done From d104b4ab2bf3dfc36bbfba5eee74ddb289dd0fec Mon Sep 17 00:00:00 2001 From: Kevin Williams Date: Mon, 26 Dec 2022 21:52:15 +0800 Subject: [PATCH 240/244] Add Hetzner Logo Signed-off-by: Kevin Williams --- .github/static/hosted-by-hetzner.png | Bin 0 -> 4159 bytes README.md | 2 ++ 2 files changed, 2 insertions(+) create mode 100644 .github/static/hosted-by-hetzner.png diff --git a/.github/static/hosted-by-hetzner.png b/.github/static/hosted-by-hetzner.png new file mode 100644 index 0000000000000000000000000000000000000000..fb9e55bfe3c4471543fbe721611c59165d811d10 GIT binary patch literal 4159 zcmai12{=@38y01$NQp>kj0({#m|@12SukbKE-_{fCd-VO(HNq#gb3LR5lZC~k`Q4k zBC=Gp$0Z&U?=L-uLr7?{h!T^;6wBPtN^Wo_NFFi64eJnT*p8Hd}us2AD@nX0F6lU0+=8-z=Pte3!Z$$0fQ)HU9cU(6lO}p z0-hA(Kssf^nkWbysjh)Sse;sCa4jfI3kp|13`e3hU}!Zp(9a9Z z^F}ATqpfg;KYj7ObitlXCJhaRvREt#OC3U`dqCkR6bcGcgQ}?=<{=I<*uG3+z+qp8 z!Y>OrfI*^DXiNqo7X=tlKt>VkQZ{UqLi~W&dkdht6mrP|bl>dVR;D}5> z7tB)tc^HN|tcJ3N!_ewTGy zL?-e7g2^PbJC*K3ks2C?2%G^aW;VlmJ_XyQ?t7>uSSemxcg1OkOMG{oSrNJAV#(-8cVOa6ygesZz@lMCeq z16{As|ESnsQ@l1+4Ap)x|ckLQw(M;szV5A5IecgPtEz7tp9X2kI~W!>cN&%7qg$v(mp1+*=&9lgs6T zgfW^EcSMA9Psgfw?A(mclvOh?jSn{Q#QKohyM{#4jJqR@?1l`4pC-t6zAyFg`}*OD z6ocO-ckT^`al zyn6L$^a>~odY*TYP4j;y2F#Hgg+SuG&u*2LC*o077;BX}?3o>RUqA#bf z=RAGzl-u2QvmRRI`KroFc?d)-W*5|;!nZdZWLxMcQsyXXWMp(OSvG*1Vh49`kv{S0 zw5ZpghS@<2Us}EulbVy2TOP;wtuC{NhRB2C#T=<_c3_~};xreAKtz<4Ng{o^qP~8m zF(<}UVuQKOk}!4ku*^)|+HY=7nTEk*Zgx zqrCM@Uv(}?Ww+4<=R;Mx=p8H##I1!5Q0@wRZ&&=SR&93WR zN=Oh-tv{eV^MRJ|K&t?;jW(jJQ)UsBtzmvMT#ttoO}{Cn2mGEpMHc%P^{Mdq!6c z%RA?!9tQM z)4@(z>x;jfeu%2FzM|so&cM!=^WW}gWE5Q8Cb~DGHA7Qq??(s$W9JcLLjl10Mz*H?W(NQcB1D|HRo z-+jcIym+i;IjiOC$GRr4a9xCbyFdlCf5(EKlxl#{5O$*hf4*S5?l+wHoIzc$Na#k4 z_1IxZ7S>=A8MJDcVFzTLdDHsXpz z0&6h`>Ca)_$9%?b+ds&zIuK;qmgHC8s<=jg^x-*3>Tc#%n> zk0=t~!W7+5Ydr^co_KgFq1$M#RY-v>OJwCo-O_%24OGYlu3SI?IdjU!>yU6 z*DXfR`+{D=CWzE6kMeEeC5Nt8Muo;qi7wT&w73qrZkdsDcI_-=j7vRV$=j|}ot*7Z zF0#cS(s`Ubkx?0_a-XwQ?Eao^d^TY3@|CO57j5|F7QA4AN2R0a+a8MKQ&Iy>e|evv zO1GNlxrT3QsXhr&wSN4g=gkxk^&PNHr0-i;oh2#+ifsCPD>l-p-t9qYdE%Lrl~(zi zH8U)M^2QjG)HrY=YXVpNexAFkB$d{|w~=%gzSc z{t_t27}j;-<^dP91+_;MAJrPYe&}E^BKbzkET5=y(yCCWtjZGaN4=&o=KnEGSxElo z$BSW^PhO}-UBWg9$)=YNY!+D1--I`2uk4+AKZdzGTwl#%Ni{zllRRl%JAQ145XSGS ztM|~>JaOR#r78Z2=vy}nmtI3}K!jvx)Ovp|T>L?4(i+Y7$zlOm@%7lNWOv$0bVXZm zt9`6*S3Y*4ZG|Wmvo>gP(puGF&9mEA>u|cLLP~Jql4E?wBx-k7l1v3FUw7X$ErNah z%UpnVAH>cg-EyvtoA`!F#;@=#$s`d#WjX0Hj(Cjsxp#f)f6SkpHH^2olQd}~k|dKm za#ruMvyooYdD&BK=8eoivGz~q`**1_iEEJri`I;jBS@VMBQ?~%=oy>&Moe~(f(KEX zZBn?@q}wkzqF5*Rc%@Ww&bRTIpNcDgvz%Sc$wQjMCP^aUn7dL9VP)Ny=dVaQ!mIMH zXjh+oZ&|EGUWhdl`*cs8fAet(N_qmFgRh7$DLooRuo}@;P7Zsp>GhRDqwh=O%s}Mi zRpYCR0W!!d#GK^(3XPo|BXmE;jkdOYKTD%tW~g^jQnU7HxeB3XM%Xh#zUa8WLixw0 zw&42}6=!GOqU)mEBe^=1v(Czxf^_?c+HkS8xFg!ffR3S7gpP6W{!1Y@41kLM`xpkL zVyf9fA!u#;cEO`H1xDk$qR@)FBJ3nGZhp?qAh;#Q5R4Y26vX?M@@mU)J;LH$&7ZJ?V)78xQ8vD{t@6pN<&P~)?s>!BiK6o^)j@YetV%Y4R zlOw70n?=0XWiO(n&b?>5&;0ofJMCjnIaq|2*&)$Be=h?qS6&<&kw(3JYtkg6fXHrF zTBzZi=@!fkZ_eUMPB`J?n$&bK;hH_)IQJ zGDq=P1G_eT>eX$fst~8HO0r%!_t^PXu-Ge#<<9OiUxT)CHko(q5Zag4HEK+b*=3Y; z!L22TJ~h?!rdt3>RQRyB^!V1J$>Fy);U#lMOBk&Zar)aXInhSb`>1&p(!1ZOQXh<5 zDO&tcl^7&rMWvkL?_00AxOPN`V^qtk9K>#TeaKmLsI9U=`m>28As=^1 zM2}>dx{2Q!y8WUFZ}rX_e(v%{%md1|Ja+N*@;@Ov1au4Ed&{TJy~{pzzMS7yL9nUs z3e_p`+AW#WZP#%fN?jP`FV|9U0m!O2oz)R6m+Phud3b78MgR6IEHL?kA-LL(_h+R{ z)Wg^)fO6W;_DT9%Y-WawWGLdpwYwNWyRyh=xT?@5&(xHam1l!(I$OOT%??Ygk^ QnDt+J0^ST)gmDf17wJ?@U;qFB literal 0 HcmV?d00001 diff --git a/README.md b/README.md index d74f32fc54..6a1c03d7f1 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ [![Join the chat at https://gitter.im/termux/termux](https://badges.gitter.im/termux/termux.svg)](https://gitter.im/termux/termux) [![Join the Termux discord server](https://img.shields.io/discord/641256914684084234.svg?label=&logo=discord&logoColor=ffffff&color=5865F2)](https://discord.gg/HXpF69X) +Hosted by Hetzner + This project contains scripts and patches to build packages for the [Termux](https://github.com/termux/termux-app) Android application. From 80a124b5d63ac4ca6ae4f3e6b8c740bb86bb8b96 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Mon, 26 Dec 2022 18:10:29 +0000 Subject: [PATCH 241/244] bump(main/libpsl): 0.21.2 This commit has been automatically submitted by Github Actions. --- packages/libpsl/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/libpsl/build.sh b/packages/libpsl/build.sh index df1e6fe2e6..1ac8a7afa2 100644 --- a/packages/libpsl/build.sh +++ b/packages/libpsl/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/rockdaboot/libpsl TERMUX_PKG_DESCRIPTION="Public Suffix List library" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=0.21.1 +TERMUX_PKG_VERSION="0.21.2" TERMUX_PKG_SRCURL=https://github.com/rockdaboot/libpsl/releases/download/${TERMUX_PKG_VERSION}/libpsl-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c +TERMUX_PKG_SHA256=e35991b6e17001afa2c0ca3b10c357650602b92596209b7492802f3768a6285f TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="libidn2, libunistring" TERMUX_PKG_BREAKS="libpsl-dev" From f1463fe56137f1195cf0dcb6cf4ed7354a6d72c4 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Mon, 26 Dec 2022 18:11:47 +0000 Subject: [PATCH 242/244] bump(main/lsof): 4.96.5 This commit has been automatically submitted by Github Actions. --- packages/lsof/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/lsof/build.sh b/packages/lsof/build.sh index d385256568..cc3b83f8e3 100644 --- a/packages/lsof/build.sh +++ b/packages/lsof/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/lsof-org/lsof TERMUX_PKG_DESCRIPTION="Lists open files for running Unix processes" TERMUX_PKG_LICENSE="custom" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="4.96.4" +TERMUX_PKG_VERSION="4.96.5" TERMUX_PKG_SRCURL=https://github.com/lsof-org/lsof/archive/${TERMUX_PKG_VERSION}/lsof-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=b5a052cac8d6b2726bbb1de2b98c6d9204c7619263fb63e9b6b1bd6bbb37bf14 +TERMUX_PKG_SHA256=e9030af1123ff052ab69e12ef55b8a17dc47ac4bccfba85ee1ca1f31acf29607 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="libandroid-support, libtirpc" TERMUX_PKG_BUILD_IN_SRC=true From 09a8870e4608c9165f8941c1a239b92af7961036 Mon Sep 17 00:00:00 2001 From: Termux Github Actions Date: Mon, 26 Dec 2022 18:15:32 +0000 Subject: [PATCH 243/244] bump(main/python-numpy): 1.24.1 This commit has been automatically submitted by Github Actions. --- packages/python-numpy/build.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/python-numpy/build.sh b/packages/python-numpy/build.sh index 01ff9ea9ff..0ed3f72b4f 100644 --- a/packages/python-numpy/build.sh +++ b/packages/python-numpy/build.sh @@ -2,8 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://numpy.org/ TERMUX_PKG_DESCRIPTION="The fundamental package for scientific computing with Python" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="1.24.0" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION="1.24.1" TERMUX_PKG_SRCURL=https://github.com/numpy/numpy.git TERMUX_PKG_DEPENDS="libandroid-complex-math, libc++, libopenblas, python" TERMUX_PKG_BUILD_IN_SRC=true From 7c8bf1d318e16919ca788aafb1a1091226676302 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Mon, 26 Dec 2022 22:20:55 +0100 Subject: [PATCH 244/244] termux-services: depend on dpkg as well dpkg contains `start-stop-daemon`, which is used by the termux-services scripts. --- packages/termux-services/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/termux-services/build.sh b/packages/termux-services/build.sh index a62a81369f..4e9f16c918 100644 --- a/packages/termux-services/build.sh +++ b/packages/termux-services/build.sh @@ -3,8 +3,9 @@ TERMUX_PKG_DESCRIPTION="Service daemon for Termux" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91" TERMUX_PKG_VERSION=0.13 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/termux/termux-services/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=486a2b21332e0557764c706e6d01a33af54425ee4ac9cc3d3e74ee574799ffb9 -TERMUX_PKG_DEPENDS="runit, coreutils" +TERMUX_PKG_DEPENDS="coreutils, dpkg, runit" TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_BUILD_IN_SRC=true