diff options
Diffstat (limited to 'source/kde')
106 files changed, 1738 insertions, 948 deletions
diff --git a/source/kde/KDE.SlackBuild b/source/kde/KDE.SlackBuild index 7d40f165b..5af89d457 100755 --- a/source/kde/KDE.SlackBuild +++ b/source/kde/KDE.SlackBuild @@ -245,6 +245,8 @@ build_mod_pkg () { # Run cmake, using custom cmake script if needed: if [ -r $CWD/cmake/${PKGNAME} ]; then . $CWD/cmake/${PKGNAME} + elif [ -r $CWD/cmake/${kde_module} ]; then + . $CWD/cmake/${kde_module} else # This is the default configure script: . $CWD/cmake/cmake @@ -328,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 @@ -417,8 +460,11 @@ mkdir -p $SLACK_KDE_BUILD_DIR # Same goes for kdelibs (at least during KDE 4.8.x) kdeutils:ksecrets needs # kdelibs and then kdelibs needs a rebuild to pick up ksecretservice # (this will no longer be required in KDE 4.9). +# And kde-baseapps is rebuilt after kdewebdev because it can then pickup +# libtidy and enable the Konqueror validators plugin to validate HTML. KDEMODS=" \ kdelibs \ + kdebase:nepomuk-core \ kdepimlibs \ kdebase \ kdesdk \ @@ -440,6 +486,7 @@ KDEMODS=" \ kdepim-runtime \ kdeedu \ kdewebdev \ + kdebase:kde-baseapps \ kdeplasma-addons \ polkit-kde \ extragear \ diff --git a/source/kde/KDE.options b/source/kde/KDE.options index debc6ea12..30ec64c2b 100644 --- a/source/kde/KDE.options +++ b/source/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.8.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/source/kde/build/ark b/source/kde/build/ark new file mode 100644 index 000000000..0cfbf0888 --- /dev/null +++ b/source/kde/build/ark @@ -0,0 +1 @@ +2 diff --git a/source/kde/build/calligra b/source/kde/build/calligra deleted file mode 100644 index b8626c4cf..000000000 --- a/source/kde/build/calligra +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/kde/build/increment.sh b/source/kde/build/increment.sh new file mode 100755 index 000000000..6de5d0da6 --- /dev/null +++ b/source/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/source/kde/build/kde-workspace b/source/kde/build/kde-workspace new file mode 100644 index 000000000..0cfbf0888 --- /dev/null +++ b/source/kde/build/kde-workspace @@ -0,0 +1 @@ +2 diff --git a/source/kde/build/kdelibs b/source/kde/build/kdelibs new file mode 100644 index 000000000..0cfbf0888 --- /dev/null +++ b/source/kde/build/kdelibs @@ -0,0 +1 @@ +2 diff --git a/source/kde/build/lskat b/source/kde/build/lskat new file mode 100644 index 000000000..0cfbf0888 --- /dev/null +++ b/source/kde/build/lskat @@ -0,0 +1 @@ +2 diff --git a/source/kde/cmake/kde-runtime b/source/kde/cmake/kde-runtime new file mode 100644 index 000000000..42ece9766 --- /dev/null +++ b/source/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/source/kde/cmake/kdebindings b/source/kde/cmake/kdebindings index c42283099..086f96259 100644 --- a/source/kde/cmake/kdebindings +++ b/source/kde/cmake/kdebindings @@ -2,6 +2,10 @@ # architecture dependent perl modules): eval $(perl '-V:vendorarch') +# Likewise for Ruby (note that our "vendordir" is empty, so we use sitedir): +ruby_vendorlibdir=$(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]') +ruby_vendorarchdir=$(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]') + mkdir -p build cd build #-DCMAKE_BACKWARDS_COMPATIBILITY:STRING="2.2" \ @@ -14,7 +18,9 @@ cd build -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DMAN_INSTALL_DIR=/usr/man \ - -DCUSTOM_PERL_SITE_ARCH_DIR=$vendorarch \ + -DCUSTOM_PERL_SITE_ARCH_DIR=${vendorarch} \ + -DRUBY_VENDORARCH_DIR:PATH=${ruby_vendorarchdir} \ + -DRUBY_VENDORLIB_DIR:PATH=${ruby_vendorlibdir} \ -DSYSCONF_INSTALL_DIR=/etc/kde \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DENABLE_QYOTO:BOOL=OFF \ diff --git a/source/kde/cmake/kross-interpreters b/source/kde/cmake/kross-interpreters new file mode 100644 index 000000000..b57de3f6e --- /dev/null +++ b/source/kde/cmake/kross-interpreters @@ -0,0 +1,17 @@ +mkdir -p build +cd build + #-DCMAKE_BACKWARDS_COMPATIBILITY:STRING="2.2" \ + cmake \ + $KDE_OPT_ARGS \ + -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} \ + -DBUILD_ruby:BOOL=OFF \ + .. + diff --git a/source/kde/kde-deps-build/alldeps.SlackBuild b/source/kde/kde-deps-build/alldeps.SlackBuild index aaf624aee..2f9baa328 100755 --- a/source/kde/kde-deps-build/alldeps.SlackBuild +++ b/source/kde/kde-deps-build/alldeps.SlackBuild @@ -11,7 +11,9 @@ QTDIR=/usr/lib${LIBDIRSUFFIX}/qt ; export QTDIR ALLDEPS=" \ + boost \ qt \ + qjson \ polkit-qt-1 \ sip \ PyQt \ diff --git a/source/kde/kde-deps-build/boost b/source/kde/kde-deps-build/boost new file mode 120000 index 000000000..89a8dd9be --- /dev/null +++ b/source/kde/kde-deps-build/boost @@ -0,0 +1 @@ +../../l/boost
\ No newline at end of file diff --git a/source/kde/modularize b/source/kde/modularize index 138552b06..d171550f3 100644 --- a/source/kde/modularize +++ b/source/kde/modularize @@ -1,14 +1,36 @@ # 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 +nepomuk-widgets kde-baseapps kactivities konsole @@ -39,15 +61,25 @@ kturtle kwordquiz marble parley +pairs rocs step +# kdeadmin +kdeadmin + +# kdeartwork +kdeartwork + # kdegraphics: libkipi libkexiv2 libkdcraw libksane okular +kdegraphics-mobipocket +kdegraphics-strigi-analyzer +kdegraphics-thumbnailers gwenview kamera kcolorchooser @@ -57,9 +89,6 @@ kruler ksaneplugin ksnapshot svgpart -kdegraphics-mobipocket -kdegraphics-strigi-analyzer -kdegraphics-thumbnailers # kdebindings smokegen @@ -71,6 +100,22 @@ korundum perlkde pykde4 kross-interpreters +kimono +qyoto + +# kdemultimedia +libkcddb +libkcompactdisc +audiocd-kio +dragon +ffmpegthumbs +mplayerthumbs +juk +kmix +kscd + +# kdenetwork +kdenetwork # kdeutils ark @@ -80,17 +125,80 @@ kcharselect kdf kfloppy kgpg -printer-applet +#printer-applet +print-manager kremotecontrol ktimer kwallet superkaramba sweeper -ksecrets + +# kdegames +libkdegames +libkmahjongg +klickety +ksudoku +ksquares +kpat +klines +ksnakeduel +kollision +kshisen +kblocks +lskat +kreversi +bovo +# Requires python-twisted: +#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 @@ -102,16 +210,20 @@ kaudiocreator kplayer kwebkitpart oxygen-gtk2 +oxygen-gtk3 kdevplatform kdevelop-pg-qt kdevelop -#kdevelop-php -quanta +kdevelop-php +kdevelop-php-docs +#quanta wicd-kde networkmanagement skanlite +kio-mtp libktorrent ktorrent -calligra amarok - +calligra +libkscreen +kscreen diff --git a/source/kde/modules/extragear b/source/kde/modules/extragear index 22668e180..f9c0940b8 100644 --- a/source/kde/modules/extragear +++ b/source/kde/modules/extragear @@ -4,16 +4,20 @@ kaudiocreator kplayer kwebkitpart oxygen-gtk2 +oxygen-gtk3 kdevplatform kdevelop-pg-qt kdevelop -#kdevelop-php -quanta +kdevelop-php +kdevelop-php-docs +#quanta wicd-kde networkmanagement skanlite +kio-mtp libktorrent ktorrent amarok calligra - +libkscreen +kscreen diff --git a/source/kde/modules/kdeaccessibility b/source/kde/modules/kdeaccessibility index 0356ae529..c8cda11c7 100644 --- a/source/kde/modules/kdeaccessibility +++ b/source/kde/modules/kdeaccessibility @@ -4,4 +4,3 @@ kaccessible kmouth kmousetool kmag - diff --git a/source/kde/modules/kdebase b/source/kde/modules/kdebase index fa37c97bc..38337e3bc 100644 --- a/source/kde/modules/kdebase +++ b/source/kde/modules/kdebase @@ -1,3 +1,5 @@ +nepomuk-core +nepomuk-widgets kde-baseapps kactivities konsole @@ -5,4 +7,4 @@ kate kde-wallpapers kde-workspace kde-runtime -#kde-base-artwork +kde-base-artwork diff --git a/source/kde/modules/kdebindings b/source/kde/modules/kdebindings index 67bef4ffc..ab459d971 100644 --- a/source/kde/modules/kdebindings +++ b/source/kde/modules/kdebindings @@ -1,11 +1,11 @@ -smokegen -smokeqt -qtruby -perlqt +smokegen +smokeqt +qtruby +perlqt smokekde korundum -perlkde +perlkde pykde4 kross-interpreters -kimono -qyoto +#kimono +#qyoto diff --git a/source/kde/modules/kdeedu b/source/kde/modules/kdeedu index 74c774752..c4627592a 100644 --- a/source/kde/modules/kdeedu +++ b/source/kde/modules/kdeedu @@ -18,5 +18,6 @@ kturtle kwordquiz marble parley +pairs rocs step diff --git a/source/kde/modules/kdegames b/source/kde/modules/kdegames index 41e45e2c5..4d64c22ff 100644 --- a/source/kde/modules/kdegames +++ b/source/kde/modules/kdegames @@ -1 +1,42 @@ -kdegames +libkdegames +libkmahjongg +klickety +ksudoku +ksquares +kpat +klines +ksnakeduel +kollision +kshisen +kblocks +lskat +kreversi +bovo +# Requires python-twisted: +#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/source/kde/modules/kdemultimedia b/source/kde/modules/kdemultimedia index cb104a70b..a78827b15 100644 --- a/source/kde/modules/kdemultimedia +++ b/source/kde/modules/kdemultimedia @@ -1 +1,9 @@ -kdemultimedia +libkcddb +libkcompactdisc +audiocd-kio +dragon +#ffmpegthumbs +mplayerthumbs +juk +kmix +#kscd diff --git a/source/kde/modules/kdepim b/source/kde/modules/kdepim index 7da0ed199..6594afb02 100644 --- a/source/kde/modules/kdepim +++ b/source/kde/modules/kdepim @@ -1,3 +1,2 @@ kdepim kdepim-runtime - diff --git a/source/kde/modules/kdeutils b/source/kde/modules/kdeutils index e4611a2f0..eb6d1ef51 100644 --- a/source/kde/modules/kdeutils +++ b/source/kde/modules/kdeutils @@ -6,11 +6,10 @@ kcharselect kdf kfloppy kgpg -printer-applet +#printer-applet +print-manager kremotecontrol ktimer kwallet superkaramba sweeper -ksecrets - diff --git a/source/kde/modules/oxygen-icons b/source/kde/modules/oxygen-icons index ab964a4eb..825251928 100644 --- a/source/kde/modules/oxygen-icons +++ b/source/kde/modules/oxygen-icons @@ -1,2 +1 @@ oxygen-icons - diff --git a/source/kde/package-blacklist b/source/kde/package-blacklist index 6451ed9e4..71e99c40c 100644 --- a/source/kde/package-blacklist +++ b/source/kde/package-blacklist @@ -6,6 +6,4 @@ # needs c-sharp: kimono qyoto -# ruby errors "env.h not found": -kross-interpreters diff --git a/source/kde/patch/amarok.patch b/source/kde/patch/amarok.patch deleted file mode 100644 index 35d438318..000000000 --- a/source/kde/patch/amarok.patch +++ /dev/null @@ -1,3 +0,0 @@ -# Build against liblastfm 1.0.1. -cat $CWD/patch/amarok/amarok-liblastfm1.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } - diff --git a/source/kde/patch/amarok/amarok-liblastfm1.patch b/source/kde/patch/amarok/amarok-liblastfm1.patch deleted file mode 100644 index 434993121..000000000 --- a/source/kde/patch/amarok/amarok-liblastfm1.patch +++ /dev/null @@ -1,704 +0,0 @@ -diff -U 3 -H -d -r -N -- amarok-2.5.96.orig/CMakeLists.txt amarok-2.5.96/CMakeLists.txt ---- amarok-2.5.96.orig/CMakeLists.txt 2012-07-31 12:17:20.000000000 +0200 -+++ amarok-2.5.96/CMakeLists.txt 2012-08-02 16:34:08.465503197 +0200 -@@ -129,7 +129,7 @@ - # macro_log_feature( STRIGI_FOUND "strigi" "Index metadata of files" "http://strigi.sourceforge.net" FALSE "" "" ) - - macro_optional_find_package(LibLastFm) -- macro_log_feature( LIBLASTFM_FOUND "liblastfm" "Enable Last.Fm service, including scrobbling, song submissions, and suggested song dynamic playlists" "http://cdn.last.fm/src/liblastfm-0.3.0.tar.bz2" FALSE "" "version 0.3.x (versions 1.0 or higher are incompatible)" ) -+ macro_log_feature( LIBLASTFM_FOUND "liblastfm" "Enable Last.Fm service, including scrobbling, song submissions, and suggested song dynamic playlists" "http://cdn.last.fm/src/liblastfm-1.0.0.tar.gz" FALSE "1.0.0" "" ) - macro_bool_to_01( LIBLASTFM_FOUND HAVE_LIBLASTFM ) - - macro_optional_find_package( FFmpeg ) -diff -U 3 -H -d -r -N -- amarok-2.5.96.orig/cmake/modules/FindLibLastFm.cmake amarok-2.5.96/cmake/modules/FindLibLastFm.cmake ---- amarok-2.5.96.orig/cmake/modules/FindLibLastFm.cmake 2012-07-31 12:10:56.000000000 +0200 -+++ amarok-2.5.96/cmake/modules/FindLibLastFm.cmake 2012-08-02 16:32:36.418653940 +0200 -@@ -6,7 +6,7 @@ - # LIBLASTFM_FOUND, whether liblastfm was found - - --find_path(LIBLASTFM_INCLUDE_DIR NAMES Audioscrobbler -+find_path(LIBLASTFM_INCLUDE_DIR NAMES lastfm - HINTS - ~/usr/include - /opt/local/include -diff -U 3 -H -d -r -N -- amarok-2.5.96.orig/src/LastfmReadLabelCapability.cpp amarok-2.5.96/src/LastfmReadLabelCapability.cpp ---- amarok-2.5.96.orig/src/LastfmReadLabelCapability.cpp 2012-07-31 12:10:56.000000000 +0200 -+++ amarok-2.5.96/src/LastfmReadLabelCapability.cpp 2012-08-02 16:32:36.419653927 +0200 -@@ -22,8 +22,7 @@ - #include <QMap> - #include <QNetworkReply> - --#include <lastfm/XmlQuery> --#include <ws.h> -+#include <lastfm/XmlQuery.h> - #include "core/support/Amarok.h" - - namespace Capabilities -@@ -72,7 +71,8 @@ - { - case QNetworkReply::NoError: - { -- lastfm::XmlQuery lfm = m_job->readAll(); -+ lastfm::XmlQuery lfm; -+ lfm.parse(m_job->readAll()); - QList<lastfm::XmlQuery> tags = lfm.children( "tag" ); - QStringList ret; - foreach( const lastfm::XmlQuery &child, tags ) -diff -U 3 -H -d -r -N -- amarok-2.5.96.orig/src/context/engines/upcomingevents/UpcomingEventsEngine.cpp amarok-2.5.96/src/context/engines/upcomingevents/UpcomingEventsEngine.cpp ---- amarok-2.5.96.orig/src/context/engines/upcomingevents/UpcomingEventsEngine.cpp 2012-07-31 12:10:56.000000000 +0200 -+++ amarok-2.5.96/src/context/engines/upcomingevents/UpcomingEventsEngine.cpp 2012-08-02 16:32:35.962659642 +0200 -@@ -27,10 +27,6 @@ - #include "EngineController.h" - #include "LastFmEventXmlParser.h" - --// LastFm --#include <lastfm/XmlQuery> --#include <lastfm/ws.h> -- - // KDE - #include <KDateTime> - -diff -U 3 -H -d -r -N -- amarok-2.5.96.orig/src/core/support/Amarok.h amarok-2.5.96/src/core/support/Amarok.h ---- amarok-2.5.96.orig/src/core/support/Amarok.h 2012-07-31 12:10:56.000000000 +0200 -+++ amarok-2.5.96/src/core/support/Amarok.h 2012-08-02 16:32:35.962659642 +0200 -@@ -203,6 +203,7 @@ - - inline const char* discogsApiKey() { return "91734dd989"; } - inline const char* lastfmApiKey() { return "402d3ca8e9bc9d3cf9b85e1202944ca5"; } -+ inline const char* lastfmApiSharedSecret() { return "fe0dcde9fcd14c2d1d50665b646335e9"; } - inline const char* yahooBossApiKey() { return "oQepTNrV34G9Satb1dgRZ8hdl1uhJvguDSU5Knl2Xd4ALK85knYt6ylr.FTA57XMRBA-"; } - inline const char* flickrApiKey() { return "9c5a288116c34c17ecee37877397fe31"; } - } -diff -U 3 -H -d -r -N -- amarok-2.5.96.orig/src/services/ampache/LastfmInfoParser.cpp amarok-2.5.96/src/services/ampache/LastfmInfoParser.cpp ---- amarok-2.5.96.orig/src/services/ampache/LastfmInfoParser.cpp 2012-07-31 12:10:56.000000000 +0200 -+++ amarok-2.5.96/src/services/ampache/LastfmInfoParser.cpp 2012-08-02 16:32:35.954659742 +0200 -@@ -20,8 +20,7 @@ - #include "core/support/Amarok.h" - #include "core/support/Debug.h" - --#include <lastfm/XmlQuery> --#include <lastfm/ws.h> -+#include <lastfm/XmlQuery.h> - - #include <KLocale> - -@@ -55,7 +54,8 @@ - { - case QNetworkReply::NoError: - { -- lastfm::XmlQuery lfm = m_jobs[ "getTrackInfo" ]->readAll(); -+ lastfm::XmlQuery lfm; -+ lfm.parse( m_jobs[ "getTrackInfo" ]->readAll() ); - lastfm::XmlQuery wiki = lfm["track"]["wiki"]; - const QString contentText = wiki["content"].text(); - const QString publishedDate = wiki["published"].text(); -@@ -103,7 +103,8 @@ - { - case QNetworkReply::NoError: - { -- lastfm::XmlQuery lfm = m_jobs[ "getAlbumInfo" ]->readAll(); -+ lastfm::XmlQuery lfm; -+ lfm.parse( m_jobs[ "getAlbumInfo" ]->readAll() ); - lastfm::XmlQuery wiki = lfm["album"]["wiki"]; - const QString summaryText = wiki["summary"].text(); - const QString contentText = wiki["content"].text(); -@@ -155,7 +156,8 @@ - { - case QNetworkReply::NoError: - { -- lastfm::XmlQuery lfm = m_jobs[ "getArtistInfo" ]->readAll(); -+ lastfm::XmlQuery lfm; -+ lfm.parse( m_jobs[ "getArtistInfo" ]->readAll() ); - debug() << lfm.text(); - lastfm::XmlQuery bio = lfm["artist"]["bio"]; - const QString summaryText = bio["summary"].text(); -diff -U 3 -H -d -r -N -- amarok-2.5.96.orig/src/services/lastfm/LastFmService.cpp amarok-2.5.96/src/services/lastfm/LastFmService.cpp ---- amarok-2.5.96.orig/src/services/lastfm/LastFmService.cpp 2012-07-31 12:10:56.000000000 +0200 -+++ amarok-2.5.96/src/services/lastfm/LastFmService.cpp 2012-08-02 16:32:35.955659729 +0200 -@@ -46,8 +46,8 @@ - #include "widgets/SearchWidget.h" - #include "NetworkAccessManagerProxy.h" - --#include <lastfm/Audioscrobbler> // from liblastfm --#include <lastfm/XmlQuery> -+#include <lastfm/Audioscrobbler.h> // from liblastfm -+#include <lastfm/XmlQuery.h> - - #include <KLocale> - #include <KPasswordDialog> -@@ -224,10 +224,7 @@ - { - // set the global static Lastfm::Ws stuff - lastfm::ws::ApiKey = Amarok::lastfmApiKey(); -- lastfm::ws::SharedSecret = "fe0dcde9fcd14c2d1d50665b646335e9"; -- // testing w/ official keys -- //Ws::SharedSecret = "73582dfc9e556d307aead069af110ab8"; -- //Ws::ApiKey = "c8c7b163b11f92ef2d33ba6cd3c2c3c3"; -+ lastfm::ws::SharedSecret = Amarok::lastfmApiSharedSecret(); - m_userNameArray = qstrdup( m_userName.toLatin1().data() ); - lastfm::ws::Username = m_userNameArray; - if( lastfm::nam() != The::networkAccessManager() ) -@@ -309,7 +306,8 @@ - case QNetworkReply::NoError: - { - -- lastfm::XmlQuery lfm = lastfm::XmlQuery( m_jobs[ "auth" ]->readAll() ); -+ lastfm::XmlQuery lfm; -+ lfm.parse( m_jobs[ "auth" ]->readAll() ); - LastFmServiceConfig config; - - if( lfm.children( "error" ).size() > 0 ) -@@ -359,10 +357,8 @@ - { - case QNetworkReply::NoError: - { -- try -- { -- lastfm::XmlQuery lfm( m_jobs[ "getUserInfo" ]->readAll() ); -- -+ lastfm::XmlQuery lfm; -+ if( lfm.parse( m_jobs[ "getUserInfo" ]->readAll() ) ) { - m_country = lfm["user"]["country"].text(); - m_age = lfm["user"]["age"].text(); - m_gender = lfm["user"]["gender"].text(); -@@ -381,9 +377,10 @@ - } - updateProfileInfo(); - -- } catch( lastfm::ws::ParseError& e ) -+ } -+ else - { -- debug() << "Got exception in parsing from last.fm:" << e.what(); -+ debug() << "Got exception in parsing from last.fm:" << lfm.parseError().message(); - } - break; - } case QNetworkReply::AuthenticationRequiredError: -diff -U 3 -H -d -r -N -- amarok-2.5.96.orig/src/services/lastfm/LastFmServiceCollection.cpp amarok-2.5.96/src/services/lastfm/LastFmServiceCollection.cpp ---- amarok-2.5.96.orig/src/services/lastfm/LastFmServiceCollection.cpp 2012-07-31 12:10:56.000000000 +0200 -+++ amarok-2.5.96/src/services/lastfm/LastFmServiceCollection.cpp 2012-08-02 16:32:35.956659716 +0200 -@@ -26,7 +26,7 @@ - #include "core-impl/collections/support/MemoryQueryMaker.h" - - #include <lastfm/ws.h> --#include <lastfm/XmlQuery> -+#include <lastfm/XmlQuery.h> - - #include <QNetworkReply> - -@@ -154,10 +154,9 @@ - case QNetworkReply::NoError: - { - // iterate through each neighbour -- try -+ lastfm::XmlQuery lfm; -+ if( lfm.parse( m_jobs[ "user.getNeighbours" ]->readAll() ) ) - { -- lastfm::XmlQuery lfm( m_jobs[ "user.getNeighbours" ]->readAll() ); -- - foreach( const lastfm::XmlQuery &e, lfm[ "neighbours" ].children( "user" ) ) - { - const QString name = e[ "name" ].text(); -@@ -168,9 +167,10 @@ - addTrack( trackPtr ); - } - -- } catch( lastfm::ws::ParseError& e ) -+ } -+ else - { -- debug() << "Got exception in parsing from last.fm:" << e.what(); -+ debug() << "Got exception in parsing from last.fm:" << lfm.parseError().message(); - } - break; - } -@@ -195,15 +195,14 @@ - case QNetworkReply::NoError: - { - // iterate through each neighbour -- try -+ if( !m_jobs[ "user.getNeighbours" ] ) -+ { -+ debug() << "BAD! got no result object"; -+ return; -+ } -+ lastfm::XmlQuery lfm; -+ if( lfm.parse( m_jobs[ "user.getNeighbours" ]->readAll() ) ) - { -- if( !m_jobs[ "user.getNeighbours" ] ) -- { -- debug() << "BAD! got no result object"; -- return; -- } -- lastfm::XmlQuery lfm( m_jobs[ "user.getNeighbours" ]->readAll() ); -- - // iterate through each neighbour - foreach( const lastfm::XmlQuery &e, lfm[ "neighbours" ].children( "user" ) ) - { -@@ -218,9 +217,10 @@ - - // should be safe, as both slots SHOULD get called before we return to the event loop... - m_jobs[ "user.getNeighbours" ]->deleteLater(); -- } catch( lastfm::ws::ParseError& e ) -+ } -+ else - { -- debug() << "Got exception in parsing from last.fm:" << e.what(); -+ debug() << "Got exception in parsing from last.fm:" << lfm.parseError().message(); - } - break; - } -@@ -248,10 +248,9 @@ - { - case QNetworkReply::NoError: - { -- try -+ lastfm::XmlQuery lfm; -+ if( lfm.parse( m_jobs[ "user.getFriends" ]->readAll() ) ) - { -- lastfm::XmlQuery lfm( m_jobs[ "user.getFriends" ]->readAll() ); -- - foreach( const lastfm::XmlQuery &e, lfm[ "friends" ].children( "user" ) ) - { - const QString name = e[ "name" ].text(); -@@ -261,9 +260,10 @@ - addTrack( trackPtr ); - } - -- } catch( lastfm::ws::ParseError& e ) -+ } -+ else - { -- debug() << "Got exception in parsing from last.fm:" << e.what(); -+ debug() << "Got exception in parsing from last.fm:" << lfm.parseError().message(); - } - break; - } -@@ -293,10 +293,9 @@ - { - case QNetworkReply::NoError: - { -- try -+ lastfm::XmlQuery lfm; -+ if( lfm.parse( m_jobs[ "user.getFriends" ]->readAll() ) ) - { -- lastfm::XmlQuery lfm( m_jobs[ "user.getFriends" ]->readAll() ); -- - foreach( const lastfm::XmlQuery &e, lfm[ "friends" ].children( "user" ) ) - { - const QString name = e[ "name" ].text(); -@@ -306,9 +305,10 @@ - addTrack( trackPtr ); - } - -- } catch( lastfm::ws::ParseError& e ) -+ } -+ else - { -- debug() << "Got exception in parsing from last.fm:" << e.what(); -+ debug() << "Got exception in parsing from last.fm:" << lfm.parseError().message(); - } - break; - } -diff -U 3 -H -d -r -N -- amarok-2.5.96.orig/src/services/lastfm/LastFmServiceSettings.cpp amarok-2.5.96/src/services/lastfm/LastFmServiceSettings.cpp ---- amarok-2.5.96.orig/src/services/lastfm/LastFmServiceSettings.cpp 2012-07-31 12:10:56.000000000 +0200 -+++ amarok-2.5.96/src/services/lastfm/LastFmServiceSettings.cpp 2012-08-02 16:32:35.957659703 +0200 -@@ -23,9 +23,9 @@ - #include "NetworkAccessManagerProxy.h" - #include "ui_LastFmConfigWidget.h" - --#include <lastfm/Audioscrobbler> // from liblastfm -+#include <lastfm/Audioscrobbler.h> // from liblastfm - #include <lastfm/ws.h> --#include <lastfm/XmlQuery> -+#include <lastfm/XmlQuery.h> - - #include <QCryptographicHash> - #include <QNetworkAccessManager> -@@ -100,7 +100,7 @@ - m_configDialog->testLogin->setText( i18n( "Testing..." ) ); - // set the global static Lastfm::Ws stuff - lastfm::ws::ApiKey = Amarok::lastfmApiKey(); -- lastfm::ws::SharedSecret = "fe0dcde9fcd14c2d1d50665b646335e9"; -+ lastfm::ws::SharedSecret = Amarok::lastfmApiSharedSecret(); - lastfm::ws::Username = qstrdup( m_configDialog->kcfg_ScrobblerUsername->text().toLatin1().data() ); - if( lastfm::nam() != The::networkAccessManager() ) - lastfm::setNetworkAccessManager( The::networkAccessManager() ); -@@ -126,7 +126,8 @@ - { - DEBUG_BLOCK - -- lastfm::XmlQuery lfm = lastfm::XmlQuery( m_authQuery->readAll() ); -+ lastfm::XmlQuery lfm; -+ lfm.parse( m_authQuery->readAll() ); - - switch( m_authQuery->error() ) - { -diff -U 3 -H -d -r -N -- amarok-2.5.96.orig/src/services/lastfm/LastFmTreeModel.cpp amarok-2.5.96/src/services/lastfm/LastFmTreeModel.cpp ---- amarok-2.5.96.orig/src/services/lastfm/LastFmTreeModel.cpp 2012-07-31 12:10:56.000000000 +0200 -+++ amarok-2.5.96/src/services/lastfm/LastFmTreeModel.cpp 2012-08-02 16:32:35.958659691 +0200 -@@ -26,8 +26,8 @@ - #include "AmarokMimeData.h" - - #include <lastfm/ws.h> --#include <lastfm/Tag> --#include <lastfm/XmlQuery> -+#include <lastfm/Tag.h> -+#include <lastfm/XmlQuery.h> - - #include <KIcon> - #include <KLocale> -@@ -68,11 +68,12 @@ - { - DEBUG_BLOCK - -- try -- { - // Iterate over each neighbor, in two passes: 1) Get data 2) Sort data, store in model - -- lastfm::XmlQuery lfm( m_jobs[ "getNeighbours" ]->readAll() ); -+ lastfm::XmlQuery lfm; -+ lfm.parse( m_jobs[ "getNeighbours" ]->readAll() ); -+ if( lfm.parseError().enumValue() == lastfm::ws::NoError ) -+ { - foreach( const lastfm::XmlQuery &e, lfm[ "neighbours" ].children ( "user" ) ) - { - const QString name = e[ "name" ].text(); -@@ -88,11 +89,11 @@ - appendUserStations( neighbor, name ); - } - m_neighbors.sort(); -+ } else { -+ debug() << "Got exception in parsing from last.fm:" << lfm.parseError().message(); -+ return; - } -- catch( lastfm::ws::ParseError e ) -- { -- debug() << "Got exception in parsing from last.fm:" << e.what(); -- } -+ - emitRowChanged(LastFm::Neighbors); - m_jobs[ "getNeighbours" ]->deleteLater(); - } -@@ -102,11 +103,11 @@ - { - DEBUG_BLOCK - -- try -- { -- // Iterate over each friend, in two passes: 1) Get data 2) Sort data, store in model -+ // Iterate over each friend, in two passes: 1) Get data 2) Sort data, store in model - -- lastfm::XmlQuery lfm( m_jobs[ "getFriends" ]->readAll() ); -+ lastfm::XmlQuery lfm; -+ if( lfm.parse( m_jobs[ "getFriends" ]->readAll() ) ) -+ { - foreach( const lastfm::XmlQuery &e, lfm[ "friends" ].children ( "user" ) ) - { - const QString name = e[ "name" ].text(); -@@ -123,11 +124,11 @@ - appendUserStations( afriend, name ); - } - m_friends.sort(); -+ } else { -+ debug() << "Got exception in parsing from last.fm:" << lfm.parseError().message(); -+ return; - } -- catch( lastfm::ws::ParseError e ) -- { -- debug() << "Got exception in parsing from last.fm:" << e.what(); -- } -+ - emitRowChanged(LastFm::Friends); - m_jobs[ "getFriends" ]->deleteLater(); - } -@@ -137,10 +138,9 @@ - { - DEBUG_BLOCK - WeightedStringList list; -- try -+ lastfm::XmlQuery lfm; -+ if( lfm.parse( m_jobs[ "getTopArtists" ]->readAll() ) ) - { -- lastfm::XmlQuery lfm( m_jobs[ "getTopArtists" ]->readAll() ); -- - foreach( const lastfm::XmlQuery &e, lfm[ "topartists" ].children ( "artist" ) ) - { - const QString name = e[ "name" ].text(); -@@ -158,9 +158,10 @@ - m_myTopArtists->appendChild ( artist ); - } - -- } catch( lastfm::ws::ParseError e ) -+ } -+ else - { -- debug() << "Got exception in parsing from last.fm:" << e.what(); -+ debug() << "Got exception in parsing from last.fm:" << lfm.parseError().message(); - } - emitRowChanged(LastFm::TopArtists); - m_jobs[ "getTopArtists" ]->deleteLater(); -diff -U 3 -H -d -r -N -- amarok-2.5.96.orig/src/services/lastfm/LastFmTreeModel.h amarok-2.5.96/src/services/lastfm/LastFmTreeModel.h ---- amarok-2.5.96.orig/src/services/lastfm/LastFmTreeModel.h 2012-07-31 12:10:56.000000000 +0200 -+++ amarok-2.5.96/src/services/lastfm/LastFmTreeModel.h 2012-08-02 16:32:35.957659703 +0200 -@@ -22,7 +22,7 @@ - #include "core/meta/Meta.h" - #include "WeightedStringList.h" - --#include <lastfm/User> -+#include <lastfm/User.h> - - #include <QAbstractItemModel> - #include <QHash> -@@ -136,7 +136,7 @@ - LastFmTreeItem *m_myTopArtists; - - QString m_userName; -- lastfm::AuthenticatedUser m_user; -+ lastfm::User m_user; - - QStringList m_friends; - QStringList m_neighbors; -diff -U 3 -H -d -r -N -- amarok-2.5.96.orig/src/services/lastfm/ScrobblerAdapter.h amarok-2.5.96/src/services/lastfm/ScrobblerAdapter.h ---- amarok-2.5.96.orig/src/services/lastfm/ScrobblerAdapter.h 2012-07-31 12:10:56.000000000 +0200 -+++ amarok-2.5.96/src/services/lastfm/ScrobblerAdapter.h 2012-08-02 16:32:35.958659691 +0200 -@@ -20,8 +20,8 @@ - - #include "core/meta/Meta.h" - --#include <lastfm/Audioscrobbler> --#include <lastfm/Track> -+#include <lastfm/Audioscrobbler.h> -+#include <lastfm/Track.h> - - #include <QVariant> - -diff -U 3 -H -d -r -N -- amarok-2.5.96.orig/src/services/lastfm/biases/LastFmBias.cpp amarok-2.5.96/src/services/lastfm/biases/LastFmBias.cpp ---- amarok-2.5.96.orig/src/services/lastfm/biases/LastFmBias.cpp 2012-07-31 12:10:56.000000000 +0200 -+++ amarok-2.5.96/src/services/lastfm/biases/LastFmBias.cpp 2012-08-02 16:32:35.958659691 +0200 -@@ -34,9 +34,8 @@ - #include "core/collections/QueryMaker.h" - #include "core-impl/collections/support/CollectionManager.h" - --#include "lastfm/Artist" --#include "lastfm/ws.h" --#include "lastfm/XmlQuery" -+#include <lastfm/Artist.h> -+#include <lastfm/ws.h> - - #include <QLabel> - #include <QComboBox> -diff -U 3 -H -d -r -N -- amarok-2.5.96.orig/src/services/lastfm/biases/WeeklyTopBias.cpp amarok-2.5.96/src/services/lastfm/biases/WeeklyTopBias.cpp ---- amarok-2.5.96.orig/src/services/lastfm/biases/WeeklyTopBias.cpp 2012-07-31 12:10:56.000000000 +0200 -+++ amarok-2.5.96/src/services/lastfm/biases/WeeklyTopBias.cpp 2012-08-02 16:32:35.960659667 +0200 -@@ -34,9 +34,9 @@ - #include "core/collections/QueryMaker.h" - #include "core-impl/collections/support/CollectionManager.h" - --#include "lastfm/Artist" --#include "lastfm/ws.h" --#include "lastfm/XmlQuery" -+#include <lastfm/Artist.h> -+#include <lastfm/ws.h> -+#include <lastfm/XmlQuery.h> - - #include <QNetworkReply> - -@@ -371,10 +371,9 @@ - } - - -- try -+ lastfm::XmlQuery lfm; -+ if( lfm.parse( reply->readAll() ) ) - { -- lastfm::XmlQuery lfm( reply->readAll() ); -- - // debug() << "got response:" << lfm; - QStringList artists; - for( int i = 0; i < lfm[ "weeklyartistchart" ].children( "artist" ).size(); i++ ) -@@ -398,10 +397,10 @@ - warning() << "Got a reply for a week"<<week<<"that was not requested."; - return; - } -- -- } catch( lastfm::ws::ParseError& e ) -+ } -+ else - { -- debug() << "caught exception parsing weekly artist chart."; -+ debug() << "failed to parse weekly artist chart."; - } - - reply->deleteLater(); -diff -U 3 -H -d -r -N -- amarok-2.5.96.orig/src/services/lastfm/meta/LastFmMeta.cpp amarok-2.5.96/src/services/lastfm/meta/LastFmMeta.cpp ---- amarok-2.5.96.orig/src/services/lastfm/meta/LastFmMeta.cpp 2012-07-31 12:10:56.000000000 +0200 -+++ amarok-2.5.96/src/services/lastfm/meta/LastFmMeta.cpp 2012-08-02 16:32:35.961659655 +0200 -@@ -41,7 +41,7 @@ - #include <QWeakPointer> - #include <QUrl> - --#include <lastfm/Track> -+#include <lastfm/Track.h> - - namespace LastFm { - -@@ -451,8 +451,7 @@ - DEBUG_BLOCK - - debug() << "info:" << d->lastFmTrack.artist() << d->lastFmTrack.title(); -- d->wsReply = lastfm::MutableTrack( d->lastFmTrack ).love(); -- connect( d->wsReply, SIGNAL( finished() ), this, SLOT( slotWsReply() ) ); -+ lastfm::MutableTrack( d->lastFmTrack ).love(); - } - - void -@@ -477,9 +476,9 @@ - { - if( d->trackFetch->error() == QNetworkReply::NoError ) - { -- try -+ lastfm::XmlQuery lfm; -+ if( lfm.parse( d->trackFetch->readAll() ) ) - { -- lastfm::XmlQuery lfm( d->trackFetch->readAll() ); - QString id = lfm[ "track" ][ "id" ].text(); - QString streamable = lfm[ "track" ][ "streamable" ].text(); - if( streamable.toInt() == 1 ) -@@ -487,9 +486,10 @@ - else - init(); - -- } catch( lastfm::ws::ParseError& e ) -+ } -+ else - { -- debug() << "Got exception in parsing from last.fm:" << e.what(); -+ debug() << "Got exception in parsing from last.fm:" << lfm.parseError().message(); - } - } else - { -diff -U 3 -H -d -r -N -- amarok-2.5.96.orig/src/services/lastfm/meta/LastFmMeta.h amarok-2.5.96/src/services/lastfm/meta/LastFmMeta.h ---- amarok-2.5.96.orig/src/services/lastfm/meta/LastFmMeta.h 2012-07-31 12:10:56.000000000 +0200 -+++ amarok-2.5.96/src/services/lastfm/meta/LastFmMeta.h 2012-08-02 16:32:35.960659667 +0200 -@@ -24,7 +24,7 @@ - #include "ServiceMetaBase.h" // for the SourceInfoProvider - - --#include <lastfm/Track> -+#include <lastfm/Track.h> - - - #include <QObject> -diff -U 3 -H -d -r -N -- amarok-2.5.96.orig/src/services/lastfm/meta/LastFmMeta_p.h amarok-2.5.96/src/services/lastfm/meta/LastFmMeta_p.h ---- amarok-2.5.96.orig/src/services/lastfm/meta/LastFmMeta_p.h 2012-07-31 12:10:56.000000000 +0200 -+++ amarok-2.5.96/src/services/lastfm/meta/LastFmMeta_p.h 2012-08-02 16:32:35.961659655 +0200 -@@ -26,10 +26,10 @@ - #include "core/statistics/StatisticsProvider.h" - #include "core-impl/statistics/providers/tag/TagStatisticsProvider.h" - --#include <lastfm/Track> -+#include <lastfm/Track.h> - #include <lastfm/ws.h> --#include <lastfm/RadioTuner> --#include <lastfm/XmlQuery> -+#include <lastfm/RadioTuner.h> -+#include <lastfm/XmlQuery.h> - - #include <kio/job.h> - #include <kio/jobclasses.h> -@@ -144,26 +144,24 @@ - return; - if( m_userFetch->error() == QNetworkReply::NoError ) - { -- try -+ lastfm::XmlQuery lfm; -+ if( !lfm.parse( m_userFetch->readAll() ) ) - { -- lastfm::XmlQuery lfm( m_userFetch->readAll() ); -- albumUrl = lfm[ "track" ][ "album" ][ "url" ].text(); -- trackUrl = lfm[ "track" ][ "url" ].text(); -- artistUrl = lfm[ "track" ][ "artist" ][ "url" ].text(); -- -- notifyObservers(); -+ debug() << "Got exception in parsing from last.fm:" << lfm.parseError().message(); -+ return; -+ } -+ albumUrl = lfm[ "track" ][ "album" ][ "url" ].text(); -+ trackUrl = lfm[ "track" ][ "url" ].text(); -+ artistUrl = lfm[ "track" ][ "artist" ][ "url" ].text(); - -- imageUrl = lfm[ "track" ][ "album" ][ "image size=large" ].text(); -+ notifyObservers(); - -- if( !imageUrl.isEmpty() ) -- { -- KIO::Job* job = KIO::storedGet( KUrl( imageUrl ), KIO::Reload, KIO::HideProgressInfo ); -- connect( job, SIGNAL( result( KJob* ) ), this, SLOT( fetchImageFinished( KJob* ) ) ); -- } -+ imageUrl = lfm[ "track" ][ "album" ][ "image size=large" ].text(); - -- } catch( lastfm::ws::ParseError& e ) -+ if( !imageUrl.isEmpty() ) - { -- debug() << "Got exception in parsing from last.fm:" << e.what(); -+ KIO::Job* job = KIO::storedGet( KUrl( imageUrl ), KIO::Reload, KIO::HideProgressInfo ); -+ connect( job, SIGNAL( result( KJob* ) ), this, SLOT( fetchImageFinished( KJob* ) ) ); - } - } - -diff -U 3 -H -d -r -N -- amarok-2.5.96.orig/src/services/lastfm/meta/MultiPlayableCapabilityImpl_p.h amarok-2.5.96/src/services/lastfm/meta/MultiPlayableCapabilityImpl_p.h ---- amarok-2.5.96.orig/src/services/lastfm/meta/MultiPlayableCapabilityImpl_p.h 2012-07-31 12:10:56.000000000 +0200 -+++ amarok-2.5.96/src/services/lastfm/meta/MultiPlayableCapabilityImpl_p.h 2012-08-02 16:32:35.962659642 +0200 -@@ -25,8 +25,9 @@ - #include "core/meta/Meta.h" - #include "core/capabilities/MultiPlayableCapability.h" - --#include <lastfm/Track> --#include <lastfm/RadioTuner> -+#include <lastfm/Track.h> -+#include <lastfm/RadioStation.h> -+#include <lastfm/RadioTuner.h> - #include <lastfm/ws.h> - - #include <KLocale> -@@ -55,24 +56,23 @@ - { - DEBUG_BLOCK - m_tuner = new lastfm::RadioTuner( lastfm::RadioStation( m_track->uidUrl() ) ); -- -+ - connect( m_tuner, SIGNAL( trackAvailable() ), this, SLOT( slotNewTrackAvailable() ) ); -- connect( m_tuner, SIGNAL( error( lastfm::ws::Error ) ), this, SLOT( error( lastfm::ws::Error ) ) ); -+ connect( m_tuner, SIGNAL( error(lastfm::ws::Error,QString) ), this, SLOT( error( lastfm::ws::Error ) ) ); - } -- -+ - virtual void fetchNext() - { - DEBUG_BLOCK - m_currentTrack = m_tuner->takeNextTrack(); - m_track->setTrackInfo( m_currentTrack ); -- - } -- -+ - using Observer::metadataChanged; - virtual void metadataChanged( Meta::TrackPtr track ) - { - const LastFm::TrackPtr ltrack = LastFm::TrackPtr::dynamicCast( track ); -- -+ - if( ltrack.isNull() ) - return; - -@@ -94,7 +94,7 @@ - m_track->setTrackInfo( m_currentTrack ); - } - } -- -+ - virtual void skip() - { - fetchNext(); diff --git a/source/kde/patch/calligra.patch b/source/kde/patch/calligra.patch deleted file mode 100644 index aac4ebf95..000000000 --- a/source/kde/patch/calligra.patch +++ /dev/null @@ -1,3 +0,0 @@ -# Patch an overflow vulnerability in calligra: -zcat $CWD/patch/calligra/calligra.words.fix_overflow.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } - diff --git a/source/kde/patch/calligra/calligra.words.fix_overflow.diff b/source/kde/patch/calligra/calligra.words.fix_overflow.diff deleted file mode 100644 index 1a68b3f9d..000000000 --- a/source/kde/patch/calligra/calligra.words.fix_overflow.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/filters/words/msword-odf/wv2/src/styles.cpp b/filters/words/msword-odf/wv2/src/styles.cpp -index 02a82a0..78ac31d 100644 ---- a/filters/words/msword-odf/wv2/src/styles.cpp -+++ b/filters/words/msword-odf/wv2/src/styles.cpp -@@ -248,6 +248,11 @@ throw(InvalidFormatException) - #ifdef WV2_DEBUG_STYLESHEET - wvlog << "cbUPX: " << cbUPX << endl; - #endif -+ // do not overflow the allocated buffer grupx -+ if (offset + cbUPX > grupxLen) { -+ wvlog << "====> Error: grupx would overflow!" << endl; -+ return false; -+ } - for ( U16 j = 0; j < cbUPX; ++j ) { - grupx[ offset + j ] = stream->readU8(); // read the whole UPX - #ifdef WV2_DEBUG_STYLESHEET diff --git a/source/kde/patch/kde-workspace.patch b/source/kde/patch/kde-workspace.patch index 27eab8742..6cc98a91e 100644 --- a/source/kde/patch/kde-workspace.patch +++ b/source/kde/patch/kde-workspace.patch @@ -3,3 +3,6 @@ zcat $CWD/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff.gz | patch - # 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 ; } + +# Fix issues with recent glibc crypt() returning NULL: +zcat $CWD/patch/kde-workspace/kde-workspace.shadow.changeset_r7777194da6154375fc8103b8c4e29e385cd7ae2e.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff b/source/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff index ef899e83f..795827805 100644 --- a/source/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff +++ b/source/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff @@ -1,16 +1,13 @@ -diff -ur kdebase-workspace-4.5.80/plasma/generic/applets/battery/battery.cpp kdebase-workspace-4.5.80-battery-plasmoid-showremainingtime/plasma/generic/applets/battery/battery.cpp ---- kdebase-workspace-4.5.80/plasma/generic/applets/battery/battery.cpp 2010-11-19 11:51:21.000000000 +0100 -+++ kdebase-workspace-4.5.80-battery-plasmoid-showremainingtime/plasma/generic/applets/battery/battery.cpp 2010-11-20 20:39:11.000000000 +0100 -@@ -712,7 +712,11 @@ - m_acInfoLabel->setText(i18n("<b>Not plugged in</b>")); - } +diff -ur kde-workspace-4.8.80/plasma/generic/applets/batterymonitor/contents/config/main.xml kde-workspace-4.8.80-battery-plasmoid-showremainingtime/plasma/generic/applets/batterymonitor/contents/config/main.xml +--- kde-workspace-4.8.80/plasma/generic/applets/batterymonitor/contents/config/main.xml 2012-05-23 01:55:18.000000000 +0200 ++++ kde-workspace-4.8.80-battery-plasmoid-showremainingtime/plasma/generic/applets/batterymonitor/contents/config/main.xml 2012-05-26 22:09:44.000000000 +0200 +@@ -10,7 +10,7 @@ + <default>false</default> + </entry> + <entry name="showRemainingTime" type="Bool"> +- <default>false</default> ++ <default>true</default> + </entry> + </group> -- if (batteryCount && showRemainingTime && m_remainingMSecs > 0) { -+ // Always show the remaining time in the popup. -+ // We don't just set m_showRemainingTime to true by default because -+ // that'd try to use the time also for the icon. That won't fit on -+ // small panels. -+ if (batteryCount && m_remainingMSecs > 0) { - m_remainingTimeLabel->show(); - m_remainingInfoLabel->show(); - // we don't have too much accuracy so only give hours and minutes + diff --git a/source/kde/patch/kde-workspace/kde-workspace.shadow.changeset_r7777194da6154375fc8103b8c4e29e385cd7ae2e.diff b/source/kde/patch/kde-workspace/kde-workspace.shadow.changeset_r7777194da6154375fc8103b8c4e29e385cd7ae2e.diff new file mode 100644 index 000000000..dbb4614c2 --- /dev/null +++ b/source/kde/patch/kde-workspace/kde-workspace.shadow.changeset_r7777194da6154375fc8103b8c4e29e385cd7ae2e.diff @@ -0,0 +1,92 @@ +commit 7777194da6154375fc8103b8c4e29e385cd7ae2e +Author: Michael Pyne <mpyne@kde.org> +Date: Sat Jun 29 16:13:20 2013 -0400 + + kdm, kcheckpass: Check for NULL return from crypt(3) and friends. + + Potential issue noted and fixed by Mancha <mancha1@hush.com>. + + Patch reviewed by myself and ossi. Review request was closed out by the + backport commit. + +diff --git a/kcheckpass/checkpass_etcpasswd.c b/kcheckpass/checkpass_etcpasswd.c +index 1dbe06f..e261b7c 100644 +--- a/kcheckpass/checkpass_etcpasswd.c ++++ b/kcheckpass/checkpass_etcpasswd.c +@@ -35,6 +35,7 @@ AuthReturn Authenticate(const char *method, + { + struct passwd *pw; + char *passwd; ++ char *crpt_passwd; + + if (strcmp(method, "classic")) + return AuthError; +@@ -49,7 +50,7 @@ AuthReturn Authenticate(const char *method, + if (!(passwd = conv(ConvGetHidden, 0))) + return AuthAbort; + +- if (!strcmp(pw->pw_passwd, crypt(passwd, pw->pw_passwd))) { ++ if ((crpt_passwd = crypt(passwd, pw->pw_passwd)) && !strcmp(pw->pw_passwd, crpt_passwd)) { + dispose(passwd); + return AuthOk; /* Success */ + } +diff --git a/kcheckpass/checkpass_osfc2passwd.c b/kcheckpass/checkpass_osfc2passwd.c +index 9a074f9..d181233 100644 +--- a/kcheckpass/checkpass_osfc2passwd.c ++++ b/kcheckpass/checkpass_osfc2passwd.c +@@ -38,6 +38,7 @@ AuthReturn Authenticate(const char *method, + const char *login, char *(*conv) (ConvRequest, const char *)) + { + char *passwd; ++ char *crpt_passwd; + char c2passwd[256]; + + if (strcmp(method, "classic")) +@@ -52,7 +53,7 @@ AuthReturn Authenticate(const char *method, + if (!(passwd = conv(ConvGetHidden, 0))) + return AuthAbort; + +- if (!strcmp(c2passwd, osf1c2crypt(passwd, c2passwd))) { ++ if ((crpt_passwd = osf1c2crypt(passwd, c2passwd)) && !strcmp(c2passwd, crpt_passwd)) { + dispose(passwd); + return AuthOk; /* Success */ + } +diff --git a/kcheckpass/checkpass_shadow.c b/kcheckpass/checkpass_shadow.c +index ec3a4e0..c0f6913 100644 +--- a/kcheckpass/checkpass_shadow.c ++++ b/kcheckpass/checkpass_shadow.c +@@ -69,7 +69,7 @@ AuthReturn Authenticate(const char *method, + crpt_passwd = crypt(typed_in_password, password); + #endif + +- if (!strcmp(password, crpt_passwd )) { ++ if (crpt_passwd && !strcmp(password, crpt_passwd )) { + dispose(typed_in_password); + return AuthOk; /* Success */ + } +diff --git a/kdm/backend/client.c b/kdm/backend/client.c +index bdff6da..26bb0b4 100644 +--- a/kdm/backend/client.c ++++ b/kdm/backend/client.c +@@ -540,6 +540,9 @@ verify(GConvFunc gconv, int rootok) + # if defined(HAVE_STRUCT_PASSWD_PW_EXPIRE) || defined(USESHADOW) + int tim, expir, warntime, quietlog; + # endif ++# if !defined(ultrix) && !defined(__ultrix__) && (defined(HAVE_PW_ENCRYPT) || defined(HAVE_CRYPT)) ++ char *crpt_passwd; ++# endif + #endif + + debug("verify ...\n"); +@@ -752,9 +755,9 @@ verify(GConvFunc gconv, int rootok) + # if defined(ultrix) || defined(__ultrix__) + if (authenticate_user(p, curpass, 0) < 0) + # elif defined(HAVE_PW_ENCRYPT) +- if (strcmp(pw_encrypt(curpass, p->pw_passwd), p->pw_passwd)) ++ if (!(crpt_passwd = pw_encrypt(curpass, p->pw_passwd)) || strcmp(crpt_passwd, p->pw_passwd)) + # elif defined(HAVE_CRYPT) +- if (strcmp(crypt(curpass, p->pw_passwd), p->pw_passwd)) ++ if (!(crpt_passwd = crypt(curpass, p->pw_passwd)) || strcmp(crpt_passwd, p->pw_passwd)) + # else + if (strcmp(curpass, p->pw_passwd)) + # endif diff --git a/source/kde/patch/kdelibs.patch b/source/kde/patch/kdelibs.patch index d66622e08..c314b559c 100644 --- a/source/kde/patch/kdelibs.patch +++ b/source/kde/patch/kdelibs.patch @@ -4,5 +4,11 @@ zcat $CWD/patch/kdelibs/kdelibs.docbook.patch.gz | patch -p1 --verbose || { touc # 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 ; } + +# Revert 3 patches which (although they probably follow the FDo spec better), +# cause incorrect icon overrides: +zcat $CWD/patch/kdelibs/return-not-break.-copy-paste-error.patch.gz | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +zcat $CWD/patch/kdelibs/coding-style-fixes.patch.gz | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +zcat $CWD/patch/kdelibs/return-application-icons-properly.patch.gz | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/patch/kdelibs/coding-style-fixes.patch b/source/kde/patch/kdelibs/coding-style-fixes.patch new file mode 100644 index 000000000..11108f0a4 --- /dev/null +++ b/source/kde/patch/kdelibs/coding-style-fixes.patch @@ -0,0 +1,62 @@ +From 2173580f070e806d4715e13048c697c49ec262e2 Mon Sep 17 00:00:00 2001 +From: Aaron Seigo <aseigo@kde.org> +Date: Thu, 21 Feb 2013 17:59:58 +0100 +Subject: [PATCH 047/111] coding style fixes + +--- + kdeui/icons/kiconloader.cpp | 27 ++++++++++++--------------- + 1 file changed, 12 insertions(+), 15 deletions(-) + +diff --git a/kdeui/icons/kiconloader.cpp b/kdeui/icons/kiconloader.cpp +index 6fed667..dba474d 100644 +--- a/kdeui/icons/kiconloader.cpp ++++ b/kdeui/icons/kiconloader.cpp +@@ -938,32 +938,29 @@ K3Icon KIconLoaderPrivate::findMatchingIcon(const QString& name, int size) const + } + } + +- foreach (KIconThemeNode *themeNode, links) +- { ++ foreach (KIconThemeNode *themeNode, links) { + QString currentName = name; + +- while (!currentName.isEmpty()) +- { +- ++ while (!currentName.isEmpty()) { + //kDebug(264) << "Looking up" << currentName; + +-// The following code has been commented out because the Qt SVG renderer needs +-// to be improved. If you are going to change/remove some code from this part, +-// please contact me before (ereslibre@kde.org), or kde-core-devel@kde.org. (ereslibre) +- for (int i = 0 ; i < 4 ; i++) +- { ++ for (int i = 0 ; i < 4 ; i++) { + icon = themeNode->theme->iconPath(currentName + ext[i], size, KIconLoader::MatchExact); +- if (icon.isValid()) +- return icon; ++ if (icon.isValid()) { ++ break; ++ } + + icon = themeNode->theme->iconPath(currentName + ext[i], size, KIconLoader::MatchBest); +- if (icon.isValid()) +- return icon; ++ if (icon.isValid()) { ++ break; ++ } + } ++ //kDebug(264) << "Looking up" << currentName; + +- if (genericFallback) ++ if (genericFallback) { + // we already tested the base name + break; ++ } + + int rindex = currentName.lastIndexOf('-'); + if (rindex > 1) { // > 1 so that we don't split x-content or x-epoc +-- +1.8.1.4 + + diff --git a/source/kde/patch/kdelibs/return-application-icons-properly.patch b/source/kde/patch/kdelibs/return-application-icons-properly.patch new file mode 100644 index 000000000..2bdb53adf --- /dev/null +++ b/source/kde/patch/kdelibs/return-application-icons-properly.patch @@ -0,0 +1,56 @@ +From 613c951a1157df0d8a907a155a5eaa706816d5f9 Mon Sep 17 00:00:00 2001 +From: Aaron Seigo <aseigo@kde.org> +Date: Thu, 21 Feb 2013 17:58:11 +0100 +Subject: return application icons properly + +BUG:315578 +--- + kdeui/icons/kiconloader.cpp | 31 ++++++++++++++++++++++++++++++- + 1 file changed, 30 insertions(+), 1 deletion(-) + +diff --git a/kdeui/icons/kiconloader.cpp b/kdeui/icons/kiconloader.cpp +index f65e941..6fed667 100644 +--- a/kdeui/icons/kiconloader.cpp ++++ b/kdeui/icons/kiconloader.cpp +@@ -909,7 +909,36 @@ K3Icon KIconLoaderPrivate::findMatchingIcon(const QString& name, int size) const + const char * const ext[4] = { ".png", ".svgz", ".svg", ".xpm" }; + bool genericFallback = name.endsWith(QLatin1String("-x-generic")); + +- foreach(KIconThemeNode *themeNode, links) ++ // Do two passes through themeNodes. ++ // ++ // The first pass looks for an exact match in each themeNode one after the other. ++ // If one is found and it is an app icon then return that icon. ++ // ++ // In the next pass (assuming the first pass failed), it looks for exact matches ++ // and then generic fallbacks in each themeNode one after the other ++ // ++ // The reasoning is that application icons should always match exactly, all other ++ // icons may fallback. Since we do not know what the context is here when we start ++ // looking for it, we can only go by the path found. ++ foreach (KIconThemeNode *themeNode, links) { ++ for (int i = 0 ; i < 4 ; i++) { ++ icon = themeNode->theme->iconPath(name + ext[i], size, KIconLoader::MatchExact); ++ if (icon.isValid()) { ++ break; ++ } ++ ++ icon = themeNode->theme->iconPath(name + ext[i], size, KIconLoader::MatchBest); ++ if (icon.isValid()) { ++ break; ++ } ++ } ++ ++ if (icon.isValid() && icon.path.contains("/apps/")) { ++ return icon; ++ } ++ } ++ ++ foreach (KIconThemeNode *themeNode, links) + { + QString currentName = name; + +-- +1.8.1.4 + + diff --git a/source/kde/patch/kdelibs/return-not-break.-copy-paste-error.patch b/source/kde/patch/kdelibs/return-not-break.-copy-paste-error.patch new file mode 100644 index 000000000..b62818ed6 --- /dev/null +++ b/source/kde/patch/kdelibs/return-not-break.-copy-paste-error.patch @@ -0,0 +1,31 @@ +From 0edfd42151ad57322a10a24ab4971b638e220e6e Mon Sep 17 00:00:00 2001 +From: Aaron Seigo <aseigo@kde.org> +Date: Thu, 21 Feb 2013 18:14:54 +0100 +Subject: [PATCH 049/111] return, not break. copy/paste error + +--- + kdeui/icons/kiconloader.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/kdeui/icons/kiconloader.cpp b/kdeui/icons/kiconloader.cpp +index dba474d..ce6aeea 100644 +--- a/kdeui/icons/kiconloader.cpp ++++ b/kdeui/icons/kiconloader.cpp +@@ -947,12 +947,12 @@ K3Icon KIconLoaderPrivate::findMatchingIcon(const QString& name, int size) const + for (int i = 0 ; i < 4 ; i++) { + icon = themeNode->theme->iconPath(currentName + ext[i], size, KIconLoader::MatchExact); + if (icon.isValid()) { +- break; ++ return icon; + } + + icon = themeNode->theme->iconPath(currentName + ext[i], size, KIconLoader::MatchBest); + if (icon.isValid()) { +- break; ++ return icon; + } + } + //kDebug(264) << "Looking up" << currentName; +-- +1.8.1.4 + diff --git a/source/kde/patch/kdepim.patch b/source/kde/patch/kdepim.patch deleted file mode 100644 index 7618dc8a8..000000000 --- a/source/kde/patch/kdepim.patch +++ /dev/null @@ -1,3 +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 ; } - diff --git a/source/kde/patch/kdepim/kdepim-4.5.85-install-headers.patch b/source/kde/patch/kdepim/kdepim-4.5.85-install-headers.patch deleted file mode 100644 index aa43059af..000000000 --- a/source/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/source/kde/patch/korundum.patch b/source/kde/patch/korundum.patch deleted file mode 100644 index 7a8b7cfaa..000000000 --- a/source/kde/patch/korundum.patch +++ /dev/null @@ -1,4 +0,0 @@ -# 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 ; } - diff --git a/source/kde/patch/korundum/korundum_ruby19.patch b/source/kde/patch/korundum/korundum_ruby19.patch deleted file mode 100644 index 561d8de13..000000000 --- a/source/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/source/kde/post-install/konsole.post-install b/source/kde/post-install/konsole.post-install index b0ef9a6b1..6104e9f2f 100644 --- a/source/kde/post-install/konsole.post-install +++ b/source/kde/post-install/konsole.post-install @@ -2,8 +2,9 @@ # still documented in the help manual. Here's a way to get the same # thing, and it works here, but I honestly don't know how it will act # everywhere with every shell. I just know it works with bash and ksh -sed -i -e 's/Exec=konsole/Exec=konsole -e $SHELL -l/' \ - $PKG/usr/share/applications/kde4/konsole.desktop +# Removed in KDE 4.9.4 package because it does not work: +#sed -i -e 's/^Exec=konsole/Exec=konsole -e $SHELL -l/' \ +# $PKG/usr/share/applications/kde4/konsole.desktop ## I find this a little bit too bright... <change by pjv> ## Change the konsole defaults to look like the real Linux console: diff --git a/source/kde/pre-install/amarok.pre-install b/source/kde/pre-install/amarok.pre-install index 2deb10632..dfb3b0095 100644 --- a/source/kde/pre-install/amarok.pre-install +++ b/source/kde/pre-install/amarok.pre-install @@ -1,9 +1,9 @@ -if [ ! -r /usr/lib${LIBDIRSUFFIX}/libmysqld.a ]; then +if [ ! -r /usr/bin/mysql_embedded ]; then cat << EOF -ERROR: missing /usr/lib${LIBDIRSUFFIX}/libmysqld.a +ERROR: missing /usr/bin/mysql_embedded please use mysql-embedded.SlackBuild in source/ap/mysql/ - to build and install a mysql package containing libmysqld.a, - and then try again. + 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/source/kde/slack-desc/audiocd-kio b/source/kde/slack-desc/audiocd-kio new file mode 100644 index 000000000..a82bd2840 --- /dev/null +++ b/source/kde/slack-desc/audiocd-kio @@ -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------------------------------------------------------| +audiocd-kio: audiocd-kio (audiocd kio slave) +audiocd-kio: +audiocd-kio: Audiocd kio slave. +audiocd-kio: +audiocd-kio: +audiocd-kio: +audiocd-kio: +audiocd-kio: +audiocd-kio: +audiocd-kio: For more information, visit: http://www.kde.org +audiocd-kio: diff --git a/source/kde/slack-desc/bomber b/source/kde/slack-desc/bomber new file mode 100644 index 000000000..cae9a7373 --- /dev/null +++ b/source/kde/slack-desc/bomber @@ -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------------------------------------------------------| +bomber: bomber (arcade bombing game for KDE) +bomber: +bomber: Bomber is a single player arcade game. The player is invading various +bomber: cities in a plane that is decreasing in height. The goal of the game +bomber: is to destroy all the buildings and advance to the next level. +bomber: Each level gets a bit harder by increasing the speed of the plane +bomber: and the height of the buildings. +bomber: +bomber: +bomber: For more information, visit: http://www.kde.org +bomber: diff --git a/source/kde/slack-desc/bovo b/source/kde/slack-desc/bovo new file mode 100644 index 000000000..8ccebb394 --- /dev/null +++ b/source/kde/slack-desc/bovo @@ -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------------------------------------------------------| +bovo: bovo (five-in-a-row board game) +bovo: +bovo: Bovo is a Gomoku ("five points" in Japanese) like game for two +bovo: players, where the opponents alternate in placing their respective +bovo: pictogram on the game board. Also known as: Connect Five, +bovo: Five in a row, X and O, Naughts and Crosses. +bovo: +bovo: +bovo: +bovo: For more information, visit: http://www.kde.org +bovo: diff --git a/source/kde/slack-desc/dragon b/source/kde/slack-desc/dragon new file mode 100644 index 000000000..115fda182 --- /dev/null +++ b/source/kde/slack-desc/dragon @@ -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------------------------------------------------------| +dragon: dragon (KDE multimedia player) +dragon: +dragon: Dragon Player is a multimedia player where the focus is on simplicity, +dragon: instead of features. Dragon Player does one thing, and only one +dragon: thing, which is playing multimedia files. +dragon: +dragon: +dragon: +dragon: +dragon: For more information, visit: http://www.kde.org +dragon: diff --git a/source/kde/slack-desc/ffmpegthumbs b/source/kde/slack-desc/ffmpegthumbs new file mode 100644 index 000000000..6ff665ff3 --- /dev/null +++ b/source/kde/slack-desc/ffmpegthumbs @@ -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------------------------------------------------------| +ffmpegthumbs: ffmpegthumbs (video thumbnail generator using ffmpeg) +ffmpegthumbs: +ffmpegthumbs: FFMpegThumbs is a video thumbnail generator for KDE file managers +ffmpegthumbs: like Dolphin and Konqueror. It enables them to show preview +ffmpegthumbs: images of video files using FFMpeg. +ffmpegthumbs: +ffmpegthumbs: +ffmpegthumbs: +ffmpegthumbs: +ffmpegthumbs: For more information, visit: http://www.kde.org +ffmpegthumbs: diff --git a/source/kde/slack-desc/granatier b/source/kde/slack-desc/granatier new file mode 100644 index 000000000..6eb369542 --- /dev/null +++ b/source/kde/slack-desc/granatier @@ -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------------------------------------------------------| +granatier: granatier (bomberman clone for KDE) +granatier: +granatier: Granatier is a clone of the classic Bomberman game, inspired by +granatier: the work of the Clanbomber clone. +granatier: +granatier: +granatier: +granatier: +granatier: +granatier: For more information, visit: http://www.kde.org +granatier: diff --git a/source/kde/slack-desc/juk b/source/kde/slack-desc/juk new file mode 100644 index 000000000..bad97bd81 --- /dev/null +++ b/source/kde/slack-desc/juk @@ -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------------------------------------------------------| +juk: juk (audio jukebox application) +juk: +juk: JuK is an audio jukebox application, supporting collections of MP3, +juk: Ogg Vorbis, and FLAC audio files. It allows you to edit the "tags" +juk: of your audio files, and manage your collection and playlists. +juk: It's main focus, in fact, is on music management. +juk: +juk: +juk: +juk: For more information, visit: http://www.kde.org +juk: diff --git a/source/kde/slack-desc/kajongg b/source/kde/slack-desc/kajongg new file mode 100644 index 000000000..eb317ef64 --- /dev/null +++ b/source/kde/slack-desc/kajongg @@ -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------------------------------------------------------| +kajongg: kajongg (Mah Jongg for KDE) +kajongg: +kajongg: Kajongg is the ancient Chinese board game for 4 players. +kajongg: Kajongg can be used in two different ways: Scoring a manual game where +kajongg: you play as always and use Kajongg for the computation of scores and +kajongg: for bookkeeping. Or you can use Kajongg to play against any +kajongg: combination of other human players or computer players. +kajongg: +kajongg: +kajongg: For more information, visit: http://www.kde.org +kajongg: diff --git a/source/kde/slack-desc/kapman b/source/kde/slack-desc/kapman new file mode 100644 index 000000000..750a4efdd --- /dev/null +++ b/source/kde/slack-desc/kapman @@ -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------------------------------------------------------| +kapman: kapman (KDE version of Pac-Man) +kapman: +kapman: Kapman is a clone of the well known game Pac-Man. +kapman: You must run through the maze to eat all pills without being captured +kapman: by a ghost. By eating an energizer, Kapman gets the ability to eat +kapman: ghosts for a few seconds. When a stage is cleared of pills and +kapman: energizer the player is taken to the next stage with slightly +kapman: increased game speed. +kapman: +kapman: For more information, visit: http://www.kde.org +kapman: diff --git a/source/kde/slack-desc/katomic b/source/kde/slack-desc/katomic new file mode 100644 index 000000000..de76b5140 --- /dev/null +++ b/source/kde/slack-desc/katomic @@ -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------------------------------------------------------| +katomic: katomic (re-assemble molecules from compound atoms) +katomic: +katomic: Katomic is both fun and educational game built around molecular +katomic: geometry. It employs simplistic two-dimensional looks at different +katomic: chemical elements. You can also play an online demo version +katomic: of this game. +katomic: +katomic: +katomic: +katomic: For more information, visit: http://www.kde.org +katomic: diff --git a/source/kde/slack-desc/kblackbox b/source/kde/slack-desc/kblackbox new file mode 100644 index 000000000..a4525a2b6 --- /dev/null +++ b/source/kde/slack-desc/kblackbox @@ -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------------------------------------------------------| +kblackbox: kblackbox (a game of hide and seek) +kblackbox: +kblackbox: KBlackbox is a game of hide and seek played on a grid of boxes +kblackbox: where the computer has hidden several balls. +kblackbox: +kblackbox: +kblackbox: +kblackbox: +kblackbox: +kblackbox: For more information, visit: http://www.kde.org +kblackbox: diff --git a/source/kde/slack-desc/kblocks b/source/kde/slack-desc/kblocks new file mode 100644 index 000000000..bdbfdfaa6 --- /dev/null +++ b/source/kde/slack-desc/kblocks @@ -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------------------------------------------------------| +kblocks: kblocks (falling blocks game for KDE) +kblocks: +kblocks: KBlocks is the KDE version of the classic falling blocks game. +kblocks: +kblocks: +kblocks: +kblocks: +kblocks: +kblocks: +kblocks: For more information, visit: http://www.kde.org +kblocks: diff --git a/source/kde/slack-desc/kbounce b/source/kde/slack-desc/kbounce new file mode 100644 index 000000000..2a9832677 --- /dev/null +++ b/source/kde/slack-desc/kbounce @@ -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------------------------------------------------------| +kbounce: kbounce (KDE Bounce Ball Game) +kbounce: +kbounce: KBounce is a single player arcade game with the elements of puzzle. +kbounce: It is played on a field, surrounded by wall, with two or more balls +kbounce: that move about in the field bouncing off of walls. +kbounce: The player can build new walls, decreasing the size of active field. +kbounce: +kbounce: +kbounce: +kbounce: For more information, visit: http://www.kde.org +kbounce: diff --git a/source/kde/slack-desc/kbreakout b/source/kde/slack-desc/kbreakout new file mode 100644 index 000000000..e9b53a145 --- /dev/null +++ b/source/kde/slack-desc/kbreakout @@ -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------------------------------------------------------| +kbreakout: kbreakout (breakout-like game for KDE) +kbreakout: +kbreakout: KBreakout is the KDE version of a Breakout-like game. +kbreakout: +kbreakout: +kbreakout: +kbreakout: +kbreakout: +kbreakout: +kbreakout: For more information, visit: http://www.kde.org +kbreakout: diff --git a/source/kde/slack-desc/kdeaccessibility b/source/kde/slack-desc/kdeaccessibility index e176b3887..91669ef7d 100644 --- a/source/kde/slack-desc/kdeaccessibility +++ b/source/kde/slack-desc/kdeaccessibility @@ -17,3 +17,4 @@ kdeaccessibility: kdeaccessibility: kdeaccessibility: kdeaccessibility: +kdeaccessibility: diff --git a/source/kde/slack-desc/kdevelop-php b/source/kde/slack-desc/kdevelop-php new file mode 100644 index 000000000..be58f46cd --- /dev/null +++ b/source/kde/slack-desc/kdevelop-php @@ -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------------------------------------------------------| +kdevelop-php: kdevelop-php (PHP language plugin for KDevelop) +kdevelop-php: +kdevelop-php: This is a KDevelop plugin that provides support for the PHP language. +kdevelop-php: +kdevelop-php: +kdevelop-php: +kdevelop-php: +kdevelop-php: +kdevelop-php: +kdevelop-php: +kdevelop-php: diff --git a/source/kde/slack-desc/kdevelop-php-docs b/source/kde/slack-desc/kdevelop-php-docs new file mode 100644 index 000000000..df368584c --- /dev/null +++ b/source/kde/slack-desc/kdevelop-php-docs @@ -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------------------------------------------------------| +kdevelop-php-docs: kdevelop-php-docs (PHP documentation plugin for KDevelop) +kdevelop-php-docs: +kdevelop-php-docs: This KDevelop plugin integrates the php.net online documentation. +kdevelop-php-docs: +kdevelop-php-docs: +kdevelop-php-docs: +kdevelop-php-docs: +kdevelop-php-docs: +kdevelop-php-docs: +kdevelop-php-docs: +kdevelop-php-docs: diff --git a/source/kde/slack-desc/kdiamond b/source/kde/slack-desc/kdiamond new file mode 100644 index 000000000..4c2c7cc61 --- /dev/null +++ b/source/kde/slack-desc/kdiamond @@ -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------------------------------------------------------| +kdiamond: kdiamond (three-in-a-row game for KDE) +kdiamond: +kdiamond: KDiamond is a single player puzzle game. The object of the game is +kdiamond: to build and remove lines of three similar diamonds. +kdiamond: +kdiamond: +kdiamond: +kdiamond: +kdiamond: +kdiamond: For more information, visit: http://www.kde.org +kdiamond: diff --git a/source/kde/slack-desc/kfourinline b/source/kde/slack-desc/kfourinline new file mode 100644 index 000000000..78b18d846 --- /dev/null +++ b/source/kde/slack-desc/kfourinline @@ -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------------------------------------------------------| +kfourinline: kfourinline (four-in-a-row board game) +kfourinline: +kfourinline: KFourInLine is a board game for two players based on the +kfourinline: Connect-Four game. The players try to build up a row of +kfourinline: four pieces using different strategies. +kfourinline: +kfourinline: +kfourinline: +kfourinline: +kfourinline: For more information, visit: http://www.kde.org +kfourinline: diff --git a/source/kde/slack-desc/kgoldrunner b/source/kde/slack-desc/kgoldrunner new file mode 100644 index 000000000..6b067c102 --- /dev/null +++ b/source/kde/slack-desc/kgoldrunner @@ -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------------------------------------------------------| +kgoldrunner: kgoldrunner (Hunt gold, dodge enemies and solve puzzles) +kgoldrunner: +kgoldrunner: KGoldrunner is a maze-threading game with a puzzle flavor. +kgoldrunner: It has hundreds of levels where pieces of gold must be collected, +kgoldrunner: with enemies in hot pursuit. +kgoldrunner: +kgoldrunner: +kgoldrunner: +kgoldrunner: +kgoldrunner: For more information, visit: http://www.kde.org +kgoldrunner: diff --git a/source/kde/slack-desc/kigo b/source/kde/slack-desc/kigo new file mode 100644 index 000000000..3939e01a8 --- /dev/null +++ b/source/kde/slack-desc/kigo @@ -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------------------------------------------------------| +kigo: kigo (Go board game for KDE) +kigo: +kigo: Kigo is an open-source implementation of the popular Go game. +kigo: Go is a strategic board game for two players. It is also known as igo +kigo: (Japanese), weiqi or wei ch'i (Chinese) or baduk (Korean). Go is noted +kigo: for being rich in strategic complexity despite its simple rules. +kigo: The game is played by two players who alternately place black and +kigo: white pieces on the vacant intersections of a grid of 19x19 lines +kigo: (9x9 or 13x13 for easier games). +kigo: +kigo: For more information, visit: http://www.kde.org diff --git a/source/kde/slack-desc/killbots b/source/kde/slack-desc/killbots new file mode 100644 index 000000000..6acee0585 --- /dev/null +++ b/source/kde/slack-desc/killbots @@ -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------------------------------------------------------| +killbots: killbots (Robots-like game for KDE) +killbots: +killbots: Killbots is a simple game of evading killer robots. +killbots: +killbots: +killbots: +killbots: +killbots: +killbots: +killbots: For more information, visit: http://www.kde.org +killbots: diff --git a/source/kde/slack-desc/kio-mtp b/source/kde/slack-desc/kio-mtp new file mode 100644 index 000000000..38c14b162 --- /dev/null +++ b/source/kde/slack-desc/kio-mtp @@ -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------------------------------------------------------| +kio-mtp: kio-mtp (Provides KIO Access to MTP devices) +kio-mtp: +kio-mtp: Provides KIO Access to MTP devices using the mtp:/// protocol. +kio-mtp: MTP stands for Media Transfer Protocol” It is required in order to +kio-mtp: access and manage files on devices running Android 4.0 and later. +kio-mtp: +kio-mtp: +kio-mtp: Kio-mtp has been developed by Philipp Schmidt. +kio-mtp: +kio-mtp: For more information, visit: http://www.kde.org +kio-mtp: diff --git a/source/kde/slack-desc/kiriki b/source/kde/slack-desc/kiriki new file mode 100644 index 000000000..cc09bbf43 --- /dev/null +++ b/source/kde/slack-desc/kiriki @@ -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------------------------------------------------------| +kiriki: kiriki (yahtzee-like dice game for KDE) +kiriki: +kiriki: Kiriki is an addictive and fun dice game for KDE, designed to be +kiriki: played by as many as six players. Participants have to collect points +kiriki: by rolling five dice for up to three times per single turn. +kiriki: +kiriki: +kiriki: +kiriki: +kiriki: For more information, visit: http://www.kde.org +kiriki: diff --git a/source/kde/slack-desc/kjumpingcube b/source/kde/slack-desc/kjumpingcube new file mode 100644 index 000000000..e8646f9dc --- /dev/null +++ b/source/kde/slack-desc/kjumpingcube @@ -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------------------------------------------------------| +kjumpingcube: kjumpingcube (territory capture game) +kjumpingcube: +kjumpingcube: KJumpingcube is a simple dice driven tactical game. +kjumpingcube: The playing area consists of squares containing points. +kjumpingcube: Players move by clicking on either a vacant square, +kjumpingcube: or on one of their own squares. +kjumpingcube: +kjumpingcube: +kjumpingcube: +kjumpingcube: For more information, visit: http://www.kde.org +kjumpingcube: diff --git a/source/kde/slack-desc/klickety b/source/kde/slack-desc/klickety new file mode 100644 index 000000000..e35b2a38a --- /dev/null +++ b/source/kde/slack-desc/klickety @@ -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------------------------------------------------------| +klickety: klickety (strategy game) +klickety: +klickety: Klickety is a strategy game for KDE, an adaption of the Clickomania +klickety: game. +klickety: The rules are similar to those of the Same game: your goal is to clear +klickety: the board by clicking on groups to destroy them. +klickety: +klickety: +klickety: +klickety: For more information, visit: http://www.kde.org +klickety: diff --git a/source/kde/slack-desc/klines b/source/kde/slack-desc/klines new file mode 100644 index 000000000..193eee19c --- /dev/null +++ b/source/kde/slack-desc/klines @@ -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------------------------------------------------------| +klines: klines (tactical game for KDE) +klines: +klines: KLines is a simple but highly addictive, one player game for KDE. +klines: KLines has been inspired by well known game of Color Lines, written +klines: by Olga Demina, Igor Ivkin and Gennady Denisov back in 1992. +klines: You can also play an online demo version of this game. +klines: +klines: +klines: +klines: For more information, visit: http://www.kde.org +klines: diff --git a/source/kde/slack-desc/kmahjongg b/source/kde/slack-desc/kmahjongg new file mode 100644 index 000000000..cd653a971 --- /dev/null +++ b/source/kde/slack-desc/kmahjongg @@ -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------------------------------------------------------| +kmahjongg: kmahjongg (KDE port of Mahjongg game) +kmahjongg: +kmahjongg: KMahjongg is a clone of the well known tile based patience game of +kmahjongg: the same name. In the game you have to empty a game board filled +kmahjongg: with pieces, by pairwise removal of pieces of the same type. +kmahjongg: +kmahjongg: +kmahjongg: +kmahjongg: +kmahjongg: For more information, visit: http://www.kde.org +kmahjongg: diff --git a/source/kde/slack-desc/kmines b/source/kde/slack-desc/kmines new file mode 100644 index 000000000..16981d23c --- /dev/null +++ b/source/kde/slack-desc/kmines @@ -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------------------------------------------------------| +kmines: kmines (minesweeper clone for KDE) +kmines: +kmines: KMines is the classic Minesweeper game. The idea is to uncover all +kmines: the squares without blowing up any mines. When a mine is blown up, +kmines: the game is over. +kmines: +kmines: +kmines: +kmines: +kmines: For more information, visit: http://www.kde.org +kmines: diff --git a/source/kde/slack-desc/kmix b/source/kde/slack-desc/kmix new file mode 100644 index 000000000..0325cdb2b --- /dev/null +++ b/source/kde/slack-desc/kmix @@ -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------------------------------------------------------| +kmix: kmix (sound mixer) +kmix: +kmix: KMix is an application to allow you to change the volume of your +kmix: sound card. Though small, it is full-featured, and it supports +kmix: several platforms and sound drivers. +kmix: +kmix: +kmix: +kmix: +kmix: For more information, visit: http://www.kde.org +kmix: diff --git a/source/kde/slack-desc/knavalbattle b/source/kde/slack-desc/knavalbattle new file mode 100644 index 000000000..a6058c5bd --- /dev/null +++ b/source/kde/slack-desc/knavalbattle @@ -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------------------------------------------------------| +knavalbattle: knavalbattle (KDE version of battleship game) +knavalbattle: +knavalbattle: KNavalBattle is a battleship game with built-in game server. +knavalbattle: Ships are placed on a board which represents the sea. Players try +knavalbattle: to hit each others ships in turns without knowing where they are +knavalbattle: placed. The first player to destroy all ships wins the game. +knavalbattle: +knavalbattle: +knavalbattle: +knavalbattle: For more information, visit: http://www.kde.org +knavalbattle: diff --git a/source/kde/slack-desc/knetwalk b/source/kde/slack-desc/knetwalk new file mode 100644 index 000000000..df4b9bb14 --- /dev/null +++ b/source/kde/slack-desc/knetwalk @@ -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------------------------------------------------------| +knetwalk: knetwalk (turn the board pieces to get computers connected) +knetwalk: +knetwalk: KNetwalk is a single player logic game. Construct the network, +knetwalk: connecting all the terminals to the server in the fewest turns +knetwalk: possible. +knetwalk: +knetwalk: +knetwalk: +knetwalk: +knetwalk: For more information, visit: http://www.kde.org +knetwalk: diff --git a/source/kde/slack-desc/kolf b/source/kde/slack-desc/kolf new file mode 100644 index 000000000..a198a8b2a --- /dev/null +++ b/source/kde/slack-desc/kolf @@ -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------------------------------------------------------| +kolf: kolf (miniature golf game for KDE) +kolf: +kolf: Kolf is a miniature golf game. The game is played from an overhead +kolf: view, with a short bar representing the golf club. Kolf features many +kolf: different types of objects, such water hazards, slopes, sand traps, +kolf: and black holes (warps), among others. +kolf: +kolf: +kolf: +kolf: For more information, visit: http://www.kde.org +kolf: diff --git a/source/kde/slack-desc/kollision b/source/kde/slack-desc/kollision new file mode 100644 index 000000000..e0b4a2a28 --- /dev/null +++ b/source/kde/slack-desc/kollision @@ -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------------------------------------------------------| +kollision: kollision (simple ball dodging game) +kollision: +kollision: Kollision is a simple ball dodging game. +kollision: +kollision: +kollision: +kollision: +kollision: +kollision: +kollision: For more information, visit: http://www.kde.org +kollision: diff --git a/source/kde/slack-desc/konquest b/source/kde/slack-desc/konquest new file mode 100644 index 000000000..e26e47473 --- /dev/null +++ b/source/kde/slack-desc/konquest @@ -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------------------------------------------------------| +konquest: konquest (KDE version of Gnu-Lactic Konquest) +konquest: +konquest: This the KDE version of Gnu-Lactic Konquest, a multi-player +konquest: strategy game. The goal of the game is to expand your +konquest: interstellar empire across the galaxy. +konquest: +konquest: +konquest: +konquest: +konquest: For more information, visit: http://www.kde.org +konquest: diff --git a/source/kde/slack-desc/kpat b/source/kde/slack-desc/kpat new file mode 100644 index 000000000..08a843995 --- /dev/null +++ b/source/kde/slack-desc/kpat @@ -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------------------------------------------------------| +kpat: kpat (patience card game for KDE) +kpat: +kpat: KPat (aka KPatience) is a relaxing card sorting game. To win the game +kpat: a player has to arrange a single deck of cards in certain order +kpat: amongst each other. +kpat: +kpat: +kpat: +kpat: +kpat: For more information, visit: http://www.kde.org +kpat: diff --git a/source/kde/slack-desc/kreversi b/source/kde/slack-desc/kreversi new file mode 100644 index 000000000..fb6c5d315 --- /dev/null +++ b/source/kde/slack-desc/kreversi @@ -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------------------------------------------------------| +kreversi: kreversi (reversi board game for KDE) +kreversi: +kreversi: KReversi is a simple one player strategy game played against the +kreversi: computer. If a player's piece is captured by an opposing player, +kreversi: that piece is turned over to reveal the color of that player. +kreversi: A winner is declared when one player has more pieces of his own color +kreversi: on the board and there are no more possible moves. +kreversi: +kreversi: +kreversi: For more information, visit: http://www.kde.org +kreversi: diff --git a/source/kde/slack-desc/kscd b/source/kde/slack-desc/kscd new file mode 100644 index 000000000..c45699e52 --- /dev/null +++ b/source/kde/slack-desc/kscd @@ -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------------------------------------------------------| +kscd: kscd (CD player) +kscd: +kscd: KsCD is a small, fast, CDDB enabled audio CD player which supports +kscd: multiple platforms. +kscd: +kscd: +kscd: +kscd: +kscd: +kscd: For more information, visit: http://www.kde.org +kscd: diff --git a/source/kde/slack-desc/kscreen b/source/kde/slack-desc/kscreen new file mode 100644 index 000000000..90f1d636f --- /dev/null +++ b/source/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/source/kde/slack-desc/kshisen b/source/kde/slack-desc/kshisen new file mode 100644 index 000000000..1af7d3518 --- /dev/null +++ b/source/kde/slack-desc/kshisen @@ -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------------------------------------------------------| +kshisen: kshisen (Shisen-Sho Mahjongg-like tile game) +kshisen: +kshisen: KShisen is a solitaire-like game played using the standard set of +kshisen: Mahjong tiles. Unlike Mahjong however, KShisen has only one layer +kshisen: of scrambled tiles. +kshisen: +kshisen: +kshisen: +kshisen: +kshisen: For more information, visit: http://www.kde.org +kshisen: diff --git a/source/kde/slack-desc/ksirk b/source/kde/slack-desc/ksirk new file mode 100644 index 000000000..1a0826dce --- /dev/null +++ b/source/kde/slack-desc/ksirk @@ -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------------------------------------------------------| +ksirk: ksirk (KDE port of the board game risk) +ksirk: +ksirk: Ksirk is a KDE port of the board game risk. +ksirk: +ksirk: +ksirk: +ksirk: +ksirk: +ksirk: +ksirk: For more information, visit: http://www.kde.org +ksirk: diff --git a/source/kde/slack-desc/ksnakeduel b/source/kde/slack-desc/ksnakeduel new file mode 100644 index 000000000..731a77263 --- /dev/null +++ b/source/kde/slack-desc/ksnakeduel @@ -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------------------------------------------------------| +ksnakeduel: ksnakeduel (simple snake duel game for KDE) +ksnakeduel: +ksnakeduel: KSnakeDuel is a simple snake duel game for KDE. You can play +ksnakeduel: KSnakeDuel against the computer or a friend. The aim of the game is +ksnakeduel: to live longer than your opponent. To do that, avoid running into +ksnakeduel: a wall, your own tail and that of your opponent. +ksnakeduel: +ksnakeduel: +ksnakeduel: +ksnakeduel: For more information, visit: http://www.kde.org +ksnakeduel: diff --git a/source/kde/slack-desc/kspaceduel b/source/kde/slack-desc/kspaceduel new file mode 100644 index 000000000..8a4435f48 --- /dev/null +++ b/source/kde/slack-desc/kspaceduel @@ -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------------------------------------------------------| +kspaceduel: kspaceduel (space arcade game) +kspaceduel: +kspaceduel: In KSpaceduel each of two possible players controls a satellite +kspaceduel: spaceship orbiting the sun. As the game progresses players have to +kspaceduel: eliminate opponent's spacecraft. +kspaceduel: +kspaceduel: +kspaceduel: +kspaceduel: +kspaceduel: For more information, visit: http://www.kde.org +kspaceduel: diff --git a/source/kde/slack-desc/ksquares b/source/kde/slack-desc/ksquares new file mode 100644 index 000000000..ed147ff0f --- /dev/null +++ b/source/kde/slack-desc/ksquares @@ -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------------------------------------------------------| +ksquares: ksquares (connect the dots to create squares) +ksquares: +ksquares: KSquares is a fun and exciting game for desktop environment. +ksquares: The game is modeled after the well known pen and paper based +ksquares: game of Dots and Boxes. +ksquares: +ksquares: +ksquares: +ksquares: +ksquares: For more information, visit: http://www.kde.org +ksquares: diff --git a/source/kde/slack-desc/ksudoku b/source/kde/slack-desc/ksudoku new file mode 100644 index 000000000..530f9d7e2 --- /dev/null +++ b/source/kde/slack-desc/ksudoku @@ -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------------------------------------------------------| +ksudoku: ksudoku (sudoku game) +ksudoku: +ksudoku: KSudoku is a logic-based symbol placement puzzle. +ksudoku: The player has to fill a grid so that each column, row as well as +ksudoku: each square block on the game field contains only one instance of +ksudoku: each symbol. +ksudoku: +ksudoku: +ksudoku: +ksudoku: For more information, visit: http://www.kde.org +ksudoku: diff --git a/source/kde/slack-desc/ktuberling b/source/kde/slack-desc/ktuberling new file mode 100644 index 000000000..b6386d697 --- /dev/null +++ b/source/kde/slack-desc/ktuberling @@ -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------------------------------------------------------| +ktuberling: ktuberling (picture game for children) +ktuberling: +ktuberling: KTuberling a simple constructor game suitable for children and +ktuberling: adults alike. The idea of the game is based around a once popular +ktuberling: doll making concept. +ktuberling: +ktuberling: +ktuberling: +ktuberling: +ktuberling: For more information, visit: http://www.kde.org +ktuberling: diff --git a/source/kde/slack-desc/kubrick b/source/kde/slack-desc/kubrick new file mode 100644 index 000000000..15bf1df1e --- /dev/null +++ b/source/kde/slack-desc/kubrick @@ -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------------------------------------------------------| +kubrick: kubrick (3-D game based on Rubik's Cube) +kubrick: +kubrick: Kubrick is a game based on the Rubik's Cube puzzle. The cube sizes +kubrick: range from 2x2x2 up to 6x6x6, or you can play with irregular "bricks" +kubrick: such as 5x3x2 or "mats" such as 6x4x1 or 2x2x1. +kubrick: The game has a selection of puzzles at several levels of difficulty, +kubrick: as well as demos of pretty patterns and solution moves, or you can +kubrick: make up your own puzzles. +kubrick: +kubrick: For more information, visit: http://www.kde.org +kubrick: diff --git a/source/kde/slack-desc/libkcddb b/source/kde/slack-desc/libkcddb new file mode 100644 index 000000000..40f295051 --- /dev/null +++ b/source/kde/slack-desc/libkcddb @@ -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------------------------------------------------------| +libkcddb: libkcddb (KDE CDDB retrieval library) +libkcddb: +libkcddb: A KDE CDDB retrieval library. +libkcddb: +libkcddb: +libkcddb: +libkcddb: +libkcddb: +libkcddb: +libkcddb: For more information, visit: http://www.kde.org +libkcddb: diff --git a/source/kde/slack-desc/libkcompactdisc b/source/kde/slack-desc/libkcompactdisc new file mode 100644 index 000000000..67ce9c92f --- /dev/null +++ b/source/kde/slack-desc/libkcompactdisc @@ -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------------------------------------------------------| +libkcompactdisc: libkcompactdisc (KDE library for playing & ripping CDs) +libkcompactdisc: +libkcompactdisc: A KDE library for playing & ripping CDs. +libkcompactdisc: +libkcompactdisc: +libkcompactdisc: +libkcompactdisc: +libkcompactdisc: +libkcompactdisc: +libkcompactdisc: For more information, visit: http://www.kde.org +libkcompactdisc: diff --git a/source/kde/slack-desc/libkdegames b/source/kde/slack-desc/libkdegames new file mode 100644 index 000000000..d38388579 --- /dev/null +++ b/source/kde/slack-desc/libkdegames @@ -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------------------------------------------------------| +libkdegames: libkdegames (common code and data for many KDE games) +libkdegames: +libkdegames: Libkdegames contains common code and data for many KDE games. +libkdegames: +libkdegames: +libkdegames: +libkdegames: +libkdegames: +libkdegames: +libkdegames: For more information, visit: http://www.kde.org +libkdegames: diff --git a/source/kde/slack-desc/libkmahjongg b/source/kde/slack-desc/libkmahjongg new file mode 100644 index 000000000..8851a3c74 --- /dev/null +++ b/source/kde/slack-desc/libkmahjongg @@ -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------------------------------------------------------| +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. +libkmahjongg: +libkmahjongg: +libkmahjongg: +libkmahjongg: +libkmahjongg: +libkmahjongg: For more information, visit: http://www.kde.org +libkmahjongg: diff --git a/source/kde/slack-desc/libkscreen b/source/kde/slack-desc/libkscreen new file mode 100644 index 000000000..d8232093b --- /dev/null +++ b/source/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/source/kde/slack-desc/lskat b/source/kde/slack-desc/lskat new file mode 100644 index 000000000..cccb8714f --- /dev/null +++ b/source/kde/slack-desc/lskat @@ -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------------------------------------------------------| +lskat: lskat (Lieutenant Skat card game for KDE) +lskat: +lskat: Lieutenant Skat (from German "Offiziersskat") is a fun and engaging +lskat: card game for two players, where the second player is either live +lskat: opponent, or a built in artificial intelligence. +lskat: +lskat: +lskat: +lskat: +lskat: For more information, visit: http://www.kde.org +lskat: diff --git a/source/kde/slack-desc/mplayerthumbs b/source/kde/slack-desc/mplayerthumbs new file mode 100644 index 000000000..999518dbe --- /dev/null +++ b/source/kde/slack-desc/mplayerthumbs @@ -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------------------------------------------------------| +mplayerthumbs: mplayerthumbs (video thumbnail generator) +mplayerthumbs: +mplayerthumbs: MPlayerThumbs is a video thumbnail generator for KDE file managers +mplayerthumbs: like Dolphin and Konqueror. It enables them to show preview images +mplayerthumbs: of video files. +mplayerthumbs: +mplayerthumbs: +mplayerthumbs: +mplayerthumbs: +mplayerthumbs: For more information, visit: http://www.kde.org +mplayerthumbs: diff --git a/source/kde/slack-desc/nepomuk-core b/source/kde/slack-desc/nepomuk-core new file mode 100644 index 000000000..c969b9eda --- /dev/null +++ b/source/kde/slack-desc/nepomuk-core @@ -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------------------------------------------------------| +nepomuk-core: nepomuk-core (Nepomuk Core utilities and libraries) +nepomuk-core: +nepomuk-core: This package contains the Nepomuk Core utilities and libraries. +nepomuk-core: +nepomuk-core: +nepomuk-core: +nepomuk-core: +nepomuk-core: +nepomuk-core: +nepomuk-core: For more information, visit: http://www.kde.org +nepomuk-core: diff --git a/source/kde/slack-desc/nepomuk-widgets b/source/kde/slack-desc/nepomuk-widgets new file mode 100644 index 000000000..f31413cd4 --- /dev/null +++ b/source/kde/slack-desc/nepomuk-widgets @@ -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------------------------------------------------------| +nepomuk-widgets: nepomuk-widgets (nepomuk widgets) +nepomuk-widgets: +nepomuk-widgets: This package contains all of the Nepomuk widgets. +nepomuk-widgets: +nepomuk-widgets: +nepomuk-widgets: +nepomuk-widgets: +nepomuk-widgets: +nepomuk-widgets: +nepomuk-widgets: For more information, visit: http://nepomuk.kde.org/ +nepomuk-widgets: diff --git a/source/kde/slack-desc/oxygen-gtk3 b/source/kde/slack-desc/oxygen-gtk3 new file mode 100644 index 000000000..43b763672 --- /dev/null +++ b/source/kde/slack-desc/oxygen-gtk3 @@ -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------------------------------------------------------| +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+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 +oxygen-gtk3: well on other Desktop Environments. +oxygen-gtk3: Unlike other attempts made to port the kde oxygen theme to GTK+, this +oxygen-gtk3: attempt does not depend on Qt. +oxygen-gtk3: +oxygen-gtk3: See: http://projects.kde.org/projects/playground/artwork/oxygen-gtk diff --git a/source/kde/slack-desc/pairs b/source/kde/slack-desc/pairs new file mode 100644 index 000000000..570aae217 --- /dev/null +++ b/source/kde/slack-desc/pairs @@ -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------------------------------------------------------| +pairs: pairs (a memory game) +pairs: +pairs: Pairs is a game that will help train your memory by remembering +pairs: different images, shapes, sounds and text. +pairs: +pairs: +pairs: +pairs: +pairs: +pairs: For more information, visit: http://www.kde.org +pairs: diff --git a/source/kde/slack-desc/palapeli b/source/kde/slack-desc/palapeli new file mode 100644 index 000000000..f0d2e8565 --- /dev/null +++ b/source/kde/slack-desc/palapeli @@ -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------------------------------------------------------| +palapeli: palapeli (jigsaw puzzle game) +palapeli: +palapeli: Palapeli is a single-player jigsaw puzzle game. +palapeli: Unlike other games in that genre, you are not limited to aligning +palapeli: pieces on imaginary grids. The pieces are freely moveable. +palapeli: Also, Palapeli features real persistency, i.e. everything you do +palapeli: is saved on your disk immediately. +palapeli: +palapeli: +palapeli: For more information, visit: http://www.kde.org +palapeli: diff --git a/source/kde/slack-desc/picmi b/source/kde/slack-desc/picmi new file mode 100644 index 000000000..bc23ac645 --- /dev/null +++ b/source/kde/slack-desc/picmi @@ -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------------------------------------------------------| +picmi: picmi (logic puzzle game) +picmi: +picmi: Picmi is a single player logic-based puzzle game. +picmi: The goal is to color cells according to numbers given at the side +picmi: of the board in order to uncover a hidden pattern or picture. +picmi: +picmi: +picmi: +picmi: +picmi: For more information, visit: http://www.kde.org +picmi: diff --git a/source/kde/slack-desc/polkit-kde-agent-1 b/source/kde/slack-desc/polkit-kde-agent-1 index a1e0077d1..8b6f29bae 100644 --- a/source/kde/slack-desc/polkit-kde-agent-1 +++ b/source/kde/slack-desc/polkit-kde-agent-1 @@ -16,4 +16,3 @@ polkit-kde-agent-1: polkit-kde-agent-1: polkit-kde-agent-1: polkit-kde-agent-1: -polkit-kde-agent-1: diff --git a/source/kde/slack-desc/polkit-kde-kcmodules-1 b/source/kde/slack-desc/polkit-kde-kcmodules-1 index a31ed0370..a98ca5fc8 100644 --- a/source/kde/slack-desc/polkit-kde-kcmodules-1 +++ b/source/kde/slack-desc/polkit-kde-kcmodules-1 @@ -16,4 +16,3 @@ polkit-kde-kcmodules-1: polkit-kde-kcmodules-1: polkit-kde-kcmodules-1: polkit-kde-kcmodules-1: -polkit-kde-kcmodules-1: diff --git a/source/kde/slack-desc/print-manager b/source/kde/slack-desc/print-manager new file mode 100644 index 000000000..623c0bc35 --- /dev/null +++ b/source/kde/slack-desc/print-manager @@ -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------------------------------------------------------| +print-manager: print-manager (tool for managing print jobs and printers) +print-manager: +print-manager: Print Manager (formerly printer-applet) is a system tray utility +print-manager: that shows current print jobs, printer warnings, and errors. +print-manager: +print-manager: +print-manager: +print-manager: +print-manager: Homepage: +print-manager: https://projects.kde.org/projects/kde/kdeutils/print-manager +print-manager: diff --git a/source/kde/slack-desc/strigi-multimedia b/source/kde/slack-desc/strigi-multimedia new file mode 100644 index 000000000..0f6660b3a --- /dev/null +++ b/source/kde/slack-desc/strigi-multimedia @@ -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------------------------------------------------------| +strigi-multimedia: strigi-multimedia (Strigi multimedia analyzers) +strigi-multimedia: +strigi-multimedia: Various analyzers to provide multimedia support to Strigi. +strigi-multimedia: +strigi-multimedia: +strigi-multimedia: +strigi-multimedia: +strigi-multimedia: +strigi-multimedia: +strigi-multimedia: For more information, visit: http://www.kde.org +strigi-multimedia: |