Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (122840e97a6159978eafa7c37b2b45cb10bfefa0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (122840e97a6159978eafa7c37b2b45cb10bfefa0)
  • Date: Mon, 28 Mar 2016 09:16:12 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

kde-frameworks/ktexteditor/DETAILS | 1 +
kde-frameworks/ktexteditor/HISTORY | 4 ++++
kde-frameworks/ktexteditor/PRE_BUILD | 3 +++
kde-frameworks/ktexteditor/kate.diff | 13 +++++++++++++
4 files changed, 21 insertions(+)

New commits:
commit 122840e97a6159978eafa7c37b2b45cb10bfefa0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

ktexteditor - upstream patch

diff --git a/kde-frameworks/ktexteditor/DETAILS
b/kde-frameworks/ktexteditor/DETAILS
index 04cc0a2..b158e40 100755
--- a/kde-frameworks/ktexteditor/DETAILS
+++ b/kde-frameworks/ktexteditor/DETAILS
@@ -2,6 +2,7 @@
VERSION=5.20.0
VX=${VERSION%.?}

SOURCE_HASH=sha512:a89cfea2d3629422c013144898c3ac3fae29c8bc247610f68145f1cbcae66f9399b71487caa929c4b5269173730af9ba1b411000b01644686c25fca1b8e814ed
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL=http://download.kde.org/stable/frameworks/$VX/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/kde-frameworks/ktexteditor/HISTORY
b/kde-frameworks/ktexteditor/HISTORY
index 95dec27..9cfe482 100644
--- a/kde-frameworks/ktexteditor/HISTORY
+++ b/kde-frameworks/ktexteditor/HISTORY
@@ -1,3 +1,7 @@
+2016-03-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * kate.diff PRE_BUILD: apply upstream patch
+
2016-03-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.20.0

diff --git a/kde-frameworks/ktexteditor/PRE_BUILD
b/kde-frameworks/ktexteditor/PRE_BUILD
new file mode 100755
index 0000000..6b9885c
--- /dev/null
+++ b/kde-frameworks/ktexteditor/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/kate.diff
diff --git a/kde-frameworks/ktexteditor/kate.diff
b/kde-frameworks/ktexteditor/kate.diff
new file mode 100644
index 0000000..d53a56b
--- /dev/null
+++ b/kde-frameworks/ktexteditor/kate.diff
@@ -0,0 +1,13 @@
+diff --git a/src/render/katelayoutcache.cpp b/src/render/katelayoutcache.cpp
+index 33781fe..3eb268f 100644
+--- a/src/render/katelayoutcache.cpp
++++ b/src/render/katelayoutcache.cpp
+@@ -165,7 +165,7 @@ void KateLayoutCache::updateViewCache(const
KTextEditor::Cursor &startPos, int n
+ {
+ //qCDebug(LOG_KTE) << startPos << " nvlc " << newViewLineCount << " vls
" << viewLinesScrolled;
+
+- int oldViewLineCount = !m_textLayouts.isEmpty();
++ int oldViewLineCount = m_textLayouts.count();
+ if (newViewLineCount == -1) {
+ newViewLineCount = oldViewLineCount;
+ }



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (122840e97a6159978eafa7c37b2b45cb10bfefa0), Treeve Jelbert, 03/28/2016

Archive powered by MHonArc 2.6.24.

Top of Page