Update to KDE SC 4.14.3

4 files changed, 90 insertions, 21 deletions

diff --git a/editors/kate/Makefile b/editors/kate/Makefile
index cfa44818c9f..39bf2f8b608 100644
--- a/editors/kate/Makefile
+++ b/editors/kate/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2014/11/07 19:39:30 adam Exp $
+# $NetBSD: Makefile,v 1.29 2014/11/13 20:10:09 markd Exp $
 
 DISTNAME=	kate-${_KDE_VERSION}
-PKGREVISION=	6
 CATEGORIES=	editors
 COMMENT=	KDE advanced text editor
 
diff --git a/editors/kate/PLIST b/editors/kate/PLIST
index 66dd03cf2a5..16c70765638 100644
--- a/editors/kate/PLIST
+++ b/editors/kate/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2014/08/17 07:46:01 markd Exp $
+@comment $NetBSD: PLIST,v 1.9 2014/11/13 20:10:09 markd Exp $
 bin/kate
 bin/kwrite
 include/kate/application.h
@@ -23,6 +23,7 @@ lib/kde4/kateopenheaderplugin.so
 lib/kde4/katepart.so
 lib/kde4/katepateplugin.so
 lib/kde4/kateprojectplugin.so
+lib/kde4/katereplicodeplugin.so
 lib/kde4/katesearchplugin.so
 lib/kde4/katesnippetsplugin.so
 lib/kde4/katesqlplugin.so
@@ -37,6 +38,7 @@ lib/kde4/ktexteditor_exporter.so
 lib/kde4/ktexteditor_hlselection.so
 lib/kde4/ktexteditor_iconinserter.so
 lib/kde4/ktexteditor_insertfile.so
+lib/kde4/ktexteditor_lumen.so
 lib/kde4/plasma_applet_katesession.so
 lib/libkateinterfaces.so
 lib/libkateinterfaces.so.4
@@ -104,6 +106,7 @@ share/kde/apps/kate/icons/hicolor/16x16/actions/sql-table.png
 share/kde/apps/kate/icons/hicolor/16x16/actions/sql-view.png
 share/kde/apps/kate/kateui.rc
 share/kde/apps/kate/pate/block.py
+share/kde/apps/kate/pate/block_ui.rc
 ${PLIST.py3x}share/kde/apps/kate/pate/cmake_utils/__init__.py
 ${PLIST.py3x}share/kde/apps/kate/pate/cmake_utils/cmake_help_parser.py
 ${PLIST.py3x}share/kde/apps/kate/pate/cmake_utils/cmake_utils.py
@@ -117,15 +120,16 @@ ${PLIST.py3x}share/kde/apps/kate/pate/cmake_utils/command_completers/cmake_polic
 ${PLIST.py3x}share/kde/apps/kate/pate/cmake_utils/command_completers/cond_cc.py
 ${PLIST.py3x}share/kde/apps/kate/pate/cmake_utils/command_completers/param_types.py
 ${PLIST.py3x}share/kde/apps/kate/pate/cmake_utils/command_completers/syntax_cc.py
-share/kde/apps/kate/pate/color_tools.py
-share/kde/apps/kate/pate/color_tools_toolview.ui
+share/kde/apps/kate/pate/color_tools/__init__.py
+share/kde/apps/kate/pate/color_tools/color_chooser.py
+share/kde/apps/kate/pate/color_tools/color_palette.py
+share/kde/apps/kate/pate/color_tools/color_swatcher.py
+share/kde/apps/kate/pate/color_tools/color_tools_toolview.ui
+share/kde/apps/kate/pate/color_tools/color_tools_ui.rc
+share/kde/apps/kate/pate/color_tools/utils.py
 share/kde/apps/kate/pate/commentar.py
-share/kde/apps/kate/pate/commentar_config.ui
-share/kde/apps/kate/pate/django_utils/django_settings.py
-share/kde/apps/kate/pate/django_utils/django_snippets.py
-share/kde/apps/kate/pate/django_utils/django_template.py
-share/kde/apps/kate/pate/django_utils/django_utils.py
-share/kde/apps/kate/pate/django_utils/django_utils.ui
+share/kde/apps/kate/pate/commentar.ui
+share/kde/apps/kate/pate/commentar_ui.rc
 ${PLIST.py3x}share/kde/apps/kate/pate/expand.py
 ${PLIST.py3x}share/kde/apps/kate/pate/expand/all.expand
 ${PLIST.py3x}share/kde/apps/kate/pate/expand/text_css.expand
@@ -135,8 +139,10 @@ ${PLIST.py3x}share/kde/apps/kate/pate/expand/text_x-c++src.expand
 ${PLIST.py3x}share/kde/apps/kate/pate/expand/text_x-chdr.expand
 ${PLIST.py3x}share/kde/apps/kate/pate/expand/text_x-python.expand
 share/kde/apps/kate/pate/format.py
+share/kde/apps/kate/pate/format_ui.rc
+share/kde/apps/kate/pate/gid/__init__.py
 share/kde/apps/kate/pate/gid/config.ui
-share/kde/apps/kate/pate/gid/gid.py
+share/kde/apps/kate/pate/gid/gid_ui.rc
 share/kde/apps/kate/pate/gid/idutils.py
 share/kde/apps/kate/pate/gid/tool.ui
 ${PLIST.py3x}share/kde/apps/kate/pate/js_utils/jquery_autocomplete.json
@@ -160,11 +166,14 @@ share/kde/apps/kate/pate/libkatepate/pred.py
 share/kde/apps/kate/pate/libkatepate/project_utils.py
 share/kde/apps/kate/pate/libkatepate/selection.py
 share/kde/apps/kate/pate/libkatepate/text.py
-share/kde/apps/kate/pate/libkatepate/ui.py
+${PLIST.py2x}share/kde/apps/kate/pate/python_autocomplete/__init__.py
 ${PLIST.py2x}share/kde/apps/kate/pate/python_autocomplete/python_autocomplete.py
 ${PLIST.py2x}share/kde/apps/kate/pate/python_autocomplete/python_autocomplete_parse.py
+share/kde/apps/kate/pate/python_autocomplete_jedi.py
+share/kde/apps/kate/pate/python_console_classic/__init__.py
 share/kde/apps/kate/pate/python_console_classic/config.ui
 share/kde/apps/kate/pate/python_console_classic/python_console_classic.py
+share/kde/apps/kate/pate/python_console_ipython/__init__.py
 share/kde/apps/kate/pate/python_console_ipython/python_console_ipython.css
 share/kde/apps/kate/pate/python_console_ipython/python_console_ipython.py
 share/kde/apps/kate/pate/python_console_ipython/python_console_ipython.ui
@@ -178,8 +187,11 @@ share/kde/apps/kate/pate/python_utils/python_settings.py
 share/kde/apps/kate/pate/python_utils/python_snippets.py
 share/kde/apps/kate/pate/python_utils/python_utils.py
 share/kde/apps/kate/pate/python_utils/python_utils.ui
+share/kde/apps/kate/pate/try_open_file.py
+share/kde/apps/kate/pate/try_open_file_ui.rc
 share/kde/apps/kate/pate/xml_pretty.py
 share/kde/apps/kate/pate/xml_pretty.ui
+share/kde/apps/kate/pate/xml_pretty_ui.rc
 share/kde/apps/kate/plugins/filetree/ui.rc
 share/kde/apps/kate/plugins/kate_kttsd/ui.rc
 share/kde/apps/kate/plugins/katebuild/ui.rc
@@ -198,6 +210,8 @@ share/kde/apps/kate/plugins/kategdb/ui.rc
 share/kde/apps/kate/plugins/katekonsole/ui.rc
 share/kde/apps/kate/plugins/katemailfiles/ui.rc
 share/kde/apps/kate/plugins/kateopenheader/ui.rc
+share/kde/apps/kate/plugins/katepateplugin/ui.rc
+share/kde/apps/kate/plugins/katereplicodeplugin/ui.rc
 share/kde/apps/kate/plugins/katesearch/ui.rc
 share/kde/apps/kate/plugins/katesql/ui.rc
 share/kde/apps/kate/plugins/katesymbolviewer/ui.rc
@@ -207,7 +221,16 @@ share/kde/apps/kate/plugins/katetextfilter/ui.rc
 share/kde/apps/kate/plugins/katexmlcheck/ui.rc
 share/kde/apps/kate/plugins/katexmltools/ui.rc
 share/kde/apps/kate/plugins/pate/kate/__init__.py
-share/kde/apps/kate/plugins/pate/kate/gui.py
+share/kde/apps/kate/plugins/pate/kate/api.py
+share/kde/apps/kate/plugins/pate/kate/configuration.py
+share/kde/apps/kate/plugins/pate/kate/decorators.py
+share/kde/apps/kate/plugins/pate/kate/document/__init__.py
+share/kde/apps/kate/plugins/pate/kate/document/decorators.py
+share/kde/apps/kate/plugins/pate/kate/document_view_helpers.py
+share/kde/apps/kate/plugins/pate/kate/ui.py
+share/kde/apps/kate/plugins/pate/kate/view/__init__.py
+share/kde/apps/kate/plugins/pate/kate/view/decorators.py
+share/kde/apps/kate/plugins/project/kateproject.example
 share/kde/apps/kate/plugins/project/ui.rc
 share/kde/apps/kate/tips
 share/kde/apps/katepart/katepartsimpleui.rc
@@ -218,15 +241,20 @@ share/kde/apps/katepart/script/commands/quickcoding.js
 share/kde/apps/katepart/script/commands/utils.js
 share/kde/apps/katepart/script/files/quickcoding/cpp/a.template
 share/kde/apps/katepart/script/files/quickcoding/cpp/c.template
+share/kde/apps/katepart/script/indentation/ada.js
+share/kde/apps/katepart/script/indentation/cmake.js
 share/kde/apps/katepart/script/indentation/cppstyle.js
 share/kde/apps/katepart/script/indentation/cstyle.js
 share/kde/apps/katepart/script/indentation/haskell.js
+share/kde/apps/katepart/script/indentation/latex.js
 share/kde/apps/katepart/script/indentation/lilypond.js
 share/kde/apps/katepart/script/indentation/lisp.js
 share/kde/apps/katepart/script/indentation/lua.js
+share/kde/apps/katepart/script/indentation/pascal.js
 share/kde/apps/katepart/script/indentation/python.js
 share/kde/apps/katepart/script/indentation/ruby.js
 share/kde/apps/katepart/script/indentation/xml.js
+share/kde/apps/katepart/script/libraries/cmake_indenter_config.js
 share/kde/apps/katepart/script/libraries/cursor.js
 share/kde/apps/katepart/script/libraries/documentcursor.js
 share/kde/apps/katepart/script/libraries/emmet/editor_interface.js
@@ -234,10 +262,12 @@ share/kde/apps/katepart/script/libraries/emmet/lib.js
 share/kde/apps/katepart/script/libraries/range.js
 share/kde/apps/katepart/script/libraries/string.js
 share/kde/apps/katepart/script/libraries/underscore.js
+share/kde/apps/katepart/script/libraries/utils.js
 share/kde/apps/katepart/syntax/abap.xml
 share/kde/apps/katepart/syntax/abc.xml
 share/kde/apps/katepart/syntax/actionscript.xml
 share/kde/apps/katepart/syntax/ada.xml
+share/kde/apps/katepart/syntax/agda.xml
 share/kde/apps/katepart/syntax/ahdl.xml
 share/kde/apps/katepart/syntax/ahk.xml
 share/kde/apps/katepart/syntax/alert.xml
@@ -275,7 +305,6 @@ share/kde/apps/katepart/syntax/commonlisp.xml
 share/kde/apps/katepart/syntax/component-pascal.xml
 share/kde/apps/katepart/syntax/context.xml
 share/kde/apps/katepart/syntax/cpp.xml
-share/kde/apps/katepart/syntax/cpp11.xml
 share/kde/apps/katepart/syntax/crk.xml
 share/kde/apps/katepart/syntax/cs.xml
 share/kde/apps/katepart/syntax/css-php.xml
@@ -312,9 +341,11 @@ share/kde/apps/katepart/syntax/gcc.xml
 share/kde/apps/katepart/syntax/gdb.xml
 share/kde/apps/katepart/syntax/gdl.xml
 share/kde/apps/katepart/syntax/gettext.xml
+share/kde/apps/katepart/syntax/git-rebase.xml
 share/kde/apps/katepart/syntax/glosstex.xml
 share/kde/apps/katepart/syntax/glsl.xml
 share/kde/apps/katepart/syntax/gnuassembler.xml
+share/kde/apps/katepart/syntax/gnuplot.xml
 share/kde/apps/katepart/syntax/go.xml
 share/kde/apps/katepart/syntax/grammar.xml
 share/kde/apps/katepart/syntax/haml.xml
@@ -327,6 +358,7 @@ share/kde/apps/katepart/syntax/idl.xml
 share/kde/apps/katepart/syntax/ilerpg.xml
 share/kde/apps/katepart/syntax/inform.xml
 share/kde/apps/katepart/syntax/ini.xml
+share/kde/apps/katepart/syntax/isocpp.xml
 share/kde/apps/katepart/syntax/jam.xml
 share/kde/apps/katepart/syntax/java.xml
 share/kde/apps/katepart/syntax/javadoc.xml
@@ -339,6 +371,7 @@ share/kde/apps/katepart/syntax/julia.xml
 share/kde/apps/katepart/syntax/k.xml
 share/kde/apps/katepart/syntax/katetemplate.xml
 share/kde/apps/katepart/syntax/kbasic.xml
+share/kde/apps/katepart/syntax/kconfig.xml
 share/kde/apps/katepart/syntax/language.dtd
 share/kde/apps/katepart/syntax/latex.xml
 share/kde/apps/katepart/syntax/ld.xml
@@ -360,6 +393,7 @@ share/kde/apps/katepart/syntax/mako.xml
 share/kde/apps/katepart/syntax/mandoc.xml
 share/kde/apps/katepart/syntax/markdown.xml
 share/kde/apps/katepart/syntax/mason.xml
+share/kde/apps/katepart/syntax/mathematica.xml
 share/kde/apps/katepart/syntax/matlab.xml
 share/kde/apps/katepart/syntax/maxima.xml
 share/kde/apps/katepart/syntax/mediawiki.xml
@@ -372,6 +406,7 @@ share/kde/apps/katepart/syntax/modelines.xml
 share/kde/apps/katepart/syntax/modula-2.xml
 share/kde/apps/katepart/syntax/monobasic.xml
 share/kde/apps/katepart/syntax/mup.xml
+share/kde/apps/katepart/syntax/nagios.xml
 share/kde/apps/katepart/syntax/nasm.xml
 share/kde/apps/katepart/syntax/nemerle.xml
 share/kde/apps/katepart/syntax/nesc.xml
@@ -396,18 +431,19 @@ share/kde/apps/katepart/syntax/povray.xml
 share/kde/apps/katepart/syntax/ppd.xml
 share/kde/apps/katepart/syntax/progress.xml
 share/kde/apps/katepart/syntax/prolog.xml
+share/kde/apps/katepart/syntax/protobuf.xml
+share/kde/apps/katepart/syntax/puppet.xml
 share/kde/apps/katepart/syntax/purebasic.xml
 share/kde/apps/katepart/syntax/python.xml
 share/kde/apps/katepart/syntax/q.xml
 share/kde/apps/katepart/syntax/qmake.xml
 share/kde/apps/katepart/syntax/qml.xml
-share/kde/apps/katepart/syntax/qt4.xml
 share/kde/apps/katepart/syntax/r.xml
 share/kde/apps/katepart/syntax/rapidq.xml
 share/kde/apps/katepart/syntax/relaxng.xml
 share/kde/apps/katepart/syntax/relaxngcompact.xml
+share/kde/apps/katepart/syntax/replicode.xml
 share/kde/apps/katepart/syntax/rest.xml
-share/kde/apps/katepart/syntax/restructuredtext.xml
 share/kde/apps/katepart/syntax/rexx.xml
 share/kde/apps/katepart/syntax/rhtml.xml
 share/kde/apps/katepart/syntax/rib.xml
@@ -500,7 +536,20 @@ share/kde4/services/katekonsoleplugin.desktop
 share/kde4/services/katemailfilesplugin.desktop
 share/kde4/services/kateopenheader.desktop
 share/kde4/services/katepart.desktop
+share/kde4/services/katepate_block.desktop
+share/kde4/services/katepate_color_tools.desktop
+share/kde4/services/katepate_commentar.desktop
+share/kde4/services/katepate_format.desktop
+share/kde4/services/katepate_gid.desktop
+share/kde4/services/katepate_python_autocomplete.desktop
+share/kde4/services/katepate_python_autocomplete_jedi.desktop
+share/kde4/services/katepate_python_console_classic.desktop
+share/kde4/services/katepate_python_console_ipython.desktop
+share/kde4/services/katepate_python_utils.desktop
+share/kde4/services/katepate_try_open_file.desktop
+share/kde4/services/katepate_xml_pretty.desktop
 share/kde4/services/kateprojectplugin.desktop
+share/kde4/services/katereplicodeplugin.desktop
 share/kde4/services/katesearch.desktop
 share/kde4/services/katesnippetsplugin.desktop
 share/kde4/services/katesql.desktop
@@ -516,6 +565,8 @@ share/kde4/services/ktexteditor_exporter.desktop
 share/kde4/services/ktexteditor_hlselection.desktop
 share/kde4/services/ktexteditor_iconinserter.desktop
 share/kde4/services/ktexteditor_insertfile.desktop
+share/kde4/services/ktexteditor_lumen.desktop
 share/kde4/services/pate.desktop
 share/kde4/services/plasma-applet-katesession.desktop
 share/kde4/servicetypes/kateplugin.desktop
+share/kde4/servicetypes/katepythonplugin.desktop
diff --git a/editors/kate/distinfo b/editors/kate/distinfo
index 4501b464132..4113beb4001 100644
--- a/editors/kate/distinfo
+++ b/editors/kate/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2014/02/01 02:20:45 markd Exp $
+$NetBSD: distinfo,v 1.8 2014/11/13 20:10:09 markd Exp $
 
-SHA1 (kate-4.11.5.tar.xz) = f08e71093eff1274760dee67844a40ab37e1279d
-RMD160 (kate-4.11.5.tar.xz) = 6a83325dc36e50e8e13f7e83d3d695cfb8ae26f6
-Size (kate-4.11.5.tar.xz) = 2585636 bytes
+SHA1 (kate-4.14.3.tar.xz) = da37195e86b5449fcdfe69a3f7df6373a5da900c
+RMD160 (kate-4.14.3.tar.xz) = 195cfac39111a1434b6b5c60543b219a70c0c74e
+Size (kate-4.14.3.tar.xz) = 2766880 bytes
+SHA1 (patch-addons_kate_pate_src_version_checker.h) = f22a9131bcbcdffc0330d258cf471d8e3dcbf05e
diff --git a/editors/kate/patches/patch-addons_kate_pate_src_version_checker.h b/editors/kate/patches/patch-addons_kate_pate_src_version_checker.h
new file mode 100644
index 00000000000..f858aae0f9b
--- /dev/null
+++ b/editors/kate/patches/patch-addons_kate_pate_src_version_checker.h
@@ -0,0 +1,18 @@
+$NetBSD: patch-addons_kate_pate_src_version_checker.h,v 1.1 2014/11/13 20:10:09 markd Exp $
+
+--- addons/kate/pate/src/version_checker.h.orig	2014-10-26 20:17:55.000000000 +0000
++++ addons/kate/pate/src/version_checker.h
+@@ -24,6 +24,13 @@
+ # include <QtCore/QStringList>
+ # include <QtCore/QtGlobal>
+ 
++# ifdef major
++#  undef major
++# endif
++# ifdef minor
++#  undef minor
++# endif
++
+ namespace Pate {
+ 
+ /**