[SCM] Akonadi packaging branch, master, updated. debian/16.04.3-5-31-g66fe978
Maximiliano Curia
maxy at moszumanska.debian.org
Sun Aug 20 23:20:41 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/akonadi.git;a=commitdiff;h=78d37ae
The following commit has been merged in the master branch:
commit 78d37ae9c93c603ad425a81f687bc0d23272da08
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Sun Aug 20 09:36:29 2017 +0200
Drop upstream patches
---
.../Delete-the-properties-window-if-closed.patch | 21 -
.../patches/QSqlite3-fix-build-with-Qt-5.7.patch | 909 ---------------------
debian/patches/fix_build_with_qt_5.9.diff | 24 -
debian/patches/series | 3 -
4 files changed, 957 deletions(-)
diff --git a/debian/patches/Delete-the-properties-window-if-closed.patch b/debian/patches/Delete-the-properties-window-if-closed.patch
deleted file mode 100644
index ebdb4d8..0000000
--- a/debian/patches/Delete-the-properties-window-if-closed.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Maximiliano Curia <maxy at gnuservers.com.ar>
-Date: Tue, 6 Dec 2016 18:53:58 +0100
-Subject: Delete the properties window if closed
-
-This should allow the window to be created again on request.
----
- src/widgets/collectionpropertiesdialog.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/widgets/collectionpropertiesdialog.cpp b/src/widgets/collectionpropertiesdialog.cpp
-index 8e31957..6922306 100644
---- a/src/widgets/collectionpropertiesdialog.cpp
-+++ b/src/widgets/collectionpropertiesdialog.cpp
-@@ -119,6 +119,7 @@ void CollectionPropertiesDialog::Private::init()
- {
- QVBoxLayout *mainLayout = new QVBoxLayout;
- q->setLayout(mainLayout);
-+ q->setAttribute(Qt::WA_DeleteOnClose);
- mTabWidget = new QTabWidget(q);
- mainLayout->addWidget(mTabWidget);
-
diff --git a/debian/patches/QSqlite3-fix-build-with-Qt-5.7.patch b/debian/patches/QSqlite3-fix-build-with-Qt-5.7.patch
deleted file mode 100644
index afb8e5c..0000000
--- a/debian/patches/QSqlite3-fix-build-with-Qt-5.7.patch
+++ /dev/null
@@ -1,909 +0,0 @@
-From: =?utf-8?q?Daniel_Vr=C3=A1til?= <dvratil at kde.org>
-Date: Sun, 5 Jun 2016 15:49:29 +0200
-Subject: QSqlite3: fix build with Qt 5.7
-
-Use ${QtSql_PRIVATE_INCLUDE_DIRS} to include the private headers
-directly from current Qt install instead of carrying a local copy.
----
- CMakeLists.txt | 6 +-
- src/qsqlite/CMakeLists.txt | 2 +
- src/qsqlite/src/QtSql/private/qobject_p.h | 434 ---------------------
- src/qsqlite/src/QtSql/private/qsqlcachedresult_p.h | 100 -----
- src/qsqlite/src/QtSql/private/qsqldriver_p.h | 86 ----
- src/qsqlite/src/qsql_sqlite.cpp | 70 +++-
- 6 files changed, 59 insertions(+), 639 deletions(-)
- delete mode 100644 src/qsqlite/src/QtSql/private/qobject_p.h
- delete mode 100644 src/qsqlite/src/QtSql/private/qsqlcachedresult_p.h
- delete mode 100644 src/qsqlite/src/QtSql/private/qsqldriver_p.h
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 936bdc3..9b1aa99 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -31,10 +31,10 @@ ecm_setup_version(${AKONADI_VERSION}
- SOVERSION 5)
-
- # Find packages
--find_package(Qt5Core ${QT_REQUIRED_VERSION} CONFIG REQUIRED)
-+find_package(Qt5Core ${QT_REQUIRED_VERSION} REQUIRED COMPONENTS Private)
- find_package(Qt5Gui ${QT_REQUIRED_VERSION} CONFIG REQUIRED)
- find_package(Qt5Widgets ${QT_REQUIRED_VERSION} CONFIG REQUIRED)
--find_package(Qt5Sql ${QT_REQUIRED_VERSION} CONFIG REQUIRED)
-+find_package(Qt5Sql ${QT_REQUIRED_VERSION} REQUIRED COMPONENTS Private)
- find_package(Qt5Network ${QT_REQUIRED_VERSION} CONFIG REQUIRED)
- find_package(Qt5Xml ${QT_REQUIRED_VERSION} CONFIG REQUIRED)
- find_package(Qt5DBus ${QT_REQUIRED_VERSION} CONFIG REQUIRED)
-@@ -129,7 +129,7 @@ else()
- set(SQLITE_TYPE "OPTIONAL")
- endif()
-
--if(AKONADI_BUILD_QSQLITE AND Qt5Core_VERSION VERSION_LESS 5.7.0) # API change in 5.7 breaks our sqlite driver
-+if(AKONADI_BUILD_QSQLITE)
- set(SQLITE_MIN_VERSION 3.6.23)
- find_package(Sqlite ${SQLITE_MIN_VERSION})
- set_package_properties(Sqlite PROPERTIES
-diff --git a/src/qsqlite/CMakeLists.txt b/src/qsqlite/CMakeLists.txt
-index 228cd10..b2f7f0c 100644
---- a/src/qsqlite/CMakeLists.txt
-+++ b/src/qsqlite/CMakeLists.txt
-@@ -9,6 +9,8 @@ message(STATUS "Building QSQLITE3 driver")
- set(QSQLITE_INSTALL_PREFIX "${PLUGIN_INSTALL_DIR}/sqldrivers")
-
- include_directories(
-+ ${Qt5Core_PRIVATE_INCLUDE_DIRS}
-+ ${Qt5Sql_PRIVATE_INCLUDE_DIRS}
- ${CMAKE_CURRENT_SOURCE_DIR}/src
- ${SQLITE_INCLUDE_DIR}
- )
-diff --git a/src/qsqlite/src/QtSql/private/qobject_p.h b/src/qsqlite/src/QtSql/private/qobject_p.h
-deleted file mode 100644
-index 180887b..0000000
---- a/src/qsqlite/src/QtSql/private/qobject_p.h
-+++ /dev/null
-@@ -1,434 +0,0 @@
--/****************************************************************************
--**
--** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
--** Copyright (C) 2013 Olivier Goffart <ogoffart at woboq.com>
--** Contact: http://www.qt-project.org/legal
--**
--** This file is part of the QtCore module of the Qt Toolkit.
--**
--** $QT_BEGIN_LICENSE:LGPL$
--** Commercial License Usage
--** Licensees holding valid commercial Qt licenses may use this file in
--** accordance with the commercial license agreement provided with the
--** Software or, alternatively, in accordance with the terms contained in
--** a written agreement between you and Digia. For licensing terms and
--** conditions see http://qt.digia.com/licensing. For further information
--** use the contact form at http://qt.digia.com/contact-us.
--**
--** 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, Digia gives you certain additional
--** rights. These rights are described in the Digia Qt LGPL Exception
--** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
--**
--** GNU General Public License Usage
--** Alternatively, this file may be used under the terms of the GNU
--** General Public License version 3.0 as published by the Free Software
--** Foundation and appearing in the file LICENSE.GPL included in the
--** packaging of this file. Please review the following information to
--** ensure the GNU General Public License version 3.0 requirements will be
--** met: http://www.gnu.org/copyleft/gpl.html.
--**
--**
--** $QT_END_LICENSE$
--**
--****************************************************************************/
--
--#ifndef QOBJECT_P_H
--#define QOBJECT_P_H
--
--//
--// W A R N I N G
--// -------------
--//
--// This file is not part of the Qt API. It exists for the convenience
--// of qapplication_*.cpp, qwidget*.cpp and qfiledialog.cpp. This header
--// file may change from version to version without notice, or even be removed.
--//
--// We mean it.
--//
--
--#include "QtCore/qobject.h"
--#include "QtCore/qpointer.h"
--#include "QtCore/qsharedpointer.h"
--#include "QtCore/qcoreevent.h"
--#include "QtCore/qlist.h"
--#include "QtCore/qvector.h"
--#include "QtCore/qvariant.h"
--#include "QtCore/qreadwritelock.h"
--
--QT_BEGIN_NAMESPACE
--
--class QVariant;
--class QThreadData;
--class QObjectConnectionListVector;
--namespace QtSharedPointer { struct ExternalRefCountData; }
--
--/* for Qt Test */
--struct QSignalSpyCallbackSet
--{
-- typedef void (*BeginCallback)(QObject *caller, int signal_or_method_index, void **argv);
-- typedef void (*EndCallback)(QObject *caller, int signal_or_method_index);
-- BeginCallback signal_begin_callback,
-- slot_begin_callback;
-- EndCallback signal_end_callback,
-- slot_end_callback;
--};
--void Q_CORE_EXPORT qt_register_signal_spy_callbacks(const QSignalSpyCallbackSet &callback_set);
--
--extern QSignalSpyCallbackSet Q_CORE_EXPORT qt_signal_spy_callback_set;
--
--enum { QObjectPrivateVersion = QT_VERSION };
--
--class Q_CORE_EXPORT QAbstractDeclarativeData
--{
--public:
-- static void (*destroyed)(QAbstractDeclarativeData *, QObject *);
-- static void (*destroyed_qml1)(QAbstractDeclarativeData *, QObject *);
-- static void (*parentChanged)(QAbstractDeclarativeData *, QObject *, QObject *);
-- static void (*signalEmitted)(QAbstractDeclarativeData *, QObject *, int, void **);
-- static int (*receivers)(QAbstractDeclarativeData *, const QObject *, int);
-- static bool (*isSignalConnected)(QAbstractDeclarativeData *, const QObject *, int);
--};
--
--// This is an implementation of QAbstractDeclarativeData that is identical with
--// the implementation in QtDeclarative and QtQml for the first bit
--struct QAbstractDeclarativeDataImpl : public QAbstractDeclarativeData
--{
-- quint32 ownedByQml1:1;
-- quint32 unused: 31;
--};
--
--class Q_CORE_EXPORT QObjectPrivate : public QObjectData
--{
-- Q_DECLARE_PUBLIC(QObject)
--
--public:
-- struct ExtraData
-- {
-- ExtraData() {}
-- #ifndef QT_NO_USERDATA
-- QVector<QObjectUserData *> userData;
-- #endif
-- QList<QByteArray> propertyNames;
-- QList<QVariant> propertyValues;
-- QVector<int> runningTimers;
-- QList<QPointer<QObject> > eventFilters;
-- QString objectName;
-- };
--
-- typedef void (*StaticMetaCallFunction)(QObject *, QMetaObject::Call, int, void **);
-- struct Connection
-- {
-- QObject *sender;
-- QObject *receiver;
-- union {
-- StaticMetaCallFunction callFunction;
-- QtPrivate::QSlotObjectBase *slotObj;
-- };
-- // The next pointer for the singly-linked ConnectionList
-- Connection *nextConnectionList;
-- //senders linked list
-- Connection *next;
-- Connection **prev;
-- QAtomicPointer<const int> argumentTypes;
-- QAtomicInt ref_;
-- ushort method_offset;
-- ushort method_relative;
-- uint signal_index : 27; // In signal range (see QObjectPrivate::signalIndex())
-- ushort connectionType : 3; // 0 == auto, 1 == direct, 2 == queued, 4 == blocking
-- ushort isSlotObject : 1;
-- ushort ownArgumentTypes : 1;
-- Connection() : nextConnectionList(0), ref_(2), ownArgumentTypes(true) {
-- //ref_ is 2 for the use in the internal lists, and for the use in QMetaObject::Connection
-- }
-- ~Connection();
-- int method() const { return method_offset + method_relative; }
-- void ref() { ref_.ref(); }
-- void deref() {
-- if (!ref_.deref()) {
-- Q_ASSERT(!receiver);
-- delete this;
-- }
-- }
-- };
-- // ConnectionList is a singly-linked list
-- struct ConnectionList {
-- ConnectionList() : first(0), last(0) {}
-- Connection *first;
-- Connection *last;
-- };
--
-- struct Sender
-- {
-- QObject *sender;
-- int signal;
-- int ref;
-- };
--
--
-- QObjectPrivate(int version = QObjectPrivateVersion);
-- virtual ~QObjectPrivate();
-- void deleteChildren();
--
-- void setParent_helper(QObject *);
-- void moveToThread_helper();
-- void setThreadData_helper(QThreadData *currentData, QThreadData *targetData);
-- void _q_reregisterTimers(void *pointer);
--
-- bool isSender(const QObject *receiver, const char *signal) const;
-- QObjectList receiverList(const char *signal) const;
-- QObjectList senderList() const;
--
-- void addConnection(int signal, Connection *c);
-- void cleanConnectionLists();
--
-- static inline Sender *setCurrentSender(QObject *receiver,
-- Sender *sender);
-- static inline void resetCurrentSender(QObject *receiver,
-- Sender *currentSender,
-- Sender *previousSender);
--
-- static QObjectPrivate *get(QObject *o) {
-- return o->d_func();
-- }
--
-- int signalIndex(const char *signalName, const QMetaObject **meta = 0) const;
-- inline bool isSignalConnected(uint signalIdx) const;
--
-- // To allow abitrary objects to call connectNotify()/disconnectNotify() without making
-- // the API public in QObject. This is used by QQmlNotifierEndpoint.
-- inline void connectNotify(const QMetaMethod &signal);
-- inline void disconnectNotify(const QMetaMethod &signal);
--
-- template <typename Func1, typename Func2>
-- static inline QMetaObject::Connection connect(const typename QtPrivate::FunctionPointer<Func1>::Object *sender, Func1 signal,
-- const typename QtPrivate::FunctionPointer<Func2>::Object *receiverPrivate, Func2 slot,
-- Qt::ConnectionType type = Qt::AutoConnection);
--
-- template <typename Func1, typename Func2>
-- static inline bool disconnect(const typename QtPrivate::FunctionPointer<Func1>::Object *sender, Func1 signal,
-- const typename QtPrivate::FunctionPointer<Func2>::Object *receiverPrivate, Func2 slot);
--
-- static QMetaObject::Connection connectImpl(const QObject *sender, int signal_index,
-- const QObject *receiver, void **slot,
-- QtPrivate::QSlotObjectBase *slotObj, Qt::ConnectionType type,
-- const int *types, const QMetaObject *senderMetaObject);
-- static QMetaObject::Connection connect(const QObject *sender, int signal_index, QtPrivate::QSlotObjectBase *slotObj, Qt::ConnectionType type);
-- static bool disconnect(const QObject *sender, int signal_index, void **slot);
--public:
-- ExtraData *extraData; // extra data set by the user
-- QThreadData *threadData; // id of the thread that owns the object
--
-- QObjectConnectionListVector *connectionLists;
--
-- Connection *senders; // linked list of connections connected to this object
-- Sender *currentSender; // object currently activating the object
-- mutable quint32 connectedSignals[2];
--
-- union {
-- QObject *currentChildBeingDeleted;
-- QAbstractDeclarativeData *declarativeData; //extra data used by the declarative module
-- };
--
-- // these objects are all used to indicate that a QObject was deleted
-- // plus QPointer, which keeps a separate list
-- QAtomicPointer<QtSharedPointer::ExternalRefCountData> sharedRefcount;
--};
--
--
--/*! \internal
--
-- Returns
--
Akonadi packaging
More information about the pkg-kde-commits
mailing list