dhcpcd-qt: Switch to Qt5

10 files changed, 140 insertions, 9 deletions

diff --git a/net/dhcpcd-qt/Makefile b/net/dhcpcd-qt/Makefile
index 02e98e7739b..a2238bc4b26 100644
--- a/net/dhcpcd-qt/Makefile
+++ b/net/dhcpcd-qt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2018/03/12 11:17:18 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2019/10/29 12:39:13 kamil Exp $
 #
 
 PKGNAME=		dhcpcd-qt-${DHCPCD_UI_VERSION}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		net
 
 COMMENT=		Qt system tray monitor for dhcpcd
@@ -14,15 +14,11 @@ DEPENDS+=	dhcpcd-icons>=${DHCPCD_UI_VERSION}:../../net/dhcpcd-icons
 
 USE_LANGUAGES=		c99 c++
 CONFIGURE_ARGS+=	--with-qt
-# Until I can get KDE4 to install...
 CONFIGURE_ARGS+=	--disable-notification
 
 INSTALL_MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR:Q}
 
-BUILDLINK_DEPMETHOD.qt4-tools=	build
-
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/qt4-libs/buildlink3.mk"
-.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/dhcpcd-qt/PLIST b/net/dhcpcd-qt/PLIST
index 55bd3e214e0..b2932c71af8 100644
--- a/net/dhcpcd-qt/PLIST
+++ b/net/dhcpcd-qt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2014/10/06 19:46:59 roy Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/10/29 12:39:13 kamil Exp $
 bin/dhcpcd-qt
 man/man8/dhcpcd-qt.8
 share/applications/dhcpcd-qt.desktop
diff --git a/net/dhcpcd-qt/distinfo b/net/dhcpcd-qt/distinfo
index fa8a950f4e0..ce137a5ed82 100644
--- a/net/dhcpcd-qt/distinfo
+++ b/net/dhcpcd-qt/distinfo
@@ -1,6 +1,13 @@
-$NetBSD: distinfo,v 1.5 2015/11/04 00:34:57 agc Exp $
+$NetBSD: distinfo,v 1.6 2019/10/29 12:39:13 kamil Exp $
 
 SHA1 (dhcpcd-ui-0.7.5.tar.bz2) = 53a3f97043cd713f776970369fff0dcc3c3e8b89
 RMD160 (dhcpcd-ui-0.7.5.tar.bz2) = 85e279a85e9e141baff39f3db694a7d2dea6e461
 SHA512 (dhcpcd-ui-0.7.5.tar.bz2) = 78dba758f7cee825a1618c33b1fff9549c4e51e19fd5eebd1ae5d6a4686726ec8ad86dc1ec5384238b43589dd700979c694f48bc94e2844f1ef898292660a5d2
 Size (dhcpcd-ui-0.7.5.tar.bz2) = 209112 bytes
+SHA1 (patch-src_dhcpcd-qt_dhcpcd-preferences.cpp) = 6e60649922e10ab824199bbe83b20124f2c80e21
+SHA1 (patch-src_dhcpcd-qt_dhcpcd-qt.cpp) = f150d562cc95ebe2d76a484172517c4f6522052a
+SHA1 (patch-src_dhcpcd-qt_dhcpcd-qt.pro) = 6771c20993d6a9ba44d6132477d235919b848659
+SHA1 (patch-src_dhcpcd-qt_dhcpcd-ssid.cpp) = 7f6482362409057e76b9261510d275317e91c2a8
+SHA1 (patch-src_dhcpcd-qt_dhcpcd-ssidmenuwidget.cpp) = a0938125446fc85135d38cab6db68d089dd9de30
+SHA1 (patch-src_dhcpcd-qt_dhcpcd-wi.cpp) = f012b24528228c40465fd74a96b39a4fa845b144
+SHA1 (patch-src_dhcpcd-qt_main.cpp) = dc78ddf047f0c46f37517e59326aadb457137d4c
diff --git a/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-preferences.cpp b/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-preferences.cpp
new file mode 100644
index 00000000000..43c4dbbf204
--- /dev/null
+++ b/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-preferences.cpp
@@ -0,0 +1,37 @@
+$NetBSD: patch-src_dhcpcd-qt_dhcpcd-preferences.cpp,v 1.1 2019/10/29 12:39:13 kamil Exp $
+
+Port to Qt5.
+
+--- src/dhcpcd-qt/dhcpcd-preferences.cpp.orig	2015-01-07 09:18:28.000000000 +0000
++++ src/dhcpcd-qt/dhcpcd-preferences.cpp
+@@ -182,10 +182,10 @@ void DhcpcdPreferences::listBlocks(const
+ 	blocks->disconnect(this);
+ 
+ 	free(eWhat);
+-	eWhat = strdup(txt.toLower().toAscii());
++	eWhat = strdup(txt.toLower().toLatin1());
+ 
+ 	list = dhcpcd_config_blocks(parent->getConnection(),
+-	    txt.toLower().toAscii());
++	    txt.toLower().toLatin1());
+ 
+ 	if (txt == "interface") {
+ 		char **ifaces, **i;
+@@ -294,7 +294,7 @@ const char *DhcpcdPreferences::getString
+ {
+ 	if (le->text().isEmpty())
+ 		return NULL;
+-	return le->text().trimmed().toAscii();
++	return le->text().trimmed().toLatin1();
+ }
+ 
+ bool DhcpcdPreferences::setOption(const char *opt, const char *val, bool *ret)
+@@ -405,7 +405,7 @@ void DhcpcdPreferences::showBlock(const 
+ 	if (txt.isEmpty())
+ 		eBlock = NULL;
+ 	else
+-		eBlock = strdup(txt.toAscii());
++		eBlock = strdup(txt.toLatin1());
+ 
+ 	dhcpcd_config_free(config);
+ 	iface = NULL;
diff --git a/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-qt.cpp b/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-qt.cpp
new file mode 100644
index 00000000000..0c726024ff4
--- /dev/null
+++ b/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-qt.cpp
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_dhcpcd-qt_dhcpcd-qt.cpp,v 1.1 2019/10/29 12:39:13 kamil Exp $
+
+Port to Qt5.
+
+--- src/dhcpcd-qt/dhcpcd-qt.cpp.orig	2015-01-07 09:18:28.000000000 +0000
++++ src/dhcpcd-qt/dhcpcd-qt.cpp
+@@ -226,9 +226,9 @@ void DhcpcdQt::updateOnline(bool showIf)
+ 			if (showIf)
+ 				qDebug() << msg;
+ 			if (msgs.isEmpty())
+-				msgs = QString::fromAscii(msg);
++				msgs = QString::fromLatin1(msg);
+ 			else
+-				msgs += '\n' + QString::fromAscii(msg);
++				msgs += '\n' + QString::fromLatin1(msg);
+ 			free(msg);
+ 		} else if (showIf)
+ 			qDebug() << i->ifname << i->reason;
diff --git a/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-qt.pro b/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-qt.pro
new file mode 100644
index 00000000000..b374ac5ea79
--- /dev/null
+++ b/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-qt.pro
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_dhcpcd-qt_dhcpcd-qt.pro,v 1.1 2019/10/29 12:39:13 kamil Exp $
+
+Port to Qt5.
+
+--- src/dhcpcd-qt/dhcpcd-qt.pro.orig	2015-01-07 09:18:28.000000000 +0000
++++ src/dhcpcd-qt/dhcpcd-qt.pro
+@@ -1,5 +1,6 @@
+ CONFIG+=		qt gui c++11 debug
+ QMAKE_CXXFLAGS+=	-std=c++11 -O2
++QT+=			core gui widgets
+ 
+ HEADERS=		dhcpcd-qt.h dhcpcd-about.h dhcpcd-preferences.h \
+ 			dhcpcd-wi.h dhcpcd-ifmenu.h \
diff --git a/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-ssid.cpp b/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-ssid.cpp
new file mode 100644
index 00000000000..ea197abb0e7
--- /dev/null
+++ b/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-ssid.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_dhcpcd-qt_dhcpcd-ssid.cpp,v 1.1 2019/10/29 12:39:13 kamil Exp $
+
+Fix compiler warning.
+
+--- src/dhcpcd-qt/dhcpcd-ssid.cpp.orig	2015-01-07 09:18:28.000000000 +0000
++++ src/dhcpcd-qt/dhcpcd-ssid.cpp
+@@ -74,8 +74,6 @@ DhcpcdSsid::DhcpcdSsid(DhcpcdWi *parent,
+ 
+ QString DhcpcdSsid::getPsk(bool *ok)
+ {
+-	int r;
+-
+ 	exec();
+ 	if (result() == QDialog::Rejected) {
+ 		if (ok)
diff --git a/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-ssidmenuwidget.cpp b/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-ssidmenuwidget.cpp
new file mode 100644
index 00000000000..9f9513fccd7
--- /dev/null
+++ b/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-ssidmenuwidget.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_dhcpcd-qt_dhcpcd-ssidmenuwidget.cpp,v 1.1 2019/10/29 12:39:13 kamil Exp $
+
+Port to Qt5.
+
+--- src/dhcpcd-qt/dhcpcd-ssidmenuwidget.cpp.orig	2015-01-07 09:18:28.000000000 +0000
++++ src/dhcpcd-qt/dhcpcd-ssidmenuwidget.cpp
+@@ -115,7 +115,8 @@ void DhcpcdSsidMenuWidget::setScan(DHCPC
+ 		selicon->setPixmap(picon);
+ 		ssid->setStyleSheet("font:bold;");
+ 	} else {
+-		selicon->setPixmap(NULL);
++		QPixmap		emptyPixmap;
++		selicon->setPixmap(emptyPixmap);
+ 		ssid->setStyleSheet(NULL);
+ 	}
+ 	ssid->setText(scan->ssid);
diff --git a/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-wi.cpp b/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-wi.cpp
new file mode 100644
index 00000000000..6cb5dade48e
--- /dev/null
+++ b/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-wi.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_dhcpcd-qt_dhcpcd-wi.cpp,v 1.1 2019/10/29 12:39:13 kamil Exp $
+
+Port to Qt5.
+
+--- src/dhcpcd-qt/dhcpcd-wi.cpp.orig	2015-01-07 09:18:28.000000000 +0000
++++ src/dhcpcd-qt/dhcpcd-wi.cpp
+@@ -300,7 +300,7 @@ void DhcpcdWi::connectSsid(DHCPCD_WI_SCA
+ 		if (pwd.isNull() || pwd.isEmpty())
+ 			err = dhcpcd_wpa_select(wpa, &s);
+ 		else
+-			err = dhcpcd_wpa_configure(wpa, &s, pwd.toAscii());
++			err = dhcpcd_wpa_configure(wpa, &s, pwd.toLatin1());
+ 	} else
+ 		err = dhcpcd_wpa_configure(wpa, &s, NULL);
+ 
diff --git a/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_main.cpp b/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_main.cpp
new file mode 100644
index 00000000000..035835dc54d
--- /dev/null
+++ b/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_main.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_dhcpcd-qt_main.cpp,v 1.1 2019/10/29 12:39:13 kamil Exp $
+
+Port to Qt5.
+
+--- src/dhcpcd-qt/main.cpp.orig	2015-01-07 09:18:28.000000000 +0000
++++ src/dhcpcd-qt/main.cpp
+@@ -24,6 +24,7 @@
+  * SUCH DAMAGE.
+  */
+ 
++#include <QApplication>
+ #include <QtGui>
+ 
+ #include "dhcpcd-qt.h"