From 4fce9d571574735aa3c7d41b34a0b2633a18caf4 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Mon, 25 Oct 2021 21:57:34 +0300 Subject: [PATCH] disable package: webkit2gtk Can't find pthreads? -- Looking for pthread.h -- Looking for pthread.h - not found CMake Error at /home/xeffyr/.termux-build/_cache/cmake-3.21.2/share/cmake-3.21/Modules/FindPackageHandleStandardArgs.cmake:230 (message): Could NOT find Threads (missing: Threads_FOUND) Call Stack (most recent call first): /home/xeffyr/.termux-build/_cache/cmake-3.21.2/share/cmake-3.21/Modules/FindPackageHandleStandardArgs.cmake:594 (_FPHSA_FAILURE_MESSAGE) /home/xeffyr/.termux-build/_cache/cmake-3.21.2/share/cmake-3.21/Modules/FindThreads.cmake:238 (FIND_PACKAGE_HANDLE_STANDARD_ARGS) Source/cmake/WebKitFindPackage.cmake:105 (_find_package) Source/cmake/OptionsGTK.cmake:21 (find_package) Source/cmake/WebKitCommon.cmake:212 (include) CMakeLists.txt:16 (include) --- .../webkit2gtk/PlatformGTK.cmake.patch | 22 ------ .../webkit2gtk/SharedMemoryUnix.cpp.patch | 70 ------------------- x11-packages/webkit2gtk/build.sh | 21 ------ x11-packages/webkit2gtk/jsc.cpp.patch | 39 ----------- 4 files changed, 152 deletions(-) delete mode 100644 x11-packages/webkit2gtk/PlatformGTK.cmake.patch delete mode 100644 x11-packages/webkit2gtk/SharedMemoryUnix.cpp.patch delete mode 100644 x11-packages/webkit2gtk/build.sh delete mode 100644 x11-packages/webkit2gtk/jsc.cpp.patch diff --git a/x11-packages/webkit2gtk/PlatformGTK.cmake.patch b/x11-packages/webkit2gtk/PlatformGTK.cmake.patch deleted file mode 100644 index a8d6183a4..000000000 --- a/x11-packages/webkit2gtk/PlatformGTK.cmake.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/Source/WTF/wtf/PlatformGTK.cmake b/Source/WTF/wtf/PlatformGTK.cmake -index fa6958fbd3..c6d4a51fec 100644 ---- a/Source/WTF/wtf/PlatformGTK.cmake -+++ b/Source/WTF/wtf/PlatformGTK.cmake -@@ -13,7 +13,7 @@ list(APPEND WTF_PUBLIC_HEADERS - glib/WTFGType.h - ) - --if (CMAKE_SYSTEM_NAME MATCHES "Linux") -+if (CMAKE_SYSTEM_NAME MATCHES "Android") - list(APPEND WTF_PUBLIC_HEADERS - linux/ProcessMemoryFootprint.h - linux/CurrentProcessMemoryStatus.h -@@ -47,7 +47,7 @@ list(APPEND WTF_SOURCES - unix/UniStdExtrasUnix.cpp - ) - --if (CMAKE_SYSTEM_NAME MATCHES "Linux") -+if (CMAKE_SYSTEM_NAME MATCHES "Android") - list(APPEND WTF_SOURCES - linux/CurrentProcessMemoryStatus.cpp - linux/MemoryFootprintLinux.cpp diff --git a/x11-packages/webkit2gtk/SharedMemoryUnix.cpp.patch b/x11-packages/webkit2gtk/SharedMemoryUnix.cpp.patch deleted file mode 100644 index a203789f9..000000000 --- a/x11-packages/webkit2gtk/SharedMemoryUnix.cpp.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/Source/WebKit/Platform/unix/SharedMemoryUnix.cpp b/Source/WebKit/Platform/unix/SharedMemoryUnix.cpp -index aff7b0d18d..7d22cb5f5c 100644 ---- a/Source/WebKit/Platform/unix/SharedMemoryUnix.cpp -+++ b/Source/WebKit/Platform/unix/SharedMemoryUnix.cpp -@@ -54,6 +54,65 @@ - #include "ArgumentCoders.h" - #endif - -+static int shm_unlink(const char *name) { -+ size_t namelen; -+ char *fname; -+ -+ /* Construct the filename. */ -+ while (name[0] == '/') ++name; -+ -+ if (name[0] == '\0') { -+ /* The name "/" is not supported. */ -+ errno = EINVAL; -+ return -1; -+ } -+ -+ namelen = strlen(name); -+ fname = (char *) alloca(sizeof("@TERMUX_PREFIX@/tmp/") - 1 + namelen + 1); -+ memcpy(fname, "@TERMUX_PREFIX@/tmp/", sizeof("@TERMUX_PREFIX@/tmp/") - 1); -+ memcpy(fname + sizeof("@TERMUX_PREFIX@/tmp/") - 1, name, namelen + 1); -+ -+ return unlink(fname); -+} -+ -+static int shm_open(const char *name, int oflag, mode_t mode) { -+ size_t namelen; -+ char *fname; -+ int fd; -+ -+ /* Construct the filename. */ -+ while (name[0] == '/') ++name; -+ -+ if (name[0] == '\0') { -+ /* The name "/" is not supported. */ -+ errno = EINVAL; -+ return -1; -+ } -+ -+ namelen = strlen(name); -+ fname = (char *) alloca(sizeof("@TERMUX_PREFIX@/tmp/") - 1 + namelen + 1); -+ memcpy(fname, "@TERMUX_PREFIX@/tmp/", sizeof("@TERMUX_PREFIX@/tmp/") - 1); -+ memcpy(fname + sizeof("@TERMUX_PREFIX@/tmp/") - 1, name, namelen + 1); -+ -+ fd = open(fname, oflag, mode); -+ if (fd != -1) { -+ /* We got a descriptor. Now set the FD_CLOEXEC bit. */ -+ int flags = fcntl(fd, F_GETFD, 0); -+ flags |= FD_CLOEXEC; -+ flags = fcntl(fd, F_SETFD, flags); -+ -+ if (flags == -1) { -+ /* Something went wrong. We cannot return the descriptor. */ -+ int save_errno = errno; -+ close(fd); -+ fd = -1; -+ errno = save_errno; -+ } -+ } -+ -+ return fd; -+} -+ - namespace WebKit { - - SharedMemory::Handle::Handle() diff --git a/x11-packages/webkit2gtk/build.sh b/x11-packages/webkit2gtk/build.sh deleted file mode 100644 index 8e02647fe..000000000 --- a/x11-packages/webkit2gtk/build.sh +++ /dev/null @@ -1,21 +0,0 @@ -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.32.3 -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SRCURL=https://webkitgtk.org/releases/webkitgtk-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=c1f496f5ac654efe4cef62fbd4f2fbeeef265a07c5e7419e5d2900bfeea52cbc -TERMUX_PKG_DEPENDS="enchant, gst-plugins-base, gstreamer, gtk3, libcairo, libgcrypt, libhyphen, libicu, libnotify, libsoup, libtasn1, libwebp, libxslt, libxt, openjpeg, woff2" -TERMUX_PKG_BREAKS="webkit, webkitgtk" -TERMUX_PKG_REPLACES="webkit, webkitgtk" - -TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --DPORT=GTK --DCMAKE_BUILD_TYPE=RelWithDebInfo --DENABLE_GAMEPAD=OFF --DUSE_SYSTEMD=OFF --DUSE_LIBSECRET=OFF --DENABLE_INTROSPECTION=OFF --DUSE_WPE_RENDERER=OFF -" diff --git a/x11-packages/webkit2gtk/jsc.cpp.patch b/x11-packages/webkit2gtk/jsc.cpp.patch deleted file mode 100644 index 620bb029e..000000000 --- a/x11-packages/webkit2gtk/jsc.cpp.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/Source/JavaScriptCore/jsc.cpp b/Source/JavaScriptCore/jsc.cpp -index 31d9abcb31..863514e97c 100644 ---- a/Source/JavaScriptCore/jsc.cpp -+++ b/Source/JavaScriptCore/jsc.cpp -@@ -127,7 +127,7 @@ - - #if OS(DARWIN) - #include --#elif OS(LINUX) -+#elif OS(LINUX) || OS(ANDROID) - #include - #endif - -@@ -2662,7 +2662,7 @@ JSC_DEFINE_HOST_FUNCTION(functionDropAllLocks, (JSGlobalObject* globalObject, Ca - - int jscmain(int argc, char** argv); - --#if OS(DARWIN) || OS(LINUX) -+#if OS(DARWIN) || OS(LINUX) || OS(ANDROID) - static size_t memoryLimit; - - static void crashIfExceedingMemoryLimit() -@@ -2697,7 +2697,7 @@ static void startMemoryMonitoringThreadIfNeeded() - } - }); - } --#endif // OS(DARWIN) || OS(LINUX) -+#endif // OS(DARWIN) || OS(LINUX) || OS(ANDROID) - - static double s_desiredTimeout; - static double s_timeoutMultiplier = 1.0; -@@ -3498,7 +3498,7 @@ int jscmain(int argc, char** argv) - #endif - initializeTimeoutIfNeeded(); - --#if OS(DARWIN) || OS(LINUX) -+#if OS(DARWIN) || OS(LINUX) || OS(ANDROID) - startMemoryMonitoringThreadIfNeeded(); - #endif