rpms/xmlcopyeditor/devel xmlcopyeditor-1.2.0.2.gcc44.patch, NONE, 1.1 xmlcopyeditor.spec, 1.4, 1.5 noautobuild, 1.2, NONE xmlcopyeditor-1.1.0.6-gcc43.patch, 1.1, NONE xmlcopyeditor-1.1.0.6-nuke.patch, 1.1, NONE
Caolan McNamara
caolanm at fedoraproject.org
Sat Sep 12 19:24:28 UTC 2009
Author: caolanm
Update of /cvs/pkgs/rpms/xmlcopyeditor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19937
Modified Files:
xmlcopyeditor.spec
Added Files:
xmlcopyeditor-1.2.0.2.gcc44.patch
Removed Files:
noautobuild xmlcopyeditor-1.1.0.6-gcc43.patch
xmlcopyeditor-1.1.0.6-nuke.patch
Log Message:
Resolves: rhbz#508867 rhbz#511552 FTBFS
xmlcopyeditor-1.2.0.2.gcc44.patch:
replace.cpp | 1 +
stringset.h | 1 +
wrapaspell.cpp | 1 +
wraplibxml.cpp | 2 +-
xmlassociatedtd.h | 1 +
xmlassociatexsd.h | 1 +
xmlassociatexsl.h | 1 +
xmlpromptgenerator.cpp | 3 +--
xmlutf8reader.h | 1 +
xsllocator.cpp | 4 ++--
10 files changed, 11 insertions(+), 5 deletions(-)
--- NEW FILE xmlcopyeditor-1.2.0.2.gcc44.patch ---
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 <cstring>
+#include <cstdio>
#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 <mem.h>
#endif
+#include <stdint.h>
template<class T>
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 <iostream>
#include <stdexcept>
+#include <cstdio>
#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 <sstream>
#include <stdexcept>
#include <wx/wx.h>
+#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 <expat.h>
#include <string>
#include <memory>
+#include <cstdio>
#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 <string>
#include <map>
#include <memory>
+#include <cstdio>
#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 <expat.h>
#include <string>
#include <memory>
+#include <cstdio>
#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 <xercesc/util/NameIdPool.hpp>
#include <xercesc/util/PlatformUtils.hpp>
@@ -441,7 +440,7 @@
}
SchemaGrammar* grammar = ( SchemaGrammar* ) rootGrammar;
- RefHash3KeysIdPoolEnumerator<SchemaElementDecl> elemEnum = grammar->getElemEnumerator();
+ RefHash3KeysIdPoolEnumerator<SchemaElementDecl> 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 <expat.h>
#include <string>
#include <memory>
+#include <cstdio>
#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;
}
}
Index: xmlcopyeditor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlcopyeditor/devel/xmlcopyeditor.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xmlcopyeditor.spec 25 Feb 2009 09:10:08 -0000 1.4
+++ xmlcopyeditor.spec 12 Sep 2009 19:24:27 -0000 1.5
@@ -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 chmo
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 <caolanm at redhat.com> 1.2.0.2-2
+- Resolves: rhbz#508867 rhbz#511552 FTBFS
+
* Thu Feb 05 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 1.2.0.2-1
- Upstream update (http://sourceforge.net/news/?group_id=141776)
--- noautobuild DELETED ---
--- xmlcopyeditor-1.1.0.6-gcc43.patch DELETED ---
--- xmlcopyeditor-1.1.0.6-nuke.patch DELETED ---
More information about the scm-commits
mailing list