diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2020-02-17 06:03:43 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2020-02-17 17:59:51 +0100 |
| commit | 8ea9f1e02e85e3cc2b4ccda52639e96651d21653 (patch) | |
| tree | dacfd5fff40a77f9335c18e572a6587149bb0abc /source/l/qt5/patches/qt5.qtbug-51621.patch | |
| parent | 6087aff6cae8d8d4c46ce086cb7b70a5af412d2b (diff) | |
| download | current-8ea9f1e02e85e3cc2b4ccda52639e96651d21653.tar.gz | |
Mon Feb 17 06:03:43 UTC 202020200217060343
ap/ksh93-20200131_e4fea8c5-x86_64-1.txz: Upgraded.
ap/zsh-5.8-x86_64-1.txz: Upgraded.
l/brotli-1.0.7-x86_64-1.txz: Added.
l/gmime-3.2.6-x86_64-1.txz: Upgraded.
l/hyphen-2.8.8-x86_64-1.txz: Added.
l/openal-soft-1.20.1-x86_64-1.txz: Upgraded.
Thanks to Skaendo and Willy Sudiarto Raharjo.
l/qt5-webkit-5.212.0_alpha3-x86_64-1.txz: Added.
Thanks to alienBOB.
l/woff2-20180531_a0d0ed7-x86_64-1.txz: Added.
n/bluez-5.53-x86_64-1.txz: Upgraded.
n/mutt-1.13.4-x86_64-1.txz: Upgraded.
n/samba-4.11.6-x86_64-3.txz: Rebuilt.
n/socat-1.7.3.4-x86_64-1.txz: Added.
n/whois-5.5.6-x86_64-1.txz: Upgraded.
testing/packages/PAM/samba-4.11.6-x86_64-3_pam.txz: Rebuilt.
Added patches to fix joining a DC when using krb5. Looks like the patches are
already upstreamed in the latest 4.12.0-rc. Thanks to camerabambai.
Diffstat (limited to 'source/l/qt5/patches/qt5.qtbug-51621.patch')
| -rw-r--r-- | source/l/qt5/patches/qt5.qtbug-51621.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/source/l/qt5/patches/qt5.qtbug-51621.patch b/source/l/qt5/patches/qt5.qtbug-51621.patch deleted file mode 100644 index 187a3d78..00000000 --- a/source/l/qt5/patches/qt5.qtbug-51621.patch +++ /dev/null @@ -1,39 +0,0 @@ -build with explicitlib after all - -unlike speculated in 2fe363514, this is not a workaround at all: it -causes that libraries' public link interfaces (LIBS) are exported in the -first place. unlike with staticlib, this does not export LIBS_PRIVATE, -so it wouldn't even be a particularly effective workaround for rpath -brokenness anyway. - -the problem was pretty well hidden by the qt module system, which at the -level of libraries is pretty redundant with the .prl file handling, -which shows just how stupid the whole "design" is. - -unlike before, we now enable explicitlib for all libraries, not just qt -modules - we enable create_prl for all of them as well, after all. - -an immediate effect of this change is that it fixes linking on RaspPI: -the qtcore headers make the user code require linking libatomic, so we -must add it to our public link interface. - -Task-number: QTBUG-51621 -Change-Id: I5742c88694db8e8a9b79d17222dc6df2b38e5ab2 - -X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt%2Fqtbase.git;a=blobdiff_plain;f=mkspecs%2Ffeatures%2Fqt_build_config.prf;h=b3081b960ec192c3421d7a1c2bd5a628f0ca8455;hp=518fd93f0457c6060721c38ad8b6a0286407e562;hb=268e7ee9778de79d2485bdd028721ec7adbc1324;hpb=495e8c205424253186bef47421de63534d23dd59 - -diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf -index 518fd93..b3081b9 100644 ---- a/mkspecs/features/qt_build_config.prf -+++ b/mkspecs/features/qt_build_config.prf -@@ -72,6 +72,10 @@ CONFIG += \ - # However, testcases should be still built with exceptions. - exceptions_off testcase_exceptions - -+# Under Windows, this is neither necessary (transitive deps are automatically -+# resolved), nor functional (.res files end up in .prl files and break things). -+unix: CONFIG += explicitlib -+ - - defineTest(qtBuildPart) { - bp = $$eval($$upper($$section(_QMAKE_CONF_, /, -2, -2))_BUILD_PARTS) |