diff options
| author | joerg <joerg@pkgsrc.org> | 2015-06-25 08:02:25 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2015-06-25 08:02:25 +0000 |
| commit | 9446bf7d0e21aee6eb4e87a30d5dfc5af5b6f62f (patch) | |
| tree | 381cb74d5770d5c5cf585a7d976376aef82fc772 /x11 | |
| parent | 6898cc101e06b96b3ad179b127258333fa19a229 (diff) | |
| download | pkgsrc-9446bf7d0e21aee6eb4e87a30d5dfc5af5b6f62f.tar.gz | |
For NetBSD, use TLS if available. Fixes rare asserts in automoc4 on
exit. Bump revision.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/qt4-libs/Makefile | 4 | ||||
| -rw-r--r-- | x11/qt4-libs/distinfo | 3 | ||||
| -rw-r--r-- | x11/qt4-libs/patches/patch-src_corelib_thread_qthread__unix.cpp | 17 |
3 files changed, 21 insertions, 3 deletions
diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile index 3376f38c0c5..f3d3dfc4051 100644 --- a/x11/qt4-libs/Makefile +++ b/x11/qt4-libs/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.105 2015/05/27 21:36:02 wiz Exp $ +# $NetBSD: Makefile,v 1.106 2015/06/25 08:02:25 joerg Exp $ PKGNAME= qt4-libs-${QTVERSION} -PKGREVISION= 6 +PKGREVISION= 7 COMMENT= C++ X GUI toolkit .include "../../x11/qt4-libs/Makefile.common" diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo index d3f1c177a85..5bdd550493d 100644 --- a/x11/qt4-libs/distinfo +++ b/x11/qt4-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.98 2015/03/24 21:43:52 bsiegert Exp $ +$NetBSD: distinfo,v 1.99 2015/06/25 08:02:25 joerg Exp $ SHA1 (qt-everywhere-opensource-src-4.8.6.tar.gz) = ddf9c20ca8309a116e0466c42984238009525da6 RMD160 (qt-everywhere-opensource-src-4.8.6.tar.gz) = 0220d4e76ac761c9ecfb8ddab6f2c1dc6ad70c33 @@ -69,6 +69,7 @@ SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_filters_arm_FEL SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_qt_PlatformKeyboardEventQt.cpp) = b28cf71983f8e71b82b1c634a10b3898ca13ede5 SHA1 (patch-src_corelib_io_io.pri) = cde98927b524c92fae1e053c2359e77bde2c240a SHA1 (patch-src_corelib_io_qfilesystemwatcher.cpp) = bb16b95d20286b1aa069dc25843d7e0067cc0268 +SHA1 (patch-src_corelib_thread_qthread__unix.cpp) = 1d2104fb43f6789729b5bb88191fa5fa4d4184b1 SHA1 (patch-src_gui_image_qbmphandler.cpp) = efe717ee805f808dc8a1ce7c56b3872bc3d75f69 SHA1 (patch-src_gui_kernel_qcocoaapplicationdelegate__mac.mm) = 0caa9b006b3ffee4ab747fca9fd224c7c49211c9 SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = 3ad682b86d2e9bd2b282caa298508dc3e9dd8566 diff --git a/x11/qt4-libs/patches/patch-src_corelib_thread_qthread__unix.cpp b/x11/qt4-libs/patches/patch-src_corelib_thread_qthread__unix.cpp new file mode 100644 index 00000000000..c6c1b8b7e09 --- /dev/null +++ b/x11/qt4-libs/patches/patch-src_corelib_thread_qthread__unix.cpp @@ -0,0 +1,17 @@ +$NetBSD: patch-src_corelib_thread_qthread__unix.cpp,v 1.1 2015/06/25 08:02:25 joerg Exp $ + +--- src/corelib/thread/qthread_unix.cpp.orig 2015-06-23 15:32:25.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 <machine/types.h> ++#if defined(__HAVE_TLS) ++#define HAVE_TLS ++#endif ++#endif + + #ifdef HAVE_TLS + static __thread QThreadData *currentThreadData = 0; |