diff options
| author | alonso <alonso@FreeBSD.org> | 2015-03-12 07:11:47 +0800 |
|---|---|---|
| committer | alonso <alonso@FreeBSD.org> | 2015-03-12 07:11:47 +0800 |
| commit | 7f08c01b39f7988dfc689593993896d621c448f2 (patch) | |
| tree | 910a5b73adcde0c6d7935ee875c9b3fb36fecc94 /x11/kde4-runtime | |
| parent | 49763a0df41c227cc1a99ec21d6fd1771b89dfc7 (diff) | |
| download | freebsd-ports-gnome-7f08c01b39f7988dfc689593993896d621c448f2.tar.gz freebsd-ports-gnome-7f08c01b39f7988dfc689593993896d621c448f2.tar.zst freebsd-ports-gnome-7f08c01b39f7988dfc689593993896d621c448f2.zip | |
Update KDE SC to 4.14.3
The kde@ team presents KDE SC 4.14.3, the last planed release
of the KDE SC 4 series.
In addition to the updates provided by the KDE SC developers, this
update also addresses numerous FreeBSD and PORTS specific
issues, found and solved by the kde@ team and area51 testers,
most notorously Tobias C. Berner <tcberner@gmail.com>
PR: 197751
PR: 197871
PR: 184996
Reviewed by: rakuco (mentor)
Differential: https://reviews.freebsd.org/D1950
Diffstat (limited to 'x11/kde4-runtime')
| -rw-r--r-- | x11/kde4-runtime/Makefile | 6 | ||||
| -rw-r--r-- | x11/kde4-runtime/distinfo | 4 | ||||
| -rw-r--r-- | x11/kde4-runtime/files/patch-kioslave__bookmarks__kio_bookmarks.cpp | 25 | ||||
| -rw-r--r-- | x11/kde4-runtime/files/patch-kioslave__sftp__kio_sftp.cpp | 11 |
4 files changed, 3 insertions, 43 deletions
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 1cdfbef31d19..0642ea140663 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -2,7 +2,6 @@ PORTNAME= kde-runtime PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 3 CATEGORIES= x11 kde MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} @@ -36,10 +35,7 @@ SHEBANG_FILES= khelpcenter/searchhandlers/*.pl \ khelpcenter/searchhandlers/*.pl.cmake \ kioslave/info/kde-info2html -OPTIONS_DEFINE= NEPOMUK PULSEAUDIO ZEITGEIST - -NEPOMUK_DESC= Nepomuk semantic desktop via Virtuoso -NEPOMUK_RUN_DEPENDS= virtuoso-t:${PORTSDIR}/databases/virtuoso +OPTIONS_DEFINE= PULSEAUDIO ZEITGEIST PULSEAUDIO_DESC=Audio configuration via PulseAudio PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio \ diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo index d96abd1dc82b..7c8ccbcb16fd 100644 --- a/x11/kde4-runtime/distinfo +++ b/x11/kde4-runtime/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/4.14.2/kde-runtime-4.14.2.tar.xz) = 22bcced462b785b8e50b666101ecbec04a0135656842ef5718530da621342fec -SIZE (KDE/4.14.2/kde-runtime-4.14.2.tar.xz) = 7867216 +SHA256 (KDE/4.14.3/kde-runtime-4.14.3.tar.xz) = 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 +SIZE (KDE/4.14.3/kde-runtime-4.14.3.tar.xz) = 7867308 diff --git a/x11/kde4-runtime/files/patch-kioslave__bookmarks__kio_bookmarks.cpp b/x11/kde4-runtime/files/patch-kioslave__bookmarks__kio_bookmarks.cpp deleted file mode 100644 index 7fb7b14a6130..000000000000 --- a/x11/kde4-runtime/files/patch-kioslave__bookmarks__kio_bookmarks.cpp +++ /dev/null @@ -1,25 +0,0 @@ -commit d68703900edc8416fbcd2550cd336cbbb76decb9 -Author: Martin Sandsmark <martin.sandsmark@kde.org> -Date: Thu Nov 13 13:29:01 2014 +0100 - - Sanitize path - ---- kioslave/bookmarks/kio_bookmarks.cpp -+++ kioslave/bookmarks/kio_bookmarks.cpp -@@ -22,6 +22,7 @@ - #include <stdlib.h> - - #include <qregexp.h> -+#include <qtextdocument.h> - - #include <kapplication.h> - #include <kcmdlineargs.h> -@@ -197,7 +198,7 @@ void BookmarksProtocol::get( const KUrl& url ) - echoImage(regexp.cap(1), regexp.cap(2), url.queryItem("size")); - } else { - echoHead(); -- echo("<p class=\"message\">" + i18n("Wrong request: %1",path) + "</p>"); -+ echo("<p class=\"message\">" + i18n("Bad request: %1", Qt::escape(Qt::escape(url.prettyUrl()))) + "</p>"); - } - finished(); - } diff --git a/x11/kde4-runtime/files/patch-kioslave__sftp__kio_sftp.cpp b/x11/kde4-runtime/files/patch-kioslave__sftp__kio_sftp.cpp deleted file mode 100644 index abf5f8c4a369..000000000000 --- a/x11/kde4-runtime/files/patch-kioslave__sftp__kio_sftp.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- kioslave/sftp/kio_sftp.cpp.orig 2014-10-27 22:00:05.195340477 +0100 -+++ kioslave/sftp/kio_sftp.cpp 2014-10-27 22:00:14.755340379 +0100 -@@ -528,7 +528,7 @@ - return false; - } - -- int timeout_sec = 30, timeout_usec = 0; -+ long int timeout_sec = 30, timeout_usec = 0; - - kDebug(KIO_SFTP_DB) << "Creating the SSH session and setting options"; - |