head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.80 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.78 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.76 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.74 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.72 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.70 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.68 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.66 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.64 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.62 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.60 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.58 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.56 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.54 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.52 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.50 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.48 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.46 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.44 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.42 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.40 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.38 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.36 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.32 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.12 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.34 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.30 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.28 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.26 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.24 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.22 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.20 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.18 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.16 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.14 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.10 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.8 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.6 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.4 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.2 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.1.0.8 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.6 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.4 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.2 pkgsrc-2015Q2-base:1.1; locks; strict; comment @// @; 1.3 date 2016.05.31.21.35.11; author joerg; state Exp; branches; next 1.2; commitid 3BNPCOOKWbssgG8z; 1.2 date 2016.05.05.22.04.34; author joerg; state Exp; branches; next 1.1; commitid 8nmB0J1LzhiEel5z; 1.1 date 2015.06.25.08.02.25; author joerg; state Exp; branches 1.1.8.1; next ; commitid RQF9zBmKXW1iJMqy; 1.1.8.1 date 2016.05.07.19.25.22; author bsiegert; state Exp; branches; next ; commitid 7CK1aZTvVPpYjA5z; desc @@ 1.3 log @Do not destroy the pthread keys. It creates race conditions during destruction and random panics as side effect. @ text @$NetBSD: patch-src_corelib_thread_qthread__unix.cpp,v 1.2 2016/05/05 22:04:34 joerg Exp $ --- src/corelib/thread/qthread_unix.cpp.orig 2015-05-07 14:14:48.000000000 +0000 +++ src/corelib/thread/qthread_unix.cpp @@@@ -120,6 +120,12 @@@@ enum { ThreadPriorityResetFlag = 0x80000 #if defined(Q_CC_XLC) || defined (Q_CC_SUN) #define HAVE_TLS #endif +#if defined(Q_OS_NETBSD) +#include +#if defined(__HAVE_TLS_VARIANT_I) || defined(__HAVE_TLS_VARIANT_II) +#define HAVE_TLS +#endif +#endif #ifdef HAVE_TLS static __thread QThreadData *currentThreadData = 0; @@@@ -167,20 +173,6 @@@@ static void create_current_thread_data_k pthread_key_create(¤t_thread_data_key, destroy_current_thread_data); } -static void destroy_current_thread_data_key() -{ - pthread_once(¤t_thread_data_once, create_current_thread_data_key); - pthread_key_delete(current_thread_data_key); - - // Reset current_thread_data_once in case we end up recreating - // the thread-data in the rare case of QObject construction - // after destroying the QThreadData. - pthread_once_t pthread_once_init = PTHREAD_ONCE_INIT; - current_thread_data_once = pthread_once_init; -} -Q_DESTRUCTOR_FUNCTION(destroy_current_thread_data_key) - - // Utility functions for getting, setting and clearing thread specific data. static QThreadData *get_thread_data() { @ 1.2 log @Fix TLS condition on NetBSD to correctly avoid using pthread_specific. Bump revision. @ text @d1 1 a1 1 $NetBSD: patch-src_corelib_thread_qthread__unix.cpp,v 1.1 2015/06/25 08:02:25 joerg Exp $ d3 1 a3 1 --- src/corelib/thread/qthread_unix.cpp.orig 2015-06-23 15:32:25.000000000 +0000 d18 21 @ 1.1 log @For NetBSD, use TLS if available. Fixes rare asserts in automoc4 on exit. Bump revision. @ text @d1 1 a1 1 $NetBSD$ d11 1 a11 1 +#if defined(__HAVE_TLS) @ 1.1.8.1 log @Pullup ticket #4969 - requested by joerg x11/qt4-libs: bugfix Revisions pulled up: - x11/qt4-libs/Makefile 1.111 - x11/qt4-libs/distinfo 1.107 - x11/qt4-libs/patches/patch-src_corelib_thread_qthread__unix.cpp 1.2 --- Module Name: pkgsrc Committed By: joerg Date: Thu May 5 22:04:34 UTC 2016 Modified Files: pkgsrc/x11/qt4-libs: Makefile distinfo pkgsrc/x11/qt4-libs/patches: patch-src_corelib_thread_qthread__unix.cpp Log Message: Fix TLS condition on NetBSD to correctly avoid using pthread_specific. Bump revision. @ text @d11 1 a11 1 +#if defined(__HAVE_TLS_VARIANT_I) || defined(__HAVE_TLS_VARIANT_II) @