From 8a6b85319aa3b4b74ce8afea3fd9d99edfc94659 Mon Sep 17 00:00:00 2001 From: Maxython Date: Wed, 3 Apr 2024 11:32:46 +0300 Subject: [PATCH] update pkgs to gpkg gpkg/cmake gpkg/glib gpkg/libcurl gpkg/libx11 gpkg/strace gpkg/vulkan-headers gpkg/zstd --- gpkg/cmake/build.sh | 4 ++-- gpkg/glib/build.sh | 33 +++++++++++++++++++++++++++------ gpkg/glib/glib-gcharset.c.patch | 10 +++++----- gpkg/libcurl/build.sh | 4 ++-- gpkg/libx11/build.sh | 4 ++-- gpkg/strace/build.sh | 4 ++-- gpkg/vulkan-headers/build.sh | 4 ++-- gpkg/zstd/build.sh | 5 ++--- 8 files changed, 44 insertions(+), 24 deletions(-) diff --git a/gpkg/cmake/build.sh b/gpkg/cmake/build.sh index 88a14d7c3..05394f9b4 100644 --- a/gpkg/cmake/build.sh +++ b/gpkg/cmake/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://cmake.org/ TERMUX_PKG_DESCRIPTION="Family of tools designed to build, test and package software" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION=3.28.3 +TERMUX_PKG_VERSION=3.29.0 TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:4}/cmake-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=72b7570e5c8593de6ac4ab433b73eab18c5fb328880460c86ce32608141ad5c1 +TERMUX_PKG_SHA256=a0669630aae7baa4a8228048bf30b622f9e9fd8ee8cedb941754e9e38686c778 TERMUX_PKG_DEPENDS="libcurl-glibc, libarchive-glibc, jsoncpp-glibc, libuv-glibc, rhash-glibc, cppdap-glibc, libexpat-glibc" TERMUX_PKG_RECOMMENDS="gcc-glibc, make-glibc" TERMUX_PKG_FORCE_CMAKE=true diff --git a/gpkg/glib/build.sh b/gpkg/glib/build.sh index 1cbbc96c7..99e495368 100644 --- a/gpkg/glib/build.sh +++ b/gpkg/glib/build.sh @@ -2,19 +2,22 @@ TERMUX_PKG_HOMEPAGE=https://developer.gnome.org/glib/ TERMUX_PKG_DESCRIPTION="Library providing core building blocks for libraries and applications written in C" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION="2.78.4" +TERMUX_PKG_VERSION="2.80.0" TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/gnome/sources/glib/${TERMUX_PKG_VERSION%.*}/glib-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=24b8e0672dca120cc32d394bccb85844e732e04fe75d18bb0573b2dbc7548f63 +TERMUX_PKG_SHA256=8228a92f92a412160b139ae68b6345bd28f24434a7b5af150ebe21ff587a561d TERMUX_PKG_DEPENDS="libffi-glibc, pcre2-glibc, util-linux-glibc, zlib-glibc, openssl-glibc, libunwind-glibc" -TERMUX_PKG_PYTHON_COMMON_DEPS="pygments, itstool" +TERMUX_PKG_BUILD_DEPENDS="gobject-introspection-glibc" +TERMUX_PKG_PYTHON_COMMON_DEPS="pygments, itstool, packaging" # -Dgtk_doc=true # -Dsysprof=enabled TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --default-library both -Druntime_dir=$TERMUX_PREFIX/var/run --Dglib_debug=disabled --Dselinux=disabled --Dman=true +-D glib_debug=disabled +-D documentation=true +-D introspection=enabled +-D man-pages=enabled +-D selinux=disabled " termux_step_pre_configure() { @@ -22,6 +25,24 @@ termux_step_pre_configure() { CXXFLAGS+=" -g3 -ffat-lto-objects" } +termux_step_configure() { + local OLD_PATH="${PATH}" + export PATH="${TERMUX_PREFIX}/bin:${PATH}" + + termux_step_configure_meson + + export PATH="${OLD_PATH}" +} + +termux_step_make() { + local OLD_PATH="${PATH}" + export PATH="${TERMUX_PREFIX}/bin:${PATH}" + + ninja + + export PATH=$OLD_PATH +} + termux_step_create_debscripts() { for i in postinst postrm triggers; do sed \ diff --git a/gpkg/glib/glib-gcharset.c.patch b/gpkg/glib/glib-gcharset.c.patch index 872126068..0facccec3 100644 --- a/gpkg/glib/glib-gcharset.c.patch +++ b/gpkg/glib/glib-gcharset.c.patch @@ -1,11 +1,11 @@ ---- ./glib/gcharset.c.orig 2021-12-10 21:38:06.571715302 +0530 -+++ ./glib/gcharset.c 2021-12-10 21:38:11.361715300 +0530 -@@ -494,7 +494,7 @@ - if (g_once_init_enter (&alias_table)) +--- src/glib/gcharset.c 2024-03-08 00:35:05.000000000 +0300 ++++ src/glib/gcharset.c.patch 2024-04-03 12:59:22.731455962 +0300 +@@ -503,7 +503,7 @@ + if (g_once_init_enter_pointer (&alias_table)) { GHashTable *table = g_hash_table_new (g_str_hash, g_str_equal); - read_aliases ("/usr/share/locale/locale.alias", table); + read_aliases ("@TERMUX_PREFIX@/share/locale/locale.alias", table); - g_once_init_leave (&alias_table, table); + g_once_init_leave_pointer (&alias_table, table); } diff --git a/gpkg/libcurl/build.sh b/gpkg/libcurl/build.sh index 67a98e864..270197370 100644 --- a/gpkg/libcurl/build.sh +++ b/gpkg/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-pacman" -TERMUX_PKG_VERSION=8.6.0 +TERMUX_PKG_VERSION=8.7.1 TERMUX_PKG_SRCURL=https://github.com/curl/curl/releases/download/curl-${TERMUX_PKG_VERSION//./_}/curl-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15 +TERMUX_PKG_SHA256=6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd TERMUX_PKG_DEPENDS="libnghttp2-glibc, libssh2-glibc, openssl-glibc (>= 3.0.3), krb5-glibc, brotli-glibc, libpsl-glibc" TERMUX_PKG_ESSENTIAL=true TERMUX_PKG_EXTRA_MAKE_ARGS="LDFLAGS='-lbrotlidec'" diff --git a/gpkg/libx11/build.sh b/gpkg/libx11/build.sh index b9848daf1..da9aecdcd 100644 --- a/gpkg/libx11/build.sh +++ b/gpkg/libx11/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="X11 client-side library" TERMUX_PKG_LICENSE="MIT, X11" TERMUX_PKG_LICENSE_FILE="COPYING" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION="1.8.7" +TERMUX_PKG_VERSION="1.8.8" TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libX11-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=05f267468e3c851ae2b5c830bcf74251a90f63f04dd7c709ca94dc155b7e99ee +TERMUX_PKG_SHA256=46afaebb2dd1a3a7348c0544a4b1c88c51de4bda885fde57d2cf98427ee5cbf6 TERMUX_PKG_DEPENDS="libxcb-glibc, xorgproto-glibc" TERMUX_PKG_BUILD_DEPENDS="xorg-util-macros-glibc, xtrans-glibc" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/gpkg/strace/build.sh b/gpkg/strace/build.sh index 8fd7822f5..096841ba2 100644 --- a/gpkg/strace/build.sh +++ b/gpkg/strace/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Debugging utility to monitor system calls and signals re TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_LICENSE_FILE="COPYING, LGPL-2.1-or-later" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION="6.7" +TERMUX_PKG_VERSION="6.8" TERMUX_PKG_SRCURL=https://github.com/strace/strace/releases/download/v$TERMUX_PKG_VERSION/strace-$TERMUX_PKG_VERSION.tar.xz -TERMUX_PKG_SHA256=2090201e1a3ff32846f4fe421c1163b15f440bb38e31355d09f82d3949922af7 +TERMUX_PKG_SHA256=ba6950a96824cdf93a584fa04f0a733896d2a6bc5f0ad9ffe505d9b41e970149 TERMUX_PKG_DEPENDS="perl-glibc, libunwind-glibc" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-libunwind diff --git a/gpkg/vulkan-headers/build.sh b/gpkg/vulkan-headers/build.sh index aa5f8b31d..7484dfb0b 100644 --- a/gpkg/vulkan-headers/build.sh +++ b/gpkg/vulkan-headers/build.sh @@ -2,7 +2,7 @@ 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-pacman" -TERMUX_PKG_VERSION="1.3.280" +TERMUX_PKG_VERSION="1.3.281" TERMUX_PKG_SRCURL=https://github.com/KhronosGroup/Vulkan-Headers/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=717b49c52dbd37c78cf2f7f0fc715292c42e74841219e6cca918cd293ad5dce4 +TERMUX_PKG_SHA256=e5784d7a2a19e86d61dfa4463246a6ca77b56087edc57323f290e9e9bc71f84e TERMUX_PKG_PLATFORM_INDEPENDENT=true diff --git a/gpkg/zstd/build.sh b/gpkg/zstd/build.sh index 610e779b2..af0cda567 100644 --- a/gpkg/zstd/build.sh +++ b/gpkg/zstd/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/facebook/zstd TERMUX_PKG_DESCRIPTION="Zstandard compression" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION="1.5.5" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION="1.5.6" TERMUX_PKG_SRCURL=https://github.com/facebook/zstd/archive/v$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1 +TERMUX_PKG_SHA256=30f35f71c1203369dc979ecde0400ffea93c27391bfd2ac5a9715d2173d92ff7 TERMUX_PKG_DEPENDS="liblzma-glibc, zlib-glibc, liblz4-glibc, gcc-libs-glibc" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -Ddefault_library=both