diff options
Diffstat (limited to 'x11/kdelibs4')
| -rw-r--r-- | x11/kdelibs4/Makefile | 1 | ||||
| -rw-r--r-- | x11/kdelibs4/distinfo | 4 | ||||
| -rw-r--r-- | x11/kdelibs4/files/patch-KDE4Defaults.cmake | 4 | ||||
| -rw-r--r-- | x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake | 13 | ||||
| -rw-r--r-- | x11/kdelibs4/files/patch-kio_kfile_kpropertiesdialog.cpp | 18 |
5 files changed, 6 insertions, 34 deletions
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 1233521b1d3d..614206ffae08 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -3,7 +3,6 @@ PORTNAME= kdelibs PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 2 CATEGORIES= x11 kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo index 5fa3b23fd6d5..0d4e85e8a6ec 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/4.10.1/kdelibs-4.10.1.tar.xz) = d5bc7ffe83b65dcb20c277253e2645f3d59dad7820cbc6f3a1bb9b5be7db05d6 -SIZE (KDE/4.10.1/kdelibs-4.10.1.tar.xz) = 11955948 +SHA256 (KDE/4.10.3/kdelibs-4.10.3.tar.xz) = 5fbde0b372e6c2054ee3c620f3e465b452d2bf90a0c6ab3cc98d153e3a572cef +SIZE (KDE/4.10.3/kdelibs-4.10.3.tar.xz) = 11981656 diff --git a/x11/kdelibs4/files/patch-KDE4Defaults.cmake b/x11/kdelibs4/files/patch-KDE4Defaults.cmake index e2c534e9148b..e0c7ded7e855 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.10.1") +-set(GENERIC_LIB_VERSION "4.10.3") -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.10.1") +-set(KDE_NON_GENERIC_LIB_VERSION "5.10.3") -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_FindKDE4Internal.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake index 88e0a69daf6b..3180d70d340c 100644 --- a/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake +++ b/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake @@ -1,14 +1,5 @@ ---- ./cmake/modules/FindKDE4Internal.cmake.orig 2013-03-01 07:26:13.335789000 +0100 -+++ ./cmake/modules/FindKDE4Internal.cmake 2013-03-29 21:51:00.038340976 +0100 -@@ -716,7 +716,7 @@ - ##################### provide some options ########################################## - - option(KDE4_ENABLE_FINAL "Enable final all-in-one compilation") --option(KDE4_BUILD_TESTS "Build the tests" ON) -+option(KDE4_BUILD_TESTS "Build the tests") - option(KDE4_ENABLE_HTMLHANDBOOK "Create targets htmlhandbook for creating the html versions of the docbook docs") - set(KDE4_SERIALIZE_TOOL "" CACHE STRING "Tool to serialize resource-intensive commands in parallel builds") - +--- ./cmake/modules/FindKDE4Internal.cmake.orig 2012-11-30 07:17:39.000000000 +0000 ++++ ./cmake/modules/FindKDE4Internal.cmake 2013-02-15 15:45:41.732493091 +0000 @@ -893,8 +893,8 @@ _set_fancy(XDG_MIME_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/mime/packages" "The install dir for the xdg mimetypes") diff --git a/x11/kdelibs4/files/patch-kio_kfile_kpropertiesdialog.cpp b/x11/kdelibs4/files/patch-kio_kfile_kpropertiesdialog.cpp deleted file mode 100644 index 004f25901f97..000000000000 --- a/x11/kdelibs4/files/patch-kio_kfile_kpropertiesdialog.cpp +++ /dev/null @@ -1,18 +0,0 @@ ---- ./kio/kfile/kpropertiesdialog.cpp.orig 2009-05-06 14:14:38.000000000 +0400 -+++ ./kio/kfile/kpropertiesdialog.cpp 2009-05-30 00:46:08.000000000 +0400 -@@ -1804,7 +1804,15 @@ - #else - QVarLengthArray<gid_t> groups; - #endif -+#ifdef Q_OS_FREEBSD -+#include <osreldate.h> -+#endif -+#if defined(Q_OS_FREEBSD) && (__FreeBSD_version <= 800000) // Fixed in kern/114655 -+ gid_t tmp_group; -+ if (getgrouplist(strUser, user->pw_gid, &tmp_group, &groupCount) < 0) { -+#else - if (getgrouplist(strUser, user->pw_gid, NULL, &groupCount) < 0) { -+#endif - groups.resize(groupCount); - if (groups.data()) - getgrouplist(strUser, user->pw_gid, groups.data(), &groupCount); |