summaryrefslogtreecommitdiffstats
path: root/kde/patch
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2015-12-31 13:53:34 +0100
committer Eric Hameleers <alien@slackware.com>2015-12-31 13:53:34 +0100
commit16e613e2585bb42feb26d70a89d8a1945c6a8827 (patch)
tree9c3086142de7474b257f7faa7c73e3c495918ffd /kde/patch
parent5c32fd177dd9dd445417f6f98c52d727e9a7f703 (diff)
downloadktown-16e613e2585bb42feb26d70a89d8a1945c6a8827.tar.gz
ktown-16e613e2585bb42feb26d70a89d8a1945c6a8827.tar.xz
Some package recompilations as a result of your feedback, thanks!
Also, three new packages have been added and one has been re-added. current/testing/deps: Updated OpenAL. current/testing/kde/applications: Rebuilt kde-runtime, kdenetwork-filesharing, kdesdk-thumbnailers, kdegraphics-thumbnailers, krfb, kamera, marble, ark, dolphin, kde-baseapps. current/testing/kde/applications: Added the missing baloo5-widgets. current/testing/kde/kdepim: Rebuilt kdepimlibs. current/testing/kde/plasma: Added bluez-qt,bluedevil (now that Slackware finally got updated to BlueZ 5)). current/testing/kde/plasma: Rebuilt plasma5-nm, plasma-workspace. current/testing/kde/plasma-extra: Re-added oxygen-fonts on request.
Diffstat (limited to 'kde/patch')
-rw-r--r--kde/patch/ark.patch4
-rw-r--r--kde/patch/ark/ark_kdebug357057.patch37
-rw-r--r--kde/patch/kdepimlibs-framework.patch3
-rw-r--r--kde/patch/kdepimlibs-framework/kdepimlibs_autotests.diff10
-rw-r--r--kde/patch/kdepimlibs.patch3
-rw-r--r--kde/patch/kdepimlibs/kdepimlibs_kmail_crash.patch59
6 files changed, 103 insertions, 13 deletions
diff --git a/kde/patch/ark.patch b/kde/patch/ark.patch
new file mode 100644
index 0000000..f9ed0ab
--- /dev/null
+++ b/kde/patch/ark.patch
@@ -0,0 +1,4 @@
+# Ark won't open RAR archives unless rar is installed (even for read access).
+# KDEBUG #357057 is fixed in 15.12.1; still needs unrar.
+cat $CWD/patch/ark/ark_kdebug357057.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/kde/patch/ark/ark_kdebug357057.patch b/kde/patch/ark/ark_kdebug357057.patch
new file mode 100644
index 0000000..76c0bab
--- /dev/null
+++ b/kde/patch/ark/ark_kdebug357057.patch
@@ -0,0 +1,37 @@
+From: Elvis Angelaccio <elvis.angelaccio@kdemail.net>
+Date: Wed, 23 Dec 2015 16:19:29 +0000
+Subject: Fallback to read-only mode if there are no read-write executables
+X-Git-Url: http://quickgit.kde.org/?p=ark.git&a=commitdiff&h=087e5aab49c60ac5930742fe892fa930048e2f43
+---
+Fallback to read-only mode if there are no read-write executables
+
+Commit 2d000a0 introduced executables check when loading a plugin. However the
+current behavior is too restrictive: if one wants only to open a rar or a
+zip archive, there is no need to require also the rar or zip program to be
+installed. Plus, some distributions (e.g. Archlinux) ship only unrar in their
+official repositories.
+
+With this commit, Ark is able to understand that e.g. unrar is installed but
+rar is not. In this case, Ark can and should fallback to read-only mode,
+to disable the Add/Delete actions in the toolbar.
+
+BUG: 357057
+FIXED-IN: 15.12.1
+
+CC: rthomsen6@gmail.com
+---
+
+
+--- a/kerfuffle/archive_kerfuffle.cpp
++++ b/kerfuffle/archive_kerfuffle.cpp
+@@ -173,6 +173,9 @@
+
+ if (iface->findExecutables(!isReadOnly)) {
+ return new Archive(iface, isReadOnly, parent);
++ } else if (!isReadOnly && iface->findExecutables(false)) {
++ qCWarning(ARK) << "Failed to find read-write executables: falling back to read-only mode for read-write plugin" << pluginName;
++ return new Archive(iface, true, parent);
+ } else {
+ qCWarning(ARK) << "Failed to find needed executables for plugin" << pluginName;
+ }
+
diff --git a/kde/patch/kdepimlibs-framework.patch b/kde/patch/kdepimlibs-framework.patch
deleted file mode 100644
index 36c99fa..0000000
--- a/kde/patch/kdepimlibs-framework.patch
+++ /dev/null
@@ -1,3 +0,0 @@
-# The autotests generate ECM errors so skip building them:
-cat $CWD/patch/kdepimlibs-framework/kdepimlibs_autotests.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/kde/patch/kdepimlibs-framework/kdepimlibs_autotests.diff b/kde/patch/kdepimlibs-framework/kdepimlibs_autotests.diff
deleted file mode 100644
index 24b21ff..0000000
--- a/kde/patch/kdepimlibs-framework/kdepimlibs_autotests.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/syndication/CMakeLists.txt 2014-06-02 13:44:23.000000000 +0200
-+++ b/syndication/CMakeLists.txt 2014-06-02 16:51:00.393339484 +0200
-@@ -41,7 +41,6 @@
- ########### Targets ###########
-
- add_subdirectory(src/syndication)
--add_subdirectory(autotests)
-
- ########### CMake Config Files ###########
- set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5Syndication")
diff --git a/kde/patch/kdepimlibs.patch b/kde/patch/kdepimlibs.patch
new file mode 100644
index 0000000..bae1792
--- /dev/null
+++ b/kde/patch/kdepimlibs.patch
@@ -0,0 +1,3 @@
+# 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
new file mode 100644
index 0000000..1614e07
--- /dev/null
+++ b/kde/patch/kdepimlibs/kdepimlibs_kmail_crash.patch
@@ -0,0 +1,59 @@
+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;
+