From dff77f234d5d0f4140caba5d982d3b5d68ed56ee Mon Sep 17 00:00:00 2001 From: markd Date: Sun, 10 Jan 2016 19:01:10 +0000 Subject: Update kdelibs4 to 4.14.15 bugfixes. --- x11/kdelibs4/Makefile | 6 +- x11/kdelibs4/PLIST | 73 +++++++++++----------- x11/kdelibs4/buildlink3.mk | 4 +- x11/kdelibs4/distinfo | 11 ++-- .../patches/patch-cmake_modules_FindTaglib.cmake | 29 --------- 5 files changed, 47 insertions(+), 76 deletions(-) delete mode 100644 x11/kdelibs4/patches/patch-cmake_modules_FindTaglib.cmake diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 5595e1da852..fd63f76ac73 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.80 2015/04/25 14:25:13 tnn Exp $ +# $NetBSD: Makefile,v 1.81 2016/01/10 19:01:10 markd Exp $ -DISTNAME= kdelibs-${_KDE_VERSION} +DISTNAME= kdelibs-4.14.15 PKGNAME= ${DISTNAME:S/-4/4-4/} -PKGREVISION= 3 CATEGORIES= x11 COMMENT= Support libraries for the KDE integrated X11 desktop +MASTER_SITES= ${MASTER_SITE_KDE:=applications/15.12.0/src/} #PATCH_SITES= ftp://ftp.kde.org/pub/kde/security_patches/ \ # http://mirrors.isc.org/pub/kde/security_patches/ diff --git a/x11/kdelibs4/PLIST b/x11/kdelibs4/PLIST index ce593bc683a..f73048e3231 100644 --- a/x11/kdelibs4/PLIST +++ b/x11/kdelibs4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.18 2014/11/13 10:31:07 markd Exp $ +@comment $NetBSD: PLIST,v 1.19 2016/01/10 19:01:10 markd Exp $ bin/checkXML bin/kbuildsycoca4 bin/kconfig_compiler @@ -1936,23 +1936,23 @@ lib/kde4/plugins/kauth/backend/kauth_backend_plugin.so lib/kde4/plugins/kauth/helper/kauth_helper_plugin.so lib/kde4/plugins/script/libkrossqtsplugin.so lib/kde4/plugins/script/libkrossqtsplugin.so.4 -lib/kde4/plugins/script/libkrossqtsplugin.so.${PKGVERSION} +lib/kde4/plugins/script/libkrossqtsplugin.so.${KDELIBSVER} lib/kde4/spellcheckplugin.so lib/libkcmutils.so lib/libkcmutils.so.4 -lib/libkcmutils.so.${PKGVERSION} +lib/libkcmutils.so.${KDELIBSVER} lib/libkde3support.so lib/libkde3support.so.4 -lib/libkde3support.so.${PKGVERSION} +lib/libkde3support.so.${KDELIBSVER} lib/libkdeclarative.so lib/libkdeclarative.so.5 -lib/libkdeclarative.so.5.14.3 +lib/libkdeclarative.so.${KDELIBSPVER} lib/libkdecore.so lib/libkdecore.so.5 -lib/libkdecore.so.5.14.3 +lib/libkdecore.so.${KDELIBSPVER} lib/libkdefakes.so lib/libkdefakes.so.5 -lib/libkdefakes.so.5.14.3 +lib/libkdefakes.so.${KDELIBSPVER} lib/libkdeinit4_kbuildsycoca4.so lib/libkdeinit4_kconf_update.so lib/libkdeinit4_kded4.so @@ -1960,94 +1960,94 @@ lib/libkdeinit4_kio_http_cache_cleaner.so lib/libkdeinit4_klauncher.so lib/libkdesu.so lib/libkdesu.so.5 -lib/libkdesu.so.5.14.3 +lib/libkdesu.so.${KDELIBSPVER} lib/libkdeui.so lib/libkdeui.so.5 -lib/libkdeui.so.5.14.3 +lib/libkdeui.so.${KDELIBSPVER} lib/libkdewebkit.so lib/libkdewebkit.so.5 -lib/libkdewebkit.so.5.14.3 +lib/libkdewebkit.so.${KDELIBSPVER} lib/libkdnssd.so lib/libkdnssd.so.4 -lib/libkdnssd.so.${PKGVERSION} +lib/libkdnssd.so.${KDELIBSVER} lib/libkemoticons.so lib/libkemoticons.so.4 -lib/libkemoticons.so.${PKGVERSION} +lib/libkemoticons.so.${KDELIBSVER} lib/libkfile.so lib/libkfile.so.4 -lib/libkfile.so.${PKGVERSION} +lib/libkfile.so.${KDELIBSVER} lib/libkhtml.so lib/libkhtml.so.5 -lib/libkhtml.so.5.14.3 +lib/libkhtml.so.${KDELIBSPVER} lib/libkidletime.so lib/libkidletime.so.4 -lib/libkidletime.so.${PKGVERSION} +lib/libkidletime.so.${KDELIBSVER} lib/libkimproxy.so lib/libkimproxy.so.4 -lib/libkimproxy.so.${PKGVERSION} +lib/libkimproxy.so.${KDELIBSVER} lib/libkio.so lib/libkio.so.5 -lib/libkio.so.5.14.3 +lib/libkio.so.${KDELIBSPVER} lib/libkjs.so lib/libkjs.so.4 -lib/libkjs.so.${PKGVERSION} +lib/libkjs.so.${KDELIBSVER} lib/libkjsapi.so lib/libkjsapi.so.4 -lib/libkjsapi.so.${PKGVERSION} +lib/libkjsapi.so.${KDELIBSVER} lib/libkjsembed.so lib/libkjsembed.so.4 -lib/libkjsembed.so.${PKGVERSION} +lib/libkjsembed.so.${KDELIBSVER} lib/libkmediaplayer.so lib/libkmediaplayer.so.4 -lib/libkmediaplayer.so.${PKGVERSION} +lib/libkmediaplayer.so.${KDELIBSVER} lib/libknewstuff2.so lib/libknewstuff2.so.4 -lib/libknewstuff2.so.${PKGVERSION} +lib/libknewstuff2.so.${KDELIBSVER} lib/libknewstuff3.so lib/libknewstuff3.so.4 -lib/libknewstuff3.so.${PKGVERSION} +lib/libknewstuff3.so.${KDELIBSVER} lib/libknotifyconfig.so lib/libknotifyconfig.so.4 -lib/libknotifyconfig.so.${PKGVERSION} +lib/libknotifyconfig.so.${KDELIBSVER} lib/libkntlm.so lib/libkntlm.so.4 -lib/libkntlm.so.${PKGVERSION} +lib/libkntlm.so.${KDELIBSVER} lib/libkparts.so lib/libkparts.so.4 -lib/libkparts.so.${PKGVERSION} +lib/libkparts.so.${KDELIBSVER} lib/libkprintutils.so lib/libkprintutils.so.4 -lib/libkprintutils.so.${PKGVERSION} +lib/libkprintutils.so.${KDELIBSVER} lib/libkpty.so lib/libkpty.so.4 -lib/libkpty.so.${PKGVERSION} +lib/libkpty.so.${KDELIBSVER} lib/libkrosscore.so lib/libkrosscore.so.4 -lib/libkrosscore.so.${PKGVERSION} +lib/libkrosscore.so.${KDELIBSVER} lib/libkrossui.so lib/libkrossui.so.4 -lib/libkrossui.so.${PKGVERSION} +lib/libkrossui.so.${KDELIBSVER} lib/libktexteditor.so lib/libktexteditor.so.4 -lib/libktexteditor.so.${PKGVERSION} +lib/libktexteditor.so.${KDELIBSVER} lib/libkunitconversion.so lib/libkunitconversion.so.4 -lib/libkunitconversion.so.${PKGVERSION} +lib/libkunitconversion.so.${KDELIBSVER} lib/libkunittest.so lib/libkunittest.so.4 -lib/libkunittest.so.${PKGVERSION} +lib/libkunittest.so.${KDELIBSVER} lib/libkutils.so lib/libkutils.so.4 -lib/libkutils.so.${PKGVERSION} +lib/libkutils.so.${KDELIBSVER} lib/libplasma.so lib/libplasma.so.3 lib/libplasma.so.3.0.0 lib/libsolid.so lib/libsolid.so.4 -lib/libsolid.so.${PKGVERSION} +lib/libsolid.so.${KDELIBSVER} lib/libthreadweaver.so lib/libthreadweaver.so.4 -lib/libthreadweaver.so.${PKGVERSION} +lib/libthreadweaver.so.${KDELIBSVER} man/man1/checkXML.1 man/man1/kconfig_compiler.1 man/man1/kde4-config.1 @@ -2121,6 +2121,7 @@ share/doc/kde/HTML/en/common/lgpl-license share/doc/kde/HTML/en/common/lgpl-license.html share/doc/kde/HTML/en/common/mainfooter.html share/doc/kde/HTML/en/common/mainheader.html +share/doc/kde/HTML/en/common/part_of_the_kde_family_horizontal_190.png share/doc/kde/HTML/en/common/qpl-license.html share/doc/kde/HTML/en/common/tabs.css share/doc/kde/HTML/en/common/top-kde.jpg diff --git a/x11/kdelibs4/buildlink3.mk b/x11/kdelibs4/buildlink3.mk index 8b3f70f66cf..8674130ad3b 100644 --- a/x11/kdelibs4/buildlink3.mk +++ b/x11/kdelibs4/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.44 2015/04/25 14:25:13 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.45 2016/01/10 19:01:10 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.14.3nb3 +BUILDLINK_ABI_DEPENDS.kdelibs+= kdelibs4>=4.14.15 BUILDLINK_PKGSRCDIR.kdelibs?= ../../x11/kdelibs4 .include "../../archivers/bzip2/buildlink3.mk" diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo index 1a06ca872e8..34aa7b4eda3 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.46 2015/11/04 03:28:43 agc Exp $ +$NetBSD: distinfo,v 1.47 2016/01/10 19:01:10 markd Exp $ -SHA1 (kdelibs-4.14.3.tar.xz) = a61beafbd7ff0f5c6be54e685d197c135ba36865 -RMD160 (kdelibs-4.14.3.tar.xz) = f0dd628eec72c52f4dd8426a2de47d75e629ff31 -SHA512 (kdelibs-4.14.3.tar.xz) = 7713cec4851fd4d7d5376afd905515902395ca469cefe1924c05ac0cd4499c28ab6a3c3e7bee10c4cfb3584f2fe93cfb6129d5b550d56d18217866f5fde748cf -Size (kdelibs-4.14.3.tar.xz) = 11600500 bytes +SHA1 (kdelibs-4.14.15.tar.xz) = 7a50824fbcd2a4a72c8780da7b1425b038415419 +RMD160 (kdelibs-4.14.15.tar.xz) = f56c85a572817c344ef3897512385c125a9046ac +SHA512 (kdelibs-4.14.15.tar.xz) = a50dcf8bd06024efe4c4e62a7822cd4e20820452812e1a41961d32b8b8dd2ae52346220830a5ab2ebf6f7a99071852fa21f8dca6e4ba6ddb872b5023b7b2d6df +Size (kdelibs-4.14.15.tar.xz) = 11633836 bytes SHA1 (patch-ConfigureChecks.cmake) = b03b38108d68d940782fbbb876affd011a39acf4 SHA1 (patch-aa) = c3044205a964797a7718b7a7bd03bb99dd3ca37d SHA1 (patch-ab) = 3f89ddfa9a6101a016128d82dbbd0e985e396cae @@ -16,7 +16,6 @@ SHA1 (patch-ak) = 73cc1bb149039d2fe3c05ee631426a8773f951c6 SHA1 (patch-al) = 5efa7d504fe75bec53837bfa062a4b3f910fd71f SHA1 (patch-am) = b6c315d152d2c3d3c66ad85050549d0b39b263e5 SHA1 (patch-cmake_modules_FindKDE4Internal.cmake) = b5f00d1df3c35f499f86aa1d8d234612e8bd130a -SHA1 (patch-cmake_modules_FindTaglib.cmake) = be38479966da542343dd962c57f7e9d1be3e9ff4 SHA1 (patch-kdecore_io_kdirwatch__p.h) = 3c14e26f3962743f7d450e2a5ea2df43bc7524b5 SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b8a513a0c51e65d7e604a88c1d0e3325be6ad688 SHA1 (patch-kdecore_network_ConfigureChecks.cmake) = 0ad9352974911ef78ec565f7b2a97c45ead2cf72 diff --git a/x11/kdelibs4/patches/patch-cmake_modules_FindTaglib.cmake b/x11/kdelibs4/patches/patch-cmake_modules_FindTaglib.cmake deleted file mode 100644 index 0288246aad8..00000000000 --- a/x11/kdelibs4/patches/patch-cmake_modules_FindTaglib.cmake +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-cmake_modules_FindTaglib.cmake,v 1.2 2012/03/19 11:28:49 markd Exp $ - -Change the string comparision operator on the TAGLIB_VERSION to a -version comparision operator (since versions are being compared.) - ---- cmake/modules/FindTaglib.cmake.orig 2011-07-27 18:34:31.000000000 +0000 -+++ cmake/modules/FindTaglib.cmake -@@ -29,10 +29,10 @@ if(TAGLIBCONFIG_EXECUTABLE) - - exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION) - -- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") -+ if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") - message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}") - set(TAGLIB_FOUND FALSE) -- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") -+ else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") - - exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES) - -@@ -43,7 +43,7 @@ if(TAGLIBCONFIG_EXECUTABLE) - message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}") - endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) - string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}") -- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") -+ endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") - mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES) - - else(TAGLIBCONFIG_EXECUTABLE) -- cgit v1.2.3