diff options
Diffstat (limited to 'editors/kile/patches')
-rw-r--r-- | editors/kile/patches/patch-aa | 13 | ||||
-rw-r--r-- | editors/kile/patches/patch-ab | 54 | ||||
-rw-r--r-- | editors/kile/patches/patch-ac | 96 | ||||
-rw-r--r-- | editors/kile/patches/patch-ad | 15 | ||||
-rw-r--r-- | editors/kile/patches/patch-ae | 43 |
5 files changed, 0 insertions, 221 deletions
diff --git a/editors/kile/patches/patch-aa b/editors/kile/patches/patch-aa deleted file mode 100644 index 3c76e8e57a3..00000000000 --- a/editors/kile/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2005/05/26 14:31:42 markd Exp $ - ---- src/kile/syntax/Makefile.in.orig 2005-05-21 23:19:32.000000000 +1200 -+++ src/kile/syntax/Makefile.in -@@ -312,7 +312,7 @@ xdg_appsdir = @xdg_appsdir@ - xdg_directorydir = @xdg_directorydir@ - xdg_menudir = @xdg_menudir@ - syntaxdir = $(kde_datadir)/katepart/syntax --syntax_DATA = latex.xml bibtex.xml -+syntax_DATA = - #>- all: all-am - #>+ 1 - all: docs-am all-am diff --git a/editors/kile/patches/patch-ab b/editors/kile/patches/patch-ab deleted file mode 100644 index e8c1142f234..00000000000 --- a/editors/kile/patches/patch-ab +++ /dev/null @@ -1,54 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2011/01/29 22:23:36 markd Exp $ - -fix build with gcc4.5 - ---- src/kile/kiledocumentinfo.cpp.orig 2008-01-06 13:45:25.000000000 +0000 -+++ src/kile/kiledocumentinfo.cpp -@@ -585,7 +585,7 @@ QString TextInfo::matchBracket(QChar obr - - QString TextInfo::getTextline(uint line, TodoResult &todo) - { -- static QRegExp::QRegExp reComments("[^\\\\](%.*$)"); -+ static QRegExp reComments("[^\\\\](%.*$)"); - - todo.type = -1; - QString s = m_doc->textLine(line); -@@ -616,7 +616,7 @@ QString TextInfo::getTextline(uint line, - - void TextInfo::searchTodoComment(const QString &s, uint startpos, TodoResult &todo) - { -- static QRegExp::QRegExp reTodoComment("\\b(TODO|FIXME)\\b(:|\\s)?\\s*(.*)"); -+ static QRegExp reTodoComment("\\b(TODO|FIXME)\\b(:|\\s)?\\s*(.*)"); - - if ( s.find(reTodoComment,startpos) != -1 ) - { -@@ -870,12 +870,12 @@ void LaTeXInfo::updateStruct() - Info::updateStruct(); - - QMapConstIterator<QString,KileStructData> it; -- static QRegExp::QRegExp reCommand("(\\\\[a-zA-Z]+)\\s*\\*?\\s*(\\{|\\[)"); -- static QRegExp::QRegExp reRoot("\\\\documentclass|\\\\documentstyle"); -- static QRegExp::QRegExp reBD("\\\\begin\\s*\\{\\s*document\\s*\\}"); -- static QRegExp::QRegExp reReNewCommand("\\\\renewcommand.*$"); -- static QRegExp::QRegExp reNumOfParams("\\s*\\[([1-9]+)\\]"); -- static QRegExp::QRegExp reNumOfOptParams("\\s*\\[([1-9]+)\\]\\s*\\[([^\\{]*)\\]"); // the quantifier * isn't used by mistake, because also emtpy optional brackets are correct. -+ static QRegExp reCommand("(\\\\[a-zA-Z]+)\\s*\\*?\\s*(\\{|\\[)"); -+ static QRegExp reRoot("\\\\documentclass|\\\\documentstyle"); -+ static QRegExp reBD("\\\\begin\\s*\\{\\s*document\\s*\\}"); -+ static QRegExp reReNewCommand("\\\\renewcommand.*$"); -+ static QRegExp reNumOfParams("\\s*\\[([1-9]+)\\]"); -+ static QRegExp reNumOfOptParams("\\s*\\[([1-9]+)\\]\\s*\\[([^\\{]*)\\]"); // the quantifier * isn't used by mistake, because also emtpy optional brackets are correct. - - int teller=0, tagStart, bd = 0; - uint tagEnd, tagLine = 0, tagCol = 0; -@@ -1223,8 +1223,8 @@ void BibInfo::updateStruct() - - KILE_DEBUG() << "==void BibInfo::updateStruct()========" << endl; - -- static QRegExp::QRegExp reItem("^(\\s*)@([a-zA-Z]+)"); -- static QRegExp::QRegExp reSpecial("string|preamble|comment"); -+ static QRegExp reItem("^(\\s*)@([a-zA-Z]+)"); -+ static QRegExp reSpecial("string|preamble|comment"); - - QString s, key; - int col = 0, startcol, startline = 0; diff --git a/editors/kile/patches/patch-ac b/editors/kile/patches/patch-ac deleted file mode 100644 index b9afc4108b3..00000000000 --- a/editors/kile/patches/patch-ac +++ /dev/null @@ -1,96 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2011/01/29 22:23:36 markd Exp $ - -fix build with gcc4.5 - ---- src/kile/latexoutputfilter.cpp.orig 2008-08-25 21:10:45.000000000 +0000 -+++ src/kile/latexoutputfilter.cpp -@@ -55,7 +55,7 @@ bool LatexOutputFilter::OnPreCreate() - - bool LatexOutputFilter::fileExists(const QString & name) - { -- static QFileInfo::QFileInfo fi; -+ static QFileInfo fi; - - if (name[0] == '/' ) - { -@@ -101,7 +101,7 @@ void LatexOutputFilter::updateFileStack( - { - //KILE_DEBUG() << "==LatexOutputFilter::updateFileStack()================" << endl; - -- static QString::QString strPartialFileName; -+ static QString strPartialFileName; - - switch (dwCookie) - { -@@ -172,7 +172,7 @@ void LatexOutputFilter::updateFileStack( - void LatexOutputFilter::updateFileStackHeuristic(const QString &strLine, short & dwCookie) - { - //KILE_DEBUG() << "==LatexOutputFilter::updateFileStackHeuristic()================" << endl; -- static QString::QString strPartialFileName; -+ static QString strPartialFileName; - bool expectFileName = (dwCookie == FileNameHeuristic); - int index = 0; - -@@ -282,10 +282,10 @@ bool LatexOutputFilter::detectError(cons - - bool found = false, flush = false; - -- static QRegExp::QRegExp reLaTeXError("^! LaTeX Error: (.*)$", false); -- static QRegExp::QRegExp rePDFLaTeXError("^Error: pdflatex (.*)$", false); -- static QRegExp::QRegExp reTeXError("^! (.*)"); -- static QRegExp::QRegExp reLineNumber("^l\\.([0-9]+)(.*)"); -+ static QRegExp reLaTeXError("^! LaTeX Error: (.*)$", false); -+ static QRegExp rePDFLaTeXError("^Error: pdflatex (.*)$", false); -+ static QRegExp reTeXError("^! (.*)"); -+ static QRegExp reLineNumber("^l\\.([0-9]+)(.*)"); - - switch (dwCookie) - { -@@ -370,9 +370,9 @@ bool LatexOutputFilter::detectWarning(co - bool found = false, flush = false; - QString warning; - -- static QRegExp::QRegExp reLaTeXWarning("^(((! )?(La|pdf)TeX)|Package|Class) .*Warning.*:(.*)", false); -- static QRegExp::QRegExp reNoFile("No file (.*)"); -- static QRegExp::QRegExp reNoAsyFile("File .* does not exist."); // FIXME can be removed when http://sourceforge.net/tracker/index.php?func=detail&aid=1772022&group_id=120000&atid=685683 has promoted to the users -+ static QRegExp reLaTeXWarning("^(((! )?(La|pdf)TeX)|Package|Class) .*Warning.*:(.*)", false); -+ static QRegExp reNoFile("No file (.*)"); -+ static QRegExp reNoAsyFile("File .* does not exist."); // FIXME can be removed when http://sourceforge.net/tracker/index.php?func=detail&aid=1772022&group_id=120000&atid=685683 has promoted to the users - - switch (dwCookie) - { -@@ -437,8 +437,8 @@ bool LatexOutputFilter::detectLaTeXLineN - { - //KILE_DEBUG() << "==LatexOutputFilter::detectLaTeXLineNumber(" << warning.length() << ")================" << endl; - -- static QRegExp::QRegExp reLaTeXLineNumber("(.*) on input line ([0-9]+)\\.$", false); -- static QRegExp::QRegExp reInternationalLaTeXLineNumber("(.*)([0-9]+)\\.$", false); -+ static QRegExp reLaTeXLineNumber("(.*) on input line ([0-9]+)\\.$", false); -+ static QRegExp reInternationalLaTeXLineNumber("(.*)([0-9]+)\\.$", false); - if ( (reLaTeXLineNumber.search(warning) != -1) || (reInternationalLaTeXLineNumber.search(warning) != -1) ) - { - //KILE_DEBUG() << "een" << endl; -@@ -478,7 +478,7 @@ bool LatexOutputFilter::detectBadBox(con - bool found = false, flush = false; - QString badbox; - -- static QRegExp::QRegExp reBadBox("^(Over|Under)(full \\\\[hv]box .*)", false); -+ static QRegExp reBadBox("^(Over|Under)(full \\\\[hv]box .*)", false); - - switch (dwCookie) - { -@@ -517,11 +517,11 @@ bool LatexOutputFilter::detectBadBoxLine - { - //KILE_DEBUG() << "==LatexOutputFilter::detectBadBoxLineNumber(" << strLine.length() << ")================" << endl; - -- static QRegExp::QRegExp reBadBoxLines("(.*) at lines ([0-9]+)--([0-9]+)", false); -- static QRegExp::QRegExp reBadBoxLine("(.*) at line ([0-9]+)", false); -+ static QRegExp reBadBoxLines("(.*) at lines ([0-9]+)--([0-9]+)", false); -+ static QRegExp reBadBoxLine("(.*) at line ([0-9]+)", false); - //Use the following only, if you know how to get the source line for it. - // This is not simple, as TeX is not reporting it. -- static QRegExp::QRegExp reBadBoxOutput("(.*)has occurred while \\output is active^", false); -+ static QRegExp reBadBoxOutput("(.*)has occurred while \\output is active^", false); - - if ( reBadBoxLines.search(strLine) != -1) - { diff --git a/editors/kile/patches/patch-ad b/editors/kile/patches/patch-ad deleted file mode 100644 index cfd1fb2a5e1..00000000000 --- a/editors/kile/patches/patch-ad +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2011/01/29 22:23:36 markd Exp $ - -fix build with gcc4.5 - ---- src/kile/kilestructurewidget.cpp.orig 2008-06-08 11:34:46.000000000 +0000 -+++ src/kile/kilestructurewidget.cpp -@@ -648,7 +648,7 @@ namespace KileWidget - { - KILE_DEBUG() << "\tStructure::slotDoubleClicked" << endl; - KileListViewItem *item = (KileListViewItem*)(itm); -- static QRegExp::QRegExp suffix("\\.[\\d\\w]*$"); -+ static QRegExp suffix("\\.[\\d\\w]*$"); - - if (!item) - return; diff --git a/editors/kile/patches/patch-ae b/editors/kile/patches/patch-ae deleted file mode 100644 index 552e6b03155..00000000000 --- a/editors/kile/patches/patch-ae +++ /dev/null @@ -1,43 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2011/01/29 22:23:36 markd Exp $ - -fix build with gcc4.5 - ---- src/kile/codecompletion.cpp.orig 2008-04-13 17:40:47.000000000 +0000 -+++ src/kile/codecompletion.cpp -@@ -38,12 +38,12 @@ - namespace KileDocument - { - -- static QRegExp::QRegExp reRef; -- static QRegExp::QRegExp reRefExt; -- static QRegExp::QRegExp reCite; -- static QRegExp::QRegExp reCiteExt; -- static QRegExp::QRegExp reNotRefChars("[^a-zA-Z0-9_@\\.\\+\\-\\*\\:]"); -- static QRegExp::QRegExp reNotCiteChars("[^a-zA-Z0-9_@\\-\\:]"); -+ static QRegExp reRef; -+ static QRegExp reRefExt; -+ static QRegExp reCite; -+ static QRegExp reCiteExt; -+ static QRegExp reNotRefChars("[^a-zA-Z0-9_@\\.\\+\\-\\*\\:]"); -+ static QRegExp reNotCiteChars("[^a-zA-Z0-9_@\\-\\:]"); - - CodeCompletion::CodeCompletion(KileInfo *info) : m_ki(info), m_view(0L) - { -@@ -532,7 +532,7 @@ namespace KileDocument - - QString CodeCompletion::filterCompletionText( const QString &text, const QString &type ) - { -- static QRegExp::QRegExp reEnv = QRegExp("^\\\\(begin|end)[^a-zA-Z]+"); -+ static QRegExp reEnv = QRegExp("^\\\\(begin|end)[^a-zA-Z]+"); - KILE_DEBUG() << " complete filter: " << text << " type " << type << endl; - m_type = getType( text ); // remember current type - -@@ -631,7 +631,7 @@ namespace KileDocument - QString CodeCompletion::buildEnvironmentText( const QString &text, const QString &type, - const QString &prefix, uint &ypos, uint &xpos ) - { -- static QRegExp::QRegExp reEnv = QRegExp("^\\\\(begin|end)\\{([^\\}]*)\\}(.*)"); -+ static QRegExp reEnv = QRegExp("^\\\\(begin|end)\\{([^\\}]*)\\}(.*)"); - - if (reEnv.search(text) == -1) return text; - |