pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net Import dhcpcd-ui-0.7.7 with the following changes:
details: https://anonhg.NetBSD.org/pkgsrc/rev/7723abc1473a
branches: trunk
changeset: 418758:7723abc1473a
user: roy <roy%pkgsrc.org@localhost>
date: Tue Dec 03 15:40:05 2019 +0000
description:
Import dhcpcd-ui-0.7.7 with the following changes:
* decode escaped \2XX and \\ correctly
* support the up and coming dhcpcd-9
dhcpcd-ui-0.7.6 changes:
* added dhcpcd-curses - this is very much a work in progress
* allow background scanning when interface is down
* wireless icon represents signal strength better
* improved wpa_suppliant interaction
* Qt5 is supported
* supports newer dhcpcd variables
diffstat:
net/dhcpcd-gtk/distinfo | 10 +-
net/dhcpcd-icons/Makefile.common | 7 +-
net/dhcpcd-icons/distinfo | 10 +-
net/dhcpcd-qt/distinfo | 17 +---
net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-preferences.cpp | 37 ----------
net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-qt.cpp | 18 ----
net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-qt.pro | 13 ---
net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-ssid.cpp | 15 ----
net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-ssidmenuwidget.cpp | 16 ----
net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-wi.cpp | 15 ----
net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_main.cpp | 14 ---
11 files changed, 19 insertions(+), 153 deletions(-)
diffs (237 lines):
diff -r a8c010a27f4f -r 7723abc1473a net/dhcpcd-gtk/distinfo
--- a/net/dhcpcd-gtk/distinfo Tue Dec 03 14:53:31 2019 +0000
+++ b/net/dhcpcd-gtk/distinfo Tue Dec 03 15:40:05 2019 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.14 2015/11/04 00:34:57 agc Exp $
+$NetBSD: distinfo,v 1.15 2019/12/03 15:40:05 roy 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 (dhcpcd-ui-0.7.7.tar.xz) = 33eddb8911953995178a5c52cc1b27f460423e24
+RMD160 (dhcpcd-ui-0.7.7.tar.xz) = a94977995a87119f10bcab054a592751e8a2db12
+SHA512 (dhcpcd-ui-0.7.7.tar.xz) = 46f66c16986c248740b2dc8ce0edb663fbd35809d2d21f701588c3736cdafb32b04c57ffbc6f8974841499ab46f6a1084d0a761b290e9d02ea3a9fae36a0ff3d
+Size (dhcpcd-ui-0.7.7.tar.xz) = 195648 bytes
diff -r a8c010a27f4f -r 7723abc1473a net/dhcpcd-icons/Makefile.common
--- a/net/dhcpcd-icons/Makefile.common Tue Dec 03 14:53:31 2019 +0000
+++ b/net/dhcpcd-icons/Makefile.common Tue Dec 03 15:40:05 2019 +0000
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile.common,v 1.5 2017/09/16 08:37:35 wiz Exp $
+# $NetBSD: Makefile.common,v 1.6 2019/12/03 15:40:05 roy Exp $
# used by net/dhcpcd-gtk/Makefile
# used by net/dhcpcd-qt/Makefile
-DHCPCD_UI_VERSION= 0.7.5
+DHCPCD_UI_VERSION= 0.7.7
DISTNAME= dhcpcd-ui-${DHCPCD_UI_VERSION}
MASTER_SITES= https://roy.marples.name/downloads/dhcpcd/
MASTER_SITES+= ftp://roy.marples.name/pub/dhcpcd/
MASTER_SITES+= http://roy.aydogan.net/dhcpcd/
-EXTRACT_SUFX= .tar.bz2
+EXTRACT_SUFX= .tar.xz
MAINTAINER= roy%NetBSD.org@localhost
HOMEPAGE= https://roy.marples.name/projects/dhcpcd-ui/
@@ -17,6 +17,7 @@
USE_LANGUAGES= c99
HAS_CONFIGURE= yes
CONFIGURE_ARGS+= --without-dhcpcd-online
+CONFIGURE_ARGS+= --without-curses
CONFIGURE_ARGS+= --without-gtk+
CONFIGURE_ARGS+= --without-qt
CONFIGURE_ARGS+= --without-icons
diff -r a8c010a27f4f -r 7723abc1473a net/dhcpcd-icons/distinfo
--- a/net/dhcpcd-icons/distinfo Tue Dec 03 14:53:31 2019 +0000
+++ b/net/dhcpcd-icons/distinfo Tue Dec 03 15:40:05 2019 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2015/11/04 00:34:57 agc Exp $
+$NetBSD: distinfo,v 1.6 2019/12/03 15:40:05 roy 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 (dhcpcd-ui-0.7.7.tar.xz) = 33eddb8911953995178a5c52cc1b27f460423e24
+RMD160 (dhcpcd-ui-0.7.7.tar.xz) = a94977995a87119f10bcab054a592751e8a2db12
+SHA512 (dhcpcd-ui-0.7.7.tar.xz) = 46f66c16986c248740b2dc8ce0edb663fbd35809d2d21f701588c3736cdafb32b04c57ffbc6f8974841499ab46f6a1084d0a761b290e9d02ea3a9fae36a0ff3d
+Size (dhcpcd-ui-0.7.7.tar.xz) = 195648 bytes
diff -r a8c010a27f4f -r 7723abc1473a net/dhcpcd-qt/distinfo
--- a/net/dhcpcd-qt/distinfo Tue Dec 03 14:53:31 2019 +0000
+++ b/net/dhcpcd-qt/distinfo Tue Dec 03 15:40:05 2019 +0000
@@ -1,13 +1,6 @@
-$NetBSD: distinfo,v 1.6 2019/10/29 12:39:13 kamil Exp $
+$NetBSD: distinfo,v 1.7 2019/12/03 15:40:06 roy 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
+SHA1 (dhcpcd-ui-0.7.7.tar.xz) = 33eddb8911953995178a5c52cc1b27f460423e24
+RMD160 (dhcpcd-ui-0.7.7.tar.xz) = a94977995a87119f10bcab054a592751e8a2db12
+SHA512 (dhcpcd-ui-0.7.7.tar.xz) = 46f66c16986c248740b2dc8ce0edb663fbd35809d2d21f701588c3736cdafb32b04c57ffbc6f8974841499ab46f6a1084d0a761b290e9d02ea3a9fae36a0ff3d
+Size (dhcpcd-ui-0.7.7.tar.xz) = 195648 bytes
diff -r a8c010a27f4f -r 7723abc1473a net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-preferences.cpp
--- a/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-preferences.cpp Tue Dec 03 14:53:31 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-$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 -r a8c010a27f4f -r 7723abc1473a net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-qt.cpp
--- a/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-qt.cpp Tue Dec 03 14:53:31 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$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 -r a8c010a27f4f -r 7723abc1473a net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-qt.pro
--- a/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-qt.pro Tue Dec 03 14:53:31 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$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 -r a8c010a27f4f -r 7723abc1473a net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-ssid.cpp
--- a/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-ssid.cpp Tue Dec 03 14:53:31 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$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 -r a8c010a27f4f -r 7723abc1473a net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-ssidmenuwidget.cpp
--- a/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-ssidmenuwidget.cpp Tue Dec 03 14:53:31 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$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 -r a8c010a27f4f -r 7723abc1473a net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-wi.cpp
--- a/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_dhcpcd-wi.cpp Tue Dec 03 14:53:31 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$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 -r a8c010a27f4f -r 7723abc1473a net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_main.cpp
--- a/net/dhcpcd-qt/patches/patch-src_dhcpcd-qt_main.cpp Tue Dec 03 14:53:31 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$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"
Home |
Main Index |
Thread Index |
Old Index