Skip to content

Commit

Permalink
global packages update
Browse files Browse the repository at this point in the history
apache2
bash-completion
boost
box64
box86
doxygen
e2fsprogs
gettext
libaom
libcurl
libdrm
libedit
libelf
libflac
libgnutls
libice
libicu
liblzma
libnettle
libnghttp2
libpam
libpixman
libpng
libsecret
libsm
libsqlite
libtool
libtpms
libuv
libwayland-protocols
libx11
libxau
libxkbcommon
libxml2
libxrender
libxshmfence
libxt
libxxf86vm
openssl
pcre2
python
zstd
python-pip
  • Loading branch information
Maxython committed Mar 7, 2025
1 parent 7b6c8c4 commit f04ea70
Show file tree
Hide file tree
Showing 51 changed files with 269 additions and 221 deletions.
4 changes: 2 additions & 2 deletions gpkg/apache2/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://httpd.apache.org
TERMUX_PKG_DESCRIPTION="Apache Web Server"
TERMUX_PKG_LICENSE="Apache-2.0"
TERMUX_PKG_MAINTAINER="@termux-pacman"
TERMUX_PKG_VERSION=2.4.62
TERMUX_PKG_VERSION=2.4.63
TERMUX_PKG_SRCURL=https://www.apache.org/dist/httpd/httpd-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_SHA256=674188e7bf44ced82da8db522da946849e22080d73d16c93f7f4df89e25729ec
TERMUX_PKG_SHA256=88fc236ab99b2864b248de7d49a008ec2afd7551e64dce8b95f58f32f94c46ab
TERMUX_PKG_DEPENDS="zlib-glibc, apr-util-glibc, pcre2-glibc, libnghttp2-glibc, openssl-glibc, libxcrypt-glibc"
TERMUX_PKG_BUILD_DEPENDS="libcurl-glibc, libjansson-glibc, brotli-glibc, libdb-glibc"
TERMUX_PKG_CONFFILES="
Expand Down
4 changes: 2 additions & 2 deletions gpkg/bash-completion/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/scop/bash-completion
TERMUX_PKG_DESCRIPTION="Programmable completion for the bash shell"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux-pacman"
TERMUX_PKG_VERSION=2.14.0
TERMUX_PKG_VERSION=2.16.0
TERMUX_PKG_SRCURL=https://github.com/scop/bash-completion/releases/download/${TERMUX_PKG_VERSION}/bash-completion-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=5c7494f968280832d6adb5aa19f745a56f1a79df311e59338c5efa6f7285e168
TERMUX_PKG_SHA256=3369bd5e418a75fb990863925aed5b420398acebb320ec4c0306b3eae23f107a
TERMUX_PKG_DEPENDS="bash-glibc"
TERMUX_PKG_PLATFORM_INDEPENDENT=true
TERMUX_PKG_RM_AFTER_INSTALL="
Expand Down
19 changes: 0 additions & 19 deletions gpkg/boost/boost-process-detail-posix-shell_path.hpp.patch

This file was deleted.

15 changes: 10 additions & 5 deletions gpkg/boost/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://boost.org
TERMUX_PKG_DESCRIPTION="Free peer-reviewed portable C++ source libraries"
TERMUX_PKG_LICENSE="BSL-1.0"
TERMUX_PKG_MAINTAINER="@termux-pacman"
TERMUX_PKG_VERSION="1.83.0"
TERMUX_PKG_SRCURL=https://boostorg.jfrog.io/artifactory/main/release/$TERMUX_PKG_VERSION/source/boost_${TERMUX_PKG_VERSION//./_}.tar.bz2
TERMUX_PKG_SHA256=6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e
TERMUX_PKG_VERSION="1.87.0"
TERMUX_PKG_SRCURL=https://archives.boost.io/release/$TERMUX_PKG_VERSION/source/boost_${TERMUX_PKG_VERSION//./_}.tar.bz2
TERMUX_PKG_SHA256=af57be25cb4c4f4b413ed692fe378affb4352ea50fbe294a11ef548f4d527d89
TERMUX_PKG_DEPENDS="libbz2-glibc, zlib-glibc, libicu-glibc, zstd-glibc"
TERMUX_PKG_BUILD_DEPENDS="python-glibc"
TERMUX_PKG_BUILD_IN_SRC=true
Expand All @@ -26,6 +26,11 @@ termux_step_make_install() {
local BOOSTAM=32
fi

local ML_FLAG=""
if [ "$TERMUX_ARCH" = i686 ]; then
ML_FLAG="-DBOOST_STACKTRACE_LIBCXX_RUNTIME_MAY_CAUSE_MEMORY_LEAK"
fi

./bootstrap.sh --with-toolset=gcc --with-icu --with-python=$TERMUX_PREFIX/bin/python3
./b2 install \
variant=release \
Expand All @@ -35,8 +40,8 @@ termux_step_make_install() {
link=shared,static \
toolset=gcc \
python=$python_version \
cflags="$CPPFLAGS $CFLAGS -fPIC -O3 -ffat-lto-objects" \
cxxflags="$CPPFLAGS $CXXFLAGS -fPIC -O3 -ffat-lto-objects" \
cflags="$CPPFLAGS $CFLAGS $ML_FLAG -fPIC -O3 -ffat-lto-objects" \
cxxflags="$CPPFLAGS $CXXFLAGS $ML_FLAG -fPIC -O3 -ffat-lto-objects" \
linkflags="$LDFLAGS" \
--layout=system \
--prefix=$TERMUX_PREFIX \
Expand Down
26 changes: 26 additions & 0 deletions gpkg/boost/fix-smart-pointer-output.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From e7433ba54596da97cb7859455cd37ca140305a9c Mon Sep 17 00:00:00 2001
From: Peter Dimov <[email protected]>
Date: Mon, 13 Jan 2025 16:13:04 +0200
Subject: [PATCH] Fix operator<< for shared_ptr and intrusive_ptr. Fixes #115.
--- a/boost/smart_ptr/intrusive_ptr.hpp
+++ b/boost/smart_ptr/intrusive_ptr.hpp
@@ -285,7 +285,7 @@ template<class T, class U> intrusive_ptr<T> dynamic_pointer_cast( intrusive_ptr<

// operator<<

-template<class Y> std::ostream & operator<< (std::ostream & os, intrusive_ptr<Y> const & p)
+template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::basic_ostream<E, T> & os, intrusive_ptr<Y> const & p)
{
os << p.get();
return os;
--- a/boost/smart_ptr/shared_ptr.hpp
+++ b/boost/smart_ptr/shared_ptr.hpp
@@ -775,7 +775,7 @@ template<class T> inline typename shared_ptr<T>::element_type * get_pointer(shar

// operator<<

-template<class Y> std::ostream & operator<< (std::ostream & os, shared_ptr<Y> const & p)
+template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::basic_ostream<E, T> & os, shared_ptr<Y> const & p)
{
os << p.get();
return os;
18 changes: 18 additions & 0 deletions gpkg/boost/shell_path.hpp.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
--- src/boost/process/v1/detail/posix/shell_path.hpp 2024-12-05 03:53:35.000000000 +0300
+++ src/boost/process/v1/detail/posix/shell_path.hpp.patch 2025-03-05 14:02:47.847495863 +0300
@@ -18,13 +18,13 @@

inline boost::process::v1::filesystem::path shell_path()
{
- return "/bin/sh";
+ return "@TERMUX_PREFIX@/bin/sh";
}

inline boost::process::v1::filesystem::path shell_path(std::error_code &ec)
{
ec.clear();
- return "/bin/sh";
+ return "@TERMUX_PREFIX@/bin/sh";
}

}}}}}
6 changes: 3 additions & 3 deletions gpkg/box64/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://github.com/ptitSeb/box64
TERMUX_PKG_DESCRIPTION="Linux Userspace x86_64 Emulator with a twist"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux-pacman"
TERMUX_PKG_VERSION=0.3.0
TERMUX_PKG_VERSION=0.3.2
TERMUX_PKG_SRCURL=https://github.com/ptitSeb/box64/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=e334e793638f375a28829c01b089c6ba27d8c3f6094fcbc9360b56ad9c09d0b5
TERMUX_PKG_SHA256=8658b2c3840ae830ebb2b2673047d30a748139ec3afe178ca74a71adeddba63e
TERMUX_PKG_DEPENDS="gcc-libs-glibc"
TERMUX_PKG_BLACKLISTED_ARCHES="arm, i686"
TERMUX_CMAKE_BUILD="Unix Makefiles"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DCMAKE_BUILD_TYPE=RelWithDebInfo"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBOX32=ON -DBOX32_BINFMT=ON"
TERMUX_PKG_RM_AFTER_INSTALL="glibc/etc/binfmt.d"

termux_step_pre_configure() {
Expand Down
62 changes: 38 additions & 24 deletions gpkg/box64/setdirs.patch
Original file line number Diff line number Diff line change
@@ -1,31 +1,45 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f9e5d6..a0fd4b4 100644
index 95e7b0c..ce59937 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -944,15 +944,15 @@ if(NOT _x86 AND NOT _x86_64)
@@ -1159,11 +1159,11 @@ if(NOT _x86 AND NOT _x86_64)
if(NOT NO_CONF_INSTALL)
configure_file(system/box64.conf.cmake system/box64.conf)
if(NOT TERMUX)
- install(FILES ${CMAKE_BINARY_DIR}/system/box64.conf DESTINATION /etc/binfmt.d/)
- install(FILES ${CMAKE_SOURCE_DIR}/system/box64.box64rc DESTINATION /etc/)
+ install(FILES ${CMAKE_BINARY_DIR}/system/box64.conf DESTINATION @TERMUX_PREFIX@/etc/binfmt.d/)
+ install(FILES ${CMAKE_SOURCE_DIR}/system/box64.box64rc DESTINATION @TERMUX_PREFIX@/etc/)
else()
install(FILES ${CMAKE_BINARY_DIR}/system/box64.conf DESTINATION ${TERMUX_PATH}/usr/etc/binfmt.d/)
install(FILES ${CMAKE_SOURCE_DIR}/system/box64.box64rc DESTINATION ${TERMUX_PATH}/usr/etc/)
- install(FILES ${CMAKE_BINARY_DIR}/system/box64.conf DESTINATION /etc/binfmt.d/)
- install(FILES ${CMAKE_SOURCE_DIR}/system/box64.box64rc DESTINATION /etc/)
+ install(FILES ${CMAKE_BINARY_DIR}/system/box64.conf DESTINATION @TERMUX_PREFIX@/etc/binfmt.d/)
+ install(FILES ${CMAKE_SOURCE_DIR}/system/box64.box64rc DESTINATION @TERMUX_PREFIX@/etc/)
if(BOX32_BINFMT)
configure_file(system/box32.conf.cmake system/box32.conf)
- install(FILES ${CMAKE_BINARY_DIR}/system/box32.conf DESTINATION /etc/binfmt.d/)
+ install(FILES ${CMAKE_BINARY_DIR}/system/box32.conf DESTINATION @TERMUX_PREFIX@/etc/binfmt.d/)
endif()
else()
install(FILES ${CMAKE_BINARY_DIR}/system/box64.conf DESTINATION ${TERMUX_PATH}/usr/etc/binfmt.d/)
@@ -1175,7 +1175,7 @@ if(NOT _x86 AND NOT _x86_64)
endif()

endif()
- set(INSTALL_PATH "/usr/lib/x86_64-linux-gnu/")
+ set(INSTALL_PATH "@TERMUX_PREFIX@/lib/x86_64-linux-gnu/")
- set(INSTALL_PATH "/usr/lib/box64-x86_64-linux-gnu/")
+ set(INSTALL_PATH "@TERMUX_PREFIX@/lib/box64-x86_64-linux-gnu/")
if(NOT NO_LIB_INSTALL)
if(NOT TERMUX)
install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libstdc++.so.5 DESTINATION ${INSTALL_PATH})
if(NOT TERMUX AND NOT ANDROID)
install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libstdc++.so.5 DESTINATION ${INSTALL_PATH})
@@ -1214,7 +1214,7 @@ if(NOT _x86 AND NOT _x86_64)
endif()
endif()
if(BOX32)
- set(INSTALL_PATH "/usr/lib/box64-i386-linux-gnu/")
+ set(INSTALL_PATH "@TERMUX_PREFIX@/lib/box64-i386-linux-gnu/")
if(NOT NO_LIB_INSTALL)
if(NOT TERMUX AND NOT ANDROID)
install(FILES ${CMAKE_SOURCE_DIR}/x86lib/libstdc++.so.5 DESTINATION ${INSTALL_PATH})
diff --git a/src/core.c b/src/core.c
index b1a552b..b9d924a 100644
index c43fd05..ab850b0 100644
--- a/src/core.c
+++ b/src/core.c
@@ -1658,7 +1658,7 @@ int initialize(int argc, const char **argv, char** env, x64emu_t** emulator, elf
@@ -1904,7 +1904,7 @@ int initialize(int argc, const char **argv, char** env, x64emu_t** emulator, elf
printf("See 'box64 --help' for more information.\n");
exit(0);
}
Expand All @@ -35,26 +49,26 @@ index b1a552b..b9d924a 100644
// uname -m is redirected to box64 -m
if(argc==2 && (!strcmp(argv[1], "-m") || !strcmp(argv[1], "-p") || !strcmp(argv[1], "-i")))
diff --git a/src/steam.c b/src/steam.c
index 52461a3..0e14ad7 100644
index 710fb84..24e1f53 100644
--- a/src/steam.c
+++ b/src/steam.c
@@ -39,13 +39,13 @@ void pressure_vessel(int argc, const char** argv, int nextarg, const char* prog)
if(is_usr) {
// transform RESSURE_VESSEL_APP_LD_LIBRARY_PATH to BOX86_ / BOX64_ LD_LIBRARY_PATH
char tmp[strlen(argv[nextarg])+150];
- strcpy(tmp, "BOX86_LD_LIBRARY_PATH=/lib/box86:/usr/lib/box86:/lib/i386-linux-gnu:/usr/lib/i386-linux-gnu:/usr/lib/i686-pc-linux-gnu:/usr/lib32:");
+ strcpy(tmp, "BOX86_LD_LIBRARY_PATH=@TERMUX_PREFIX@/lib/box86:@TERMUX_PREFIX@/lib/i386-linux-gnu:@TERMUX_PREFIX@/lib/i686-pc-linux-gnu:@TERMUX_PREFIX@/lib32:");
- strcpy(tmp, "BOX86_LD_LIBRARY_PATH=/lib/box86:/usr/lib/box86:/lib/i386-linux-gnu:/usr/lib/i386-linux-gnu:/usr/lib/box86-i386-linux-gnu:/usr/lib/box64-i386-linux-gnu:/usr/lib/i686-pc-linux-gnu:/usr/lib32:");
+ strcpy(tmp, "BOX86_LD_LIBRARY_PATH=@TERMUX_PREFIX@/lib/box86:@TERMUX_PREFIX@/lib/i386-linux-gnu:@TERMUX_PREFIX@/lib/box86-i386-linux-gnu:@TERMUX_PREFIX@/lib/box64-i386-linux-gnu:@TERMUX_PREFIX@/lib/i686-pc-linux-gnu:@TERMUX_PREFIX@/lib32:");
strcat(tmp, argv[nextarg]+strlen("--env-if-host=STEAM_RUNTIME_LIBRARY_PATH="));
char *p = strchr(tmp, '=');
*p ='\0'; ++p;
setenv(tmp, p, 1);
printf_log(LOG_DEBUG, "setenv(%s, %s, 1)\n", tmp, p);
- strcpy(tmp, "BOX64_LD_LIBRARY_PATH=/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu:");
+ strcpy(tmp, "BOX64_LD_LIBRARY_PATH=@TERMUX_PREFIX@/lib/x86_64-linux-gnu:");
- strcpy(tmp, "BOX64_LD_LIBRARY_PATH=/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu:/usr/lib/box64-x86_64-linux-gnu:/usr/lib/box64-i386-linux-gnu:");
+ strcpy(tmp, "BOX64_LD_LIBRARY_PATH=@TERMUX_PREFIX@/lib/x86_64-linux-gnu:@TERMUX_PREFIX@/lib/box64-x86_64-linux-gnu:@TERMUX_PREFIX@/lib/box64-i386-linux-gnu:");
strcat(tmp, argv[nextarg]+strlen("--env-if-host=STEAM_RUNTIME_LIBRARY_PATH="));
p = strchr(tmp, '=');
*p ='\0'; ++p;
@@ -81,14 +81,8 @@ void pressure_vessel(int argc, const char** argv, int nextarg, const char* prog)
@@ -93,14 +93,8 @@ void pressure_vessel(int argc, const char** argv, int nextarg, const char* prog)
strcat(sniper, "/files"); // this is the sniper root
// do LD_LIBRARY_PATH
{
Expand All @@ -70,7 +84,7 @@ index 52461a3..0e14ad7 100644
// prepare folders, using ldconfig
snprintf(tmp, sizeof(tmp), "%s -i -n %s/lib/x86_64-linux-gnu", ldcmd, sniper);
diff --git a/src/tools/fileutils.c b/src/tools/fileutils.c
index 327f798..79d22c8 100644
index 11dc690..8e2a625 100644
--- a/src/tools/fileutils.c
+++ b/src/tools/fileutils.c
@@ -17,9 +17,9 @@
Expand Down Expand Up @@ -100,10 +114,10 @@ index de962ee..67a786f 100644
typedef void* (*pFp_t)(void*);

diff --git a/src/wrapped/wrappedlibdl.c b/src/wrapped/wrappedlibdl.c
index 2725285..fd94673 100644
index d8b73b3..d886411 100644
--- a/src/wrapped/wrappedlibdl.c
+++ b/src/wrapped/wrappedlibdl.c
@@ -101,7 +101,7 @@ void* my_dlopen(x64emu_t* emu, void *filename, int flag)
@@ -141,7 +141,7 @@ void* my_dlopen(x64emu_t* emu, void *filename, int flag)
if(sys)
return sys;
}
Expand Down
4 changes: 2 additions & 2 deletions gpkg/box86/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/ptitSeb/box86
TERMUX_PKG_DESCRIPTION="Linux Userspace x86 Emulator with a twist"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux-pacman"
TERMUX_PKG_VERSION=0.3.6
TERMUX_PKG_VERSION=0.3.8
TERMUX_PKG_SRCURL=https://github.com/ptitSeb/box86/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=bba944fc21f07afc4b9f3de694826819024dd2f391085f11de0e63a210e937ff
TERMUX_PKG_SHA256=454e5f7c57f7c7c4530d4f453bf6afd07b00bd93c92fe16a4305bacae0b6a93d
TERMUX_PKG_DEPENDS="gcc-libs-glibc"
TERMUX_PKG_BLACKLISTED_ARCHES="aarch64, x86_64, i686"
TERMUX_CMAKE_BUILD="Unix Makefiles"
Expand Down
Loading

0 comments on commit f04ea70

Please sign in to comment.