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-60558.patch | |
| parent | 6087aff6cae8d8d4c46ce086cb7b70a5af412d2b (diff) | |
| download | current-8ea9f1e02e85e3cc2b4ccda52639e96651d21653.tar.gz current-8ea9f1e02e85e3cc2b4ccda52639e96651d21653.tar.xz | |
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-60558.patch')
| -rw-r--r-- | source/l/qt5/patches/qt5.qtbug-60558.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/source/l/qt5/patches/qt5.qtbug-60558.patch b/source/l/qt5/patches/qt5.qtbug-60558.patch deleted file mode 100644 index 2d039203f..000000000 --- a/source/l/qt5/patches/qt5.qtbug-60558.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://github.com/qt/qtbase/commit/f45c6c18.patch - -From f45c6c180463ccb6620e1d273a264f14a1204a93 Mon Sep 17 00:00:00 2001 -From: Thiago Macieira <thiago.macieira@intel.com> -Date: Wed, 3 May 2017 14:08:50 -0700 -Subject: [PATCH] QInternal::unregisterCallback: don't crash on unregistering - during exit - -Task-number: QTBUG-60558 -Change-Id: Ica9894dc9b5e48278fd4fffd14bb34c6d98d2555 -Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> ---- - src/corelib/global/qglobal.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp -index c37503f3db..22fc20d47e 100644 ---- a/src/corelib/global/qglobal.cpp -+++ b/src/corelib/global/qglobal.cpp -@@ -3988,8 +3988,10 @@ bool QInternal::registerCallback(Callback cb, qInternalCallback callback) - bool QInternal::unregisterCallback(Callback cb, qInternalCallback callback) - { - if (cb >= 0 && cb < QInternal::LastCallback) { -- QInternal_CallBackTable *cbt = global_callback_table(); -- return (bool) cbt->callbacks[cb].removeAll(callback); -+ if (global_callback_table.exists()) { -+ QInternal_CallBackTable *cbt = global_callback_table(); -+ return (bool) cbt->callbacks[cb].removeAll(callback); -+ } - } - return false; - } |