diff --git a/noautobuild b/noautobuild deleted file mode 100644 index 22f99cd..0000000 --- a/noautobuild +++ /dev/null @@ -1 +0,0 @@ -Does not currently build (https://bugzilla.redhat.com/show_bug.cgi?id=487073) diff --git a/xmlcopyeditor-1.1.0.6-gcc43.patch b/xmlcopyeditor-1.1.0.6-gcc43.patch deleted file mode 100644 index 18f5f2f..0000000 --- a/xmlcopyeditor-1.1.0.6-gcc43.patch +++ /dev/null @@ -1,264 +0,0 @@ -diff -up xmlcopyeditor-1.1.0.6/src/xmlfilterreader.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/xmlfilterreader.cpp ---- xmlcopyeditor-1.1.0.6/src/xmlfilterreader.cpp.gcc43 2008-02-13 23:11:04.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlfilterreader.cpp 2008-02-13 23:11:44.000000000 -0500 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include "xmlfilterreader.h" - - using namespace std; -diff -up xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.cpp ---- xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.cpp.gcc43 2008-02-13 22:50:22.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.cpp 2008-02-13 22:51:01.000000000 -0500 -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include "xmlassociatexsl.h" - - XmlAssociateXsl::XmlAssociateXsl ( const std::string& path, size_t size ) : -diff -up xmlcopyeditor-1.1.0.6/src/housestylewriter.h.gcc43 xmlcopyeditor-1.1.0.6/src/housestylewriter.h ---- xmlcopyeditor-1.1.0.6/src/housestylewriter.h.gcc43 2008-02-13 23:46:54.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/housestylewriter.h 2008-02-13 23:47:07.000000000 -0500 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include "wrapexpat.h" - #include "wrapregex.h" - #include "contexthandler.h" -diff -up xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.h ---- xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.h.gcc43 2008-02-13 22:35:15.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.h 2008-02-13 22:35:36.000000000 -0500 -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #include "wrapexpat.h" - - struct AssociateXsdData : public ParserData -diff -up xmlcopyeditor-1.1.0.6/src/xmlwordcount.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlwordcount.h ---- xmlcopyeditor-1.1.0.6/src/xmlwordcount.h.gcc43 2008-02-13 23:52:56.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlwordcount.h 2008-02-13 23:53:06.000000000 -0500 -@@ -21,6 +21,7 @@ - #define XML_WORD_COUNT_H - - #include -+#include - #include "wrapexpat.h" - - struct WordCountData : public ParserData -diff -up xmlcopyeditor-1.1.0.6/src/xmlshallowvalidator.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlshallowvalidator.h ---- xmlcopyeditor-1.1.0.6/src/xmlshallowvalidator.h.gcc43 2008-02-13 22:58:11.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlshallowvalidator.h 2008-02-13 22:59:00.000000000 -0500 -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include "wrapexpat.h" - - struct XmlShallowValidatorData : public ParserData -diff -up xmlcopyeditor-1.1.0.6/src/xmlencodingspy.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlencodingspy.h ---- xmlcopyeditor-1.1.0.6/src/xmlencodingspy.h.gcc43 2008-02-14 00:01:03.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlencodingspy.h 2008-02-14 00:01:20.000000000 -0500 -@@ -22,6 +22,7 @@ - - #include - #include -+#include - #include "wrapexpat.h" - - struct EncodingData : public ParserData -diff -up xmlcopyeditor-1.1.0.6/src/xmlschemalocator.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlschemalocator.h ---- xmlcopyeditor-1.1.0.6/src/xmlschemalocator.h.gcc43 2008-02-13 23:28:10.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlschemalocator.h 2008-02-13 23:28:34.000000000 -0500 -@@ -22,6 +22,7 @@ - - #include - #include -+#include - #include "wrapexpat.h" - - struct SchemaLocatorData -diff -up xmlcopyeditor-1.1.0.6/src/xmlpromptgenerator.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlpromptgenerator.h ---- xmlcopyeditor-1.1.0.6/src/xmlpromptgenerator.h.gcc43 2008-02-13 22:58:11.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlpromptgenerator.h 2008-02-13 22:58:33.000000000 -0500 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include "wrapexpat.h" - #include "parserdata.h" - -diff -up xmlcopyeditor-1.1.0.6/src/xmlassociatedtd.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlassociatedtd.h ---- xmlcopyeditor-1.1.0.6/src/xmlassociatedtd.h.gcc43 2008-02-13 22:26:41.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlassociatedtd.h 2008-02-13 22:26:58.000000000 -0500 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include "wrapexpat.h" - - struct DtdData : public ParserData -diff -up xmlcopyeditor-1.1.0.6/src/xmlctrl.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/xmlctrl.cpp ---- xmlcopyeditor-1.1.0.6/src/xmlctrl.cpp.gcc43 2008-02-13 22:58:11.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlctrl.cpp 2008-02-13 22:59:23.000000000 -0500 -@@ -22,6 +22,7 @@ - #include "xmlshallowvalidator.h" - #include "xmlencodinghandler.h" - #include -+#include - - // adapted from wxSTEdit (c) 2005 John Labenski, Otto Wyss - #define XMLCTRL_HASBIT(value, bit) (((value) & (bit)) != 0) -diff -up xmlcopyeditor-1.1.0.6/src/xmlfilterreader.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlfilterreader.h ---- xmlcopyeditor-1.1.0.6/src/xmlfilterreader.h.gcc43 2008-02-13 23:11:04.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlfilterreader.h 2008-02-13 23:11:35.000000000 -0500 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include "wrapexpat.h" - - using namespace std; -diff -up xmlcopyeditor-1.1.0.6/src/xmlparseschemans.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlparseschemans.h ---- xmlcopyeditor-1.1.0.6/src/xmlparseschemans.h.gcc43 2008-02-13 22:35:52.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlparseschemans.h 2008-02-13 22:36:09.000000000 -0500 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include "wrapexpat.h" - - struct ParseSchemaNsData : public ParserData -diff -up xmlcopyeditor-1.1.0.6/src/xmlutf8reader.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlutf8reader.h ---- xmlcopyeditor-1.1.0.6/src/xmlutf8reader.h.gcc43 2008-02-13 23:34:17.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlutf8reader.h 2008-02-13 23:34:32.000000000 -0500 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include "wrapexpat.h" - - struct UtfData : public ParserData -diff -up xmlcopyeditor-1.1.0.6/src/globalreplacedialog.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/globalreplacedialog.cpp ---- xmlcopyeditor-1.1.0.6/src/globalreplacedialog.cpp.gcc43 2008-02-13 19:59:16.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/globalreplacedialog.cpp 2008-02-13 19:59:26.000000000 -0500 -@@ -19,6 +19,7 @@ - - #include "globalreplacedialog.h" - #include "wrapregex.h" -+#include - - BEGIN_EVENT_TABLE ( GlobalReplaceDialog, wxDialog ) - EVT_BUTTON ( wxID_OK, GlobalReplaceDialog::OnOk ) -diff -up xmlcopyeditor-1.1.0.6/src/xsllocator.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/xsllocator.cpp ---- xmlcopyeditor-1.1.0.6/src/xsllocator.cpp.gcc43 2008-02-13 23:40:13.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xsllocator.cpp 2008-02-13 23:40:46.000000000 -0500 -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include "xsllocator.h" - - XslLocator::XslLocator() : d ( new XslLocatorData() ) -diff -up xmlcopyeditor-1.1.0.6/src/housestylereader.h.gcc43 xmlcopyeditor-1.1.0.6/src/housestylereader.h ---- xmlcopyeditor-1.1.0.6/src/housestylereader.h.gcc43 2008-02-13 22:13:55.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/housestylereader.h 2008-02-13 22:13:59.000000000 -0500 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include "wrapexpat.h" - - using namespace std; -diff -up xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.h ---- xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.h.gcc43 2008-02-13 22:49:52.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.h 2008-02-13 22:50:09.000000000 -0500 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include "wrapexpat.h" - - struct XslData : public ParserData -diff -up xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.cpp ---- xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.cpp.gcc43 2008-02-13 22:43:24.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.cpp 2008-02-13 22:43:42.000000000 -0500 -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include "xmlassociatexsd.h" - #include "xmlparseschemans.h" - #include "readfile.h" -diff -up xmlcopyeditor-1.1.0.6/src/xmlschemalocator.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/xmlschemalocator.cpp ---- xmlcopyeditor-1.1.0.6/src/xmlschemalocator.cpp.gcc43 2008-02-13 23:28:10.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlschemalocator.cpp 2008-02-13 23:28:46.000000000 -0500 -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include "xmlschemalocator.h" - - XmlSchemaLocator::XmlSchemaLocator() : -diff -up xmlcopyeditor-1.1.0.6/src/stringset.h.gcc43 xmlcopyeditor-1.1.0.6/src/stringset.h ---- xmlcopyeditor-1.1.0.6/src/stringset.h.gcc43 2008-02-13 20:22:00.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/stringset.h 2008-02-13 20:22:18.000000000 -0500 -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #ifdef __WXMSW__ - #include - #endif -diff -up xmlcopyeditor-1.1.0.6/src/wrapregex.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/wrapregex.cpp ---- xmlcopyeditor-1.1.0.6/src/wrapregex.cpp.gcc43 2008-02-13 22:20:55.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/wrapregex.cpp 2008-02-13 22:21:09.000000000 -0500 -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include "wrapregex.h" - #include "contexthandler.h" - -diff -up xmlcopyeditor-1.1.0.6/src/xsllocator.h.gcc43 xmlcopyeditor-1.1.0.6/src/xsllocator.h ---- xmlcopyeditor-1.1.0.6/src/xsllocator.h.gcc43 2008-02-13 23:40:13.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xsllocator.h 2008-02-13 23:40:34.000000000 -0500 -@@ -22,6 +22,7 @@ - - #include - #include -+#include - #include "wrapexpat.h" - - struct XslLocatorData : public ParserData -diff -up xmlcopyeditor-1.1.0.6/src/xmlencodinghandler.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/xmlencodinghandler.cpp ---- xmlcopyeditor-1.1.0.6/src/xmlencodinghandler.cpp.gcc43 2008-02-13 23:04:33.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlencodinghandler.cpp 2008-02-13 23:04:53.000000000 -0500 -@@ -17,6 +17,7 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -+#include - #include "xmlencodinghandler.h" - - bool XmlEncodingHandler::hasDeclaration ( const std::string& utf8 ) diff --git a/xmlcopyeditor-1.1.0.6-nuke.patch b/xmlcopyeditor-1.1.0.6-nuke.patch deleted file mode 100644 index bc2a79c..0000000 --- a/xmlcopyeditor-1.1.0.6-nuke.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -up xmlcopyeditor-1.1.0.6/src/Makefile.in.nuke xmlcopyeditor-1.1.0.6/src/Makefile.in ---- xmlcopyeditor-1.1.0.6/src/Makefile.in.nuke 2008-01-29 03:03:11.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/Makefile.in 2008-01-29 03:03:59.000000000 -0500 -@@ -241,24 +241,7 @@ nobase_xmlcopyeditor_DATA = png/*.png \ - rng/modules/*.rng \ - xpm/*.xpm \ - templates/*.* \ -- help/*.* help/html/*.* \ -- copying/*.txt copying/boost_shared_ptr/* \ -- copying/Expat/* copying/libxml2/* copying/libxslt/* \ -- copying/PCRE/* copying/Scintilla/* \ -- copying/scowl/* \ -- copying/wxStyledTextCtrl/* copying/ximian/* \ -- copying/wxStEditor/* \ -- copying/xmlcopyeditor/* \ -- copying/Aspell/* \ -- copying/Apache/LICENSE-2.0 \ -- copying/Apache/LICENSE-2_files/* \ -- po/sk/messages.mo \ -- po/sv/messages.mo \ -- po/fr/messages.mo \ -- po/de/messages.mo \ -- po/zh_CN/messages.mo \ -- po/zh_TW/messages.mo \ -- po/en_us/messages.po -+ help/*.* help/html/*.* - - pixmap_DATA = xmlcopyeditor.png - applications_DATA = xmlcopyeditor.desktop -diff -up xmlcopyeditor-1.1.0.6/src/Makefile.am.nuke xmlcopyeditor-1.1.0.6/src/Makefile.am ---- xmlcopyeditor-1.1.0.6/src/Makefile.am.nuke 2008-01-29 03:03:06.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/Makefile.am 2008-01-29 03:03:41.000000000 -0500 -@@ -50,25 +50,6 @@ nobase_xmlcopyeditor_DATA = png/*.png \ - templates/*.lzx \ - templates/*.xlf \ - help/*.* help/html/*.* \ -- copying/*.txt copying/boost_shared_ptr/* \ -- copying/Expat/* copying/libxml2/* copying/libxslt/* \ -- copying/PCRE/* copying/Scintilla/* \ -- copying/scowl/* \ -- copying/wxStyledTextCtrl/* copying/ximian/* \ -- copying/wxStEditor/* \ -- copying/xmlcopyeditor/* \ -- copying/Aspell/* \ -- copying/Apache/LICENSE-2.0 \ -- copying/Apache/LICENSE-2_files/* \ -- po/sk/messages.mo \ -- po/sv/messages.mo \ -- po/fr/messages.mo \ -- po/de/messages.mo \ -- po/zh_CN/messages.mo \ -- po/zh_TW/messages.mo \ -- po/uk_UA/messages.mo \ -- po/uk_UA/messages.mo \ -- po/en_us/messages.po \ - - pixmap_DATA = xmlcopyeditor.png - diff --git a/xmlcopyeditor-1.2.0.2.gcc44.patch b/xmlcopyeditor-1.2.0.2.gcc44.patch new file mode 100644 index 0000000..efc5e7d --- /dev/null +++ b/xmlcopyeditor-1.2.0.2.gcc44.patch @@ -0,0 +1,133 @@ +diff -ru xmlcopyeditor-1.2.0.2.orig/src/replace.cpp xmlcopyeditor-1.2.0.2/src/replace.cpp +--- xmlcopyeditor-1.2.0.2.orig/src/replace.cpp 2009-06-30 10:38:57.000000000 +0100 ++++ xmlcopyeditor-1.2.0.2/src/replace.cpp 2009-06-30 10:43:13.000000000 +0100 +@@ -18,6 +18,7 @@ + */ + + #include ++#include + #include "replace.h" + + int Replace::run ( +diff -ru xmlcopyeditor-1.2.0.2.orig/src/stringset.h xmlcopyeditor-1.2.0.2/src/stringset.h +--- xmlcopyeditor-1.2.0.2.orig/src/stringset.h 2009-06-30 10:38:57.000000000 +0100 ++++ xmlcopyeditor-1.2.0.2/src/stringset.h 2009-06-30 10:40:40.000000000 +0100 +@@ -28,6 +28,7 @@ + #ifdef __WXMSW__ + #include + #endif ++#include + + template + class StringSetNode +diff -ru xmlcopyeditor-1.2.0.2.orig/src/wrapaspell.cpp xmlcopyeditor-1.2.0.2/src/wrapaspell.cpp +--- xmlcopyeditor-1.2.0.2.orig/src/wrapaspell.cpp 2009-06-30 10:38:57.000000000 +0100 ++++ xmlcopyeditor-1.2.0.2/src/wrapaspell.cpp 2009-06-30 11:12:37.000000000 +0100 +@@ -19,6 +19,7 @@ + + #include + #include ++#include + #include "wrapaspell.h" + #include "aspell.h" + #include "casehandler.h" +diff -ru xmlcopyeditor-1.2.0.2.orig/src/wraplibxml.cpp xmlcopyeditor-1.2.0.2/src/wraplibxml.cpp +--- xmlcopyeditor-1.2.0.2.orig/src/wraplibxml.cpp 2009-06-30 10:38:57.000000000 +0100 ++++ xmlcopyeditor-1.2.0.2/src/wraplibxml.cpp 2009-06-30 11:23:19.000000000 +0100 +@@ -17,10 +17,10 @@ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +-#include "wraplibxml.h" + #include + #include + #include ++#include "wraplibxml.h" + + WrapLibxml::WrapLibxml ( bool netAccessParameter, const std::string& catalogPathParameter ) + : netAccess ( netAccessParameter ), catalogPath ( catalogPathParameter ) +diff -ru xmlcopyeditor-1.2.0.2.orig/src/xmlassociatedtd.h xmlcopyeditor-1.2.0.2/src/xmlassociatedtd.h +--- xmlcopyeditor-1.2.0.2.orig/src/xmlassociatedtd.h 2009-06-30 10:38:57.000000000 +0100 ++++ xmlcopyeditor-1.2.0.2/src/xmlassociatedtd.h 2009-06-30 11:04:26.000000000 +0100 +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include "wrapexpat.h" + + struct DtdData : public ParserData +diff -ru xmlcopyeditor-1.2.0.2.orig/src/xmlassociatexsd.h xmlcopyeditor-1.2.0.2/src/xmlassociatexsd.h +--- xmlcopyeditor-1.2.0.2.orig/src/xmlassociatexsd.h 2009-06-30 10:38:57.000000000 +0100 ++++ xmlcopyeditor-1.2.0.2/src/xmlassociatexsd.h 2009-06-30 11:05:29.000000000 +0100 +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include "wrapexpat.h" + + struct AssociateXsdData : public ParserData +diff -ru xmlcopyeditor-1.2.0.2.orig/src/xmlassociatexsl.h xmlcopyeditor-1.2.0.2/src/xmlassociatexsl.h +--- xmlcopyeditor-1.2.0.2.orig/src/xmlassociatexsl.h 2009-06-30 10:38:57.000000000 +0100 ++++ xmlcopyeditor-1.2.0.2/src/xmlassociatexsl.h 2009-06-30 11:05:55.000000000 +0100 +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include "wrapexpat.h" + + struct XslData : public ParserData +diff -ru xmlcopyeditor-1.2.0.2.orig/src/xmlpromptgenerator.cpp xmlcopyeditor-1.2.0.2/src/xmlpromptgenerator.cpp +--- xmlcopyeditor-1.2.0.2.orig/src/xmlpromptgenerator.cpp 2009-06-30 10:38:57.000000000 +0100 ++++ xmlcopyeditor-1.2.0.2/src/xmlpromptgenerator.cpp 2009-06-30 11:23:56.000000000 +0100 +@@ -31,7 +31,6 @@ + #include "catalogresolver.h" + + // Xerces-C req'd for Schema parsing +-#define XERCES_TMPLSINC + + #include + #include +@@ -441,7 +440,7 @@ + } + + SchemaGrammar* grammar = ( SchemaGrammar* ) rootGrammar; +- RefHash3KeysIdPoolEnumerator elemEnum = grammar->getElemEnumerator(); ++ RefHash3KeysIdPoolEnumerator elemEnum (grammar->getElemEnumerator()); + + if ( !elemEnum.hasMoreElements() ) + { +diff -ru xmlcopyeditor-1.2.0.2.orig/src/xmlutf8reader.h xmlcopyeditor-1.2.0.2/src/xmlutf8reader.h +--- xmlcopyeditor-1.2.0.2.orig/src/xmlutf8reader.h 2009-06-30 10:38:57.000000000 +0100 ++++ xmlcopyeditor-1.2.0.2/src/xmlutf8reader.h 2009-06-30 11:08:20.000000000 +0100 +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include "wrapexpat.h" + + struct UtfData : public ParserData +diff -ru xmlcopyeditor-1.2.0.2.orig/src/xsllocator.cpp xmlcopyeditor-1.2.0.2/src/xsllocator.cpp +--- xmlcopyeditor-1.2.0.2.orig/src/xsllocator.cpp 2009-06-30 10:38:57.000000000 +0100 ++++ xmlcopyeditor-1.2.0.2/src/xsllocator.cpp 2009-06-30 11:11:23.000000000 +0100 +@@ -46,7 +46,7 @@ + return; + + char *value, *iterator; +- value = strstr ( ( const char * ) data, "href=" ); ++ value = strstr ( ( char * ) data, "href=" ); + if ( !value || strlen ( value ) < 7 ) + return; + value += 6; +@@ -55,7 +55,7 @@ + { + if ( *iterator == '"' || *iterator == '\'' ) + { +- *iterator = '\0'; ++ *iterator = '\0'; //bustage, modifying const *data + break; + } + } diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index e879cbf..a8240e8 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -8,6 +8,7 @@ License: GPLv2 URL: http://xml-copy-editor.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/xml-copy-editor/%name-%version.tar.gz Patch0: xmlcopyeditor-1.1.0.6-defaultbrowser.patch +Patch1: xmlcopyeditor-1.2.0.2.gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: wxGTK-devel >= 2.8 pcre-devel aspell-devel boost-devel @@ -22,6 +23,7 @@ find src -type f -print0 | xargs -0 chmod a-x tr -d '\r' < src/copying/gpl.txt > COPYING chmod a-x AUTHORS COPYING NEWS %patch0 -p 1 -b .defaultbrowser +%patch1 -p 1 -b .gcc44 %build %configure @@ -55,6 +57,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/pixmaps/* %changelog +* Sat Sep 12 2009 Caolán McNamara 1.2.0.2-2 +- Resolves: rhbz#508867 rhbz#511552 FTBFS + * Thu Feb 05 2009 Ignacio Vazquez-Abrams 1.2.0.2-1 - Upstream update (http://sourceforge.net/news/?group_id=141776)