[packages/sword] - up to 1.9.0

[baggins]

commit b4a374c8f765b6061d05ef6206a27537100945ef
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Aug 15 16:51:29 2021 +0200

    - up to 1.9.0

 sword-icu64.patch | 78 -------------------------------------------------------
 sword.spec        | 11 ++++----
 2 files changed, 5 insertions(+), 84 deletions(-)
---
diff --git a/sword.spec b/sword.spec
index b4e1a84..3d88b9e 100644
--- a/sword.spec
+++ b/sword.spec
@@ -14,13 +14,12 @@
 Summary:	The SWORD Project framework for manipulating Bible texts
 Summary(pl.UTF-8):	Szkielet projektu SWORD do pracy nad tekstami biblijnymi
 Name:		sword
-Version:	1.7.4
-Release:	6
+Version:	1.9.0
+Release:	1
 License:	GPL v2
 Group:		Libraries
-Source0:	http://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/%{name}-%{version}.tar.gz
-# Source0-md5:	1677f02a86cbf07713d4e1d4c39791e6
-Patch0:		%{name}-icu64.patch
+Source0:	http://www.crosswire.org/ftpmirror/pub/sword/source/v1.9/%{name}-%{version}.tar.gz
+# Source0-md5:	7b86ab627993ef295307e3729d8edef2
 URL:		http://www.crosswire.org/sword
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
@@ -104,7 +103,6 @@ Biblioteka statyczna do rozwijania aplikacji sword.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -158,6 +156,7 @@ rm -rf $RPM_BUILD_ROOT
 %files utilities
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/diatheke
+%attr(755,root,root) %{_bindir}/emptyvss
 %attr(755,root,root) %{_bindir}/imp2gbs
 %attr(755,root,root) %{_bindir}/imp2ld
 %attr(755,root,root) %{_bindir}/imp2vs
diff --git a/sword-icu64.patch b/sword-icu64.patch
deleted file mode 100644
index 8faf5e4..0000000
--- a/sword-icu64.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -bur sword-1.7.4.orig/include/utf8transliterator.h sword-1.7.4/include/utf8transliterator.h
---- sword-1.7.4.orig/include/utf8transliterator.h	2013-07-18 00:34:43.000000000 +0200
-+++ sword-1.7.4/include/utf8transliterator.h	2019-04-13 23:12:32.614203906 +0200
-@@ -50,11 +50,11 @@
- class SWModule;
- 
- struct SWTransData {
--	UnicodeString resource;
-+	icu::UnicodeString resource;
- 	UTransDirection dir;
- };
--typedef std::map<const UnicodeString, SWTransData> SWTransMap;
--typedef std::pair<UnicodeString, SWTransData> SWTransPair;
-+typedef std::map<const icu::UnicodeString, SWTransData> SWTransMap;
-+typedef std::pair<icu::UnicodeString, SWTransData> SWTransPair;
- 
- /** This Filter uses ICU for transliteration
- */
-@@ -77,11 +77,11 @@
- 	UErrorCode utf8status;
- 
- 	void Load(UErrorCode &status);
--	void registerTrans(const UnicodeString& ID, const UnicodeString& resource, UTransDirection dir, UErrorCode &status);	
--	bool checkTrans(const UnicodeString& ID, UErrorCode &status);
-+	void registerTrans(const icu::UnicodeString& ID, const icu::UnicodeString& resource, UTransDirection dir, UErrorCode &status);	
-+	bool checkTrans(const icu::UnicodeString& ID, UErrorCode &status);
- #endif
- 	bool addTrans(const char* newTrans, SWBuf* transList);
--	Transliterator *createTrans(const UnicodeString& ID, UTransDirection dir, UErrorCode &status);
-+	icu::Transliterator *createTrans(const icu::UnicodeString& ID, UTransDirection dir, UErrorCode &status);
- 
- public:
- 	UTF8Transliterator();
-diff -bur sword-1.7.4.orig/src/modules/filters/utf8nfc.cpp sword-1.7.4/src/modules/filters/utf8nfc.cpp
---- sword-1.7.4.orig/src/modules/filters/utf8nfc.cpp	2014-04-17 05:56:12.000000000 +0200
-+++ sword-1.7.4/src/modules/filters/utf8nfc.cpp	2019-04-13 23:20:04.374845084 +0200
-@@ -46,11 +46,11 @@
- 		return -1;
-         
- 	err = U_ZERO_ERROR;
--	UnicodeString source(text.getRawData(), text.length(), conv, err);
--	UnicodeString target;
-+	icu::UnicodeString source(text.getRawData(), text.length(), conv, err);
-+	icu::UnicodeString target;
- 
- 	err = U_ZERO_ERROR;
--	Normalizer::normalize(source, UNORM_NFC, 0, target, err);
-+	icu::Normalizer::normalize(source, UNORM_NFC, 0, target, err);
- 
- 	err = U_ZERO_ERROR;
- 	text.setSize(text.size()*2); // potentially, it can grow to 2x the original size
-diff -bur sword-1.7.4.orig/src/modules/filters/utf8transliterator.cpp sword-1.7.4/src/modules/filters/utf8transliterator.cpp
---- sword-1.7.4.orig/src/modules/filters/utf8transliterator.cpp	2013-07-18 00:44:29.000000000 +0200
-+++ sword-1.7.4/src/modules/filters/utf8transliterator.cpp	2019-04-13 23:18:33.983429613 +0200
-@@ -328,9 +328,9 @@
- }
- 
- 
--Transliterator * UTF8Transliterator::createTrans(const UnicodeString& ID, UTransDirection dir, UErrorCode &status )
-+icu::Transliterator * UTF8Transliterator::createTrans(const icu::UnicodeString& ID, UTransDirection dir, UErrorCode &status )
- {
--	Transliterator *trans = Transliterator::createInstance(ID,UTRANS_FORWARD,status);
-+	icu::Transliterator *trans = icu::Transliterator::createInstance(ID,UTRANS_FORWARD,status);
- 	if (U_FAILURE(status)) {
- 		delete trans;
- 		return NULL;
-@@ -906,9 +906,9 @@
-                 addTrans("NFC", &ID);
- 
-                 err = U_ZERO_ERROR;
--                Transliterator * trans = createTrans(UnicodeString(ID), UTRANS_FORWARD, err);
-+		icu::Transliterator * trans = createTrans(icu::UnicodeString(ID), UTRANS_FORWARD, err);
-                 if (trans && !U_FAILURE(err)) {
--                        UnicodeString target = UnicodeString(source);
-+			icu::UnicodeString target = icu::UnicodeString(source);
- 			trans->transliterate(target);
- 			text.setSize(text.size()*2);
- 			len = ucnv_fromUChars(conv, text.getRawData(), text.size(), target.getBuffer(), target.length(), &err);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sword.git/commitdiff/b4a374c8f765b6061d05ef6206a27537100945ef