snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

Revert "qt5: update to 5.12.1" 

This reverts commit 75efc498dd.

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
This commit is contained in:
Jürgen Buchmüller 2019-03-19 16:32:57 +01:00
parent cc8eab43ef
commit 58abd14181
No known key found for this signature in database
GPG Key ID: DE55AD8DBEBB4EE8
17 changed files with 2359 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/shlibs
View File

@ -1842,13 +1842,10 @@ libQt5Quick.so.5 qt5-declarative-5.6.0_1
libQt5QuickTest.so.5 qt5-declarative-5.6.0_1
libQt5QuickWidgets.so.5 qt5-declarative-5.6.0_1
libQt5QuickParticles.so.5 qt5-declarative-5.6.0_1
libQt5QuickShapes.so.5 qt5-declarative-5.12.1_1
libQt5QuickControls2.so.5 qt5-quickcontrols2-5.7.1_1
libQt5QuickTemplates2.so.5 qt5-quickcontrols2-5.7.1_1
libQt5Positioning.so.5 qt5-location-5.6.0_1
libQt5Location.so.5 qt5-location-5.6.0_1
libQt5PositioningQuick.so.5 qt5-location-5.12.1_1
libQt5VirtualKeyboard.so.5 qt5-virtualkeyboard-5.12.1_1
libQt5Multimedia.so.5 qt5-multimedia-5.6.0_1
libQt5MultimediaGstTools.so.5 qt5-multimedia-5.10.1_1
libQt5MultimediaQuick.so.5 qt5-multimedia-5.10.1_1

2
srcpkgs/qt5/files/assistant.pro
View File

@ -5,7 +5,9 @@ SUBDIRS += \
assistant \
qhelpgenerator \
qcollectiongenerator \
qhelpconverter
assistant.depends = help
qhelpgenerator.depends = help
qcollectiongenerator.depends = help
qhelpconverter.depends = help

2
srcpkgs/qt5/files/qmlimportscanner.pro
View File

@ -1,7 +1,7 @@
QT = core qml network qmldevtools-private
DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
SOURCES += main.cpp ../../src/qml/qqmljsgrammar.cpp
SOURCES += main.cpp ../../src/qml/parser/qqmljsgrammar.cpp
QMAKE_TARGET_DESCRIPTION = QML Import Scanner

2
srcpkgs/qt5/files/qmllint.pro
View File

@ -1,6 +1,6 @@
QT = core qml network qmldevtools-private
SOURCES += main.cpp ../../src/qml/qqmljsgrammar.cpp
SOURCES += main.cpp ../../src/qml/parser/qqmljsgrammar.cpp
QMAKE_TARGET_DESCRIPTION = QML Syntax Verifier

2
srcpkgs/qt5/files/qmlmin.pro
View File

@ -1,5 +1,5 @@
QT = core qml network qmldevtools-private
SOURCES += main.cpp ../../src/qml/qqmljsgrammar.cpp
SOURCES += main.cpp ../../src/qml/parser/qqmljsgrammar.cpp
QMAKE_TARGET_DESCRIPTION = QML/JS Minifier

24
srcpkgs/qt5/patches/0005-musl-no-execinfo.patch
View File

@ -92,8 +92,8 @@
!defined(OS_AIX)
if (severity_ == LOG_FATAL && !base::debug::BeingDebugged()) {
// Include a stack trace on a fatal, unless a debugger is attached.
--- qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/assertions.cc 2017-11-28 14:06:53.000000000 +0100
+++ qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/assertions.cc 2018-01-29 20:23:26.498185623 +0100
--- qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/platform/wtf/Assertions.cpp 2017-11-28 14:06:53.000000000 +0100
+++ qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/platform/wtf/Assertions.cpp 2018-01-29 20:23:26.498185623 +0100
@@ -59,7 +59,6 @@
#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(__UCLIBC__))
#include <cxxabi.h>
@ -102,3 +102,23 @@
#endif
#if defined(OS_ANDROID)
--- qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/checks.cc 2017-11-28 14:06:53.000000000 +0100
+++ qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/checks.cc 2018-01-29 20:32:41.070163511 +0100
@@ -16,7 +16,7 @@
#include <cstdio>
#include <cstdlib>
-#if defined(__GLIBCXX__) && !defined(__UCLIBC__)
+#if defined(__GLIBCXX__) && defined(__GLIBC__)
#include <cxxabi.h>
#include <execinfo.h>
#endif
@@ -60,7 +60,7 @@
// to get usable symbols on Linux. This is copied from V8. Chromium has a more
// advanced stace trace system; also more difficult to copy.
void DumpBacktrace() {
-#if defined(__GLIBCXX__) && !defined(__UCLIBC__)
+#if defined(__GLIBCXX__) && defined(__GLIBC__)
void* trace[100];
int size = backtrace(trace, sizeof(trace) / sizeof(*trace));
char** symbols = backtrace_symbols(trace, size);

11
srcpkgs/qt5/patches/0008-musl-no-mallinfo.patch
View File

@ -29,3 +29,14 @@
struct mallinfo minfo = mallinfo();
#if defined(USE_TCMALLOC)
return minfo.uordblks;
--- qtwebengine/src/3rdparty/chromium/content/child/content_child_helpers.cc 2017-11-28 14:06:53.000000000 +0100
+++ qtwebengine/src/3rdparty/chromium/content/child/content_child_helpers.cc 2018-01-28 06:23:14.891238507 +0100
@@ -25,7 +25,7 @@
// though, this provides only a partial and misleading value.
// Unfortunately some telemetry benchmark rely on it and these need to
// be refactored before getting rid of this. See crbug.com/581365 .
-#if defined(OS_LINUX) || defined(OS_ANDROID)
+#if defined(__GLIBC__) || defined(OS_ANDROID)
size_t GetMemoryUsageKB() {
struct mallinfo minfo = mallinfo();
uint64_t mem_usage =

4
srcpkgs/qt5/patches/0017-musl-stackstart.patch
View File

@ -1,5 +1,5 @@
--- qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc 2018-01-27 23:08:43.586475349 +0100
+++ qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc 2018-01-27 23:18:22.274505203 +0100
--- qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp 2018-01-27 23:08:43.586475349 +0100
+++ qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp 2018-01-27 23:18:22.274505203 +0100
@@ -28,7 +28,7 @@
// FIXME: On Mac OSX and Linux, this method cannot estimate stack size
// correctly for the main thread.

18
srcpkgs/qt5/patches/0021-chromium-mojo-gcc8.patch Normal file
View File

@ -0,0 +1,18 @@
--- qtwebengine/src/3rdparty/chromium/mojo/public/c/system/macros.h 2018-05-15 14:58:46.448912634 -0400
+++ qtwebengine/src/3rdparty/chromium/mojo/public/c/system/macros.h 2018-05-15 14:58:52.041784613 -0400
@@ -18,7 +18,13 @@
#endif
// Like the C++11 |alignof| operator.
-#if __cplusplus >= 201103L
+#if defined(__GNUC__) && __GNUC__ >= 8
+// GCC 8 has changed the alignof operator to return the minimal alignment
+// required by the target ABI, instead of the preferred alignment.
+// This means that on 32-bit x86, it will return 4 instead of 8.
+// Use __alignof__ instead to avoid this.
+#define MOJO_ALIGNOF(type) __alignof__(type)
+#elif __cplusplus >= 201103L
#define MOJO_ALIGNOF(type) alignof(type)
#elif defined(__GNUC__)
#define MOJO_ALIGNOF(type) __alignof__(type)
generated by cgit v1.1 at 2018-05-28 17:38:41 +0000

27
srcpkgs/qt5/patches/0022-libressl-compat.patch
View File

@ -1,3 +1,15 @@
--- qtbase/config.tests/unix/openssl11/openssl.cpp 2017-11-05 16:07:40.963385070 -0500
+++ qtbase/config.tests/unix/openssl11/openssl.cpp 2017-11-05 16:07:51.755255545 -0500
@@ -39,7 +39,7 @@
#include <openssl/opensslv.h>
-#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L
+#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
# error "OpenSSL >= 1.1 is required"
#endif
diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp
index 41b759364b..17ce5b4b30 100644
--- qtbase/src/network/ssl/qsslcontext_openssl.cpp
@ -19,10 +31,10 @@ index 82ff5e9e3a..77e5d03b7d 100644
@@ -402,7 +402,7 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return 0, return)
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return 0, return);
DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h
@ -38,14 +50,3 @@ index 4fb8f26cf6..3a7de93113 100644
SSL_CONF_CTX *q_SSL_CONF_CTX_new();
void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
--- qtbase/src/network/configure.json 2019-01-28 18:11:52.000000000 +0100
+++ - 2019-03-11 00:31:42.883264246 +0100
@@ -165,7 +165,7 @@
"test": {
"include": "openssl/opensslv.h",
"tail": [
- "#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L",
+ "#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)",
"# error OpenSSL >= 1.1 is required",
"#endif"
]

33
srcpkgs/qt5/patches/0023-enable_tools-cross.patch
View File

@ -1,37 +1,28 @@
--- qttools/src/src.pro 2018-06-09 13:10:38.000000000 +0200
+++ qttools/src/src.pro 2018-08-19 09:34:29.803670205 +0200
@@ -1,20 +1,14 @@
@@ -1,16 +1,10 @@
TEMPLATE = subdirs
-qtHaveModule(widgets) {
- no-png {
- message("Some graphics-related tools are unavailable without PNG support")
- } else {
- QT_FOR_CONFIG += widgets
- qtConfig(pushbutton):qtConfig(toolbutton) {
- SUBDIRS = assistant \
- designer \
- pixeltool
-
- linguist.depends = designer
- }
- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
- SUBDIRS = assistant \
- pixeltool \
- designer
+SUBDIRS = assistant \
+ pixeltool \
+ designer
- linguist.depends = designer
- }
-}
+QT_FOR_CONFIG += widgets
+
+SUBDIRS = assistant \
+ designer \
+ pixeltool
+
+linguist.depends = designer
+
+SUBDIRS += distancefieldgenerator
SUBDIRS += linguist \
qtattributionsscanner
@@ -31,11 +25,11 @@ macos {
SUBDIRS += macdeployqt
@@ -31,11 +25,11 @@
SUBDIRS += androiddeployqt
}
-qtHaveModule(dbus): SUBDIRS += qdbus
@ -43,4 +34,4 @@
+SUBDIRS += qtdiag
qtNomakeTools( \
distancefieldgenerator \
pixeltool \

12
srcpkgs/qt5/patches/0027-skia_cpu-be.patch Normal file
View File

@ -0,0 +1,12 @@
--- qtwebengine/src/3rdparty/chromium/third_party/skia/include/gpu/GrTypes.h.orig 2018-09-11 14:37:56.832822055 +0200
+++ qtwebengine/src/3rdparty/chromium/third_party/skia/include/gpu/GrTypes.h 2018-09-11 14:38:11.464821183 +0200
@@ -348,9 +348,6 @@
static const int kGrPixelConfigCnt = kLast_GrPixelConfig + 1;
// Aliases for pixel configs that match skia's byte order.
-#ifndef SK_CPU_LENDIAN
- #error "Skia gpu currently assumes little endian"
-#endif
#if SK_PMCOLOR_BYTE_ORDER(B,G,R,A)
static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig;
#elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)

12
srcpkgs/qt5/patches/0028-webrtc-be.patch Normal file
View File

@ -0,0 +1,12 @@
--- qtwebengine/src/3rdparty/chromium/third_party/webrtc/typedefs.h 2018-06-15 09:47:20.000000000 +0200
+++ qtwebengine/src/3rdparty/chromium/third_party/webrtc/typedefs.h 2018-09-14 17:50:45.198153942 +0200
@@ -47,6 +47,9 @@
#elif defined(__pnacl__)
#define WEBRTC_ARCH_32_BITS
#define WEBRTC_ARCH_LITTLE_ENDIAN
+#elif defined(__MIPSEB__)
+#define WEBRTC_ARCH_MIPS_FAMILY
+#define WEBRTC_ARCH_BIG_ENDIAN
#else
#error Please add support for your architecture in typedefs.h
#endif

121
srcpkgs/qt5/patches/0029-musl-libevent.patch Normal file
View File

@ -0,0 +1,121 @@
--- qtwebengine/src/3rdparty/chromium/base/message_loop/message_pump_libevent.cc
+++ qtwebengine/src/3rdparty/chromium/base/message_loop/message_pump_libevent.cc
@@ -14,7 +14,7 @@
#include "base/files/file_util.h"
#include "base/logging.h"
#include "base/posix/eintr_wrapper.h"
-#include "base/third_party/libevent/event.h"
+#include "event.h"
#include "base/time/time.h"
#include "base/trace_event/trace_event.h"
#include "build/build_config.h"
--- qtwebengine/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py 2018-10-18 01:20:19.224169786 +0200
+++ qtwebengine/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py 2018-10-18 01:26:11.273148802 +0200
@@ -32,6 +32,7 @@
is_win = sys.platform.startswith('win')
is_linux = sys.platform.startswith('linux')
+is_gnu_linux = is_linux and platform.libc_ver()[0].startswith('glibc')
is_mac = sys.platform.startswith('darwin')
is_aix = sys.platform.startswith('aix')
is_posix = is_linux or is_mac or is_aix
@@ -193,7 +193,7 @@
{'ENABLE_MUTEX_PRIORITY_INHERITANCE': 'false'})
write_buildflag_header_manually(root_gen_dir, 'base/allocator/features.h',
- {'USE_ALLOCATOR_SHIM': 'true' if is_linux else 'false'})
+ {'USE_ALLOCATOR_SHIM': 'true' if is_gnu_linux else 'false'})
write_buildflag_header_manually(root_gen_dir, 'base/debug/debugging_flags.h',
{
@@ -453,8 +453,6 @@
'base/third_party/superfasthash/superfasthash.c',
])
static_libraries['base']['sources'].extend([
- 'base/allocator/allocator_check.cc',
- 'base/allocator/allocator_extension.cc',
'base/at_exit.cc',
'base/base_paths.cc',
'base/base_switches.cc',
@@ -625,6 +623,11 @@
'base/values.cc',
'base/vlog.cc',
])
+ if is_gnu_linux:
+ static_libraries['base']['sources'].extend([
+ 'base/allocator/allocator_check.cc',
+ 'base/allocator/allocator_extension.cc',
+ ])
if is_posix:
static_libraries['base']['sources'].extend([
@@ -663,29 +666,31 @@
'base/time/time_exploded_posix.cc',
])
- static_libraries['libevent'] = {
- 'sources': [
- 'base/third_party/libevent/buffer.c',
- 'base/third_party/libevent/evbuffer.c',
- 'base/third_party/libevent/evdns.c',
- 'base/third_party/libevent/event.c',
- 'base/third_party/libevent/event_tagging.c',
- 'base/third_party/libevent/evrpc.c',
- 'base/third_party/libevent/evutil.c',
- 'base/third_party/libevent/http.c',
- 'base/third_party/libevent/log.c',
- 'base/third_party/libevent/poll.c',
- 'base/third_party/libevent/select.c',
- 'base/third_party/libevent/signal.c',
- 'base/third_party/libevent/strlcpy.c',
- ],
- 'tool': 'cc',
- 'include_dirs': [],
- 'cflags': cflags + ['-DHAVE_CONFIG_H'],
- }
+ if is_gnu_linux:
+ static_libraries['libevent'] = {
+ 'sources': [
+ 'base/third_party/libevent/buffer.c',
+ 'base/third_party/libevent/evbuffer.c',
+ 'base/third_party/libevent/evdns.c',
+ 'base/third_party/libevent/event.c',
+ 'base/third_party/libevent/event_tagging.c',
+ 'base/third_party/libevent/evrpc.c',
+ 'base/third_party/libevent/evutil.c',
+ 'base/third_party/libevent/http.c',
+ 'base/third_party/libevent/log.c',
+ 'base/third_party/libevent/poll.c',
+ 'base/third_party/libevent/select.c',
+ 'base/third_party/libevent/signal.c',
+ 'base/third_party/libevent/strlcpy.c',
+ ],
+ 'tool': 'cc',
+ 'include_dirs': [],
+ 'cflags': cflags + ['-DHAVE_CONFIG_H'],
+ }
if is_linux or is_aix:
ldflags.extend(['-pthread'])
+ ldflags.extend(['-levent'])
static_libraries['xdg_user_dirs'] = {
'sources': [
@@ -709,7 +714,7 @@
'base/sys_info_linux.cc',
'base/threading/platform_thread_linux.cc',
])
- if is_linux:
+ if is_gnu_linux:
static_libraries['base']['sources'].extend([
'base/allocator/allocator_shim.cc',
'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
@@ -721,7 +726,7 @@
static_libraries['libevent']['sources'].extend([
'base/third_party/libevent/epoll.c',
])
- else:
+ if is_aix:
libs.extend(['-lrt'])
static_libraries['base']['sources'].extend([
'base/process/internal_aix.cc'

8
srcpkgs/qt5/patches/libressl-const-bio.patch
View File

@ -4,10 +4,10 @@
#endif
DEFINEFUNC2(BIO *, BIO_new_file, const char *filename, filename, const char *mode, mode, return 0, return)
DEFINEFUNC(void, ERR_clear_error, DUMMYARG, DUMMYARG, return, DUMMYARG)
-DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return nullptr, return)
-DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return)
+DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return nullptr, return)
+DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return)
-DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return 0, return)
-DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return)
+DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return 0, return)
+DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return)
DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return)
DEFINEFUNC(void, CRYPTO_set_locking_callback, void (*a)(int, int, const char *, int), a, return, DUMMYARG)
DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG)

2112
srcpkgs/qt5/patches/qtwebengine-chromium-ppc64.patch Normal file
View File

File diff suppressed because it is too large Load Diff

30
srcpkgs/qt5/template
View File

@ -1,7 +1,7 @@
# Template file for 'qt5'
pkgname=qt5
version=5.12.1
revision=1
version=5.11.3
revision=5
wrksrc="qt-everywhere-src-${version}"
build_style=gnu-configure
hostmakedepends="cmake clang flex git glib-devel gperf ninja pkg-config
@ -10,7 +10,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
gtk+3-devel icu-devel jsoncpp-devel libXv-devel libbluetooth-devel libcap-devel
libevent-devel libinput-devel libmng-devel libmysqlclient-devel libproxy-devel
libvpx-devel libwebp-devel libxslt-devel minizip-devel nss-devel
libvpx5-devel libwebp-devel libxslt-devel minizip-devel nss-devel
opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
protobuf-devel pulseaudio-devel snappy-devel tslib-devel
unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
@ -18,10 +18,10 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
depends="qtchooser"
short_desc="Cross-platform application and UI framework (QT5)"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="LGPL-3.0-or-later"
license="GPL-3.0-or-later, LGPL-2.1-or-later"
homepage="https://qt.io/"
distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/single/qt-everywhere-src-${version}.tar.xz"
checksum=caffbd625c7bc10ff8c5c7a27dbc7d84fa4de146975c0e1ffe904b514ccd6da4
checksum=859417642713cee2493ee3646a7fee782c9f1db39e41d7bb1322bba0c5f0ff4d
replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0
qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1"
@ -79,7 +79,7 @@ fi
_bootstrap_gn() {
# Bootstrap gn (generate ninja)
_msg_cross "Bootstrapping 'gn'"
cd ${wrksrc}/qtwebengine/src/3rdparty/gn
cd ${wrksrc}/qtwebengine/src/3rdparty/chromium/tools/gn
conf='is_clang=false'
conf+=' treat_warnings_as_errors=false'
conf+=' enable_remoting=false'
@ -108,18 +108,16 @@ _bootstrap_gn() {
AR="$AR_host" CC="$CC_host" CXX="$CXX_host" LD="$CXX_host" \
CFLAGS="$CFLAGS_host" CXXFLAGS="$CXXFLAGS_host" LDFLAGS="$LDFLAGS_host" \
PKGCONFIG=/usr/bin/pkgconfig PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/share/pkgconfig" \
python2 build/gen.py --no-last-commit-position --out-path \
${wrksrc}/qtwebengine/src/3rdparty/gn/out/Release
ninja -C out/Release gn
python2 bootstrap/bootstrap.py -n --gn-gen-args "${conf}"
cd ${wrksrc}
#mkdir -p ${wrksrc}/qtwebengine/src/3rdparty/chromium/tools/gn/out/Release
#cp -p ${wrksrc}/qtwebengine/src/3rdparty/chromium/out/Release/gn \
# ${wrksrc}/qtwebengine/src/3rdparty/chromium/tools/gn/out/Release/
mkdir -p ${wrksrc}/qtwebengine/src/3rdparty/chromium/tools/gn/out/Release
cp -p ${wrksrc}/qtwebengine/src/3rdparty/chromium/out/Release/gn \
${wrksrc}/qtwebengine/src/3rdparty/chromium/tools/gn/out/Release/
# Remove gn from SUBDIRS for qtwebengine/src/buildtools
#sed -i ${wrksrc}/qtwebengine/src/buildtools/buildtools.pro \
# -e"/gn.file = gn.pro/,+3d"
sed -i ${wrksrc}/qtwebengine/src/buildtools/buildtools.pro \
-e"/gn.file = gn.pro/,+3d"
}
_cleanup_wrksrc_leak() {
@ -289,7 +287,6 @@ do_configure() {
done
if [ "$build_option_webengine" ]; then
:
_bootstrap_gn
fi
@ -428,6 +425,7 @@ do_install() {
cd ${wrksrc}/qtbase
make INSTALL_ROOT=${DESTDIR} install
vlicense ${wrksrc}/LGPL_EXCEPTION.txt
_cleanup_wrksrc_leak
# Symbolic links for remaining binaries
@ -437,7 +435,7 @@ do_install() {
ln -sf /usr/lib/qt5/bin/${base} ${PKGDESTDIR}/usr/bin/${base}-qt5
done
if [ "$CROSS_BUILD" ]; then
if [ -n "$CROSS_BUILD" ]; then
vmkdir usr/bin
vmkdir usr/lib/qt5/bin