[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [emerge/kde-4.10] portage/kde/kate: fix building kate on 4.10.0
From:       Patrick Spendrin <ps_ml () gmx ! de>
Date:       2013-02-28 22:06:27
Message-ID: 20130228220627.75AD0A6105 () git ! kde ! org
[Download RAW message or body]

Git commit 5af0e25375a53fd3b58387567b97d6c011470d7a by Patrick Spendrin.
Committed on 28/02/2013 at 23:06.
Pushed by sengels into branch 'kde-4.10'.

fix building kate on 4.10.0

M  +1    -0    portage/kde/kate/kate-20110130.py
A  +13   -0    portage/kde/kate/kate-4.10.0.diff

http://commits.kde.org/emerge/5af0e25375a53fd3b58387567b97d6c011470d7a

diff --git a/portage/kde/kate/kate-20110130.py b/portage/kde/kate/kate-20110130.py
index a4290e6..9f0702f 100644
--- a/portage/kde/kate/kate-20110130.py
+++ b/portage/kde/kate/kate-20110130.py
@@ -6,6 +6,7 @@ class subinfo( info.infoclass ):
         for ver in ['0', '1', '2', '3', '4', '5']:
             self.targets[kd.kdeversion + ver] = "http://download.kde.org/stable/" + \
                kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + \
                ver + ".tar.xz"
             self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + \
kd.kdeversion + ver +        self.patchToApply['4.10.0'] = [("kate-4.10.0.diff", 1)]
 
         self.defaultTarget = 'gitHEAD'
 
diff --git a/portage/kde/kate/kate-4.10.0.diff b/portage/kde/kate/kate-4.10.0.diff
new file mode 100644
index 0000000..ddd94f3
--- /dev/null
+++ b/portage/kde/kate/kate-4.10.0.diff
@@ -0,0 +1,13 @@
+diff --git a/part/view/kateviewhelpers.cpp b/part/view/kateviewhelpers.cpp
+index c6f8ec5..3ed6c90 100644
+--- a/part/view/kateviewhelpers.cpp
++++ b/part/view/kateviewhelpers.cpp
+@@ -278,7 +278,7 @@ const QColor KateScrollBar::charColor(const QVector<int> \
&attributes, int &attri +   // Query the decorations, that is, things like search \
highlighting, or the +   // KDevelop DUChain highlighting, for a color to use
+   foreach (const QTextLayout::FormatRange& range, decorations) {
+-    if (range.start <= x and range.start + range.length > x) {
++    if (range.start <= x && range.start + range.length > x) {
+       // If there's a different background color set (search markers, ...)
+       // use that, otherwise use the foreground color.
+       if ( range.format.hasProperty(QTextFormat::BackgroundBrush) ) {


[prev in list] [next in list] [prev in thread] [next in thread]