From owner-svn-ports-all@FreeBSD.ORG Thu Jan 29 02:11:01 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B496E67D; Thu, 29 Jan 2015 02:11:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 865A6941; Thu, 29 Jan 2015 02:11:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0T2B1Yr006280; Thu, 29 Jan 2015 02:11:01 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0T2B1Ew006274; Thu, 29 Jan 2015 02:11:01 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201501290211.t0T2B1Ew006274@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Thu, 29 Jan 2015 02:11:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r378099 - in head/lang/qt5-qml: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Jan 2015 02:11:01 -0000 Author: rakuco Date: Thu Jan 29 02:11:00 2015 New Revision: 378099 URL: https://svnweb.freebsd.org/changeset/ports/378099 QAT: https://qat.redports.org/buildarchive/r378099/ Log: Add upstream commit to fix a crash in devel/qtcreator. PR: 197079 Submitted by: Alex Richardson Added: head/lang/qt5-qml/files/patch-git_cf6e9711 (contents, props changed) Modified: head/lang/qt5-qml/Makefile Modified: head/lang/qt5-qml/Makefile ============================================================================== --- head/lang/qt5-qml/Makefile Thu Jan 29 02:03:09 2015 (r378098) +++ head/lang/qt5-qml/Makefile Thu Jan 29 02:11:00 2015 (r378099) @@ -2,6 +2,7 @@ PORTNAME= qml DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= lang PKGNAMEPREFIX= qt5- Added: head/lang/qt5-qml/files/patch-git_cf6e9711 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/qt5-qml/files/patch-git_cf6e9711 Thu Jan 29 02:11:00 2015 (r378099) @@ -0,0 +1,26 @@ +commit cf6e97119df5bf17b4a952b257d05d43b7d6ca26 +Author: Alex Richardson +Date: Wed Jan 21 09:10:01 2015 +0000 + + Don't crash on FreeBSD when computing stack limits + + On FreeBSD pthread_attr_t is a pointer and is dereferenced when calling + pthread_attr_get_np() so if we don't initialize it will probably crash. + This is not a problem on glibc systems since there pthread_attr_t is an + opaque union an doesn't need to be allocated using malloc(). + + Change-Id: I227685ddf9981974ade08aee8917f7262c301787 + Reviewed-by: Simon Hausmann + +--- src/qml/jsruntime/qv4engine.cpp ++++ src/qml/jsruntime/qv4engine.cpp +@@ -112,7 +112,8 @@ quintptr getStackLimit() + void* stackBottom = 0; + pthread_attr_t attr; + #if HAVE(PTHREAD_NP_H) && OS(FREEBSD) +- if (pthread_attr_get_np(pthread_self(), &attr) == 0) { ++ // on FreeBSD pthread_attr_init() must be called otherwise getting the attrs crashes ++ if (pthread_attr_init(&attr) == 0 && pthread_attr_get_np(pthread_self(), &attr) == 0) { + #else + if (pthread_getattr_np(pthread_self(), &attr) == 0) { + #endif