mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-01-25 02:52:13 +08:00
removed kdepimlibs
This commit is contained in:
parent
819bf9da8e
commit
4c39f8511f
@ -1,63 +0,0 @@
|
||||
# Include global configuration
|
||||
source ../kdeapps.conf
|
||||
|
||||
pkgbase=kdepimlibs
|
||||
pkgname=(akonadi-contact akonadi-mime akonadi-notes akonadi-socialutils kio-pim)
|
||||
pkgver=${_kdever}
|
||||
pkgrel=1
|
||||
pkgdesc="KDE PIM Libraries"
|
||||
arch=('x86_64')
|
||||
url='https://projects.kde.org/kdepimlibs'
|
||||
license=(GPL LGPL)
|
||||
makedepends=(extra-cmake-modules qt5-tools kcalcore kmbox kcontacts kldap akonadi prison-kf5 boost kdoctools grantlee-qt5)
|
||||
options=('docs' 'debug')
|
||||
source=("$_mirror/${pkgbase}-$_kdever.tar.xz")
|
||||
sha256sums=(`grep ${pkgbase}-$_kdever.tar.xz ../checksums.txt | cut -d " " -f1`)
|
||||
|
||||
prepare() {
|
||||
mkdir -p build
|
||||
}
|
||||
|
||||
build() {
|
||||
cd build
|
||||
cmake_kf5 ../${pkgbase}-${pkgver}
|
||||
make
|
||||
}
|
||||
|
||||
package_akonadi-contact() {
|
||||
depends=(akonadi kmime kcontacts kcalcore prison-kf5 grantlee-qt5)
|
||||
|
||||
cd build/akonadi-contact
|
||||
make DESTDIR="$pkgdir" install
|
||||
}
|
||||
|
||||
package_akonadi-mime() {
|
||||
depends=(akonadi kmime)
|
||||
install=akonadi-mime.install
|
||||
|
||||
cd build/akonadi-mime
|
||||
make DESTDIR="$pkgdir" install
|
||||
}
|
||||
|
||||
package_akonadi-notes() {
|
||||
depends=(kmime)
|
||||
|
||||
cd build/akonadi-notes
|
||||
make DESTDIR="$pkgdir" install
|
||||
}
|
||||
|
||||
package_akonadi-socialutils() {
|
||||
depends=(akonadi)
|
||||
install=akonadi-socialutils.install
|
||||
|
||||
cd build/akonadi-socialutils
|
||||
make DESTDIR="$pkgdir" install
|
||||
}
|
||||
|
||||
package_kio-pim() {
|
||||
pkgdesc='PIM kioslaves'
|
||||
depends=(kldap kio)
|
||||
|
||||
cd build/kioslave
|
||||
make DESTDIR="$pkgdir" install
|
||||
}
|
@ -1,11 +0,0 @@
|
||||
post_install() {
|
||||
update-mime-database usr/share/mime &> /dev/null
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
post_install
|
||||
}
|
||||
|
||||
post_remove() {
|
||||
post_install
|
||||
}
|
@ -1,11 +0,0 @@
|
||||
post_install() {
|
||||
update-mime-database usr/share/mime &> /dev/null
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
post_install
|
||||
}
|
||||
|
||||
post_remove() {
|
||||
post_install
|
||||
}
|
@ -1,59 +0,0 @@
|
||||
From: Weng Xuetian <wengxt@gmail.com>
|
||||
Date: Thu, 17 Dec 2015 16:19:36 +0000
|
||||
Subject: Fix possible crash upon application exits (e.g. kmail)
|
||||
X-Git-Url: http://quickgit.kde.org/?p=kdepimlibs.git&a=commitdiff&h=c6bf33a9018587e96a350bfd0b2bffde1859db27
|
||||
---
|
||||
Fix possible crash upon application exits (e.g. kmail)
|
||||
|
||||
Qt lambda connection will not automatically disconnect if no context
|
||||
qobject is provided. Since SessionPrivate is not a qobject, disconnect
|
||||
the connection in the destructor to prevent accessing deleted object.
|
||||
|
||||
REVIEW: 126395
|
||||
---
|
||||
|
||||
|
||||
--- a/akonadi/src/core/session.cpp
|
||||
+++ b/akonadi/src/core/session.cpp
|
||||
@@ -301,15 +301,16 @@
|
||||
// Shutdown the thread before QApplication event loop quits - the
|
||||
// thread()->wait() mechanism in ConnectionThread dtor crashes sometimes
|
||||
// when called from QApplication destructor
|
||||
- QObject::connect(qApp, &QCoreApplication::aboutToQuit,
|
||||
- [this]() {
|
||||
- delete connThread;
|
||||
- connThread = Q_NULLPTR;
|
||||
- });
|
||||
+ connThreadCleanUp = QObject::connect(qApp, &QCoreApplication::aboutToQuit,
|
||||
+ [this]() {
|
||||
+ delete connThread;
|
||||
+ connThread = Q_NULLPTR;
|
||||
+ });
|
||||
}
|
||||
|
||||
SessionPrivate::~SessionPrivate()
|
||||
{
|
||||
+ QObject::disconnect(connThreadCleanUp);
|
||||
delete connThread;
|
||||
}
|
||||
|
||||
|
||||
--- a/akonadi/src/core/session_p.h
|
||||
+++ b/akonadi/src/core/session_p.h
|
||||
@@ -29,6 +29,7 @@
|
||||
|
||||
#include <QtCore/QQueue>
|
||||
#include <QtCore/QThreadStorage>
|
||||
+#include <QtCore/QMetaObject>
|
||||
#include <QFile>
|
||||
|
||||
class QIODevice;
|
||||
@@ -125,6 +126,7 @@
|
||||
Session *mParent;
|
||||
QThread *thread;
|
||||
ConnectionThread *connThread;
|
||||
+ QMetaObject::Connection connThreadCleanUp;
|
||||
QByteArray sessionId;
|
||||
bool connected;
|
||||
qint64 theNextTag;
|
||||
|
Loading…
Reference in New Issue
Block a user