From owner-svn-ports-all@freebsd.org Mon Dec 24 20:43: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 53A0E134E480; Mon, 24 Dec 2018 20:43: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 ECEEC6C2F3; Mon, 24 Dec 2018 20:43:00 +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 DF9B319B1; Mon, 24 Dec 2018 20:43:00 +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 wBOKh0cE003894; Mon, 24 Dec 2018 20:43:00 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBOKh0gL003893; Mon, 24 Dec 2018 20:43:00 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201812242043.wBOKh0gL003893@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Mon, 24 Dec 2018 20:43:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488281 - 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: 488281 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: ECEEC6C2F3 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.98)[-0.982,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] 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, 24 Dec 2018 20:43:01 -0000 Author: adridg Date: Mon Dec 24 20:43:00 2018 New Revision: 488281 URL: https://svnweb.freebsd.org/changeset/ports/488281 Log: Fix build of net/qt5-network on 12.0. Added note in the patch about future compatibility. Reported by: jrm Modified: head/net/qt5-network/Makefile head/net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp Modified: head/net/qt5-network/Makefile ============================================================================== --- head/net/qt5-network/Makefile Mon Dec 24 19:31:19 2018 (r488280) +++ head/net/qt5-network/Makefile Mon Dec 24 20:43:00 2018 (r488281) @@ -2,7 +2,7 @@ PORTNAME= network DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net ipv6 PKGNAMEPREFIX= qt5- Modified: head/net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp ============================================================================== --- head/net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp Mon Dec 24 19:31:19 2018 (r488280) +++ head/net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp Mon Dec 24 20:43:00 2018 (r488281) @@ -7,8 +7,9 @@ Clean up interface type and MTU detection. - In particular, don't use a union of structs passed in to ioctl(). Make them separate structs (with block scope so the compiler might place them on top of each other, that would be ok). + - IFM_FDDI (still) exists in 11.2, not in 12.0 ---- src/network/kernel/qnetworkinterface_unix.cpp.orig 2018-12-24 17:00:42 UTC +--- src/network/kernel/qnetworkinterface_unix.cpp.orig 2018-12-03 11:15:26 UTC +++ src/network/kernel/qnetworkinterface_unix.cpp @@ -419,12 +419,23 @@ QT_BEGIN_INCLUDE_NAMESPACE #endif // QT_PLATFORM_UIKIT @@ -39,7 +40,17 @@ Clean up interface type and MTU detection. static QNetworkInterface::InterfaceType probeIfType(int socket, int iftype, struct ifmediareq *req) { -@@ -477,15 +488,8 @@ static QNetworkInterface::InterfaceType +@@ -463,9 +474,6 @@ static QNetworkInterface::InterfaceType + case IFM_ETHER: + return QNetworkInterface::Ethernet; + +- case IFM_FDDI: +- return QNetworkInterface::Fddi; +- + case IFM_IEEE80211: + return QNetworkInterface::Ieee80211; + } +@@ -477,15 +485,8 @@ static QNetworkInterface::InterfaceType static QList createInterfaces(ifaddrs *rawList) { QList interfaces; @@ -57,7 +68,7 @@ Clean up interface type and MTU detection. // on NetBSD we use AF_LINK and sockaddr_dl // scan the list for that family -@@ -500,13 +504,21 @@ static QList +@@ -500,13 +501,21 @@ static QList iface->flags = convertFlags(ptr->ifa_flags); iface->hardwareAddress = iface->makeHwAddress(sdl->sdl_alen, (uchar*)LLADDR(sdl)); @@ -84,7 +95,7 @@ Clean up interface type and MTU detection. return interfaces; } -@@ -605,7 +617,7 @@ static QList +@@ -605,7 +614,7 @@ static QList { QList interfaces;