Hello community, here is the log from the commit of package plasma-nm for openSUSE:Factory checked in at 2014-03-18 17:16:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma-nm (Old) and /work/SRC/openSUSE:Factory/.plasma-nm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma-nm" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma-nm/plasma-nm.changes 2014-02-28 19:17:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.plasma-nm.new/plasma-nm.changes 2014-03-18 17:16:48.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Mar 14 14:12:48 UTC 2014 - dmitr...@opensuse.org + +- Set language package as recommended + +------------------------------------------------------------------- @@ -6,0 +12,2 @@ +- Added openconnect.patch to make it build with the latest + openconnect version New: ---- openconnect.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma-nm.spec ++++++ --- /var/tmp/diff_new_pack.bOIfnD/_old 2014-03-18 17:16:49.000000000 +0100 +++ /var/tmp/diff_new_pack.bOIfnD/_new 2014-03-18 17:16:49.000000000 +0100 @@ -26,6 +26,7 @@ Source0: http://download.kde.org/unstable/%{name}/%{name}-%{version}.tar.xz Source1: icon.tar.bz2 Source2: 01-plasma-nm.js +Patch1: openconnect.patch BuildRequires: NetworkManager-devel >= 0.9.8.0 BuildRequires: fdupes BuildRequires: libModemManagerQt-devel >= 0.7.990 @@ -37,18 +38,12 @@ %endif Provides: NetworkManager-client Recommends: %{name}-pptp -%if 0%{?suse_version} > 1310 Obsoletes: NetworkManager-kde4-devel Obsoletes: NetworkManager-kde4-libs Obsoletes: NetworkManager-novellvpn-kde4 Obsoletes: plasmoid-networkmanagement -%else -Conflicts: NetworkManager-kde4-devel -Conflicts: NetworkManager-kde4-libs -Conflicts: NetworkManager-novellvpn-kde4 -Conflicts: plasmoid-networkmanagement -%endif Requires: mobile-broadband-provider-info +Recommends: %{name}-lang = %{version} %kde4_runtime_requires %description @@ -61,12 +56,8 @@ Requires: %{name} = %{version} Requires: NetworkManager-openvpn Provides: NetworkManager-openvpn-frontend -%if 0%{?suse_version} > 1310 Supplements: packageand(%{name};NetworkManager-openvpn) Obsoletes: NetworkManager-openvpn-kde4 -%else -Conflicts: NetworkManager-openvpn-kde4 -%endif %kde4_runtime_requires %description openvpn @@ -78,12 +69,8 @@ Requires: %{name} = %{version} Requires: NetworkManager-vpnc Provides: NetworkManager-vpnc-frontend -%if 0%{?suse_version} > 1310 Supplements: packageand(%{name};NetworkManager-vpnc) Obsoletes: NetworkManager-vpnc-kde4 -%else -Conflicts: NetworkManager-vpnc-kde4 -%endif %kde4_runtime_requires %description vpnc @@ -97,12 +84,8 @@ Requires: NetworkManager-openconnect Requires: openconnect Provides: NetworkManager-openconnect-frontend -%if 0%{?suse_version} > 1310 Supplements: packageand(%{name};NetworkManager-openconnect;openconnect) Obsoletes: NetworkManager-openconnect-kde4 -%else -Conflicts: NetworkManager-openconnect-kde4 -%endif %kde4_runtime_requires %description openconnect @@ -153,12 +136,8 @@ Requires: %{name} = %{version} Requires: NetworkManager-pptp Provides: NetworkManager-pptp-frontend -%if 0%{?suse_version} > 1310 Supplements: packageand(%{name};NetworkManager-pptp) Obsoletes: NetworkManager-pptp-kde4 -%else -Conflicts: NetworkManager-pptp-kde4 -%endif %kde4_runtime_requires %description pptp @@ -167,6 +146,9 @@ %lang_package %prep %setup -qn %{name}-%{version} -a 1 +%if 0%{?suse_version} > 1310 +%patch1 -p1 +%endif %build %cmake_kde4 -d build ++++++ openconnect.patch ++++++ 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; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
