Received: by mail.netbsd.org (Postfix, from userid 605) id 65BA584E86; Tue, 29 Oct 2019 12:39:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E28B884DFB for ; Tue, 29 Oct 2019 12:39:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id EngpUl5PL97q for ; Tue, 29 Oct 2019 12:39:14 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 0865084D74 for ; Tue, 29 Oct 2019 12:39:14 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C6F46FA8E; Tue, 29 Oct 2019 12:39:13 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1572352753132020" MIME-Version: 1.0 Date: Tue, 29 Oct 2019 12:39:13 +0000 From: "Kamil Rytarowski" Subject: CVS commit: pkgsrc/net/dhcpcd-qt To: pkgsrc-changes@NetBSD.org Reply-To: kamil@netbsd.org X-Mailer: log_accum Message-Id: <20191029123913.C6F46FA8E@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1572352753132020 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: kamil Date: Tue Oct 29 12:39:13 UTC 2019 Modified Files: pkgsrc/net/dhcpcd-qt: Makefile PLIST distinfo Added Files: pkgsrc/net/dhcpcd-qt/patches: patch-src_dhcpcd-qt_dhcpcd-preferences.cpp patch-src_dhcpcd-qt_dhcpcd-qt.cpp patch-src_dhcpcd-qt_dhcpcd-qt.pro patch-src_dhcpcd-qt_dhcpcd-ssid.cpp patch-src_dhcpcd-qt_dhcpcd-ssidmenuwidget.cpp patch-src_dhcpcd-qt_dhcpcd-wi.cpp patch-src_dhcpcd-qt_main.cpp Log Message: dhcpcd-qt: Switch to Qt5 To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/dhcpcd-qt/Makefile \ pkgsrc/net/dhcpcd-qt/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/dhcpcd-qt/PLIST cvs rdiff -u -r0 -r1.1 \ pkgsrc/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-preferences.cpp \ pkgsrc/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-qt.cpp \ pkgsrc/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-qt.pro \ pkgsrc/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-ssid.cpp \ pkgsrc/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-ssidmenuwidget.cpp \ pkgsrc/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-wi.cpp \ pkgsrc/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_main.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1572352753132020 Content-Disposition: inline Content-Length: 9014 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/dhcpcd-qt/Makefile diff -u pkgsrc/net/dhcpcd-qt/Makefile:1.5 pkgsrc/net/dhcpcd-qt/Makefile:1.6 --- pkgsrc/net/dhcpcd-qt/Makefile:1.5 Mon Mar 12 11:17:18 2018 +++ pkgsrc/net/dhcpcd-qt/Makefile Tue Oct 29 12:39:13 2019 @@ -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_VERS 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" Index: pkgsrc/net/dhcpcd-qt/distinfo diff -u pkgsrc/net/dhcpcd-qt/distinfo:1.5 pkgsrc/net/dhcpcd-qt/distinfo:1.6 --- pkgsrc/net/dhcpcd-qt/distinfo:1.5 Wed Nov 4 00:34:57 2015 +++ pkgsrc/net/dhcpcd-qt/distinfo Tue Oct 29 12:39:13 2019 @@ -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 Index: pkgsrc/net/dhcpcd-qt/PLIST diff -u pkgsrc/net/dhcpcd-qt/PLIST:1.1 pkgsrc/net/dhcpcd-qt/PLIST:1.2 --- pkgsrc/net/dhcpcd-qt/PLIST:1.1 Mon Oct 6 19:46:59 2014 +++ pkgsrc/net/dhcpcd-qt/PLIST Tue Oct 29 12:39:13 2019 @@ -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 Added files: Index: pkgsrc/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-preferences.cpp diff -u /dev/null pkgsrc/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-preferences.cpp:1.1 --- /dev/null Tue Oct 29 12:39:13 2019 +++ pkgsrc/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-preferences.cpp Tue Oct 29 12:39:13 2019 @@ -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; Index: pkgsrc/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-qt.cpp diff -u /dev/null pkgsrc/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-qt.cpp:1.1 --- /dev/null Tue Oct 29 12:39:13 2019 +++ pkgsrc/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-qt.cpp Tue Oct 29 12:39:13 2019 @@ -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; Index: pkgsrc/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-qt.pro diff -u /dev/null pkgsrc/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-qt.pro:1.1 --- /dev/null Tue Oct 29 12:39:13 2019 +++ pkgsrc/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-qt.pro Tue Oct 29 12:39:13 2019 @@ -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 \ Index: pkgsrc/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-ssid.cpp diff -u /dev/null pkgsrc/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-ssid.cpp:1.1 --- /dev/null Tue Oct 29 12:39:13 2019 +++ pkgsrc/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-ssid.cpp Tue Oct 29 12:39:13 2019 @@ -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) Index: pkgsrc/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-ssidmenuwidget.cpp diff -u /dev/null pkgsrc/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-ssidmenuwidget.cpp:1.1 --- /dev/null Tue Oct 29 12:39:13 2019 +++ pkgsrc/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-ssidmenuwidget.cpp Tue Oct 29 12:39:13 2019 @@ -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); Index: pkgsrc/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-wi.cpp diff -u /dev/null pkgsrc/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-wi.cpp:1.1 --- /dev/null Tue Oct 29 12:39:13 2019 +++ pkgsrc/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-wi.cpp Tue Oct 29 12:39:13 2019 @@ -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); + Index: pkgsrc/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_main.cpp diff -u /dev/null pkgsrc/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_main.cpp:1.1 --- /dev/null Tue Oct 29 12:39:13 2019 +++ pkgsrc/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_main.cpp Tue Oct 29 12:39:13 2019 @@ -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 + #include + + #include "dhcpcd-qt.h" --_----------=_1572352753132020--