Merge branch 'elogind'HEADmaster

6 files changed, 0 insertions, 382 deletions

diff --git a/kde/patch/kdepim.patch b/kde/patch/kdepim.patch
deleted file mode 100644
index c5aeb9c..0000000
--- a/kde/patch/kdepim.patch
+++ /dev/null
@@ -1,4 +0,0 @@
-# Install Kleopatra headers, needed by kopete-cryptography:
-# This used to be fixed?
-#cat $CWD/patch/kdepim/kdepim-install_kleopatra_headers.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/kde/patch/kdepim/kdepim-install_kleopatra_headers.patch b/kde/patch/kdepim/kdepim-install_kleopatra_headers.patch
deleted file mode 100644
index 18662fd..0000000
--- a/kde/patch/kdepim/kdepim-install_kleopatra_headers.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-diff -uarN kdepim-15.08.0.orig/kleopatra/libkleopatraclient/CMakeLists.txt kdepim-15.08.0/kleopatra/libkleopatraclient/CMakeLists.txt
---- kdepim-15.08.0.orig/kleopatra/libkleopatraclient/CMakeLists.txt	2015-08-10 21:56:00.000000000 +0200
-+++ kdepim-15.08.0/kleopatra/libkleopatraclient/CMakeLists.txt	2015-08-24 23:05:07.650076668 +0200
-@@ -4,6 +4,11 @@
- add_subdirectory(core)
- add_subdirectory(gui)
- 
-+install(
-+  FILES kleopatraclient_export.h
-+  DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient
-+  )
-+
- if(BUILD_TESTING)
-     add_subdirectory(tests)
- endif()
-diff -uarN kdepim-15.08.0.orig/kleopatra/libkleopatraclient/core/CMakeLists.txt kdepim-15.08.0/kleopatra/libkleopatraclient/core/CMakeLists.txt
---- kdepim-15.08.0.orig/kleopatra/libkleopatraclient/core/CMakeLists.txt	2015-08-10 21:56:00.000000000 +0200
-+++ kdepim-15.08.0/kleopatra/libkleopatraclient/core/CMakeLists.txt	2015-08-24 22:52:15.613045160 +0200
-@@ -67,3 +67,13 @@
- target_link_libraries(kleopatraclientcore Qt5::Widgets KF5::I18n)
- 
- install(TARGETS kleopatraclientcore ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-+
-+install(
-+  FILES
-+    initialization.h
-+    command.h
-+    selectcertificatecommand.h
-+    signencryptfilescommand.h
-+    decryptverifyfilescommand.h
-+  DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/core
-+  )
-diff -uarN kdepim-15.08.0.orig/kleopatra/libkleopatraclient/gui/CMakeLists.txt kdepim-15.08.0/kleopatra/libkleopatraclient/gui/CMakeLists.txt
---- kdepim-15.08.0.orig/kleopatra/libkleopatraclient/gui/CMakeLists.txt	2015-08-10 21:56:00.000000000 +0200
-+++ kdepim-15.08.0/kleopatra/libkleopatraclient/gui/CMakeLists.txt	2015-08-24 22:52:15.613045160 +0200
-@@ -16,3 +16,9 @@
- )
- 
- install(TARGETS kleopatraclientgui ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-+
-+install(
-+  FILES
-+    certificaterequester.h
-+  DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/gui
-+  )
-diff -uarN kdepim-15.08.0.orig/libkleo/CMakeLists.txt kdepim-15.08.0/libkleo/CMakeLists.txt
---- kdepim-15.08.0.orig/libkleo/CMakeLists.txt	2015-08-10 21:56:00.000000000 +0200
-+++ kdepim-15.08.0/libkleo/CMakeLists.txt	2015-08-24 22:52:15.613045160 +0200
-@@ -126,3 +126,61 @@
- else ()
- install ( FILES libkleopatrarc.desktop DESTINATION ${KDE_INSTALL_CONFDIR} RENAME libkleopatrarc )
- endif ()
-+
-+install( FILES
-+    kleo/kleo_export.h
-+    kleo/enum.h
-+    kleo/oidmap.h
-+    kleo/cryptobackend.h
-+    kleo/cryptobackendfactory.h
-+    kleo/cryptoconfig.h
-+    kleo/dn.h
-+    kleo/job.h
-+    kleo/keylistjob.h
-+    kleo/keygenerationjob.h
-+    kleo/abstractimportjob.h
-+    kleo/importjob.h
-+    kleo/importfromkeyserverjob.h
-+    kleo/exportjob.h
-+    kleo/changeexpiryjob.h
-+    kleo/changeownertrustjob.h
-+    kleo/downloadjob.h
-+    kleo/deletejob.h
-+    kleo/encryptjob.h
-+    kleo/decryptjob.h
-+    kleo/signjob.h
-+    kleo/specialjob.h
-+    kleo/verifydetachedjob.h
-+    kleo/verifyopaquejob.h
-+    kleo/decryptverifyjob.h
-+    kleo/signencryptjob.h
-+    kleo/signkeyjob.h
-+    kleo/adduseridjob.h
-+    kleo/refreshkeysjob.h
-+    kleo/multideletejob.h
-+    kleo/hierarchicalkeylistjob.h
-+    kleo/keyfilter.h
-+    kleo/keyfiltermanager.h
-+    kleo/changepasswdjob.h
-+    kleo/checksumdefinition.h
-+    kleo/exception.h
-+    kleo/kconfigbasedkeyfilter.h
-+    kleo/listallkeysjob.h
-+    kleo/stl_util.h
-+    DESTINATION ${INCLUDE_INSTALL_DIR}/kleo COMPONENT Devel)
-+
-+install ( FILES
-+    ui/kdhorizontalline.h
-+    ui/messagebox.h
-+    ui/progressbar.h
-+    ui/progressdialog.h
-+    ui/keylistview.h
-+    ui/keyselectiondialog.h
-+    ui/keyrequester.h
-+    ui/keyapprovaldialog.h
-+    ui/dnattributeorderconfigwidget.h
-+    ui/cryptoconfigmodule.h
-+    ui/cryptoconfigdialog.h
-+    ui/directoryserviceswidget.h
-+    ui/filenamerequester.h
-+    DESTINATION ${INCLUDE_INSTALL_DIR}/kleo/ui COMPONENT Devel)
-diff -uarN kdepim-15.08.0.orig/libkpgp/CMakeLists.txt kdepim-15.08.0/libkpgp/CMakeLists.txt
---- kdepim-15.08.0.orig/libkpgp/CMakeLists.txt	2015-08-10 21:56:00.000000000 +0200
-+++ kdepim-15.08.0/libkpgp/CMakeLists.txt	2015-08-24 23:04:02.505074051 +0200
-@@ -44,6 +44,15 @@
- set_target_properties(kpgp PROPERTIES VERSION ${KDEPIM_LIB_VERSION} SOVERSION ${KDEPIM_LIB_SOVERSION})
- install(TARGETS kpgp ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
- 
-+install(FILES
-+        kpgp.h
-+        kpgpbase.h
-+        kpgpblock.h
-+        kpgpkey.h
-+        kpgpui.h
-+        libkpgp_export.h
-+        DESTINATION ${INCLUDE_INSTALL_DIR}/kpgp COMPONENT Devel )
-+
- if(BUILD_TESTING)
-     add_subdirectory( tests )
- endif()
diff --git a/kde/patch/kdepimlibs.patch b/kde/patch/kdepimlibs.patch
deleted file mode 100644
index 05e5dfe..0000000
--- a/kde/patch/kdepimlibs.patch
+++ /dev/null
@@ -1,3 +0,0 @@
-# Fix a crash in kmail (fixed in 15.12.1):
-#cat $CWD/patch/kdepimlibs/kdepimlibs_kmail_crash.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/kde/patch/kdepimlibs/kdepimlibs_kmail_crash.patch b/kde/patch/kdepimlibs/kdepimlibs_kmail_crash.patch
deleted file mode 100644
index 1614e07..0000000
--- a/kde/patch/kdepimlibs/kdepimlibs_kmail_crash.patch
+++ /dev/null
@@ -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;
-
diff --git a/kde/patch/kdepimlibs4.patch b/kde/patch/kdepimlibs4.patch
deleted file mode 100644
index 91a7d15..0000000
--- a/kde/patch/kdepimlibs4.patch
+++ /dev/null
@@ -1,3 +0,0 @@
-# Fix a compilation issue with new libical:
-cat $CWD/patch/kdepimlibs4/kdepimlibs.libical3.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/kde/patch/kdepimlibs4/kdepimlibs.libical3.diff b/kde/patch/kdepimlibs4/kdepimlibs.libical3.diff
deleted file mode 100644
index c3b8caf..0000000
--- a/kde/patch/kdepimlibs4/kdepimlibs.libical3.diff
+++ /dev/null
@@ -1,184 +0,0 @@
---- ./kcalcore/icalformat_p.cpp.orig	2015-06-24 07:43:14.000000000 -0500
-+++ ./kcalcore/icalformat_p.cpp	2017-12-05 23:03:44.742261940 -0600
-@@ -2301,7 +2301,6 @@
-     t.second = 0;
- 
-     t.is_date = 1;
--    t.is_utc = 0;
-     t.zone = 0;
- 
-     return t;
-@@ -2322,8 +2321,7 @@
-         t.minute = datetime.time().minute();
-         t.second = datetime.time().second();
-     }
--    t.zone = 0;   // zone is NOT set
--    t.is_utc = datetime.isUtc() ? 1 : 0;
-+    t.zone = datetime.isUtc() ? icaltimezone_get_utc_timezone() : 0;   // zone is NOT set
- 
-     // _dumpIcaltime( t );
- 
-@@ -2398,7 +2396,7 @@
-     }
- 
-     KTimeZone ktz;
--    if (!t.is_utc) {
-+    if (!icaltime_is_utc( t )) {
-         ktz = dt.timeZone();
-     }
- 
-@@ -2431,7 +2429,7 @@
- //  _dumpIcaltime( t );
- 
-     KDateTime::Spec timeSpec;
--    if (t.is_utc  ||  t.zone == icaltimezone_get_utc_timezone()) {
-+    if (icaltime_is_utc( t )  ||  t.zone == icaltimezone_get_utc_timezone()) {
-         timeSpec = KDateTime::UTC;   // the time zone is UTC
-         utc = false;    // no need to convert to UTC
-     } else {
---- ./kcalcore/icaltimezones.cpp.orig	2015-06-24 07:43:14.000000000 -0500
-+++ ./kcalcore/icaltimezones.cpp	2017-12-05 23:03:55.482262829 -0600
-@@ -54,7 +54,7 @@
- {
-     return QDateTime(QDate(t.year, t.month, t.day),
-                      QTime(t.hour, t.minute, t.second),
--                     (t.is_utc ? Qt::UTC : Qt::LocalTime));
-+                     (icaltime_is_utc( t ) ? Qt::UTC : Qt::LocalTime));
- }
- 
- // Maximum date for time zone data.
-@@ -81,7 +81,6 @@
-     t.second = local.time().second();
-     t.is_date = 0;
-     t.zone = 0;
--    t.is_utc = 0;
-     return t;
- }
- 
-@@ -886,7 +885,7 @@
-         case ICAL_LASTMODIFIED_PROPERTY:
-         {
-             const icaltimetype t = icalproperty_get_lastmodified(p);
--            if (t.is_utc) {
-+            if (icaltime_is_utc( t )) {
-                 data->d->lastModified = toQDateTime(t);
-             } else {
-                 kDebug() << "LAST-MODIFIED not UTC";
-@@ -1259,7 +1258,7 @@
-     // Convert DTSTART to QDateTime, and from local time to UTC
-     const QDateTime localStart = toQDateTime(dtstart);     // local time
-     dtstart.second -= prevOffset;
--    dtstart.is_utc = 1;
-+    dtstart.zone = icaltimezone_get_utc_timezone();
-     const QDateTime utcStart = toQDateTime(icaltime_normalize(dtstart));       // UTC
- 
-     transitions += utcStart;
-@@ -1286,13 +1285,13 @@
-                     t.minute = dtstart.minute;
-                     t.second = dtstart.second;
-                     t.is_date = 0;
--                    t.is_utc = 0;    // dtstart is in local time
-+                    t.zone = 0;    // dtstart is in local time
-                 }
-                 // RFC2445 states that RDATE must be in local time,
-                 // but we support UTC as well to be safe.
--                if (!t.is_utc) {
-+                if (!icaltime_is_utc( t )) {
-                     t.second -= prevOffset;    // convert to UTC
--                    t.is_utc = 1;
-+                    t.zone = icaltimezone_get_utc_timezone();
-                     t = icaltime_normalize(t);
-                 }
-                 transitions += toQDateTime(t);
---- ./kcal/icalformat_p.cpp.orig	2015-06-24 07:43:14.000000000 -0500
-+++ ./kcal/icalformat_p.cpp	2017-12-05 23:04:01.670263342 -0600
-@@ -2087,7 +2087,6 @@
-   t.second = 0;
- 
-   t.is_date = 1;
--  t.is_utc = 0;
-   t.zone = 0;
- 
-   return t;
-@@ -2106,8 +2105,7 @@
-   t.second = datetime.time().second();
- 
-   t.is_date = 0;
--  t.zone = 0;   // zone is NOT set
--  t.is_utc = datetime.isUtc() ? 1 : 0;
-+  t.zone = datetime.isUtc() ? icaltimezone_get_utc_timezone() : 0;
- 
-   // _dumpIcaltime( t );
- 
-@@ -2174,7 +2172,7 @@
-   }
- 
-   KTimeZone ktz;
--  if ( !t.is_utc ) {
-+  if ( !icaltime_is_utc( t ) ) {
-     ktz = dt.timeZone();
-   }
- 
-@@ -2207,7 +2205,7 @@
- //  _dumpIcaltime( t );
- 
-   KDateTime::Spec timeSpec;
--  if ( t.is_utc  ||  t.zone == icaltimezone_get_utc_timezone() ) {
-+  if ( icaltime_is_utc( t )  ||  t.zone == icaltimezone_get_utc_timezone() ) {
-     timeSpec = KDateTime::UTC;   // the time zone is UTC
-     utc = false;    // no need to convert to UTC
-   } else {
---- ./kcal/icaltimezones.cpp.orig	2015-06-24 07:43:14.000000000 -0500
-+++ ./kcal/icaltimezones.cpp	2017-12-05 23:04:07.385263815 -0600
-@@ -50,7 +50,7 @@
- {
-   return QDateTime( QDate( t.year, t.month, t.day ),
-                     QTime( t.hour, t.minute, t.second ),
--                    ( t.is_utc ? Qt::UTC : Qt::LocalTime ) );
-+                    ( icaltime_is_utc( t ) ? Qt::UTC : Qt::LocalTime ) );
- }
- 
- // Maximum date for time zone data.
-@@ -77,7 +77,6 @@
-   t.second = local.time().second();
-   t.is_date = 0;
-   t.zone = 0;
--  t.is_utc = 0;
-   return t;
- }
- 
-@@ -787,7 +786,7 @@
-     case ICAL_LASTMODIFIED_PROPERTY:
-     {
-       icaltimetype t = icalproperty_get_lastmodified(p);
--      if ( t.is_utc ) {
-+      if ( icaltime_is_utc( t ) ) {
-         data->d->lastModified = toQDateTime( t );
-       } else {
-         kDebug() << "LAST-MODIFIED not UTC";
-@@ -972,7 +971,7 @@
-   // Convert DTSTART to QDateTime, and from local time to UTC
-   QDateTime localStart = toQDateTime( dtstart );   // local time
-   dtstart.second -= prevOffset;
--  dtstart.is_utc = 1;
-+  dtstart.zone = icaltimezone_get_utc_timezone();
-   QDateTime utcStart = toQDateTime( icaltime_normalize( dtstart ) );   // UTC
- 
-   transitions += utcStart;
-@@ -999,13 +998,13 @@
-           t.minute = dtstart.minute;
-           t.second = dtstart.second;
-           t.is_date = 0;
--          t.is_utc = 0;    // dtstart is in local time
-+          t.zone = 0;    // dtstart is in local time
-         }
-         // RFC2445 states that RDATE must be in local time,
-         // but we support UTC as well to be safe.
--        if ( !t.is_utc ) {
-+        if ( !icaltime_is_utc( t ) ) {
-           t.second -= prevOffset;    // convert to UTC
--          t.is_utc = 1;
-+          t.zone = icaltimezone_get_utc_timezone();
-           t = icaltime_normalize( t );
-         }
-         transitions += toQDateTime( t );