[meego-commits] 8367: Changes to MeeGo:1.1:Core/qt
Peter Zhu
no_reply at build.meego.com
Wed Oct 13 13:17:51 UTC 2010
Hi,
I have made the following changes to qt in project MeeGo:1.1:Core. Please review and accept ASAP.
Thank You,
Peter Zhu
[This message was auto-generated]
---
Request #8367:
submit: MeeGo:1.1:Core:Testing/qt(r2) -> MeeGo:1.1:Core/qt
Message:
Move to MeeGo:1.1:Core
State: new 2010-10-13T06:17:51 peter
Comment: None
changes files:
--------------
--- qt.changes
+++ qt.changes
@@ -0,0 +1,7 @@
+* Wed Sep 29 2010 Fathi Boudra <fathi.boudra at nokia.com> - 4.7.0
+- Update Connman backend for Bearer Management patch
+ Connman plugin is missing in Qt 4.7.0 packages (BMC#7765)
+- Update libqtnetwork4 package: add libqconnmanbearer.so file
+- Add add_lib_to_openssl_search_path.patch
+ on MeeGo, OpenSSL library is installed under /lib (BMC#7777)
+
old:
----
13_connman_backend_for_bearer_management.patch.bz2
new:
----
add_lib_to_openssl_search_path.patch
connman_backend_for_bearer_management.patch.bz2
spec files:
-----------
--- qt.spec
+++ qt.spec
@@ -49,8 +49,9 @@
Patch8: 09_texture_enable_fix.patch
Patch9: 10_webkit_self_injection_into_qt_configuration.patch
Patch10: 11_honor_all_FreeDesktop_icon_paths.patch
-Patch11: 13_connman_backend_for_bearer_management.patch.bz2
+Patch11: connman_backend_for_bearer_management.patch.bz2
Patch12: 16_force_cxxflags_on_arm.patch
+Patch13: add_lib_to_openssl_search_path.patch
BuildRequires: cups-devel
BuildRequires: fdupes
BuildRequires: flex
@@ -556,12 +557,14 @@
%patch9 -p1
# 11_honor_all_FreeDesktop_icon_paths.patch
%patch10 -p1
-# 13_connman_backend_for_bearer_management.patch.bz2
+# connman_backend_for_bearer_management.patch.bz2
%patch11 -p1
%ifarch armv7l
# 16_force_cxxflags_on_arm.patch
%patch12 -p1
%endif
+# add_lib_to_openssl_search_path.patch
+%patch13 -p1
%build
export QTDIR=`pwd`
@@ -817,6 +820,7 @@
%files -n libqtnetwork4
%defattr(-,root,root,-)
%{_libdir}/libQtNetwork.so.*
+%{_libdir}/qt4/plugins/bearer/libqconnmanbearer.so
%{_libdir}/qt4/plugins/bearer/libqgenericbearer.so
%{_libdir}/qt4/plugins/bearer/libqnmbearer.so
other changes:
--------------
++++++ add_lib_to_openssl_search_path.patch (new)
--- add_lib_to_openssl_search_path.patch
+++ add_lib_to_openssl_search_path.patch
+Description; Add /lib to OpenSSL search path.
+on MeeGo, OpenSSL library is installed under /lib.
+Author: Thiago Macieira <thiago.macieira at nokia.com>
+--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
++++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
+@@ -329,7 +329,7 @@ static QStringList findAllLibSsl()
+ paths = QString::fromLatin1(qgetenv("LD_LIBRARY_PATH"))
+ .split(QLatin1Char(':'), QString::SkipEmptyParts);
+ # endif
+- paths << QLatin1String("/usr/lib") << QLatin1String("/usr/local/lib");
++ paths << QLatin1String("/lib") << QLatin1String("/usr/lib") << QLatin1String("/usr/local/lib");
+
+ QStringList foundSsls;
+ foreach (const QString &path, paths) {
++++++ connman_backend_for_bearer_management.patch.bz2 (new)
--- connman_backend_for_bearer_management.patch.bz2
+++ connman_backend_for_bearer_management.patch.bz2
+--- a/src/plugins/bearer/bearer.pro
++++ b/src/plugins/bearer/bearer.pro
+@@ -3,8 +3,9 @@ TEMPLATE = subdirs
+ contains(QT_CONFIG, dbus) {
+ contains(QT_CONFIG, icd) {
+ SUBDIRS += icd
+- } else {
+- SUBDIRS += networkmanager generic
++ } else:linux* {
++ SUBDIRS += generic
++ SUBDIRS += connman networkmanager
+ }
+ }
+
+@@ -15,4 +16,4 @@ macx:contains(QT_CONFIG, corewlan):SUBDI
+ macx:SUBDIRS += generic
+ symbian:SUBDIRS += symbian
+
+-isEmpty(SUBDIRS):SUBDIRS += generic
++isEmpty(SUBDIRS):SUBDIRS = generic
+--- /dev/null
++++ b/src/plugins/bearer/connman/connman.pro
+@@ -0,0 +1,21 @@
++TARGET = qconnmanbearer
++include(../../qpluginbase.pri)
++
++QT = core network dbus
++
++HEADERS += qconnmanservice_linux_p.h \
++ qofonoservice_linux_p.h \
++ qconnmanengine.h \
++ ../qnetworksession_impl.h \
++ ../qbearerengine_impl.h
++
++SOURCES += main.cpp \
++ qconnmanservice_linux.cpp \
++ qofonoservice_linux.cpp \
++ qconnmanengine.cpp \
++ ../qnetworksession_impl.cpp
++
++QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer
++target.path += $$[QT_INSTALL_PLUGINS]/bearer
++INSTALLS += target
++
+--- /dev/null
++++ b/src/plugins/bearer/connman/main.cpp
+@@ -0,0 +1,93 @@
++/****************************************************************************
++**
++** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
++** All rights reserved.
++** Contact: Nokia Corporation (qt-info at nokia.com)
++**
++** This file is part of the plugins of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** No Commercial Usage
++** This file contains pre-release code and may not be distributed.
++** You may use this file in accordance with the terms and conditions
++** contained in the Technology Preview License Agreement accompanying
++** this package.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file. Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Nokia gives you certain additional
++** rights. These rights are described in the Nokia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** If you have questions regarding the use of this file, please contact
++** Nokia at qt-info at nokia.com.
++**
++**
++**
++**
++**
++**
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++#include "qconnmanengine.h"
++
++#include <QtNetwork/private/qbearerplugin_p.h>
++
++#include <QtCore/qdebug.h>
++
++#ifndef QT_NO_BEARERMANAGEMENT
++#ifndef QT_NO_DBUS
++
++QT_BEGIN_NAMESPACE
++
++class QConnmanEnginePlugin : public QBearerEnginePlugin
++{
++public:
++ QConnmanEnginePlugin();
++ ~QConnmanEnginePlugin();
++
++ QStringList keys() const;
++ QBearerEngine *create(const QString &key) const;
++};
++
++QConnmanEnginePlugin::QConnmanEnginePlugin()
++{
++}
++
++QConnmanEnginePlugin::~QConnmanEnginePlugin()
++{
++}
++
++QStringList QConnmanEnginePlugin::keys() const
++{
++ return QStringList() << QLatin1String("connman");
++}
++
++QBearerEngine *QConnmanEnginePlugin::create(const QString &key) const
++{
++ if (key == QLatin1String("connman")) {
++ QConnmanEngine *engine = new QConnmanEngine;
++ if (engine->connmanAvailable())
++ return engine;
++ else
++ delete engine;
++ }
++ return 0;
++}
++
++Q_EXPORT_STATIC_PLUGIN(QConnmanEnginePlugin)
++Q_EXPORT_PLUGIN2(qconnmanbearer, QConnmanEnginePlugin)
++
++QT_END_NAMESPACE
++
++#endif
++#endif // QT_NO_BEARERMANAGEMENT
+--- /dev/null
++++ b/src/plugins/bearer/connman/qconnmanengine.cpp
+@@ -0,0 +1,853 @@
++/****************************************************************************
++**
++** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
++** All rights reserved.
++** Contact: Nokia Corporation (qt-info at nokia.com)
++**
++** This file is part of the plugins of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** No Commercial Usage
++** This file contains pre-release code and may not be distributed.
++** You may use this file in accordance with the terms and conditions
++** contained in the Technology Preview License Agreement accompanying
++** this package.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file. Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Nokia gives you certain additional
++** rights. These rights are described in the Nokia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** If you have questions regarding the use of this file, please contact
++** Nokia at qt-info at nokia.com.
++**
++**
++**
++**
++**
++**
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#include "qconnmanengine.h"
++#include "qconnmanservice_linux_p.h"
++#include "qofonoservice_linux_p.h"
++#include "../qnetworksession_impl.h"
++
++#include <QtNetwork/private/qnetworkconfiguration_p.h>
++
++#include <QtNetwork/qnetworksession.h>
++
++#include <QtCore/qdebug.h>
++
++#include <QtDBus/QtDBus>
++#include <QtDBus/QDBusConnection>
++#include <QtDBus/QDBusInterface>
(3825 more lines skipped)
++++++ deleted files:
--- 13_connman_backend_for_bearer_management.patch.bz2
More information about the MeeGo-commits
mailing list