summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2016-09-15 04:04:32 +1000
committerMichael Palimaka <kensington@gentoo.org>2016-09-15 04:12:16 +1000
commit1f9700ed2ec8463a6b7d80a06f83c7b50c973b54 (patch)
tree4a5042f5e2915e29ee83096ce0306f8e0e8208ee /kde-frameworks/ktexteditor
parentdev-python/simplecv: remove unused patch (diff)
downloadgentoo-1f9700ed2ec8463a6b7d80a06f83c7b50c973b54.tar.gz
gentoo-1f9700ed2ec8463a6b7d80a06f83c7b50c973b54.tar.bz2
gentoo-1f9700ed2ec8463a6b7d80a06f83c7b50c973b54.zip
kde-frameworks: version bump 5.26.0
Package-Manager: portage-2.3.0
Diffstat (limited to 'kde-frameworks/ktexteditor')
-rw-r--r--kde-frameworks/ktexteditor/Manifest1
-rw-r--r--kde-frameworks/ktexteditor/files/ktexteditor-5.26.0-runtime-crash.patch39
-rw-r--r--kde-frameworks/ktexteditor/ktexteditor-5.26.0-r1.ebuild55
3 files changed, 95 insertions, 0 deletions
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 43cf40c84f4f..a560ac6da1bf 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,2 +1,3 @@
DIST ktexteditor-5.23.0.tar.xz 2885048 SHA256 08eca5054f7b696671407cb628a657b9736b363c6a1476e4dd37adb3e46a2f76 SHA512 46e3a14cf41e61b335ab8febb2c30c0d365393e97f5b691520436e2f4db7aa268d1a43f7a76dc6d55c3fa0a5727b28372b46a6528795c4362b1b128705ce60db WHIRLPOOL c3d0fff530d2a4b4346384cf9e085e150e16a16808723b8ebd2c1a3c2406d28eafa62dd4ae6c366b88616008312415486cfb0fcdc5c3c8690b8a075e90b8dd8b
DIST ktexteditor-5.25.0.tar.xz 2919080 SHA256 4a225b73c33dc0cc49fdf67eab60f119eca74b2e8a7801af16ecc5b87bf53e1b SHA512 bd4d90f701edb2a44c1eae7c3e5748bc9e82cc76d6964ff7fc21a0ecf88d1af097c9e93c6fb01f5f5c2bc5995411c37e391caf1b6ab9ae0f8d69df3d57162072 WHIRLPOOL 9af47513d8a761b22021f3dee6ecc267690296444c90c32c65633dc559c58bbdbdc8093fabdeddd0958d1c548d07c218cb63d58fc2a74751d2f6f1e292bb070f
+DIST ktexteditor-5.26.0.tar.xz 2922232 SHA256 648ff87ac206f0f6dbe191977f834ba0e3b21b433e6d963d943a3c38dbda0461 SHA512 306c861f325cab675e000dcb32f476ad3ad1162504a86739cb5c09c90758ee789fa9d2d6d8e7261dab466b0df836e6afc05b0fa73f154cb05dca1a1fd3fe7b2f WHIRLPOOL 67363e23153799044a9ddadbe8d15662806161c5267c7654cabe9e25daecc2b91484e025e1090ffde930f50c162e9460cf8f01f31ff542b1291a472059cd87e4
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.26.0-runtime-crash.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.26.0-runtime-crash.patch
new file mode 100644
index 000000000000..36636d490632
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.26.0-runtime-crash.patch
@@ -0,0 +1,39 @@
+From: Dominik Haumann <dhaumann@kde.org>
+Date: Thu, 08 Sep 2016 13:32:39 +0000
+Subject: Fix crash: Make sure the display cursor is valid after text folding
+X-Git-Url: http://quickgit.kde.org/?p=ktexteditor.git&a=commitdiff&h=09a1e864d54735ebcab6bf31198fdef969b92a67
+---
+Fix crash: Make sure the display cursor is valid after text folding
+
+This bug existed at least since KDE 4.3 (2009), took a long time to track it down.
+
+FIXED-IN: KDE Frameworks 5.27
+BUG: 367466
+Differential-Revision: https://phabricator.kde.org/D2709
+---
+
+
+--- a/src/view/kateviewinternal.cpp
++++ b/src/view/kateviewinternal.cpp
+@@ -709,6 +709,10 @@
+
+ // set cursor to start of folding region
+ updateCursor(foldingRange.start(), true);
++ } else {
++ // force an update of the cursor, since otherwise the m_displayCursor
++ // line may be below the total amount of visible lines.
++ updateCursor(m_cursor, true);
+ }
+
+ updateView();
+@@ -1515,6 +1519,9 @@
+ m_view->completionWidget()->cursorUp();
+ return;
+ }
++
++ // assert that the display cursor is in visible lines
++ Q_ASSERT(m_displayCursor.line() < m_view->textFolding().visibleLines());
+
+ /**
+ * move cursor to start of line, if we are at first line!
+
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.26.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.26.0-r1.ebuild
new file mode 100644
index 000000000000..41ba42115035
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.26.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing a full text editor component"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="git"
+
+RDEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep sonnet)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ git? ( dev-libs/libgit2:= )
+"
+DEPEND="${RDEPEND}
+ $(add_qt_dep qtxmlpatterns)
+ test? ( $(add_frameworks_dep kservice) )
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-runtime-crash.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package git LibGit2)
+ )
+
+ kde5_src_configure
+}