Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 64E817A1B9 for ; Mon, 24 Apr 2017 12:28:00 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 1195484DD9; Mon, 24 Apr 2017 12:28:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9416C84CD8 for ; Mon, 24 Apr 2017 12:27:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id Jgkyz655ncOQ for ; Mon, 24 Apr 2017 12:27:59 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 1A5D584DD4 for ; Mon, 24 Apr 2017 12:27:59 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 15B1DFBE4; Mon, 24 Apr 2017 12:27:59 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_149303687929110" MIME-Version: 1.0 Date: Mon, 24 Apr 2017 12:27:59 +0000 From: "Maya Rashish" Subject: CVS commit: pkgsrc/x11/qt5-qtbase To: pkgsrc-changes@NetBSD.org Reply-To: maya@netbsd.org X-Mailer: log_accum Message-Id: <20170424122759.15B1DFBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_149303687929110 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 pkgsrc/x11/qt5-qtbase/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_thread_qwaitcondition__unix.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_149303687929110 Content-Disposition: inline Content-Length: 2765 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/qt5-qtbase/distinfo diff -u pkgsrc/x11/qt5-qtbase/distinfo:1.31 pkgsrc/x11/qt5-qtbase/distinfo:1.32 --- pkgsrc/x11/qt5-qtbase/distinfo:1.31 Sun Dec 4 21:46:54 2016 +++ pkgsrc/x11/qt5-qtbase/distinfo Mon Apr 24 12:27:58 2017 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.31 2016/12/04 21:46:54 marino Exp $ +$NetBSD: distinfo,v 1.32 2017/04/24 12:27:58 maya Exp $ SHA1 (qtbase-opensource-src-5.5.1.tar.xz) = 0b651543fa013ae151b7a11f0d0dee092050aa3f RMD160 (qtbase-opensource-src-5.5.1.tar.xz) = ce4bccd0703aaf8d904fbecd1f334ef13d698a44 @@ -23,6 +23,7 @@ SHA1 (patch-src_corelib_io_io.pri) = 9a5 SHA1 (patch-src_corelib_io_qlockfile__unix.cpp) = f07812f0867bd04dfdea736847a668843a5fe646 SHA1 (patch-src_corelib_io_qstandardpaths_unix.cpp) = de4b6c6be89524763e40698bcf5e8f413abdb938 SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 688de65bf3364cb8c982a7f82c9b67f5ecbebd10 +SHA1 (patch-src_corelib_thread_qwaitcondition__unix.cpp) = 331c3ced6554da7164a6927b0d8052447ae804d0 SHA1 (patch-src_network_kernel_qhostinfo__unix.cpp) = 0335273353daa7c980ccb4febb6eed11b452e50d SHA1 (patch-src_openglextensions_openglextensions.pro) = e79effc1433ddda744b79d7e1f47764fee406580 SHA1 (patch-src_platformsupport_devicediscovery_devicediscovery.pri) = 2cd24768b41c813d0aee0943f97f913308794611 Added files: Index: pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_thread_qwaitcondition__unix.cpp diff -u /dev/null pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_thread_qwaitcondition__unix.cpp:1.1 --- /dev/null Mon Apr 24 12:27:59 2017 +++ pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_thread_qwaitcondition__unix.cpp Mon Apr 24 12:27:58 2017 @@ -0,0 +1,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 --_----------=_149303687929110--