diff options
author | markd <markd> | 2011-01-29 22:16:51 +0000 |
---|---|---|
committer | markd <markd> | 2011-01-29 22:16:51 +0000 |
commit | d6d464400c72123d8454cf078bf392cdce1d1402 (patch) | |
tree | c0cad8630990b32aa8a64faafed40b5eff735226 /editors/kile | |
parent | 31b4102c404bebc196342f36251b70bf7cf96085 (diff) | |
download | pkgsrc-d6d464400c72123d8454cf078bf392cdce1d1402.tar.gz |
Fix build with gcc4.5
Diffstat (limited to 'editors/kile')
-rw-r--r-- | editors/kile/distinfo | 6 | ||||
-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, 213 insertions, 1 deletions
diff --git a/editors/kile/distinfo b/editors/kile/distinfo index 2f9ae1ce165..069030ccae7 100644 --- a/editors/kile/distinfo +++ b/editors/kile/distinfo @@ -1,6 +1,10 @@ -$NetBSD: distinfo,v 1.18 2008/11/26 10:34:11 markd Exp $ +$NetBSD: distinfo,v 1.19 2011/01/29 22:23:36 markd Exp $ SHA1 (kile-2.0.2.tar.bz2) = 6666470d41beff4a26b3e85a161da276ebc30d76 RMD160 (kile-2.0.2.tar.bz2) = 736107cc5a676df91e2b9f8f158ca58ec4697237 Size (kile-2.0.2.tar.bz2) = 5438442 bytes SHA1 (patch-aa) = 80ca229b80a3940b32a1a654d891b067805c2f1e +SHA1 (patch-ab) = b8705f330e7601e2af6ee7db2e8c3cc7aac9f175 +SHA1 (patch-ac) = 15f9ff76688923eadae8844cc31845bdfc75be8e +SHA1 (patch-ad) = 33225c1a7284ba654d8ba23ae5029ce8f4a39181 +SHA1 (patch-ae) = 18f982fe814cc747f8a8c0633ed191fcc19d4bb7 diff --git a/editors/kile/patches/patch-ab b/editors/kile/patches/patch-ab new file mode 100644 index 00000000000..e8c1142f234 --- /dev/null +++ b/editors/kile/patches/patch-ab @@ -0,0 +1,54 @@ +$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 new file mode 100644 index 00000000000..b9afc4108b3 --- /dev/null +++ b/editors/kile/patches/patch-ac @@ -0,0 +1,96 @@ +$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 new file mode 100644 index 00000000000..cfd1fb2a5e1 --- /dev/null +++ b/editors/kile/patches/patch-ad @@ -0,0 +1,15 @@ +$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 new file mode 100644 index 00000000000..552e6b03155 --- /dev/null +++ b/editors/kile/patches/patch-ae @@ -0,0 +1,43 @@ +$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; + |