Update to KDE SC 4.10.2

bugfixes, other quality improvements, new and improved KDE Applications

5 files changed, 36 insertions, 103 deletions

diff --git a/x11/py-kde4/Makefile b/x11/py-kde4/Makefile
index f7bf454b80c..7ae5b8da58d 100644
--- a/x11/py-kde4/Makefile
+++ b/x11/py-kde4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2013/02/16 11:25:23 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2013/04/03 10:52:21 markd Exp $
 
 PKGNAME=	${PYPKGPREFIX}-kde4-${_KDE_VERSION}
 DISTNAME=	pykde4-${_KDE_VERSION}
-PKGREVISION=	11
 CATEGORIES=	misc
 COMMENT=	Python bindings for the KDE integrated X11 desktop
 
@@ -31,14 +30,15 @@ SUBST_SED.pykdeuic4=	-e 's:/usr/bin/env python$$:${PYTHONBIN}:'
 #	${CP} ${FILESDIR}/FindPolkitQt.cmake ${WRKSRC}/cmake/modules
 
 # remove when file not patched any longer
-post-install:
-	${RM} -f ${DESTDIR}${PREFIX}/share/sip${PYVERSSUFFIX}/PyKDE4/kdecore/typedefs.sip.orig
+#post-install:
+#	${RM} -f ${DESTDIR}${PREFIX}/share/sip${PYVERSSUFFIX}/PyKDE4/kdecore/typedefs.sip.orig
 
 .include "../../meta-pkgs/kde4/kde4.mk"
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../misc/kdepimlibs4/buildlink3.mk"
+.include "../../misc/nepomuk-core/buildlink3.mk"
 .include "../../security/polkit-qt/buildlink3.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"
 BUILDLINK_API_DEPENDS.py-sip+=	${PYPKGPREFIX}-sip>=4.10
diff --git a/x11/py-kde4/PLIST b/x11/py-kde4/PLIST
index ad21513060c..249cd7875cb 100644
--- a/x11/py-kde4/PLIST
+++ b/x11/py-kde4/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2012/03/19 19:44:04 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/04/03 10:52:21 markd Exp $
 bin/pykdeuic4
+bin/pykdeuic4-${PYVERSSUFFIX}
 lib/kde4/kpythonpluginfactory.so
 ${PYSITELIB}/PyKDE4/__init__.py
 ${PYSITELIB}/PyKDE4/__init__.pyc
@@ -107,10 +108,12 @@ share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/collectionstatistics.sip
 share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/collectionstatisticsdelegate.sip
 share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/collectionstatisticsjob.sip
 share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/collectionstatisticsmodel.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/collectionutils_p.sip
 share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/collectionview.sip
 share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/control.sip
 share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/differencesalgorithminterface.sip
 share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/entity.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/entitydeletedattribute.sip
 share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/entitydisplayattribute.sip
 share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/entityhiddenattribute.sip
 share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/entitylistview.sip
@@ -171,6 +174,10 @@ share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/statisticsproxymodel.sip
 share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/transactionjobs.sip
 share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/transactionsequence.sip
 share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/transportresourcebase.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/trashfilterproxymodel.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/trashjob.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/trashrestorejob.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/trashsettings.sip
 share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/unlinkjob.sip
 share/sip${PYVERSSUFFIX}/PyKDE4/dnssd/dnssdmod.sip
 share/sip${PYVERSSUFFIX}/PyKDE4/dnssd/domainbrowser.sip
diff --git a/x11/py-kde4/distinfo b/x11/py-kde4/distinfo
index 1b2d7e906c8..883c9e5f801 100644
--- a/x11/py-kde4/distinfo
+++ b/x11/py-kde4/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.4 2012/10/11 13:17:09 wiz Exp $
+$NetBSD: distinfo,v 1.5 2013/04/03 10:52:21 markd Exp $
 
-SHA1 (pykde4-4.8.4.tar.xz) = e629d7a1d7d1aa1d1dd24769dc5412a60b6ac256
-RMD160 (pykde4-4.8.4.tar.xz) = 563cca881a3f9c298be1c18979b6fcbc5eb8dcc0
-Size (pykde4-4.8.4.tar.xz) = 2111428 bytes
-SHA1 (patch-CMakeLists.txt) = 6981a91671511739e63568d7bc2ee8899d28f8a9
+SHA1 (pykde4-4.10.2.tar.xz) = a17d533fca8126970ec8886f55297f1005df3eb5
+RMD160 (pykde4-4.10.2.tar.xz) = a594a297b18ee4f22f87af3295bb889dd5a58a01
+Size (pykde4-4.10.2.tar.xz) = 2033256 bytes
+SHA1 (patch-CMakeLists.txt) = 605557b9bdbc1b726e32132a21e5b575db18d386
 SHA1 (patch-__init__.py) = 721287a0ec82b79ea4a502526ed98ba44c6d979f
-SHA1 (patch-sip_kdecore_typedefs.sip) = 7e8332a4c0d661f564a4cfea800f4fcee945df4c
diff --git a/x11/py-kde4/patches/patch-CMakeLists.txt b/x11/py-kde4/patches/patch-CMakeLists.txt
index 2f490531917..99a2480fe54 100644
--- a/x11/py-kde4/patches/patch-CMakeLists.txt
+++ b/x11/py-kde4/patches/patch-CMakeLists.txt
@@ -1,13 +1,24 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2012/03/19 19:44:04 markd Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2013/04/03 10:52:21 markd Exp $
 
---- CMakeLists.txt.orig	2010-11-02 12:51:11.000000000 +0000
+Retain the python version number in sip install directory
+
+--- CMakeLists.txt.orig	2013-03-01 06:38:30.000000000 +0000
 +++ CMakeLists.txt
-@@ -15,6 +15,8 @@ endif(${CMAKE_SOURCE_DIR} STREQUAL ${CMA
- # This module can be built independant from the rest of kdebindings.
- SET(CMAKE_MODULE_PATH ${pykde4_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
+@@ -20,6 +20,8 @@ option(PYKDEUIC4_ALTINSTALL "Enable para
+ 
+ set(CMAKE_MODULE_PATH ${pykde4_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
  
 +add_definitions(${KDE4_ENABLE_EXCEPTIONS})
 +
- # Fix output file conflict with the Ruby bindings
- IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 6)
-     SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib/pykde)
+ find_package(PythonLibrary)
+ 
+ set_package_properties(KDE4 PROPERTIES DESCRIPTION "The KDE libraries"
+@@ -241,7 +243,7 @@ endforeach (_X ${SIP_DISABLE_FEATURES})
+ 
+ get_filename_component(LIB_DIR ${KDE4_LIB_DIR} NAME)
+ 
+-set (SIP_FILES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/sip)
++set (SIP_FILES_INSTALL_DIR ${SIP_DEFAULT_SIP_DIR})
+ 
+ set(SIP_CONFIGURATION "
+ kde_version_parts = '${KDE_VERSION}'.split('.')
diff --git a/x11/py-kde4/patches/patch-sip_kdecore_typedefs.sip b/x11/py-kde4/patches/patch-sip_kdecore_typedefs.sip
deleted file mode 100644
index b81c977f993..00000000000
--- a/x11/py-kde4/patches/patch-sip_kdecore_typedefs.sip
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-sip_kdecore_typedefs.sip,v 1.1 2012/10/11 13:17:09 wiz Exp $
-
-py-qt4 defines this itself since about 4.9.5; avoid conflict.
-
---- sip/kdecore/typedefs.sip.orig	2011-07-27 18:37:15.000000000 +0000
-+++ sip/kdecore/typedefs.sip
-@@ -951,77 +951,3 @@ template <TYPE1>
- %End
- };
- 
--%MappedType QVector<int>
--{
--%TypeHeaderCode
--#include <qvector.h>
--%End
--
--%ConvertFromTypeCode
--    // Create the list.
--    PyObject *l;
--
--    if ((l = PyList_New(sipCpp->size())) == NULL)
--        return NULL;
--
--    // Set the list elements.
--    for (int i = 0; i < sipCpp->size(); ++i)
--    {
--        int t = (sipCpp->at(i));
--
--#if PY_MAJOR_VERSION >= 3        
--        PyObject *tobj = PyLong_FromLong(t);
--#else
--        PyObject *tobj = PyInt_FromLong(t);
--#endif
--
--        PyList_SET_ITEM(l, i, tobj);
--    }
--
--    return l;
--%End
--
--%ConvertToTypeCode
--    // Check the type if that is all that is required.
--    if (sipIsErr == NULL)
--    {
--        if (!PyList_Check(sipPy))
--            return 0;
--
--        for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
--            PyObject *tobj = PyList_GET_ITEM(sipPy, i);
--#if PY_MAJOR_VERSION >= 3
--            if (!PyNumber_Check(tobj))
--#else
--            if (!PyInt_Check(tobj))
--#endif
--                return 0;
--        }
--        return 1;
--    }
--
--    QVector<int> *qv = new QVector<int>;
-- 
--    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
--    {
--        PyObject *tobj = PyList_GET_ITEM(sipPy, i);
-- #if PY_MAJOR_VERSION >= 3
--        int t = PyLong_AsLong (tobj);
--#else
--        int t = PyInt_AS_LONG (tobj);
--#endif
--
--        if (*sipIsErr)
--        {
--            delete qv;
--            return 0;
--        }
--
--        qv->append(t);
--    }
-- 
--    *sipCppPtr = qv;
-- 
--    return sipGetState(sipTransferObj);
--%End
--};