5 files changed, 97 insertions, 191 deletions

diff --git a/x11/kdelibs4/files/patch-KDE4Defaults.cmake b/x11/kdelibs4/files/patch-KDE4Defaults.cmake
index 8255113b68bc..e2c534e9148b 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.9.5")
+-set(GENERIC_LIB_VERSION "4.10.1")
 -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.9.5")
+-set(KDE_NON_GENERIC_LIB_VERSION "5.10.1")
 -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_FindFFmpeg.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindFFmpeg.cmake
new file mode 100644
index 000000000000..0e4e9f3ea52a
--- /dev/null
+++ b/x11/kdelibs4/files/patch-cmake_modules_FindFFmpeg.cmake
@@ -0,0 +1,45 @@
+--- ./cmake/modules/FindFFmpeg.cmake.orig	2013-03-01 06:26:13.331789000 +0000
++++ ./cmake/modules/FindFFmpeg.cmake	2013-03-06 22:29:44.367663443 +0000
+@@ -71,13 +71,15 @@
+       ${PC_LIB${_component}_INCLUDEDIR}
+       ${PC_LIB${_component}_INCLUDE_DIRS}
+     PATH_SUFFIXES
+-      ffmpeg
++      ffmpeg${FFMPEG_SUFFIX}
+   )
+ 
+   find_library(${_component}_LIBRARIES NAMES ${_library}
+-      HINTS
++    HINTS
+       ${PC_LIB${_component}_LIBDIR}
+       ${PC_LIB${_component}_LIBRARY_DIRS}
++    PATH_SUFFIXES
++      ffmpeg${FFMPEG_SUFFIX}
+   )
+ 
+   set(${_component}_DEFINITIONS  ${PC_${_component}_CFLAGS_OTHER} CACHE STRING "The ${_component} CFLAGS.")
+@@ -97,13 +99,18 @@
+ # Check for cached results. If there are skip the costly part.
+ if (NOT FFMPEG_LIBRARIES)
+ 
++  # Look for ffmpeg1 by default. Use empty suffix for ffmpeg-0.7
++  if (NOT DEFINED FFMPEG_SUFFIX)
++    set(FFMPEG_SUFFIX 1)
++  endif ()
++
+   # Check for all possible component.
+-  find_component(AVCODEC  libavcodec  avcodec  libavcodec/avcodec.h)
+-  find_component(AVFORMAT libavformat avformat libavformat/avformat.h)
+-  find_component(AVDEVICE libavdevice avdevice libavdevice/avdevice.h)
+-  find_component(AVUTIL   libavutil   avutil   libavutil/avutil.h)
+-  find_component(SWSCALE  libswscale  swscale  libswscale/swscale.h)
+-  find_component(POSTPROC libpostproc postproc libpostproc/postprocess.h)
++  find_component(AVCODEC  libavcodec${FFMPEG_SUFFIX}  avcodec${FFMPEG_SUFFIX}  libavcodec/avcodec.h)
++  find_component(AVFORMAT libavformat${FFMPEG_SUFFIX} avformat${FFMPEG_SUFFIX} libavformat/avformat.h)
++  find_component(AVDEVICE libavdevice${FFMPEG_SUFFIX} avdevice${FFMPEG_SUFFIX} libavdevice/avdevice.h)
++  find_component(AVUTIL   libavutil${FFMPEG_SUFFIX}   avutil${FFMPEG_SUFFIX}   libavutil/avutil.h)
++  find_component(SWSCALE  libswscale${FFMPEG_SUFFIX}  swscale${FFMPEG_SUFFIX}  libswscale/swscale.h)
++  find_component(POSTPROC libpostproc${FFMPEG_SUFFIX} postproc${FFMPEG_SUFFIX} libpostproc/postprocess.h)
+ 
+   # Check if the required components were found and add their stuff to the FFMPEG_* vars.
+   foreach (_component ${FFmpeg_FIND_COMPONENTS})
diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindKdcraw.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindKdcraw.cmake
index ebe252b8fcb7..c107ee3db591 100644
--- a/x11/kdelibs4/files/patch-cmake_modules_FindKdcraw.cmake
+++ b/x11/kdelibs4/files/patch-cmake_modules_FindKdcraw.cmake
@@ -1,84 +1,11 @@
---- 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 @@
+--- cmake/modules/FindKdcraw.cmake.orig	2013-03-09 04:00:37.000000000 +0000
++++ cmake/modules/FindKdcraw.cmake	2013-03-11 16:15:36.354922501 +0000
+@@ -77,7 +77,7 @@
+       # in the find_path() and find_library() calls
+       include(FindPkgConfig)
  
-   else(KDCRAW_LOCAL_FOUND)
- 
--    message(STATUS "Check Kdcraw library using pkg-config...")
-     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)
--    
--      PKGCONFIG(libkdcraw _KDCRAWIncDir _KDCRAWLinkDir _KDCRAWLinkFlags _KDCRAWCflags)
--    
--      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")
--            message(STATUS "Found libkdcraw release >= 0.2.0")
--            set(KDCRAW_VERSION_GOOD_FOUND TRUE)
--        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)
--        set(KDCRAW_VERSION_GOOD_FOUND FALSE)
--        set(KDCRAW_FOUND FALSE)
--      endif (_KDCRAWLinkFlags)
--    else (NOT WIN32)
--      set(KDCRAW_VERSION_GOOD_FOUND TRUE)
--    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)
--        set(KDCRAW_DEFINITIONS "${_KDCRAWCflags}")
--    
--        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
--        PATHS
--        ${_KDCRAWLinkDir}
-+    find_library(KDCRAW_LIBRARY NAMES kdcraw
-+        HINTS
-+        ${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) 
--     if (KDCRAW_FOUND)
--         if (NOT Kdcraw_FIND_QUIETLY)
--             message(STATUS "Found libkdcraw: ${KDCRAW_LIBRARIES}")
--         endif (NOT Kdcraw_FIND_QUIETLY)
--     else (KDCRAW_FOUND)
--         if (Kdcraw_FIND_REQUIRED)
--             if (NOT KDCRAW_INCLUDE_DIR)
--                 message(FATAL_ERROR "Could NOT find libkdcraw header files")
--             endif (NOT KDCRAW_INCLUDE_DIR)
--             if (NOT KDCRAW_LIBRARIES)
--                 message(FATAL_ERROR "Could NOT find libkdcraw library")
--             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 KDCRAW_DEFINITIONS)
+-      pkg_check_modules(PC_KDCRAW libkdcraw)
++      pkg_check_modules(PC_KDCRAW libkdcraw-kde4)
  
+       if (PC_KDCRAW_FOUND)
+         # make sure the version is >= 0.2.0
diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindKipi.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindKipi.cmake
index f26b75067657..8ac921f072c1 100644
--- a/x11/kdelibs4/files/patch-cmake_modules_FindKipi.cmake
+++ b/x11/kdelibs4/files/patch-cmake_modules_FindKipi.cmake
@@ -1,74 +1,11 @@
---- 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 @@
+--- cmake/modules/FindKipi.cmake.orig	2013-03-09 04:00:37.000000000 +0000
++++ cmake/modules/FindKipi.cmake	2013-03-11 16:15:53.867922813 +0000
+@@ -78,7 +78,7 @@
+       ENDIF(NOT Kipi_FIND_QUIETLY)
  
-       # use pkg-config to get the directories and then use these values
-       # in the FIND_PATH() and FIND_LIBRARY() calls
--      include(UsePkgConfig)
--
--      PKGCONFIG(libkipi _KIPIIncDir _KIPILinkDir _KIPILinkFlags _KIPICflags)
--
--      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")
--            message(STATUS "Found libkipi release >= 0.2.0")
--            set(KIPI_VERSION_GOOD_FOUND TRUE)
--        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)
--        set(KIPI_VERSION_GOOD_FOUND FALSE)
--        set(KIPI_FOUND FALSE)
--      endif (_KIPILinkFlags)
--    else (NOT WIN32)
--      set(KIPI_VERSION_GOOD_FOUND TRUE)
-+      include(FindPkgConfig)
-+      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)
--        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})
--
--        if (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES)
--            set(KIPI_FOUND TRUE)
--        endif (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES)
--      endif (KIPI_VERSION_GOOD_FOUND)
--      if (KIPI_FOUND)
--          if (NOT Kipi_FIND_QUIETLY)
--              message(STATUS "Found libkipi: ${KIPI_LIBRARIES}")
--          endif (NOT Kipi_FIND_QUIETLY)
--      else (KIPI_FOUND)
--          if (Kipi_FIND_REQUIRED)
--              if (NOT KIPI_INCLUDE_DIR)
--                  message(FATAL_ERROR "Could NOT find libkipi header files")
--              endif (NOT KIPI_INCLUDE_DIR)
--              if (NOT KIPI_LIBRARIES)
--                  message(FATAL_ERROR "Could NOT find libkipi library")
--              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 KIPI_DEFINITIONS)
+       INCLUDE(FindPkgConfig)
+-      PKG_CHECK_MODULES(PC_KIPI libkipi>=${Kipi_FIND_VERSION})
++      PKG_CHECK_MODULES(PC_KIPI libkipi-kde4>=${Kipi_FIND_VERSION})
+     ENDIF(NOT WIN32)
  
+     FIND_LIBRARY(KIPI_LIBRARIES NAMES kipi HINTS ${PC_KIPI_LIBRARY_DIRS} ${LIB_INSTALL_DIR} ${KDE4_LIB_DIR})
diff --git a/x11/kdelibs4/files/patch-cmake_modules_PythonMacros.cmake b/x11/kdelibs4/files/patch-cmake_modules_PythonMacros.cmake
index 5ef1320f261e..d93570912c61 100644
--- a/x11/kdelibs4/files/patch-cmake_modules_PythonMacros.cmake
+++ b/x11/kdelibs4/files/patch-cmake_modules_PythonMacros.cmake
@@ -1,39 +1,36 @@
---- ./cmake/modules/PythonMacros.cmake.orig	2012-11-30 07:17:39.000000000 +0000
-+++ ./cmake/modules/PythonMacros.cmake	2013-01-03 16:30:53.706219657 +0000
-@@ -41,8 +41,10 @@
-         # To get the right version for suffix
-         STRING(REPLACE "." "" _suffix ${PYTHON_SHORT_VERSION})
-         SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc)
-+        SET(_bin_pyo ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyo)
-     ELSE(PYTHON_SHORT_VERSION GREATER 3.1)
-         SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
-+        SET(_bin_pyo ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyo)
-     ENDIF(PYTHON_SHORT_VERSION GREATER 3.1)
+--- cmake/modules/PythonMacros.cmake.orig	2013-01-23 22:44:16.000000000 +0100
++++ cmake/modules/PythonMacros.cmake	2013-02-27 13:39:48.000000000 +0100
+@@ -43,9 +43,11 @@
+     if(PYTHON_VERSION_STRING VERSION_GREATER 3.1)
+       # To get the right version for suffix
+       set(_bin_pyc "${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.pyc")
++      set(_bin_pyo "${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.pyo")
+       set(_py_install_dir "${DESTINATION_DIR}/__pycache__/")
+     else()
+       set(_bin_pyc "${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc")
++      set(_bin_pyo "${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyo")
+       set(_py_install_dir "${DESTINATION_DIR}")
+     endif()
  
-     FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
-@@ -55,6 +57,7 @@
+@@ -60,6 +62,7 @@
          TARGET compile_python_files
-         COMMAND ${CMAKE_COMMAND} -E echo ${_message}
-         COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
-+        COMMAND ${PYTHON_EXECUTABLE} -O ${_python_compile_py} ${_bin_py}
-         DEPENDS ${_absfilename}
-         )
-     ELSE(_abs_bin_py STREQUAL ${_absfilename})
-@@ -63,14 +66,15 @@
-         COMMAND ${CMAKE_COMMAND} -E echo ${_message} 
-         COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
-         COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
-+        COMMAND ${PYTHON_EXECUTABLE} -O ${_python_compile_py} ${_bin_py}
-         DEPENDS ${_absfilename}
-         )
-     ENDIF(_abs_bin_py STREQUAL ${_absfilename})
+         COMMAND "${CMAKE_COMMAND}" -E echo "${_message}"
+         COMMAND "${PYTHON_EXECUTABLE}" "${_python_compile_py}" "${_bin_py}"
++        COMMAND "${PYTHON_EXECUTABLE}" -O "${_python_compile_py}" "${_bin_py}"
+         DEPENDS "${_absfilename}"
+       )
+     else()
+@@ -68,11 +71,13 @@
+         COMMAND "${CMAKE_COMMAND}" -E echo "${_message}"
+         COMMAND "${CMAKE_COMMAND}" -E copy "${_absfilename}" "${_bin_py}"
+         COMMAND "${PYTHON_EXECUTABLE}" "${_python_compile_py}" "${_bin_py}"
++        COMMAND "${PYTHON_EXECUTABLE}" -O "${_python_compile_py}" "${_bin_py}"
+         DEPENDS "${_absfilename}"
+       )
+     endif()
  
-     IF(PYTHON_SHORT_VERSION GREATER 3.1)
--        INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/)
-+        INSTALL(FILES ${_bin_pyc} ${_bin_pyo} DESTINATION ${DESTINATION_DIR}/__pycache__/)
-     ELSE (PYTHON_SHORT_VERSION GREATER 3.1)
--        INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR})
-+        INSTALL(FILES ${_bin_pyc} ${_bin_pyo} DESTINATION ${DESTINATION_DIR})
-     ENDIF (PYTHON_SHORT_VERSION GREATER 3.1)
-   ENDIF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
+     install(FILES ${_bin_pyc} DESTINATION "${_py_install_dir}")
++    install(FILES ${_bin_pyo} DESTINATION "${_py_install_dir}")
+     unset(_py_install_dir)
+     unset(_message)