aboutsummaryrefslogtreecommitdiff
path: root/x11/kde4-baseapps
diff options
context:
space:
mode:
authorMax Brazhnikov <makc@FreeBSD.org>2011-05-16 19:26:43 +0000
committerMax Brazhnikov <makc@FreeBSD.org>2011-05-16 19:26:43 +0000
commita34b8d38b831d19001533639592430f41527a96c (patch)
tree039439a298b8e93967986e11178208cf8e1adbe2 /x11/kde4-baseapps
parenteb56f7f7066ae94ebacc2284e0b0000539fca8d9 (diff)
Notes
Diffstat (limited to 'x11/kde4-baseapps')
-rw-r--r--x11/kde4-baseapps/Makefile3
-rw-r--r--x11/kde4-baseapps/distinfo4
-rw-r--r--x11/kde4-baseapps/files/patch-dolphin__src__panels__terminal__terminalpanel.cpp31
-rw-r--r--x11/kde4-baseapps/files/patch-konqueror__src__CMakeLists.txt11
-rw-r--r--x11/kde4-baseapps/pkg-plist1
5 files changed, 3 insertions, 47 deletions
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 53a0c3a31df4..558117d26bdb 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -18,8 +18,7 @@ COMMENT= Basic applications for the KDE system
LIB_DEPENDS= searchclient:${PORTSDIR}/deskutils/strigi \
soprano.4:${PORTSDIR}/textproc/soprano \
- qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
- kwebkit.1:${PORTSDIR}/www/kwebkitpart
+ qimageblitz.4:${PORTSDIR}/x11/qimageblitz
LATEST_LINK= ${PORTNAME}4
diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo
index ac511ca41a49..fe609de0b51e 100644
--- a/x11/kde4-baseapps/distinfo
+++ b/x11/kde4-baseapps/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdebase-4.6.2.tar.bz2) = 1f797f386ddac4eb1974cb8090dec4a0e86b9a40b834ed8cf210e3bc160c15f9
-SIZE (KDE/kdebase-4.6.2.tar.bz2) = 2681254
+SHA256 (KDE/kdebase-4.6.3.tar.bz2) = 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
+SIZE (KDE/kdebase-4.6.3.tar.bz2) = 2682586
diff --git a/x11/kde4-baseapps/files/patch-dolphin__src__panels__terminal__terminalpanel.cpp b/x11/kde4-baseapps/files/patch-dolphin__src__panels__terminal__terminalpanel.cpp
deleted file mode 100644
index 04ddd15939e3..000000000000
--- a/x11/kde4-baseapps/files/patch-dolphin__src__panels__terminal__terminalpanel.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
---- dolphin/src/panels/terminal/terminalpanel.cpp~ 2011-02-26 00:33:12.000000000 +0200
-+++ dolphin/src/panels/terminal/terminalpanel.cpp 2011-03-14 17:41:58.000000000 +0200
-@@ -19,6 +19,8 @@
-
- #include "terminalpanel.h"
-
-+#include <signal.h>
-+
- #include <kpluginloader.h>
- #include <kpluginfactory.h>
- #include <kde_terminal_interface_v2.h>
-@@ -111,16 +113,12 @@
-
- void TerminalPanel::sendCdToTerminal(const QString& dir)
- {
-- if (!m_clearTerminal) {
-+ if (!m_clearTerminal)
- // The TerminalV2 interface does not provide a way to delete the
- // current line before sending a new input. This is mandatory,
- // otherwise sending a 'cd x' to a existing 'rm -rf *' might
-- // result in data loss. As workaround Ctrl+C is send.
-- QString cancel;
-- cancel.append(QChar(3));
-- cancel.append(QChar('c'));
-- m_terminal->sendInput(cancel);
-- }
-+ // result in data loss. As workaround SIGINT is send.
-+ ::kill(m_terminal->terminalProcessId(), SIGINT);
-
- m_terminal->sendInput("cd " + KShell::quoteArg(dir) + '\n');
-
diff --git a/x11/kde4-baseapps/files/patch-konqueror__src__CMakeLists.txt b/x11/kde4-baseapps/files/patch-konqueror__src__CMakeLists.txt
deleted file mode 100644
index 13a1cb556339..000000000000
--- a/x11/kde4-baseapps/files/patch-konqueror__src__CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./konqueror/src/CMakeLists.txt.orig 2011-02-25 22:55:12.000000000 +0100
-+++ ./konqueror/src/CMakeLists.txt 2011-03-04 12:09:23.643348069 +0100
-@@ -33,7 +33,7 @@
- kde4_add_library(konquerorprivate SHARED ${konquerorprivate_SRCS})
- target_link_libraries(konquerorprivate konq ${KDE4_KPARTS_LIBS} ${ZLIB_LIBRARY})
- set_target_properties(konquerorprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
--install(TARGETS konquerorprivate ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
-+install(TARGETS konquerorprivate ${INSTALL_TARGETS_DEFAULT_ARGS})
-
- ########### konqueror ###############
- if (WIN32)
diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist
index 12fb85f8c61b..c761f3c317f6 100644
--- a/x11/kde4-baseapps/pkg-plist
+++ b/x11/kde4-baseapps/pkg-plist
@@ -76,7 +76,6 @@ lib/libkonq.so.7.0.1
lib/libkonqsidebarplugin.so
lib/libkonqsidebarplugin.so.5
lib/libkonqsidebarplugin.so.5.0.1
-lib/libkonquerorprivate.so
lib/libkonquerorprivate.so.5
lib/libkonquerorprivate.so.5.0.1
lib/libkonsoleprivate.so