Skip to content

Commit 7d6d637

Browse files
MaxythonMaxython
committed
global packages update
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
1 parent 7b6c8c4 commit 7d6d637

File tree

50 files changed

+258
-199
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+258
-199
lines changed

‎gpkg/apache2/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://httpd.apache.org
22
TERMUX_PKG_DESCRIPTION="Apache Web Server"
33
TERMUX_PKG_LICENSE="Apache-2.0"
44
TERMUX_PKG_MAINTAINER="@termux-pacman"
5-
TERMUX_PKG_VERSION=2.4.62
5+
TERMUX_PKG_VERSION=2.4.63
66
TERMUX_PKG_SRCURL=https://www.apache.org/dist/httpd/httpd-${TERMUX_PKG_VERSION}.tar.bz2
7-
TERMUX_PKG_SHA256=674188e7bf44ced82da8db522da946849e22080d73d16c93f7f4df89e25729ec
7+
TERMUX_PKG_SHA256=88fc236ab99b2864b248de7d49a008ec2afd7551e64dce8b95f58f32f94c46ab
88
TERMUX_PKG_DEPENDS="zlib-glibc, apr-util-glibc, pcre2-glibc, libnghttp2-glibc, openssl-glibc, libxcrypt-glibc"
99
TERMUX_PKG_BUILD_DEPENDS="libcurl-glibc, libjansson-glibc, brotli-glibc, libdb-glibc"
1010
TERMUX_PKG_CONFFILES="

‎gpkg/bash-completion/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/scop/bash-completion
22
TERMUX_PKG_DESCRIPTION="Programmable completion for the bash shell"
33
TERMUX_PKG_LICENSE="GPL-2.0"
44
TERMUX_PKG_MAINTAINER="@termux-pacman"
5-
TERMUX_PKG_VERSION=2.14.0
5+
TERMUX_PKG_VERSION=2.16.0
66
TERMUX_PKG_SRCURL=https://github.com/scop/bash-completion/releases/download/${TERMUX_PKG_VERSION}/bash-completion-${TERMUX_PKG_VERSION}.tar.xz
7-
TERMUX_PKG_SHA256=5c7494f968280832d6adb5aa19f745a56f1a79df311e59338c5efa6f7285e168
7+
TERMUX_PKG_SHA256=3369bd5e418a75fb990863925aed5b420398acebb320ec4c0306b3eae23f107a
88
TERMUX_PKG_DEPENDS="bash-glibc"
99
TERMUX_PKG_PLATFORM_INDEPENDENT=true
1010
TERMUX_PKG_RM_AFTER_INSTALL="

‎gpkg/boost/boost-process-detail-posix-shell_path.hpp.patch

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎gpkg/boost/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://boost.org
22
TERMUX_PKG_DESCRIPTION="Free peer-reviewed portable C++ source libraries"
33
TERMUX_PKG_LICENSE="BSL-1.0"
44
TERMUX_PKG_MAINTAINER="@termux-pacman"
5-
TERMUX_PKG_VERSION="1.83.0"
6-
TERMUX_PKG_SRCURL=https://boostorg.jfrog.io/artifactory/main/release/$TERMUX_PKG_VERSION/source/boost_${TERMUX_PKG_VERSION//./_}.tar.bz2
7-
TERMUX_PKG_SHA256=6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e
5+
TERMUX_PKG_VERSION="1.87.0"
6+
TERMUX_PKG_SRCURL=https://archives.boost.io/release/$TERMUX_PKG_VERSION/source/boost_${TERMUX_PKG_VERSION//./_}.tar.bz2
7+
TERMUX_PKG_SHA256=af57be25cb4c4f4b413ed692fe378affb4352ea50fbe294a11ef548f4d527d89
88
TERMUX_PKG_DEPENDS="libbz2-glibc, zlib-glibc, libicu-glibc, zstd-glibc"
99
TERMUX_PKG_BUILD_DEPENDS="python-glibc"
1010
TERMUX_PKG_BUILD_IN_SRC=true

‎gpkg/boost/fix-smart-pointer-output.patch

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
From e7433ba54596da97cb7859455cd37ca140305a9c Mon Sep 17 00:00:00 2001
2+
From: Peter Dimov <pdimov@gmail.com>
3+
Date: Mon, 13 Jan 2025 16:13:04 +0200
4+
Subject: [PATCH] Fix operator<< for shared_ptr and intrusive_ptr. Fixes #115.
5+
--- a/boost/smart_ptr/intrusive_ptr.hpp
6+
+++ b/boost/smart_ptr/intrusive_ptr.hpp
7+
@@ -285,7 +285,7 @@ template<class T, class U> intrusive_ptr<T> dynamic_pointer_cast( intrusive_ptr<
8+
9+
// operator<<
10+
11+
-template<class Y> std::ostream & operator<< (std::ostream & os, intrusive_ptr<Y> const & p)
12+
+template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::basic_ostream<E, T> & os, intrusive_ptr<Y> const & p)
13+
{
14+
os << p.get();
15+
return os;
16+
--- a/boost/smart_ptr/shared_ptr.hpp
17+
+++ b/boost/smart_ptr/shared_ptr.hpp
18+
@@ -775,7 +775,7 @@ template<class T> inline typename shared_ptr<T>::element_type * get_pointer(shar
19+
20+
// operator<<
21+
22+
-template<class Y> std::ostream & operator<< (std::ostream & os, shared_ptr<Y> const & p)
23+
+template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::basic_ostream<E, T> & os, shared_ptr<Y> const & p)
24+
{
25+
os << p.get();
26+
return os;

‎gpkg/boost/shell_path.hpp.patch

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
--- src/boost/process/v1/detail/posix/shell_path.hpp 2024-12-05 03:53:35.000000000 +0300
2+
+++ src/boost/process/v1/detail/posix/shell_path.hpp.patch 2025-03-05 14:02:47.847495863 +0300
3+
@@ -18,13 +18,13 @@
4+
5+
inline boost::process::v1::filesystem::path shell_path()
6+
{
7+
- return "/bin/sh";
8+
+ return "@TERMUX_PREFIX@/bin/sh";
9+
}
10+
11+
inline boost::process::v1::filesystem::path shell_path(std::error_code &ec)
12+
{
13+
ec.clear();
14+
- return "/bin/sh";
15+
+ return "@TERMUX_PREFIX@/bin/sh";
16+
}
17+
18+
}}}}}

‎gpkg/box64/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://github.com/ptitSeb/box64
22
TERMUX_PKG_DESCRIPTION="Linux Userspace x86_64 Emulator with a twist"
33
TERMUX_PKG_LICENSE="MIT"
44
TERMUX_PKG_MAINTAINER="@termux-pacman"
5-
TERMUX_PKG_VERSION=0.3.0
5+
TERMUX_PKG_VERSION=0.3.2
66
TERMUX_PKG_SRCURL=https://github.com/ptitSeb/box64/archive/v${TERMUX_PKG_VERSION}.tar.gz
7-
TERMUX_PKG_SHA256=e334e793638f375a28829c01b089c6ba27d8c3f6094fcbc9360b56ad9c09d0b5
7+
TERMUX_PKG_SHA256=8658b2c3840ae830ebb2b2673047d30a748139ec3afe178ca74a71adeddba63e
88
TERMUX_PKG_DEPENDS="gcc-libs-glibc"
99
TERMUX_PKG_BLACKLISTED_ARCHES="arm, i686"
1010
TERMUX_CMAKE_BUILD="Unix Makefiles"
11-
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DCMAKE_BUILD_TYPE=RelWithDebInfo"
11+
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBOX32=ON -DBOX32_BINFMT=ON"
1212
TERMUX_PKG_RM_AFTER_INSTALL="glibc/etc/binfmt.d"
1313

1414
termux_step_pre_configure() {

‎gpkg/box64/setdirs.patch

Lines changed: 38 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,45 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index 7f9e5d6..a0fd4b4 100644
2+
index 95e7b0c..ce59937 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
5-
@@ -944,15 +944,15 @@ if(NOT _x86 AND NOT _x86_64)
5+
@@ -1159,11 +1159,11 @@ if(NOT _x86 AND NOT _x86_64)
66
if(NOT NO_CONF_INSTALL)
77
configure_file(system/box64.conf.cmake system/box64.conf)
88
if(NOT TERMUX)
9-
- install(FILES ${CMAKE_BINARY_DIR}/system/box64.conf DESTINATION /etc/binfmt.d/)
10-
- install(FILES ${CMAKE_SOURCE_DIR}/system/box64.box64rc DESTINATION /etc/)
11-
+ install(FILES ${CMAKE_BINARY_DIR}/system/box64.conf DESTINATION @TERMUX_PREFIX@/etc/binfmt.d/)
12-
+ install(FILES ${CMAKE_SOURCE_DIR}/system/box64.box64rc DESTINATION @TERMUX_PREFIX@/etc/)
13-
else()
14-
install(FILES ${CMAKE_BINARY_DIR}/system/box64.conf DESTINATION ${TERMUX_PATH}/usr/etc/binfmt.d/)
15-
install(FILES ${CMAKE_SOURCE_DIR}/system/box64.box64rc DESTINATION ${TERMUX_PATH}/usr/etc/)
9+
- install(FILES ${CMAKE_BINARY_DIR}/system/box64.conf DESTINATION /etc/binfmt.d/)
10+
- install(FILES ${CMAKE_SOURCE_DIR}/system/box64.box64rc DESTINATION /etc/)
11+
+ install(FILES ${CMAKE_BINARY_DIR}/system/box64.conf DESTINATION @TERMUX_PREFIX@/etc/binfmt.d/)
12+
+ install(FILES ${CMAKE_SOURCE_DIR}/system/box64.box64rc DESTINATION @TERMUX_PREFIX@/etc/)
13+
if(BOX32_BINFMT)
14+
configure_file(system/box32.conf.cmake system/box32.conf)
15+
- install(FILES ${CMAKE_BINARY_DIR}/system/box32.conf DESTINATION /etc/binfmt.d/)
16+
+ install(FILES ${CMAKE_BINARY_DIR}/system/box32.conf DESTINATION @TERMUX_PREFIX@/etc/binfmt.d/)
17+
endif()
18+
else()
19+
install(FILES ${CMAKE_BINARY_DIR}/system/box64.conf DESTINATION ${TERMUX_PATH}/usr/etc/binfmt.d/)
20+
@@ -1175,7 +1175,7 @@ if(NOT _x86 AND NOT _x86_64)
1621
endif()
1722

1823
endif()
19-
- set(INSTALL_PATH "/usr/lib/x86_64-linux-gnu/")
20-
+ set(INSTALL_PATH "@TERMUX_PREFIX@/lib/x86_64-linux-gnu/")
24+
- set(INSTALL_PATH "/usr/lib/box64-x86_64-linux-gnu/")
25+
+ set(INSTALL_PATH "@TERMUX_PREFIX@/lib/box64-x86_64-linux-gnu/")
2126
if(NOT NO_LIB_INSTALL)
22-
if(NOT TERMUX)
23-
install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libstdc++.so.5 DESTINATION ${INSTALL_PATH})
27+
if(NOT TERMUX AND NOT ANDROID)
28+
install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libstdc++.so.5 DESTINATION ${INSTALL_PATH})
29+
@@ -1214,7 +1214,7 @@ if(NOT _x86 AND NOT _x86_64)
30+
endif()
31+
endif()
32+
if(BOX32)
33+
- set(INSTALL_PATH "/usr/lib/box64-i386-linux-gnu/")
34+
+ set(INSTALL_PATH "@TERMUX_PREFIX@/lib/box64-i386-linux-gnu/")
35+
if(NOT NO_LIB_INSTALL)
36+
if(NOT TERMUX AND NOT ANDROID)
37+
install(FILES ${CMAKE_SOURCE_DIR}/x86lib/libstdc++.so.5 DESTINATION ${INSTALL_PATH})
2438
diff --git a/src/core.c b/src/core.c
25-
index b1a552b..b9d924a 100644
39+
index c43fd05..ab850b0 100644
2640
--- a/src/core.c
2741
+++ b/src/core.c
28-
@@ -1658,7 +1658,7 @@ int initialize(int argc, const char **argv, char** env, x64emu_t** emulator, elf
42+
@@ -1904,7 +1904,7 @@ int initialize(int argc, const char **argv, char** env, x64emu_t** emulator, elf
2943
printf("See 'box64 --help' for more information.\n");
3044
exit(0);
3145
}
@@ -35,26 +49,26 @@ index b1a552b..b9d924a 100644
3549
// uname -m is redirected to box64 -m
3650
if(argc==2 && (!strcmp(argv[1], "-m") || !strcmp(argv[1], "-p") || !strcmp(argv[1], "-i")))
3751
diff --git a/src/steam.c b/src/steam.c
38-
index 52461a3..0e14ad7 100644
52+
index 710fb84..24e1f53 100644
3953
--- a/src/steam.c
4054
+++ b/src/steam.c
4155
@@ -39,13 +39,13 @@ void pressure_vessel(int argc, const char** argv, int nextarg, const char* prog)
4256
if(is_usr) {
4357
// transform RESSURE_VESSEL_APP_LD_LIBRARY_PATH to BOX86_ / BOX64_ LD_LIBRARY_PATH
4458
char tmp[strlen(argv[nextarg])+150];
45-
- 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:");
46-
+ 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:");
59+
- 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:");
60+
+ 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:");
4761
strcat(tmp, argv[nextarg]+strlen("--env-if-host=STEAM_RUNTIME_LIBRARY_PATH="));
4862
char *p = strchr(tmp, '=');
4963
*p ='\0'; ++p;
5064
setenv(tmp, p, 1);
5165
printf_log(LOG_DEBUG, "setenv(%s, %s, 1)\n", tmp, p);
52-
- strcpy(tmp, "BOX64_LD_LIBRARY_PATH=/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu:");
53-
+ strcpy(tmp, "BOX64_LD_LIBRARY_PATH=@TERMUX_PREFIX@/lib/x86_64-linux-gnu:");
66+
- 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:");
67+
+ 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:");
5468
strcat(tmp, argv[nextarg]+strlen("--env-if-host=STEAM_RUNTIME_LIBRARY_PATH="));
5569
p = strchr(tmp, '=');
5670
*p ='\0'; ++p;
57-
@@ -81,14 +81,8 @@ void pressure_vessel(int argc, const char** argv, int nextarg, const char* prog)
71+
@@ -93,14 +93,8 @@ void pressure_vessel(int argc, const char** argv, int nextarg, const char* prog)
5872
strcat(sniper, "/files"); // this is the sniper root
5973
// do LD_LIBRARY_PATH
6074
{
@@ -70,7 +84,7 @@ index 52461a3..0e14ad7 100644
7084
// prepare folders, using ldconfig
7185
snprintf(tmp, sizeof(tmp), "%s -i -n %s/lib/x86_64-linux-gnu", ldcmd, sniper);
7286
diff --git a/src/tools/fileutils.c b/src/tools/fileutils.c
73-
index 327f798..79d22c8 100644
87+
index 11dc690..8e2a625 100644
7488
--- a/src/tools/fileutils.c
7589
+++ b/src/tools/fileutils.c
7690
@@ -17,9 +17,9 @@
@@ -100,10 +114,10 @@ index de962ee..67a786f 100644
100114
typedef void* (*pFp_t)(void*);
101115

102116
diff --git a/src/wrapped/wrappedlibdl.c b/src/wrapped/wrappedlibdl.c
103-
index 2725285..fd94673 100644
117+
index d8b73b3..d886411 100644
104118
--- a/src/wrapped/wrappedlibdl.c
105119
+++ b/src/wrapped/wrappedlibdl.c
106-
@@ -101,7 +101,7 @@ void* my_dlopen(x64emu_t* emu, void *filename, int flag)
120+
@@ -141,7 +141,7 @@ void* my_dlopen(x64emu_t* emu, void *filename, int flag)
107121
if(sys)
108122
return sys;
109123
}

‎gpkg/box86/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/ptitSeb/box86
22
TERMUX_PKG_DESCRIPTION="Linux Userspace x86 Emulator with a twist"
33
TERMUX_PKG_LICENSE="MIT"
44
TERMUX_PKG_MAINTAINER="@termux-pacman"
5-
TERMUX_PKG_VERSION=0.3.6
5+
TERMUX_PKG_VERSION=0.3.8
66
TERMUX_PKG_SRCURL=https://github.com/ptitSeb/box86/archive/v${TERMUX_PKG_VERSION}.tar.gz
7-
TERMUX_PKG_SHA256=bba944fc21f07afc4b9f3de694826819024dd2f391085f11de0e63a210e937ff
7+
TERMUX_PKG_SHA256=454e5f7c57f7c7c4530d4f453bf6afd07b00bd93c92fe16a4305bacae0b6a93d
88
TERMUX_PKG_DEPENDS="gcc-libs-glibc"
99
TERMUX_PKG_BLACKLISTED_ARCHES="aarch64, x86_64, i686"
1010
TERMUX_CMAKE_BUILD="Unix Makefiles"

‎gpkg/box86/setdirs.patch

Lines changed: 22 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,30 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index f093c18..eac861f 100755
2+
index 4d0c8a9..cd0cb20 100755
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
5-
@@ -75,7 +75,6 @@ else()
6-
set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE INTERNAL "The Python3 executable" FORCE)
7-
endif()
8-
9-
-cmake_host_system_information(RESULT CMAKE_HOST_SYSTEM_PROCESSOR QUERY OS_PLATFORM)
10-
string(COMPARE EQUAL "${CMAKE_HOST_SYSTEM_PROCESSOR}" "i686" _x86)
11-
string(COMPARE EQUAL "${CMAKE_HOST_SYSTEM_PROCESSOR}" "x86_64" _x86_64)
12-
string(COMPARE EQUAL "${CMAKE_HOST_SYSTEM_PROCESSOR}" "aarch64" _aarch64)
13-
@@ -781,8 +780,8 @@ if(NOT _x86 AND NOT _x86_64)
5+
@@ -801,14 +801,14 @@ if(NOT _x86 AND NOT _x86_64)
146
if(NOT NO_CONF_INSTALL)
157
configure_file(system/box86.conf.cmake system/box86.conf)
168
if(NOT TERMUX)
179
- install(FILES ${CMAKE_BINARY_DIR}/system/box86.conf DESTINATION /etc/binfmt.d/)
1810
- install(FILES ${CMAKE_SOURCE_DIR}/system/box86.box86rc DESTINATION /etc/)
19-
+ install(FILES ${CMAKE_BINARY_DIR}/system/box86.conf DESTINATION @TERMUX_PREFIX@/etc/binfmt.d/)
11+
+ install(FILES ${CMAKE_BINARY_DIR}/system/box86.conf DESTINATION @TERMUX_PREFIX@/etc/binfmt.d/)
2012
+ install(FILES ${CMAKE_SOURCE_DIR}/system/box86.box86rc DESTINATION @TERMUX_PREFIX@/etc/)
2113
else()
2214
#install(FILES ${CMAKE_BINARY_DIR}/system/box86.conf DESTINATION ${TERMUX_PATH}/usr/etc/binfmt.d/)
2315
install(FILES ${CMAKE_SOURCE_DIR}/system/box86.box86rc DESTINATION ${TERMUX_PATH}/usr/etc/)
24-
@@ -790,11 +789,11 @@ if(NOT _x86 AND NOT _x86_64)
16+
endif()
2517
endif()
18+
- set(INSTALL_PATH "/usr/lib/box86-i386-linux-gnu/")
19+
+ set(INSTALL_PATH "@TERMUX_PREFIX@/lib/box86-i386-linux-gnu/")
2620
if(NOT NO_LIB_INSTALL)
2721
if(NOT TERMUX)
28-
- install(FILES ${CMAKE_SOURCE_DIR}/x86lib/libstdc++.so.6 DESTINATION /usr/lib/i386-linux-gnu/)
29-
- install(FILES ${CMAKE_SOURCE_DIR}/x86lib/libstdc++.so.5 DESTINATION /usr/lib/i386-linux-gnu/)
30-
- install(FILES ${CMAKE_SOURCE_DIR}/x86lib/libgcc_s.so.1 DESTINATION /usr/lib/i386-linux-gnu/)
31-
- install(FILES ${CMAKE_SOURCE_DIR}/x86lib/libpng12.so.0 DESTINATION /usr/lib/i386-linux-gnu/)
32-
- install(FILES ${CMAKE_SOURCE_DIR}/x86lib/libunwind.so.8 DESTINATION /usr/lib/i386-linux-gnu/)
33-
+ install(FILES ${CMAKE_SOURCE_DIR}/x86lib/libstdc++.so.6 DESTINATION @TERMUX_PREFIX@/lib/i386-linux-gnu/)
34-
+ install(FILES ${CMAKE_SOURCE_DIR}/x86lib/libstdc++.so.5 DESTINATION @TERMUX_PREFIX@/lib/i386-linux-gnu/)
35-
+ install(FILES ${CMAKE_SOURCE_DIR}/x86lib/libgcc_s.so.1 DESTINATION @TERMUX_PREFIX@/lib/i386-linux-gnu/)
36-
+ install(FILES ${CMAKE_SOURCE_DIR}/x86lib/libpng12.so.0 DESTINATION @TERMUX_PREFIX@/lib/i386-linux-gnu/)
37-
+ install(FILES ${CMAKE_SOURCE_DIR}/x86lib/libunwind.so.8 DESTINATION @TERMUX_PREFIX@/lib/i386-linux-gnu/)
38-
else()
39-
40-
install(FILES ${CMAKE_SOURCE_DIR}/x86lib/libstdc++.so.6 DESTINATION ${TERMUX_PATH}/usr/lib/i386-linux-gnu/)
22+
install(FILES ${CMAKE_SOURCE_DIR}/x86lib/libstdc++.so.6 DESTINATION ${INSTALL_PATH})
4123
diff --git a/src/main.c b/src/main.c
42-
index 8009c47..66d9953 100644
24+
index f7da5c6..a242d1f 100644
4325
--- a/src/main.c
4426
+++ b/src/main.c
45-
@@ -952,20 +952,14 @@ void LoadEnvVars(box86context_t *context)
27+
@@ -981,24 +981,16 @@ void LoadEnvVars(box86context_t *context)
4628
//TODO: add relative path to box86 location
4729
#endif
4830
#ifndef TERMUX
@@ -60,6 +42,10 @@ index 8009c47..66d9953 100644
6042
- AddPath("/usr/lib/i686-pc-linux-gnu", &context->box86_ld_lib, 1);
6143
- if(FileExist("/usr/lib32", 0))
6244
- AddPath("/usr/lib32", &context->box86_ld_lib, 1);
45+
- if(FileExist("/lib/box86-i386-linux-gnu", 0))
46+
- AddPath("/lib/box86-i386-linux-gnu", &context->box86_ld_lib, 1);
47+
- if(FileExist("/usr/lib/box86-i386-linux-gnu", 0))
48+
- AddPath("/usr/lib/box86-i386-linux-gnu", &context->box86_ld_lib, 1);
6349
+ if(FileExist("@TERMUX_PREFIX@/lib/box86", 0))
6450
+ AddPath("@TERMUX_PREFIX@/lib/box86", &context->box86_ld_lib, 1);
6551
+ if(FileExist("@TERMUX_PREFIX@/lib/i386-linux-gnu", 0))
@@ -68,10 +54,12 @@ index 8009c47..66d9953 100644
6854
+ AddPath("@TERMUX_PREFIX@/lib/i686-pc-linux-gnu", &context->box86_ld_lib, 1);
6955
+ if(FileExist("@TERMUX_PREFIX@/lib32", 0))
7056
+ AddPath("@TERMUX_PREFIX@/lib32", &context->box86_ld_lib, 1);
57+
+ if(FileExist("@TERMUX_PREFIX@/lib/box86-i386-linux-gnu", 0))
58+
+ AddPath("@TERMUX_PREFIX@/lib/box86-i386-linux-gnu", &context->box86_ld_lib, 1);
7159
#else
7260
if(FileExist("/data/data/com.termux/files/usr/lib/i386-linux-gnu", 0))
7361
AddPath("/data/data/com.termux/files/usr/lib/i386-linux-gnu", &context->box86_ld_lib, 1);
74-
@@ -1208,8 +1202,8 @@ static void load_rcfiles()
62+
@@ -1243,8 +1235,8 @@ static void load_rcfiles()
7563
LoadRCFile(rcpath);
7664

7765
#ifndef TERMUX
@@ -82,7 +70,7 @@ index 8009c47..66d9953 100644
8270
#else
8371
else if(FileExist("/data/data/com.termux/files/usr/etc/box86.box86rc", IS_FILE))
8472
LoadRCFile("/data/data/com.termux/files/usr/etc/box86.box86rc");
85-
@@ -1290,7 +1284,7 @@ int main(int argc, const char **argv, char **env)
73+
@@ -1325,7 +1317,7 @@ int main(int argc, const char **argv, char **env)
8674
printf("See 'box86 --help' for more information.\n");
8775
exit(0);
8876
}
@@ -135,10 +123,10 @@ index 7b13da1..0ed698f 100644
135123
typedef void* (*pFp_t)(void*);
136124

137125
diff --git a/src/wrapped/wrappedlibc.c b/src/wrapped/wrappedlibc.c
138-
index 4abb88f..f2b49c0 100755
126+
index f27d3ba..7fd250d 100755
139127
--- a/src/wrapped/wrappedlibc.c
140128
+++ b/src/wrapped/wrappedlibc.c
141-
@@ -2634,7 +2634,7 @@ EXPORT void* my_getpwuid(x86emu_t* emu, uint32_t uid)
129+
@@ -2707,7 +2707,7 @@ EXPORT void* my_getpwuid(x86emu_t* emu, uint32_t uid)
142130
fakepwd.pw_gid = 0;
143131
fakepwd.pw_gecos = strdup("root");
144132
fakepwd.pw_dir = getenv("HOME");
@@ -148,15 +136,15 @@ index 4abb88f..f2b49c0 100755
148136

149137
return ret ? ret : (void*)&fakepwd;
150138
diff --git a/src/wrapped/wrappedlibdl.c b/src/wrapped/wrappedlibdl.c
151-
index 3e519bb..6c85caf 100755
139+
index 87c0b76..b012212 100755
152140
--- a/src/wrapped/wrappedlibdl.c
153141
+++ b/src/wrapped/wrappedlibdl.c
154142
@@ -100,7 +100,7 @@ void* my_dlopen(x86emu_t* emu, void *filename, int flag)
155143
if(sys)
156144
return sys;
157145
}
158-
- if(!strcmp(rfilename, "/usr/lib/x86_64-linux-gnu/d3d")) {
159-
+ if(!strcmp(rfilename, "@TERMUX_PREFIX@/lib/x86_64-linux-gnu/d3d")) {
146+
- if(!strcmp(rfilename, "/usr/lib/i386-linux-gnu/d3d")) {
147+
+ if(!strcmp(rfilename, "@TERMUX_PREFIX@/lib/i386-linux-gnu/d3d")) {
160148
void* sys = my_dlopen(emu, "d3dadapter9.so.1", flag);
161149
if(sys)
162150
return sys;

‎gpkg/doxygen/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=http://www.doxygen.org
22
TERMUX_PKG_DESCRIPTION="A documentation system for C++, C, Java, IDL and PHP"
33
TERMUX_PKG_LICENSE="GPL-2.0"
44
TERMUX_PKG_MAINTAINER="@termux-pacman"
5-
TERMUX_PKG_VERSION="1.12.0"
5+
TERMUX_PKG_VERSION="1.13.2"
66
TERMUX_PKG_SRCURL=https://github.com/doxygen/doxygen/archive/Release_${TERMUX_PKG_VERSION//./_}.tar.gz
7-
TERMUX_PKG_SHA256=5ca35e1258020df5fe8b21c3656aed156c317def4a81b7fe52f452edc9f35768
7+
TERMUX_PKG_SHA256=4c9d9c8e95c2af4163ee92bcb0f3af03b2a4089402a353e4715771e8d3701c48
88
TERMUX_PKG_DEPENDS="glibc, gcc-libs-glibc"
99
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
1010
-DDOC_INSTALL_DIR:PATH=share/doc/doxygen

0 commit comments

Comments
 (0)