pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/kdelibs4 Update to KDE SC 4.14.3



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e8367d968cf9
branches:  trunk
changeset: 641613:e8367d968cf9
user:      markd <markd%pkgsrc.org@localhost>
date:      Thu Nov 13 10:31:07 2014 +0000

description:
Update to KDE SC 4.14.3

diffstat:

 x11/kdelibs4/Makefile                                                        |  11 +-
 x11/kdelibs4/PLIST                                                           |  94 +---------
 x11/kdelibs4/buildlink3.mk                                                   |   6 +-
 x11/kdelibs4/distinfo                                                        |  12 +-
 x11/kdelibs4/patches/patch-cmake_modules_FindFFmpeg.cmake                    |  16 -
 x11/kdelibs4/patches/patch-kdecore_auth_backends_polkit-1_Polkit1Backend.cpp |  52 -----
 x11/kdelibs4/patches/patch-khtml_imload_decoders_gifloader.cpp               |  58 ------
 x11/kdelibs4/patches/patch-kio_kio_usernotificationhandler.cpp               |  48 -----
 8 files changed, 21 insertions(+), 276 deletions(-)

diffs (truncated from 456 to 300 lines):

diff -r 42517ac5669a -r e8367d968cf9 x11/kdelibs4/Makefile
--- a/x11/kdelibs4/Makefile     Thu Nov 13 10:22:48 2014 +0000
+++ b/x11/kdelibs4/Makefile     Thu Nov 13 10:31:07 2014 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.75 2014/11/07 19:39:26 adam Exp $
+# $NetBSD: Makefile,v 1.76 2014/11/13 10:31:07 markd Exp $
 
 DISTNAME=      kdelibs-${_KDE_VERSION}
 PKGNAME=       ${DISTNAME:S/-4/4-4/}
-PKGREVISION=   9
 CATEGORIES=    x11
 COMMENT=       Support libraries for the KDE integrated X11 desktop
 
@@ -83,13 +82,13 @@
 .include "../../meta-pkgs/kde4/kde4.mk"
 
 BUILDLINK_API_DEPENDS.strigi+= strigi>=0.5.11
-BUILDLINK_API_DEPENDS.soprano+=        soprano>=2.5.60
-BUILDLINK_API_DEPENDS.shared-desktop-ontologies+=      shared-desktop-ontologies>=0.10.0
+#BUILDLINK_API_DEPENDS.soprano+=       soprano>=2.5.60
+#BUILDLINK_API_DEPENDS.shared-desktop-ontologies+=     shared-desktop-ontologies>=0.10.0
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../sysutils/strigi/buildlink3.mk"
-.include "../../textproc/soprano/buildlink3.mk"
+#.include "../../textproc/soprano/buildlink3.mk"
 .include "../../databases/shared-mime-info/buildlink3.mk"
 .include "../../devel/grantlee/buildlink3.mk"
 .include "../../devel/libdbusmenu-qt/buildlink3.mk"
@@ -113,7 +112,7 @@
 .include "../../textproc/enchant/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
-.include "../../textproc/shared-desktop-ontologies/buildlink3.mk"
+#.include "../../textproc/shared-desktop-ontologies/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
diff -r 42517ac5669a -r e8367d968cf9 x11/kdelibs4/PLIST
--- a/x11/kdelibs4/PLIST        Thu Nov 13 10:22:48 2014 +0000
+++ b/x11/kdelibs4/PLIST        Thu Nov 13 10:31:07 2014 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2014/02/01 02:20:53 markd Exp $
+@comment $NetBSD: PLIST,v 1.18 2014/11/13 10:31:07 markd Exp $
 bin/checkXML
 bin/kbuildsycoca4
 bin/kconfig_compiler
@@ -8,7 +8,6 @@
 bin/kdeinit4
 bin/kdeinit4_shutdown
 bin/kdeinit4_wrapper
-bin/kfilemetadatareader
 bin/kjs
 bin/kjscmd
 bin/kmailservice
@@ -20,7 +19,6 @@
 bin/makekdewidgets
 bin/meinproc4
 bin/meinproc4_simple
-bin/nepomuk-rcgen
 bin/preparetips
 include/KDE/ConversionCheck/QVconvertible
 include/KDE/ConversionCheck/type_toQString
@@ -1726,73 +1724,8 @@
 include/kxutils.h
 include/kxyselector.h
 include/kzip.h
-include/nepomuk/andterm.h
-include/nepomuk/class.h
-include/nepomuk/comparisonterm.h
-include/nepomuk/desktopontologyloader.h
-include/nepomuk/dynamicresourcefacet.h
-include/nepomuk/entity.h
-include/nepomuk/facet.h
-include/nepomuk/facetwidget.h
-include/nepomuk/file.h
-include/nepomuk/fileontologyloader.h
-include/nepomuk/filequery.h
-include/nepomuk/global.h
-include/nepomuk/groupterm.h
-include/nepomuk/kmetadatatagcloud.h
-include/nepomuk/kmetadatatagwidget.h
 include/nepomuk/kratingpainter.h
 include/nepomuk/kratingwidget.h
-include/nepomuk/ktagcloudwidget.h
-include/nepomuk/ktagdisplaywidget.h
-include/nepomuk/literal.h
-include/nepomuk/literalterm.h
-include/nepomuk/ncal.h
-include/nepomuk/nco.h
-include/nepomuk/ndo.h
-include/nepomuk/negationterm.h
-include/nepomuk/nepomuk_export.h
-include/nepomuk/nepomukmassupdatejob.h
-include/nepomuk/nepomukontologyloader.h
-include/nepomuk/nepomukquery_export.h
-include/nepomuk/nepomukservice.h
-include/nepomuk/nepomukutils_export.h
-include/nepomuk/nexif.h
-include/nepomuk/nfo.h
-include/nepomuk/nie.h
-include/nepomuk/nmm.h
-include/nepomuk/nmo.h
-include/nepomuk/nuao.h
-include/nepomuk/ontology.h
-include/nepomuk/ontologyloader.h
-include/nepomuk/ontologymanager.h
-include/nepomuk/optionalterm.h
-include/nepomuk/orterm.h
-include/nepomuk/pimo.h
-include/nepomuk/property.h
-include/nepomuk/proxyfacet.h
-include/nepomuk/query.h
-include/nepomuk/queryparser.h
-include/nepomuk/queryserviceclient.h
-include/nepomuk/resource.h
-include/nepomuk/resourcemanager.h
-include/nepomuk/resourcemodel.h
-include/nepomuk/resourceterm.h
-include/nepomuk/resourcetypeterm.h
-include/nepomuk/result.h
-include/nepomuk/searchwidget.h
-include/nepomuk/simplefacet.h
-include/nepomuk/simpleresourcemodel.h
-include/nepomuk/simpleterm.h
-include/nepomuk/standardqueries.h
-include/nepomuk/tag.h
-include/nepomuk/tagwidget.h
-include/nepomuk/term.h
-include/nepomuk/thing.h
-include/nepomuk/tmo.h
-include/nepomuk/tools.h
-include/nepomuk/utils.h
-include/nepomuk/variant.h
 include/netwm.h
 include/netwm_def.h
 include/passdlg.h
@@ -2013,13 +1946,13 @@
 lib/libkde3support.so.${PKGVERSION}
 lib/libkdeclarative.so
 lib/libkdeclarative.so.5
-lib/libkdeclarative.so.5.11.5
+lib/libkdeclarative.so.5.14.3
 lib/libkdecore.so
 lib/libkdecore.so.5
-lib/libkdecore.so.5.11.5
+lib/libkdecore.so.5.14.3
 lib/libkdefakes.so
 lib/libkdefakes.so.5
-lib/libkdefakes.so.5.11.5
+lib/libkdefakes.so.5.14.3
 lib/libkdeinit4_kbuildsycoca4.so
 lib/libkdeinit4_kconf_update.so
 lib/libkdeinit4_kded4.so
@@ -2027,13 +1960,13 @@
 lib/libkdeinit4_klauncher.so
 lib/libkdesu.so
 lib/libkdesu.so.5
-lib/libkdesu.so.5.11.5
+lib/libkdesu.so.5.14.3
 lib/libkdeui.so
 lib/libkdeui.so.5
-lib/libkdeui.so.5.11.5
+lib/libkdeui.so.5.14.3
 lib/libkdewebkit.so
 lib/libkdewebkit.so.5
-lib/libkdewebkit.so.5.11.5
+lib/libkdewebkit.so.5.14.3
 lib/libkdnssd.so
 lib/libkdnssd.so.4
 lib/libkdnssd.so.${PKGVERSION}
@@ -2045,7 +1978,7 @@
 lib/libkfile.so.${PKGVERSION}
 lib/libkhtml.so
 lib/libkhtml.so.5
-lib/libkhtml.so.5.11.5
+lib/libkhtml.so.5.14.3
 lib/libkidletime.so
 lib/libkidletime.so.4
 lib/libkidletime.so.${PKGVERSION}
@@ -2054,7 +1987,7 @@
 lib/libkimproxy.so.${PKGVERSION}
 lib/libkio.so
 lib/libkio.so.5
-lib/libkio.so.5.11.5
+lib/libkio.so.5.14.3
 lib/libkjs.so
 lib/libkjs.so.4
 lib/libkjs.so.${PKGVERSION}
@@ -2106,15 +2039,6 @@
 lib/libkutils.so
 lib/libkutils.so.4
 lib/libkutils.so.${PKGVERSION}
-lib/libnepomuk.so
-lib/libnepomuk.so.4
-lib/libnepomuk.so.${PKGVERSION}
-lib/libnepomukquery.so
-lib/libnepomukquery.so.4
-lib/libnepomukquery.so.${PKGVERSION}
-lib/libnepomukutils.so
-lib/libnepomukutils.so.4
-lib/libnepomukutils.so.${PKGVERSION}
 lib/libplasma.so
 lib/libplasma.so.3
 lib/libplasma.so.3.0.0
diff -r 42517ac5669a -r e8367d968cf9 x11/kdelibs4/buildlink3.mk
--- a/x11/kdelibs4/buildlink3.mk        Thu Nov 13 10:22:48 2014 +0000
+++ b/x11/kdelibs4/buildlink3.mk        Thu Nov 13 10:31:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.41 2014/11/07 19:39:26 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.42 2014/11/13 10:31:07 markd Exp $
 
 BUILDLINK_TREE+=       kdelibs
 
@@ -6,7 +6,7 @@
 KDELIBS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.kdelibs+=        kdelibs4>=4.0.0
-BUILDLINK_ABI_DEPENDS.kdelibs+=        kdelibs4>=4.11.5nb9
+BUILDLINK_ABI_DEPENDS.kdelibs+=        kdelibs4>=4.14.3
 BUILDLINK_PKGSRCDIR.kdelibs?=  ../../x11/kdelibs4
 
 .include "../../archivers/bzip2/buildlink3.mk"
@@ -23,7 +23,7 @@
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/fam.buildlink3.mk"
 .include "../../sysutils/strigi/buildlink3.mk"
-.include "../../textproc/soprano/buildlink3.mk"
+#.include "../../textproc/soprano/buildlink3.mk"
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../textproc/enchant/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff -r 42517ac5669a -r e8367d968cf9 x11/kdelibs4/distinfo
--- a/x11/kdelibs4/distinfo     Thu Nov 13 10:22:48 2014 +0000
+++ b/x11/kdelibs4/distinfo     Thu Nov 13 10:31:07 2014 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.43 2014/08/14 13:03:23 wiz Exp $
+$NetBSD: distinfo,v 1.44 2014/11/13 10:31:07 markd Exp $
 
-SHA1 (kdelibs-4.11.5.tar.xz) = b4926c62b590e48ac7547bead7e04ef4938d6981
-RMD160 (kdelibs-4.11.5.tar.xz) = 9ed91ef6f0860443ec584fdf75adde57d3236682
-Size (kdelibs-4.11.5.tar.xz) = 11832556 bytes
+SHA1 (kdelibs-4.14.3.tar.xz) = a61beafbd7ff0f5c6be54e685d197c135ba36865
+RMD160 (kdelibs-4.14.3.tar.xz) = f0dd628eec72c52f4dd8426a2de47d75e629ff31
+Size (kdelibs-4.14.3.tar.xz) = 11600500 bytes
 SHA1 (patch-ConfigureChecks.cmake) = b03b38108d68d940782fbbb876affd011a39acf4
 SHA1 (patch-aa) = c3044205a964797a7718b7a7bd03bb99dd3ca37d
 SHA1 (patch-ab) = 3f89ddfa9a6101a016128d82dbbd0e985e396cae
@@ -14,16 +14,12 @@
 SHA1 (patch-ak) = 73cc1bb149039d2fe3c05ee631426a8773f951c6
 SHA1 (patch-al) = 5efa7d504fe75bec53837bfa062a4b3f910fd71f
 SHA1 (patch-am) = b6c315d152d2c3d3c66ad85050549d0b39b263e5
-SHA1 (patch-cmake_modules_FindFFmpeg.cmake) = 43de2ebe9b553f610185dc2f4add946ab0e660c9
 SHA1 (patch-cmake_modules_FindKDE4Internal.cmake) = b5f00d1df3c35f499f86aa1d8d234612e8bd130a
 SHA1 (patch-cmake_modules_FindTaglib.cmake) = be38479966da542343dd962c57f7e9d1be3e9ff4
-SHA1 (patch-kdecore_auth_backends_polkit-1_Polkit1Backend.cpp) = 3f9cf465db8c1eec3e3a799d9b02e1c9642a4216
 SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b8a513a0c51e65d7e604a88c1d0e3325be6ad688
 SHA1 (patch-kdecore_network_ConfigureChecks.cmake) = 0ad9352974911ef78ec565f7b2a97c45ead2cf72
 SHA1 (patch-kdecore_tests_CMakeLists.txt) = bbe806b078f54201528c86489d3ac200145a8d2f
 SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805
-SHA1 (patch-khtml_imload_decoders_gifloader.cpp) = 79180efd4b13e273b4eda1ae70b3e04c0cb4aac1
-SHA1 (patch-kio_kio_usernotificationhandler.cpp) = f0b3d408e90ad665e8e0cbf47856ded654c0b72e
 SHA1 (patch-kjs_JSImmediate.h) = ecc761c7c82f711f41cf47d706c1c22d22c2980a
 SHA1 (patch-kjs_interpreter.cpp) = 9d400daf7d96674b8d66e1cde46dcb3615635241
 SHA1 (patch-kjs_wtf_DisallowCType.h) = 6305dd274f1478ba0fe0a6f1717451ab8e3e50d2
diff -r 42517ac5669a -r e8367d968cf9 x11/kdelibs4/patches/patch-cmake_modules_FindFFmpeg.cmake
--- a/x11/kdelibs4/patches/patch-cmake_modules_FindFFmpeg.cmake Thu Nov 13 10:22:48 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-cmake_modules_FindFFmpeg.cmake,v 1.1 2014/08/14 13:03:23 wiz Exp $
-
-Fix detection using pkg-config.
-https://bugs.kde.org/show_bug.cgi?id=338266
-
---- cmake/modules/FindFFmpeg.cmake.orig        2014-08-14 11:43:40.000000000 +0000
-+++ cmake/modules/FindFFmpeg.cmake
-@@ -62,7 +62,7 @@ macro(find_component _component _pkgconf
-      # in the FIND_PATH() and FIND_LIBRARY() calls
-      find_package(PkgConfig)
-      if (PKG_CONFIG_FOUND)
--       pkg_check_modules(PC_${_component} ${_pkgconfig})
-+       pkg_check_modules(PC_LIB${_component} ${_pkgconfig})
-      endif ()
-   endif (NOT WIN32)
- 
diff -r 42517ac5669a -r e8367d968cf9 x11/kdelibs4/patches/patch-kdecore_auth_backends_polkit-1_Polkit1Backend.cpp
--- a/x11/kdelibs4/patches/patch-kdecore_auth_backends_polkit-1_Polkit1Backend.cpp      Thu Nov 13 10:22:48 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-$NetBSD: patch-kdecore_auth_backends_polkit-1_Polkit1Backend.cpp,v 1.1 2014/08/11 21:18:03 markd Exp $
-
-From: Martin T. H. Sandsmark <martin.sandsmark%kde.org@localhost>
-Date: Mon, 21 Jul 2014 20:52:40 +0000
-Subject: Use dbus system bus name instead of PID for authentication.
-X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=e4e7b53b71e2659adaf52691d4accc3594203b23
----
-Use dbus system bus name instead of PID for authentication.
-
-Using the PID for authentication is prone to a PID reuse



Home | Main Index | Thread Index | Old Index