summaryrefslogtreecommitdiffstats
path: root/kde
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2014-12-22 15:11:27 +0100
committer Eric Hameleers <alien@slackware.com>2014-12-22 15:11:27 +0100
commit5fc3fdb057a38c4c237a09c390871899dcfde24a (patch)
tree8b63511032f4850e197a065260d07f5970ad6dab /kde
parent8d7dd4892e8aa73ce7c3ea73f48a5274e48f5428 (diff)
downloadktown-4.10.5.tar.gz
ktown-4.10.5.tar.xz
KDE 4.10.5 for Slackware 14.0 (02jul2013)4.10.5
Diffstat (limited to 'kde')
-rwxr-xr-xkde/KDE.SlackBuild44
-rw-r--r--kde/KDE.options4
-rwxr-xr-xkde/build/increment.sh17
-rw-r--r--kde/build/kde-runtime (renamed from kde/build/kdelibs)0
-rw-r--r--kde/cmake/kde-runtime17
-rw-r--r--kde/modularize128
-rw-r--r--kde/modules/extragear5
-rw-r--r--kde/modules/kdeaccessibility1
-rw-r--r--kde/modules/kdebase2
-rw-r--r--kde/modules/kdebindings4
-rw-r--r--kde/modules/kdegames83
-rw-r--r--kde/modules/kdemultimedia1
-rw-r--r--kde/modules/kdepim1
-rw-r--r--kde/modules/kdeutils5
-rw-r--r--kde/modules/oxygen-icons1
-rw-r--r--kde/patch/ark.patch4
-rw-r--r--kde/patch/ark/ark-4.8.0_7zip_crash.patch24
-rw-r--r--kde/patch/calligra.patch7
-rw-r--r--kde/patch/calligra/calligra-2.3.87_gcc47.patch13
-rw-r--r--kde/patch/calligra/calligra.git.6e4d171dfa5bad07e06277ef8e36d8a6a00005db.diff.gzbin806 -> 0 bytes
-rw-r--r--kde/patch/kde-baseapps.patch12
-rw-r--r--kde/patch/kde-baseapps/dolphin-4.8.0_ctrlclick.patch25
-rw-r--r--kde/patch/kde-baseapps/dolphin.kitemlistkeyboardsearchmanager.cpp.diff31
-rw-r--r--kde/patch/kde-baseapps/konsole-4.8.2_kdebug280896.patch62
-rw-r--r--kde/patch/kde-workspace.patch16
-rw-r--r--kde/patch/kde-workspace/kde-workspace-4.9.1_bug_306260+306275.diff.gzbin2313 -> 0 bytes
-rw-r--r--kde/patch/kde-workspace/kde-workspace-4.9.2_unbreak_python2_appletloading.diff.gzbin787 -> 0 bytes
-rw-r--r--kde/patch/kde-workspace/kde-workspace.kwin.effects.performance.diff.gzbin1019 -> 0 bytes
-rw-r--r--kde/patch/kdeedu.patch4
-rw-r--r--kde/patch/kdeedu/marble130_qt480_colorfix.diff65
-rw-r--r--kde/patch/kdeedu/marble130_qt480_qcolor.diff22
-rw-r--r--kde/patch/kdelibs.patch18
-rw-r--r--kde/patch/kdelibs/changeset_r9323adac35d40da69e3cb18504340e984c4afd05.diff.gzbin0 -> 493 bytes
-rw-r--r--kde/patch/kdelibs/kdelibs.kssl.CVE-2011-3365.patch24
-rw-r--r--kde/patch/kdelibs/kdelibs.mimetypecheck.BUG311214.patch48
-rw-r--r--kde/patch/kdelibs/kdelibs.nepomuk.unicode.patch65
-rw-r--r--kde/patch/kdelibs/kdelibs.upnp_conditional.patch15
-rw-r--r--kde/patch/kdelibs/kdelibs.upnp_conditional.patch.gzbin0 -> 347 bytes
-rw-r--r--kde/patch/kdepim-runtime.patch7
-rw-r--r--kde/patch/kdepim-runtime/0001-Ignore-items-with-empty-remote-ids-here.patch36
-rw-r--r--kde/patch/kdepim-runtime/Kmail-has-duplicated-folders-after-migration-from-previous-version_bug-283467.patch76
-rw-r--r--kde/patch/kdepim.patch14
-rw-r--r--kde/patch/kdepim/kdepim-4.5.85-install-headers.patch124
-rw-r--r--kde/patch/kdepim/kdepim-4.7.1_memleak.patch22
-rw-r--r--kde/patch/kdepim/kdepim-4.8.1_bug_258551.patch58
-rw-r--r--kde/patch/kdepim/kdepim-4.8.80_x11libs.patch30
-rw-r--r--kde/patch/kdeplasma-addons.patch3
-rw-r--r--kde/patch/kdeplasma-addons/random_generator_cve-2013-2120.patch.gzbin0 -> 945 bytes
-rw-r--r--kde/patch/kdesdk.patch4
-rw-r--r--kde/patch/kdesdk/kdesdk-4.8.2_scriptperms.diff14
-rw-r--r--kde/patch/kgpg.patch4
-rw-r--r--kde/patch/kgpg/kgpg-4.8.0.noconfigfile.patch27
-rw-r--r--kde/patch/korundum.patch2
-rw-r--r--kde/patch/korundum/korundum_ruby19.patch31
-rw-r--r--kde/patch/korundum/korundum_ruby19.patch.gzbin0 -> 488 bytes
-rw-r--r--kde/patch/ktorrent.patch4
-rw-r--r--kde/patch/ktorrent/ktorrent.taskmanager.diff174
-rw-r--r--kde/patch/strigi-multimedia.patch2
-rw-r--r--kde/patch/strigi-multimedia/strigi-multimedia_port.patch29
-rw-r--r--kde/patch/strigi-multimedia/strigi-multimedia_port.patch.gzbin0 -> 639 bytes
-rw-r--r--kde/pre-install/amarok.pre-install9
-rw-r--r--[-rwxr-xr-x]kde/pre-install/kdewebdev/tidy/tidy.build0
-rw-r--r--kde/slack-desc/kscreen19
-rw-r--r--kde/slack-desc/libkcompactdisc4
-rw-r--r--kde/slack-desc/libkmahjongg2
-rw-r--r--kde/slack-desc/libkscreen19
-rw-r--r--kde/slack-desc/oxygen-gtk34
-rw-r--r--kde/slack-desc/print-manager2
68 files changed, 288 insertions, 1200 deletions
diff --git a/kde/KDE.SlackBuild b/kde/KDE.SlackBuild
index ffbf3bc..5af89d4 100755
--- a/kde/KDE.SlackBuild
+++ b/kde/KDE.SlackBuild
@@ -330,13 +330,54 @@ build_mod_pkg () {
done
- # Nothing here? Must have been fully modular. :-)
+ # At this point, we have left the loop to build modular packages.
+ # We might need to build a package for the "<kde_module>", but to
+ # avoid needlessly repacking if there happens to be a package with
+ # the same name as "<kde_module>", we'll do some checks first.
+
+ # If every package listed in modules/"<kde_module>" is also listed
+ # in the modularize file, then there's no need to make a package
+ # for "<kde_module>":
+ echo
+ echo "Searching for packages in ${kde_module} that were not built modular:"
+ cat $CWD/modules/${kde_module} | grep -v "^#" | grep -v -w "^" | while read checkpackage ; do
+ if ! grep -wq "^$checkpackage" ${CWD}/modularize ; then
+ # Non-modular package found, so we'll have to build the package below.
+ # It might already have been built once, but in that case it is likely
+ # that more things have been added to the package directory since then.
+ echo "Found non-modular package $checkpackage."
+ exit 99
+ fi
+ done
+
+ # Exit if everything in "<kde_module>" was built modular:
+ if [ ! $? = 99 ]; then
+ echo "No non-modular components found in ${kde_module}."
+ echo "Not building catch-all package for ${kde_module}."
+ echo
+ return
+ fi
+
+ # If there's no /usr directory in the "<kde_module>" package directory,
+ # then skip it. There's nothing present worth packing up.
if [ ! -d ${SLACK_KDE_BUILD_DIR}/${kde_module}/package-${kde_module}/usr ]; then
+ echo "No /usr directory found in package-${kde_module}."
+ echo "Not building catch-all package for ${kde_module}."
+ echo
return
fi
# Build a "<kde_module>" package for anything that wasn't built modular:
# It's safer to consider these to have binaries in them. ;-)
+
+ # Put up a bit of a black-box warning, in case this was a mistake where
+ # something was meant to be listed in the modularize file and wasn't:
+ echo
+ echo "**************************************************************************"
+ echo "* Building combined package for non-modular parts of ${kde_module}"
+ echo "**************************************************************************"
+ echo
+
PKGARCH=$ARCH
cd $PKG
@@ -423,6 +464,7 @@ mkdir -p $SLACK_KDE_BUILD_DIR
# libtidy and enable the Konqueror validators plugin to validate HTML.
KDEMODS=" \
kdelibs \
+ kdebase:nepomuk-core \
kdepimlibs \
kdebase \
kdesdk \
diff --git a/kde/KDE.options b/kde/KDE.options
index 6f79c05..30ec64c 100644
--- a/kde/KDE.options
+++ b/kde/KDE.options
@@ -3,7 +3,7 @@
# usually has a different version number), or by setting your own
# environment variables.
-[ -z $VERSION ] && export VERSION=4.9.5
+[ -z $VERSION ] && export VERSION=4.10.5
[ -z $BUILD ] && export BUILD=1
# Automatically determine the architecture we're building on:
@@ -54,5 +54,5 @@ fi
# Additional cmake flags that are spanned across the KDE modules
# Do not use "final build" unless we build an actual release.
#export KDE_OPT_ARGS=" -DKDE4_ENABLE_FINAL=\"ON\" -DSITE=\"slackware.com\" "
-export KDE_OPT_ARGS=" -DSITE=\"slackware.com\" -DKDE_DISTRIBUTION_TEXT=\"volkerdi@slackware.com\" "
+export KDE_OPT_ARGS=" -DKDE4_BUILD_TESTS=OFF -DSITE=\"slackware.com\" -DKDE_DISTRIBUTION_TEXT=\"volkerdi@slackware.com\" "
diff --git a/kde/build/increment.sh b/kde/build/increment.sh
new file mode 100755
index 0000000..6de5d0d
--- /dev/null
+++ b/kde/build/increment.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+# A script to increment build numbers.
+# Call it with the list of the build numbers to increase by one:
+#
+# ./increment.sh xf86-input-acecad xf86-input-aiptek xf86-input-joystick
+#
+# If a build file does not exist, it will be created with a value of 2.
+
+for build in $* ; do
+ if [ ! -r $build ]; then
+ echo "Creating $build with value 2"
+ echo 2 > $build
+ else
+ echo "Incrementing $build $(cat $build) -> $(expr $(cat $build) + 1)"
+ echo $(expr $(cat $build) + 1) > $build
+ fi
+done
diff --git a/kde/build/kdelibs b/kde/build/kde-runtime
index 9a7456b..9a7456b 100644
--- a/kde/build/kdelibs
+++ b/kde/build/kde-runtime
diff --git a/kde/cmake/kde-runtime b/kde/cmake/kde-runtime
new file mode 100644
index 0000000..42ece97
--- /dev/null
+++ b/kde/cmake/kde-runtime
@@ -0,0 +1,17 @@
+mkdir build
+cd build
+ cmake \
+ $KDE_OPT_ARGS \
+ -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DMAN_INSTALL_DIR=/usr/man \
+ -DSYSCONF_INSTALL_DIR=/etc/kde \
+ -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+ -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0 \
+ ..
+
diff --git a/kde/modularize b/kde/modularize
index fad472b..264add9 100644
--- a/kde/modularize
+++ b/kde/modularize
@@ -1,12 +1,32 @@
# If a package is listed here, it will be built apart from the
# usual "grab bag" package that's made from each source directory.
+#
+# Things to note:
+#
+# Listing a package here will not cause it to be built. To do that,
+# make sure it is added to one of the files in the modules/ directory
+# that is built by the main KDE.SlackBuild script.
+#
+# If a subpackage name happens to be the same as the "grab bag" package
+# that contains it, you need to be a bit careful. Unless everything
+# in that collection will be built modular, *do not* list that name
+# here! If you do, first the module by that name will be built, and
+# then everything that's not modular in that collection will be built
+# into a "grab bag" that will replace that first package.
+#
+# If the goal is to build the most combined packages possible, the
+# easiest way to accomplish that is just to move this file out of the
+# way and replace it with an empty one before building.
# kdeaccessibility
jovie
kaccessible
-kmag
kmouth
kmousetool
+kmag
+
+# kdelibs:
+kdelibs
# kdebase:
nepomuk-core
@@ -45,12 +65,21 @@ pairs
rocs
step
+# kdeadmin
+kdeadmin
+
+# kdeartwork
+kdeartwork
+
# kdegraphics:
libkipi
libkexiv2
libkdcraw
libksane
okular
+kdegraphics-mobipocket
+kdegraphics-strigi-analyzer
+kdegraphics-thumbnailers
gwenview
kamera
kcolorchooser
@@ -60,9 +89,6 @@ kruler
ksaneplugin
ksnapshot
svgpart
-kdegraphics-mobipocket
-kdegraphics-strigi-analyzer
-kdegraphics-thumbnailers
# kdebindings
smokegen
@@ -74,11 +100,12 @@ korundum
perlkde
pykde4
kross-interpreters
+kimono
+qyoto
# kdemultimedia
libkcddb
libkcompactdisc
-strigi-multimedia
audiocd-kio
dragon
ffmpegthumbs
@@ -87,6 +114,9 @@ juk
kmix
kscd
+# kdenetwork
+kdenetwork
+
# kdeutils
ark
filelight
@@ -95,7 +125,8 @@ kcharselect
kdf
kfloppy
kgpg
-printer-applet
+#printer-applet
+print-manager
kremotecontrol
ktimer
kwallet
@@ -103,30 +134,70 @@ superkaramba
sweeper
# kdegames
-#kbounce
-#konquest
-#kapman
-#knavalbattle
-#killbots
-#kubrick
-#kgoldrunner
-#knetwalk
-#kbreakout
-#ksirk
-#kfourinline
-#libkmahjongg
-#picmi
-#kblackbox
-#palapeli
-#katomic
-#ktuberling
-#kjumpingcube
-#kmahjongg
-#kspaceduel
+libkdegames
+libkmahjongg
+klickety
+ksudoku
+ksquares
+kpat
+klines
+ksnakeduel
+kollision
+kshisen
+kblocks
+lskat
+kreversi
+bovo
+kajongg
+granatier
+kmines
+kiriki
+kigo
+bomber
+kolf
+kdiamond
+kbounce
+konquest
+kapman
+knavalbattle
+killbots
+kubrick
+kgoldrunner
+knetwalk
+kbreakout
+ksirk
+kfourinline
+picmi
+kblackbox
+palapeli
+katomic
+ktuberling
+kjumpingcube
+kmahjongg
+kspaceduel
+
+# kdewebdev
+kdewebdev
# kdepim
+kdepim
kdepim-runtime
+# kdepimlibs
+kdepimlibs
+
+# kdeplasma-addons
+kdeplasma-addons
+
+# kdesdk
+kdesdk
+
+# kdetoys
+kdetoys
+
+# oxygen-icons
+oxygen-icons
+
# polkit-kde
polkit-kde-agent-1
polkit-kde-kcmodules-1
@@ -143,7 +214,7 @@ kdevplatform
kdevelop-pg-qt
kdevelop
#kdevelop-php
-quanta
+#quanta
wicd-kde
networkmanagement
skanlite
@@ -152,4 +223,5 @@ libktorrent
ktorrent
amarok
calligra
-
+libkscreen
+kscreen
diff --git a/kde/modules/extragear b/kde/modules/extragear
index 51e5597..074a936 100644
--- a/kde/modules/extragear
+++ b/kde/modules/extragear
@@ -9,7 +9,7 @@ kdevplatform
kdevelop-pg-qt
kdevelop
#kdevelop-php
-quanta
+#quanta
wicd-kde
networkmanagement
skanlite
@@ -18,4 +18,5 @@ libktorrent
ktorrent
amarok
calligra
-
+libkscreen
+kscreen
diff --git a/kde/modules/kdeaccessibility b/kde/modules/kdeaccessibility
index 0356ae5..c8cda11 100644
--- a/kde/modules/kdeaccessibility
+++ b/kde/modules/kdeaccessibility
@@ -4,4 +4,3 @@ kaccessible
kmouth
kmousetool
kmag
-
diff --git a/kde/modules/kdebase b/kde/modules/kdebase
index 782f9e6..38337e3 100644
--- a/kde/modules/kdebase
+++ b/kde/modules/kdebase
@@ -1,5 +1,5 @@
nepomuk-core
-#nepomuk-widgets
+nepomuk-widgets
kde-baseapps
kactivities
konsole
diff --git a/kde/modules/kdebindings b/kde/modules/kdebindings
index 9aa72c0..ab459d9 100644
--- a/kde/modules/kdebindings
+++ b/kde/modules/kdebindings
@@ -7,5 +7,5 @@ korundum
perlkde
pykde4
kross-interpreters
-kimono
-qyoto
+#kimono
+#qyoto
diff --git a/kde/modules/kdegames b/kde/modules/kdegames
index 82073d4..eb3133b 100644
--- a/kde/modules/kdegames
+++ b/kde/modules/kdegames
@@ -1,42 +1,41 @@
-#libkdegames
-#libkmahjongg
-#klickety
-#ksudoku
-#ksquares
-#kpat
-#klines
-#ksnakeduel
-#kollision
-#kshisen
-#kblocks
-#lskat
-#kreversi
-#bovo
-#kajongg
-#granatier
-#kmines
-#kiriki
-#kigo
-#bomber
-#kolf
-#kdiamond
-#kbounce
-#konquest
-#kapman
-#knavalbattle
-#killbots
-#kubrick
-#kgoldrunner
-#knetwalk
-#kbreakout
-#ksirk
-#kfourinline
-#picmi
-#kblackbox
-#palapeli
-#katomic
-#ktuberling
-#kjumpingcube
-#kmahjongg
-#kspaceduel
-kdegames
+libkdegames
+libkmahjongg
+klickety
+ksudoku
+ksquares
+kpat
+klines
+ksnakeduel
+kollision
+kshisen
+kblocks
+lskat
+kreversi
+bovo
+kajongg
+granatier
+kmines
+kiriki
+kigo
+bomber
+kolf
+kdiamond
+kbounce
+konquest
+kapman
+knavalbattle
+killbots
+kubrick
+kgoldrunner
+knetwalk
+kbreakout
+ksirk
+kfourinline
+picmi
+kblackbox
+palapeli
+katomic
+ktuberling
+kjumpingcube
+kmahjongg
+kspaceduel
diff --git a/kde/modules/kdemultimedia b/kde/modules/kdemultimedia
index d8feed9..a78827b 100644
--- a/kde/modules/kdemultimedia
+++ b/kde/modules/kdemultimedia
@@ -7,4 +7,3 @@ mplayerthumbs
juk
kmix
#kscd
-
diff --git a/kde/modules/kdepim b/kde/modules/kdepim
index 7da0ed1..6594afb 100644
--- a/kde/modules/kdepim
+++ b/kde/modules/kdepim
@@ -1,3 +1,2 @@
kdepim
kdepim-runtime
-
diff --git a/kde/modules/kdeutils b/kde/modules/kdeutils
index 62d5bbf..eb6d1ef 100644
--- a/kde/modules/kdeutils
+++ b/kde/modules/kdeutils
@@ -6,11 +6,10 @@ kcharselect
kdf
kfloppy
kgpg
-printer-applet
-#print-manager
+#printer-applet
+print-manager
kremotecontrol
ktimer
kwallet
superkaramba
sweeper
-
diff --git a/kde/modules/oxygen-icons b/kde/modules/oxygen-icons
index ab964a4..8252519 100644
--- a/kde/modules/oxygen-icons
+++ b/kde/modules/oxygen-icons
@@ -1,2 +1 @@
oxygen-icons
-
diff --git a/kde/patch/ark.patch b/kde/patch/ark.patch
deleted file mode 100644
index 1397f30..0000000
--- a/kde/patch/ark.patch
+++ /dev/null
@@ -1,4 +0,0 @@
-# Fix crash whenever a 7zip archive is opened.
-# Only for KDE 4.8.0 pre-built:
-#cat $CWD/patch/ark/ark-4.8.0_7zip_crash.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/kde/patch/ark/ark-4.8.0_7zip_crash.patch b/kde/patch/ark/ark-4.8.0_7zip_crash.patch
deleted file mode 100644
index 52939e8..0000000
--- a/kde/patch/ark/ark-4.8.0_7zip_crash.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date: Sun, 22 Jan 2012 19:03:05 +0000
-Subject: cli7zip: Completely remove RootNodeSwitch.
-X-Git-Url: http://quickgit.kde.org/?p=ark.git&amp;a=commitdiff&amp;h=0e67d6db9e7a5a0f90fcacaee11042b89b79d96b
----
-cli7zip: Completely remove RootNodeSwitch.
-
-Follow-up to 45c6c6f5bcff6bf754fccd6377836e025a6baade, which removed the
-definition of RootNodeSwitch but did not remove the reference in
-ExtractArgs, resulting in a crash whenever a 7z archive was extracted.
----
-
-
---- a/plugins/cli7zplugin/cliplugin.cpp
-+++ b/plugins/cli7zplugin/cliplugin.cpp
-@@ -53,7 +53,7 @@ ParameterList CliPlugin::parameterList()
- p[ListProgram] = p[ExtractProgram] = p[DeleteProgram] = p[AddProgram] = QLatin1String( "7z" );
-
- p[ListArgs] = QStringList() << QLatin1String( "l" ) << QLatin1String( "-slt" ) << QLatin1String( "$Archive" );
-- p[ExtractArgs] = QStringList() << QLatin1String( "$PreservePathSwitch" ) << QLatin1String( "$PasswordSwitch" ) << QLatin1String( "$RootNodeSwitch" ) << QLatin1String( "$Archive" ) << QLatin1String( "$Files" );
-+ p[ExtractArgs] = QStringList() << QLatin1String( "$PreservePathSwitch" ) << QLatin1String( "$PasswordSwitch" ) << QLatin1String( "$Archive" ) << QLatin1String( "$Files" );
- p[PreservePathSwitch] = QStringList() << QLatin1String( "x" ) << QLatin1String( "e" );
- p[PasswordSwitch] = QStringList() << QLatin1String( "-p$Password" );
- p[FileExistsExpression] = QLatin1String( "already exists. Overwrite with" );
diff --git a/kde/patch/calligra.patch b/kde/patch/calligra.patch
deleted file mode 100644
index 973a8bf..0000000
--- a/kde/patch/calligra.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-# Required patch for a successful compilation with gcc 4.7:
-# (still required for calligra-2.3.92)
-cat $CWD/patch/calligra/calligra-2.3.87_gcc47.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
-# Patch for "corrupted document", side-effect of compiling calligra-2.4.0 with gcc-4.7.0:
-zcat $CWD/patch/calligra/calligra.git.6e4d171dfa5bad07e06277ef8e36d8a6a00005db.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/kde/patch/calligra/calligra-2.3.87_gcc47.patch b/kde/patch/calligra/calligra-2.3.87_gcc47.patch
deleted file mode 100644
index 51cba63..0000000
--- a/kde/patch/calligra/calligra-2.3.87_gcc47.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up calligra-2.3.87/filters/words/hancomword/pole.cpp.gcc47 calligra-2.3.87/filters/words/hancomword/pole.cpp
---- calligra-2.3.87/filters/words/hancomword/pole.cpp.gcc47 2012-01-28 01:04:47.000000000 -0600
-+++ calligra-2.3.87/filters/words/hancomword/pole.cpp 2012-01-29 17:04:11.520633241 -0600
-@@ -866,7 +866,7 @@ void StorageIO::load()
- unsigned char* buffer2 = new unsigned char[ bbat->blockSize ];
- unsigned k = 109;
- unsigned mblock = header->mbat_start;
-- for (unsigned r = 0; r < header->num_mbat; r++) {
-+ for (unsigned rr = 0; rr < header->num_mbat; rr++) {
- unsigned long r = loadBigBlock(mblock, buffer2, bbat->blockSize);
- if (r != bbat->blockSize) {
- delete[] buffer2;
-
diff --git a/kde/patch/calligra/calligra.git.6e4d171dfa5bad07e06277ef8e36d8a6a00005db.diff.gz b/kde/patch/calligra/calligra.git.6e4d171dfa5bad07e06277ef8e36d8a6a00005db.diff.gz
deleted file mode 100644
index 87a730e..0000000
--- a/kde/patch/calligra/calligra.git.6e4d171dfa5bad07e06277ef8e36d8a6a00005db.diff.gz
+++ /dev/null
Binary files differ
diff --git a/kde/patch/kde-baseapps.patch b/kde/patch/kde-baseapps.patch
deleted file mode 100644
index a721076..0000000
--- a/kde/patch/kde-baseapps.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# Make sure that Control+click toggles the selection state (CCBUG: 292250)
-# Only for KDE 4.8.0:
-#cat $CWD/patch/kde-baseapps/dolphin-4.8.0_ctrlclick.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
-# Fix for KDE bug 280896 (font display issue in konsole due to Qt 4.8):
-# Fixed just in time for the KDE 4.8.2 source release:
-#cat $CWD/patch/kde-baseapps/konsole-4.8.2_kdebug280896.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
-# Fix for KDE bug 297458 and 297488
-# Reduce the timeout in KItemListKeyboardSearchManager to 1 second
-#cat $CWD/patch/kde-baseapps/dolphin.kitemlistkeyboardsearchmanager.cpp.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/kde/patch/kde-baseapps/dolphin-4.8.0_ctrlclick.patch b/kde/patch/kde-baseapps/dolphin-4.8.0_ctrlclick.patch
deleted file mode 100644
index fa928c9..0000000
--- a/kde/patch/kde-baseapps/dolphin-4.8.0_ctrlclick.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Frank Reininghaus <frank78ac@googlemail.com>
-Date: Mon, 23 Jan 2012 18:28:21 +0000
-Subject: Make sure that Control+click toggles the selection state
-X-Git-Url: http://quickgit.kde.org/?p=kde-baseapps.git&amp;a=commitdiff&amp;h=e8bfc8724b441b70e440cad05983134975facc8b
----
-Make sure that Control+click toggles the selection state
-
-This commit fixes a regression caused by the recent commit
-9f711b5f2e1d1fd856cd6b033e6adb96f9b46d8a.
-CCBUG: 292250
-(cherry picked from commit 84a9cc4bf6e9decc4c102102c4b04162369eb0fe)
----
-
-
---- a/dolphin/src/kitemviews/kitemlistcontroller.cpp
-+++ b/dolphin/src/kitemviews/kitemlistcontroller.cpp
-@@ -471,7 +471,7 @@ bool KItemListController::mousePressEven
- (!shiftOrControlPressed && !pressedItemAlreadySelected);
- if (clearSelection) {
- m_selectionManager->clearSelection();
-- } else if (pressedItemAlreadySelected && (event->buttons() & Qt::LeftButton)) {
-+ } else if (pressedItemAlreadySelected && !shiftOrControlPressed && (event->buttons() & Qt::LeftButton)) {
- // The user might want to start dragging multiple items, but if he clicks the item
- // in order to trigger it instead, the other selected items must be deselected.
- // However, we do not know yet what the user is going to do.
diff --git a/kde/patch/kde-baseapps/dolphin.kitemlistkeyboardsearchmanager.cpp.diff b/kde/patch/kde-baseapps/dolphin.kitemlistkeyboardsearchmanager.cpp.diff
deleted file mode 100644
index 45c830a..0000000
--- a/kde/patch/kde-baseapps/dolphin.kitemlistkeyboardsearchmanager.cpp.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-commit d8732a59d3b1f2d0bebf43f294df7e9f333abde4
-Author: Frank Reininghaus <frank78ac@googlemail.com>
-Date: Thu Apr 5 18:59:58 2012 +0200
-
- Reduce the timeout in KItemListKeyboardSearchManager to 1 second
-
- It turned out that the longer timeout, introduced recently in
- 02eab49b2de51c31fe46a0d9501327b579b3648e, not only made multi-letter
- keyboard searches easier, but also had some unwanted side effects. I
- hope that 1 second, which is between the previous value of 5 seconds and
- the pre-KDE 4.8.2 value of 0.4 seconds, is a compromise which will fit
- most users' needs.
- We will try to improve the situation further in future releases by
- providing visual feedback about the keyboard search, but such a change
- would not be suitable for a bug-fix release.
- CCBUG:297458
- CCBUG:297488
-
-diff --git a/dolphin/src/kitemviews/kitemlistkeyboardsearchmanager.cpp b/dolphin/src/kitemviews/kitemlistkeyboardsearchmanager.cpp
-index f4dc1a5..592605a 100644
---- a/dolphin/src/kitemviews/kitemlistkeyboardsearchmanager.cpp
-+++ b/dolphin/src/kitemviews/kitemlistkeyboardsearchmanager.cpp
-@@ -29,7 +29,7 @@
-
- KItemListKeyboardSearchManager::KItemListKeyboardSearchManager(QObject* parent) :
- QObject(parent),
-- m_timeout(5000)
-+ m_timeout(1000)
- {
- m_keyboardInputTime.invalidate();
- }
diff --git a/kde/patch/kde-baseapps/konsole-4.8.2_kdebug280896.patch b/kde/patch/kde-baseapps/konsole-4.8.2_kdebug280896.patch
deleted file mode 100644
index 352adb2..0000000
--- a/kde/patch/kde-baseapps/konsole-4.8.2_kdebug280896.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-commit bf3e57e94b54c1c4337d7960e0fda0ef98156451
-Author: Kurt Hindenburg <kurt.hindenburg@gmail.com>
-Date: Fri Mar 30 20:55:46 2012 -0400
-
- A quick fix to get fonts to look OK w/ Qt4.8 and bidi off
-
- Hopefully a temp fix for this issue. It would be better to find out
- what happened with Qt4.8 font rendering.
-
- Thanks to people on bug report for research and info.
-
- CCBUG: 280896
-
-diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
-index 1076131..ac44da9 100644
---- a/src/TerminalDisplay.cpp
-+++ b/src/TerminalDisplay.cpp
-@@ -720,10 +720,18 @@ void TerminalDisplay::drawCharacters(QPainter& painter,
- // Qt::LeftToRight for this widget
- //
- // This was discussed in: http://lists.kde.org/?t=120552223600002&r=1&w=2
-- if (_bidiEnabled)
-- painter.drawText(rect,0,text);
-+ if (_bidiEnabled) {
-+ painter.drawText(rect, 0, text);
-+ }
- else
-- painter.drawText(rect,0,LTR_OVERRIDE_CHAR+text);
-+ {
-+ // See bug 280896 for more info
-+#if QT_VERSION >= 0x040800
-+ painter.drawText(rect, Qt::AlignBottom, LTR_OVERRIDE_CHAR + text);
-+#else
-+ painter.drawText(rect, 0, LTR_OVERRIDE_CHAR + text);
-+#endif
-+ }
- }
- }
-
-diff --git a/src/TerminalDisplay.h b/src/TerminalDisplay.h
-index 97b517e..c6f993e 100644
---- a/src/TerminalDisplay.h
-+++ b/src/TerminalDisplay.h
-@@ -398,7 +398,17 @@ public:
- * Sets the status of the BiDi rendering inside the terminal display.
- * Defaults to disabled.
- */
-- void setBidiEnabled(bool set) { _bidiEnabled=set; }
-+ void setBidiEnabled(bool set) {
-+ _bidiEnabled=set;
-+ // See bug 280896 for more info
-+#if QT_VERSION >= 0x040800
-+ if (_bidiEnabled) {
-+ setLineSpacing(0);
-+ } else {
-+ setLineSpacing(2);
-+ }
-+#endif
-+ }
- /**
- * Returns the status of the BiDi rendering in this widget.
- */
diff --git a/kde/patch/kde-workspace.patch b/kde/patch/kde-workspace.patch
index 19f7d09..d86c11a 100644
--- a/kde/patch/kde-workspace.patch
+++ b/kde/patch/kde-workspace.patch
@@ -1,20 +1,6 @@
# Increase the timeout to accomodate slow-to-initialize video chipset drivers:
zcat $CWD/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-## Patch for the shutdown issue with KDE 4.6.2 (in Linux, only "halt"
-## understands the '-p' parameter):
-#sed -i -e 's/shutdown -p now/shutdown -h -P now/' kdm/config.def
-
-# 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
deleted file mode 100644
index 0afbc5f..0000000
--- a/kde/patch/kde-workspace/kde-workspace-4.9.1_bug_306260+306275.diff.gz
+++ /dev/null
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
deleted file mode 100644
index 1ca2c8d..0000000
--- a/kde/patch/kde-workspace/kde-workspace-4.9.2_unbreak_python2_appletloading.diff.gz
+++ /dev/null
Binary files differ
diff --git a/kde/patch/kde-workspace/kde-workspace.kwin.effects.performance.diff.gz b/kde/patch/kde-workspace/kde-workspace.kwin.effects.performance.diff.gz
deleted file mode 100644
index 7596c2e..0000000
--- a/kde/patch/kde-workspace/kde-workspace.kwin.effects.performance.diff.gz
+++ /dev/null
Binary files differ
diff --git a/kde/patch/kdeedu.patch b/kde/patch/kdeedu.patch
deleted file mode 100644
index 0c542d8..0000000
--- a/kde/patch/kdeedu.patch
+++ /dev/null
@@ -1,4 +0,0 @@
-# Fix some severe bugs for Marble 1.3.0 in combination with Qt 4.8.0:
-#cat $CWD/patch/kdeedu/marble130_qt480_colorfix.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-#cat $CWD/patch/kdeedu/marble130_qt480_qcolor.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/kde/patch/kdeedu/marble130_qt480_colorfix.diff b/kde/patch/kdeedu/marble130_qt480_colorfix.diff
deleted file mode 100644
index 5e88fc4..0000000
--- a/kde/patch/kdeedu/marble130_qt480_colorfix.diff
+++ /dev/null
@@ -1,65 +0,0 @@
-commit 79c39f45468bace95169d1ba959884ce27087d1e
-Author: Torsten Rahn <rahn@kde.org>
-Date: Wed Feb 8 17:18:15 2012 +0100
-
- Fixes for Marble with Qt 4.8:
-
- - Provide proper colors for Marble's Atlas, Temperature,
- Precipitation and Venus/Mars Topography maps.
- ( due to introduction of QImage::fill( QColor ) overload )
-
- - Show proper icons for MarbleLegendBrowser
- ( due to new interpretation of the "current directory" in
- QTextBrowser )
-
-diff --git a/src/lib/MarbleLegendBrowser.cpp b/src/lib/MarbleLegendBrowser.cpp
-index 4a25095..ffa0a23 100644
---- a/src/lib/MarbleLegendBrowser.cpp
-+++ b/src/lib/MarbleLegendBrowser.cpp
-@@ -130,26 +130,24 @@ void MarbleLegendBrowser::loadLegend()
- t.start();
-
- // Read the html string.
-- QString finalHtml;
-+ QString legendPath;
-
- // Check for a theme specific legend.html first
- if ( d->m_marbleModel != 0 && d->m_marbleModel->mapTheme() != 0 )
- {
- GeoSceneDocument *currentMapTheme = d->m_marbleModel->mapTheme();
-
-- QString customLegendPath = MarbleDirs::path( "maps/" +
-+ legendPath = MarbleDirs::path( "maps/" +
- currentMapTheme->head()->target() + '/' +
- currentMapTheme->head()->theme() + "/legend.html" );
-- if ( !customLegendPath.isEmpty() )
-- finalHtml = readHtml( QUrl::fromLocalFile( customLegendPath ) );
-- else
-- finalHtml.clear();
- }
--
-- if ( finalHtml.isEmpty() ) {
-- finalHtml = readHtml( QUrl::fromLocalFile( MarbleDirs::path( "legend.html" ) ) );
-+ if ( legendPath.isEmpty() ) {
-+ legendPath = MarbleDirs::path( "legend.html" );
- }
-
-+ QString finalHtml = readHtml( QUrl::fromLocalFile( legendPath ) );
-+ finalHtml.replace( QString( "./" ), legendPath.section( '/', 0, -2 ) + '/' );
-+
- // Generate some parts of the html from the MapTheme <Legend> tag.
- const QString sectionsHtml = generateSectionsHtml();
-
-diff --git a/src/lib/TextureColorizer.cpp b/src/lib/TextureColorizer.cpp
-index 4a4f8f3..d0deead 100644
---- a/src/lib/TextureColorizer.cpp
-+++ b/src/lib/TextureColorizer.cpp
-@@ -176,7 +176,7 @@ void TextureColorizer::colorize( QImage *origimg, const ViewportParams *viewport
- m_coastImage = QImage( viewport->size(), QImage::Format_RGB32 );
-
- // update coast image
-- m_coastImage.fill( Qt::transparent );
-+ m_coastImage.fill( QColor( 0, 0, 255, 0) );
-
- bool doClip = false; //assume false
- switch( viewport->projection() ) {
diff --git a/kde/patch/kdeedu/marble130_qt480_qcolor.diff b/kde/patch/kdeedu/marble130_qt480_qcolor.diff
deleted file mode 100644
index 9febade..0000000
--- a/kde/patch/kdeedu/marble130_qt480_qcolor.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-commit b89ff577fcbd085fbd180f59aa669dded1818082
-Author: Bernhard Beschow <bbeschow@cs.tu-berlin.de>
-Date: Wed Feb 8 18:14:59 2012 +0100
-
- compile with Qt < 4.8
-
- * take into account the comment in the API doc, which suggests to use QColor::rgb()
- (cherry picked from commit 6eafb31f509c622e2672c31b73ebcb1b3dafb3e9)
-
-diff --git a/src/lib/TextureColorizer.cpp b/src/lib/TextureColorizer.cpp
-index d0deead..9319a89 100644
---- a/src/lib/TextureColorizer.cpp
-+++ b/src/lib/TextureColorizer.cpp
-@@ -176,7 +176,7 @@ void TextureColorizer::colorize( QImage *origimg, const ViewportParams *viewport
- m_coastImage = QImage( viewport->size(), QImage::Format_RGB32 );
-
- // update coast image
-- m_coastImage.fill( QColor( 0, 0, 255, 0) );
-+ m_coastImage.fill( QColor( 0, 0, 255, 0).rgb() );
-
- bool doClip = false; //assume false
- switch( viewport->projection() ) {
diff --git a/kde/patch/kdelibs.patch b/kde/patch/kdelibs.patch
index 407e25a..63cfd34 100644
--- a/kde/patch/kdelibs.patch
+++ b/kde/patch/kdelibs.patch
@@ -1,20 +1,12 @@
# Slackware ships a different version of XML DTDs:
zcat $CWD/patch/kdelibs/kdelibs.docbook.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-# Fix for CVE-2011-3365 (not needed for KDE >= 4.7.2):
-#cat $CWD/patch/kdelibs/kdelibs.kssl.CVE-2011-3365.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
-# Fix a bug introduced in kdelibs-4.7.2 which was intended as a fix but
-# 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 ; }
+zcat $CWD/patch/kdelibs/kdelibs.upnp_conditional.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+## Fix plasma crash noticed exiting KDE, or quitting Amarok:
+# Fixed in KDE 4.10.4:
+#zcat $CWD/patch/kdelibs/changeset_r9323adac35d40da69e3cb18504340e984c4afd05.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/kde/patch/kdelibs/changeset_r9323adac35d40da69e3cb18504340e984c4afd05.diff.gz b/kde/patch/kdelibs/changeset_r9323adac35d40da69e3cb18504340e984c4afd05.diff.gz
new file mode 100644
index 0000000..1aa1934
--- /dev/null
+++ b/kde/patch/kdelibs/changeset_r9323adac35d40da69e3cb18504340e984c4afd05.diff.gz
Binary files differ
diff --git a/kde/patch/kdelibs/kdelibs.kssl.CVE-2011-3365.patch b/kde/patch/kdelibs/kdelibs.kssl.CVE-2011-3365.patch
deleted file mode 100644
index b44b865..0000000
--- a/kde/patch/kdelibs/kdelibs.kssl.CVE-2011-3365.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit bd70d4e589711fda9ab07738c46e37eee8376214
-Author: David Faure <faure@kde.org>
-Date: Thu Jun 30 23:43:45 2011 +0200
-
- Security fix: don't interpret html tags
-
- Credits to Tim Brown for the find.
-
-diff --git a/kio/kssl/ksslcertificatebox.cpp b/kio/kssl/ksslcertificatebox.cpp
-index 4ffc613..094787a 100644
---- a/kio/kssl/ksslcertificatebox.cpp
-+++ b/kio/kssl/ksslcertificatebox.cpp
-@@ -36,6 +36,10 @@ KSslCertificateBox::KSslCertificateBox(QWidget *parent)
- d(new KSslCertificateBoxPrivate())
- {
- d->ui.setupUi(this);
-+ // No fooling us with html tags
-+ Q_FOREACH(QLabel* label, qFindChildren<QLabel *>(this)) {
-+ label->setTextFormat(Qt::PlainText);
-+ }
- }
-
-
-
diff --git a/kde/patch/kdelibs/kdelibs.mimetypecheck.BUG311214.patch b/kde/patch/kdelibs/kdelibs.mimetypecheck.BUG311214.patch
deleted file mode 100644
index 048f2d0..0000000
--- a/kde/patch/kdelibs/kdelibs.mimetypecheck.BUG311214.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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/kdelibs/kdelibs.nepomuk.unicode.patch b/kde/patch/kdelibs/kdelibs.nepomuk.unicode.patch
deleted file mode 100644
index 819a429..0000000
--- a/kde/patch/kdelibs/kdelibs.nepomuk.unicode.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/nepomuk/query/querybuilderdata_p.h b/nepomuk/query/querybuilderdata_p.h
-index 055482e..3880e13 100644
---- a/nepomuk/query/querybuilderdata_p.h
-+++ b/nepomuk/query/querybuilderdata_p.h
-@@ -32,6 +32,28 @@
- #include "query_p.h"
- #include "groupterm_p.h"
-
-+namespace {
-+/// A hack to avoid passing extended chars to the bif:search_excerpts method which cannot handle
-+/// utf8 chars which use more than one char, ie. wide chars.
-+/// Thus, we simply truncate each term at the first wide char.
-+QStringList stripExtendedCharsHack(const QStringList& terms) {
-+ QStringList newTerms;
-+ foreach(const QString& term, terms) {
-+ int i = 0;
-+ while(i < term.length()) {
-+ if(term[i].unicode() > 0x7f) {
-+ break;
-+ }
-+ ++i;
-+ }
-+ if(i > 0) {
-+ newTerms.append(term.left(i));
-+ }
-+ }
-+ return newTerms;
-+}
-+}
-+
- namespace Nepomuk {
- namespace Query {
- class QueryBuilderData
-@@ -246,16 +268,23 @@ namespace Nepomuk {
- for( QHash<QString, QStringList>::const_iterator it = m_fullTextSearchTerms.constBegin();
- it != m_fullTextSearchTerms.constEnd(); ++it ) {
- const QString& varName = it.key();
-- const QStringList& terms = it.value();
-- // bif:search_excerpt wants a vector of all search terms
-- excerptParts
-- << QString::fromLatin1("bif:search_excerpt(bif:vector(bif:charset_recode('%1', '_WIDE_', 'UTF-8')), %2)")
-- .arg( terms.join(QLatin1String("','")),
-- varName );
-+ const QStringList terms = stripExtendedCharsHack(it.value());
-+ if(terms.count()) {
-+ // bif:search_excerpt wants a vector of all search terms
-+ excerptParts
-+ << QString::fromLatin1("bif:search_excerpt(bif:vector('%1'), %2)")
-+ .arg( terms.join(QLatin1String("','")),
-+ varName );
-+ }
- }
-
-- return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_")
-- .arg(excerptParts.join(QLatin1String(",")));
-+ if(excerptParts.count()) {
-+ return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_")
-+ .arg(excerptParts.join(QLatin1String(",")));
-+ }
-+ else {
-+ return QString();
-+ }
- }
- else {
- return QString();
diff --git a/kde/patch/kdelibs/kdelibs.upnp_conditional.patch b/kde/patch/kdelibs/kdelibs.upnp_conditional.patch
deleted file mode 100644
index 3a19447..0000000
--- a/kde/patch/kdelibs/kdelibs.upnp_conditional.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- kdelibs-4.8.0/solid/solid/managerbase.cpp.orig 2011-07-27 20:34:39.000000000 +0200
-+++ kdelibs-4.8.0/solid/solid/managerbase.cpp 2012-01-26 09:17:49.409993419 +0100
-@@ -90,7 +90,11 @@
- # endif
-
- # if defined (HUPNP_FOUND)
-- m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0);
-+ bool solidUpnpEnabled
-+ = QString::fromLocal8Bit(qgetenv("SOLID_UPNP")).toInt()==1;
-+ if (solidUpnpEnabled) {
-+ m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0);
-+ }
- # endif
- }
- }
diff --git a/kde/patch/kdelibs/kdelibs.upnp_conditional.patch.gz b/kde/patch/kdelibs/kdelibs.upnp_conditional.patch.gz
new file mode 100644
index 0000000..479980f
--- /dev/null
+++ b/kde/patch/kdelibs/kdelibs.upnp_conditional.patch.gz
Binary files differ
diff --git a/kde/patch/kdepim-runtime.patch b/kde/patch/kdepim-runtime.patch
deleted file mode 100644
index 0fa7a5a..0000000
--- a/kde/patch/kdepim-runtime.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-# Fix a bug in kdepim-runtime 4.7.1 which can cause an email to be permanently
-# lost when downloading from a POP3 account into a maildir-style mailbox:
-#cat $CWD/patch/kdepim-runtime/0001-Ignore-items-with-empty-remote-ids-here.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
-# Address bug 283467, fixed in KDE 4.7.3:
-#cat $CWD/patch/kdepim-runtime/kdepim-runtime/Kmail-has-duplicated-folders-after-migration-from-previous-version_bug-283467.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/kde/patch/kdepim-runtime/0001-Ignore-items-with-empty-remote-ids-here.patch b/kde/patch/kdepim-runtime/0001-Ignore-items-with-empty-remote-ids-here.patch
deleted file mode 100644
index 2a8397d..0000000
--- a/kde/patch/kdepim-runtime/0001-Ignore-items-with-empty-remote-ids-here.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From ccd67f3e65c9ffe32858ca521aa1e56a42b026af Mon Sep 17 00:00:00 2001
-From: Volker Krause <vkrause@kde.org>
-Date: Tue, 20 Sep 2011 10:12:40 +0200
-Subject: [PATCH] Ignore items with empty remote ids here.
-
-Items with empty remote id are those not yet stored by the resource,
-ie. we still have pending change replays for those. So, if we do a sync
-during that period (which could happen since the introduction of the
-file system watcher), we would remove a random one of those (only one
-since the map would only contain one without a remote id). This mostly
-affects the POP3 usage pattern.
-(cherry picked from commit f814b46a799ea8418ae17cf77d44da473124d12d)
----
- resources/maildir/retrieveitemsjob.cpp | 6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/resources/maildir/retrieveitemsjob.cpp b/resources/maildir/retrieveitemsjob.cpp
-index 7253f7e..f0273ef 100644
---- a/resources/maildir/retrieveitemsjob.cpp
-+++ b/resources/maildir/retrieveitemsjob.cpp
-@@ -57,8 +57,10 @@ void RetrieveItemsJob::localListDone ( KJob* job )
-
- const Akonadi::Item::List items = qobject_cast<Akonadi::ItemFetchJob*>( job )->items();
- m_localItems.reserve( items.size() );
-- foreach ( const Akonadi::Item &item, items )
-- m_localItems.insert( item.remoteId(), item );
-+ foreach ( const Akonadi::Item &item, items ) {
-+ if ( !item.remoteId().isEmpty() )
-+ m_localItems.insert( item.remoteId(), item );
-+ }
-
- const QStringList entryList = m_maildir.entryList();
- qint64 previousMtime = m_collection.remoteRevision().toLongLong();
---
-1.7.1
-
diff --git a/kde/patch/kdepim-runtime/Kmail-has-duplicated-folders-after-migration-from-previous-version_bug-283467.patch b/kde/patch/kdepim-runtime/Kmail-has-duplicated-folders-after-migration-from-previous-version_bug-283467.patch
deleted file mode 100644
index 1c1dcc5..0000000
--- a/kde/patch/kdepim-runtime/Kmail-has-duplicated-folders-after-migration-from-previous-version_bug-283467.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From: Montel Laurent <montel@kde.org>
-Date: Fri, 07 Oct 2011 15:14:06 +0000
-Subject: Fix Bug 283467 - Kmail has duplicated folders after migration from previous version.
-X-Git-Url: http://quickgit.kde.org/?p=kdepim-runtime.git&amp;a=commitdiff&amp;h=6bdc6290632be5fc6c103064463d7421b5e3b60d
----
-Fix Bug 283467 - Kmail has duplicated folders after migration from previous version.
-
-By default in config we don't translate config name.
-We use "inbox" "sent-mail" etc.
-
-BUG: 283467
-FIXED-IN: 4.7.3
----
-
-
---- a/migration/kmail/localfolderscollectionmigrator.cpp
-+++ b/migration/kmail/localfolderscollectionmigrator.cpp
-@@ -64,23 +64,41 @@ void LocalFoldersCollectionMigrator::set
-
- const KConfigGroup group( config, QLatin1String( "General" ) );
-
-- QString name = group.readEntry( QLatin1String( "inboxFolder" ), i18nc( "mail folder name for role inbox", "inbox" ) );
-- d->mSystemFolders.insert( name, SpecialMailCollections::Inbox );
--
-- name = group.readEntry( QLatin1String( "outboxFolder" ), i18nc( "mail folder name for role outbox", "outbox" ) );
-- d->mSystemFolders.insert( name, SpecialMailCollections::Outbox );
--
-- name = group.readEntry( QLatin1String( "sentFolder" ), i18nc( "mail folder name for role sent-mail", "sent-mail" ) );
-- d->mSystemFolders.insert( name, SpecialMailCollections::SentMail );
--
-- name = group.readEntry( QLatin1String( "trashFolder" ), i18nc( "mail folder name for role trash", "trash" ) );
-- d->mSystemFolders.insert( name, SpecialMailCollections::Trash );
--
-- name = group.readEntry( QLatin1String( "draftsFolder" ), i18nc( "mail folder name for role drafts", "drafts" ) );
-- d->mSystemFolders.insert( name, SpecialMailCollections::Drafts );
--
-- name = group.readEntry( QLatin1String( "templatesFolder" ), i18nc( "mail folder name for role templates", "templates" ) );
-- d->mSystemFolders.insert( name, SpecialMailCollections::Templates );
-+ if ( group.hasKey( QLatin1String( "inboxFolder" ) ) ) {
-+ const QString name = group.readEntry( QLatin1String( "inboxFolder" ), i18nc( "mail folder name for role inbox", "inbox" ) );
-+ d->mSystemFolders.insert( name, SpecialMailCollections::Inbox );
-+ } else
-+ d->mSystemFolders.insert( QLatin1String( "inbox" ), SpecialMailCollections::Inbox );
-+
-+ if ( group.hasKey( QLatin1String( "outboxFolder" ) ) ) {
-+ const QString name = group.readEntry( QLatin1String( "outboxFolder" ), i18nc( "mail folder name for role outbox", "outbox" ) );
-+ d->mSystemFolders.insert( name, SpecialMailCollections::Outbox );
-+ } else
-+ d->mSystemFolders.insert( QLatin1String( "outbox" ), SpecialMailCollections::Outbox );
-+
-+ if ( group.hasKey( QLatin1String( "sentFolder" ) ) ) {
-+ const QString name = group.readEntry( QLatin1String( "sentFolder" ), i18nc( "mail folder name for role sent-mail", "sent-mail" ) );
-+ d->mSystemFolders.insert( name, SpecialMailCollections::SentMail );
-+ } else
-+ d->mSystemFolders.insert( QLatin1String( "sent-mail" ), SpecialMailCollections::SentMail );
-+
-+ if ( group.hasKey( QLatin1String( "trashFolder" ) ) ) {
-+ const QString name = group.readEntry( QLatin1String( "trashFolder" ), i18nc( "mail folder name for role trash", "trash" ) );
-+ d->mSystemFolders.insert( name, SpecialMailCollections::Trash );
-+ } else
-+ d->mSystemFolders.insert( QLatin1String( "trash" ), SpecialMailCollections::Trash );
-+
-+ if ( group.hasKey( QLatin1String( "draftsFolder" ) ) ) {
-+ const QString name = group.readEntry( QLatin1String( "draftsFolder" ), i18nc( "mail folder name for role drafts", "drafts" ) );
-+ d->mSystemFolders.insert( name, SpecialMailCollections::Drafts );
-+ } else
-+ d->mSystemFolders.insert( QLatin1String( "drafts" ), SpecialMailCollections::Drafts );
-+
-+ if ( group.hasKey( QLatin1String( "templatesFolder" ) ) ) {
-+ const QString name = group.readEntry( QLatin1String( "templatesFolder" ), i18nc( "mail folder name for role templates", "templates" ) );
-+ d->mSystemFolders.insert( name, SpecialMailCollections::Templates );
-+ } else
-+ d->mSystemFolders.insert( QLatin1String( "templates" ), SpecialMailCollections::Templates );
- }
-
- void LocalFoldersCollectionMigrator::migrateCollection( const Collection &collection, const QString &folderId )
diff --git a/kde/patch/kdepim.patch b/kde/patch/kdepim.patch
deleted file mode 100644
index 516270d..0000000
--- a/kde/patch/kdepim.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Install the kleopatra headers, or else kopete-cryptography will not build:
-cat $CWD/patch/kdepim/kdepim-4.5.85-install-headers.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
-# Fix a memleak in kdepim 4.7.1 (fixed just too late to be included in the
-# 4.7.1 tarball)
-#cat $CWD/patch/kdepim/kdepim-4.7.1_memleak.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
-# Fix a memleak in kdepim 4.8.1
-# (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.5.85-install-headers.patch b/kde/patch/kdepim/kdepim-4.5.85-install-headers.patch
deleted file mode 100644
index aa43059..0000000
--- a/kde/patch/kdepim/kdepim-4.5.85-install-headers.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-diff -ur kdepim-4.5.85/kleopatra/libkleopatraclient/CMakeLists.txt kdepim-4.5.85-install-headers/kleopatra/libkleopatraclient/CMakeLists.txt
---- kdepim-4.5.85/kleopatra/libkleopatraclient/CMakeLists.txt 2010-01-27 01:22:34.000000000 +0100
-+++ kdepim-4.5.85-install-headers/kleopatra/libkleopatraclient/CMakeLists.txt 2010-12-08 14:40:45.000000000 +0100
-@@ -6,3 +6,7 @@
-
- add_subdirectory( tests )
-
-+install(
-+ FILES kleopatraclient_export.h
-+ DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient
-+ )
-diff -ur kdepim-4.5.85/kleopatra/libkleopatraclient/core/CMakeLists.txt kdepim-4.5.85-install-headers/kleopatra/libkleopatraclient/core/CMakeLists.txt
---- kdepim-4.5.85/kleopatra/libkleopatraclient/core/CMakeLists.txt 2010-11-19 11:51:51.000000000 +0100
-+++ kdepim-4.5.85-install-headers/kleopatra/libkleopatraclient/core/CMakeLists.txt 2010-12-08 14:42:12.000000000 +0100
-@@ -55,4 +55,12 @@
- DESTINATION ${LIB_INSTALL_DIR}
- )
-
--
-+install(
-+ FILES
-+ initialization.h
-+ command.h
-+ selectcertificatecommand.h
-+ signencryptfilescommand.h
-+ decryptverifyfilescommand.h
-+ DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/core
-+ )
-diff -ur kdepim-4.5.85/kleopatra/libkleopatraclient/gui/CMakeLists.txt kdepim-4.5.85-install-headers/kleopatra/libkleopatraclient/gui/CMakeLists.txt
---- kdepim-4.5.85/kleopatra/libkleopatraclient/gui/CMakeLists.txt 2010-07-29 11:58:45.000000000 +0200
-+++ kdepim-4.5.85-install-headers/kleopatra/libkleopatraclient/gui/CMakeLists.txt 2010-12-08 14:42:41.000000000 +0100
-@@ -20,3 +20,8 @@
- DESTINATION ${LIB_INSTALL_DIR}
- )
-
-+install(
-+ FILES
-+ certificaterequester.h
-+ DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/gui
-+ )
-diff -ur kdepim-4.5.85/libkleo/CMakeLists.txt kdepim-4.5.85-install-headers/libkleo/CMakeLists.txt
---- kdepim-4.5.85/libkleo/CMakeLists.txt 2010-12-01 23:23:12.000000000 +0100
-+++ kdepim-4.5.85-install-headers/libkleo/CMakeLists.txt 2010-12-08 15:22:00.000000000 +0100
-@@ -112,6 +112,64 @@
- set_target_properties(kleo PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
- install(TARGETS kleo ${INSTALL_TARGETS_DEFAULT_ARGS})
-
-+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)
-+
- if ( WIN32 )
- install ( FILES libkleopatrarc-win32.desktop DESTINATION ${CONFIG_INSTALL_DIR} RENAME libkleopatrarc )
- else ( WIN32 )
-diff -ur kdepim-4.5.85/libkpgp/CMakeLists.txt kdepim-4.5.85-install-headers/libkpgp/CMakeLists.txt
---- kdepim-4.5.85/libkpgp/CMakeLists.txt 2010-07-29 11:59:00.000000000 +0200
-+++ kdepim-4.5.85-install-headers/libkpgp/CMakeLists.txt 2010-12-08 14:43:33.000000000 +0100
-@@ -35,3 +35,11 @@
- install(FILES kpgp.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
- install(PROGRAMS kpgp-3.1-upgrade-address-data.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
-
-+install(FILES
-+ kpgp.h
-+ kpgpbase.h
-+ kpgpblock.h
-+ kpgpkey.h
-+ kpgpui.h
-+ libkpgp_export.h
-+ DESTINATION ${INCLUDE_INSTALL_DIR}/kpgp COMPONENT Devel )
-
diff --git a/kde/patch/kdepim/kdepim-4.7.1_memleak.patch b/kde/patch/kdepim/kdepim-4.7.1_memleak.patch
deleted file mode 100644
index e959dfa..0000000
--- a/kde/patch/kdepim/kdepim-4.7.1_memleak.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 0dbc5c1b233d355dce26868253c0e8f4dede58d4
-Author: Montel Laurent <montel@kde.org>
-Date: Mon Sep 5 16:01:10 2011 +0200
-
- Fix mem leak (too bad it will not in 4.7.1)
-
-diff --git a/mailcommon/foldercollection.cpp b/mailcommon/foldercollection.cpp
-index 3c31d8e..2d4ca73 100644
---- a/mailcommon/foldercollection.cpp
-+++ b/mailcommon/foldercollection.cpp
-@@ -294,8 +294,10 @@ uint FolderCollection::identity() const
- OrgKdeAkonadiImapSettingsInterface *imapSettingsInterface = Util::createImapSettingsInterface( mCollection.resource() );
- if ( imapSettingsInterface->isValid() ) {
- QDBusReply<bool> useDefault = imapSettingsInterface->useDefaultIdentity();
-- if( useDefault.isValid() && useDefault.value() )
-+ if( useDefault.isValid() && useDefault.value() ) {
-+ delete imapSettingsInterface;
- return mIdentity;
-+ }
-
- QDBusReply<int> remoteAccountIdent = imapSettingsInterface->accountIdentity();
- if ( remoteAccountIdent.isValid() && remoteAccountIdent.value() > 0 ) {
diff --git a/kde/patch/kdepim/kdepim-4.8.1_bug_258551.patch b/kde/patch/kdepim/kdepim-4.8.1_bug_258551.patch
deleted file mode 100644
index c94cf11..0000000
--- a/kde/patch/kdepim/kdepim-4.8.1_bug_258551.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-commit 7e4953c54752dca8a10ad29adf2e225a96f8669a
-Author: Montel Laurent <montel@kde.org>
-Date: Mon Mar 5 21:59:44 2012 +0100
-
- Fix Bug 258551 - KMailCVT leaks lots of memory when importing maildir
-
- Akonadi::ItemCreateJob was never delete during importing so memory used increase a lot.
- (for example during importing 2 Go it takes 2.5Go virtual memory before, after my fix it takes just 400Mo)
- Too bad that it's will not in 4.8.1
- FIXED-IN: 4.8.2
- BUG: 258551
- (cherry picked from commit eafff41025775a8a2c15cd3f26233bd8d50cb277)
-
- If we can't update kdepim source please add this patch to your source please.
-
- CCMAIL: kde-packager@kde.org
-
-diff --git a/kmailcvt/filters.cxx b/kmailcvt/filters.cxx
-index 8579534..7ffb005 100644
---- a/kmailcvt/filters.cxx
-+++ b/kmailcvt/filters.cxx
-@@ -169,11 +169,13 @@ bool Filter::addAkonadiMessage( FilterInfo* info, const Akonadi::Collection &col
- }
- item.setPayload<KMime::Message::Ptr>( message );
- Akonadi::ItemCreateJob* job = new Akonadi::ItemCreateJob( item, collection );
-+ job->setAutoDelete( false );
- if( !job->exec() ) {
- info->alert( i18n( "<b>Error:</b> Could not add message to folder %1. Reason: %2",
- collection.name(), job->errorString() ) );
- return false;
- }
-+ delete job;
- return true;
- }
-
-
-commit d5933dd8913e9a57ef0b6a7f732d6a10d08f82ae
-Author: Montel Laurent <montel@kde.org>
-Date: Tue Mar 6 08:42:31 2012 +0100
-
- Fix mem leak
-
- CCMAIL: mueller@kde.org
- CCMAIL: kde-packager@kde.org
- (cherry picked from commit 8de439bc0c39a511cfb69d5e5b111b2a5de72ccb)
-
-diff --git a/kmailcvt/filters.cxx b/kmailcvt/filters.cxx
-index 7ffb005..c3878da 100644
---- a/kmailcvt/filters.cxx
-+++ b/kmailcvt/filters.cxx
-@@ -173,6 +173,7 @@ bool Filter::addAkonadiMessage( FilterInfo* info, const Akonadi::Collection &col
- if( !job->exec() ) {
- info->alert( i18n( "<b>Error:</b> Could not add message to folder %1. Reason: %2",
- collection.name(), job->errorString() ) );
-+ delete job;
- return false;
- }
- delete job;
diff --git a/kde/patch/kdepim/kdepim-4.8.80_x11libs.patch b/kde/patch/kdepim/kdepim-4.8.80_x11libs.patch
deleted file mode 100644
index f87d8f4..0000000
--- a/kde/patch/kdepim/kdepim-4.8.80_x11libs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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/kdeplasma-addons.patch b/kde/patch/kdeplasma-addons.patch
new file mode 100644
index 0000000..c262d90
--- /dev/null
+++ b/kde/patch/kdeplasma-addons.patch
@@ -0,0 +1,3 @@
+# CVE 2013-2120: paste widget "password" generator uses insecure randomness:
+#zcat $CWD/patch/kdeplasma-addons/random_generator_cve-2013-2120.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/kde/patch/kdeplasma-addons/random_generator_cve-2013-2120.patch.gz b/kde/patch/kdeplasma-addons/random_generator_cve-2013-2120.patch.gz
new file mode 100644
index 0000000..a6f723a
--- /dev/null
+++ b/kde/patch/kdeplasma-addons/random_generator_cve-2013-2120.patch.gz
Binary files differ
diff --git a/kde/patch/kdesdk.patch b/kde/patch/kdesdk.patch
deleted file mode 100644
index f6106af..0000000
--- a/kde/patch/kdesdk.patch
+++ /dev/null
@@ -1,4 +0,0 @@
-# Fix permissions of find-gui-text.sh script:
-# Fixed just in time before release of KDE 4.8.2:
-#cat $CWD/patch/kdesdk/kdesdk-4.8.2_scriptperms.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/kde/patch/kdesdk/kdesdk-4.8.2_scriptperms.diff b/kde/patch/kdesdk/kdesdk-4.8.2_scriptperms.diff
deleted file mode 100644
index 4440f2d..0000000
--- a/kde/patch/kdesdk/kdesdk-4.8.2_scriptperms.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up kdesdk-4.8.2/lokalize/scripts/CMakeLists.txt.perms kdesdk-4.8.2/lokalize/scripts/CMakeLists.txt
---- kdesdk-4.8.2/lokalize/scripts/CMakeLists.txt.perms 2012-03-29 15:51:49.000000000 -0500
-+++ kdesdk-4.8.2/lokalize/scripts/CMakeLists.txt 2012-03-30 14:19:02.860529844 -0500
-@@ -12,8 +12,7 @@ ELSE (WIN32)
- newprojectwizard.py
- DESTINATION ${DATA_INSTALL_DIR}/lokalize/scripts )
-
-- install( FILES find-gui-text.sh
-- PERMISSIONS WORLD_EXECUTE WORLD_READ
-+ install( PROGRAMS find-gui-text.sh
- DESTINATION ${DATA_INSTALL_DIR}/lokalize/scripts )
-
- ENDIF (WIN32)
-
diff --git a/kde/patch/kgpg.patch b/kde/patch/kgpg.patch
deleted file mode 100644
index a3ef384..0000000
--- a/kde/patch/kgpg.patch
+++ /dev/null
@@ -1,4 +0,0 @@
-# Fix startup when no config file is defined (BUG:291923)
-# Only for KDE 4.8.0 pre-built:
-#cat $CWD/patch/kgpg/kgpg-4.8.0.noconfigfile.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/kde/patch/kgpg/kgpg-4.8.0.noconfigfile.patch b/kde/patch/kgpg/kgpg-4.8.0.noconfigfile.patch
deleted file mode 100644
index 89d4ee6..0000000
--- a/kde/patch/kgpg/kgpg-4.8.0.noconfigfile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit fa0b4565a2c4aa672dc4c285d1bd445e055da626
-Author: Patrick Spendrin <ps_ml@gmx.de>
-Date: Thu Jan 19 11:24:44 2012 +0100
-
- fix startup when no config file is defined
-
- BUG:291923
-
-diff --git a/gpgproc.cpp b/gpgproc.cpp
-index 49a5385..dc5ebfa 100644
---- a/gpgproc.cpp
-+++ b/gpgproc.cpp
-@@ -86,9 +86,11 @@ void GnupgBinary::setBinary(const QString &executable)
- m_standardArguments.clear();
- m_standardArguments << QLatin1String( "--no-secmem-warning" )
- << QLatin1String( "--no-tty" )
-- << QLatin1String("--no-greeting")
-- << QLatin1String("--options")
-- << gpgConfigFile;
-+ << QLatin1String("--no-greeting");
-+
-+ if (!gpgConfigFile.isEmpty())
-+ m_standardArguments << QLatin1String("--options")
-+ << gpgConfigFile;
-
- QStringList debugLevelArguments(QLatin1String("--debug-level"));
- debugLevelArguments << QLatin1String("none");
diff --git a/kde/patch/korundum.patch b/kde/patch/korundum.patch
index 7a8b7cf..e28217d 100644
--- a/kde/patch/korundum.patch
+++ b/kde/patch/korundum.patch
@@ -1,4 +1,4 @@
# Build against Ruby 1.9.3.
# See also https://bugs.kde.org/show_bug.cgi?id=287057
-cat $CWD/patch/korundum/korundum_ruby19.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+#zcat $CWD/patch/korundum/korundum_ruby19.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/kde/patch/korundum/korundum_ruby19.patch b/kde/patch/korundum/korundum_ruby19.patch
deleted file mode 100644
index 561d8de..0000000
--- a/kde/patch/korundum/korundum_ruby19.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -up korundum-4.8.0/src/krubypluginfactory.cpp.ruby19 korundum-4.8.0/src/krubypluginfactory.cpp
---- korundum-4.8.0/src/krubypluginfactory.cpp.ruby19 2011-07-27 13:37:29.000000000 -0500
-+++ korundum-4.8.0/src/krubypluginfactory.cpp 2012-02-17 08:30:38.785635819 -0600
-@@ -39,7 +39,7 @@
- extern "C" {
- extern VALUE rb_load_path;
- extern VALUE qt_internal_module;
--void Init_prelude(void);
-+// void Init_prelude(void);
- }
-
- //
-@@ -165,7 +165,7 @@ QObject *KRubyPluginFactory::create(cons
- #if RUBY_VERSION >= 0x10900
- VALUE gem = rb_define_module("Gem");
- rb_const_set(gem, rb_intern("Enable"), Qtrue);
-- Init_prelude();
-+// Init_prelude();
- #endif
-
- ruby_incpush(QFile::encodeName(program.path()));
-@@ -342,7 +342,7 @@ int kdemain(int argc, char **argv)
- #if RUBY_VERSION >= 0x10900
- VALUE gem = rb_define_module("Gem");
- rb_const_set(gem, rb_intern("Enable"), Qtrue);
-- Init_prelude();
-+// Init_prelude();
- #endif
-
- ruby_incpush(QFile::encodeName(program.path()));
-
diff --git a/kde/patch/korundum/korundum_ruby19.patch.gz b/kde/patch/korundum/korundum_ruby19.patch.gz
new file mode 100644
index 0000000..2463d0a
--- /dev/null
+++ b/kde/patch/korundum/korundum_ruby19.patch.gz
Binary files differ
diff --git a/kde/patch/ktorrent.patch b/kde/patch/ktorrent.patch
deleted file mode 100644
index ecd0a8b..0000000
--- a/kde/patch/ktorrent.patch
+++ /dev/null
@@ -1,4 +0,0 @@
-# Fix compilation against KDE 4.8.0
-# Only for ktorrent 4.1.3:
-#cat $CWD/patch/ktorrent/ktorrent.taskmanager.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/kde/patch/ktorrent/ktorrent.taskmanager.diff b/kde/patch/ktorrent/ktorrent.taskmanager.diff
deleted file mode 100644
index bb7fe25..0000000
--- a/kde/patch/ktorrent/ktorrent.taskmanager.diff
+++ /dev/null
@@ -1,174 +0,0 @@
-From: Joris Guisson <joris.guisson@gmail.com>
-Date: Wed, 23 Nov 2011 19:17:08 +0000
-Subject: Use dbus to show ktorrent window from plasma applet. This removes the dependency on libtaskmanager.
-X-Git-Tag: v4.2rc1
-X-Git-Url: http://quickgit.kde.org/?p=ktorrent.git&amp;a=commitdiff&amp;h=6d4a6ae51692966862ccb20d17cb217717519d40
----
-Use dbus to show ktorrent window from plasma applet. This removes the dependency on libtaskmanager.
-
-BUG: 287309
----
-
-
---- a/plasma/applet/CMakeLists.txt
-+++ b/plasma/applet/CMakeLists.txt
-@@ -5,25 +5,15 @@ if(NOT QT_VERSION_OK)
-
- else(NOT QT_VERSION_OK)
-
-- set(TASKMANAGER_FOUND FALSE)
-- FIND_PATH(TASKMANAGER_INCLUDE_DIR NAMES taskmanager.h PATHS ${KDE4_INCLUDE_DIR}/taskmanager ${INCLUDE_INSTALL_DIR}/taskmanager.h)
-- FIND_LIBRARY(TASKMANAGER_LIBRARY NAMES taskmanager PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
--
-- if(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY)
-- set(TASKMANAGER_FOUND TRUE)
-- message(STATUS "Found libtaskmanager: ${TASKMANAGER_LIBRARY} ")
-- include_directories(${TASKMANAGER_INCLUDE_DIR})
-- set(ktapplet_SRCS applet.cpp chunkbar.cpp fadingitem.cpp fadingnavigationwidget.cpp)
--
-- kde4_add_ui_files(ktapplet_SRCS appletconfig.ui)
--
-- kde4_add_plugin(plasma_applet_ktorrent ${ktapplet_SRCS})
-- target_link_libraries(plasma_applet_ktorrent ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${TASKMANAGER_LIBRARY} ${LIBKTORRENT_LIBRARIES} ktcore)
--
-- install(TARGETS plasma_applet_ktorrent DESTINATION ${PLUGIN_INSTALL_DIR})
-- install(FILES plasma-applet-ktorrent.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-- endif(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY)
--
-- macro_log_feature(TASKMANAGER_FOUND "libtaskmanager" "libtaskmanager library and header files" "http://www.kde.org/" FALSE "" "libtaskmanager is needed for KTorrent Plasmoid")
-+
-+ set(ktapplet_SRCS applet.cpp chunkbar.cpp fadingitem.cpp fadingnavigationwidget.cpp)
-+
-+ kde4_add_ui_files(ktapplet_SRCS appletconfig.ui)
-+
-+ kde4_add_plugin(plasma_applet_ktorrent ${ktapplet_SRCS})
-+ target_link_libraries(plasma_applet_ktorrent ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${LIBKTORRENT_LIBRARIES} ktcore)
-+
-+ install(TARGETS plasma_applet_ktorrent DESTINATION ${PLUGIN_INSTALL_DIR})
-+ install(FILES plasma-applet-ktorrent.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-
- endif(NOT QT_VERSION_OK)
-
---- a/plasma/applet/applet.cpp
-+++ b/plasma/applet/applet.cpp
-@@ -21,6 +21,9 @@
- #include "applet.h"
- #include <QFile>
- #include <QGraphicsLinearLayout>
-+#include <QDBusConnection>
-+#include <QDBusConnectionInterface>
-+#include <QDBusMessage>
- #include <KConfigDialog>
- #include <KLocale>
- #include <KRun>
-@@ -31,12 +34,11 @@
- #include <Plasma/IconWidget>
- #endif
- #include <Plasma/Label>
--#include <taskmanager/taskmanager.h>
--#include <taskmanager/task.h>
- #include <util/functions.h>
- #include "chunkbar.h"
- #include "fadingnavigationwidget.h"
-
-+
- using namespace bt;
-
- namespace ktplasma
-@@ -174,7 +176,8 @@ namespace ktplasma
- }
- }
-
-- void Applet::updateNavigation() {
-+ void Applet::updateNavigation()
-+ {
- navigation->setEnabled(connected_to_app && !sources.empty()
- && (sources.count() > 1 || !sources.contains(current_source)));
- }
-@@ -193,12 +196,14 @@ namespace ktplasma
- }
- }
-
-- void Applet::updateSources() {
-+ void Applet::updateSources()
-+ {
- sources = engine->sources();
- sources.removeOne("core");
- }
-
-- void Applet::setSource(QString source) {
-+ void Applet::setSource(QString source)
-+ {
- if (!current_source.isEmpty())
- engine->disconnectSource(current_source,this);
- clearData();
-@@ -340,20 +345,39 @@ namespace ktplasma
-
- void Applet::iconClicked()
- {
-- TaskManager::TaskDict tasks = TaskManager::TaskManager::self()->tasks();
-- for (TaskManager::TaskDict::iterator i = tasks.begin();i != tasks.end();i ++)
-+ QDBusConnection session_bus = QDBusConnection::sessionBus();
-+ QDBusConnectionInterface* dbus_service = session_bus.interface();
-+ if (!session_bus.isConnected() || !dbus_service || !dbus_service->isServiceRegistered("org.ktorrent.ktorrent"))
-+ {
-+ // can't find the window, try launching it
-+ KUrl::List empty;
-+ KRun::run("ktorrent", empty, 0);
-+ }
-+ else
- {
-- if (i.value()->className() == "ktorrent")
-- {
-- KWindowSystem::activateWindow(i.key());
-- return;
-- }
-+ QDBusMessage msg = QDBusMessage::createMethodCall("org.ktorrent.ktorrent", "/ktorrent/MainWindow_1", "org.kde.KMainWindow", "winId");
-+ QDBusPendingCall call = session_bus.asyncCall(msg, 5000);
-+ QDBusPendingCallWatcher* watcher = new QDBusPendingCallWatcher(call ,this);
-+ connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(dbusCallFinished(QDBusPendingCallWatcher*)));
- }
--
-- // can't find the window, try launching it
-- KUrl::List empty;
-- KRun::run("ktorrent", empty, 0);
- }
-+
-+ void Applet::dbusCallFinished(QDBusPendingCallWatcher* self)
-+ {
-+ if (self->isError())
-+ {
-+ // call failed, try launching it
-+ KUrl::List empty;
-+ KRun::run("ktorrent", empty, 0);
-+ }
-+ else
-+ {
-+ QDBusPendingReply<qlonglong> reply = *self;
-+ KWindowSystem::activateWindow(reply.value());
-+ }
-+ self->deleteLater();
-+ }
-+
-
- void Applet::clearData()
- {
-
---- a/plasma/applet/applet.h
-+++ b/plasma/applet/applet.h
-@@ -27,6 +27,7 @@
- #include "fadingnavigationwidget.h"
-
- class QGraphicsLinearLayout;
-+class QDBusPendingCallWatcher;
-
- namespace Plasma
- {
-@@ -68,6 +69,7 @@ namespace ktplasma
- void iconClicked();
- void selectPrev();
- void selectNext();
-+ void dbusCallFinished(QDBusPendingCallWatcher* self);
-
- private:
- void updateTorrentCombo();
diff --git a/kde/patch/strigi-multimedia.patch b/kde/patch/strigi-multimedia.patch
index aebad0d..8b03abd 100644
--- a/kde/patch/strigi-multimedia.patch
+++ b/kde/patch/strigi-multimedia.patch
@@ -1,3 +1,3 @@
# Fix build:
-cat $CWD/patch/strigi-multimedia/strigi-multimedia_port.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+zcat $CWD/patch/strigi-multimedia/strigi-multimedia_port.patch.gz | 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
deleted file mode 100644
index 21a29a0..0000000
--- a/kde/patch/strigi-multimedia/strigi-multimedia_port.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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)
diff --git a/kde/patch/strigi-multimedia/strigi-multimedia_port.patch.gz b/kde/patch/strigi-multimedia/strigi-multimedia_port.patch.gz
new file mode 100644
index 0000000..86a6172
--- /dev/null
+++ b/kde/patch/strigi-multimedia/strigi-multimedia_port.patch.gz
Binary files differ
diff --git a/kde/pre-install/amarok.pre-install b/kde/pre-install/amarok.pre-install
index 5411ce0..dfb3b00 100644
--- a/kde/pre-install/amarok.pre-install
+++ b/kde/pre-install/amarok.pre-install
@@ -1,8 +1,9 @@
-if [ ! -r /usr/lib${LIBDIRSUFFIX}/mysql/libmysqld.a ]; then
+if [ ! -r /usr/bin/mysql_embedded ]; then
cat << EOF
-ERROR: missing /usr/lib${LIBDIRSUFFIX}/mysql/libmysqld.a
- please use mysql-embedded.build in source/ap/mysql/
- to build and install this, and then try again.
+ERROR: missing /usr/bin/mysql_embedded
+ please use mysql-embedded.SlackBuild in source/ap/mysql/
+ or build_embedded.package.sh in source/ap/mariadb/ to
+ rebuild your database package, reinstall it, and then try again.
EOF
touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ;
fi
diff --git a/kde/pre-install/kdewebdev/tidy/tidy.build b/kde/pre-install/kdewebdev/tidy/tidy.build
index b638b24..b638b24 100755..100644
--- a/kde/pre-install/kdewebdev/tidy/tidy.build
+++ b/kde/pre-install/kdewebdev/tidy/tidy.build
diff --git a/kde/slack-desc/kscreen b/kde/slack-desc/kscreen
new file mode 100644
index 0000000..90f1d63
--- /dev/null
+++ b/kde/slack-desc/kscreen
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in. You must make
+# exactly 11 lines for the formatting to be correct. It's also customary to
+# leave one space after the ':'.
+
+ |-----handy-ruler------------------------------------------------------|
+kscreen: kscreen (KDE screen management)
+kscreen:
+kscreen: KScreen is the new screen management software for KDE Plasma
+kscreen: Workspaces which tries to be as magic and automatic as possible
+kscreen: for users with basic needs and easy to configure for those
+kscreen: who want special setups.
+kscreen:
+kscreen:
+kscreen: For more information, visit:
+kscreen: http://community.kde.org/Solid/Projects/ScreenManagement
+kscreen:
diff --git a/kde/slack-desc/libkcompactdisc b/kde/slack-desc/libkcompactdisc
index c9c9259..67ce9c9 100644
--- a/kde/slack-desc/libkcompactdisc
+++ b/kde/slack-desc/libkcompactdisc
@@ -6,9 +6,9 @@
# leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libkcompactdisc: libkcompactdisc (KDE library for playing & ripping CD's)
+libkcompactdisc: libkcompactdisc (KDE library for playing & ripping CDs)
libkcompactdisc:
-libkcompactdisc: A KDE library for playing & ripping CD's.
+libkcompactdisc: A KDE library for playing & ripping CDs.
libkcompactdisc:
libkcompactdisc:
libkcompactdisc:
diff --git a/kde/slack-desc/libkmahjongg b/kde/slack-desc/libkmahjongg
index a255c73..8851a3c 100644
--- a/kde/slack-desc/libkmahjongg
+++ b/kde/slack-desc/libkmahjongg
@@ -6,7 +6,7 @@
# leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libkmahjongg: libkmahjongg (library loading and rendering of Mahjongg tilesets)
+libkmahjongg: libkmahjongg (library for rendering of Mahjongg tilesets)
libkmahjongg:
libkmahjongg: libkmahjongg is a library used by several KDE games for loading
libkmahjongg: and rendering of Mahjongg tilesets.
diff --git a/kde/slack-desc/libkscreen b/kde/slack-desc/libkscreen
new file mode 100644
index 0000000..d823209
--- /dev/null
+++ b/kde/slack-desc/libkscreen
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in. You must make
+# exactly 11 lines for the formatting to be correct. It's also customary to
+# leave one space after the ':'.
+
+ |-----handy-ruler------------------------------------------------------|
+libkscreen: libkscreen (KDE screen management library)
+libkscreen:
+libkscreen: LibKScreen is a library that provides access to current configuration
+libkscreen: of connected displays and ways to change the configuration.
+libkscreen:
+libkscreen:
+libkscreen:
+libkscreen:
+libkscreen: For more information, visit:
+libkscreen: http://community.kde.org/Solid/Projects/ScreenManagement
+libkscreen:
diff --git a/kde/slack-desc/oxygen-gtk3 b/kde/slack-desc/oxygen-gtk3
index 5c837ca..43b7636 100644
--- a/kde/slack-desc/oxygen-gtk3
+++ b/kde/slack-desc/oxygen-gtk3
@@ -6,9 +6,9 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-oxygen-gtk3: oxygen-gtk3 (Oxygen GTK+ engine)
+oxygen-gtk3: oxygen-gtk3 (Oxygen GTK+3 engine)
oxygen-gtk3:
-oxygen-gtk3: Oxygen-Gtk3 is a port of the KDE widget theme Oxygen, to GTK+.
+oxygen-gtk3: Oxygen-Gtk3 is a port of the KDE widget theme Oxygen, to GTK+3.
oxygen-gtk3: It's primary goal is to ensure visual consistency between GTK+ and
oxygen-gtk3: qt-based applications running under kde. A secondary objective is
oxygen-gtk3: to also have a stand-alone nice looking GTK+ theme that would behave
diff --git a/kde/slack-desc/print-manager b/kde/slack-desc/print-manager
index 6e52321..623c0bc 100644
--- a/kde/slack-desc/print-manager
+++ b/kde/slack-desc/print-manager
@@ -1,7 +1,7 @@
# HOW TO EDIT THIS FILE:
# The "handy ruler" below makes it easier to edit a package description. Line
# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side mprint-managers the last column you can put a character in. You must
+# on the right side marks the last column you can put a character in. You must
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.