From 5e1fc021597aa4307d16c92d8da4f0bfc30b46e6 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kkofler@fedoraproject.org>
Date: Mon, 15 Dec 2008 06:35:14 +0000
Subject: [PATCH] Sync from devel: Mon Dec 15 2008 Kevin Kofler
 <Kevin@tigcc.ticalc.org> 3.5.10-3 - update the KatePart latex.xml syntax
 definition to the version from Kile     2.0.3 Thu Dec 04 2008 Rex Dieter
 <rdieter@fedoraproject.org> 3.5.10-2 - omit libkscreensaver (F9+)

---
 kdelibs-3.5.10-latex-syntax-kile-2.0.3.patch | 143 +++++++++++++++++++
 kdelibs3.spec                                |  17 ++-
 2 files changed, 158 insertions(+), 2 deletions(-)
 create mode 100644 kdelibs-3.5.10-latex-syntax-kile-2.0.3.patch

diff --git a/kdelibs-3.5.10-latex-syntax-kile-2.0.3.patch b/kdelibs-3.5.10-latex-syntax-kile-2.0.3.patch
new file mode 100644
index 0000000..450dd1f
--- /dev/null
+++ b/kdelibs-3.5.10-latex-syntax-kile-2.0.3.patch
@@ -0,0 +1,143 @@
+diff -ur kdelibs-3.5.10/kate/data/latex.xml kdelibs-3.5.10-latex-syntax-kile-2.0.3/kate/data/latex.xml
+--- kdelibs-3.5.10/kate/data/latex.xml	2007-05-14 09:52:27.000000000 +0200
++++ kdelibs-3.5.10-latex-syntax-kile-2.0.3/kate/data/latex.xml	2008-12-05 14:08:28.000000000 +0100
+@@ -1,16 +1,18 @@
+ <?xml version="1.01" encoding="UTF-8"?>
+ <!DOCTYPE language SYSTEM "language.dtd">
+-<language name="LaTeX" version="1.25" section="Markup" kateversion="2.3" extensions="*.tex; *.ltx; *.dtx; *.sty; *.cls;" mimetype="text/x-tex" casesensitive="1" author="Jeroen Wijnhout (Jeroen.Wijnhout@kdemail.net)+Holger Danielsson (holger.danielsson@versanet.de)+Michel Ludwig (michel.ludwig@kdemail.net)" license="LGPL" >
++<language name="LaTeX" version="1.29" section="Markup" kateversion="2.3" extensions="*.tex; *.ltx; *.dtx; *.sty; *.cls;" mimetype="text/x-tex" casesensitive="1" author="Jeroen Wijnhout (Jeroen.Wijnhout@kdemail.net)+Holger Danielsson (holger.danielsson@versanet.de)+Michel Ludwig (michel.ludwig@kdemail.net)+Thomas Braun (braun@physik.fu-berlin.de)" license="LGPL" >
+   <highlighting>
+     <contexts>
+       <!-- Normal text -->
+       <context name="Normal Text" attribute="Normal Text" lineEndContext="#stay">
+         <RegExpr String="\\begin(?=[^a-zA-Z])" attribute="Structure" context="FindEnvironment" beginRegion="block" />
+         <RegExpr String="\\end(?=[^a-zA-Z])" attribute="Structure" context="FindEnvironment" endRegion="block" />
+-        <RegExpr String="\\(label|pageref|ref|vpageref|vref|cite)(?=[^a-zA-Z])" attribute="Structure" context="Label"/>
++        <RegExpr String="\\(label|pageref|autoref|ref|vpageref|vref|cite)(?=[^a-zA-Z])" attribute="Structure" context="Label"/>
+         <RegExpr String="\\(part|chapter|section|subsection|subsubsection|paragraph|subparagraph)\*?\s*(?=[\{\[])" attribute="Structure" context="Sectioning"/>
++        <RegExpr String="\\(footnote)\*?\s*(?=[\{\[])" attribute="Footnote" context="Footnoting"/>
+         <RegExpr String="\\(re)?newcommand(?=[^a-zA-Z])" attribute="Keyword" context="NewCommand"/>
+         <RegExpr String="\\(e|g|x)?def(?=[^a-zA-Z])" attribute="Keyword" context="DefCommand"/>
++	<RegExpr String="&lt;&lt;.*&gt;&gt;=" attribute="Normal Text" context="NoWeb" />
+         <StringDetect String="\(" attribute="Math" context="MathMode" beginRegion="mathMode" />
+         <StringDetect String="\[" attribute="Math" context="MathModeEquation" beginRegion="mathMode" />
+         <DetectChar char="\" attribute="Keyword" context="ContrSeq"/>
+@@ -22,6 +24,11 @@
+         <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
+       </context>
+ 
++	<!-- NoWeb -->
++      <context name="NoWeb" attribute="Normal Text" lineEndContext="#stay" >
++	<RegExpr String="^\s*@\s*" attribute="Normal Text" context="#pop" />
++      </context>
++
+       <!-- LaTeX sectioning commands -->
+       <context name="Sectioning" attribute="Normal Text" lineEndContext="#stay" fallthrough="true" fallthroughContext="#pop">
+         <RegExpr String="\[[^\]]*\]" attribute="Normal Text" context="#stay"/>
+@@ -59,9 +66,46 @@
+         <RegExpr String="[^a-zA-Z]" attribute="Structure Keyword Mathmode" context="#pop" /> 
+       </context>
+ 
++      <!-- LaTeX Footnote commands -->
++      <context name="Footnoting" attribute="Normal Text" lineEndContext="#stay" fallthrough="true" fallthroughContext="#pop">
++        <RegExpr String="\[[^\]]*\]" attribute="Normal Text" context="#stay"/>
++        <DetectChar char=" " attribute="Normal Text" context="#stay"/>
++        <DetectChar char="{" attribute="Normal Text" context="FootnotingInside"/>
++        <DetectChar char="}" attribute="Normal Text" context="#pop"/>
++        <DetectChar char="%" attribute="Comment" context="Comment"/>
++      </context>
++      <context name="FootnotingInside" attribute="Footnote Text" lineEndContext="#stay">
++        <DetectChar char="{" attribute="Normal Text" context="FootnotingInside"/>
++        <DetectChar char="}" attribute="Normal Text" context="#pop"/>
++        <StringDetect String="\(" attribute="Footnote Math" context="FootnotingMathMode" beginRegion="mathMode" />
++        <DetectChar char="\" attribute="Footnote Keyword" context="FootnotingContrSeq"/>
++        <DetectChar char="$" attribute="Footnote Math" context="FootnotingMathMode" beginRegion="mathMode" />
++        <DetectChar char="%" attribute="Comment" context="Comment"/>
++        <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
++      </context>
++      <context name="FootnotingContrSeq" attribute="Keyword" lineEndContext="#pop">
++         <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
++        <RegExpr String="[a-zA-Z]+(\+?|\*{0,3})" attribute="Footnote Keyword" context="#pop"/>
++        <RegExpr String="[^a-zA-Z]" attribute="Footnote Keyword" context="#pop" />
++      </context>
++      <context name="FootnotingMathMode" attribute="Footnote Math" lineEndContext="#stay">
++        <StringDetect String="$$" attribute="Error" context="#stay" />
++        <DetectChar char="$" attribute="Footnote Math" context="#pop" endRegion="mathMode" />
++        <Detect2Chars char="\" char1=")" attribute="Footnote Math" context="#pop" endRegion="mathMode" />
++        <Detect2Chars char="\" char1="]" attribute="Error" context="#stay" />
++        <DetectChar char="\" attribute="Footnote Keyword Mathmode" context="FootnotingMathContrSeq"/>
++        <DetectChar char="%" attribute="Comment" context="Comment"/>
++        <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
++      </context>
++      <context name="FootnotingMathContrSeq" attribute="Footnote Keyword Mathmode" lineEndContext="#pop">
++        <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
++        <RegExpr String="[a-zA-Z]+\*?" attribute="Footnote Keyword Mathmode" context="#pop"/>
++        <RegExpr String="[^a-zA-Z]" attribute="Footnote Keyword Mathmode" context="#pop" /> 
++      </context>
++
+       <!-- LaTeX commands \newcommand and \renewcommand -->
+       <context name="NewCommand" attribute="Normal Text" lineEndContext="#stay" fallthrough="true" fallthroughContext="#pop">
+-        <RegExpr String="\s*\{\s*\\[a-zA-Z]+\s*\}(\[\d\](\[[^\]]+\])?)?\{" attribute="Normal Text" context="CommandParameterStart"/>
++        <RegExpr String="\s*\{\s*\\[a-zA-Z]+\s*\}(\[\d\](\[[^\]]*\])?)?\{" attribute="Normal Text" context="CommandParameterStart"/>
+         <DetectChar char="}" attribute="Error" context="#pop"/>
+       </context>
+ 
+@@ -137,8 +181,9 @@
+       <context name="Environment" attribute="Environment" lineEndContext="#stay">
+         <RegExpr String="(lstlisting|(B|L)?Verbatim)" attribute="Environment" context="VerbatimEnvParam"/>
+         <RegExpr String="(verbatim|boxedverbatim)" attribute="Environment" context="VerbatimEnv"/>
+-        <RegExpr String="(equation|displaymath|eqnarray|subeqnarray|math|multline|gather|align|flalign)" attribute="Environment" context="MathEnv"/>
+         <RegExpr String="(alignat|xalignat|xxalignat)" attribute="Environment" context="MathEnvParam"/>
++        <RegExpr String="(equation|displaymath|eqnarray|subeqnarray|math|multline|gather|align|flalign)" attribute="Environment" context="MathEnv"/>
++        <RegExpr String="(tabular|supertabular|mpsupertabular|xtabular|mpxtabular|longtable)" attribute="Environment" context="TabEnv"/>
+         <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
+         <RegExpr String="[a-zA-Z]" attribute="Environment" context="LatexEnv"/>
+         <RegExpr String="\s+" attribute="Error" context="#pop"/>
+@@ -228,6 +273,28 @@
+         <DetectChar char="}" attribute="Normal Text" context="#pop#pop#pop#pop#pop"  endRegion="block"/>
+       </context>
+ 
++          <!-- environment type 9: tabular -->
++      <context name="TabEnv" attribute="Environment" lineEndContext="#stay" fallthrough="true" fallthroughContext="#pop#pop#pop">
++        <DetectChar char="}" attribute="Normal Text" context="Tab"/>
++        <RegExpr String="[a-zA-Z]" attribute="Environment" lookAhead="true" context="#pop"/>
++        <IncludeRules context="EnvCommon" />
++       </context>
++
++      <!-- parse tabular text -->
++      <context name="Tab" attribute="Tab" lineEndContext="#stay">
++	<DetectChar char="&amp;" attribute="Ampersand" context="#stay"/>
++	<RegExpr String="@\{.*\}" minimal="true" attribute="Column Separator" context="#stay"/>
++        <RegExpr String="\\end(?=\s*\{(tabular|supertabular|mpsupertabular|xtabular|mpxtabular|longtable)\*?\})" attribute="Structure"  context="TabFindEnd"/>
++	<IncludeRules context="Normal Text" />
++      </context>
++
++      <!-- end of tabular environment -->
++      <context name="TabFindEnd" attribute="Normal Text" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
++        <RegExpr String="\s*\{" attribute="Normal Text" context="#stay"/>
++        <RegExpr String="(tabular|supertabular|mpsupertabular|xtabular|mpxtabular|longtable)\*?" attribute="Environment" context="#stay"/>
++        <DetectChar char="}" attribute="Normal Text" context="#pop#pop#pop#pop#pop" endRegion="block"/>
++      </context>
++
+       <!-- math mode: starting with $ or \( -->
+       <context name="MathMode" attribute="Math" lineEndContext="#stay">
+         <StringDetect String="$$" attribute="Error" context="#stay" />
+@@ -315,11 +382,18 @@
+       <itemData name="Verbatim" defStyleNum="dsNormal" color="#a08000" selColor="#80D0FF" bold="0" italic="0"/>
+       <itemData name="Region Marker" defStyleNum="dsRegionMarker" />
+       <itemData name="Bullet" defStyleNum="dsNormal" color="#FF00C4" bold="1" underline="1"/>
++      <itemData name="Ampersand" defStyleNum="dsNormal" color="#002793" bold="1" />
++      <itemData name="Column Separator" defStyleNum="dsNormal" color="#002793" />
+       <itemData name="Alert" defStyleNum="dsAlert" />
+       <itemData name="Structure Text" defStyleNum="dsNormal" color="#000000" selColor="#FFFFFF" bold="1" italic="0"/>
+       <itemData name="Structure Keyword" defStyleNum="dsNormal" color="#800000" selColor="#60FFFF" bold="1" italic="0"/>
+       <itemData name="Structure Math" defStyleNum="dsNormal" color="#00A000" selColor="#FF40FF"  bold="1" italic="0"/>
+       <itemData name="Structure Keyword Mathmode" defStyleNum="dsNormal" color="#606000" selColor="#FFD0FF" bold="1" italic="0"/>
++      <itemData name="Footnote" defStyleNum="dsNormal" color="#800000" selColor="#60FFFF" bold="0" italic="0"/>
++      <itemData name="Footnote Text" defStyleNum="dsNormal" color="#000000" selColor="#FFFFFF" bold="0" italic="0"/>
++      <itemData name="Footnote Keyword" defStyleNum="dsNormal" color="#800000" selColor="#60FFFF" bold="0" italic="0"/>
++      <itemData name="Footnote Math" defStyleNum="dsNormal" color="#00A000" selColor="#FF40FF"  bold="0" italic="0"/>
++      <itemData name="Footnote Keyword Mathmode" defStyleNum="dsNormal" color="#606000" selColor="#FFD0FF" bold="0" italic="0"/>
+      </itemDatas>
+   </highlighting>
+ 
diff --git a/kdelibs3.spec b/kdelibs3.spec
index bc83dfc..5738be7 100644
--- a/kdelibs3.spec
+++ b/kdelibs3.spec
@@ -7,7 +7,7 @@
 %define kde_settings 1 
 
 %define arts 1
-%define arts_ev 8:1.5.9
+%define arts_ev 8:1.5.10
 
 %if 0%{?fedora} > 8
 %define qt3 qt3
@@ -36,7 +36,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.10
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -88,6 +88,8 @@ Patch52: kdelibs-3.5.9-KDE3.patch
 Patch53: kdelibs-3.5.9-drkonqi-kde4.patch
 # fix build against Rawhide kernel headers (fix flock and flock64 redefinition)
 Patch54: kdelibs-3.5.9-fix-flock-redefinition.patch
+# update the KatePart latex.xml syntax definition to the version from Kile 2.0.3
+Patch55: kdelibs-3.5.10-latex-syntax-kile-2.0.3-patch
 
 # use /etc/kde in addition to /usr/share/config, borrowed from debian
 Patch100: kdelibs-3.5.5-kstandarddirs.patch
@@ -268,6 +270,7 @@ format for easy browsing
 %patch53 -p1 -b .drkonqi-kde4
 %endif
 %patch54 -p1 -b .flock-redefinition
+%patch55 -p1 -b .latex-syntax
 
 %patch100 -p1 -b .kstandarddirs
 %patch101 -p1 -b .libtool-shlibext
@@ -292,6 +295,10 @@ elif ! echo ${PATH} | grep -q /usr/kerberos/bin ; then
   export PATH=/usr/kerberos/bin:${PATH}
 fi
 
+%if "%{name}" != "kdelibs"
+export DO_NOT_COMPILE="libkscreensaver"
+%endif
+
 %configure \
    --includedir=%{_includedir}/kde \
    --disable-rpath \
@@ -625,6 +632,12 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 
 
 %changelog
+* Mon Dec 15 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.10-3
+- update the KatePart latex.xml syntax definition to the version from Kile 2.0.3
+
+* Thu Dec 04 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.10-2
+- omit libkscreensaver (F9+)
+
 * Tue Aug 26 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.10-1
 - kde-3.5.10