Compare commits

..

3 commits

Author SHA1 Message Date
Fedora Release Engineering
36f22e8bd6 dist-git conversion 2010-07-29 15:56:00 +00:00
Bill Nottingham
625e17af45 Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-26 01:34:12 +00:00
Jesse Keating
ab12ebd109 Initialize branch F-10 for xmlcopyeditor 2008-11-07 04:27:53 +00:00
7 changed files with 431 additions and 1 deletions

1
.gitignore vendored Normal file
View file

@ -0,0 +1 @@
xmlcopyeditor-1.1.0.6.tar.gz

View file

@ -1 +0,0 @@
Orphaned for 6+ weeks

1
sources Normal file
View file

@ -0,0 +1 @@
29350234faca3ad978ff74dbbf7f3ef5 xmlcopyeditor-1.1.0.6.tar.gz

View file

@ -0,0 +1,32 @@
diff -up xmlcopyeditor-1.1.0.6/src/xmlcopyeditor.cpp.defaultbrowser xmlcopyeditor-1.1.0.6/src/xmlcopyeditor.cpp
--- xmlcopyeditor-1.1.0.6/src/xmlcopyeditor.cpp.defaultbrowser 2008-01-28 02:38:06.000000000 -0500
+++ xmlcopyeditor-1.1.0.6/src/xmlcopyeditor.cpp 2008-01-28 09:48:46.000000000 -0500
@@ -1015,17 +1015,18 @@ MyFrame::~MyFrame()
wxString MyFrame::getLinuxBrowser()
{
wxString s;
- const int stringArrayLen = 9;
+ const int stringArrayLen = 10;
wxString stringArray[stringArrayLen];
- stringArray[0] = _T ( "/usr/bin/firefox" );
- stringArray[1] = _T ( "/usr/bin/mozilla" );
- stringArray[2] = _T ( "/usr/bin/opera" );
- stringArray[3] = _T ( "/usr/bin/dillo" );
- stringArray[4] = _T ( "/opt/gnome/bin/epiphany" );
- stringArray[5] = _T ( "/opt/gnome/bin/galeon" );
- stringArray[6] = _T ( "/opt/kde/bin/konqueror" );
- stringArray[7] = _T ( "/opt/mozilla/bin/firefox" );
- stringArray[8] = wxEmptyString; // empty option is safe
+ stringArray[0] = _T ( "/usr/bin/xdg-open" );
+ stringArray[1] = _T ( "/usr/bin/htmlview" );
+ stringArray[2] = _T ( "/usr/bin/galeon" );
+ stringArray[3] = _T ( "/usr/bin/epiphany" );
+ stringArray[4] = _T ( "/usr/bin/firefox" );
+ stringArray[5] = _T ( "/usr/bin/mozilla" );
+ stringArray[6] = _T ( "/usr/bin/konqueror" );
+ stringArray[7] = _T ( "/usr/bin/opera" );
+ stringArray[8] = _T ( "/usr/bin/dillo" );
+ stringArray[9] = wxEmptyString; // empty option is safe
for ( int i = 0; i < stringArrayLen; i++ )
{

View file

@ -0,0 +1,264 @@
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 <expat.h>
#include <map>
#include <set>
+#include <cstring>
#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 <vector>
#include <stdexcept>
#include <expat.h>
+#include <cstring>
#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 <set>
#include <string>
#include <expat.h>
+#include <memory>
#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 <expat.h>
#include <string>
#include <map>
+#include <memory>
#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 <string>
+#include <memory>
#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 <vector>
#include <utility>
#include <expat.h>
+#include <memory>
#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 <expat.h>
#include <string>
+#include <memory>
#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 <expat.h>
#include <string>
+#include <memory>
#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 <expat.h>
#include <map>
#include <set>
+#include <memory>
#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 <vector>
#include <expat.h>
#include <string>
+#include <memory>
#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 <utility>
+#include <memory>
// 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 <map>
#include <set>
#include <expat.h>
+#include <memory>
#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 <vector>
#include <expat.h>
#include <string>
+#include <memory>
#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 <vector>
#include <expat.h>
#include <string>
+#include <memory>
#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 <memory>
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 <vector>
#include <stdexcept>
#include <expat.h>
+#include <cstring>
#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 <set>
#include <vector>
#include <expat.h>
+#include <memory>
#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 <vector>
#include <expat.h>
#include <string>
+#include <memory>
#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 <vector>
#include <stdexcept>
#include <expat.h>
+#include <cstring>
#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 <vector>
#include <stdexcept>
#include <expat.h>
+#include <cstring>
#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 <stdexcept>
#include <cmath>
#include <climits>
+#include <cstring>
#ifdef __WXMSW__
#include <mem.h>
#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 <string>
#include <ctype.h>
#include <stdexcept>
+#include <cstring>
#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 <expat.h>
#include <string>
+#include <memory>
#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 <cstring>
#include "xmlencodinghandler.h"
bool XmlEncodingHandler::hasDeclaration ( const std::string& utf8 )

View file

@ -0,0 +1,58 @@
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

75
xmlcopyeditor.spec Normal file
View file

@ -0,0 +1,75 @@
Name: xmlcopyeditor
Version: 1.1.0.6
Release: 4%{?dist}
Summary: A fast, free, validating XML editor
Group: Applications/Editors
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.1.0.6-nuke.patch
Patch2: xmlcopyeditor-1.1.0.6-gcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: wxGTK-devel >= 2.8 pcre-devel aspell-devel boost-devel
BuildRequires: xerces-c-devel libxslt-devel expat-devel desktop-file-utils
%description
XML Copy Editor is a fast, free, validating XML editor.
%prep
%setup -q
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 .nuke
%patch2 -p 1 -b .gcc43
%build
%configure
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install --vendor=fedora --remove-category Application \
--delete-original \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
sed -i -e "s/\(Icon=[^.]\+\).[^.]\+/\1/" $RPM_BUILD_ROOT%{_datadir}/applications/*%{name}.desktop
#rm -r $RPM_BUILD_ROOT%{_datadir}/%{name}/po
%clean
rm -rf $RPM_BUILD_ROOT
%post
update-desktop-database &> /dev/null || :
%postun
update-desktop-database &> /dev/null || :
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS
%{_bindir}/*
%{_datadir}/%{name}
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%changelog
* Wed Feb 13 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> 1.1.0.6-4
- Fixed build under GCC 4.3
* Tue Jan 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> 1.1.0.6-3
- Removed locale files for now
- Removed spurious license files
- Fixed debuginfo permissions
- Fixed desktop file handling
* Mon Jan 28 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> 1.1.0.6-2
- Changed search list of default browsers
* Sun Jan 27 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> 1.1.0.6-1
- Initial RPM release