6 files changed, 127 insertions, 103 deletions

diff --git a/x11/kdelibs4/files/patch-KDE4Defaults.cmake b/x11/kdelibs4/files/patch-KDE4Defaults.cmake
index d03cd7efecb5..3e9468a8ea52 100644
--- a/x11/kdelibs4/files/patch-KDE4Defaults.cmake
+++ b/x11/kdelibs4/files/patch-KDE4Defaults.cmake
@@ -4,13 +4,13 @@
  # define the generic version of the libraries here
  # this makes it easy to advance it when the next KDE release comes
  # Use this version number for libraries which are at version n in KDE version n
--set(GENERIC_LIB_VERSION "4.6.0")
+-set(GENERIC_LIB_VERSION "4.7.0")
 -set(GENERIC_LIB_SOVERSION "4")
 +set(GENERIC_LIB_VERSION "5.0.1")
 +set(GENERIC_LIB_SOVERSION "5")
  
  # Use this version number for libraries which are already at version n+1 in KDE version n
--set(KDE_NON_GENERIC_LIB_VERSION "5.6.0")
+-set(KDE_NON_GENERIC_LIB_VERSION "5.7.0")
 -set(KDE_NON_GENERIC_LIB_SOVERSION "5")
 +set(KDE_NON_GENERIC_LIB_VERSION "7.0.1")
 +set(KDE_NON_GENERIC_LIB_SOVERSION "7")
diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindKdcraw.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindKdcraw.cmake
index b706d00de0fe..ebe252b8fcb7 100644
--- a/x11/kdelibs4/files/patch-cmake_modules_FindKdcraw.cmake
+++ b/x11/kdelibs4/files/patch-cmake_modules_FindKdcraw.cmake
@@ -1,54 +1,53 @@
---- ./cmake/modules/FindKdcraw.cmake.orig	2009-05-08 02:16:53.000000000 +0400
-+++ ./cmake/modules/FindKdcraw.cmake	2009-09-23 00:36:17.000000000 +0400
-@@ -45,63 +45,33 @@
+--- cmake/modules/FindKdcraw.cmake.orig	2011-05-20 22:24:53.000000000 +0200
++++ cmake/modules/FindKdcraw.cmake	2011-07-31 04:06:34.029187418 +0200
+@@ -59,63 +59,32 @@
  
    else(KDCRAW_LOCAL_FOUND)
  
 -    message(STATUS "Check Kdcraw library using pkg-config...")
-     if(NOT WIN32)
+     if (NOT WIN32)
 +      message(STATUS "Check Kdcraw library using pkg-config...")
-+
        # use pkg-config to get the directories and then use these values
        # in the FIND_PATH() and FIND_LIBRARY() calls
--      INCLUDE(UsePkgConfig)
+-      include(UsePkgConfig)
 -    
 -      PKGCONFIG(libkdcraw _KDCRAWIncDir _KDCRAWLinkDir _KDCRAWLinkFlags _KDCRAWCflags)
 -    
--      if(_KDCRAWLinkFlags)
+-      if (_KDCRAWLinkFlags)
 -        # query pkg-config asking for a libkdcraw >= 0.2.0
--        EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkdcraw RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
--        if(_return_VALUE STREQUAL "0")
+-        exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkdcraw RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
+-        if (_return_VALUE STREQUAL "0")
 -            message(STATUS "Found libkdcraw release >= 0.2.0")
 -            set(KDCRAW_VERSION_GOOD_FOUND TRUE)
--        else(_return_VALUE STREQUAL "0")
+-        else (_return_VALUE STREQUAL "0")
 -            message(STATUS "Found libkdcaw release < 0.2.0, too old")
 -            set(KDCRAW_VERSION_GOOD_FOUND FALSE)
 -            set(KDCRAW_FOUND FALSE)
--        endif(_return_VALUE STREQUAL "0")
--      else(_KDCRAWLinkFlags)
+-        endif (_return_VALUE STREQUAL "0")
+-      else (_KDCRAWLinkFlags)
 -        set(KDCRAW_VERSION_GOOD_FOUND FALSE)
 -        set(KDCRAW_FOUND FALSE)
--      endif(_KDCRAWLinkFlags)
--    ELSE(NOT WIN32)
+-      endif (_KDCRAWLinkFlags)
+-    else (NOT WIN32)
 -      set(KDCRAW_VERSION_GOOD_FOUND TRUE)
--    ENDif(NOT WIN32)
+-    endif (NOT WIN32)
 +      include(FindPkgConfig)
 +      pkg_check_modules(PC_LIBKDCRAW libkdcraw-kde4>=0.2.0)
 +      set(KDCRAW_DEFINITIONS ${PC_LIBKDCRAW_CFLAGS_OTHER})
 +    endif(NOT WIN32)
  
--    if(KDCRAW_VERSION_GOOD_FOUND)
+-    if (KDCRAW_VERSION_GOOD_FOUND)
 -        set(KDCRAW_DEFINITIONS "${_KDCRAWCflags}")
 -    
--        FIND_PATH(KDCRAW_INCLUDE_DIR libkdcraw/version.h
+-        find_path(KDCRAW_INCLUDE_DIR libkdcraw/version.h
 -        ${_KDCRAWIncDir}
 +    find_path(KDCRAW_INCLUDE_DIR NAMES libkdcraw/version.h
 +        HINTS
 +        ${PC_LIBKDCRAW_INCLUDEDIR}
 +        ${PC_LIBKDCRAW_INCLUDE_DIRS}
          )
--    
--        FIND_LIBRARY(KDCRAW_LIBRARIES NAMES kdcraw
+     
+-        find_library(KDCRAW_LIBRARIES NAMES kdcraw
 -        PATHS
 -        ${_KDCRAWLinkDir}
 +    find_library(KDCRAW_LIBRARY NAMES kdcraw
@@ -56,11 +55,11 @@
 +        ${PC_LIBKDCRAW_LIBDIR}
 +        ${PC_LIBKDCRAW_LIBRARY_DIRS}
          )
--    
+     
 -        if (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES)
 -            set(KDCRAW_FOUND TRUE)
 -        endif (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES)
--     endif(KDCRAW_VERSION_GOOD_FOUND) 
+-     endif (KDCRAW_VERSION_GOOD_FOUND) 
 -     if (KDCRAW_FOUND)
 -         if (NOT Kdcraw_FIND_QUIETLY)
 -             message(STATUS "Found libkdcraw: ${KDCRAW_LIBRARIES}")
@@ -75,13 +74,11 @@
 -             endif (NOT KDCRAW_LIBRARIES)
 -         endif (Kdcraw_FIND_REQUIRED)
 -     endif (KDCRAW_FOUND)
-+
 +    include(FindPackageHandleStandardArgs)
 +    find_package_handle_standard_args(Kdcraw DEFAULT_MSG KDCRAW_LIBRARY KDCRAW_INCLUDE_DIR)
-+
 +    if(KDCRAW_FOUND)
 +       set(KDCRAW_LIBRARIES ${KDCRAW_LIBRARY})
 +    endif(KDCRAW_FOUND)
      
-     MARK_AS_ADVANCED(KDCRAW_INCLUDE_DIR KDCRAW_LIBRARIES)
+     mark_as_advanced(KDCRAW_INCLUDE_DIR KDCRAW_LIBRARIES KDCRAW_DEFINITIONS)
  
diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindKexiv2.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindKexiv2.cmake
index c243accfb041..a34c0668c78f 100644
--- a/x11/kdelibs4/files/patch-cmake_modules_FindKexiv2.cmake
+++ b/x11/kdelibs4/files/patch-cmake_modules_FindKexiv2.cmake
@@ -1,16 +1,16 @@
---- ./cmake/modules/FindKexiv2.cmake.orig	2009-01-06 20:27:37.000000000 +0300
-+++ ./cmake/modules/FindKexiv2.cmake	2009-09-23 00:38:15.000000000 +0400
-@@ -47,60 +47,29 @@
+--- cmake/modules/FindKexiv2.cmake.orig	2011-05-20 22:24:53.000000000 +0200
++++ cmake/modules/FindKexiv2.cmake	2011-07-31 04:11:37.659261791 +0200
+@@ -62,59 +62,28 @@
  
        # use pkg-config to get the directories and then use these values
        # in the FIND_PATH() and FIND_LIBRARY() calls
--      INCLUDE(UsePkgConfig)
+-      include(UsePkgConfig)
 -    
 -      PKGCONFIG(libkexiv2 _KEXIV2IncDir _KEXIV2LinkDir _KEXIV2LinkFlags _KEXIV2Cflags)
 -    
 -      if(_KEXIV2LinkFlags)
 -        # query pkg-config asking for a libkexiv2 >= 0.2.0
--        EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkexiv2 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
+-        exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkexiv2 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
 -        if(_return_VALUE STREQUAL "0")
 -            message(STATUS "Found libkexiv2 release >= 0.2.0")
 -            set(KEXIV2_VERSION_GOOD_FOUND TRUE)
@@ -33,15 +33,15 @@
 -    if(KEXIV2_VERSION_GOOD_FOUND)
 -        set(KEXIV2_DEFINITIONS "${_KEXIV2Cflags}")
 -    
--        FIND_PATH(KEXIV2_INCLUDE_DIR libkexiv2/version.h
+-        find_path(KEXIV2_INCLUDE_DIR libkexiv2/version.h
 -        ${_KEXIV2IncDir}
 +    find_path(KEXIV2_INCLUDE_DIR NAMES libkexiv2/version.h
 +        HINTS
 +        ${PC_LIBKEXIV2_INCLUDEDIR}
 +        ${PC_LIBKEXIV2_INCLUDE_DIRS}
          )
--    
--        FIND_LIBRARY(KEXIV2_LIBRARIES NAMES kexiv2
+     
+-        find_library(KEXIV2_LIBRARIES NAMES kexiv2
 -        PATHS
 -        ${_KEXIV2LinkDir}
 +    find_library(KEXIV2_LIBRARY NAMES kexiv2
@@ -49,7 +49,7 @@
 +        ${PC_LIBKEXIV2_LIBDIR}
 +        ${PC_LIBKEXIV2_LIBRARY_DIRS}
          )
--    
+     
 -        if (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES)
 -            set(KEXIV2_FOUND TRUE)
 -        endif (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES)
@@ -68,15 +68,11 @@
 -              endif (NOT KEXIV2_LIBRARIES)
 -          endif (Kexiv2_FIND_REQUIRED)
 -      endif (KEXIV2_FOUND)
--    
-+
 +    include(FindPackageHandleStandardArgs)
 +    find_package_handle_standard_args(Kexiv2 DEFAULT_MSG KEXIV2_LIBRARY KEXIV2_INCLUDE_DIR)
-+
 +    if(KEXIV2_FOUND)
 +       set(KEXIV2_LIBRARIES ${KEXIV2_LIBRARY})
 +    endif(KEXIV2_FOUND)
-+
-     MARK_AS_ADVANCED(KEXIV2_INCLUDE_DIR KEXIV2_LIBRARIES)
+     
+     mark_as_advanced(KEXIV2_INCLUDE_DIR KEXIV2_LIBRARIES KEXIV2_DEFINITIONS)
  
-   endif(KEXIV2_LOCAL_FOUND)
diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindKipi.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindKipi.cmake
index 814d692694fd..f26b75067657 100644
--- a/x11/kdelibs4/files/patch-cmake_modules_FindKipi.cmake
+++ b/x11/kdelibs4/files/patch-cmake_modules_FindKipi.cmake
@@ -1,54 +1,44 @@
---- ./cmake/modules/FindKipi.cmake.orig	2009-01-06 20:27:37.000000000 +0300
-+++ ./cmake/modules/FindKipi.cmake	2009-09-23 00:39:53.000000000 +0400
-@@ -48,52 +48,28 @@
+--- cmake/modules/FindKipi.cmake.orig	2011-05-20 22:24:53.000000000 +0200
++++ cmake/modules/FindKipi.cmake	2011-07-31 04:14:21.939197375 +0200
+@@ -62,52 +62,26 @@
  
        # use pkg-config to get the directories and then use these values
        # in the FIND_PATH() and FIND_LIBRARY() calls
--      INCLUDE(UsePkgConfig)
+-      include(UsePkgConfig)
 -
 -      PKGCONFIG(libkipi _KIPIIncDir _KIPILinkDir _KIPILinkFlags _KIPICflags)
 -
--      if(_KIPILinkFlags)
+-      if (_KIPILinkFlags)
 -        # query pkg-config asking for a libkipi >= 0.2.0
 -        exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkipi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
--        if(_return_VALUE STREQUAL "0")
+-        if (_return_VALUE STREQUAL "0")
 -            message(STATUS "Found libkipi release >= 0.2.0")
 -            set(KIPI_VERSION_GOOD_FOUND TRUE)
--        else(_return_VALUE STREQUAL "0")
+-        else (_return_VALUE STREQUAL "0")
 -            message(STATUS "Found libkipi release < 0.2.0, too old")
 -            set(KIPI_VERSION_GOOD_FOUND FALSE)
 -            set(KIPI_FOUND FALSE)
--        endif(_return_VALUE STREQUAL "0")
--      else(_KIPILinkFlags)
+-        endif (_return_VALUE STREQUAL "0")
+-      else (_KIPILinkFlags)
 -        set(KIPI_VERSION_GOOD_FOUND FALSE)
 -        set(KIPI_FOUND FALSE)
--      endif(_KIPILinkFlags)
--    else(NOT WIN32)
+-      endif (_KIPILinkFlags)
+-    else (NOT WIN32)
 -      set(KIPI_VERSION_GOOD_FOUND TRUE)
 +      include(FindPkgConfig)
-+      pkg_check_modules(PC_LIBKIPI libkexiv2-kde4>=0.2.0)
++      pkg_check_modules(PC_LIBKIPI libkipi-kde4>=0.2.0)
 +      set(KIPI_DEFINITIONS ${PC_LIBKIPI_CFLAGS_OTHER})
-     endif(NOT WIN32)
--    if(KIPI_VERSION_GOOD_FOUND)
+     endif (NOT WIN32)
+-    if (KIPI_VERSION_GOOD_FOUND)
 -        set(KIPI_DEFINITIONS ${_KIPICflags})
- 
+-
 -        find_path(KIPI_INCLUDE_DIR NAMES libkipi/version.h PATHS ${KDE4_INCLUDE_DIR} ${_KIPIIncDir})
 -        find_library(KIPI_LIBRARIES NAMES kipi PATHS ${KDE4_LIB_DIR} ${_KIPILinkDir})
-+    find_path(KIPI_INCLUDE_DIR NAMES libkipi/version.h
-+        HINTS
-+        ${PC_LIBKIPI_INCLUDEDIR}
-+        ${PC_LIBKIPI_INCLUDE_DIRS}
-+        )
-+    find_library(KIPI_LIBRARY NAMES kipi
-+        HINTS
-+        ${PC_LIBKIPI_LIBDIR}
-+        ${PC_LIBKIPI_LIBRARY_DIRS}
-+        )
- 
+-
 -        if (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES)
 -            set(KIPI_FOUND TRUE)
 -        endif (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES)
--      endif(KIPI_VERSION_GOOD_FOUND)
+-      endif (KIPI_VERSION_GOOD_FOUND)
 -      if (KIPI_FOUND)
 -          if (NOT Kipi_FIND_QUIETLY)
 -              message(STATUS "Found libkipi: ${KIPI_LIBRARIES}")
@@ -63,12 +53,22 @@
 -              endif (NOT KIPI_LIBRARIES)
 -          endif (Kipi_FIND_REQUIRED)
 -      endif (KIPI_FOUND)
++    find_path(KIPI_INCLUDE_DIR NAMES libkipi/version.h
++        HINTS
++        ${PC_LIBKIPI_INCLUDEDIR}
++        ${PC_LIBKIPI_INCLUDE_DIRS}
++        )
++    find_library(KIPI_LIBRARY NAMES kipi
++        HINTS
++        ${PC_LIBKIPI_LIBDIR}
++        ${PC_LIBKIPI_LIBRARY_DIRS}
++        )
++
 +    include(FindPackageHandleStandardArgs)
 +    find_package_handle_standard_args(Kipi DEFAULT_MSG KIPI_LIBRARY KIPI_INCLUDE_DIR)
-+
 +    if(KIPI_FOUND)
 +       set(KIPI_LIBRARIES ${KIPI_LIBRARY})
 +    endif(KIPI_FOUND)
-     
-     MARK_AS_ADVANCED(KIPI_INCLUDE_DIR KIPI_LIBRARIES)
+ 
+     mark_as_advanced(KIPI_INCLUDE_DIR KIPI_LIBRARIES KIPI_DEFINITIONS)
  
diff --git a/x11/kdelibs4/files/patch-nepomuk__query__querybuilderdata_p.h b/x11/kdelibs4/files/patch-nepomuk__query__querybuilderdata_p.h
new file mode 100644
index 000000000000..bfe1c2b4bf16
--- /dev/null
+++ b/x11/kdelibs4/files/patch-nepomuk__query__querybuilderdata_p.h
@@ -0,0 +1,63 @@
+--- ./nepomuk/query/querybuilderdata_p.h
++++ ./nepomuk/query/querybuilderdata_p.h
+@@ -32,6 +32,28 @@
+ #include "query_p.h"
+ #include "groupterm_p.h"
+ 
++namespace {
++/// A hack to avoid passing extended chars to the bif:search_excerpts method which cannot handle
++/// utf8 chars which use more than one char, ie. wide chars.
++/// Thus, we simply truncate each term at the first wide char.
++QStringList stripExtendedCharsHack(const QStringList& terms) {
++    QStringList newTerms;
++    foreach(const QString& term, terms) {
++        int i = 0;
++        while(i < term.length()) {
++            if(term[i].unicode() > 0x7f) {
++                break;
++            }
++            ++i;
++        }
++        if(i > 0) {
++            newTerms.append(term.left(i));
++        }
++    }
++    return newTerms;
++}
++}
++
+ namespace Nepomuk {
+     namespace Query {
+         class QueryBuilderData
+@@ -246,16 +268,23 @@ namespace Nepomuk {
+                     for( QHash<QString, QStringList>::const_iterator it = m_fullTextSearchTerms.constBegin();
+                          it != m_fullTextSearchTerms.constEnd(); ++it ) {
+                         const QString& varName = it.key();
+-                        const QStringList& terms = it.value();
+-                        // bif:search_excerpt wants a vector of all search terms
+-                        excerptParts
+-                                << QString::fromLatin1("bif:search_excerpt(bif:vector(bif:charset_recode('%1', '_WIDE_', 'UTF-8')), %2)")
+-                            .arg( terms.join(QLatin1String("','")),
+-                                  varName );
++                        const QStringList terms = stripExtendedCharsHack(it.value());
++                        if(terms.count()) {
++                            // bif:search_excerpt wants a vector of all search terms
++                            excerptParts
++                                    << QString::fromLatin1("bif:search_excerpt(bif:vector('%1'), %2)")
++                                       .arg( terms.join(QLatin1String("','")),
++                                             varName );
++                        }
+                     }
+ 
+-                    return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_")
+-                        .arg(excerptParts.join(QLatin1String(",")));
++                    if(excerptParts.count()) {
++                        return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_")
++                                .arg(excerptParts.join(QLatin1String(",")));
++                    }
++                    else {
++                        return QString();
++                    }
+                 }
+                 else {
+                     return QString();
diff --git a/x11/kdelibs4/files/patch-solid_solid_backends_hal_haldevice.cpp b/x11/kdelibs4/files/patch-solid_solid_backends_hal_haldevice.cpp
deleted file mode 100644
index 2bec2d0b9ca3..000000000000
--- a/x11/kdelibs4/files/patch-solid_solid_backends_hal_haldevice.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
---- ./solid/solid/backends/hal/haldevice.cpp.orig	2011-02-25 22:53:32.000000000 +0100
-+++ ./solid/solid/backends/hal/haldevice.cpp	2011-03-14 11:44:20.293518650 +0100
-@@ -199,7 +199,7 @@
-             return "computer";
-         }
- 
--    } else if (category=="storage") {
-+    } else if (category=="storage" || category=="storage.cdrom") {
- 
-         if (prop("storage.drive_type").toString()=="floppy") {
-             return "media-floppy";
-@@ -222,7 +222,7 @@
- 
-         return "drive-harddisk";
- 
--    } else if (category=="volume") {
-+    } else if (category=="volume" || category=="volume.disc") {
- 
-         QStringList capabilities = prop("info.capabilities").toStringList();
- 
-@@ -350,9 +350,9 @@
- {
-     QString category = prop("info.category").toString();
- 
--    if (category=="storage") {
-+    if (category=="storage" || category=="storage.cdrom") {
-         return storageDescription();
--    } else if (category=="volume") {
-+    } else if (category=="volume" || category=="volume.disc") {
-         return volumeDescription();
-     } else if (category=="net.80211") {
-         return QObject::tr("WLAN Interface");