[SCM] plasma-nm packaging branch, master, updated. debian/0.9.3.3-4-7-g0f60115

Maximiliano Curia maxy at moszumanska.debian.org
Sun Aug 17 20:52:47 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/plasma-nm.git;a=commitdiff;h=43a2f22

The following commit has been merged in the master branch:
commit 43a2f22070b7472da849ce6d82a0bc643a1c5b0e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Aug 14 15:07:32 2014 +0200

    Remove no longer needed patches
---
 debian/changelog                                   |   2 +
 debian/patches/disable_teamwidget                  |  52 ----------
 debian/patches/series                              |   2 -
 debian/patches/upstream_fix_build_new_openconnnect | 109 ---------------------
 4 files changed, 2 insertions(+), 163 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9d713e2..9498c5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ plasma-nm (0.9.3.4-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Update build dependencies.
+  * Remove upstream patch: upstream_fix_build_new_openconnnect
+  * Remove patch: disable_teamwidget
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 14 Aug 2014 14:47:22 +0200
 
diff --git a/debian/patches/disable_teamwidget b/debian/patches/disable_teamwidget
deleted file mode 100644
index 046cf4e..0000000
--- a/debian/patches/disable_teamwidget
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: plasma-nm/lib/editor/connectiondetaileditor.cpp
-===================================================================
---- plasma-nm.orig/lib/editor/connectiondetaileditor.cpp	2014-07-17 14:52:26.327086121 +0200
-+++ plasma-nm/lib/editor/connectiondetaileditor.cpp	2014-07-17 14:52:26.323086278 +0200
-@@ -39,7 +39,7 @@
- #include <vlanwidget.h>
- #include <wimaxwidget.h>
- #if NM_CHECK_VERSION(0, 9, 9)
--#include <teamwidget.h>
-+/* Should check for NETWORKMANAGERQT_VERSION: #include <teamwidget.h> */
- #endif
- #include "vpnuiplugin.h"
- 
-@@ -315,9 +315,9 @@
-         VlanWidget * vlanWidget = new VlanWidget(m_connection->setting(NetworkManager::Setting::Vlan), this);
-         m_ui->tabWidget->addTab(vlanWidget, i18n("Vlan"));
- #if NM_CHECK_VERSION(0, 9, 9)
--    } else if (type == NetworkManager::ConnectionSettings::Team) { // Team
--        TeamWidget * teamWidget = new TeamWidget(uuid, m_connection->setting(NetworkManager::Setting::Team), this);
--        m_ui->tabWidget->addTab(teamWidget, i18n("Team"));
-+    // } else if (type == NetworkManager::ConnectionSettings::Team) { // Team
-+    //    TeamWidget * teamWidget = new TeamWidget(uuid, m_connection->setting(NetworkManager::Setting::Team), this);
-+    //    m_ui->tabWidget->addTab(teamWidget, i18n("Team"));
- #endif
-     } else if (type == NetworkManager::ConnectionSettings::Wimax) { // Wimax
-         WimaxWidget * wimaxWidget = new WimaxWidget(m_connection->setting(NetworkManager::Setting::Wimax), this);
-@@ -370,7 +370,7 @@
-          || type == ConnectionSettings::Infiniband
-          || type == ConnectionSettings::Wimax
-      #if NM_CHECK_VERSION(0, 9, 9)
--         || type == ConnectionSettings::Team
-+     //    || type == ConnectionSettings::Team
-      #endif
-          || type == ConnectionSettings::Bond
-          || type == ConnectionSettings::Bridge
-Index: plasma-nm/editor/connectioneditor.cpp
-===================================================================
---- plasma-nm.orig/editor/connectioneditor.cpp	2014-07-17 14:52:18.143408479 +0200
-+++ plasma-nm/editor/connectioneditor.cpp	2014-07-17 14:53:34.792386343 +0200
-@@ -118,9 +118,9 @@
-     action->setData(NetworkManager::ConnectionSettings::Vlan);
-     m_menu->addAction(action);
- #if NM_CHECK_VERSION(0, 9, 9)
--    action = new QAction(i18n("Team"), this);
--    action->setData(NetworkManager::ConnectionSettings::Team);
--    m_menu->addAction(action);
-+    // action = new QAction(i18n("Team"), this);
-+    // action->setData(NetworkManager::ConnectionSettings::Team);
-+    // m_menu->addAction(action);
- #endif
- 
-     action = m_menu->addSeparator();
diff --git a/debian/patches/series b/debian/patches/series
index 1ad9829..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-upstream_fix_build_new_openconnnect
-disable_teamwidget
diff --git a/debian/patches/upstream_fix_build_new_openconnnect b/debian/patches/upstream_fix_build_new_openconnnect
deleted file mode 100644
index 8cba845..0000000
--- a/debian/patches/upstream_fix_build_new_openconnnect
+++ /dev/null
@@ -1,109 +0,0 @@
-commit 947f56f1cd21a72fa0f88e1c42ac8c19e23864d0
-Author: Jan Grulich <jgrulich at redhat.com>
-Date:   Thu Mar 13 12:07:47 2014 +0100
-
-    Fix build with the new version of openconnect
-    
-    Still needs to be finished and tested
-
-diff --git a/vpn/openconnect/openconnectauth.cpp b/vpn/openconnect/openconnectauth.cpp
-index 33e8c93..fdfdd61 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)) {
-+                // TODO: 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..7060fb2 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;
-+    // TODO : 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;

-- 
plasma-nm packaging



More information about the pkg-kde-commits mailing list