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 /japanese | |
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 'japanese')
-rw-r--r-- | japanese/fcitx-mozc/Makefile | 1 | ||||
-rw-r--r-- | japanese/fcitx-skk/Makefile | 2 | ||||
-rw-r--r-- | japanese/ibus-mozc/Makefile | 1 | ||||
-rw-r--r-- | japanese/kiten/Makefile | 1 | ||||
-rw-r--r-- | japanese/mozc-server/Makefile | 2 | ||||
-rw-r--r-- | japanese/mozc-tool/Makefile | 1 | ||||
-rw-r--r-- | japanese/uim-mozc/Makefile | 1 | ||||
-rw-r--r-- | japanese/xpdf/Makefile | 2 |
8 files changed, 8 insertions, 3 deletions
diff --git a/japanese/fcitx-mozc/Makefile b/japanese/fcitx-mozc/Makefile index a6b6e0eb1531..12cdca513d01 100644 --- a/japanese/fcitx-mozc/Makefile +++ b/japanese/fcitx-mozc/Makefile @@ -1,6 +1,7 @@ # Created by: Daichi GOTO <daichi@FreeBSD.org> # $FreeBSD$ +PORTREVISION= 15 PKGNAMEPREFIX= ja-fcitx- COMMENT= Mozc engine for Fcitx diff --git a/japanese/fcitx-skk/Makefile b/japanese/fcitx-skk/Makefile index 7426b345f7bf..be12f27c073a 100644 --- a/japanese/fcitx-skk/Makefile +++ b/japanese/fcitx-skk/Makefile @@ -2,7 +2,7 @@ PORTNAME= fcitx-skk PORTVERSION= 0.1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese MASTER_SITES= http://download.fcitx-im.org/${PORTNAME}/ DIST_SUBDIR= fcitx diff --git a/japanese/ibus-mozc/Makefile b/japanese/ibus-mozc/Makefile index c932f4949b9e..253c5ec81e76 100644 --- a/japanese/ibus-mozc/Makefile +++ b/japanese/ibus-mozc/Makefile @@ -1,6 +1,7 @@ # Created by: Daichi GOTO <daichi@FreeBSD.org> # $FreeBSD$ +PORTREVISION= 15 PKGNAMEPREFIX= ja-ibus- COMMENT= Mozc engine for IBus diff --git a/japanese/kiten/Makefile b/japanese/kiten/Makefile index fdbcf802b737..942fd45af5fd 100644 --- a/japanese/kiten/Makefile +++ b/japanese/kiten/Makefile @@ -2,6 +2,7 @@ PORTNAME= kiten DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= japanese kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile index 6ae48132f110..d652d0ee4d97 100644 --- a/japanese/mozc-server/Makefile +++ b/japanese/mozc-server/Makefile @@ -4,7 +4,7 @@ PORTNAME= mozc PORTVERSION= 2.20.2677.102.02 DISTVERSIONPREFIX= v -PORTREVISION= 14 +PORTREVISION?= 14 CATEGORIES= japanese MAINTAINER= hrs@FreeBSD.org diff --git a/japanese/mozc-tool/Makefile b/japanese/mozc-tool/Makefile index 4d571eca8019..4b7b82a75647 100644 --- a/japanese/mozc-tool/Makefile +++ b/japanese/mozc-tool/Makefile @@ -1,6 +1,7 @@ # Created by: Daichi GOTO <daichi@FreeBSD.org> # $FreeBSD$ +PORTREVISION= 15 PKGNAMESUFFIX= -tool COMMENT= Mozc tool for IBus, SCIM, and others diff --git a/japanese/uim-mozc/Makefile b/japanese/uim-mozc/Makefile index ae7710325997..83f40e7d3e03 100644 --- a/japanese/uim-mozc/Makefile +++ b/japanese/uim-mozc/Makefile @@ -1,6 +1,7 @@ # Created by: Koichiro IWAO <meta+ports@vmeta.jp> # $FreeBSD$ +PORTREVISION= 15 PKGNAMEPREFIX= ja-uim- COMMENT= Mozc engine for uim diff --git a/japanese/xpdf/Makefile b/japanese/xpdf/Makefile index 3d531a0a4460..bb351c49e4f3 100644 --- a/japanese/xpdf/Makefile +++ b/japanese/xpdf/Makefile @@ -3,7 +3,7 @@ PORTNAME= xpdf PORTVERSION= 3.03 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= japanese MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ PKGNAMESUFFIX= -jafont |