Compare commits
13 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
8ac31914ad | ||
|
a244889bd2 | ||
|
09b773362c | ||
|
5e1fc02159 | ||
|
77a2cf577e | ||
|
f2029eba95 | ||
|
e8a0969265 | ||
|
dfc42d09e8 | ||
|
79f9695775 | ||
|
a897be9d0e | ||
|
c78fd12ad1 | ||
|
041ce6693c | ||
|
2af744fd76 |
@ -1 +0,0 @@
|
||||
kdelibs-3.5.9.tar.bz2
|
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
kdelibs-3.5.10.tar.bz2
|
21
Makefile
21
Makefile
@ -1,21 +0,0 @@
|
||||
# Makefile for source rpm: kdelibs3
|
||||
# $Id$
|
||||
NAME := kdelibs3
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attept a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
143
kdelibs-3.5.10-latex-syntax-kile-2.0.3.patch
Normal file
143
kdelibs-3.5.10-latex-syntax-kile-2.0.3.patch
Normal file
@ -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="<<.*>>=" 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="×" 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="×" attribute="Bullet" context="#stay"/>
|
||||
+ </context>
|
||||
+ <context name="FootnotingContrSeq" attribute="Keyword" lineEndContext="#pop">
|
||||
+ <DetectChar char="×" 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="×" attribute="Bullet" context="#stay"/>
|
||||
+ </context>
|
||||
+ <context name="FootnotingMathContrSeq" attribute="Footnote Keyword Mathmode" lineEndContext="#pop">
|
||||
+ <DetectChar char="×" 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="×" 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="&" 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>
|
||||
|
@ -1,133 +0,0 @@
|
||||
Index: kioslave/metainfo/Makefile.am
|
||||
===================================================================
|
||||
--- kioslave/metainfo/Makefile.am (Revision 606834)
|
||||
+++ kioslave/metainfo/Makefile.am (Arbeitskopie)
|
||||
@@ -2,7 +2,7 @@
|
||||
## Makefile.am of kdebase/kioslave/metainfo
|
||||
|
||||
INCLUDES = $(all_includes)
|
||||
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
|
||||
+AM_LDFLAGS = $(KDE_RPATH) $(all_libraries)
|
||||
METASOURCES = AUTO
|
||||
|
||||
kde_module_LTLIBRARIES = kio_metainfo.la
|
||||
Index: kioslave/gzip/Makefile.am
|
||||
===================================================================
|
||||
--- kioslave/gzip/Makefile.am (Revision 606834)
|
||||
+++ kioslave/gzip/Makefile.am (Arbeitskopie)
|
||||
@@ -1,5 +1,5 @@
|
||||
INCLUDES = -I$(top_srcdir)/kio $(all_includes)
|
||||
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
|
||||
+AM_LDFLAGS = $(KDE_RPATH) $(all_libraries)
|
||||
METASOURCES = AUTO
|
||||
|
||||
kde_module_LTLIBRARIES = kgzipfilter.la
|
||||
Index: kio/tests/Makefile.am
|
||||
===================================================================
|
||||
--- kio/tests/Makefile.am (Revision 606834)
|
||||
+++ kio/tests/Makefile.am (Arbeitskopie)
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio $(all_includes)
|
||||
LDADD = $(LIB_KIO)
|
||||
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
|
||||
+AM_LDFLAGS = $(KDE_RPATH) $(all_libraries)
|
||||
|
||||
check_PROGRAMS = ksycocatest getalltest kruntest ktartest kziptest\
|
||||
kioslavetest kdirwatchtest kshredtest speed kurifiltertest \
|
||||
Index: dcop/tests/Makefile.am
|
||||
===================================================================
|
||||
--- dcop/tests/Makefile.am (Revision 606834)
|
||||
+++ dcop/tests/Makefile.am (Arbeitskopie)
|
||||
@@ -3,7 +3,6 @@
|
||||
@echo -e "dcop tests not run.\nRun make tests in the tests directory to make them"
|
||||
|
||||
INCLUDES = $(all_includes)
|
||||
-AM_LDFLAGS = $(all_libraries)
|
||||
|
||||
METASOURCES = AUTO
|
||||
|
||||
@@ -17,7 +16,7 @@
|
||||
|
||||
driver_SOURCES = driver.cpp test.stub
|
||||
driver_LDADD = $(LIB_KDECORE)
|
||||
-driver_LDFLAGS = $(KDE_RPATH)
|
||||
+driver_LDFLAGS = $(KDE_RPATH) $(all_libraries)
|
||||
|
||||
CLEANFILES = batch.generated definitions.generated driver.generated shell.generated
|
||||
|
||||
Index: dcop/dcopidl2cpp/Makefile.am
|
||||
===================================================================
|
||||
--- dcop/dcopidl2cpp/Makefile.am (Revision 606834)
|
||||
+++ dcop/dcopidl2cpp/Makefile.am (Arbeitskopie)
|
||||
@@ -1,6 +1,5 @@
|
||||
|
||||
INCLUDES = $(all_includes)
|
||||
-AM_LDFLAGS = $(all_libraries)
|
||||
|
||||
####### Files
|
||||
|
||||
@@ -10,7 +9,7 @@
|
||||
noinst_HEADERS = main.h
|
||||
|
||||
dcopidl2cpp_LDADD = $(LIB_QT)
|
||||
-dcopidl2cpp_LDFLAGS = $(KDE_RPATH)
|
||||
+dcopidl2cpp_LDFLAGS = $(all_libraries) $(KDE_RPATH)
|
||||
|
||||
dcopidl_output.kidl: ../dcopidl/dcopidl $(srcdir)/dcopidl_test.h
|
||||
../dcopidl/dcopidl $(srcdir)/dcopidl_test.h > dcopidl_output.kidl
|
||||
Index: dcop/client/Makefile.am
|
||||
===================================================================
|
||||
--- dcop/client/Makefile.am (Revision 606834)
|
||||
+++ dcop/client/Makefile.am (Arbeitskopie)
|
||||
@@ -1,6 +1,5 @@
|
||||
|
||||
INCLUDES = $(all_includes)
|
||||
-AM_LDFLAGS = $(all_libraries)
|
||||
DCOP_LIB = ../libDCOP.la
|
||||
|
||||
####### Files
|
||||
@@ -9,19 +8,19 @@
|
||||
|
||||
dcop_SOURCES = dcop.cpp
|
||||
dcop_LDADD = $(LIB_QT) $(DCOP_LIB)
|
||||
-dcop_LDFLAGS = $(KDE_RPATH)
|
||||
+dcop_LDFLAGS = $(KDE_RPATH) $(all_libraries)
|
||||
|
||||
dcopstart_SOURCES = dcopstart.cpp
|
||||
dcopstart_LDADD = $(LIB_QT) $(DCOP_LIB)
|
||||
-dcopstart_LDFLAGS = $(KDE_RPATH)
|
||||
+dcopstart_LDFLAGS = $(KDE_RPATH) $(all_libraries)
|
||||
|
||||
dcopquit_SOURCES = dcopquit.cpp
|
||||
dcopquit_LDADD = $(LIB_QT) $(DCOP_LIB)
|
||||
-dcopquit_LDFLAGS = $(KDE_RPATH)
|
||||
+dcopquit_LDFLAGS = $(KDE_RPATH) $(all_libraries)
|
||||
|
||||
dcopfind_SOURCES = dcopfind.cpp
|
||||
dcopfind_LDADD = $(LIB_QT) $(DCOP_LIB)
|
||||
-dcopfind_LDFLAGS = $(KDE_RPATH)
|
||||
+dcopfind_LDFLAGS = $(KDE_RPATH) $(all_libraries)
|
||||
|
||||
dcopclient_SOURCES = dcopclient.c
|
||||
dcopobject_SOURCES = dcopobject.c
|
||||
Index: dcop/dcopidl/Makefile.am
|
||||
===================================================================
|
||||
--- dcop/dcopidl/Makefile.am (Revision 606834)
|
||||
+++ dcop/dcopidl/Makefile.am (Arbeitskopie)
|
||||
@@ -1,6 +1,5 @@
|
||||
|
||||
INCLUDES = $(all_includes)
|
||||
-AM_LDFLAGS = $(all_libraries)
|
||||
AM_CPPFLAGS = -DYYDEBUG
|
||||
|
||||
####### Files
|
||||
@@ -11,7 +10,7 @@
|
||||
noinst_HEADERS = yacc.cc.h
|
||||
|
||||
dcopidl_LDADD = $(LIB_QT)
|
||||
-dcopidl_LDFLAGS = $(KDE_RPATH)
|
||||
+dcopidl_LDFLAGS = $(KDE_RPATH) $(all_libraries)
|
||||
|
||||
####### Build rules
|
||||
|
41
kdelibs-3.5.9-KDE3.patch
Normal file
41
kdelibs-3.5.9-KDE3.patch
Normal file
@ -0,0 +1,41 @@
|
||||
diff -up kdelibs-3.5.9/kio/kio/kservice.cpp.KDE3 kdelibs-3.5.9/kio/kio/kservice.cpp
|
||||
--- kdelibs-3.5.9/kio/kio/kservice.cpp.KDE3 2008-02-13 03:41:06.000000000 -0600
|
||||
+++ kdelibs-3.5.9/kio/kio/kservice.cpp 2008-05-15 15:36:13.000000000 -0500
|
||||
@@ -701,7 +701,7 @@ bool KService::noDisplay() const {
|
||||
{
|
||||
QString aValue = it.data().toString();
|
||||
QStringList aList = QStringList::split(';', aValue);
|
||||
- if (!aList.contains("KDE"))
|
||||
+ if (!(aList.contains("KDE") || aList.contains("KDE3")) )
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -710,7 +710,7 @@ bool KService::noDisplay() const {
|
||||
{
|
||||
QString aValue = it.data().toString();
|
||||
QStringList aList = QStringList::split(';', aValue);
|
||||
- if (aList.contains("KDE"))
|
||||
+ if (aList.contains("KDE") || aList.contains("KDE3"))
|
||||
return true;
|
||||
}
|
||||
|
||||
diff -up kdelibs-3.5.9/kio/kio/kservicegroup.cpp.KDE3 kdelibs-3.5.9/kio/kio/kservicegroup.cpp
|
||||
--- kdelibs-3.5.9/kio/kio/kservicegroup.cpp.KDE3 2007-05-14 02:52:35.000000000 -0500
|
||||
+++ kdelibs-3.5.9/kio/kio/kservicegroup.cpp 2008-05-15 15:39:34.000000000 -0500
|
||||
@@ -76,12 +76,14 @@ KServiceGroup::KServiceGroup( const QStr
|
||||
QStringList tmpList;
|
||||
if (config.hasKey("OnlyShowIn"))
|
||||
{
|
||||
- if (!config.readListEntry("OnlyShowIn", ';').contains("KDE"))
|
||||
+ QStringList onlyShowInList = config.readListEntry("OnlyShowIn", ';');
|
||||
+ if (! (onlyShowInList.contains("KDE") || onlyShowInList.contains("KDE3")))
|
||||
d->m_bNoDisplay = true;
|
||||
}
|
||||
if (config.hasKey("NotShowIn"))
|
||||
{
|
||||
- if (config.readListEntry("NotShowIn", ';').contains("KDE"))
|
||||
+ QStringList notShowInList = config.readListEntry("NotShowIn", ';');
|
||||
+ if (notShowInList.contains("KDE") || notShowInList.contains("KDE3"))
|
||||
d->m_bNoDisplay = true;
|
||||
}
|
||||
|
21
kdelibs-3.5.9-drkonqi-kde4.patch
Normal file
21
kdelibs-3.5.9-drkonqi-kde4.patch
Normal file
@ -0,0 +1,21 @@
|
||||
diff -ur kdelibs-3.5.9/kdecore/kcrash.cpp kdelibs-3.5.9-drkonqi-kde4/kdecore/kcrash.cpp
|
||||
--- kdelibs-3.5.9/kdecore/kcrash.cpp 2007-01-15 12:34:17.000000000 +0100
|
||||
+++ kdelibs-3.5.9-drkonqi-kde4/kdecore/kcrash.cpp 2008-07-02 08:24:37.000000000 +0200
|
||||
@@ -158,7 +158,7 @@
|
||||
int i = 0;
|
||||
|
||||
// argument 0 has to be drkonqi
|
||||
- argv[i++] = "drkonqi";
|
||||
+ argv[i++] = "/usr/libexec/kde4/drkonqi";
|
||||
|
||||
#if defined Q_WS_X11
|
||||
// start up on the correct display
|
||||
@@ -325,7 +325,7 @@
|
||||
_exit(253);
|
||||
if(!geteuid() && setuid(getuid()) < 0)
|
||||
_exit(253);
|
||||
- execvp("drkonqi", const_cast< char** >( argv ));
|
||||
+ execv("/usr/libexec/kde4/drkonqi", const_cast< char** >( argv ));
|
||||
_exit(errno);
|
||||
}
|
||||
else
|
15
kdelibs-3.5.9-fix-flock-redefinition.patch
Normal file
15
kdelibs-3.5.9-fix-flock-redefinition.patch
Normal file
@ -0,0 +1,15 @@
|
||||
diff -ur kdelibs-3.5.9/kio/kio/kdirwatch.cpp kdelibs-3.5.9-fix-flock-redefinition/kio/kio/kdirwatch.cpp
|
||||
--- kdelibs-3.5.9/kio/kio/kdirwatch.cpp 2006-07-22 10:16:37.000000000 +0200
|
||||
+++ kdelibs-3.5.9-fix-flock-redefinition/kio/kio/kdirwatch.cpp 2008-08-23 00:59:17.000000000 +0200
|
||||
@@ -71,7 +71,11 @@
|
||||
#include <linux/types.h>
|
||||
// Linux kernel headers are documented to not compile
|
||||
#define _S390_BITOPS_H
|
||||
+#define flock linux_flock
|
||||
+#define flock64 linux_flock64
|
||||
#include <linux/inotify.h>
|
||||
+#undef flock
|
||||
+#undef flock64
|
||||
|
||||
static inline int inotify_init (void)
|
||||
{
|
@ -1,11 +0,0 @@
|
||||
--- kdelibs/kate/part/katesupercursor.cpp 2008/02/08 14:17:43 772352
|
||||
+++ kdelibs/kate/part/katesupercursor.cpp 2008/02/20 11:02:18 777286
|
||||
@@ -186,7 +186,7 @@
|
||||
{
|
||||
if (newLine)
|
||||
{
|
||||
- if (m_line > int(line) || (m_line == int(line) && m_col > int(col)))
|
||||
+ if (m_line > int(line) || (m_line == int(line) && m_col >= int(col)))
|
||||
{
|
||||
if(m_line == int(line))
|
||||
m_col -= col;
|
143
kdelibs3.spec
143
kdelibs3.spec
@ -1,20 +1,27 @@
|
||||
# kdelibs3 review: http://bugzilla.redhat.com/248899
|
||||
|
||||
%define _default_patch_fuzz 2
|
||||
|
||||
%define distname "Fedora"
|
||||
|
||||
%define kde_settings 1
|
||||
|
||||
%define arts 1
|
||||
%define arts_epoch 8
|
||||
%define arts_version 1.5.9
|
||||
%define arts_ev 8:1.5.10
|
||||
|
||||
%define qt3_epoch 1
|
||||
%if 0%{?fedora} > 8
|
||||
%define qt3 qt3
|
||||
%else
|
||||
%define qt3_epoch 1:
|
||||
%define qt3 qt
|
||||
%endif
|
||||
%define qt3_version 3.3.8b
|
||||
%define qt3_ev %{?qt3_epoch}%{qt3_version}
|
||||
# unfortunately, this doesn't work for 3.3.8b which still identifies as 3.3.8
|
||||
#global qt3_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt3_version})
|
||||
%define qt3_ver %{qt3_version}
|
||||
# fix this?... -- Rex
|
||||
%define qt3_docdir %{_docdir}/qt-devel-%{qt_ver}
|
||||
%define qt3_docdir %{_docdir}/qt-devel-%{qt3_ver}
|
||||
|
||||
%define kde_major_version 3
|
||||
|
||||
@ -22,20 +29,26 @@
|
||||
|
||||
%define apidocs 1
|
||||
|
||||
# We always include this here now because kdeartwork 4 has moved on to
|
||||
# icon-naming-spec names (partially, so the icon theme isn't usable with KDE 4
|
||||
# yet either). Maybe the conditional should be dropped entirely? -- Kevin
|
||||
%define include_crystalsvg 1
|
||||
|
||||
Summary: K Desktop Environment 3 - Libraries
|
||||
Version: 3.5.9
|
||||
Release: 8%{?dist}
|
||||
Version: 3.5.10
|
||||
Release: 3%{?dist}
|
||||
|
||||
%if 0%{?fedora} > 8
|
||||
Name: kdelibs3
|
||||
Obsoletes: kdelibs < 6:%{version}-%{release}
|
||||
Provides: kdelibs = 6:%{version}-%{release}
|
||||
# define to enable kdeui symlink hack -- Rex
|
||||
#define kdeui_symlink 1
|
||||
%else
|
||||
Name: kdelibs
|
||||
Epoch: 6
|
||||
Obsoletes: kdelibs3 < %{version}-%{release}
|
||||
Provides: kdelibs3 = %{version}-%{release}
|
||||
%define include_crystalsvg 1
|
||||
%endif
|
||||
|
||||
License: LGPLv2
|
||||
@ -69,21 +82,26 @@ Patch48: kdelibs-3.5.8-kspell-hunspell.patch
|
||||
Patch49: kdelibs-3.5.8-kspell2-enchant.patch
|
||||
Patch50: kdelibs-3.5.8-kspell2-no-ispell.patch
|
||||
Patch51: kdelibs-3.5.9-cupsserverbin.patch
|
||||
# initial support for (Only|Not)ShowIn=KDE3
|
||||
Patch52: kdelibs-3.5.9-KDE3.patch
|
||||
# use /usr/libexec/kde4/drkonqi in KCrash (#453243)
|
||||
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
|
||||
# http://bugs.kde.org/93359, alternative to export libltdl_cv_shlibext=".so" hack.
|
||||
Patch101: kde-3.5-libtool-shlibext.patch
|
||||
# automake-1.10, $(all_libraries) is missing from a few LDFLAGS (kde #137675)
|
||||
Patch102: kdelibs-3.5.6-137675.patch
|
||||
# kget ignores simultaneous download limit (kde #101956)
|
||||
Patch103: kdelibs-3.5.0-101956.patch
|
||||
|
||||
## upstream patches
|
||||
Patch200: kdelibs-3.5.9-kate-regression.patch
|
||||
|
||||
#{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}}
|
||||
#Requires: qt3 >= %{qt3_epoch}:%{qt3_ver}
|
||||
#{?arts:Requires: arts >= %{arts_ev}}
|
||||
#Requires: %{qt3} >= %{qt3_ev}
|
||||
Requires: hicolor-icon-theme
|
||||
%if %{kde_settings}
|
||||
Requires: kde-settings >= 3.5
|
||||
@ -110,11 +128,16 @@ Requires(pre): coreutils
|
||||
Requires(post): /sbin/ldconfig
|
||||
Requires(postun): /sbin/ldconfig
|
||||
|
||||
%if 0%{?kdeui_symlink}
|
||||
# for %_kde4_* macros
|
||||
BuildRequires: kde4-macros(api)
|
||||
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
|
||||
%endif
|
||||
BuildRequires: gettext
|
||||
BuildRequires: pcre-devel
|
||||
BuildRequires: cups-devel cups
|
||||
BuildRequires: qt3-devel qt3-devel-docs
|
||||
%{?arts:BuildRequires: arts-devel >= %{arts_epoch}:%{arts_version}}
|
||||
BuildRequires: %{qt3}-devel %{qt3}-devel-docs
|
||||
%{?arts:BuildRequires: arts-devel >= %{arts_ev}}
|
||||
BuildRequires: flex >= 2.5.4a-13
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: libxslt-devel
|
||||
@ -166,9 +189,10 @@ Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
|
||||
%endif
|
||||
|
||||
%if 0%{?include_crystalsvg}
|
||||
Provides: crystalsvg-icon-theme = %{version}-%{release}
|
||||
Provides: crystalsvg-icon-theme = 1:%{version}-%{release}
|
||||
Obsoletes: crystalsvg-icon-theme < 1:%{version}-%{release}
|
||||
%else
|
||||
# this Requires could be made unconditional -- Rex
|
||||
# for bootstrapping kde3, omit Requires: crystalsvg... -- Rex
|
||||
Requires: crystalsvg-icon-theme
|
||||
%endif
|
||||
|
||||
@ -191,7 +215,7 @@ Obsoletes: kdelibs-devel < 6:%{version}-%{release}
|
||||
Provides: kdelibs-devel = 6:%{version}-%{release}
|
||||
%endif
|
||||
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Requires: qt3-devel
|
||||
Requires: %{qt3}-devel
|
||||
Requires: openssl-devel
|
||||
%{?arts:Requires: arts-devel}
|
||||
%{?libkdnssd:Requires: libkdnssd-devel}
|
||||
@ -241,13 +265,17 @@ format for easy browsing
|
||||
%patch50 -p1 -b .no-ispell
|
||||
%endif
|
||||
%patch51 -p1 -b .cupsserverbin
|
||||
%patch52 -p1 -b .KDE3
|
||||
%if "%{name}" != "kdelibs"
|
||||
%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
|
||||
%patch102 -p0 -b .kde#137675
|
||||
|
||||
# upstream patches
|
||||
%patch200 -p1 -b .kate-regression
|
||||
|
||||
sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
|
||||
|
||||
@ -267,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 \
|
||||
@ -302,7 +334,7 @@ fi
|
||||
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%if "%{?apidocs}" == "1"
|
||||
%if 0%{?apidocs}
|
||||
make %{?_smp_mflags} apidox
|
||||
%endif
|
||||
|
||||
@ -315,7 +347,7 @@ make DESTDIR=%{buildroot} install
|
||||
chmod a+x %{buildroot}%{_libdir}/*
|
||||
install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/services/devices.protocol
|
||||
|
||||
%if "%{?apidocs}" == "1"
|
||||
%if 0%{?apidocs}
|
||||
pushd %{buildroot}%{_docdir}
|
||||
ln -sf HTML/en/kdelibs-apidocs %{name}-devel-%{kde_major_version}
|
||||
popd
|
||||
@ -424,8 +456,15 @@ rm -f %{buildroot}%{_docdir}/HTML/en/common/xml.dcl
|
||||
rm -rf %{buildroot}%{_datadir}/locale/all_languages
|
||||
rm -rf %{buildroot}%{_sysconfdir}/xdg/menus/
|
||||
rm -rf %{buildroot}%{_datadir}/autostart/
|
||||
# make kresources hidden
|
||||
echo "Hidden=true;" >> %{buildroot}%{_datadir}/applications/kde/kresources.desktop
|
||||
# don't show kresources
|
||||
sed -i -e "s,^OnlyShowIn=KDE;,OnlyShowIn=KDE3;," %{buildroot}%{_datadir}/applications/kde/kresources.desktop
|
||||
|
||||
%if 0%{?kdeui_symlink}
|
||||
# kdeui for kde3, kinda workaround http://bugs.kde.org/157850
|
||||
# and save space by sharing
|
||||
rm -rf %{buildroot}%{_datadir}/apps/kdeui/
|
||||
ln -s %{_kde4_appsdir}/kdeui %{buildroot}%{_datadir}/apps/kdeui
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if 0%{?include_crystalsvg} == 0
|
||||
@ -434,6 +473,17 @@ rm -rf %{buildroot}%{_datadir}/icons/crystalsvg/
|
||||
%endif
|
||||
|
||||
|
||||
%check
|
||||
ERROR=0
|
||||
%if 0%{?apidocs}
|
||||
if [ ! -f %{buildroot}%{_docdir}/HTML/en/kdelibs-apidocs/index.html ]; then
|
||||
echo "ERROR: %{_docdir}/HTML/en/kdelibs-apidocs/index.html not generated"
|
||||
ERROR=1
|
||||
fi
|
||||
%endif
|
||||
exit $ERROR
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
@ -445,6 +495,13 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||
%endif
|
||||
%{_bindir}/update-desktop-database > /dev/null 2>&1 || :
|
||||
%if 0%{?kdeui_symlink}
|
||||
rm -rf %{_datadir}/apps/kdeui.rpm_remove ||:
|
||||
|
||||
%pre
|
||||
test -d %{_datadir}/apps/kdeui -a ! -L %{_datadir}/apps/kdeui && \
|
||||
mv %{_datadir}/apps/kdeui %{_datadir}/apps/kdeui.rpm_remove ||:
|
||||
%endif
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
@ -566,7 +623,7 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||
%{_libdir}/lib*.a
|
||||
%exclude %{_libdir}/libkdeinit_*.so
|
||||
|
||||
%if "%{?apidocs}" == "1"
|
||||
%if 0%{?apidocs}
|
||||
%files apidocs
|
||||
%defattr(-,root,root,-)
|
||||
%{_docdir}/%{name}-devel-%{kde_major_version}
|
||||
@ -575,6 +632,44 @@ 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
|
||||
|
||||
* Fri Aug 22 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.9-18
|
||||
- fix build against Rawhide kernel headers (fix flock and flock64 redefinition)
|
||||
|
||||
* Fri Aug 22 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.9-17
|
||||
- fix logic error in OnlyShowIn=KDE3 patch
|
||||
|
||||
* Wed Jul 02 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.9-16
|
||||
- f9+: use drkonqi from KDE 4 kdebase-runtime in KCrash (#453243)
|
||||
|
||||
* Wed Jun 04 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.9-15
|
||||
- set include_crystalsvg to 1 everywhere
|
||||
- use Epoch 1 for crystalsvg-icon-theme, add Obsoletes
|
||||
|
||||
* Tue Jun 03 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-14
|
||||
- revert kdeui symlink hack (there be dragons)
|
||||
- unbreak -apidocs, add %%check so this never ever happens again
|
||||
|
||||
* Sat May 24 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-13
|
||||
- f9+: include kdeui symlink here + scriptlets to help rpm handle it
|
||||
|
||||
* Fri May 23 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-12
|
||||
- f9+: omit %%{_datadir}/apps/kdeui, use version from kdelibs-common (rh#447965, kde#157850)
|
||||
|
||||
* Thu May 15 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-11
|
||||
- (Only|Not)ShowIn=KDE3 patch (helps #446466)
|
||||
|
||||
* Thu May 15 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-10
|
||||
- fix kresources.desktop: NoDisplay=true
|
||||
|
||||
* Mon Apr 14 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-8
|
||||
- omit Requires: kdndsd-avahi (#441222)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user