Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Dec 2018 20:43:00 +0000 (UTC)
From:      Adriaan de Groot <adridg@FreeBSD.org>
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
Message-ID:  <201812242043.wBOKh0gL003893@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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<QNetworkInterfacePrivate *> createInterfaces(ifaddrs *rawList)
  {
      QList<QNetworkInterfacePrivate *> 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<QNetworkInterfacePrivate *>
+@@ -500,13 +501,21 @@ static QList<QNetworkInterfacePrivate *>
              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<QNetworkInterfacePrivate *>
+@@ -605,7 +614,7 @@ static QList<QNetworkInterfacePrivate *>
  {
      QList<QNetworkInterfacePrivate *> interfaces;
  



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812242043.wBOKh0gL003893>