Re: Qt 5.6 patch for QMutex problem

[Adriaan de Groot]

On Monday 15 August 2016 13:38:00 Gleb Popov wrote:
> This is the patch against 5.6 branch that fixes the QMutex problem:
> 
> diff --git a/src/corelib/thread/qmutex.cpp b/src/corelib/thread/qmutex.cpp


Thanks. I've added it to the area51 repo, in trunk (which is Qt 5.6).

[ade]

[SVN Commit] branches/plasma5/PORTS/multimedia/mlt

[Tobias Berner]

SVN commit 12924 by tcberner:

Update distinfo -- got skipped in r12923 *glares at rsync*

 M  +3 -2  distinfo  

[SVN Commit] branches/plasma5/PORTS/multimedia/mlt

[Tobias Berner]

SVN commit 12923 by tcberner:

Sync with ports r420257

 M  +15 -27Makefile  
 M  +8 -2  pkg-plist  

[SVN Commit] branches/plasma5/PORTS

[Tobias Berner]

SVN commit 12922 by tcberner:

Sync grantlee with ports r420244

 M  +42 -32Mk/Uses/grantlee.mk  
 M  +1 -12 devel/grantlee/Makefile  
 M  +1 -0  devel/grantlee/distinfo  
 A devel/grantlee/files (directory)  
 AMdevel/grantlee/files/patch-CMakeLists.txt  
 AMdevel/grantlee/files/patch-templates_lib_CMakeLists.txt  
 AMdevel/grantlee/files/patch-textdocument_lib_CMakeLists.txt  
 M  +1 -1  devel/grantlee/pkg-descr  
 M  +6 -6  devel/grantlee/pkg-plist  
 M  +2 -12 devel/grantlee5/Makefile  
 M  +1 -0  devel/grantlee5/distinfo  
 A devel/grantlee5/files (directory)  
 AMdevel/grantlee5/files/patch-CMakeLists.txt  
 AMdevel/grantlee5/files/patch-templates_lib_CMakeLists.txt  
 AMdevel/grantlee5/files/patch-textdocument_lib_CMakeLists.txt  
 M  +1 -1  devel/grantlee5/pkg-descr  
 M  +6 -6  devel/grantlee5/pkg-plist  

[SVN Commit] area51/QT/devel/qt5-core

[Adriaan de Groot]

SVN commit 12921 by adridg:

QMutex fix from arrowsvc (tested to the point of 'it compiles, ship it'

 M  +1 -0  Makefile  
 A files/patch-src_corelib_thread_qmutex_cpp.patch  

Qt 5.6 patch for QMutex problem

[Gleb Popov]

This is the patch against 5.6 branch that fixes the QMutex problem:

diff --git a/src/corelib/thread/qmutex.cpp b/src/corelib/thread/qmutex.cpp
index fa3bb08..db8e33e 100644
--- a/src/corelib/thread/qmutex.cpp
+++ b/src/corelib/thread/qmutex.cpp
@@ -571,7 +571,7 @@ const int
FreeListConstants::Sizes[FreeListConstants::BlockCount] = {

 typedef QFreeList FreeList;
 // We cannot use Q_GLOBAL_STATIC because it uses QMutex
-#if defined(Q_COMPILER_THREADSAFE_STATICS)
+#if defined(Q_COMPILER_THREADSAFE_STATICS) && !defined(Q_OS_FREEBSD)
 FreeList *freelist()
 {
 static FreeList list;


There was another proposed patch (which also worked fine), which involved
moving

 static FreeList list;

line out of the freelist() function to the global scope.

[SVN Commit] branches/plasma5/KDE

[Tobias Berner]

SVN commit 12920 by tcberner:

Remove DOCS option from plasma-* and kf5-*. 
Keeping it simple.



 M  +0 -3  audio/plasma5-plasma-pa/Makefile  
 M  +2 -2  audio/plasma5-plasma-pa/pkg-plist  
 M  +0 -3  devel/kf5-kdoctools/Makefile  
 M  +76 -76devel/kf5-kdoctools/pkg-plist  
 M  +0 -3  devel/kf5-kio/Makefile  
 M  +208 -208  devel/kf5-kio/pkg-plist  
 M  +0 -3  devel/kf5-kpackage/Makefile  
 M  +0 -3  devel/kf5-kservice/Makefile  
 M  +0 -3  devel/plasma5-khotkeys/Makefile  
 M  +10 -10devel/plasma5-khotkeys/pkg-plist  
 M  +0 -3  lang/kf5-kross/Makefile  
 M  +1 -4  security/plasma5-kscreenlocker/Makefile  
 M  +0 -3  sysutils/plasma5-kde-cli-tools/Makefile  
 M  +4 -4  sysutils/plasma5-kde-cli-tools/pkg-plist  
 M  +0 -3  sysutils/plasma5-kinfocenter/Makefile  
 M  +23 -23sysutils/plasma5-kinfocenter/pkg-plist  
 M  +0 -3  sysutils/plasma5-kmenuedit/Makefile  
 M  +34 -34sysutils/plasma5-kmenuedit/pkg-plist  
 M  +1 -1  sysutils/plasma5-ksysguard/Makefile  
 M  +18 -18sysutils/plasma5-ksysguard/pkg-plist  
 M  +0 -3  sysutils/plasma5-powerdevil/Makefile  
 M  +5 -5  sysutils/plasma5-powerdevil/pkg-plist  
 M  +0 -3  sysutils/plasma5-systemsettings/Makefile  
 M  +16 -16sysutils/plasma5-systemsettings/pkg-plist  
 M  +0 -3  www/kf5-kjs/Makefile  
 M  +0 -3  www/kf5-kjsembed/Makefile  
 M  +0 -3  x11-toolkits/kf5-kconfigwidgets/Makefile  
 M  +0 -3  x11-toolkits/kf5-kdesignerplugin/Makefile  
 M  +0 -3  x11-wm/plasma5-kwin/Makefile  
 M  +60 -60x11-wm/plasma5-kwin/pkg-plist  
 M  +0 -3  x11/kf5-kded/Makefile  
 M  +0 -3  x11/kf5-kdelibs4support/Makefile  
 M  +40 -40x11/kf5-kdelibs4support/pkg-plist  
 M  +0 -3  x11/kf5-kinit/Makefile  
 M  +0 -3  x11/kf5-plasma-framework/Makefile  
 M  +0 -3  x11/plasma5-kgamma5/Makefile  
 M  +2 -2  x11/plasma5-kgamma5/pkg-plist  
 M  +0 -3  x11/plasma5-kscreen/Makefile  
 M  +1 -1  x11/plasma5-plasma-desktop/Makefile  
 M  +256 -256  x11/plasma5-plasma-desktop/pkg-plist  
 M  +1 -1  x11/plasma5-plasma-workspace/Makefile  
 M  +15 -15x11/plasma5-plasma-workspace/pkg-plist  

[Bug 211832] net/qt5-network: fix build with LibreSSL

[bugzilla-noreply]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=211832

Tobias Kortkamp  changed:

   What|Removed |Added

 CC||t...@tobik.me

--- Comment #1 from Tobias Kortkamp  ---
Also see https://github.com/libressl-portable/openbsd/issues/33
and
http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/x11/qt5/patches/patch-qtbase_src_network_ssl_qsslcontext_openssl_cpp?rev=1.1=text/x-cvsweb-markup

-- 
You are receiving this mail because:
You are the assignee for the bug.