Merge lp:~mardy/ubuntu-system-settings-online-accounts/optional-mir into lp:~mardy/ubuntu-system-settings-online-accounts/master

[Alberto Mardegan]

Make the Mir dependency optional, as it's not available for all architectures.

Make the Mir dependency optional, as it's not available for all architectures.

[David Barth (dbarth)]

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-08-12 12:33:10 +0000
+++ debian/control	2014-08-18 13:26:04 +0000
@@ -6,7 +6,7 @@
                pkg-config,
                python3:any,
                libaccounts-qt5-dev,
-               libmirclient-dev,
+               libmirclient-dev [!powerpc !ppc64 !ppc64el],
                libnotify-dev,
                libsignon-qt5-dev,
                libsystemsettings-dev (>= 0.1+13.10.20130806),

=== modified file 'debian/rules'
--- debian/rules	2014-06-06 08:10:04 +0000
+++ debian/rules	2014-08-18 13:26:04 +0000
@@ -8,6 +8,7 @@
 	dh_auto_configure -- \
 		LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
 		"QMAKE_CXXFLAGS=$(CFLAGS)" \
+		CONFIG+=enable-mir \
 		CONFIG+=ubuntu-docs \
 		ubuntu-system-settings-online-accounts.pro
 

=== added file 'online-accounts-service/mir-helper-stub.cpp'
--- online-accounts-service/mir-helper-stub.cpp	1970-01-01 00:00:00 +0000
+++ online-accounts-service/mir-helper-stub.cpp	2014-08-18 13:26:04 +0000
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This file is part of online-accounts-ui
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "debug.h"
+#include "mir-helper.h"
+
+using namespace OnlineAccountsUi;
+
+namespace OnlineAccountsUi {
+
+static MirHelper *m_instance = 0;
+
+} // namespace
+
+PromptSession::PromptSession(PromptSessionPrivate *priv):
+    d_ptr(priv)
+{
+}
+
+PromptSession::~PromptSession()
+{
+}
+
+QString PromptSession::requestSocket()
+{
+    return QString();
+}
+
+MirHelper::MirHelper(QObject *parent):
+    QObject(parent),
+    d_ptr(0)
+{
+}
+
+MirHelper::~MirHelper()
+{
+    m_instance = 0;
+}
+
+MirHelper *MirHelper::instance()
+{
+    if (!m_instance) {
+        m_instance = new MirHelper;
+    }
+    return m_instance;
+}
+
+PromptSession *MirHelper::createPromptSession(pid_t initiatorPid)
+{
+    Q_UNUSED(initiatorPid);
+    return 0;
+}

=== modified file 'online-accounts-service/online-accounts-service.pro'
--- online-accounts-service/online-accounts-service.pro	2014-08-12 12:33:10 +0000
+++ online-accounts-service/online-accounts-service.pro	2014-08-18 13:26:04 +0000
@@ -16,9 +16,16 @@
 PKGCONFIG += \
     libnotify \
     libsignon-qt5 \
-    mirclient \
     signon-plugins-common
 
+
+CONFIG(enable-mir) : system(pkg-config --exists mirclient) {
+    PKGCONFIG += mirclient
+    SOURCES += mir-helper.cpp
+} else {
+    SOURCES += mir-helper-stub.cpp
+}
+
 DBUS_ADAPTORS += \
     com.ubuntu.OnlineAccountsUi.xml
 
@@ -39,7 +46,6 @@
     inactivity-timer.cpp \
     indicator-service.cpp \
     main.cpp \
-    mir-helper.cpp \
     reauthenticator.cpp \
     request.cpp \
     request-manager.cpp \