From 33e08057c8d859d8e097870e2b5d91cf693a5bba Mon Sep 17 00:00:00 2001 From: markd Date: Thu, 13 Nov 2014 10:31:07 +0000 Subject: Update to KDE SC 4.14.3 --- x11/kdelibs4/Makefile | 11 ++- x11/kdelibs4/PLIST | 94 +++------------------- x11/kdelibs4/buildlink3.mk | 6 +- x11/kdelibs4/distinfo | 12 +-- .../patches/patch-cmake_modules_FindFFmpeg.cmake | 16 ---- ...ecore_auth_backends_polkit-1_Polkit1Backend.cpp | 52 ------------ .../patch-khtml_imload_decoders_gifloader.cpp | 58 ------------- .../patch-kio_kio_usernotificationhandler.cpp | 48 ----------- 8 files changed, 21 insertions(+), 276 deletions(-) delete mode 100644 x11/kdelibs4/patches/patch-cmake_modules_FindFFmpeg.cmake delete mode 100644 x11/kdelibs4/patches/patch-kdecore_auth_backends_polkit-1_Polkit1Backend.cpp delete mode 100644 x11/kdelibs4/patches/patch-khtml_imload_decoders_gifloader.cpp delete mode 100644 x11/kdelibs4/patches/patch-kio_kio_usernotificationhandler.cpp (limited to 'x11') diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 3ad9b6dfdcc..cc11f259597 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -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 @@ BUILDLINK_DEPMETHOD.qt4-tools= full .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 @@ BUILDLINK_API_DEPENDS.shared-desktop-ontologies+= shared-desktop-ontologies>=0.1 .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 --git a/x11/kdelibs4/PLIST b/x11/kdelibs4/PLIST index 734a8559347..ce593bc683a 100644 --- a/x11/kdelibs4/PLIST +++ b/x11/kdelibs4/PLIST @@ -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/kded4 bin/kdeinit4 bin/kdeinit4_shutdown bin/kdeinit4_wrapper -bin/kfilemetadatareader bin/kjs bin/kjscmd bin/kmailservice @@ -20,7 +19,6 @@ bin/kwrapper4 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/kxmlguiwindow.h 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.4 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_kio_http_cache_cleaner.so 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.4 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.4 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/libkunittest.so.${PKGVERSION} 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 --git a/x11/kdelibs4/buildlink3.mk b/x11/kdelibs4/buildlink3.mk index 4390e6cf401..cd7b222cf8b 100644 --- a/x11/kdelibs4/buildlink3.mk +++ b/x11/kdelibs4/buildlink3.mk @@ -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 @@ BUILDLINK_TREE+= kdelibs 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 @@ BUILDLINK_PKGSRCDIR.kdelibs?= ../../x11/kdelibs4 .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 --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo index 226ec7fbc56..0b8f86a516c 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -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-aj) = 501e34c8fdf242c3718ecb26577ac5940d37fae5 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 --git a/x11/kdelibs4/patches/patch-cmake_modules_FindFFmpeg.cmake b/x11/kdelibs4/patches/patch-cmake_modules_FindFFmpeg.cmake deleted file mode 100644 index 05a243b9058..00000000000 --- a/x11/kdelibs4/patches/patch-cmake_modules_FindFFmpeg.cmake +++ /dev/null @@ -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 --git a/x11/kdelibs4/patches/patch-kdecore_auth_backends_polkit-1_Polkit1Backend.cpp b/x11/kdelibs4/patches/patch-kdecore_auth_backends_polkit-1_Polkit1Backend.cpp deleted file mode 100644 index 68b5f6f1574..00000000000 --- a/x11/kdelibs4/patches/patch-kdecore_auth_backends_polkit-1_Polkit1Backend.cpp +++ /dev/null @@ -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 -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 -race condition, and a security issue. - -REVIEW: 119323 ---- - - ---- kdecore/auth/backends/polkit-1/Polkit1Backend.cpp -+++ kdecore/auth/backends/polkit-1/Polkit1Backend.cpp -@@ -144,7 +144,7 @@ - - Action::AuthStatus Polkit1Backend::actionStatus(const QString &action) - { -- PolkitQt1::UnixProcessSubject subject(QCoreApplication::applicationPid()); -+ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID())); - PolkitQt1::Authority::Result r = PolkitQt1::Authority::instance()->checkAuthorizationSync(action, subject, - PolkitQt1::Authority::None); - switch (r) { -@@ -160,21 +160,12 @@ - - QByteArray Polkit1Backend::callerID() const - { -- QByteArray a; -- QDataStream s(&a, QIODevice::WriteOnly); -- s << QCoreApplication::applicationPid(); -- -- return a; -+ return QDBusConnection::systemBus().baseService().toUtf8(); - } - - bool Polkit1Backend::isCallerAuthorized(const QString &action, QByteArray callerID) - { -- QDataStream s(&callerID, QIODevice::ReadOnly); -- qint64 pid; -- -- s >> pid; -- -- PolkitQt1::UnixProcessSubject subject(pid); -+ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID)); - PolkitQt1::Authority *authority = PolkitQt1::Authority::instance(); - - PolkitResultEventLoop e; - diff --git a/x11/kdelibs4/patches/patch-khtml_imload_decoders_gifloader.cpp b/x11/kdelibs4/patches/patch-khtml_imload_decoders_gifloader.cpp deleted file mode 100644 index 479e8af2382..00000000000 --- a/x11/kdelibs4/patches/patch-khtml_imload_decoders_gifloader.cpp +++ /dev/null @@ -1,58 +0,0 @@ -$NetBSD: patch-khtml_imload_decoders_gifloader.cpp,v 1.2 2014/08/11 21:17:20 markd Exp $ - -Fix build with giflib 5.1. - ---- khtml/imload/decoders/gifloader.cpp.orig 2014-01-02 19:26:52.000000000 +0000 -+++ khtml/imload/decoders/gifloader.cpp -@@ -369,7 +369,7 @@ public: - - if (DGifSlurp(file) == GIF_ERROR) - { -- DGifCloseFile(file); -+ DGifCloseFile(file, NULL); - return Error; - } - -@@ -378,7 +378,7 @@ public: - if (file->ImageCount > 1) { - // Verify it.. - if (!ImageManager::isAcceptableSize(file->SWidth, file->SHeight)) { -- DGifCloseFile(file); -+ DGifCloseFile(file, NULL); - return Error; - } - notifyImageInfo(file->SWidth, file->SHeight); -@@ -390,7 +390,7 @@ public: - //Extract colormap, geometry, so that we can create the frame - SavedImage* curFrame = &file->SavedImages[frame]; - if (!ImageManager::isAcceptableSize(curFrame->ImageDesc.Width, curFrame->ImageDesc.Height)) { -- DGifCloseFile(file); -+ DGifCloseFile(file, NULL); - return Error; - } - } -@@ -502,6 +502,7 @@ public: - else - buf = new uchar[w]; - -+#if GIFLIB_MAJOR < 5 - if (curFrame->ImageDesc.Interlace) - { - // Interlaced. Considering we don't do progressive loading of gif's, -@@ -551,6 +552,7 @@ public: - } // for pass.. - } // if interlaced - else -+#endif - { - for (int line = 0; line < h; ++line) - { -@@ -574,7 +576,7 @@ public: - frame0->animProvider = new GIFAnimProvider(frame0, image, frameProps, bgColor); - } - -- DGifCloseFile(file); -+ DGifCloseFile(file, NULL); - - return Done; - } diff --git a/x11/kdelibs4/patches/patch-kio_kio_usernotificationhandler.cpp b/x11/kdelibs4/patches/patch-kio_kio_usernotificationhandler.cpp deleted file mode 100644 index 3b4f1daafed..00000000000 --- a/x11/kdelibs4/patches/patch-kio_kio_usernotificationhandler.cpp +++ /dev/null @@ -1,48 +0,0 @@ -$NetBSD: patch-kio_kio_usernotificationhandler.cpp,v 1.1 2014/07/24 21:30:10 markd Exp $ - -http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=bbae87dc1be3ae063796a582774bd5642cacdd5d -Don't require a job to handle messageboxes. -http://www.kde.org/info/security/advisory-20140618-1.txt - ---- kio/kio/usernotificationhandler.cpp.orig 2014-01-02 19:26:52.000000000 +0000 -+++ kio/kio/usernotificationhandler.cpp -@@ -20,6 +20,7 @@ - - #include "slave.h" - #include "job_p.h" -+#include "jobuidelegate.h" - - #include - -@@ -76,19 +77,18 @@ void UserNotificationHandler::processReq - - if (m_cachedResults.contains(key)) { - result = *(m_cachedResults[key]); -- } else if (r->slave->job()) { -- SimpleJobPrivate* jobPrivate = SimpleJobPrivate::get(r->slave->job()); -- if (jobPrivate) { -- result = jobPrivate->requestMessageBox(r->type, -- r->data.value(MSG_TEXT).toString(), -- r->data.value(MSG_CAPTION).toString(), -- r->data.value(MSG_YES_BUTTON_TEXT).toString(), -- r->data.value(MSG_NO_BUTTON_TEXT).toString(), -- r->data.value(MSG_YES_BUTTON_ICON).toString(), -- r->data.value(MSG_NO_BUTTON_ICON).toString(), -- r->data.value(MSG_DONT_ASK_AGAIN).toString(), -- r->data.value(MSG_META_DATA).toMap()); -- } -+ } else { -+ JobUiDelegate ui; -+ const JobUiDelegate::MessageBoxType type = static_cast(r->type); -+ result = ui.requestMessageBox(type, -+ r->data.value(MSG_TEXT).toString(), -+ r->data.value(MSG_CAPTION).toString(), -+ r->data.value(MSG_YES_BUTTON_TEXT).toString(), -+ r->data.value(MSG_NO_BUTTON_TEXT).toString(), -+ r->data.value(MSG_YES_BUTTON_ICON).toString(), -+ r->data.value(MSG_NO_BUTTON_ICON).toString(), -+ r->data.value(MSG_DONT_ASK_AGAIN).toString(), -+ r->data.value(MSG_META_DATA).toMap()); - m_cachedResults.insert(key, new int(result)); - } - } else { -- cgit v1.2.3