commit: 65afad2ce6682bc6b381b9c09f3a574f276c2bd5
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 23 20:24:08 2014 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Apr 23 20:24:08 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=65afad2c
[kde-misc/plasma-nm] Move to KF5
Package-Manager: portage-2.2.10
---
.../plasma-nm-0.9.3.3-openconnect-build.patch | 101 ---------------------
kde-misc/plasma-nm/plasma-nm-9999.ebuild | 40 ++++++--
2 files changed, 31 insertions(+), 110 deletions(-)
diff --git a/kde-misc/plasma-nm/files/plasma-nm-0.9.3.3-openconnect-build.patch
b/kde-misc/plasma-nm/files/plasma-nm-0.9.3.3-openconnect-build.patch
deleted file mode 100644
index 3a1aa10..0000000
--- a/kde-misc/plasma-nm/files/plasma-nm-0.9.3.3-openconnect-build.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff --git a/vpn/openconnect/openconnectauth.cpp
b/vpn/openconnect/openconnectauth.cpp
-index 33e8c93..e2eb15a 100644
---- a/vpn/openconnect/openconnectauth.cpp
-+++ b/vpn/openconnect/openconnectauth.cpp
-@@ -414,7 +414,7 @@ void OpenconnectAuthWidget::processAuthForm(struct
oc_auth_form *form)
- int passwordnumber = 0;
- bool focusSet = false;
- for (opt = form->opts; opt; opt = opt->next) {
-- if (opt->type == OC_FORM_OPT_HIDDEN)
-+ if (opt->type == OC_FORM_OPT_HIDDEN || IGNORE_OPT(opt))
- continue;
- QLabel *text = new QLabel(this);
- text->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter);
-@@ -441,9 +441,20 @@ void OpenconnectAuthWidget::processAuthForm(struct
oc_auth_form *form)
- KComboBox *cmb = new KComboBox(this);
- struct oc_form_opt_select *sopt =
reinterpret_cast<oc_form_opt_select *>(opt);
- for (int i = 0; i < sopt->nr_choices; i++) {
-- cmb->addItem(QString::fromUtf8(sopt->choices[i].label),
QString::fromUtf8(sopt->choices[i].name));
-- if (value == QString::fromUtf8(sopt->choices[i].name))
-+ cmb->addItem(QString::fromUtf8(FORMCHOICE(sopt, i)->label),
-+ QString::fromUtf8(FORMCHOICE(sopt, i)->name));
-+ if (value == QString::fromUtf8(FORMCHOICE(sopt, i)->name)) {
- cmb->setCurrentIndex(i);
-+ if (sopt == AUTHGROUP_OPT(form) &&
-+ i != AUTHGROUP_SELECTION(form)) {
-+ // XXX: Immediately return OC_FORM_RESULT_NEWGROUP to
-+ // change group
-+ }
-+ }
-+ }
-+ if (sopt == AUTHGROUP_OPT(form)) {
-+ /// XXX: Hook up signal when the KComboBox entry changes, to
-+ // return OC_FORM_RESULT_NEWGROUP
- }
- widget = qobject_cast<QWidget*>(cmb);
- }
-@@ -540,6 +551,7 @@ void OpenconnectAuthWidget::validatePeerCert(const QString
&fingerprint,
- void OpenconnectAuthWidget::formLoginClicked()
- {
- Q_D(OpenconnectAuthWidget);
-+ /// XXX: This, or something like it, needs to be called when the
KComboBox for the auth group changes too.
- const int lastIndex = d->ui.loginBoxLayout->count() - 1;
- QLayout *layout = d->ui.loginBoxLayout->itemAt(lastIndex - 2)->layout();
- struct oc_auth_form *form = (struct oc_auth_form *)
d->ui.loginBoxLayout->itemAt(lastIndex)->widget()->property("openconnect_form").value<quintptr>();
-diff --git a/vpn/openconnect/openconnectauthworkerthread.cpp
b/vpn/openconnect/openconnectauthworkerthread.cpp
-index 4c16388..194b164 100644
---- a/vpn/openconnect/openconnectauthworkerthread.cpp
-+++ b/vpn/openconnect/openconnectauthworkerthread.cpp
-@@ -59,7 +59,7 @@ public:
- {
- if (obj)
- return
static_cast<OpenconnectAuthWorkerThread*>(obj)->processAuthFormP(form);
-- return -1;
-+ return OC_FORM_RESULT_ERR;
- }
- static void writeProgress(void *obj, int level, const char *str, ...)
- {
-@@ -181,9 +181,11 @@ int OpenconnectAuthWorkerThread::processAuthFormP(struct
oc_auth_form *form)
- m_waitForUserInput->wait(m_mutex);
- m_mutex->unlock();
- if (*m_userDecidedToQuit)
-- return -1;
-+ return OC_FORM_RESULT_CANCELLED;
-
-- return 0;
-+ /// XXX: If group changed, return OC_FORM_RESULT_NEWGROUP
-+
-+ return OC_FORM_RESULT_OK;
- }
-
- void OpenconnectAuthWorkerThread::writeProgress(int level, const char *fmt,
va_list argPtr)
-diff --git a/vpn/openconnect/openconnectauthworkerthread.h
b/vpn/openconnect/openconnectauthworkerthread.h
-index 37c854f..39d68b3 100644
---- a/vpn/openconnect/openconnectauthworkerthread.h
-+++ b/vpn/openconnect/openconnectauthworkerthread.h
-@@ -40,6 +40,25 @@ struct x509_st;
- #define OPENCONNECT_OPENSSL
- #endif
-
-+#if OPENCONNECT_CHECK_VER(3,0)
-+#define NEWGROUP_SUPPORTED 1
-+#define AUTHGROUP_OPT(form) (void *)(form)->authgroup_opt
-+#define AUTHGROUP_SELECTION(form) (form)->authgroup_selection
-+#define FORMCHOICE(sopt, i) ((sopt)->choices[i])
-+#define IGNORE_OPT(opt) ((opt)->flags & OC_FORM_OPT_IGNORE)
-+#else
-+#define NEWGROUP_SUPPORTED 0
-+#define AUTHGROUP_OPT(form) NULL
-+#define AUTHGROUP_SELECTION(form) 0
-+#define FORMCHOICE(sopt, i) (&(sopt)->choices[i])
-+#define IGNORE_OPT(opt) 0
-+
-+#define OC_FORM_RESULT_ERR -1
-+#define OC_FORM_RESULT_OK 0
-+#define OC_FORM_RESULT_CANCELLED 1
-+#define OC_FORM_RESULT_NEWGROUP 2
-+#endif
-+
- #include <QThread>
-
- class QMutex;
\ No newline at end of file
diff --git a/kde-misc/plasma-nm/plasma-nm-9999.ebuild
b/kde-misc/plasma-nm/plasma-nm-9999.ebuild
index 9a4f223..d0823af 100644
--- a/kde-misc/plasma-nm/plasma-nm-9999.ebuild
+++ b/kde-misc/plasma-nm/plasma-nm-9999.ebuild
@@ -7,28 +7,50 @@ EAPI=5
KDE_LINGUAS="ar bs ca ca@valencia cs da de el en_GB eo es et fa fi fr ga gl hr
hu is it ja km lt lv mai mr ms nb nds nl nn pa pl pt pt_BR ro ru sk sl sr
sr@ijekavian sr@ijekavianlatin sr@latin sv th tr ug uk zh_CN zh_TW"
-DECLARATIVE_REQUIRED="always"
-inherit kde4-base
+inherit kde5
if [[ ${KDE_BUILD_TYPE} != live ]]; then
KEYWORDS="~amd64 ~x86"
SRC_URI="mirror://kde/unstable/${PN}/${P}.tar.xz"
else
KEYWORDS=""
+ EGIT_BRANCH="frameworks"
fi
DESCRIPTION="KDE Plasma applet for NetworkManager"
HOMEPAGE="https://projects.kde.org/projects/playground/network/plasma-nm";
LICENSE="GPL-2 LGPL-2.1"
-SLOT="4"
IUSE="debug modemmanager openconnect"
DEPEND="
- >=net-libs/libnm-qt-0.9.8.1[modemmanager?]
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep plasma)
+ $(add_frameworks_dep solid)
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ >=net-libs/libnm-qt-5.0
net-misc/mobile-broadband-provider-info
>=net-misc/networkmanager-0.9.8.0
- modemmanager? ( >=net-libs/libmm-qt-1.0.0 )
+ modemmanager? ( >=net-libs/libmm-qt-5.0 )
openconnect? (
net-misc/networkmanager-openconnect
net-misc/openconnect
@@ -36,15 +58,15 @@ DEPEND="
"
RDEPEND="${DEPEND}
!kde-misc/networkmanagement
+ !kde-misc/plasma-nm:4
"
-PATCHES=( "${FILESDIR}/${PN}-0.9.3.3-openconnect-build.patch" )
-
src_configure() {
local mycmakeargs=(
- $(cmake-utils_use !modemmanager DISABLE_MODEMMANAGER_SUPPORT)
+ $(cmake-utils_use_find_package modemmanager ModemManager)
+ $(cmake-utils_use_find_package modemmanager KF5ModemManagerQt)
$(cmake-utils_use_find_package openconnect OpenConnect)
)
- kde4-base_src_configure
+ kde5_src_configure
}
