summaryrefslogtreecommitdiffstats
path: root/kde/patch
diff options
context:
space:
mode:
Diffstat (limited to 'kde/patch')
-rw-r--r--kde/patch/kde-workspace.patch8
-rw-r--r--kde/patch/kde-workspace/kde-workspace-4.9.1_bug_306260+306275.diff.gzbin0 -> 2313 bytes
-rw-r--r--kde/patch/kde-workspace/kde-workspace-4.9.2_unbreak_python2_appletloading.diff.gzbin0 -> 787 bytes
-rw-r--r--kde/patch/kde-workspace/kde-workspace.batteryapplet.diff.gzbin494 -> 301 bytes
-rw-r--r--kde/patch/kdelibs.patch9
-rw-r--r--kde/patch/kdelibs/kdelibs.fstab.patch47
-rw-r--r--kde/patch/kdelibs/kdelibs.mimetypecheck.BUG311214.patch48
-rw-r--r--kde/patch/kdepim.patch3
-rw-r--r--kde/patch/kdepim/kdepim-4.8.80_x11libs.patch30
-rw-r--r--kde/patch/strigi-multimedia.patch3
-rw-r--r--kde/patch/strigi-multimedia/strigi-multimedia_port.patch29
11 files changed, 126 insertions, 51 deletions
diff --git a/kde/patch/kde-workspace.patch b/kde/patch/kde-workspace.patch
index e2b5f82..19f7d09 100644
--- a/kde/patch/kde-workspace.patch
+++ b/kde/patch/kde-workspace.patch
@@ -8,5 +8,13 @@ zcat $CWD/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff.gz | patch -
# Fix a long-standing performance issue (since 4.0) in kwin (not needed for KDE >= 4.7.2):
#zcat $CWD/patch/kde-workspace/kde-workspace.kwin.effects.performance.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+# Patch a kwin bug which showed up right after 4.9.1 was released
+# (kde bugs 306260+306275, fixed in 4.9.2):
+#zcat $CWD/patch/kde-workspace/kde-workspace-4.9.1_bug_306260+306275.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+# Unbreak Python 2 applet loading.
+# Fixed just before 4.9.2 release:
+#zcat $CWD/patch/kde-workspace/kde-workspace-4.9.2_unbreak_python2_appletloading.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
# Always show 'remaining time' in the popup of the battery plasmoid:
zcat $CWD/patch/kde-workspace/kde-workspace.batteryapplet.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/kde/patch/kde-workspace/kde-workspace-4.9.1_bug_306260+306275.diff.gz b/kde/patch/kde-workspace/kde-workspace-4.9.1_bug_306260+306275.diff.gz
new file mode 100644
index 0000000..0afbc5f
--- /dev/null
+++ b/kde/patch/kde-workspace/kde-workspace-4.9.1_bug_306260+306275.diff.gz
Binary files differ
diff --git a/kde/patch/kde-workspace/kde-workspace-4.9.2_unbreak_python2_appletloading.diff.gz b/kde/patch/kde-workspace/kde-workspace-4.9.2_unbreak_python2_appletloading.diff.gz
new file mode 100644
index 0000000..1ca2c8d
--- /dev/null
+++ b/kde/patch/kde-workspace/kde-workspace-4.9.2_unbreak_python2_appletloading.diff.gz
Binary files differ
diff --git a/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff.gz b/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff.gz
index c6226ca..7e16f14 100644
--- a/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff.gz
+++ b/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff.gz
Binary files differ
diff --git a/kde/patch/kdelibs.patch b/kde/patch/kdelibs.patch
index 2445d6d..407e25a 100644
--- a/kde/patch/kdelibs.patch
+++ b/kde/patch/kdelibs.patch
@@ -8,12 +8,13 @@ zcat $CWD/patch/kdelibs/kdelibs.docbook.patch.gz | patch -p1 --verbose || { touc
# prevents any query which does NOT use wide unicode characters to fail:
#cat $CWD/patch/kdelibs/kdelibs.nepomuk.unicode.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+# Fix a bug introduced in kdelibs-4.9.4 which was not detected until right
+# after release. This breaks opening of .odt and other zip-based files
+# in external applications:
+#cat $CWD/patch/kdelibs/kdelibs.mimetypecheck.BUG311214.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
# Make uPnP support depend on the environment variable SOLID_UPNP,
# e.g. by creating an /etc/profile.d/upnp.sh file with the following contents:
# export SOLID_UPNP=1
cat $CWD/patch/kdelibs/kdelibs.upnp_conditional.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-# Fix fstab support in solid (last-minute patch for KDE 4.8.4 which _just_
-# made it into the official tarball):
-#cat $CWD/patch/kdelibs/kdelibs.fstab.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/kde/patch/kdelibs/kdelibs.fstab.patch b/kde/patch/kdelibs/kdelibs.fstab.patch
deleted file mode 100644
index a57662b..0000000
--- a/kde/patch/kdelibs/kdelibs.fstab.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Alex Fiestas <afiestas@kde.org>
-Date: Tue, 05 Jun 2012 16:12:28 +0000
-Subject: Emit deviceRemoved/Added with the right deviceList set
-X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&amp;a=commitdiff&amp;h=19213a6c34e1b47a100815ccbfee8b5c70c3c12a
----
-Emit deviceRemoved/Added with the right deviceList set
-
-The problem is quite straightforward, deviceAdded is being emitted when
-the m_deviceList has the OLD list, so the new device is still NOT in it.
-If the user of the library instances a device Solid::Device(UDI) in the
-slot after that signal, the device will be null because it will not be
-found in m_deviceList.
-
-REVIEW: 105132
----
-
-
---- a/solid/solid/backends/fstab/fstabmanager.cpp
-+++ b/solid/solid/backends/fstab/fstabmanager.cpp
-@@ -116,17 +116,19 @@ void FstabManager::_k_updateDeviceList()
- QSet<QString> newlist = deviceList.toSet();
- QSet<QString> oldlist = m_deviceList.toSet();
-
-- foreach(const QString &device, newlist) {
-- if ( !oldlist.contains(device) )
-- emit deviceAdded(udiPrefix() + "/" + device);
-- }
--
- foreach(const QString &device, oldlist) {
-- if ( !newlist.contains(device) )
-+ if ( !newlist.contains(device) ) {
- emit deviceRemoved(udiPrefix() + "/" + device);
-+ }
- }
-
- m_deviceList = deviceList;
-+
-+ foreach(const QString &device, newlist) {
-+ if ( !oldlist.contains(device) ) {
-+ emit deviceAdded(udiPrefix() + "/" + device);
-+ }
-+ }
- }
-
- void FstabManager::onMtabChanged()
-
-
diff --git a/kde/patch/kdelibs/kdelibs.mimetypecheck.BUG311214.patch b/kde/patch/kdelibs/kdelibs.mimetypecheck.BUG311214.patch
new file mode 100644
index 0000000..048f2d0
--- /dev/null
+++ b/kde/patch/kdelibs/kdelibs.mimetypecheck.BUG311214.patch
@@ -0,0 +1,48 @@
+commit 73283f1332e90fbb6fe0caa39a038cb16b83a54c
+Author: David Faure <faure@kde.org>
+Date: Wed Dec 5 22:42:25 2012 +0100
+
+ Revert "Also check parent mimetypes in protocolForArchiveMimetype()."
+
+ This reverts commit 4f296cfbced2c4ad54beec8f500ed2d3fc04ee05.
+ It breaks opening odt and other zip-based files in external apps.
+ That's what I get for delegating the testing :-)
+ BUG: 311214
+
+diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp
+index 3f1cadd..502a3e6 100644
+--- a/kio/kio/kprotocolmanager.cpp
++++ b/kio/kio/kprotocolmanager.cpp
+@@ -47,7 +47,6 @@
+ #include <ksharedconfig.h>
+ #include <kstandarddirs.h>
+ #include <kurl.h>
+-#include <kmimetype.h>
+ #include <kmimetypetrader.h>
+ #include <kprotocolinfofactory.h>
+
+@@ -1190,23 +1189,7 @@ QString KProtocolManager::protocolForArchiveMimetype( const QString& mimeType )
+ }
+ }
+ }
+- const QString prot = d->protocolForArchiveMimetypes.value(mimeType);
+- if (!prot.isEmpty())
+- return prot;
+-
+- // Check parent mimetypes
+- KMimeType::Ptr mime = KMimeType::mimeType(mimeType);
+- if (mime) {
+- const QStringList parentMimeTypes = mime->allParentMimeTypes();
+- Q_FOREACH(const QString& parentMimeType, parentMimeTypes) {
+- const QString res = d->protocolForArchiveMimetypes.value(parentMimeType);
+- if (!res.isEmpty()) {
+- return res;
+- }
+- }
+- }
+-
+- return QString();
++ return d->protocolForArchiveMimetypes.value(mimeType);
+ }
+
+ #undef PRIVATE_DATA
diff --git a/kde/patch/kdepim.patch b/kde/patch/kdepim.patch
index 1934e35..516270d 100644
--- a/kde/patch/kdepim.patch
+++ b/kde/patch/kdepim.patch
@@ -9,3 +9,6 @@ cat $CWD/patch/kdepim/kdepim-4.5.85-install-headers.patch | patch -p1 --verbose
# (it got included in the tarball _just_ before the release)
#cat $CWD/patch/kdepim/kdepim-4.8.1_bug_258551.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+# Build fix for 4.8.80 but does nnot seem to be needed on Slackware:
+#cat $CWD/patch/kdepim/kdepim-4.8.80_x11libs.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/kde/patch/kdepim/kdepim-4.8.80_x11libs.patch b/kde/patch/kdepim/kdepim-4.8.80_x11libs.patch
new file mode 100644
index 0000000..f87d8f4
--- /dev/null
+++ b/kde/patch/kdepim/kdepim-4.8.80_x11libs.patch
@@ -0,0 +1,30 @@
+commit 26f9d62b9a9b4bfa736b342903d16dc0d8739d98
+Author: Allen Winter <winter@kde.org>
+Date: Thu May 31 12:58:07 2012 -0400
+
+ Revert last: Remove X11 requirement
+
+ CCMAIL: djarvie@kde.org
+ David, without explicit linking to X11 libs, I get an unresolved
+ symbol for XSetWMHints
+
+diff --git a/kalarm/CMakeLists.txt b/kalarm/CMakeLists.txt
+index 9efb9a1..97e69a8 100644
+--- a/kalarm/CMakeLists.txt
++++ b/kalarm/CMakeLists.txt
+@@ -202,6 +202,7 @@ if(KALARM_USE_AKONADI)
+ kdepim
+ ${KDE4_KCMUTILS_LIBS}
+ ${KDE4_PHONON_LIBS}
++ ${X11_X11_LIB}
+ )
+ else(KALARM_USE_AKONADI)
+ target_link_libraries(kalarm_bin
+@@ -220,6 +221,7 @@ else(KALARM_USE_AKONADI)
+ kdepim
+ ${KDE4_KCMUTILS_LIBS}
+ ${KDE4_PHONON_LIBS}
++ ${X11_X11_LIB}
+ )
+ endif(KALARM_USE_AKONADI)
+
diff --git a/kde/patch/strigi-multimedia.patch b/kde/patch/strigi-multimedia.patch
new file mode 100644
index 0000000..aebad0d
--- /dev/null
+++ b/kde/patch/strigi-multimedia.patch
@@ -0,0 +1,3 @@
+# Fix build:
+cat $CWD/patch/strigi-multimedia/strigi-multimedia_port.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/kde/patch/strigi-multimedia/strigi-multimedia_port.patch b/kde/patch/strigi-multimedia/strigi-multimedia_port.patch
new file mode 100644
index 0000000..21a29a0
--- /dev/null
+++ b/kde/patch/strigi-multimedia/strigi-multimedia_port.patch
@@ -0,0 +1,29 @@
+diff -urB strigi-multimedia/CMakeLists.txt new/CMakeLists.txt
+--- strigi-multimedia/CMakeLists.txt 2012-04-08 11:47:03.923386124 +0200
++++ new/CMakeLists.txt 2012-04-08 12:29:05.807989600 +0200
+@@ -1,3 +1,5 @@
++Project(strigi-multimedia)
++
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/)
+ find_package(Qt4 REQUIRED)
+ find_package(KDE4 REQUIRED)
+@@ -5,12 +7,10 @@
+ include(MacroLibrary)
+
+ include_directories(${KDE4_INCLUDES} ${QT_INCLUDES})
++add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} )
+
+ include(CheckIncludeFileCXX)
+
+-message (STATUS "port strigi-analyzer !!!")
+-if(KFILE_PLUGINS_PORTED)
+-
+ macro_optional_find_package(Theora)
+ macro_log_feature(THEORA_FOUND "Theora" "A video codec intended for use within the Ogg's project's Ogg multimedia streaming system" "http://www.theora.org" FALSE "" "Required to build the Theora Strigi Analyzer.")
+
+@@ -35,5 +35,3 @@
+ if (OGGVORBIS_FOUND)
+ add_subdirectory(ogg)
+ endif(OGGVORBIS_FOUND)
+-
+-endif(KFILE_PLUGINS_PORTED)