Compare commits
No commits in common. "rawhide" and "f16" have entirely different histories.
6 changed files with 244 additions and 1 deletions
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
xmlcopyeditor-1.2.0.2.tar.gz
|
||||||
|
/xmlcopyeditor-1.2.0.4.tar.gz
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
Orphaned for 6+ weeks
|
|
||||||
1
sources
Normal file
1
sources
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
0b85649a4ef6af817b1c4089237b2a57 xmlcopyeditor-1.2.0.4.tar.gz
|
||||||
32
xmlcopyeditor-1.1.0.6-defaultbrowser.patch
Normal file
32
xmlcopyeditor-1.1.0.6-defaultbrowser.patch
Normal 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++ )
|
||||||
|
{
|
||||||
118
xmlcopyeditor-1.2.0.4-gcc44.patch
Normal file
118
xmlcopyeditor-1.2.0.4-gcc44.patch
Normal file
|
|
@ -0,0 +1,118 @@
|
||||||
|
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/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;
|
||||||
|
}
|
||||||
|
}
|
||||||
91
xmlcopyeditor.spec
Normal file
91
xmlcopyeditor.spec
Normal file
|
|
@ -0,0 +1,91 @@
|
||||||
|
Name: xmlcopyeditor
|
||||||
|
Version: 1.2.0.4
|
||||||
|
Release: 1%{?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.2.0.4-gcc44.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 .gcc44
|
||||||
|
|
||||||
|
%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
|
||||||
|
* Fri May 20 2011 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> 1.2.0.4-1
|
||||||
|
- Upstream update
|
||||||
|
|
||||||
|
* Thu Mar 10 2011 Kalev Lember <kalev@smartlink.ee> - 1.2.0.2-5
|
||||||
|
- Rebuilt with xerces-c 3.1
|
||||||
|
|
||||||
|
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.0.2-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 14 2010 Dan Horák <dan@danny.cz> - 1.2.0.2-3
|
||||||
|
- rebuilt against wxGTK-2.8.11-2
|
||||||
|
|
||||||
|
* Sat Sep 12 2009 Caolán McNamara <caolanm@redhat.com> 1.2.0.2-2
|
||||||
|
- Resolves: rhbz#508867 rhbz#511552 FTBFS
|
||||||
|
|
||||||
|
* Thu Feb 05 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> 1.2.0.2-1
|
||||||
|
- Upstream update (http://sourceforge.net/news/?group_id=141776)
|
||||||
|
|
||||||
|
* 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
|
||||||
Loading…
Add table
Add a link
Reference in a new issue