mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-17 13:07:54 +02:00
48c845902a
Qt's configure grabs the path to xkb's data root during configure, but the
build changes in 5.8 apparently broke the handling for cross builds. As a
result, the string embedded in the binary depends on whether or not some files
are present in the builder's filesystem.
The "-xkb-config-root" configure setting is intended to allow manual overriding
but it is also broken. See: https://bugreports.qt.io/browse/QTBUG-60005
This has since been fixed upstream, so just hard-code the path for now. We can
drop this patch when we bump to a fixed Qt.
Also, fix the "-qt-xkbcommon-x11" config param which was renamed. This does not
appear to affect build results, presumably because auto-detection is working,
but it does not hurt to be explicit.
Github-Pull: #14000
Rebased-From:
|
||
|---|---|---|
| .. | ||
| bdb.mk | ||
| boost.mk | ||
| dbus.mk | ||
| expat.mk | ||
| fontconfig.mk | ||
| freetype.mk | ||
| libevent.mk | ||
| libICE.mk | ||
| libSM.mk | ||
| libX11.mk | ||
| libXau.mk | ||
| libxcb.mk | ||
| libXext.mk | ||
| miniupnpc.mk | ||
| native_biplist.mk | ||
| native_cctools.mk | ||
| native_cdrkit.mk | ||
| native_ds_store.mk | ||
| native_libdmg-hfsplus.mk | ||
| native_mac_alias.mk | ||
| native_protobuf.mk | ||
| openssl.mk | ||
| packages.mk | ||
| protobuf.mk | ||
| qrencode.mk | ||
| qt.mk | ||
| xcb_proto.mk | ||
| xextproto.mk | ||
| xproto.mk | ||
| xtrans.mk | ||
| zeromq.mk | ||
| zlib.mk | ||