phantomjs: remove, upstream dead.

Use Headless Chrome instead.
https://github.com/ariya/phantomjs/issues/15344
This commit is contained in:
Leah Neukirchen 2019-08-01 10:28:28 +02:00
parent 2e895c9a14
commit 702d6cb7f3
9 changed files with 0 additions and 348 deletions

View file

@ -1,72 +0,0 @@
--- src/qt/qtbase/src/network/ssl/qsslcontext.cpp
+++ src/qt/qtbase/src/network/ssl/qsslcontext.cpp
@@ -142,7 +142,11 @@
#endif
break;
case QSsl::SslV3:
+#ifndef OPENSSL_NO_SSL3
sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method());
+#else
+ sslContext->ctx = 0; // SSL 2 not supported by the system, but chosen deliberately -> error
+#endif
break;
case QSsl::SecureProtocols: // SslV2 will be disabled below
case QSsl::TlsV1SslV3: // SslV2 will be disabled below
--- src/qt/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
+++ src/qt/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -266,7 +266,9 @@
#ifndef OPENSSL_NO_SSL2
DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return)
#endif
+#ifndef OPENSSL_NO_SSL3
DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return)
+#endif
DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return)
DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return)
#if OPENSSL_VERSION_NUMBER >= 0x10001000L
@@ -276,7 +278,9 @@
#ifndef OPENSSL_NO_SSL2
DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return)
#endif
+#ifndef OPENSSL_NO_SSL3
DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return)
+#endif
DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return)
DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return)
#if OPENSSL_VERSION_NUMBER >= 0x10001000L
@@ -285,11 +289,15 @@
#endif
#else
DEFINEFUNC(SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return)
+#ifndef OPENSSL_NO_SSL3
DEFINEFUNC(SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return)
+#endif
DEFINEFUNC(SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return)
DEFINEFUNC(SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return)
DEFINEFUNC(SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return)
+#ifndef OPENSSL_NO_SSL3
DEFINEFUNC(SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return)
+#endif
DEFINEFUNC(SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return)
DEFINEFUNC(SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return)
#endif
@@ -767,7 +775,9 @@
#ifndef OPENSSL_NO_SSL2
RESOLVEFUNC(SSLv2_client_method)
#endif
+#ifndef OPENSSL_NO_SSL3
RESOLVEFUNC(SSLv3_client_method)
+#endif
RESOLVEFUNC(SSLv23_client_method)
RESOLVEFUNC(TLSv1_client_method)
#if OPENSSL_VERSION_NUMBER >= 0x10001000L
@@ -777,7 +787,9 @@
#ifndef OPENSSL_NO_SSL2
RESOLVEFUNC(SSLv2_server_method)
#endif
+#ifndef OPENSSL_NO_SSL3
RESOLVEFUNC(SSLv3_server_method)
+#endif
RESOLVEFUNC(SSLv23_server_method)
RESOLVEFUNC(TLSv1_server_method)
#if OPENSSL_VERSION_NUMBER >= 0x10001000L

View file

@ -1,14 +0,0 @@
--- src/qt/qtwebkit/Source/JavaScriptCore/runtime/JSObject.cpp.orig 2015-01-24 08:19:52.000000000 +0600
+++ src/qt/qtwebkit/Source/JavaScriptCore/runtime/JSObject.cpp 2015-09-24 18:18:45.598322592 +0600
@@ -1909,6 +1909,11 @@
}
}
+// Used in JSArray.cpp so we must instantiate explicit
+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value);
+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value);
+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value);
+
void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
{
VM& vm = exec->vm();

View file

@ -1,64 +0,0 @@
--- src/breakpad/src/client/linux/handler/exception_handler.h 2015-01-24 03:19:52.000000000 +0100
+++ src/breakpad/src/client/linux/handler/exception_handler.h 2017-11-12 12:29:48.306216165 +0100
@@ -172,7 +172,7 @@
struct CrashContext {
siginfo_t siginfo;
pid_t tid; // the crashing thread.
- struct ucontext context;
+ ucontext_t context;
#if !defined(__ARM_EABI__)
// #ifdef this out because FP state is not part of user ABI for Linux ARM.
struct _libc_fpstate float_state;
--- src/breakpad/src/client/linux/handler/exception_handler.cc 2015-01-24 03:19:52.000000000 +0100
+++ src/breakpad/src/client/linux/handler/exception_handler.cc 2017-11-12 12:30:22.866218630 +0100
@@ -342,10 +342,10 @@
}
CrashContext context;
memcpy(&context.siginfo, info, sizeof(siginfo_t));
- memcpy(&context.context, uc, sizeof(struct ucontext));
+ memcpy(&context.context, uc, sizeof(ucontext_t));
#if !defined(__ARM_EABI__)
// FP state is not part of user ABI on ARM Linux.
- struct ucontext *uc_ptr = (struct ucontext*)uc;
+ ucontext_t *uc_ptr = (ucontext_t*)uc;
if (uc_ptr->uc_mcontext.fpregs) {
memcpy(&context.float_state,
uc_ptr->uc_mcontext.fpregs,
--- src/breakpad/src/client/linux/minidump_writer/minidump_writer.cc 2015-01-24 03:19:52.000000000 +0100
+++ src/breakpad/src/client/linux/minidump_writer/minidump_writer.cc 2017-11-12 12:39:02.862255717 +0100
@@ -163,7 +163,7 @@
// Juggle an x86 ucontext into minidump format
// out: the minidump structure
// info: the collection of register structures.
-static void CPUFillFromUContext(MDRawContextX86 *out, const ucontext *uc,
+static void CPUFillFromUContext(MDRawContextX86 *out, const ucontext_t *uc,
const struct _libc_fpstate* fp) {
const greg_t* regs = uc->uc_mcontext.gregs;
@@ -263,7 +263,7 @@
memcpy(&out->flt_save.xmm_registers, &info.fpregs.xmm_space, 16 * 16);
}
-static void CPUFillFromUContext(MDRawContextAMD64 *out, const ucontext *uc,
+static void CPUFillFromUContext(MDRawContextAMD64 *out, const ucontext_t *uc,
const struct _libc_fpstate* fpregs) {
const greg_t* regs = uc->uc_mcontext.gregs;
@@ -330,7 +330,7 @@
#endif
}
-static void CPUFillFromUContext(MDRawContextARM *out, const ucontext *uc,
+static void CPUFillFromUContext(MDRawContextARM *out, const ucontext_t *uc,
const struct _libc_fpstate* fpregs) {
out->context_flags = MD_CONTEXT_ARM_FULL;
@@ -1300,7 +1300,7 @@
}
const char* const filename_; // output filename
- const struct ucontext* const ucontext_; // also from the signal handler
+ const ucontext_t* const ucontext_; // also from the signal handler
const struct _libc_fpstate* const float_state_; // ditto
LinuxDumper* dumper_;
MinidumpFileWriter minidump_writer_;

View file

@ -1,73 +0,0 @@
--- src/qt/qtwebkit/Source/JavaScriptCore/API/JSStringRef.h.orig 2015-10-13 06:37:10.000000000 +0200
+++ src/qt/qtwebkit/Source/JavaScriptCore/API/JSStringRef.h 2017-04-24 12:26:42.495345570 +0200
@@ -32,6 +32,7 @@
#include <stdbool.h>
#endif
#include <stddef.h> /* for size_t */
+#include <uchar.h>
#ifdef __cplusplus
extern "C" {
@@ -43,7 +44,7 @@
@typedef JSChar
@abstract A Unicode character.
*/
- typedef unsigned short JSChar;
+ typedef char16_t JSChar;
#else
typedef wchar_t JSChar;
#endif
--- src/qt/qtwebkit/Source/WebKit2/Shared/API/c/WKString.h.orig 2015-10-13 06:37:12.000000000 +0200
+++ src/qt/qtwebkit/Source/WebKit2/Shared/API/c/WKString.h 2017-04-24 12:27:33.432011867 +0200
@@ -31,6 +31,7 @@
#ifndef __cplusplus
#include <stdbool.h>
#endif
+#include <uchar.h>
#ifdef __cplusplus
extern "C" {
@@ -38,7 +39,7 @@
#if !defined(WIN32) && !defined(_WIN32) \
&& !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */
- typedef unsigned short WKChar;
+ typedef char16_t WKChar;
#else
typedef wchar_t WKChar;
#endif
diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h
index ead844f..e62cfd4 100644
--- src/qt/qtwebkit/Source/WTF/wtf/Compiler.h
+++ src/qt/qtwebkit/Source/WTF/wtf/Compiler.h
@@ -61,6 +61,7 @@
#define WTF_COMPILER_SUPPORTS_HAS_TRIVIAL_DESTRUCTOR __has_feature(has_trivial_destructor)
#define WTF_COMPILER_SUPPORTS_CXX_STRONG_ENUMS __has_feature(cxx_strong_enums)
#define WTF_COMPILER_SUPPORTS_CXX_REFERENCE_QUALIFIED_FUNCTIONS __has_feature(cxx_reference_qualified_functions)
+#define WTF_COMPILER_SUPPORTS_CXX_NEW_CHAR_TYPES !defined(_LIBCPP_HAS_NO_UNICODE_CHARS)
#endif
@@ -142,6 +143,7 @@
#define WTF_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS 1
#endif
#if GCC_VERSION_AT_LEAST(4, 5, 0)
+#define WTF_COMPILER_SUPPORTS_CXX_NEW_CHAR_TYPES 1
#define WTF_COMPILER_SUPPORTS_CXX_EXPLICIT_CONVERSIONS 1
#endif
#if GCC_VERSION_AT_LEAST(4, 6, 0)
diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h
index b9e46bc..876fa45 100644
--- src/qt/qtwebkit/Source/WTF/wtf/TypeTraits.h
+++ src/qt/qtwebkit/Source/WTF/wtf/TypeTraits.h
@@ -75,6 +75,10 @@ namespace WTF {
#if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
template<> struct IsInteger<wchar_t> { static const bool value = true; };
#endif
+#if COMPILER_SUPPORTS(CXX_NEW_CHAR_TYPES)
+ template<> struct IsInteger<char16_t> { static const bool value = true; };
+ template<> struct IsInteger<char32_t> { static const bool value = true; };
+#endif
template<typename T> struct IsFloatingPoint { static const bool value = false; };
template<> struct IsFloatingPoint<float> { static const bool value = true; };

View file

@ -1,31 +0,0 @@
--- src/qt/qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h.orig 2018-11-05 17:46:43.875933644 +0100
+++ src/qt/qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h 2018-11-05 17:47:11.510667982 +0100
@@ -223,10 +223,10 @@
int q_ASN1_STRING_to_UTF8(unsigned char **a, ASN1_STRING *b);
long q_BIO_ctrl(BIO *a, int b, long c, void *d);
int q_BIO_free(BIO *a);
-BIO *q_BIO_new(BIO_METHOD *a);
+BIO *q_BIO_new(const BIO_METHOD *a);
BIO *q_BIO_new_mem_buf(void *a, int b);
int q_BIO_read(BIO *a, void *b, int c);
-BIO_METHOD *q_BIO_s_mem();
+const BIO_METHOD *q_BIO_s_mem();
int q_BIO_write(BIO *a, const void *b, int c);
int q_BN_num_bits(const BIGNUM *a);
int q_CRYPTO_num_locks();
--- src/qt/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2018-11-05 17:46:20.799155485 +0100
+++ src/qt/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp 2018-11-05 17:39:58.106834390 +0100
@@ -136,10 +136,10 @@
DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return);
DEFINEFUNC4(long, BIO_ctrl, BIO *a, a, int b, b, long c, c, void *d, d, return -1, return)
DEFINEFUNC(int, BIO_free, BIO *a, a, return 0, return)
-DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return 0, return)
+DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return 0, return)
DEFINEFUNC2(BIO *, BIO_new_mem_buf, void *a, a, int b, b, return 0, return)
DEFINEFUNC3(int, BIO_read, BIO *a, a, void *b, b, int c, c, return -1, return)
-DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return)
+DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return)
DEFINEFUNC3(int, BIO_write, BIO *a, a, const void *b, b, int c, c, return -1, return)
DEFINEFUNC(int, BN_num_bits, const BIGNUM *a, a, return 0, return)
DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return)

View file

@ -1,20 +0,0 @@
--- src/qt/qtwebkit/Source/WTF/wtf/Assertions.cpp
+++ src/qt/qtwebkit/Source/WTF/wtf/Assertions.cpp
@@ -61,7 +61,7 @@
#include <windows.h>
#endif
-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID)
#include <cxxabi.h>
#include <dlfcn.h>
#include <execinfo.h>
@@ -245,7 +245,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f
void WTFGetBacktrace(void** stack, int* size)
{
-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID)
*size = backtrace(stack, *size);
#elif OS(WINDOWS) && !OS(WINCE)
// The CaptureStackBackTrace function is available in XP, but it is not defined

View file

@ -1,14 +0,0 @@
--- src/qt/qtbase/mkspecs/linux-g++/qplatformdefs.h.orig
+++ src/qt/qtbase/mkspecs/linux-g++/qplatformdefs.h
@@ -86,11 +86,7 @@
#undef QT_SOCKLEN_T
-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
#define QT_SOCKLEN_T socklen_t
-#else
-#define QT_SOCKLEN_T int
-#endif
#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
#define QT_SNPRINTF ::snprintf

View file

@ -1,59 +0,0 @@
# Template file for 'phantomjs'
pkgname=phantomjs
version=2.0.0
revision=15
hostmakedepends="unzip flex ruby gperf python perl pkg-config"
makedepends="
fontconfig-devel icu-devel libressl-devel libpng-devel
libjpeg-turbo-devel"
short_desc="Scriptable headless WebKit"
maintainer="Eivind Uggedal <eivind@uggedal.com>"
license="BSD, MIT, LGPL-2.1"
homepage="http://phantomjs.org/"
distfiles="https://bitbucket.org/ariya/${pkgname}/downloads/${pkgname}-${version}-source.zip"
checksum=cc81249eaa059cc138414390cade9cb6509b9d6fa0df16f4f43de70b174b3bfe
broken="https://build.voidlinux.org/builders/x86_64_builder/builds/19100/steps/shell_3/logs/stdio"
nopie=yes
nocross=yes
case $XBPS_MACHINE in
i686*) # /usr/bin/ld: final link failed: memory exhausted
nodebug=yes
;;
*-musl) broken="https://build.voidlinux.org/builders/x86_64-musl_builder/builds/22060/steps/shell_3/logs/stdio";;
esac
do_configure() {
sed -e "s|-O2|${CXXFLAGS}|" \
-i src/qt/qtbase/mkspecs/common/{g++,gcc}-base.conf
sed -e "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" \
-i src/qt/qtbase/mkspecs/common/gcc-base.conf
# Disable severely outdated bundled version of google breakpad on musl:
case "$XBPS_TARGET_MACHINE" in
*-musl)
sed -e '/^#ifdef Q_OS_LINUX/,/^#endif/d' \
-i src/crashdump.cpp
sed -e '/^linux/,/^}/d' \
-i src/phantomjs.pro
;;
esac
}
do_build() {
export LD_LIBRARY_PATH="${wrksrc}/qtbase/lib:${wrksrc}/qttools/lib:${LD_LIBRARY_PATH}"
export LD="$CXX"
unset CPP AR AS RANLIB
./build.sh \
--confirm \
--jobs $XBPS_MAKEJOBS
}
do_install() {
vbin bin/phantomjs
vlicense LICENSE.BSD LICENSE
vlicense third-party.txt
}

View file

@ -1 +0,0 @@
pattern="$pkgname-\K[\d\.]+(?=(-source)?\.(zip|tar))"