From owner-svn-ports-all@freebsd.org Mon Dec 31 22:30:01 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A66F0141E3ED; Mon, 31 Dec 2018 22:30:01 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BCAF87FF5; Mon, 31 Dec 2018 22:30:01 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1F94D18EED; Mon, 31 Dec 2018 22:30:01 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBVMU0P6042669; Mon, 31 Dec 2018 22:30:00 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBVMU0Fl042668; Mon, 31 Dec 2018 22:30:00 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201812312230.wBVMU0Fl042668@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Mon, 31 Dec 2018 22:30:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488842 - in head/net/qt5-network: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/net/qt5-network: . files X-SVN-Commit-Revision: 488842 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4BCAF87FF5 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.964,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.998,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Mon, 31 Dec 2018 22:30:02 -0000 Author: adridg Date: Mon Dec 31 22:30:00 2018 New Revision: 488842 URL: https://svnweb.freebsd.org/changeset/ports/488842 Log: Be more defensive in Qt5Network code. It's possible, but rather unlikely, to build Qt5Network with QT_NO_NETWORKINTERFACE, and still get around to building the generic bearer. In that case, comment out the workaround that needs an interface. PR: 232784 Obtained from: Max Steciuk Modified: head/net/qt5-network/Makefile head/net/qt5-network/files/patch-src_plugins_bearer_generic_qgenericengine.cpp Modified: head/net/qt5-network/Makefile ============================================================================== --- head/net/qt5-network/Makefile Mon Dec 31 22:07:13 2018 (r488841) +++ head/net/qt5-network/Makefile Mon Dec 31 22:30:00 2018 (r488842) @@ -2,7 +2,7 @@ PORTNAME= network DISTVERSION= ${QT5_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net ipv6 PKGNAMEPREFIX= qt5- Modified: head/net/qt5-network/files/patch-src_plugins_bearer_generic_qgenericengine.cpp ============================================================================== --- head/net/qt5-network/files/patch-src_plugins_bearer_generic_qgenericengine.cpp Mon Dec 31 22:07:13 2018 (r488841) +++ head/net/qt5-network/files/patch-src_plugins_bearer_generic_qgenericengine.cpp Mon Dec 31 22:30:00 2018 (r488842) @@ -5,9 +5,9 @@ If getting the HW address succeeds, assume it's Ethern with two Ethernet cards and a vlan (all of which have a MAC reported by ifconfig). ---- src/plugins/bearer/generic/qgenericengine.cpp.orig 2018-12-03 12:15:26.000000000 +0100 -+++ src/plugins/bearer/generic/qgenericengine.cpp 2018-12-23 12:42:48.095145000 +0100 -@@ -82,7 +82,7 @@ +--- src/plugins/bearer/generic/qgenericengine.cpp.orig 2018-12-03 11:15:26 UTC ++++ src/plugins/bearer/generic/qgenericengine.cpp +@@ -82,7 +82,7 @@ using namespace ABI::Windows::Networking::Connectivity // needed as interface is used as parameter name in qGetInterfaceType #undef interface @@ -16,7 +16,7 @@ by ifconfig). #include #include #include -@@ -139,6 +139,23 @@ +@@ -139,6 +139,23 @@ static QNetworkConfiguration::BearerType qGetInterface if (result >= 0 && request.ifr_hwaddr.sa_family == ARPHRD_ETHER) return QNetworkConfiguration::BearerEthernet; @@ -40,3 +40,15 @@ by ifconfig). #elif defined(Q_OS_WINRT) ComPtr networkInfoStatics; HRESULT hr = GetActivationFactory(HString::MakeReference(RuntimeClass_Windows_Networking_Connectivity_NetworkInformation).Get(), &networkInfoStatics); +@@ -231,9 +248,11 @@ static QNetworkConfiguration::BearerType qGetInterface + QGenericEngine::QGenericEngine(QObject *parent) + : QBearerEngineImpl(parent) + { ++#ifndef QT_NO_NETWORKINTERFACE + //workaround for deadlock in __cxa_guard_acquire with webkit on macos x + //initialise the Q_GLOBAL_STATIC in same thread as the AtomicallyInitializedStatic + (void)QNetworkInterface::interfaceFromIndex(0); ++#endif + } + + QGenericEngine::~QGenericEngine()