From 8dbe7ac9863855d67b24e32922d04596dfa36068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
Date: Mon, 14 Mar 2016 22:36:02 +0100
Subject: [PATCH] Add upstream patch to fix build

---
 ...evert-add-syntax-highlight-for-gcode.patch | 230 ++++++++++++++++++
 kf5-ktexteditor.spec                          |   3 +
 2 files changed, 233 insertions(+)
 create mode 100644 0001-revert-add-syntax-highlight-for-gcode.patch

diff --git a/0001-revert-add-syntax-highlight-for-gcode.patch b/0001-revert-add-syntax-highlight-for-gcode.patch
new file mode 100644
index 0000000..f0d03f2
--- /dev/null
+++ b/0001-revert-add-syntax-highlight-for-gcode.patch
@@ -0,0 +1,230 @@
+From: Sven Brauch <mail@svenbrauch.de>
+Date: Sat, 05 Mar 2016 00:04:39 +0000
+Subject: Revert "Add syntax highlighting for gcode"
+X-Git-Tag: v5.20.0
+X-Git-Url: http://quickgit.kde.org/?p=ktexteditor.git&a=commitdiff&h=c805f75f893300c7bd0e52159bd4aaedd0e8d37a
+---
+Revert "Add syntax highlighting for gcode"
+
+This reverts commit c65cdf81660eca01ab3d0792944a2e96a365bbca.
+Reverted because it breaks the 2-week string freeze, sorry.
+Will resubmit this after 5.8.
+---
+
+
+--- a/src/syntax/data/gcode.xml
++++ /dev/null
+@@ -1,212 +1,1 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!DOCTYPE language SYSTEM "language.dtd">
+-<!--
+ 
+-  G-code syntax highlighting for KatePart
+-
+-  Copy this file to :  ~/.kde/share/apps/katepart/syntax/
+-
+-  Copyright © 2016 by Fernand Veilleux (fernveilleux@gmail.com)
+-  All rights reserved.
+-
+-  This library is free software; you can redistribute it and/or
+-	modify it under the terms of the GNU Library General Public
+-	License as published by the Free Software Foundation; either
+-	version 2 of the License, or (at your option) any later version.
+-	
+-	This library is distributed in the hope that it will be useful,
+-	but WITHOUT ANY WARRANTY; without even the implied warranty of
+-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-	Library General Public License for more details.
+-	
+-	You should have received a copy of the GNU Library General Public
+-	License along with this library; if not, write to the
+-	Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+-	Boston, MA  02110-1301, USA.
+-
+--->
+-<language name="G-Code"
+-	version="1.00"
+-	kateversion="3.8"
+-	section="Other"
+-	extensions="*.ngc"
+-	mimetype="text/ngc"
+-	author="Fernand Veilleux (fernveilleux@gmail.com)"
+-	license="LGPL">
+-
+-  <highlighting>
+-    <list name="operators">
+-      <item>and</item>
+-      <item>or</item>
+-      <item>xor</item>
+-      <item>eq</item>
+-      <item>ne</item>
+-      <item>gt</item>
+-      <item>ge</item>
+-      <item>lt</item>
+-      <item>le</item>
+-      <item>mod</item>
+-    </list>
+-		
+-    <list name="functions">
+-      <item>atan</item>
+-      <item>abs</item>
+-      <item>acos</item>
+-      <item>asin</item>
+-      <item>cos</item>
+-      <item>exp</item>
+-      <item>exists</item>
+-      <item>fix</item>
+-      <item>fup</item>
+-      <item>ln</item>
+-      <item>round</item>
+-      <item>sin</item>
+-      <item>sqrt</item>
+-      <item>tan</item>
+-    </list>
+-
+-    <list name="o_sub">
+-      <item>sub</item>
+-      <item>endsub</item>
+-      <item>call</item>
+-      <item>return</item>
+-    </list>
+-
+-    <list name="keyword">
+-      <item>do</item>
+-      <item>while</item>
+-      <item>endwhile</item>
+-      <item>repeat</item>
+-      <item>endrepeat</item>
+-      <item>break</item>
+-      <item>continue</item>
+-      <item>if</item>
+-      <item>elseif</item>
+-      <item>else</item>
+-      <item>endif</item>
+-    </list>
+-
+-    <contexts>
+-      <context name="Alert" attribute="Alert" lineEndContext="#pop">
+-        <DetectSpaces attribute="Normal Text"/>
+-        <DetectChar char="[" attribute="Brackets"/>
+-        <DetectChar char="]" attribute="Brackets"/>
+-        <DetectChar char="(" lookAhead="1" context="parenthese"/>
+-        <DetectChar char="#" lookAhead="1" context="hash1"/>
+-        <RegExpr String="[+\-*/=]" attribute="Operator"/>
+-        <RegExpr String=";.*$" attribute="Comment"/>
+-        <RegExpr String="[.]?[\d]+[.]?" attribute="Number"/>
+-        <keyword String="functions" attribute="Function"/>
+-        <keyword String="operators" attribute="Operator"/>
+-        <keyword String="o_sub" attribute="Sub-program"/>
+-        <keyword String="keyword" attribute="Keyword"/>
+-        <RegExpr String="[oO]" lookAhead="1" context="oword"/>
+-        <RegExpr String="[abcu-z][\s\t]*[\-\d#\[.]" insensitive="1" lookAhead="1" context="coords"/>
+-        <RegExpr String="[abcu-z].*$" insensitive="1" attribute="Alert"/>
+-        <RegExpr String="[deh-lpqr][\s\t]*[\-\d#\[.]" insensitive="1" lookAhead="1" context="opts"/>
+-        <RegExpr String="[deh-lpqr].*$" insensitive="1" attribute="Alert"/>
+-        <RegExpr String="[gG][\s\t]*[\d]+[\s\t]*[.]?[\s\t]*[\d]*" attribute="G-word"/>
+-        <RegExpr String="[gG][\s\t]*[\[#]" lookAhead="1" context="gword"/>
+-        <RegExpr String="[gG].*$" attribute="Alert"/>
+-        <RegExpr String="[tsTS][\s\t]*[\d#\[]" lookAhead="1" context="tools"/>
+-        <RegExpr String="[tsTS].*$" attribute="Alert"/>       
+-        <RegExpr String="[fF][\s\t]*[\d#\[.]" lookAhead="1" context="feed"/>
+-        <RegExpr String="[fF].*$" attribute="Alert"/>
+-        <RegExpr String="[mM][\s\t]*[\d#\[]" lookAhead="1" context="mword"/>
+-        <RegExpr String="[mM].*$" attribute="Alert"/>
+-        <RegExpr String="^[\s\t]*[nN][\s\t]*[\d]{1,5}" attribute="Line Number"/>
+-        <RegExpr String="." lookAhead="1" context="alert"/>
+-      </context>
+-
+-      <context name="mword" attribute="Alert" lineEndContext="#pop">
+-        <RegExpr String="[mM][\s\t]*[1][\d]{2}" attribute="M-word (user)" context="#pop"/>
+-        <RegExpr String="[mM]" attribute="M-word" context="#pop"/>
+-      </context>
+-
+-      <context name="feed" attribute="Alert" lineEndContext="#pop">
+-        <RegExpr String="[fF]" attribute="Tool" context="#pop"/>
+-      </context>
+-      
+-      <context name="tools" attribute="Alert" lineEndContext="#pop">
+-        <RegExpr String="[tsTS]" attribute="Tool" context="#pop"/>
+-      </context>
+-      
+-      <context name="gword" attribute="Alert" lineEndContext="#pop">
+-        <RegExpr String="[gG]" attribute="G-word" context="#pop"/>
+-      </context>
+-      
+-      <context name="coords" attribute="Alert" lineEndContext="#pop">
+-        <RegExpr String="[abcu-z]" insensitive="1" attribute="Coordinate" context="#pop"/>
+-      </context>
+-      
+-      <context name="opts" attribute="Alert" lineEndContext="#pop">
+-        <RegExpr String="[deh-lpqr]" insensitive="1" attribute="G-options" context="#pop"/>
+-      </context>
+-
+-      <context name="parenthese" attribute="Alert" lineEndContext="#pop">
+-        <RegExpr String="\([\s\t]*(PRINT|DEBUG|MSG|AXIS|(PROBE(CLOSE|OPEN))|(LOG(OPEN|CLOSE|APPEND|[\s]|[\,]))).*\)"
+-          insensitive="1" attribute="Message" context="#pop"/>
+-        <RegExpr String="\(.*\)" attribute="Comment" context="#pop"/>
+-        <RegExpr String="." lookAhead="1" context="alert"/>
+-      </context>
+-
+-      <context name="oword" attribute="Alert" lineEndContext="#pop">
+-        <RegExpr String="[oO][\s\t]*&lt;[\s\t]*&gt;" attribute="Alert" context="alert"/>
+-        <RegExpr String="[oO][\s\t]*([\d]+|&lt;[\w_\-\s\t]+&gt;)" attribute="O-word" context="#pop"/>
+-        <RegExpr String="." lookAhead="1" context="alert"/>
+-      </context>
+-
+-      <context name="hash1" attribute="Alert" lineEndContext="#pop">
+-        <RegExpr String="(#[\s\t]*&lt;[\s\t]*[_]*[\s\t]*&gt;)" attribute="Alert" context="alert"/>
+-        <RegExpr String="(#[\s\t]*[\d]{1,4})|(#[\s\t]*&lt;[\s\t]*[_][\s\t]*[:\w_\-\s]*&gt;)"
+-          attribute="Param (global)" context="#pop"/>
+-        <RegExpr String="#[\s\t]*&lt;[\s\t]*[^_][\s\t]*[:\w_\-\s]*&gt;"
+-          attribute="Param (local)" context="#pop"/>
+-        <RegExpr String="#[\s\t]*#" attribute="Param (local)" context="#pop"/>
+-        <RegExpr String="#[\s\t]*\[" lookAhead="1" context="hash2"/>
+-        <RegExpr String="." lookAhead="1" context="alert"/>
+-      </context>
+-
+-      <context name="hash2" attribute= "Alert" lineEndContext="#pop">        
+-        <RegExpr String="#" attribute="Param (global)" context="#pop#pop"/>
+-      </context>
+-
+-      <context name="alert" attribute="Alert" lineEndContext="#pop">
+-        <RegExpr String=".*$" attribute="Alert" context="#pop#pop"/>
+-      </context>
+-      
+-    </contexts>
+-    
+-    <itemDatas>
+-      <itemData name="Normal Text" defStyleNum="dsNormal"/>
+-      <itemData name="Brackets" defStyleNum="dsNormal"/>
+-      <itemData name="Comment" defStyleNum="dsComment"/>
+-      <itemData name="Coordinate" defStyleNum="dsNormal" color="#A57800" bold="1" italic="0"/>
+-      <itemData name="Function" defStyleNum="dsFunction" color="#800080" bold="1" italic="1"/>
+-      <itemData name="G-options" defStyleNum="dsNormal" color="#800080"  bold="1" italic="0"/>
+-      <itemData name="G-word" defStyleNum="dsNormal" selColor="#FFFFFF"  bold="1" italic="0"/>
+-      <itemData name="Keyword" defStyleNum="dsNormal" bold="1" italic="1"/>
+-      <itemData name="Line Number" defStyleNum="dsComment"/>
+-      <itemData name="Message" defStyleNum="dsNormal" italic="1" />
+-      <itemData name="M-word" defStyleNum="dsNormal" color="#A07400" bold="0" italic="0" />
+-      <itemData name="M-word (user)" defStyleNum="dsNormal" color="#A07400" bold="1" italic="1"/>
+-      <itemData name="Number" defStyleNum="dsDecVal" color="#A64C00" bold="1" italic="0"/>
+-      <itemData name="Operator" defStyleNum="dsOperator" color="#000080" bold="1" italic="0"/>
+-      <itemData name="O-word" defStyleNum="dsControlFlow" color="#BB7B40" bold="0" italic="0"/>
+-      <itemData name="Param (global)" defStyleNum="dsVariable" color="#149E05" bold="0" italic="0"/>
+-      <itemData name="Param (local)" defStyleNum="dsVariable" color="#0950AB" bold="0" italic="0"/>
+-      <itemData name="Sub-program" defStyleNum="dsKeyword" color="#700070" bold="0" italic="0"/>
+-      <itemData name="Tool" defStyleNum="dsNormal" color="#0000D6" bold="1" italic="0"/>
+-      <itemData name="Alert" defStyleNum="dsError"/>
+-    </itemDatas>
+-  </highlighting>
+-  
+-  <general>
+-    <folding indentationsensitive="1"/>
+-    <comments>
+-      <comment name="multiLine" start="(" end=")"/>
+-    </comments>
+-    <keywords casesensitive="0"/>
+-  </general>
+-</language>
+-
+
diff --git a/kf5-ktexteditor.spec b/kf5-ktexteditor.spec
index b4da959..6dd530d 100644
--- a/kf5-ktexteditor.spec
+++ b/kf5-ktexteditor.spec
@@ -17,6 +17,9 @@ URL:            https://projects.kde.org/ktexteditor
 %endif
 Source0:        http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz
 
+# Upstream patches
+Patch10:        0001-revert-add-syntax-highlight-for-gcode.patch
+
 BuildRequires:  extra-cmake-modules >= %{version}
 BuildRequires:  kf5-karchive-devel >= %{version}
 BuildRequires:  kf5-kconfig-devel >= %{version}