diff options
author | Tijl Coosemans <tijl@FreeBSD.org> | 2019-01-16 11:13:44 +0000 |
---|---|---|
committer | Tijl Coosemans <tijl@FreeBSD.org> | 2019-01-16 11:13:44 +0000 |
commit | 1bf487d3e73d83700f5a4aeb3a9ffbfc6e87856b (patch) | |
tree | 127ae6686665fd0ff97a7bd5f27449299929734e /www/qt5-webengine | |
parent | d20d8aa75e51f61da14ac206199a1ebc244f940a (diff) | |
download | ports-1bf487d3e73d83700f5a4aeb3a9ffbfc6e87856b.tar.gz ports-1bf487d3e73d83700f5a4aeb3a9ffbfc6e87856b.zip |
Fix Qt5 symbol version scripts to put the catch-all clause first. When
a symbol matches multiple clauses the last one takes precedence. If the
catch-all is last it captures everything. In the case of Qt5 libraries
this caused all symbols to have a Qt_5 label while some should have
Qt_5_PRIVATE_API. This only affects lld because GNU ld always gives the
catch-all lowest priority.
Older versions of Qt5Webengine exported some memory allocation symbols from
the bundled Chromium. Version 5.9 stopped exporting these [1] but the
symbols were kept as weak wrappers for the standard allocation functions to
maintain binary compatibility. [2][3] The problem is that the call to the
standard function in these weak wrappers is only resolved to the standard
function if there's a call to this standard function in other parts of
Qt5Webengine, because only then is there a non-weak symbol that takes
precedence over the weak one. If there's no such non-weak symbol the call
in the weak wrapper resolves to the weak wrapper itself creating an infinite
call loop that overflows the stack and causes a crash. Some of the
allocation functions are variants of C++ new and delete and it probably
depends on the compiler whether these variants are used in other parts of
Qt5Webengine.
Remove the weak wrappers (make them Linux specific). This isn't binary
compatible but we are already breaking that with the changes to the symbol
versions.
[1] https://github.com/qt/qtwebengine/commit/5c2cbfccf9aafb547b0b30914c4056abd25942a4
[2] https://github.com/qt/qtwebengine/commit/2ed5054e3a800fa97c2c9e920ba1e6ea4b6ef2a5
[3] https://github.com/qt/qtwebengine/commit/009f5ebb4bd6e50188671e0815a5dae6afe39db5
Bump all ports that depend on Qt5.
PR: 234070
Exp-run by: antoine
Approved by: kde (adridg)
Notes
Notes:
svn path=/head/; revision=490472
Diffstat (limited to 'www/qt5-webengine')
-rw-r--r-- | www/qt5-webengine/Makefile | 2 | ||||
-rw-r--r-- | www/qt5-webengine/files/patch-src_core_api_core_api.pro | 11 | ||||
-rw-r--r-- | www/qt5-webengine/files/patch-src_core_api_qtbug-61521.cpp | 50 |
3 files changed, 12 insertions, 51 deletions
diff --git a/www/qt5-webengine/Makefile b/www/qt5-webengine/Makefile index 00d7304b6729..269d2538f6ce 100644 --- a/www/qt5-webengine/Makefile +++ b/www/qt5-webengine/Makefile @@ -20,7 +20,7 @@ PORTNAME= webengine DISTVERSION= ${QT5_VERSION} -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= www PKGNAMEPREFIX= qt5- diff --git a/www/qt5-webengine/files/patch-src_core_api_core_api.pro b/www/qt5-webengine/files/patch-src_core_api_core_api.pro new file mode 100644 index 000000000000..a5126d0478f1 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_core_api_core_api.pro @@ -0,0 +1,11 @@ +--- src/core/api/core_api.pro.orig 2018-04-10 14:50:39 UTC ++++ src/core/api/core_api.pro +@@ -53,7 +53,7 @@ SOURCES = \ + qwebengineurlschemehandler.cpp + + ### Qt6 Remove this workaround +-unix:!isEmpty(QMAKE_LFLAGS_VERSION_SCRIPT):!static { ++linux:!isEmpty(QMAKE_LFLAGS_VERSION_SCRIPT):!static { + SOURCES += qtbug-60565.cpp \ + qtbug-61521.cpp + } diff --git a/www/qt5-webengine/files/patch-src_core_api_qtbug-61521.cpp b/www/qt5-webengine/files/patch-src_core_api_qtbug-61521.cpp deleted file mode 100644 index bcb247bbbc30..000000000000 --- a/www/qt5-webengine/files/patch-src_core_api_qtbug-61521.cpp +++ /dev/null @@ -1,50 +0,0 @@ -malloc.h does not exist on FreeBSD, and neither do memalign(3) and pvalloc(3). ---- src/core/api/qtbug-61521.cpp -+++ src/core/api/qtbug-61521.cpp -@@ -38,7 +38,7 @@ - ****************************************************************************/ - - #include <stdlib.h> --#include <malloc.h> -+#include <unistd.h> - - #define SHIM_ALIAS_SYMBOL(fn) __attribute__((weak, alias(#fn))) - #define SHIM_SYMBOL_VERSION(fn) __asm__(".symver __" #fn "," #fn "@Qt_5") -@@ -66,18 +66,10 @@ SHIM_SYMBOL_VERSION(cfree); - void __cfree(void* ptr) - SHIM_ALIAS_SYMBOL(ShimCFree); - --SHIM_SYMBOL_VERSION(memalign); --void* __memalign(size_t align, size_t s) -- SHIM_ALIAS_SYMBOL(ShimMemalign); -- - SHIM_SYMBOL_VERSION(valloc); - void* __valloc(size_t size) - SHIM_ALIAS_SYMBOL(ShimValloc); - --SHIM_SYMBOL_VERSION(pvalloc); --void* __pvalloc(size_t size) -- SHIM_ALIAS_SYMBOL(ShimPvalloc); -- - SHIM_SYMBOL_VERSION(posix_memalign); - int __posix_memalign(void** r, size_t a, size_t s) - SHIM_ALIAS_SYMBOL(ShimPosixMemalign); -@@ -102,18 +94,10 @@ SHIM_HIDDEN void ShimCFree(void* ptr) { - free(ptr); - } - --SHIM_HIDDEN void* ShimMemalign(size_t align, size_t s) { -- return memalign(align,s); --} -- - SHIM_HIDDEN void* ShimValloc(size_t size) { - return valloc(size); - } - --SHIM_HIDDEN void* ShimPvalloc(size_t size) { -- return pvalloc(size); --} -- - SHIM_HIDDEN int ShimPosixMemalign(void** r, size_t a, size_t s) { - return posix_memalign(r,a,s); - } |