Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
--- a/base/debug/stack_trace_posix.cc
+++ b/base/debug/stack_trace_posix.cc
@@ -1062,14 +1062,14 @@
@@ -1068,12 +1068,14 @@
#endif
}

-#if defined(HAVE_BACKTRACE)
+#if !defined(__UCLIBC__) && !defined(_AIX)
void StackTrace::OutputToStreamWithPrefixImpl(
std::ostream* os,
cstring_view prefix_string) const {
+#if defined(HAVE_BACKTRACE)
StreamBacktraceOutputHandler handler(os);
ProcessBacktrace(trace_, count_, prefix_string, &handler);
-}
ProcessBacktrace(addresses(), prefix_string, &handler);
+#endif
}
#endif
+}

namespace internal {

4 changes: 2 additions & 2 deletions tur-chromium/chromium-stable/1601-angle-no-android-jni.patch
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#elif defined(__APPLE__)
# define ANGLE_PLATFORM_APPLE 1
# define ANGLE_PLATFORM_POSIX 1
-#elif defined(ANDROID)
+#elif (defined(ANDROID) && !defined(__TERMUX__))
-#elif defined(ANDROID) && !defined(ANGLE_ANDROID_DMA_BUF)
+#elif (defined(ANDROID) && !defined(ANGLE_ANDROID_DMA_BUF) && !defined(__TERMUX__))
# define ANGLE_PLATFORM_ANDROID 1
# define ANGLE_PLATFORM_POSIX 1
#elif defined(__ggp__)
4 changes: 2 additions & 2 deletions tur-chromium/chromium-stable/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.chromium.org/Home
TERMUX_PKG_DESCRIPTION="Chromium web browser"
TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_MAINTAINER="Chongyun Lee <[email protected]>"
TERMUX_PKG_VERSION=128.0.6613.137
TERMUX_PKG_VERSION=129.0.6668.100
TERMUX_PKG_SRCURL=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$TERMUX_PKG_VERSION.tar.xz
TERMUX_PKG_SHA256=e1d39c170dfdc2627a7b003e11d77f04a578b8e1cfe41e714cdaa345c91f4943
TERMUX_PKG_SHA256=281daed29a5cb546f6273130035d9980666d2232f356ad95fc06af3c90121bc2
TERMUX_PKG_DEPENDS="atk, cups, dbus, fontconfig, gtk3, krb5, libc++, libdrm, libevdev, libxkbcommon, libminizip, libnss, libwayland, libx11, mesa, openssl, pango, pulseaudio, zlib"
# Chromium doesn't support i686 on Linux.
TERMUX_PKG_BLACKLISTED_ARCHES="i686"
Expand Down