aboutsummaryrefslogtreecommitdiff
path: root/x11/kdelibs4
diff options
context:
space:
mode:
Diffstat (limited to 'x11/kdelibs4')
-rw-r--r--x11/kdelibs4/Makefile34
-rw-r--r--x11/kdelibs4/distinfo4
-rw-r--r--x11/kdelibs4/files/patch-KDE4Defaults.cmake4
-rw-r--r--x11/kdelibs4/files/patch-cmake_modules_FindFFmpeg.cmake45
-rw-r--r--x11/kdelibs4/files/patch-cmake_modules_FindKdcraw.cmake91
-rw-r--r--x11/kdelibs4/files/patch-cmake_modules_FindKipi.cmake81
-rw-r--r--x11/kdelibs4/files/patch-cmake_modules_PythonMacros.cmake67
-rw-r--r--x11/kdelibs4/pkg-plist46
8 files changed, 140 insertions, 232 deletions
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index d4d2f52e5a30..0f4e7236eeb5 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -3,17 +3,15 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
CATEGORIES= x11 kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE
+DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= Base set of libraries needed by KDE programs
LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \
- aspell:${PORTSDIR}/textproc/aspell \
jasper:${PORTSDIR}/graphics/jasper \
pcre:${PORTSDIR}/devel/pcre \
avahi-core:${PORTSDIR}/net/avahi-app \
@@ -25,24 +23,21 @@ LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \
qca:${PORTSDIR}/devel/qca \
HUpnp:${PORTSDIR}/net/hupnp \
polkit-qt-core-1:${PORTSDIR}/sysutils/polkit-qt \
- smbclient:${PORTSDIR}/net/samba-libsmbclient \
dbusmenu-qt:${PORTSDIR}/devel/libdbusmenu-qt
-BUILD_DEPENDS= ${LOCALBASE}/lib/libhspell.a:${PORTSDIR}/hebrew/hspell \
- ${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml \
+BUILD_DEPENDS= ${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml \
${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
xauth:${PORTSDIR}/x11/xauth \
${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml \
- ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
- ${LOCALBASE}/share/aspell/en.multi:${PORTSDIR}/textproc/en-aspell
+ ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
CONFLICTS= kdebase-runtime-4.5.[0-5]
LATEST_LINK= ${PORTNAME}4
-USE_XZ= yes
+USE_XZ= yes
USE_FAM= yes
USE_GETTEXT= yes
USE_GNOME= libxml2 libxslt
@@ -51,17 +46,19 @@ USE_KDE4= kdehier kdeprefix oxygen \
USES= cmake:outsource
USE_OPENSSL= yes
USE_PERL5= yes
-USE_QT4= dbus declarative designer gui imageformats_run \
- network opengl phonon qdbusviewer_run qt3support \
+USE_QT4= corelib dbus declarative designer_build gui \
+ network opengl phonon qt3support \
qtestlib script sql svg webkit xml \
- moc_build qmake_build rcc_build uic_build
+ moc_build qmake_build rcc_build uic_build \
+ imageformats_run qdbusviewer_run
USE_XORG= sm x11 xcursor xext xfixes xrender xtst
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
CMAKE_ARGS+= -DWITH_ACL:BOOL=Off \
-DWITH_FAM:BOOL=On \
- -DHUPNP_INCLUDE_PATH:PATH="${LOCALBASE}/include" \
+ -DWITH_ASPELL:BOOL=Off \
+ -DWITH_HSPELL:BOOL=Off \
-DKDE_DISTRIBUTION_TEXT:STRING="${OPSYS}" \
-DKDE_DEFAULT_HOME:STRING=".kde4"
@@ -82,6 +79,9 @@ MAN8= kbuildsycoca4.8 \
kdeinit4.8 \
meinproc4.8
+OPTIONS_DEFINE= AVAHI
+AVAHI_DESC= Use Avahi's mDNSResponder (otherwise Apple's)
+
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
@@ -93,9 +93,8 @@ LIB_DEPENDS+= utempter:${PORTSDIR}/sysutils/libutempter
EXTRA_PATCHES= ${FILESDIR}/extra-patch-ConfigureChecks.cmake
.endif
-.if exists(${LOCALBASE}/include/avahi-compat-libdns_sd/dns_sd.h) || defined(WITH_LIBDNS)
-LIB_DEPENDS+= avahi-qt4.1:${PORTSDIR}/net/avahi-qt4 \
- dns_sd:${PORTSDIR}/net/avahi-libdns
+.if ${PORT_OPTIONS:MAVAHI}
+LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/avahi-libdns
.else
LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/mDNSResponder
.endif
@@ -140,7 +139,4 @@ pre-configure:
${REINPLACE_CMD} -e '/macro_bool_to_01/ s|^.*X11_Xscreensaver.*$$|set(HAVE_XSCREENSAVER 0)|' \
${PATCH_WRKSRC}/CMakeLists.txt
-post-install:
- @-update-mime-database ${PREFIX}/share/mime
-
.include <bsd.port.post.mk>
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 6e8fdb00a826..5fa3b23fd6d5 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdelibs-4.9.5.tar.xz) = fc977af4efe00e6cab1051dc7b2424b1a8aa434536c5a5f8f1f54417519b3427
-SIZE (KDE/kdelibs-4.9.5.tar.xz) = 11902204
+SHA256 (KDE/4.10.1/kdelibs-4.10.1.tar.xz) = d5bc7ffe83b65dcb20c277253e2645f3d59dad7820cbc6f3a1bb9b5be7db05d6
+SIZE (KDE/4.10.1/kdelibs-4.10.1.tar.xz) = 11955948
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)
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index c4c9f5d6f527..d6715c20ab5f 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -10,8 +10,10 @@ bin/kdeinit4_wrapper
bin/kfilemetadatareader
bin/kjs
bin/kjscmd
+bin/kmailservice
bin/kross
bin/kshell4
+bin/ktelnetservice
bin/kunittestmodrunner
bin/kwrapper4
bin/makekdewidgets
@@ -230,6 +232,7 @@ include/KDE/KAuth/ActionWatcher
include/KDE/KAuth/HelperSupport
include/KDE/KAuthorized
include/KDE/KAutoMount
+include/KDE/KAutoSaveFile
include/KDE/KAutoUnmount
include/KDE/KAutostart
include/KDE/KBookmark
@@ -245,6 +248,7 @@ include/KDE/KBookmarkImporterBase
include/KDE/KBookmarkManager
include/KDE/KBookmarkMenu
include/KDE/KBookmarkOwner
+include/KDE/KBreadcrumbSelectionModel
include/KDE/KBugReport
include/KDE/KBuildSycocaProgressDialog
include/KDE/KButtonGroup
@@ -256,6 +260,7 @@ include/KDE/KCModuleProxy
include/KDE/KCMultiDialog
include/KDE/KCalendarSystem
include/KDE/KCalendarSystemFactory
+include/KDE/KCapacityBar
include/KDE/KCategorizedSortFilterProxyModel
include/KDE/KCategorizedView
include/KDE/KCategoryDrawer
@@ -301,6 +306,7 @@ include/KDE/KCurrencyCode
include/KDE/KCursor
include/KDE/KDBusServiceStarter
include/KDE/KDEDModule
+include/KDE/KDEPrintDialog
include/KDE/KDEsuClient
include/KDE/KDataTool
include/KDE/KDataToolAction
@@ -316,8 +322,10 @@ include/KDE/KDateWidget
include/KDE/KDebug
include/KDE/KDescendantsProxyModel
include/KDE/KDesktopFile
+include/KDE/KDeviceListModel
include/KDE/KDialog
include/KDE/KDialogButtonBox
+include/KDE/KDialogJobUiDelegate
include/KDE/KDirLister
include/KDE/KDirModel
include/KDE/KDirNotify
@@ -361,6 +369,7 @@ include/KDE/KFileSharePropsPlugin
include/KDE/KFileTreeBranch
include/KDE/KFileTreeView
include/KDE/KFileWidget
+include/KDE/KFileWritePlugin
include/KDE/KFilterBase
include/KDE/KFilterDev
include/KDE/KFilterProxySearchLine
@@ -379,6 +388,7 @@ include/KDE/KGenericFactoryBase
include/KDE/KGlobal
include/KDE/KGlobalAccel
include/KDE/KGlobalSettings
+include/KDE/KGlobalShortcutInfo
include/KDE/KGradientSelector
include/KDE/KGraphicsWebView
include/KDE/KGuiItem
@@ -442,6 +452,7 @@ include/KDE/KIconDialog
include/KDE/KIconEffect
include/KDE/KIconLoader
include/KDE/KIconTheme
+include/KDE/KIdentityProxyModel
include/KDE/KIdleTime
include/KDE/KImageCache
include/KDE/KImageFilePreview
@@ -451,6 +462,7 @@ include/KDE/KIntNumInput
include/KDE/KIntSpinBox
include/KDE/KIntValidator
include/KDE/KJob
+include/KDE/KJobTrackerInterface
include/KDE/KJobUiDelegate
include/KDE/KKeySequenceWidget
include/KDE/KLanguageButton
@@ -459,9 +471,11 @@ include/KDE/KLibFactory
include/KDE/KLibLoader
include/KDE/KLibrary
include/KDE/KLineEdit
+include/KDE/KLinkItemSelectionModel
include/KDE/KListWidget
include/KDE/KListWidgetSearchLine
include/KDE/KLocale
+include/KDE/KLocalizedDate
include/KDE/KLocalizedString
include/KDE/KLockFile
include/KDE/KMD5
@@ -483,7 +497,9 @@ include/KDE/KMimeTypeChooserDialog
include/KDE/KMimeTypeResolver
include/KDE/KMimeTypeTrader
include/KDE/KMimeTypeValidator
+include/KDE/KModelIndexProxyMapper
include/KDE/KModifierKeyInfo
+include/KDE/KMountPoint
include/KDE/KMozillaBookmarkImporterImpl
include/KDE/KMultiTabBar
include/KDE/KMultiTabBarButton
@@ -504,6 +520,7 @@ include/KDE/KNSBookmarkExporterImpl
include/KDE/KNSBookmarkImporter
include/KDE/KNSBookmarkImporterImpl
include/KDE/KNTLM
+include/KDE/KNameAndUrlInputDialog
include/KDE/KNetwork/KActiveSocketBase
include/KDE/KNetwork/KBufferedSocket
include/KDE/KNetwork/KClientSocketBase
@@ -526,6 +543,7 @@ include/KDE/KNetwork/KSocksSocketDevice
include/KDE/KNetwork/KStreamSocket
include/KDE/KNetwork/KUnixSocketAddress
include/KDE/KNewFileMenu
+include/KDE/KNewPasswordDialog
include/KDE/KNotification
include/KDE/KNotificationRestrictions
include/KDE/KNotifyConfigWidget
@@ -608,6 +626,7 @@ include/KDE/KRatingWidget
include/KDE/KRecentDocument
include/KDE/KRecentFilesAction
include/KDE/KRecursiveFilterProxyModel
+include/KDE/KRegExpEditorInterface
include/KDE/KRemoteEncoding
include/KDE/KReplace
include/KDE/KReplaceDialog
@@ -627,6 +646,7 @@ include/KDE/KSelectionWatcher
include/KDE/KSelector
include/KDE/KSeparator
include/KDE/KService
+include/KDE/KServiceAction
include/KDE/KServiceGroup
include/KDE/KServiceType
include/KDE/KServiceTypeProfile
@@ -659,6 +679,8 @@ include/KDE/KStartupInfo
include/KDE/KStartupInfoData
include/KDE/KStartupInfoId
include/KDE/KStatusBar
+include/KDE/KStatusBarJobTracker
+include/KDE/KStatusBarOfflineIndicator
include/KDE/KStatusNotifierItem
include/KDE/KStringHandler
include/KDE/KStringListValidator
@@ -767,12 +789,14 @@ include/KDE/KUser
include/KDE/KUserGroup
include/KDE/KVBox
include/KDE/KViewStateMaintainer
+include/KDE/KViewStateSaver
include/KDE/KWallet/Wallet
include/KDE/KWebPage
include/KDE/KWebPluginFactory
include/KDE/KWebView
include/KDE/KWebWallet
include/KDE/KWidgetItemDelegate
+include/KDE/KWidgetJobTracker
include/KDE/KWindowInfo
include/KDE/KWindowSystem
include/KDE/KWordMacroExpander
@@ -1938,9 +1962,7 @@ lib/kde4/krosskjs.so
lib/kde4/krossmoduleforms.so
lib/kde4/krossmodulekdetranslation.so
lib/kde4/krossqts.so
-lib/kde4/kspell_aspell.so
lib/kde4/kspell_enchant.so
-lib/kde4/kspell_hspell.so
lib/kde4/ktranscript.so
lib/kde4/libexec/filesharelist
lib/kde4/libexec/fileshareset
@@ -1950,10 +1972,8 @@ lib/kde4/libexec/kdesu_stub
lib/kde4/libexec/kio_http_cache_cleaner
lib/kde4/libexec/kioslave
lib/kde4/libexec/klauncher
-lib/kde4/libexec/kmailservice
lib/kde4/libexec/kpac_dhcp_helper
lib/kde4/libexec/ksendbugmail
-lib/kde4/libexec/ktelnetservice
lib/kde4/libexec/lnusertemp
lib/kde4/libexec/start_kdeinit
lib/kde4/libexec/start_kdeinit_wrapper
@@ -2111,10 +2131,6 @@ share/apps/LICENSES/LGPL_V2
share/apps/LICENSES/LGPL_V3
share/apps/LICENSES/QPL_V1.0
share/apps/cmake/modules/BasicFindPackageVersion.cmake.in
-share/apps/cmake/modules/CMakeParseArguments.cmake
-share/apps/cmake/modules/CheckCXXSourceCompiles.cmake
-share/apps/cmake/modules/CheckCXXSourceRuns.cmake
-share/apps/cmake/modules/CheckCXXSymbolExists.cmake
share/apps/cmake/modules/CheckPointerMember.cmake
share/apps/cmake/modules/CheckPrototypeExists.cmake
share/apps/cmake/modules/CheckStructMember.cmake
@@ -2127,7 +2143,6 @@ share/apps/cmake/modules/FindAvahi.cmake
share/apps/cmake/modules/FindBerkeleyDB.cmake
share/apps/cmake/modules/FindBlitz.cmake
share/apps/cmake/modules/FindBlueZ.cmake
-share/apps/cmake/modules/FindBoost.cmake
share/apps/cmake/modules/FindCarbon.cmake
share/apps/cmake/modules/FindDBusMenuQt.cmake
share/apps/cmake/modules/FindDNSSD.cmake
@@ -2140,8 +2155,6 @@ share/apps/cmake/modules/FindFFmpeg.cmake
share/apps/cmake/modules/FindFlac.cmake
share/apps/cmake/modules/FindFlex.cmake
share/apps/cmake/modules/FindFontconfig.cmake
-share/apps/cmake/modules/FindFreetype.cmake
-share/apps/cmake/modules/FindGIF.cmake
share/apps/cmake/modules/FindGLIB2.cmake
share/apps/cmake/modules/FindGMP.cmake
share/apps/cmake/modules/FindGObject.cmake
@@ -2169,7 +2182,6 @@ share/apps/cmake/modules/FindLibAttica.cmake
share/apps/cmake/modules/FindLibKonq.cmake
share/apps/cmake/modules/FindLibLZMA.cmake
share/apps/cmake/modules/FindLibPython.py
-share/apps/cmake/modules/FindLibXml2.cmake
share/apps/cmake/modules/FindLibXslt.cmake
share/apps/cmake/modules/FindLibintl.cmake
share/apps/cmake/modules/FindLibraryWithDebug.cmake
@@ -2181,11 +2193,8 @@ share/apps/cmake/modules/FindNepomuk.cmake
share/apps/cmake/modules/FindNetworkManager.cmake
share/apps/cmake/modules/FindOggVorbis.cmake
share/apps/cmake/modules/FindOpenEXR.cmake
-share/apps/cmake/modules/FindOpenSSL.cmake
share/apps/cmake/modules/FindPCRE.cmake
-share/apps/cmake/modules/FindPackageHandleStandardArgs.cmake
share/apps/cmake/modules/FindPhonon.cmake
-share/apps/cmake/modules/FindPkgConfig.cmake
share/apps/cmake/modules/FindPlasma.cmake
share/apps/cmake/modules/FindPolkitQt-1.cmake
share/apps/cmake/modules/FindPolkitQt.cmake
@@ -2265,6 +2274,7 @@ share/apps/kauth/dbus_service.stub
share/apps/kcharselect/kcharselect-data
share/apps/kcm_componentchooser/kcm_instantmessenger.desktop
share/apps/kcm_componentchooser/kcm_ktexteditor.desktop
+share/apps/kconf_update/kcookiescfg.pl
share/apps/kconf_update/kcookiescfg.upd
share/apps/kconf_update/kded.upd
share/apps/kconf_update/kio_help.upd
@@ -2282,7 +2292,7 @@ share/apps/kdeui/about/bar-middle-right.png
share/apps/kdeui/about/bar-top-left.png
share/apps/kdeui/about/bar-top-middle.png
share/apps/kdeui/about/bar-top-right.png
-share/apps/kdeui/about/body-background.jpg
+share/apps/kdeui/about/body-background.png
share/apps/kdeui/about/box-bottom-left.png
share/apps/kdeui/about/box-bottom-middle.png
share/apps/kdeui/about/box-bottom-right.png
@@ -3387,9 +3397,7 @@ share/kde4/services/khtmladaptorpart.desktop
share/kde4/services/khtmlimage.desktop
share/kde4/services/kjavaappletviewer.desktop
share/kde4/services/kmultipart.desktop
-share/kde4/services/kspell_aspell.desktop
share/kde4/services/kspell_enchant.desktop
-share/kde4/services/kspell_hspell.desktop
share/kde4/services/metainfo.protocol
share/kde4/services/mms.protocol
share/kde4/services/mmst.protocol
@@ -3675,5 +3683,3 @@ share/mime/uri/rtspu.xml
@dirrm include/KDE/ConversionCheck
@dirrmtry etc/xdg/menus
@dirrmtry etc/xdg
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 07:30:50 +0000