From 6a293c249ef5d82e2889ba5aa07ca6cd048f2d40 Mon Sep 17 00:00:00 2001 From: blublue Date: Wed, 17 Nov 2021 10:44:21 +0000 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20pppoe=20=E7=BD=91=E7=BB=9C?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- add-pppoe-parent.patch | 70 ++++++++++++++++++++++++++++++++++++++ kf5-networkmanager-qt.spec | 6 +++- 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 add-pppoe-parent.patch diff --git a/add-pppoe-parent.patch b/add-pppoe-parent.patch new file mode 100644 index 0000000..68e8dc2 --- /dev/null +++ b/add-pppoe-parent.patch @@ -0,0 +1,70 @@ +Index: networkmanager-qt/src/settings/pppoesetting.cpp +=================================================================== +--- networkmanager-qt.orig/src/settings/pppoesetting.cpp ++++ networkmanager-qt/src/settings/pppoesetting.cpp +@@ -97,6 +97,20 @@ QString NetworkManager::PppoeSetting::pa + return d->password; + } + ++void NetworkManager::PppoeSetting::setParent(const QString &parent) ++{ ++ Q_D(PppoeSetting); ++ ++ d->parent = parent; ++} ++ ++QString NetworkManager::PppoeSetting::parent() const ++{ ++ Q_D(const PppoeSetting); ++ ++ return d->parent; ++} ++ + void NetworkManager::PppoeSetting::setPasswordFlags(NetworkManager::Setting::SecretFlags flags) + { + Q_D(PppoeSetting); +@@ -171,6 +185,10 @@ QVariantMap NetworkManager::PppoeSetting + setting.insert(QLatin1String(NM_SETTING_PPPOE_USERNAME), username()); + } + ++ if (!parent().isEmpty()) { ++ setting.insert(QLatin1String(NM_SETTING_PPPOE_PARENT), parent()); ++ } ++ + if (!password().isEmpty()) { + setting.insert(QLatin1String(NM_SETTING_PPPOE_PASSWORD), password()); + } +@@ -190,6 +208,7 @@ QDebug NetworkManager::operator <<(QDebu + dbg.nospace() << NM_SETTING_PPPOE_SERVICE << ": " << setting.service() << '\n'; + dbg.nospace() << NM_SETTING_PPPOE_USERNAME << ": " << setting.username() << '\n'; + dbg.nospace() << NM_SETTING_PPPOE_PASSWORD << ": " << setting.password() << '\n'; ++ dbg.nospace() << NM_SETTING_PPPOE_PARENT << ": " << setting.parent() << '\n'; + dbg.nospace() << NM_SETTING_PPPOE_PASSWORD_FLAGS << ": " << setting.passwordFlags() << '\n'; + + return dbg.maybeSpace(); +Index: networkmanager-qt/src/settings/pppoesetting.h +=================================================================== +--- networkmanager-qt.orig/src/settings/pppoesetting.h ++++ networkmanager-qt/src/settings/pppoesetting.h +@@ -54,6 +54,9 @@ public: + void setPassword(const QString &password); + QString password() const; + ++ void setParent(const QString &parent); ++ QString parent() const; ++ + void setPasswordFlags(Setting::SecretFlags flags); + Setting::SecretFlags passwordFlags() const; + +Index: networkmanager-qt/src/settings/pppoesetting_p.h +=================================================================== +--- networkmanager-qt.orig/src/settings/pppoesetting_p.h ++++ networkmanager-qt/src/settings/pppoesetting_p.h +@@ -35,6 +35,7 @@ public: + QString service; + QString username; + QString password; ++ QString parent; + NetworkManager::Setting::SecretFlags passwordFlags; + }; + diff --git a/kf5-networkmanager-qt.spec b/kf5-networkmanager-qt.spec index 4ff6f20..90eefbd 100644 --- a/kf5-networkmanager-qt.spec +++ b/kf5-networkmanager-qt.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.55.0 -Release: 1 +Release: 2 Summary: A Tier 1 KDE Frameworks 5 module that wraps NetworkManager DBus API License: LGPLv2+ @@ -16,6 +16,7 @@ URL: https://cgit.kde.org/%{framework}.git %global stable stable %endif Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz +Patch0: add-pppoe-parent.patch BuildRequires: extra-cmake-modules >= %{majmin} BuildRequires: kf5-rpm-macros >= %{majmin} @@ -73,5 +74,8 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Wed Nov 17 2021 guoqinglan - 5.55.0-2 +- add pppoe parent + * Mon Aug 17 2020 yeqinglong - 5.55.0-1 - Initial release for OpenEuler -- Gitee