[packages/xmlcopyeditor] - added type fixes, updated dependencies, package locales; release 4

qboosh qboosh at pld-linux.org
Sat Aug 30 16:17:49 CEST 2025


commit d700b3b20274977afd475fa2864a6db57a2ba6c5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Aug 30 16:20:32 2025 +0200

    - added type fixes, updated dependencies, package locales; release 4

 xmlcopyeditor-types.patch | 29 +++++++++++++++++++++++++++++
 xmlcopyeditor.spec        | 28 ++++++++++++++++++----------
 2 files changed, 47 insertions(+), 10 deletions(-)
---
diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec
index 46a0b91..5328a7b 100644
--- a/xmlcopyeditor.spec
+++ b/xmlcopyeditor.spec
@@ -2,19 +2,22 @@ Summary:	Fast, free, validating XML editor
 Summary(pl.UTF-8):	Szybkim, wolnodostępnym, walidującym edytorem XML
 Name:		xmlcopyeditor
 Version:	1.3.1.0
-Release:	3
+Release:	4
 License:	GPL v2
-Group:		Applications
-Source0:	http://downloads.sourceforge.net/xml-copy-editor/%{name}-%{version}.tar.gz
+Group:		Applications/Text
+Source0:	https://downloads.sourceforge.net/xml-copy-editor/%{name}-%{version}.tar.gz
 # Source0-md5:	3e515b07a9f3c3c73f03c43cbb8719cd
+Patch0:		%{name}-types.patch
 URL:		https://sourceforge.net/projects/xml-copy-editor/
-BuildRequires:	aspell-devel
 BuildRequires:	boost-devel
+BuildRequires:	enchant2-devel >= 2
 BuildRequires:	expat-devel
+BuildRequires:	intltool >= 0.40.0
 BuildRequires:	libstdc++-devel
+BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	libxslt-devel
-BuildRequires:	pcre-devel
-BuildRequires:	wxGTK3-unicode-devel
+BuildRequires:	pcre2-8-devel
+BuildRequires:	wxGTK3-unicode-devel >= 2.8.0
 BuildRequires:	xerces-c-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -27,6 +30,7 @@ XML.
 
 %prep
 %setup -q
+%patch -P0 -p1
 
 %build
 %configure \
@@ -40,15 +44,19 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{uk_UA,uk}
+
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/xmlcopyeditor
 %{_datadir}/%{name}
-%{_desktopdir}/%{name}.desktop
-%{_pixmapsdir}/%{name}.png
+%{_desktopdir}/xmlcopyeditor.desktop
+%{_pixmapsdir}/xmlcopyeditor.png
 %{_datadir}/metainfo/xmlcopyeditor.appdata.xml
 %{_mandir}/man1/xmlcopyeditor.1*
diff --git a/xmlcopyeditor-types.patch b/xmlcopyeditor-types.patch
new file mode 100644
index 0000000..84bf7f8
--- /dev/null
+++ b/xmlcopyeditor-types.patch
@@ -0,0 +1,29 @@
+--- xmlcopyeditor-1.3.1.0/src/wraplibxml.cpp.orig	2022-10-08 17:18:24.000000000 +0200
++++ xmlcopyeditor-1.3.1.0/src/wraplibxml.cpp	2025-08-30 15:40:06.441676589 +0200
+@@ -54,7 +54,7 @@ public:
+ 		xmlLoadCatalog ( CONV ( catalogPath ) );
+ 		::catalog = xmlLoadACatalog ( CONV ( catalogPath ) );
+ 
+-		initGenericErrorDefaultFunc ( NULL );
++		initGenericErrorDefaultFunc ( (xmlGenericErrorFunc*) NULL );
+ 	}
+ 
+ 	~Initializer ()
+@@ -706,7 +706,7 @@ int WrapLibxml::saveEncoding (
+ 
+ wxString WrapLibxml::getLastError()
+ {
+-	xmlErrorPtr err = xmlGetLastError();
++	const xmlError *err = xmlGetLastError();
+ 
+ 	if ( !err )
+ 		return nonParserError;
+@@ -722,7 +722,7 @@ wxString WrapLibxml::getLastError()
+ 
+ std::pair<int, int> WrapLibxml::getErrorPosition()
+ {
+-	xmlErrorPtr err = xmlGetLastError();
++	const xmlError *err = xmlGetLastError();
+ 	if ( !err )
+ 		return std::make_pair ( 1, 1 );
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xmlcopyeditor.git/commitdiff/d700b3b20274977afd475fa2864a6db57a2ba6c5



More information about the pld-cvs-commit mailing list