CVS commit: [pkgsrc-2017Q1] pkgsrc/x11/qt5-qtbase

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Tue Apr 25 18:29:40 UTC 2017

Modified Files:
        pkgsrc/x11/qt5-qtbase [pkgsrc-2017Q1]: Makefile distinfo
Added Files:
        pkgsrc/x11/qt5-qtbase/patches [pkgsrc-2017Q1]:
            patch-src_corelib_thread_qwaitcondition__unix.cpp

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.41.2.1 pkgsrc/x11/qt5-qtbase/Makefile
cvs rdiff -u -r1.31 -r1.31.4.1 pkgsrc/x11/qt5-qtbase/distinfo
cvs rdiff -u -r0 -r1.1.2.2 \
    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.

Modified files:

Index: pkgsrc/x11/qt5-qtbase/Makefile
diff -u pkgsrc/x11/qt5-qtbase/Makefile:1.41 pkgsrc/x11/qt5-qtbase/Makefile:1.41.2.1
--- pkgsrc/x11/qt5-qtbase/Makefile:1.41 Sun Feb 12 06:24:57 2017
+++ pkgsrc/x11/qt5-qtbase/Makefile      Tue Apr 25 18:29:40 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2017/02/12 06:24:57 ryoon Exp $
+# $NetBSD: Makefile,v 1.41.2.1 2017/04/25 18:29:40 bsiegert Exp $
 
 DISTNAME=      qtbase-opensource-src-${QTVERSION}
 PKGNAME=       qt5-qtbase-${QTVERSION}
@@ -97,6 +97,7 @@ LDFLAGS+=             -ldl
 .  if exists(/usr/lib/libexecinfo.so)
 LDFLAGS+=              -lexecinfo
 .  endif
+LDFLAGS.FreeBSD+=      -lutil
 .endif
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
 LDFLAGS+=              -lkvm   # see patch-src_corelib_io_qlockfile__unix.cpp

Index: pkgsrc/x11/qt5-qtbase/distinfo
diff -u pkgsrc/x11/qt5-qtbase/distinfo:1.31 pkgsrc/x11/qt5-qtbase/distinfo:1.31.4.1
--- pkgsrc/x11/qt5-qtbase/distinfo:1.31 Sun Dec  4 21:46:54 2016
+++ pkgsrc/x11/qt5-qtbase/distinfo      Tue Apr 25 18:29:40 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2016/12/04 21:46:54 marino Exp $
+$NetBSD: distinfo,v 1.31.4.1 2017/04/25 18:29:40 bsiegert 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.2.2
--- /dev/null   Tue Apr 25 18:29:40 2017
+++ pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_thread_qwaitcondition__unix.cpp     Tue Apr 25 18:29:40 2017
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_corelib_thread_qwaitcondition__unix.cpp,v 1.1.2.2 2017/04/25 18:29:40 bsiegert 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 <errno.h>
+ #include <sys/time.h>
++#include <sys/param.h>
+ #include <time.h>
+ 
+ #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