head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.60 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.58 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.56 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.54 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.52 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.50 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.48 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.46 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.44 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.42 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.40 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.38 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.36 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.34 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.32 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.30 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.28 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.26 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.24 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.22 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.20 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.18 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.16 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.14 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.10 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.12 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.8 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.6 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.4 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.2 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.2.0.6 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.4 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.2 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.1.0.10 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.8 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.4 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.2; locks; strict; comment @// @; 1.3 date 2018.12.18.09.57.18; author adam; state Exp; branches; next 1.2; commitid 5krex6Do2TLDtg4B; 1.2 date 2018.01.17.19.30.47; author markd; state Exp; branches; next 1.1; commitid spdRQpEmKELRpgnA; 1.1 date 2017.04.24.12.27.58; author maya; state Exp; branches 1.1.2.1; next ; commitid CzRmG3cV8sAVGMOz; 1.1.2.1 date 2017.04.24.12.27.58; author bsiegert; state dead; branches; next 1.1.2.2; commitid Xv5VLGNJIiDnFWOz; 1.1.2.2 date 2017.04.25.18.29.40; author bsiegert; state Exp; branches; next ; commitid Xv5VLGNJIiDnFWOz; desc @@ 1.3 log @qt5: updated to 5.12.0 Just in time for the end of the year, we have released Qt 5.12 LTS today. This is a long-term-supported (LTS) release that we will support for 3 years to come. We have had a strong focus on quality and fixed more than 2000 bugs since the last Qt LTS version, Qt 5.9.7 – make that over 5000 bugfixes since Qt 5.6.3. Of course, this is only the start, and we will work hard on continuously improving the quality of Qt 5.12 in upcoming patches @ text @$NetBSD: patch-src_corelib_thread_qwaitcondition__unix.cpp,v 1.2 2018/01/17 19:30:47 markd Exp $ On NetBSD before 6.1, do not use pthread_condattr_setclock(). --- src/corelib/thread/qwaitcondition_unix.cpp.orig 2018-12-03 11:15:26.000000000 +0000 +++ src/corelib/thread/qwaitcondition_unix.cpp @@@@ -54,6 +54,7 @@@@ #include #include +#include #include QT_BEGIN_NAMESPACE @@@@ -84,7 +85,7 @@@@ void qt_initialize_pthread_cond(pthread_ #if defined(Q_OS_ANDROID) if (local_condattr_setclock && QElapsedTimer::clockType() == QElapsedTimer::MonotonicClock) local_condattr_setclock(&condattr, CLOCK_MONOTONIC); -#elif !defined(Q_OS_MAC) +#elif !defined(Q_OS_MAC) && !(defined(Q_OS_NETBSD) && (__NetBSD_Version__ < 600010000)) if (QElapsedTimer::clockType() == QElapsedTimer::MonotonicClock) pthread_condattr_setclock(&condattr, CLOCK_MONOTONIC); #endif @ 1.2 log @qt5: update to 5.10.0 2+ years worth of bug fixes and feature enhancements @ text @d1 1 a1 1 $NetBSD: patch-src_corelib_thread_qwaitcondition__unix.cpp,v 1.1 2017/04/24 12:27:58 maya Exp $ d5 1 a5 1 --- src/corelib/thread/qwaitcondition_unix.cpp.orig 2017-05-26 12:43:31.000000000 +0000 d7 1 a7 1 @@@@ -52,6 +52,7 @@@@ d14 1 a14 1 #ifndef QT_NO_THREAD @ 1.1 log @qt5-qtbase: fix build on NetBSD < 6.1 (no pthread_condattr_setclock) Invert logic from !defined && to defined || for simplicity and use a netbsd version check. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 2 don't have pthread_condattr_setclock on NetBSD < 6.1, don't use it. d5 1 a5 1 --- src/corelib/thread/qwaitcondition_unix.cpp.orig 2015-10-13 04:35:30.000000000 +0000 d7 1 a7 1 @@@@ -45,6 +45,7 @@@@ d15 1 a15 1 @@@@ -77,7 +78,10 @@@@ void qt_initialize_pthread_cond(pthread_ d19 2 a20 5 -#elif !defined(Q_OS_MAC) && !defined(Q_OS_HAIKU) +#elif (defined(Q_OS_NETBSD) && (__NetBSD_Version__ < 600010000)) || \ + defined(Q_OS_MAC) || defined(Q_OS_HAIKU) + /* nothing, don't have pthread_condattr_setclock */ +#else @ 1.1.2.1 log @file patch-src_corelib_thread_qwaitcondition__unix.cpp was added on branch pkgsrc-2017Q1 on 2017-04-25 18:29:40 +0000 @ text @d1 27 @ 1.1.2.2 log @Pullup ticket #5335 - requested by maya x11/qt5-qtbase: build fix Revisions pulled up: - x11/qt5-qtbase/Makefile 1.42 - x11/qt5-qtbase/distinfo 1.32 - x11/qt5-qtbase/patches/patch-src_corelib_thread_qwaitcondition__unix.cpp 1.1 --- Module Name: pkgsrc Committed By: maya Date: Thu Apr 20 18:38:09 UTC 2017 Modified Files: pkgsrc/x11/qt5-qtbase: Makefile Log Message: qt5-qtbase: FreeBSD needs -lutil PR pkg/52181 from Santhosh Raju --- Module Name: pkgsrc Committed By: maya Date: Mon Apr 24 12:27:59 UTC 2017 Modified Files: pkgsrc/x11/qt5-qtbase: distinfo Added Files: pkgsrc/x11/qt5-qtbase/patches: patch-src_corelib_thread_qwaitcondition__unix.cpp Log Message: qt5-qtbase: fix build on NetBSD < 6.1 (no pthread_condattr_setclock) Invert logic from !defined && to defined || for simplicity and use a netbsd version check. @ text @a0 27 $NetBSD: patch-src_corelib_thread_qwaitcondition__unix.cpp,v 1.1 2017/04/24 12:27:58 maya Exp $ don't have pthread_condattr_setclock on NetBSD < 6.1, don't use it. --- src/corelib/thread/qwaitcondition_unix.cpp.orig 2015-10-13 04:35:30.000000000 +0000 +++ src/corelib/thread/qwaitcondition_unix.cpp @@@@ -45,6 +45,7 @@@@ #include #include +#include #include #ifndef QT_NO_THREAD @@@@ -77,7 +78,10 @@@@ void qt_initialize_pthread_cond(pthread_ #if defined(Q_OS_ANDROID) if (local_condattr_setclock && QElapsedTimer::clockType() == QElapsedTimer::MonotonicClock) local_condattr_setclock(&condattr, CLOCK_MONOTONIC); -#elif !defined(Q_OS_MAC) && !defined(Q_OS_HAIKU) +#elif (defined(Q_OS_NETBSD) && (__NetBSD_Version__ < 600010000)) || \ + defined(Q_OS_MAC) || defined(Q_OS_HAIKU) + /* nothing, don't have pthread_condattr_setclock */ +#else if (QElapsedTimer::clockType() == QElapsedTimer::MonotonicClock) pthread_condattr_setclock(&condattr, CLOCK_MONOTONIC); #endif @