From c2639a5649c90f1c3ccd1e350d70c16a5a12fb15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 11:06:34 +0200 Subject: [PATCH 01/66] Rebuilt for Python 3.8 --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 45a29e3..2b27acd 100644 --- a/sword.spec +++ b/sword.spec @@ -2,7 +2,7 @@ Name: sword Version: 1.8.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -157,6 +157,9 @@ make tests %changelog +* Mon Aug 19 2019 Miro Hrončok - 1.8.1-14 +- Rebuilt for Python 3.8 + * Sun Aug 04 2019 Dominique Corbex - 1.8.1-13 - Added Perl bindings From fddb031c123743bc8dc622d48e65a73727cc398f Mon Sep 17 00:00:00 2001 From: Jaak Ristioja Date: Sat, 24 Aug 2019 14:47:02 +0300 Subject: [PATCH 02/66] Fixed potentially conflicting integer types being defined --- sword-1.8.1-integer-types.diff | 1488 ++++++++++++++++++++++++++++++++ sword.spec | 7 +- 2 files changed, 1494 insertions(+), 1 deletion(-) create mode 100644 sword-1.8.1-integer-types.diff diff --git a/sword-1.8.1-integer-types.diff b/sword-1.8.1-integer-types.diff new file mode 100644 index 0000000..b6d61db --- /dev/null +++ b/sword-1.8.1-integer-types.diff @@ -0,0 +1,1488 @@ +Author: Jaak Ristioja +Date: Sat Aug 24 14:31:34 2019 +0300 + + Removed all __[su](8|16|32|64) types from sysdata.h, use types + +diff --git a/examples/cmdline/search.cpp b/examples/cmdline/search.cpp +index 6e5d0ac9..e80f3541 100644 +--- a/examples/cmdline/search.cpp ++++ b/examples/cmdline/search.cpp +@@ -129,7 +129,7 @@ int main(int argc, char **argv) + // listkey.sort(); + while (!listkey.popError()) { + std::cout << (const char *)listkey; +- if (listkey.getElement()->userData) std::cout << " : " << (__u64)listkey.getElement()->userData << "%"; ++ if (listkey.getElement()->userData) std::cout << " : " << (std::uint64_t)listkey.getElement()->userData << "%"; + std::cout << std::endl; + listkey++; + } +diff --git a/include/rawstr.h b/include/rawstr.h +index d25ebc37..782cd0e0 100644 +--- a/include/rawstr.h ++++ b/include/rawstr.h +@@ -54,8 +54,8 @@ public: + virtual ~RawStr(); + void getIDXBuf(long ioffset, char **buf) const; + void getIDXBufDat(long ioffset, char **buf) const; +- signed char findOffset(const char *key, __u32 *start, __u16 *size, long away = 0, __u32 *idxoff = 0) const; +- void readText(__u32 start, __u16 *size, char **idxbuf, SWBuf &buf) const; ++ signed char findOffset(const char *key, std::uint32_t *start, std::uint16_t *size, long away = 0, std::uint32_t *idxoff = 0) const; ++ void readText(std::uint32_t start, std::uint16_t *size, char **idxbuf, SWBuf &buf) const; + static signed char createModule(const char *path); + }; + +diff --git a/include/rawstr4.h b/include/rawstr4.h +index 0277a25a..95d2e268 100644 +--- a/include/rawstr4.h ++++ b/include/rawstr4.h +@@ -53,8 +53,8 @@ public: + virtual ~RawStr4(); + void getIDXBuf(long ioffset, char **buf) const; + void getIDXBufDat(long ioffset, char **buf) const; +- signed char findOffset(const char *key, __u32 *start, __u32 *size, long away = 0, __u32 *idxoff = 0) const; +- void readText(__u32 start, __u32 *size, char **idxbuf, SWBuf &buf) const; ++ signed char findOffset(const char *key, std::uint32_t *start, std::uint32_t *size, long away = 0, std::uint32_t *idxoff = 0) const; ++ void readText(std::uint32_t start, std::uint32_t *size, char **idxbuf, SWBuf &buf) const; + static signed char createModule(const char *path); + }; + +diff --git a/include/swkey.h b/include/swkey.h +index f7c94f13..68c9e5d6 100644 +--- a/include/swkey.h ++++ b/include/swkey.h +@@ -114,7 +114,7 @@ protected: + public: + + // misc storage for whatever +- __u64 userData; ++ std::uint64_t userData; + + /** initializes instance of SWKey from a string + * All keys can be reduced to a string representation which should be able +diff --git a/include/sysdata.h b/include/sysdata.h +index f979f29f..75bcdefd 100644 +--- a/include/sysdata.h ++++ b/include/sysdata.h +@@ -22,6 +22,9 @@ + + #ifndef SIZEDTYPES_H + #define SIZEDTYPES_H ++ ++#include ++ + /* + * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the + * header files exported to user space +@@ -31,55 +34,34 @@ + #endif + + +-typedef signed char __s8; +-typedef unsigned char __u8; +- +-typedef signed short __s16; +-typedef unsigned short __u16; +- +-typedef signed int __s32; +-typedef unsigned int __u32; +- +-#ifdef OS_ANDROID +-#elif defined(__GNUC__) +-__extension__ typedef __signed__ long long __s64; +-__extension__ typedef unsigned long long __u64; +-#elif defined(__BORLANDC__) +-typedef signed __int64 __s64; +-typedef unsigned __int64 __u64; +-#else +-typedef signed long long __s64; +-typedef unsigned long long __u64; +-#endif +- + #undef __swswap16 + #undef __swswap32 + #undef __swswap64 + + #define __swswap16(x) \ +- ((__u16)( \ +- (((__u16)(x) & (__u16)0x00ffU) << 8) | \ +- (((__u16)(x) & (__u16)0xff00U) >> 8) )) ++ ((std::uint16_t)( \ ++ (((std::uint16_t)(x) & (std::uint16_t)0x00ffU) << 8) | \ ++ (((std::uint16_t)(x) & (std::uint16_t)0xff00U) >> 8) )) + + + #define __swswap32(x) \ +- ((__u32)( \ +- (((__u32)(x) & (__u32)0x000000ffUL) << 24) | \ +- (((__u32)(x) & (__u32)0x0000ff00UL) << 8) | \ +- (((__u32)(x) & (__u32)0x00ff0000UL) >> 8) | \ +- (((__u32)(x) & (__u32)0xff000000UL) >> 24) )) ++ ((std::uint32_t)( \ ++ (((std::uint32_t)(x) & (std::uint32_t)0x000000ffUL) << 24) | \ ++ (((std::uint32_t)(x) & (std::uint32_t)0x0000ff00UL) << 8) | \ ++ (((std::uint32_t)(x) & (std::uint32_t)0x00ff0000UL) >> 8) | \ ++ (((std::uint32_t)(x) & (std::uint32_t)0xff000000UL) >> 24) )) + + + #define __swswap64(x) \ +- ((__u64)( \ +- (__u64)(((__u64)(x) & (__u64)0x00000000000000ffULL) << 56) | \ +- (__u64)(((__u64)(x) & (__u64)0x000000000000ff00ULL) << 40) | \ +- (__u64)(((__u64)(x) & (__u64)0x0000000000ff0000ULL) << 24) | \ +- (__u64)(((__u64)(x) & (__u64)0x00000000ff000000ULL) << 8) | \ +- (__u64)(((__u64)(x) & (__u64)0x000000ff00000000ULL) >> 8) | \ +- (__u64)(((__u64)(x) & (__u64)0x0000ff0000000000ULL) >> 24) | \ +- (__u64)(((__u64)(x) & (__u64)0x00ff000000000000ULL) >> 40) | \ +- (__u64)(((__u64)(x) & (__u64)0xff00000000000000ULL) >> 56) )) ++ ((std::uint64_t)( \ ++ (std::uint64_t)(((std::uint64_t)(x) & (std::uint64_t)0x00000000000000ffULL) << 56) | \ ++ (std::uint64_t)(((std::uint64_t)(x) & (std::uint64_t)0x000000000000ff00ULL) << 40) | \ ++ (std::uint64_t)(((std::uint64_t)(x) & (std::uint64_t)0x0000000000ff0000ULL) << 24) | \ ++ (std::uint64_t)(((std::uint64_t)(x) & (std::uint64_t)0x00000000ff000000ULL) << 8) | \ ++ (std::uint64_t)(((std::uint64_t)(x) & (std::uint64_t)0x000000ff00000000ULL) >> 8) | \ ++ (std::uint64_t)(((std::uint64_t)(x) & (std::uint64_t)0x0000ff0000000000ULL) >> 24) | \ ++ (std::uint64_t)(((std::uint64_t)(x) & (std::uint64_t)0x00ff000000000000ULL) >> 40) | \ ++ (std::uint64_t)(((std::uint64_t)(x) & (std::uint64_t)0xff00000000000000ULL) >> 56) )) + + + +diff --git a/include/treekeyidx.h b/include/treekeyidx.h +index 331b7e83..3aa6c668 100644 +--- a/include/treekeyidx.h ++++ b/include/treekeyidx.h +@@ -42,12 +42,12 @@ class SWDLLEXPORT TreeKeyIdx : public TreeKey { + TreeNode(); + ~TreeNode(); + void clear(); +- __s32 offset; +- __s32 parent; +- __s32 next; +- __s32 firstChild; ++ std::int32_t offset; ++ std::int32_t parent; ++ std::int32_t next; ++ std::int32_t firstChild; + char *name; +- __u16 dsize; ++ std::uint16_t dsize; + char *userData; + } currentNode; + +diff --git a/include/utilstr.h b/include/utilstr.h +index a20706ed..aeec6db3 100644 +--- a/include/utilstr.h ++++ b/include/utilstr.h +@@ -86,8 +86,8 @@ extern const unsigned char SW_toupper_array[256]; + * unicode codepoint value (0 with buf incremented is invalid UTF8 byte + */ + +-inline __u32 getUniCharFromUTF8(const unsigned char **buf, bool skipValidation = false) { +- __u32 ch = 0; ++inline std::uint32_t getUniCharFromUTF8(const unsigned char **buf, bool skipValidation = false) { ++ std::uint32_t ch = 0; + + //case: We're at the end + if (!(**buf)) { +@@ -163,7 +163,7 @@ inline __u32 getUniCharFromUTF8(const unsigned char **buf, bool skipValidation = + * to work with + */ + +-inline SWBuf *getUTF8FromUniChar(__u32 uchar, SWBuf *appendTo) { ++inline SWBuf *getUTF8FromUniChar(std::uint32_t uchar, SWBuf *appendTo) { + unsigned long base = appendTo->size(); + + // This would be out of Unicode bounds +diff --git a/include/xzcomprs.h b/include/xzcomprs.h +index f3fe42b2..1483240a 100644 +--- a/include/xzcomprs.h ++++ b/include/xzcomprs.h +@@ -42,7 +42,7 @@ public: + virtual void Decode(void); + virtual void setLevel(int l); + private: +- __u64 memlimit; // memory usage limit during decompression ++ std::uint64_t memlimit; // memory usage limit during decompression + }; + + SWORD_NAMESPACE_END +diff --git a/src/keys/treekeyidx.cpp b/src/keys/treekeyidx.cpp +index c4716868..915873b6 100644 +--- a/src/keys/treekeyidx.cpp ++++ b/src/keys/treekeyidx.cpp +@@ -177,7 +177,7 @@ bool TreeKeyIdx::nextSibling() { + + bool TreeKeyIdx::previousSibling() { + TreeNode iterator; +- __s32 target = currentNode.offset; ++ std::int32_t target = currentNode.offset; + if (currentNode.parent > -1) { + getTreeNodeFromIdxOffset(currentNode.parent, &iterator); + getTreeNodeFromIdxOffset(iterator.firstChild, &iterator); +@@ -207,10 +207,10 @@ void TreeKeyIdx::append() { + while (lastSib.next > -1) { + getTreeNodeFromIdxOffset(lastSib.next, &lastSib); + } +- __u32 idxOffset = (__u32)idxfd->seek(0, SEEK_END); ++ std::uint32_t idxOffset = (std::uint32_t)idxfd->seek(0, SEEK_END); + lastSib.next = idxOffset; + saveTreeNodeOffsets(&lastSib); +- __u32 parent = currentNode.parent; ++ std::uint32_t parent = currentNode.parent; + currentNode.clear(); + currentNode.offset = idxOffset; + currentNode.parent = parent; +@@ -224,10 +224,10 @@ void TreeKeyIdx::appendChild() { + append(); + } + else { +- __u32 idxOffset = (__u32)idxfd->seek(0, SEEK_END); ++ std::uint32_t idxOffset = (std::uint32_t)idxfd->seek(0, SEEK_END); + currentNode.firstChild = idxOffset; + saveTreeNodeOffsets(¤tNode); +- __u32 parent = currentNode.offset; ++ std::uint32_t parent = currentNode.offset; + currentNode.clear(); + currentNode.offset = idxOffset; + currentNode.parent = parent; +@@ -257,7 +257,7 @@ void TreeKeyIdx::remove() { + } + if (!done) { + TreeNode iterator; +- __s32 target = currentNode.offset; ++ std::int32_t target = currentNode.offset; + if (currentNode.parent > -1) { + getTreeNodeFromIdxOffset(currentNode.parent, &iterator); + getTreeNodeFromIdxOffset(iterator.firstChild, &iterator); +@@ -331,8 +331,8 @@ signed char TreeKeyIdx::create(const char *ipath) { + void TreeKeyIdx::getTreeNodeFromDatOffset(long ioffset, TreeNode *node) const { + unsnappedKeyText = ""; + char ch; +- __s32 tmp; +- __u16 tmp2; ++ std::int32_t tmp; ++ std::uint16_t tmp2; + + if (datfd && datfd->getFd() >= 0) { + +@@ -379,7 +379,7 @@ void TreeKeyIdx::getTreeNodeFromDatOffset(long ioffset, TreeNode *node) const { + + char TreeKeyIdx::getTreeNodeFromIdxOffset(long ioffset, TreeNode *node) const { + unsnappedKeyText = ""; +- __u32 offset; ++ std::uint32_t offset; + char error = KEYERR_OUTOFBOUNDS; + + if (ioffset < 0) { +@@ -387,7 +387,7 @@ char TreeKeyIdx::getTreeNodeFromIdxOffset(long ioffset, TreeNode *node) const { + error = 77; // out of bounds but still position to 0; + } + +- node->offset = (__s32)ioffset; ++ node->offset = (std::int32_t)ioffset; + if (idxfd && idxfd->getFd() >= 0) { + idxfd->seek(ioffset, SEEK_SET); + if (idxfd->read(&offset, 4) == 4) { +@@ -421,13 +421,13 @@ void TreeKeyIdx::setOffset(unsigned long offset) { + void TreeKeyIdx::saveTreeNodeOffsets(TreeNode *node) { + unsnappedKeyText = ""; + long datOffset = 0; +- __s32 tmp; ++ std::int32_t tmp; + + if (idxfd && idxfd->getFd() >= 0) { + idxfd->seek(node->offset, SEEK_SET); + if (idxfd->read(&tmp, 4) != 4) { + datOffset = datfd->seek(0, SEEK_END); +- tmp = (__s32)archtosword32(datOffset); ++ tmp = (std::int32_t)archtosword32(datOffset); + idxfd->write(&tmp, 4); + } + else { +@@ -435,13 +435,13 @@ void TreeKeyIdx::saveTreeNodeOffsets(TreeNode *node) { + datfd->seek(datOffset, SEEK_SET); + } + +- tmp = (__s32)archtosword32(node->parent); ++ tmp = (std::int32_t)archtosword32(node->parent); + datfd->write(&tmp, 4); + +- tmp = (__s32)archtosword32(node->next); ++ tmp = (std::int32_t)archtosword32(node->next); + datfd->write(&tmp, 4); + +- tmp = (__s32)archtosword32(node->firstChild); ++ tmp = (std::int32_t)archtosword32(node->firstChild); + datfd->write(&tmp, 4); + } + } +@@ -488,12 +488,12 @@ void TreeKeyIdx::copyFrom(const TreeKeyIdx &ikey) { + + void TreeKeyIdx::saveTreeNode(TreeNode *node) { + long datOffset = 0; +- __s32 tmp; ++ std::int32_t tmp; + if (idxfd && idxfd->getFd() >= 0) { + + idxfd->seek(node->offset, SEEK_SET); + datOffset = datfd->seek(0, SEEK_END); +- tmp = (__s32)archtosword32(datOffset); ++ tmp = (std::int32_t)archtosword32(datOffset); + idxfd->write(&tmp, 4); + + saveTreeNodeOffsets(node); +@@ -502,7 +502,7 @@ void TreeKeyIdx::saveTreeNode(TreeNode *node) { + char null = 0; + datfd->write(&null, 1); + +- __u16 tmp2 = archtosword16(node->dsize); ++ std::uint16_t tmp2 = archtosword16(node->dsize); + datfd->write(&tmp2, 2); + + if (node->dsize) { +diff --git a/src/keys/versekey.cpp b/src/keys/versekey.cpp +index bad90fbf..01101634 100644 +--- a/src/keys/versekey.cpp ++++ b/src/keys/versekey.cpp +@@ -776,7 +776,7 @@ terminate_range: + lastKey->setPosition(TOP); + tmpListKey << *lastKey; + ((VerseKey *)tmpListKey.getElement())->setAutoNormalize(isAutoNormalize()); +- tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); ++ tmpListKey.getElement()->userData = (std::uint64_t)(bufStart+(buf-iBuf.c_str())); + } + else { + if (!dash) { // if last separator was not a dash just add +@@ -790,7 +790,7 @@ terminate_range: + *lastKey = TOP; + tmpListKey << *lastKey; + ((VerseKey *)tmpListKey.getElement())->setAutoNormalize(isAutoNormalize()); +- tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); ++ tmpListKey.getElement()->userData = (std::uint64_t)(bufStart+(buf-iBuf.c_str())); + } + else { + bool f = false; +@@ -805,7 +805,7 @@ terminate_range: + *lastKey = TOP; + tmpListKey << *lastKey; + ((VerseKey *)tmpListKey.getElement())->setAutoNormalize(isAutoNormalize()); +- tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); ++ tmpListKey.getElement()->userData = (std::uint64_t)(bufStart+(buf-iBuf.c_str())); + } + } + else if (expandRange) { +@@ -818,7 +818,7 @@ terminate_range: + newElement->setUpperBound(*curKey); + *lastKey = *curKey; + *newElement = TOP; +- tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); ++ tmpListKey.getElement()->userData = (std::uint64_t)(bufStart+(buf-iBuf.c_str())); + } + } + } +@@ -1049,7 +1049,7 @@ terminate_range: + lastKey->setLowerBound(*curKey); + *lastKey = TOP; + tmpListKey << *lastKey; +- tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); ++ tmpListKey.getElement()->userData = (std::uint64_t)(bufStart+(buf-iBuf.c_str())); + } + else { + if (!dash) { // if last separator was not a dash just add +@@ -1062,7 +1062,7 @@ terminate_range: + lastKey->setUpperBound(*curKey); + *lastKey = TOP; + tmpListKey << *lastKey; +- tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); ++ tmpListKey.getElement()->userData = (std::uint64_t)(bufStart+(buf-iBuf.c_str())); + } + else { + bool f = false; +@@ -1076,7 +1076,7 @@ terminate_range: + lastKey->setUpperBound(*curKey); + *lastKey = TOP; + tmpListKey << *lastKey; +- tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); ++ tmpListKey.getElement()->userData = (std::uint64_t)(bufStart+(buf-iBuf.c_str())); + } + } + else if (expandRange) { +@@ -1088,7 +1088,7 @@ terminate_range: + *curKey = MAXVERSE; + newElement->setUpperBound(*curKey); + *newElement = TOP; +- tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); ++ tmpListKey.getElement()->userData = (std::uint64_t)(bufStart+(buf-iBuf.c_str())); + } + } + } +diff --git a/src/modules/comments/rawfiles/rawfiles.cpp b/src/modules/comments/rawfiles/rawfiles.cpp +index bfd3e1da..d32fb104 100644 +--- a/src/modules/comments/rawfiles/rawfiles.cpp ++++ b/src/modules/comments/rawfiles/rawfiles.cpp +@@ -187,7 +187,7 @@ void RawFiles::deleteEntry() { + + const char *RawFiles::getNextFilename() { + static SWBuf incfile; +- __u32 number = 0; ++ std::uint32_t number = 0; + FileDesc *datafile; + + incfile.setFormatted("%s/incfile", path); +@@ -213,7 +213,7 @@ const char *RawFiles::getNextFilename() { + char RawFiles::createModule(const char *path) { + char *incfile = new char [ strlen (path) + 16 ]; + +- __u32 zero = 0; ++ std::uint32_t zero = 0; + zero = archtosword32(zero); + + FileDesc *datafile; +diff --git a/src/modules/common/entriesblk.cpp b/src/modules/common/entriesblk.cpp +index c2c02e41..d1383711 100644 +--- a/src/modules/common/entriesblk.cpp ++++ b/src/modules/common/entriesblk.cpp +@@ -37,13 +37,13 @@ EntriesBlock::EntriesBlock(const char *iBlock, unsigned long size) { + memcpy(block, iBlock, size); + } + else { +- block = (char *)calloc(1, sizeof(__u32)); ++ block = (char *)calloc(1, sizeof(std::uint32_t)); + } + } + + + EntriesBlock::EntriesBlock() { +- block = (char *)calloc(1, sizeof(__u32)); ++ block = (char *)calloc(1, sizeof(std::uint32_t)); + } + + +@@ -53,22 +53,22 @@ EntriesBlock::~EntriesBlock() { + + + void EntriesBlock::setCount(int count) { +- __u32 rawCount = archtosword32(count); +- memcpy(block, &rawCount, sizeof(__u32)); ++ std::uint32_t rawCount = archtosword32(count); ++ memcpy(block, &rawCount, sizeof(std::uint32_t)); + } + + + int EntriesBlock::getCount() { +- __u32 count = 0; +- memcpy(&count, block, sizeof(__u32)); ++ std::uint32_t count = 0; ++ memcpy(&count, block, sizeof(std::uint32_t)); + count = swordtoarch32(count); + return count; + } + + + void EntriesBlock::getMetaEntry(int index, unsigned long *offset, unsigned long *size) { +- __u32 rawOffset = 0; +- __u32 rawSize = 0; ++ std::uint32_t rawOffset = 0; ++ std::uint32_t rawSize = 0; + *offset = 0; + *size = 0; + if (index >= getCount()) // assert index < count +@@ -84,8 +84,8 @@ void EntriesBlock::getMetaEntry(int index, unsigned long *offset, unsigned long + + + void EntriesBlock::setMetaEntry(int index, unsigned long offset, unsigned long size) { +- __u32 rawOffset = (__u32)archtosword32(offset); +- __u32 rawSize = (__u32)archtosword32(size); ++ std::uint32_t rawOffset = (std::uint32_t)archtosword32(offset); ++ std::uint32_t rawSize = (std::uint32_t)archtosword32(size); + + if (index >= getCount()) // assert index < count + return; +diff --git a/src/modules/common/rawstr.cpp b/src/modules/common/rawstr.cpp +index 0541b5c3..4bec07c5 100644 +--- a/src/modules/common/rawstr.cpp ++++ b/src/modules/common/rawstr.cpp +@@ -145,7 +145,7 @@ void RawStr::getIDXBufDat(long ioffset, char **buf) const + + void RawStr::getIDXBuf(long ioffset, char **buf) const + { +- __u32 offset; ++ std::uint32_t offset; + + if (idxfd && idxfd->getFd() >= 0) { + idxfd->seek(ioffset, SEEK_SET); +@@ -170,7 +170,7 @@ void RawStr::getIDXBuf(long ioffset, char **buf) const + * RET: error status -1 general error; -2 new file + */ + +-signed char RawStr::findOffset(const char *ikey, __u32 *start, __u16 *size, long away, __u32 *idxoff) const ++signed char RawStr::findOffset(const char *ikey, std::uint32_t *start, std::uint16_t *size, long away, std::uint32_t *idxoff) const + { + char *trybuf, *maxbuf, *key = 0, quitflag = 0; + signed char retval = -1; +@@ -239,13 +239,13 @@ signed char RawStr::findOffset(const char *ikey, __u32 *start, __u16 *size, long + + idxfd->seek(tryoff, SEEK_SET); + +- __u32 tmpStart; +- __u16 tmpSize; ++ std::uint32_t tmpStart; ++ std::uint16_t tmpSize; + *start = *size = tmpStart = tmpSize = 0; + idxfd->read(&tmpStart, 4); + idxfd->read(&tmpSize, 2); + if (idxoff) +- *idxoff = (__u32)tryoff; ++ *idxoff = (std::uint32_t)tryoff; + + *start = swordtoarch32(tmpStart); + *size = swordtoarch16(tmpSize); +@@ -264,17 +264,17 @@ signed char RawStr::findOffset(const char *ikey, __u32 *start, __u16 *size, long + if (bad) { + if(!awayFromSubstrCheck) + retval = -1; +- *start = (__u32)laststart; ++ *start = (std::uint32_t)laststart; + *size = lastsize; + tryoff = lasttry; + if (idxoff) +- *idxoff = (__u32)tryoff; ++ *idxoff = (std::uint32_t)tryoff; + break; + } + idxfd->read(&tmpStart, 4); + idxfd->read(&tmpSize, 2); + if (idxoff) +- *idxoff = (__u32)tryoff; ++ *idxoff = (std::uint32_t)tryoff; + + *start = swordtoarch32(tmpStart); + *size = swordtoarch16(tmpSize); +@@ -306,12 +306,12 @@ signed char RawStr::findOffset(const char *ikey, __u32 *start, __u16 *size, long + * + */ + +-void RawStr::readText(__u32 istart, __u16 *isize, char **idxbuf, SWBuf &buf) const ++void RawStr::readText(std::uint32_t istart, std::uint16_t *isize, char **idxbuf, SWBuf &buf) const + { + unsigned int ch; + char *idxbuflocal = 0; + getIDXBufDat(istart, &idxbuflocal); +- __u32 start = istart; ++ std::uint32_t start = istart; + + do { + if (*idxbuf) +@@ -368,12 +368,12 @@ void RawStr::readText(__u32 istart, __u16 *isize, char **idxbuf, SWBuf &buf) con + void RawStr::doSetText(const char *ikey, const char *buf, long len) + { + +- __u32 start, outstart; +- __u32 idxoff; +- __u32 endoff; +- __s32 shiftSize; +- __u16 size; +- __u16 outsize; ++ std::uint32_t start, outstart; ++ std::uint32_t idxoff; ++ std::uint32_t endoff; ++ std::int32_t shiftSize; ++ std::uint16_t size; ++ std::uint16_t outsize; + char *tmpbuf = 0; + char *key = 0; + char *dbKey = 0; +@@ -426,7 +426,7 @@ void RawStr::doSetText(const char *ikey, const char *buf, long len) + while (true); // while we're resolving links + } + +- endoff = (__u32)idxfd->seek(0, SEEK_END); ++ endoff = (std::uint32_t)idxfd->seek(0, SEEK_END); + + shiftSize = endoff - idxoff; + +@@ -442,7 +442,7 @@ void RawStr::doSetText(const char *ikey, const char *buf, long len) + memcpy(outbuf + size, buf, len); + size = outsize = size + (len); + +- start = outstart = (__u32)datfd->seek(0, SEEK_END); ++ start = outstart = (std::uint32_t)datfd->seek(0, SEEK_END); + + outstart = archtosword32(start); + outsize = archtosword16(size); +diff --git a/src/modules/common/rawstr4.cpp b/src/modules/common/rawstr4.cpp +index 2d49b3d7..bf249516 100644 +--- a/src/modules/common/rawstr4.cpp ++++ b/src/modules/common/rawstr4.cpp +@@ -145,7 +145,7 @@ void RawStr4::getIDXBufDat(long ioffset, char **buf) const + + void RawStr4::getIDXBuf(long ioffset, char **buf) const + { +- __u32 offset; ++ std::uint32_t offset; + + if ((unsigned long)idxfd > 0) { + idxfd->seek(ioffset, SEEK_SET); +@@ -179,7 +179,7 @@ void RawStr4::getIDXBuf(long ioffset, char **buf) const + * RET: error status -1 general error; -2 new file + */ + +-signed char RawStr4::findOffset(const char *ikey, __u32 *start, __u32 *size, long away, __u32 *idxoff) const ++signed char RawStr4::findOffset(const char *ikey, std::uint32_t *start, std::uint32_t *size, long away, std::uint32_t *idxoff) const + { + char *trybuf, *maxbuf, *key = 0, quitflag = 0; + signed char retval = -1; +@@ -249,12 +249,12 @@ signed char RawStr4::findOffset(const char *ikey, __u32 *start, __u32 *size, lon + + idxfd->seek(tryoff, SEEK_SET); + +- __u32 tmpStart, tmpSize; ++ std::uint32_t tmpStart, tmpSize; + *start = *size = tmpStart = tmpSize = 0; + idxfd->read(&tmpStart, 4); + idxfd->read(&tmpSize, 4); + if (idxoff) +- *idxoff = (__u32)tryoff; ++ *idxoff = (std::uint32_t)tryoff; + + *start = swordtoarch32(tmpStart); + *size = swordtoarch32(tmpSize); +@@ -273,17 +273,17 @@ signed char RawStr4::findOffset(const char *ikey, __u32 *start, __u32 *size, lon + if (bad) { + if(!awayFromSubstrCheck) + retval = -1; +- *start = (__u32)laststart; +- *size = (__u32)lastsize; ++ *start = (std::uint32_t)laststart; ++ *size = (std::uint32_t)lastsize; + tryoff = lasttry; + if (idxoff) +- *idxoff = (__u32)tryoff; ++ *idxoff = (std::uint32_t)tryoff; + break; + } + idxfd->read(&tmpStart, 4); + idxfd->read(&tmpSize, 4); + if (idxoff) +- *idxoff = (__u32)tryoff; ++ *idxoff = (std::uint32_t)tryoff; + + *start = swordtoarch32(tmpStart); + *size = swordtoarch32(tmpSize); +@@ -315,12 +315,12 @@ signed char RawStr4::findOffset(const char *ikey, __u32 *start, __u32 *size, lon + * + */ + +-void RawStr4::readText(__u32 istart, __u32 *isize, char **idxbuf, SWBuf &buf) const ++void RawStr4::readText(std::uint32_t istart, std::uint32_t *isize, char **idxbuf, SWBuf &buf) const + { + unsigned int ch; + char *idxbuflocal = 0; + getIDXBufDat(istart, &idxbuflocal); +- __u32 start = istart; ++ std::uint32_t start = istart; + + do { + if (*idxbuf) +@@ -376,12 +376,12 @@ void RawStr4::readText(__u32 istart, __u32 *isize, char **idxbuf, SWBuf &buf) co + + void RawStr4::doSetText(const char *ikey, const char *buf, long len) { + +- __u32 start, outstart; +- __u32 idxoff; +- __u32 endoff; +- __s32 shiftSize; +- __u32 size; +- __u32 outsize; ++ std::uint32_t start, outstart; ++ std::uint32_t idxoff; ++ std::uint32_t endoff; ++ std::int32_t shiftSize; ++ std::uint32_t size; ++ std::uint32_t outsize; + char *tmpbuf = 0; + char *key = 0; + char *dbKey = 0; +@@ -434,7 +434,7 @@ void RawStr4::doSetText(const char *ikey, const char *buf, long len) { + while (true); // while we're resolving links + } + +- endoff = (__u32)idxfd->seek(0, SEEK_END); ++ endoff = (std::uint32_t)idxfd->seek(0, SEEK_END); + + shiftSize = endoff - idxoff; + +@@ -448,9 +448,9 @@ void RawStr4::doSetText(const char *ikey, const char *buf, long len) { + sprintf(outbuf, "%s%c%c", key, 13, 10); + size = strlen(outbuf); + memcpy(outbuf + size, buf, len); +- size = outsize = size + (__u32)len; ++ size = outsize = size + (std::uint32_t)len; + +- start = outstart = (__u32)datfd->seek(0, SEEK_END); ++ start = outstart = (std::uint32_t)datfd->seek(0, SEEK_END); + + outstart = archtosword32(start); + outsize = archtosword32(size); +diff --git a/src/modules/common/rawverse.cpp b/src/modules/common/rawverse.cpp +index 3e79b88d..39560a3b 100644 +--- a/src/modules/common/rawverse.cpp ++++ b/src/modules/common/rawverse.cpp +@@ -122,8 +122,8 @@ void RawVerse::findOffset(char testmt, long idxoff, long *start, unsigned short + + if (idxfp[testmt-1]->getFd() >= 0) { + idxfp[testmt-1]->seek(idxoff, SEEK_SET); +- __s32 tmpStart; +- __u16 tmpSize; ++ std::int32_t tmpStart; ++ std::uint16_t tmpSize; + idxfp[testmt-1]->read(&tmpStart, 4); + long len = idxfp[testmt-1]->read(&tmpSize, 2); // read size + +@@ -177,8 +177,8 @@ void RawVerse::readText(char testmt, long start, unsigned short size, SWBuf &buf + + void RawVerse::doSetText(char testmt, long idxoff, const char *buf, long len) + { +- __s32 start; +- __u16 size; ++ std::int32_t start; ++ std::uint16_t size; + + idxoff *= 6; + if (!testmt) +@@ -186,7 +186,7 @@ void RawVerse::doSetText(char testmt, long idxoff, const char *buf, long len) + + size = (len < 0) ? strlen(buf) : len; + +- start = (__s32)textfp[testmt-1]->seek(0, SEEK_END); ++ start = (std::int32_t)textfp[testmt-1]->seek(0, SEEK_END); + idxfp[testmt-1]->seek(idxoff, SEEK_SET); + + if (size) { +@@ -217,8 +217,8 @@ void RawVerse::doSetText(char testmt, long idxoff, const char *buf, long len) + */ + + void RawVerse::doLinkEntry(char testmt, long destidxoff, long srcidxoff) { +- __s32 start; +- __u16 size; ++ std::int32_t start; ++ std::uint16_t size; + + destidxoff *= 6; + srcidxoff *= 6; +@@ -282,8 +282,8 @@ char RawVerse::createModule(const char *ipath, const char *v11n) + vk.setVersificationSystem(v11n); + vk.setIntros(1); + +- __s32 offset = 0; +- __u16 size = 0; ++ std::int32_t offset = 0; ++ std::uint16_t size = 0; + offset = archtosword32(offset); + size = archtosword16(size); + +diff --git a/src/modules/common/rawverse4.cpp b/src/modules/common/rawverse4.cpp +index 67a43d8f..35d64f51 100644 +--- a/src/modules/common/rawverse4.cpp ++++ b/src/modules/common/rawverse4.cpp +@@ -123,8 +123,8 @@ void RawVerse4::findOffset(char testmt, long idxoff, long *start, unsigned long + + if (idxfp[testmt-1]->getFd() >= 0) { + idxfp[testmt-1]->seek(idxoff, SEEK_SET); +- __u32 tmpStart; +- __u32 tmpSize; ++ std::uint32_t tmpStart; ++ std::uint32_t tmpSize; + idxfp[testmt-1]->read(&tmpStart, 4); + long len = idxfp[testmt-1]->read(&tmpSize, 4); // read size + +@@ -178,16 +178,16 @@ void RawVerse4::readText(char testmt, long start, unsigned long size, SWBuf &buf + + void RawVerse4::doSetText(char testmt, long idxoff, const char *buf, long len) + { +- __u32 start; +- __u32 size; ++ std::uint32_t start; ++ std::uint32_t size; + + idxoff *= 8; + if (!testmt) + testmt = ((idxfp[1]) ? 1:2); + +- size = (__u32)((len < 0) ? strlen(buf) : len); ++ size = (std::uint32_t)((len < 0) ? strlen(buf) : len); + +- start = (__u32)textfp[testmt-1]->seek(0, SEEK_END); ++ start = (std::uint32_t)textfp[testmt-1]->seek(0, SEEK_END); + idxfp[testmt-1]->seek(idxoff, SEEK_SET); + + if (size) { +@@ -218,8 +218,8 @@ void RawVerse4::doSetText(char testmt, long idxoff, const char *buf, long len) + */ + + void RawVerse4::doLinkEntry(char testmt, long destidxoff, long srcidxoff) { +- __u32 start; +- __u32 size; ++ std::uint32_t start; ++ std::uint32_t size; + + destidxoff *= 8; + srcidxoff *= 8; +@@ -282,8 +282,8 @@ char RawVerse4::createModule(const char *ipath, const char *v11n) + VerseKey vk; + vk.setVersificationSystem(v11n); + vk.setIntros(1); +- __u32 offset = 0; +- __u32 size = 0; ++ std::uint32_t offset = 0; ++ std::uint32_t size = 0; + offset = archtosword32(offset); + size = archtosword32(size); + +diff --git a/src/modules/common/zstr.cpp b/src/modules/common/zstr.cpp +index 324372da..6bbb6e84 100644 +--- a/src/modules/common/zstr.cpp ++++ b/src/modules/common/zstr.cpp +@@ -167,7 +167,7 @@ void zStr::getKeyFromDatOffset(long ioffset, char **buf) const + + void zStr::getKeyFromIdxOffset(long ioffset, char **buf) const + { +- __u32 offset; ++ std::uint32_t offset; + + if (idxfd && idxfd->getFd() >= 0) { + idxfd->seek(ioffset, SEEK_SET); +@@ -194,13 +194,13 @@ signed char zStr::findKeyIndex(const char *ikey, long *idxoff, long away) const + { + char *maxbuf = 0, *trybuf = 0, *key = 0, quitflag = 0; + signed char retval = 0; +- __s32 headoff, tailoff, tryoff = 0, maxoff = 0; +- __u32 start, size; ++ std::int32_t headoff, tailoff, tryoff = 0, maxoff = 0; ++ std::uint32_t start, size; + int diff = 0; + bool awayFromSubstrCheck = false; + + if (idxfd->getFd() >= 0) { +- tailoff = maxoff = (__s32)idxfd->seek(0, SEEK_END) - IDXENTRYSIZE; ++ tailoff = maxoff = (std::int32_t)idxfd->seek(0, SEEK_END) - IDXENTRYSIZE; + if (*ikey) { + headoff = 0; + stdstr(&key, ikey, 3); +@@ -212,7 +212,7 @@ signed char zStr::findKeyIndex(const char *ikey, long *idxoff, long away) const + getKeyFromIdxOffset(maxoff, &maxbuf); + + while (headoff < tailoff) { +- tryoff = ((__s32)lastoff == -1) ? headoff + (((((tailoff / IDXENTRYSIZE) - (headoff / IDXENTRYSIZE))) / 2) * IDXENTRYSIZE) : (__s32)lastoff; ++ tryoff = ((std::int32_t)lastoff == -1) ? headoff + (((((tailoff / IDXENTRYSIZE) - (headoff / IDXENTRYSIZE))) / 2) * IDXENTRYSIZE) : (std::int32_t)lastoff; + lastoff = -1; + + getKeyFromIdxOffset(tryoff, &trybuf); +@@ -268,9 +268,9 @@ signed char zStr::findKeyIndex(const char *ikey, long *idxoff, long away) const + *idxoff = tryoff; + + while (away) { +- __u32 laststart = start; +- __u32 lastsize = size; +- __s32 lasttry = tryoff; ++ std::uint32_t laststart = start; ++ std::uint32_t lastsize = size; ++ std::int32_t lasttry = tryoff; + tryoff += (away > 0) ? IDXENTRYSIZE : -IDXENTRYSIZE; + + bool bad = false; +@@ -328,8 +328,8 @@ void zStr::getText(long offset, char **idxbuf, char **buf) const { + char *ch; + char *idxbuflocal = 0; + getKeyFromIdxOffset(offset, &idxbuflocal); +- __u32 start; +- __u32 size; ++ std::uint32_t start; ++ std::uint32_t size; + + do { + idxfd->seek(offset, SEEK_SET); +@@ -368,16 +368,16 @@ void zStr::getText(long offset, char **idxbuf, char **buf) const { + while (true); // while we're resolving links + + if (idxbuflocal) { +- __u32 localsize = (__u32)strlen(idxbuflocal); ++ std::uint32_t localsize = (std::uint32_t)strlen(idxbuflocal); + localsize = (localsize < (size - 1)) ? localsize : (size - 1); + strncpy(*idxbuf, idxbuflocal, localsize); + (*idxbuf)[localsize] = 0; + free(idxbuflocal); + } +- __u32 block = 0; +- __u32 entry = 0; +- memmove(&block, *buf, sizeof(__u32)); +- memmove(&entry, *buf + sizeof(__u32), sizeof(__u32)); ++ std::uint32_t block = 0; ++ std::uint32_t entry = 0; ++ memmove(&block, *buf, sizeof(std::uint32_t)); ++ memmove(&entry, *buf + sizeof(std::uint32_t), sizeof(std::uint32_t)); + block = swordtoarch32(block); + entry = swordtoarch32(entry); + getCompressedText(block, entry, buf); +@@ -391,10 +391,10 @@ void zStr::getText(long offset, char **idxbuf, char **buf) const { + + void zStr::getCompressedText(long block, long entry, char **buf) const { + +- __u32 size = 0; ++ std::uint32_t size = 0; + + if (cacheBlockIndex != block) { +- __u32 start = 0; ++ std::uint32_t start = 0; + + zdxfd->seek(block * ZDXENTRYSIZE, SEEK_SET); + zdxfd->read(&start, 4); +@@ -418,7 +418,7 @@ void zStr::getCompressedText(long block, long entry, char **buf) const { + cacheBlock = new EntriesBlock(rawBuf, len); + cacheBlockIndex = block; + } +- size = (__u32)cacheBlock->getEntrySize(entry); ++ size = (std::uint32_t)cacheBlock->getEntrySize(entry); + *buf = (*buf) ? (char *)realloc(*buf, size*2 + 1) : (char *)malloc(size*2 + 1); + strcpy(*buf, cacheBlock->getEntry(entry)); + } +@@ -436,11 +436,11 @@ void zStr::setText(const char *ikey, const char *buf, long len) { + + static const char nl[] = {13, 10}; + +- __u32 start, outstart; +- __u32 size, outsize; +- __s32 endoff; ++ std::uint32_t start, outstart; ++ std::uint32_t size, outsize; ++ std::int32_t endoff; + long idxoff = 0; +- __s32 shiftSize; ++ std::int32_t shiftSize; + char *tmpbuf = 0; + char *key = 0; + char *dbKey = 0; +@@ -499,9 +499,9 @@ void zStr::setText(const char *ikey, const char *buf, long len) { + } + } + +- endoff = (__s32)idxfd->seek(0, SEEK_END); ++ endoff = (std::int32_t)idxfd->seek(0, SEEK_END); + +- shiftSize = endoff - (__s32)idxoff; ++ shiftSize = endoff - (std::int32_t)idxoff; + + if (shiftSize > 0) { + idxBytes = new char [ shiftSize ]; +@@ -511,7 +511,7 @@ void zStr::setText(const char *ikey, const char *buf, long len) { + + outbuf = new char [ len + strlen(key) + 5 ]; + sprintf(outbuf, "%s%c%c", key, 13, 10); +- size = (__u32)strlen(outbuf); ++ size = (std::uint32_t)strlen(outbuf); + if (len > 0) { // NOT a link + if (!cacheBlock) { + flushCache(); +@@ -523,20 +523,20 @@ void zStr::setText(const char *ikey, const char *buf, long len) { + cacheBlock = new EntriesBlock(); + cacheBlockIndex = (zdxfd->seek(0, SEEK_END) / ZDXENTRYSIZE); + } +- __u32 entry = cacheBlock->addEntry(buf); ++ std::uint32_t entry = cacheBlock->addEntry(buf); + cacheDirty = true; +- outstart = (__u32)archtosword32(cacheBlockIndex); ++ outstart = (std::uint32_t)archtosword32(cacheBlockIndex); + outsize = archtosword32(entry); +- memcpy (outbuf + size, &outstart, sizeof(__u32)); +- memcpy (outbuf + size + sizeof(__u32), &outsize, sizeof(__u32)); +- size += (sizeof(__u32) * 2); ++ memcpy (outbuf + size, &outstart, sizeof(std::uint32_t)); ++ memcpy (outbuf + size + sizeof(std::uint32_t), &outsize, sizeof(std::uint32_t)); ++ size += (sizeof(std::uint32_t) * 2); + } + else { // link + memcpy(outbuf + size, buf, len); + size += len; + } + +- start = (__u32)datfd->seek(0, SEEK_END); ++ start = (std::uint32_t)datfd->seek(0, SEEK_END); + + outstart = archtosword32(start); + outsize = archtosword32(size); +@@ -593,9 +593,9 @@ void zStr::flushCache() const { + + if (cacheBlock) { + if (cacheDirty) { +- __u32 start = 0; ++ std::uint32_t start = 0; + unsigned long size = 0; +- __u32 outstart = 0, outsize = 0; ++ std::uint32_t outstart = 0, outsize = 0; + + const char *rawBuf = cacheBlock->getRawData(&size); + compressor->Buf(rawBuf, &size); +@@ -611,7 +611,7 @@ void zStr::flushCache() const { + unsigned long zdtSize = zdtfd->seek(0, SEEK_END); + + if ((cacheBlockIndex * ZDXENTRYSIZE) > (zdxSize - ZDXENTRYSIZE)) { // New Block +- start = (__u32)zdtSize; ++ start = (std::uint32_t)zdtSize; + } + else { + zdxfd->seek(cacheBlockIndex * ZDXENTRYSIZE, SEEK_SET); +@@ -626,14 +626,14 @@ void zStr::flushCache() const { + size = outsize; + } + else { // middle and bigger-- we have serious problems, for now let's put it at the end = lots of wasted space +- start = (__u32)zdtSize; ++ start = (std::uint32_t)zdtSize; + } + } + + + + outstart = archtosword32(start); +- outsize = archtosword32((__u32)size); ++ outsize = archtosword32((std::uint32_t)size); + + zdxfd->seek(cacheBlockIndex * ZDXENTRYSIZE, SEEK_SET); + zdtfd->seek(start, SEEK_SET); +diff --git a/src/modules/common/zverse.cpp b/src/modules/common/zverse.cpp +index d54c67d9..6ccd9111 100644 +--- a/src/modules/common/zverse.cpp ++++ b/src/modules/common/zverse.cpp +@@ -149,9 +149,9 @@ zVerse::~zVerse() + + void zVerse::findOffset(char testmt, long idxoff, long *start, unsigned short *size, unsigned long *buffnum) const + { +- __u32 ulBuffNum = 0; // buffer number +- __u32 ulVerseStart = 0; // verse offset within buffer +- __u16 usVerseSize = 0; // verse size ++ std::uint32_t ulBuffNum = 0; // buffer number ++ std::uint32_t ulVerseStart = 0; // verse offset within buffer ++ std::uint16_t usVerseSize = 0; // verse size + // set start to offset in + // set size to + // set +@@ -204,9 +204,9 @@ void zVerse::findOffset(char testmt, long idxoff, long *start, unsigned short *s + */ + + void zVerse::zReadText(char testmt, long start, unsigned short size, unsigned long ulBuffNum, SWBuf &inBuf) const { +- __u32 ulCompOffset = 0; // compressed buffer start +- __u32 ulCompSize = 0; // buffer size compressed +- __u32 ulUnCompSize = 0; // buffer size uncompressed ++ std::uint32_t ulCompOffset = 0; // compressed buffer start ++ std::uint32_t ulCompSize = 0; // buffer size compressed ++ std::uint32_t ulUnCompSize = 0; // buffer size uncompressed + + if (!testmt) { + testmt = ((idxfp[0]) ? 1:2); +@@ -312,14 +312,14 @@ void zVerse::doSetText(char testmt, long idxoff, const char *buf, long len) { + + dirtyCache = true; + +- __u32 start; +- __u16 size; +- __u32 outBufIdx = (__u32)cacheBufIdx; ++ std::uint32_t start; ++ std::uint16_t size; ++ std::uint32_t outBufIdx = (std::uint32_t)cacheBufIdx; + + idxoff *= 10; + size = len; + +- start = (__u32)strlen(cacheBuf); ++ start = (std::uint32_t)strlen(cacheBuf); + + if (!size) + start = outBufIdx = 0; +@@ -338,14 +338,14 @@ void zVerse::doSetText(char testmt, long idxoff, const char *buf, long len) { + + void zVerse::flushCache() const { + if (dirtyCache) { +- __u32 idxoff; +- __u32 start, outstart; +- __u32 size, outsize; +- __u32 zsize, outzsize; ++ std::uint32_t idxoff; ++ std::uint32_t start, outstart; ++ std::uint32_t size, outsize; ++ std::uint32_t zsize, outzsize; + +- idxoff = (__u32)cacheBufIdx * 12; ++ idxoff = (std::uint32_t)cacheBufIdx * 12; + if (cacheBuf) { +- size = outsize = zsize = outzsize = (__u32)strlen(cacheBuf); ++ size = outsize = zsize = outzsize = (std::uint32_t)strlen(cacheBuf); + if (size) { + // if (compressor) { + // delete compressor; +@@ -354,16 +354,16 @@ void zVerse::flushCache() const { + compressor->Buf(cacheBuf); + unsigned long tmpSize; + compressor->zBuf(&tmpSize); +- outzsize = zsize = (__u32)tmpSize; ++ outzsize = zsize = (std::uint32_t)tmpSize; + + SWBuf buf; + buf.setSize(zsize + 5); + memcpy(buf.getRawData(), compressor->zBuf(&tmpSize), tmpSize); +- outzsize = zsize = (__u32)tmpSize; ++ outzsize = zsize = (std::uint32_t)tmpSize; + buf.setSize(zsize); + rawZFilter(buf, 1); // 1 = encipher + +- start = outstart = (__u32)textfp[cacheTestament-1]->seek(0, SEEK_END); ++ start = outstart = (std::uint32_t)textfp[cacheTestament-1]->seek(0, SEEK_END); + + outstart = archtosword32(start); + outsize = archtosword32(size); +@@ -392,9 +392,9 @@ void zVerse::flushCache() const { + */ + + void zVerse::doLinkEntry(char testmt, long destidxoff, long srcidxoff) { +- __s32 bufidx; +- __s32 start; +- __u16 size; ++ std::int32_t bufidx; ++ std::int32_t start; ++ std::uint16_t size; + + destidxoff *= 10; + srcidxoff *= 10; +@@ -429,8 +429,8 @@ char zVerse::createModule(const char *ipath, int blockBound, const char *v11n) + char *buf = new char [ strlen (ipath) + 20 ]; + char retVal = 0; + FileDesc *fd, *fd2; +- __s32 offset = 0; +- __s16 size = 0; ++ std::int32_t offset = 0; ++ std::int16_t size = 0; + VerseKey vk; + + stdstr(&path, ipath); +diff --git a/src/modules/common/zverse4.cpp b/src/modules/common/zverse4.cpp +index c5f7d79b..8496416e 100644 +--- a/src/modules/common/zverse4.cpp ++++ b/src/modules/common/zverse4.cpp +@@ -147,9 +147,9 @@ zVerse4::~zVerse4() + + void zVerse4::findOffset(char testmt, long idxoff, long *start, unsigned long *size, unsigned long *buffnum) const + { +- __u32 ulBuffNum = 0; // buffer number +- __u32 ulVerseStart = 0; // verse offset within buffer +- __u32 usVerseSize = 0; // verse size ++ std::uint32_t ulBuffNum = 0; // buffer number ++ std::uint32_t ulVerseStart = 0; // verse offset within buffer ++ std::uint32_t usVerseSize = 0; // verse size + // set start to offset in + // set size to + // set +@@ -202,9 +202,9 @@ void zVerse4::findOffset(char testmt, long idxoff, long *start, unsigned long *s + */ + + void zVerse4::zReadText(char testmt, long start, unsigned long size, unsigned long ulBuffNum, SWBuf &inBuf) const { +- __u32 ulCompOffset = 0; // compressed buffer start +- __u32 ulCompSize = 0; // buffer size compressed +- __u32 ulUnCompSize = 0; // buffer size uncompressed ++ std::uint32_t ulCompOffset = 0; // compressed buffer start ++ std::uint32_t ulCompSize = 0; // buffer size compressed ++ std::uint32_t ulUnCompSize = 0; // buffer size uncompressed + + if (!testmt) { + testmt = ((idxfp[0]) ? 1:2); +@@ -310,14 +310,14 @@ void zVerse4::doSetText(char testmt, long idxoff, const char *buf, long len) { + + dirtyCache = true; + +- __u32 start; +- __u32 size; +- __u32 outBufIdx = (__u32)cacheBufIdx; ++ std::uint32_t start; ++ std::uint32_t size; ++ std::uint32_t outBufIdx = (std::uint32_t)cacheBufIdx; + + idxoff *= 12; +- size = (__u32)len; ++ size = (std::uint32_t)len; + +- start = (__u32)strlen(cacheBuf); ++ start = (std::uint32_t)strlen(cacheBuf); + + if (!size) + start = outBufIdx = 0; +@@ -336,28 +336,28 @@ void zVerse4::doSetText(char testmt, long idxoff, const char *buf, long len) { + + void zVerse4::flushCache() const { + if (dirtyCache) { +- __u32 idxoff; +- __u32 start, outstart; +- __u32 size, outsize; +- __u32 zsize, outzsize; ++ std::uint32_t idxoff; ++ std::uint32_t start, outstart; ++ std::uint32_t size, outsize; ++ std::uint32_t zsize, outzsize; + +- idxoff = (__u32)cacheBufIdx * 12; ++ idxoff = (std::uint32_t)cacheBufIdx * 12; + if (cacheBuf) { +- size = outsize = zsize = outzsize = (__u32)strlen(cacheBuf); ++ size = outsize = zsize = outzsize = (std::uint32_t)strlen(cacheBuf); + if (size) { + compressor->Buf(cacheBuf); + unsigned long tmpSize; + compressor->zBuf(&tmpSize); +- outzsize = zsize = (__u32)tmpSize; ++ outzsize = zsize = (std::uint32_t)tmpSize; + + SWBuf buf; + buf.setSize(zsize + 5); + memcpy(buf.getRawData(), compressor->zBuf(&tmpSize), tmpSize); +- outzsize = zsize = (__u32)tmpSize; ++ outzsize = zsize = (std::uint32_t)tmpSize; + buf.setSize(zsize); + rawZFilter(buf, 1); // 1 = encipher + +- start = outstart = (__u32)textfp[cacheTestament-1]->seek(0, SEEK_END); ++ start = outstart = (std::uint32_t)textfp[cacheTestament-1]->seek(0, SEEK_END); + + outstart = archtosword32(start); + outsize = archtosword32(size); +@@ -386,9 +386,9 @@ void zVerse4::flushCache() const { + */ + + void zVerse4::doLinkEntry(char testmt, long destidxoff, long srcidxoff) { +- __s32 bufidx; +- __s32 start; +- __u32 size; ++ std::int32_t bufidx; ++ std::int32_t start; ++ std::uint32_t size; + + destidxoff *= 12; + srcidxoff *= 12; +@@ -423,8 +423,8 @@ char zVerse4::createModule(const char *ipath, int blockBound, const char *v11n) + char *buf = new char [ strlen (ipath) + 20 ]; + char retVal = 0; + FileDesc *fd, *fd2; +- __s32 offset = 0; +- __s32 size = 0; ++ std::int32_t offset = 0; ++ std::int32_t size = 0; + VerseKey vk; + + stdstr(&path, ipath); +diff --git a/src/modules/filters/rtfhtml.cpp b/src/modules/filters/rtfhtml.cpp +index c2cf73e0..c92c46e3 100644 +--- a/src/modules/filters/rtfhtml.cpp ++++ b/src/modules/filters/rtfhtml.cpp +@@ -53,8 +53,8 @@ char RTFHTML::processText(SWBuf &text, const SWKey *key, const SWModule *module) + while (isdigit(*++end)); + SWBuf num; + num.append(from, end-from); +- __s16 n = atoi(num.c_str()); +- __u32 u = (__u16)n; ++ std::int16_t n = atoi(num.c_str()); ++ std::uint32_t u = (std::uint16_t)n; + getUTF8FromUniChar(u, &text); + from += (end-from); + continue; +diff --git a/src/modules/filters/utf8greekaccents.cpp b/src/modules/filters/utf8greekaccents.cpp +index 15e885f4..9387ada0 100644 +--- a/src/modules/filters/utf8greekaccents.cpp ++++ b/src/modules/filters/utf8greekaccents.cpp +@@ -48,7 +48,7 @@ namespace { + return &oVals; + } + +- std::map<__u32, SWBuf> converters; ++ std::map converters; + class converters_init { + public: + converters_init() { +@@ -354,9 +354,9 @@ char UTF8GreekAccents::processText(SWBuf &text, const SWKey *key, const SWModule + SWBuf orig = text; + const unsigned char* from = (unsigned char*)orig.c_str(); + text = ""; +- map<__u32, SWBuf>::const_iterator it = converters.end(); ++ map::const_iterator it = converters.end(); + while (*from) { +- __u32 ch = getUniCharFromUTF8(&from, true); ++ std::uint32_t ch = getUniCharFromUTF8(&from, true); + // if ch is bad, then convert to replacement char + if (!ch) ch = 0xFFFD; + +diff --git a/src/modules/filters/utf8utf16.cpp b/src/modules/filters/utf8utf16.cpp +index 7cbfe596..bdd022da 100644 +--- a/src/modules/filters/utf8utf16.cpp ++++ b/src/modules/filters/utf8utf16.cpp +@@ -43,25 +43,25 @@ char UTF8UTF16::processText(SWBuf &text, const SWKey *key, const SWModule *modul + text = ""; + while (*from) { + +- __u32 ch = getUniCharFromUTF8(&from); ++ std::uint32_t ch = getUniCharFromUTF8(&from); + + if (!ch) continue; // invalid char + + if (ch < 0x10000) { + text.setSize(text.size()+2); +- *((__u16 *)(text.getRawData()+(text.size()-2))) = (__u16)ch; ++ *((std::uint16_t *)(text.getRawData()+(text.size()-2))) = (std::uint16_t)ch; + } + else { +- __u16 utf16; +- utf16 = (__s16)((ch - 0x10000) / 0x400 + 0xD800); ++ std::uint16_t utf16; ++ utf16 = (std::int16_t)((ch - 0x10000) / 0x400 + 0xD800); + text.setSize(text.size()+4); +- *((__u16 *)(text.getRawData()+(text.size()-4))) = utf16; +- utf16 = (__s16)((ch - 0x10000) % 0x400 + 0xDC00); +- *((__u16 *)(text.getRawData()+(text.size()-2))) = utf16; ++ *((std::uint16_t *)(text.getRawData()+(text.size()-4))) = utf16; ++ utf16 = (std::int16_t)((ch - 0x10000) % 0x400 + 0xDC00); ++ *((std::uint16_t *)(text.getRawData()+(text.size()-2))) = utf16; + } + } + text.setSize(text.size()+2); +- *((__u16 *)(text.getRawData()+(text.size()-2))) = (__u16)0; ++ *((std::uint16_t *)(text.getRawData()+(text.size()-2))) = (std::uint16_t)0; + text.setSize(text.size()-2); + + return 0; +diff --git a/src/modules/genbook/rawgenbook/rawgenbook.cpp b/src/modules/genbook/rawgenbook/rawgenbook.cpp +index 4074cf9b..47931dc8 100644 +--- a/src/modules/genbook/rawgenbook/rawgenbook.cpp ++++ b/src/modules/genbook/rawgenbook/rawgenbook.cpp +@@ -98,8 +98,8 @@ bool RawGenBook::isWritable() const { + + SWBuf &RawGenBook::getRawEntryBuf() const { + +- __u32 offset = 0; +- __u32 size = 0; ++ std::uint32_t offset = 0; ++ std::uint32_t size = 0; + + const TreeKey &key = getTreeKey(); + +@@ -133,8 +133,8 @@ SWBuf &RawGenBook::getRawEntryBuf() const { + + void RawGenBook::setEntry(const char *inbuf, long len) { + +- __u32 offset = (__u32)archtosword32(bdtfd->seek(0, SEEK_END)); +- __u32 size = 0; ++ std::uint32_t offset = (std::uint32_t)archtosword32(bdtfd->seek(0, SEEK_END)); ++ std::uint32_t size = 0; + TreeKeyIdx *key = ((TreeKeyIdx *)&(getTreeKey())); + + char userData[8]; +@@ -144,7 +144,7 @@ void RawGenBook::setEntry(const char *inbuf, long len) { + + bdtfd->write(inbuf, len); + +- size = (__u32)archtosword32(len); ++ size = (std::uint32_t)archtosword32(len); + memcpy(userData, &offset, 4); + memcpy(userData+4, &size, 4); + key->setUserData(userData, 8); +diff --git a/src/modules/lexdict/rawld/rawld.cpp b/src/modules/lexdict/rawld/rawld.cpp +index 2e758599..e1c3f7c3 100644 +--- a/src/modules/lexdict/rawld/rawld.cpp ++++ b/src/modules/lexdict/rawld/rawld.cpp +@@ -73,8 +73,8 @@ bool RawLD::isWritable() const { + + char RawLD::getEntry(long away) const + { +- __u32 start = 0; +- __u16 size = 0; ++ std::uint32_t start = 0; ++ std::uint16_t size = 0; + char *idxbuf = 0; + char retval = 0; + +@@ -195,8 +195,8 @@ long RawLD::getEntryCount() const { + + + long RawLD::getEntryForKey(const char *key) const { +- __u32 start, offset; +- __u16 size; ++ std::uint32_t start, offset; ++ std::uint16_t size; + + char *buf = new char [ strlen(key) + 6 ]; + strcpy(buf, key); +diff --git a/src/modules/lexdict/rawld4/rawld4.cpp b/src/modules/lexdict/rawld4/rawld4.cpp +index bfbe0cb5..fdfe8706 100644 +--- a/src/modules/lexdict/rawld4/rawld4.cpp ++++ b/src/modules/lexdict/rawld4/rawld4.cpp +@@ -73,8 +73,8 @@ bool RawLD4::isWritable() const { + + char RawLD4::getEntry(long away) const + { +- __u32 start = 0; +- __u32 size = 0; ++ std::uint32_t start = 0; ++ std::uint32_t size = 0; + char *idxbuf = 0; + char retval = 0; + +@@ -193,8 +193,8 @@ long RawLD4::getEntryCount() const { + + + long RawLD4::getEntryForKey(const char *key) const { +- __u32 start, offset; +- __u32 size; ++ std::uint32_t start, offset; ++ std::uint32_t size; + + char *buf = new char [ strlen(key) + 6 ]; + strcpy(buf, key); +diff --git a/src/modules/swmodule.cpp b/src/modules/swmodule.cpp +index 2ae8ca22..50e1a1db 100644 +--- a/src/modules/swmodule.cpp ++++ b/src/modules/swmodule.cpp +@@ -543,7 +543,7 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc + Xapian::MSetIterator i; + for (i = h.begin(); i != h.end(); ++i) { + // cout << "Document ID " << *i << "\t"; +- __u64 score = i.get_percent(); ++ std::uint64_t score = i.get_percent(); + Xapian::Document doc = i.get_document(); + *resultKey = doc.get_data().c_str(); + #elif defined USELUCENE +@@ -551,7 +551,7 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc + Document &doc = h->doc(i); + // set a temporary verse key to this module position + *resultKey = wcharToUTF8(doc.get(_T("key"))); //TODO Does a key always accept utf8? +- __u64 score = (__u64)((__u32)(h->score(i)*100)); ++ std::uint64_t score = (std::uint64_t)((std::uint32_t)(h->score(i)*100)); + #endif + + // check to see if it sets ok (within our bounds) and if not, skip +diff --git a/tests/filtertest.cpp b/tests/filtertest.cpp +index 03c86954..91652b87 100644 +--- a/tests/filtertest.cpp ++++ b/tests/filtertest.cpp +@@ -72,7 +72,7 @@ int main(int argc, char **argv) { + /* + // Example showing safe to cast to u16 stream + unsigned int size = lineBuffer.size() / 2; +- __u16 *wcharBuf = (__u16 *)lineBuffer.getRawData(); ++ std::uint16_t *wcharBuf = (std::uint16_t *)lineBuffer.getRawData(); + for (unsigned int i = 0; i < size; ++i) { + std::wcout << (wchar_t)wcharBuf[i]; // must cast for correct output and because wchar_t is different size on linux we couldn't declare out wcharBuf a wchar_t * + } +diff --git a/tests/utf8norm.cpp b/tests/utf8norm.cpp +index 06143c43..27ebb825 100644 +--- a/tests/utf8norm.cpp ++++ b/tests/utf8norm.cpp +@@ -67,7 +67,7 @@ int main(int argc, char **argv) { + } + const unsigned char *c = (const unsigned char *)filteredContents.getRawData(); + // UTF-32 BOM +- __u32 ch = 0xfeff; ++ std::uint32_t ch = 0xfeff; + // write(STDOUT_FILENO, &ch, 4); + while (c && *c) { + ch = getUniCharFromUTF8(&c); diff --git a/sword.spec b/sword.spec index 2b27acd..57dfd41 100644 --- a/sword.spec +++ b/sword.spec @@ -2,7 +2,7 @@ Name: sword Version: 1.8.1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -11,6 +11,7 @@ Patch0: sword-1.8.1-cmake.diff Patch1: sword-1.8.1-icu61.diff Patch2: sword-1.8.1-swig.diff Patch3: sword-1.8.1-swig-perl.diff +Patch4: sword-1.8.1-integer-types.diff BuildRequires: cmake BuildRequires: cmake-data BuildRequires: openssl-devel @@ -84,6 +85,7 @@ Perl bindings for The SWORD Library. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build mkdir build @@ -157,6 +159,9 @@ make tests %changelog +* Mon Aug 19 2019 Jaak Ristioja - 1.8.1-15 +- Fixed conflicting integer types being defined + * Mon Aug 19 2019 Miro Hrončok - 1.8.1-14 - Rebuilt for Python 3.8 From 8c527209c5dd077b4a9d7c0a51f89b4e9f4d0036 Mon Sep 17 00:00:00 2001 From: Jaak Ristioja Date: Sat, 24 Aug 2019 14:47:02 +0300 Subject: [PATCH 03/66] Fixed potentially conflicting integer types being defined --- sword-1.8.1-integer-types.diff | 1488 ++++++++++++++++++++++++++++++++ sword.spec | 10 +- 2 files changed, 1497 insertions(+), 1 deletion(-) create mode 100644 sword-1.8.1-integer-types.diff diff --git a/sword-1.8.1-integer-types.diff b/sword-1.8.1-integer-types.diff new file mode 100644 index 0000000..b6d61db --- /dev/null +++ b/sword-1.8.1-integer-types.diff @@ -0,0 +1,1488 @@ +Author: Jaak Ristioja +Date: Sat Aug 24 14:31:34 2019 +0300 + + Removed all __[su](8|16|32|64) types from sysdata.h, use types + +diff --git a/examples/cmdline/search.cpp b/examples/cmdline/search.cpp +index 6e5d0ac9..e80f3541 100644 +--- a/examples/cmdline/search.cpp ++++ b/examples/cmdline/search.cpp +@@ -129,7 +129,7 @@ int main(int argc, char **argv) + // listkey.sort(); + while (!listkey.popError()) { + std::cout << (const char *)listkey; +- if (listkey.getElement()->userData) std::cout << " : " << (__u64)listkey.getElement()->userData << "%"; ++ if (listkey.getElement()->userData) std::cout << " : " << (std::uint64_t)listkey.getElement()->userData << "%"; + std::cout << std::endl; + listkey++; + } +diff --git a/include/rawstr.h b/include/rawstr.h +index d25ebc37..782cd0e0 100644 +--- a/include/rawstr.h ++++ b/include/rawstr.h +@@ -54,8 +54,8 @@ public: + virtual ~RawStr(); + void getIDXBuf(long ioffset, char **buf) const; + void getIDXBufDat(long ioffset, char **buf) const; +- signed char findOffset(const char *key, __u32 *start, __u16 *size, long away = 0, __u32 *idxoff = 0) const; +- void readText(__u32 start, __u16 *size, char **idxbuf, SWBuf &buf) const; ++ signed char findOffset(const char *key, std::uint32_t *start, std::uint16_t *size, long away = 0, std::uint32_t *idxoff = 0) const; ++ void readText(std::uint32_t start, std::uint16_t *size, char **idxbuf, SWBuf &buf) const; + static signed char createModule(const char *path); + }; + +diff --git a/include/rawstr4.h b/include/rawstr4.h +index 0277a25a..95d2e268 100644 +--- a/include/rawstr4.h ++++ b/include/rawstr4.h +@@ -53,8 +53,8 @@ public: + virtual ~RawStr4(); + void getIDXBuf(long ioffset, char **buf) const; + void getIDXBufDat(long ioffset, char **buf) const; +- signed char findOffset(const char *key, __u32 *start, __u32 *size, long away = 0, __u32 *idxoff = 0) const; +- void readText(__u32 start, __u32 *size, char **idxbuf, SWBuf &buf) const; ++ signed char findOffset(const char *key, std::uint32_t *start, std::uint32_t *size, long away = 0, std::uint32_t *idxoff = 0) const; ++ void readText(std::uint32_t start, std::uint32_t *size, char **idxbuf, SWBuf &buf) const; + static signed char createModule(const char *path); + }; + +diff --git a/include/swkey.h b/include/swkey.h +index f7c94f13..68c9e5d6 100644 +--- a/include/swkey.h ++++ b/include/swkey.h +@@ -114,7 +114,7 @@ protected: + public: + + // misc storage for whatever +- __u64 userData; ++ std::uint64_t userData; + + /** initializes instance of SWKey from a string + * All keys can be reduced to a string representation which should be able +diff --git a/include/sysdata.h b/include/sysdata.h +index f979f29f..75bcdefd 100644 +--- a/include/sysdata.h ++++ b/include/sysdata.h +@@ -22,6 +22,9 @@ + + #ifndef SIZEDTYPES_H + #define SIZEDTYPES_H ++ ++#include ++ + /* + * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the + * header files exported to user space +@@ -31,55 +34,34 @@ + #endif + + +-typedef signed char __s8; +-typedef unsigned char __u8; +- +-typedef signed short __s16; +-typedef unsigned short __u16; +- +-typedef signed int __s32; +-typedef unsigned int __u32; +- +-#ifdef OS_ANDROID +-#elif defined(__GNUC__) +-__extension__ typedef __signed__ long long __s64; +-__extension__ typedef unsigned long long __u64; +-#elif defined(__BORLANDC__) +-typedef signed __int64 __s64; +-typedef unsigned __int64 __u64; +-#else +-typedef signed long long __s64; +-typedef unsigned long long __u64; +-#endif +- + #undef __swswap16 + #undef __swswap32 + #undef __swswap64 + + #define __swswap16(x) \ +- ((__u16)( \ +- (((__u16)(x) & (__u16)0x00ffU) << 8) | \ +- (((__u16)(x) & (__u16)0xff00U) >> 8) )) ++ ((std::uint16_t)( \ ++ (((std::uint16_t)(x) & (std::uint16_t)0x00ffU) << 8) | \ ++ (((std::uint16_t)(x) & (std::uint16_t)0xff00U) >> 8) )) + + + #define __swswap32(x) \ +- ((__u32)( \ +- (((__u32)(x) & (__u32)0x000000ffUL) << 24) | \ +- (((__u32)(x) & (__u32)0x0000ff00UL) << 8) | \ +- (((__u32)(x) & (__u32)0x00ff0000UL) >> 8) | \ +- (((__u32)(x) & (__u32)0xff000000UL) >> 24) )) ++ ((std::uint32_t)( \ ++ (((std::uint32_t)(x) & (std::uint32_t)0x000000ffUL) << 24) | \ ++ (((std::uint32_t)(x) & (std::uint32_t)0x0000ff00UL) << 8) | \ ++ (((std::uint32_t)(x) & (std::uint32_t)0x00ff0000UL) >> 8) | \ ++ (((std::uint32_t)(x) & (std::uint32_t)0xff000000UL) >> 24) )) + + + #define __swswap64(x) \ +- ((__u64)( \ +- (__u64)(((__u64)(x) & (__u64)0x00000000000000ffULL) << 56) | \ +- (__u64)(((__u64)(x) & (__u64)0x000000000000ff00ULL) << 40) | \ +- (__u64)(((__u64)(x) & (__u64)0x0000000000ff0000ULL) << 24) | \ +- (__u64)(((__u64)(x) & (__u64)0x00000000ff000000ULL) << 8) | \ +- (__u64)(((__u64)(x) & (__u64)0x000000ff00000000ULL) >> 8) | \ +- (__u64)(((__u64)(x) & (__u64)0x0000ff0000000000ULL) >> 24) | \ +- (__u64)(((__u64)(x) & (__u64)0x00ff000000000000ULL) >> 40) | \ +- (__u64)(((__u64)(x) & (__u64)0xff00000000000000ULL) >> 56) )) ++ ((std::uint64_t)( \ ++ (std::uint64_t)(((std::uint64_t)(x) & (std::uint64_t)0x00000000000000ffULL) << 56) | \ ++ (std::uint64_t)(((std::uint64_t)(x) & (std::uint64_t)0x000000000000ff00ULL) << 40) | \ ++ (std::uint64_t)(((std::uint64_t)(x) & (std::uint64_t)0x0000000000ff0000ULL) << 24) | \ ++ (std::uint64_t)(((std::uint64_t)(x) & (std::uint64_t)0x00000000ff000000ULL) << 8) | \ ++ (std::uint64_t)(((std::uint64_t)(x) & (std::uint64_t)0x000000ff00000000ULL) >> 8) | \ ++ (std::uint64_t)(((std::uint64_t)(x) & (std::uint64_t)0x0000ff0000000000ULL) >> 24) | \ ++ (std::uint64_t)(((std::uint64_t)(x) & (std::uint64_t)0x00ff000000000000ULL) >> 40) | \ ++ (std::uint64_t)(((std::uint64_t)(x) & (std::uint64_t)0xff00000000000000ULL) >> 56) )) + + + +diff --git a/include/treekeyidx.h b/include/treekeyidx.h +index 331b7e83..3aa6c668 100644 +--- a/include/treekeyidx.h ++++ b/include/treekeyidx.h +@@ -42,12 +42,12 @@ class SWDLLEXPORT TreeKeyIdx : public TreeKey { + TreeNode(); + ~TreeNode(); + void clear(); +- __s32 offset; +- __s32 parent; +- __s32 next; +- __s32 firstChild; ++ std::int32_t offset; ++ std::int32_t parent; ++ std::int32_t next; ++ std::int32_t firstChild; + char *name; +- __u16 dsize; ++ std::uint16_t dsize; + char *userData; + } currentNode; + +diff --git a/include/utilstr.h b/include/utilstr.h +index a20706ed..aeec6db3 100644 +--- a/include/utilstr.h ++++ b/include/utilstr.h +@@ -86,8 +86,8 @@ extern const unsigned char SW_toupper_array[256]; + * unicode codepoint value (0 with buf incremented is invalid UTF8 byte + */ + +-inline __u32 getUniCharFromUTF8(const unsigned char **buf, bool skipValidation = false) { +- __u32 ch = 0; ++inline std::uint32_t getUniCharFromUTF8(const unsigned char **buf, bool skipValidation = false) { ++ std::uint32_t ch = 0; + + //case: We're at the end + if (!(**buf)) { +@@ -163,7 +163,7 @@ inline __u32 getUniCharFromUTF8(const unsigned char **buf, bool skipValidation = + * to work with + */ + +-inline SWBuf *getUTF8FromUniChar(__u32 uchar, SWBuf *appendTo) { ++inline SWBuf *getUTF8FromUniChar(std::uint32_t uchar, SWBuf *appendTo) { + unsigned long base = appendTo->size(); + + // This would be out of Unicode bounds +diff --git a/include/xzcomprs.h b/include/xzcomprs.h +index f3fe42b2..1483240a 100644 +--- a/include/xzcomprs.h ++++ b/include/xzcomprs.h +@@ -42,7 +42,7 @@ public: + virtual void Decode(void); + virtual void setLevel(int l); + private: +- __u64 memlimit; // memory usage limit during decompression ++ std::uint64_t memlimit; // memory usage limit during decompression + }; + + SWORD_NAMESPACE_END +diff --git a/src/keys/treekeyidx.cpp b/src/keys/treekeyidx.cpp +index c4716868..915873b6 100644 +--- a/src/keys/treekeyidx.cpp ++++ b/src/keys/treekeyidx.cpp +@@ -177,7 +177,7 @@ bool TreeKeyIdx::nextSibling() { + + bool TreeKeyIdx::previousSibling() { + TreeNode iterator; +- __s32 target = currentNode.offset; ++ std::int32_t target = currentNode.offset; + if (currentNode.parent > -1) { + getTreeNodeFromIdxOffset(currentNode.parent, &iterator); + getTreeNodeFromIdxOffset(iterator.firstChild, &iterator); +@@ -207,10 +207,10 @@ void TreeKeyIdx::append() { + while (lastSib.next > -1) { + getTreeNodeFromIdxOffset(lastSib.next, &lastSib); + } +- __u32 idxOffset = (__u32)idxfd->seek(0, SEEK_END); ++ std::uint32_t idxOffset = (std::uint32_t)idxfd->seek(0, SEEK_END); + lastSib.next = idxOffset; + saveTreeNodeOffsets(&lastSib); +- __u32 parent = currentNode.parent; ++ std::uint32_t parent = currentNode.parent; + currentNode.clear(); + currentNode.offset = idxOffset; + currentNode.parent = parent; +@@ -224,10 +224,10 @@ void TreeKeyIdx::appendChild() { + append(); + } + else { +- __u32 idxOffset = (__u32)idxfd->seek(0, SEEK_END); ++ std::uint32_t idxOffset = (std::uint32_t)idxfd->seek(0, SEEK_END); + currentNode.firstChild = idxOffset; + saveTreeNodeOffsets(¤tNode); +- __u32 parent = currentNode.offset; ++ std::uint32_t parent = currentNode.offset; + currentNode.clear(); + currentNode.offset = idxOffset; + currentNode.parent = parent; +@@ -257,7 +257,7 @@ void TreeKeyIdx::remove() { + } + if (!done) { + TreeNode iterator; +- __s32 target = currentNode.offset; ++ std::int32_t target = currentNode.offset; + if (currentNode.parent > -1) { + getTreeNodeFromIdxOffset(currentNode.parent, &iterator); + getTreeNodeFromIdxOffset(iterator.firstChild, &iterator); +@@ -331,8 +331,8 @@ signed char TreeKeyIdx::create(const char *ipath) { + void TreeKeyIdx::getTreeNodeFromDatOffset(long ioffset, TreeNode *node) const { + unsnappedKeyText = ""; + char ch; +- __s32 tmp; +- __u16 tmp2; ++ std::int32_t tmp; ++ std::uint16_t tmp2; + + if (datfd && datfd->getFd() >= 0) { + +@@ -379,7 +379,7 @@ void TreeKeyIdx::getTreeNodeFromDatOffset(long ioffset, TreeNode *node) const { + + char TreeKeyIdx::getTreeNodeFromIdxOffset(long ioffset, TreeNode *node) const { + unsnappedKeyText = ""; +- __u32 offset; ++ std::uint32_t offset; + char error = KEYERR_OUTOFBOUNDS; + + if (ioffset < 0) { +@@ -387,7 +387,7 @@ char TreeKeyIdx::getTreeNodeFromIdxOffset(long ioffset, TreeNode *node) const { + error = 77; // out of bounds but still position to 0; + } + +- node->offset = (__s32)ioffset; ++ node->offset = (std::int32_t)ioffset; + if (idxfd && idxfd->getFd() >= 0) { + idxfd->seek(ioffset, SEEK_SET); + if (idxfd->read(&offset, 4) == 4) { +@@ -421,13 +421,13 @@ void TreeKeyIdx::setOffset(unsigned long offset) { + void TreeKeyIdx::saveTreeNodeOffsets(TreeNode *node) { + unsnappedKeyText = ""; + long datOffset = 0; +- __s32 tmp; ++ std::int32_t tmp; + + if (idxfd && idxfd->getFd() >= 0) { + idxfd->seek(node->offset, SEEK_SET); + if (idxfd->read(&tmp, 4) != 4) { + datOffset = datfd->seek(0, SEEK_END); +- tmp = (__s32)archtosword32(datOffset); ++ tmp = (std::int32_t)archtosword32(datOffset); + idxfd->write(&tmp, 4); + } + else { +@@ -435,13 +435,13 @@ void TreeKeyIdx::saveTreeNodeOffsets(TreeNode *node) { + datfd->seek(datOffset, SEEK_SET); + } + +- tmp = (__s32)archtosword32(node->parent); ++ tmp = (std::int32_t)archtosword32(node->parent); + datfd->write(&tmp, 4); + +- tmp = (__s32)archtosword32(node->next); ++ tmp = (std::int32_t)archtosword32(node->next); + datfd->write(&tmp, 4); + +- tmp = (__s32)archtosword32(node->firstChild); ++ tmp = (std::int32_t)archtosword32(node->firstChild); + datfd->write(&tmp, 4); + } + } +@@ -488,12 +488,12 @@ void TreeKeyIdx::copyFrom(const TreeKeyIdx &ikey) { + + void TreeKeyIdx::saveTreeNode(TreeNode *node) { + long datOffset = 0; +- __s32 tmp; ++ std::int32_t tmp; + if (idxfd && idxfd->getFd() >= 0) { + + idxfd->seek(node->offset, SEEK_SET); + datOffset = datfd->seek(0, SEEK_END); +- tmp = (__s32)archtosword32(datOffset); ++ tmp = (std::int32_t)archtosword32(datOffset); + idxfd->write(&tmp, 4); + + saveTreeNodeOffsets(node); +@@ -502,7 +502,7 @@ void TreeKeyIdx::saveTreeNode(TreeNode *node) { + char null = 0; + datfd->write(&null, 1); + +- __u16 tmp2 = archtosword16(node->dsize); ++ std::uint16_t tmp2 = archtosword16(node->dsize); + datfd->write(&tmp2, 2); + + if (node->dsize) { +diff --git a/src/keys/versekey.cpp b/src/keys/versekey.cpp +index bad90fbf..01101634 100644 +--- a/src/keys/versekey.cpp ++++ b/src/keys/versekey.cpp +@@ -776,7 +776,7 @@ terminate_range: + lastKey->setPosition(TOP); + tmpListKey << *lastKey; + ((VerseKey *)tmpListKey.getElement())->setAutoNormalize(isAutoNormalize()); +- tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); ++ tmpListKey.getElement()->userData = (std::uint64_t)(bufStart+(buf-iBuf.c_str())); + } + else { + if (!dash) { // if last separator was not a dash just add +@@ -790,7 +790,7 @@ terminate_range: + *lastKey = TOP; + tmpListKey << *lastKey; + ((VerseKey *)tmpListKey.getElement())->setAutoNormalize(isAutoNormalize()); +- tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); ++ tmpListKey.getElement()->userData = (std::uint64_t)(bufStart+(buf-iBuf.c_str())); + } + else { + bool f = false; +@@ -805,7 +805,7 @@ terminate_range: + *lastKey = TOP; + tmpListKey << *lastKey; + ((VerseKey *)tmpListKey.getElement())->setAutoNormalize(isAutoNormalize()); +- tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); ++ tmpListKey.getElement()->userData = (std::uint64_t)(bufStart+(buf-iBuf.c_str())); + } + } + else if (expandRange) { +@@ -818,7 +818,7 @@ terminate_range: + newElement->setUpperBound(*curKey); + *lastKey = *curKey; + *newElement = TOP; +- tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); ++ tmpListKey.getElement()->userData = (std::uint64_t)(bufStart+(buf-iBuf.c_str())); + } + } + } +@@ -1049,7 +1049,7 @@ terminate_range: + lastKey->setLowerBound(*curKey); + *lastKey = TOP; + tmpListKey << *lastKey; +- tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); ++ tmpListKey.getElement()->userData = (std::uint64_t)(bufStart+(buf-iBuf.c_str())); + } + else { + if (!dash) { // if last separator was not a dash just add +@@ -1062,7 +1062,7 @@ terminate_range: + lastKey->setUpperBound(*curKey); + *lastKey = TOP; + tmpListKey << *lastKey; +- tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); ++ tmpListKey.getElement()->userData = (std::uint64_t)(bufStart+(buf-iBuf.c_str())); + } + else { + bool f = false; +@@ -1076,7 +1076,7 @@ terminate_range: + lastKey->setUpperBound(*curKey); + *lastKey = TOP; + tmpListKey << *lastKey; +- tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); ++ tmpListKey.getElement()->userData = (std::uint64_t)(bufStart+(buf-iBuf.c_str())); + } + } + else if (expandRange) { +@@ -1088,7 +1088,7 @@ terminate_range: + *curKey = MAXVERSE; + newElement->setUpperBound(*curKey); + *newElement = TOP; +- tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); ++ tmpListKey.getElement()->userData = (std::uint64_t)(bufStart+(buf-iBuf.c_str())); + } + } + } +diff --git a/src/modules/comments/rawfiles/rawfiles.cpp b/src/modules/comments/rawfiles/rawfiles.cpp +index bfd3e1da..d32fb104 100644 +--- a/src/modules/comments/rawfiles/rawfiles.cpp ++++ b/src/modules/comments/rawfiles/rawfiles.cpp +@@ -187,7 +187,7 @@ void RawFiles::deleteEntry() { + + const char *RawFiles::getNextFilename() { + static SWBuf incfile; +- __u32 number = 0; ++ std::uint32_t number = 0; + FileDesc *datafile; + + incfile.setFormatted("%s/incfile", path); +@@ -213,7 +213,7 @@ const char *RawFiles::getNextFilename() { + char RawFiles::createModule(const char *path) { + char *incfile = new char [ strlen (path) + 16 ]; + +- __u32 zero = 0; ++ std::uint32_t zero = 0; + zero = archtosword32(zero); + + FileDesc *datafile; +diff --git a/src/modules/common/entriesblk.cpp b/src/modules/common/entriesblk.cpp +index c2c02e41..d1383711 100644 +--- a/src/modules/common/entriesblk.cpp ++++ b/src/modules/common/entriesblk.cpp +@@ -37,13 +37,13 @@ EntriesBlock::EntriesBlock(const char *iBlock, unsigned long size) { + memcpy(block, iBlock, size); + } + else { +- block = (char *)calloc(1, sizeof(__u32)); ++ block = (char *)calloc(1, sizeof(std::uint32_t)); + } + } + + + EntriesBlock::EntriesBlock() { +- block = (char *)calloc(1, sizeof(__u32)); ++ block = (char *)calloc(1, sizeof(std::uint32_t)); + } + + +@@ -53,22 +53,22 @@ EntriesBlock::~EntriesBlock() { + + + void EntriesBlock::setCount(int count) { +- __u32 rawCount = archtosword32(count); +- memcpy(block, &rawCount, sizeof(__u32)); ++ std::uint32_t rawCount = archtosword32(count); ++ memcpy(block, &rawCount, sizeof(std::uint32_t)); + } + + + int EntriesBlock::getCount() { +- __u32 count = 0; +- memcpy(&count, block, sizeof(__u32)); ++ std::uint32_t count = 0; ++ memcpy(&count, block, sizeof(std::uint32_t)); + count = swordtoarch32(count); + return count; + } + + + void EntriesBlock::getMetaEntry(int index, unsigned long *offset, unsigned long *size) { +- __u32 rawOffset = 0; +- __u32 rawSize = 0; ++ std::uint32_t rawOffset = 0; ++ std::uint32_t rawSize = 0; + *offset = 0; + *size = 0; + if (index >= getCount()) // assert index < count +@@ -84,8 +84,8 @@ void EntriesBlock::getMetaEntry(int index, unsigned long *offset, unsigned long + + + void EntriesBlock::setMetaEntry(int index, unsigned long offset, unsigned long size) { +- __u32 rawOffset = (__u32)archtosword32(offset); +- __u32 rawSize = (__u32)archtosword32(size); ++ std::uint32_t rawOffset = (std::uint32_t)archtosword32(offset); ++ std::uint32_t rawSize = (std::uint32_t)archtosword32(size); + + if (index >= getCount()) // assert index < count + return; +diff --git a/src/modules/common/rawstr.cpp b/src/modules/common/rawstr.cpp +index 0541b5c3..4bec07c5 100644 +--- a/src/modules/common/rawstr.cpp ++++ b/src/modules/common/rawstr.cpp +@@ -145,7 +145,7 @@ void RawStr::getIDXBufDat(long ioffset, char **buf) const + + void RawStr::getIDXBuf(long ioffset, char **buf) const + { +- __u32 offset; ++ std::uint32_t offset; + + if (idxfd && idxfd->getFd() >= 0) { + idxfd->seek(ioffset, SEEK_SET); +@@ -170,7 +170,7 @@ void RawStr::getIDXBuf(long ioffset, char **buf) const + * RET: error status -1 general error; -2 new file + */ + +-signed char RawStr::findOffset(const char *ikey, __u32 *start, __u16 *size, long away, __u32 *idxoff) const ++signed char RawStr::findOffset(const char *ikey, std::uint32_t *start, std::uint16_t *size, long away, std::uint32_t *idxoff) const + { + char *trybuf, *maxbuf, *key = 0, quitflag = 0; + signed char retval = -1; +@@ -239,13 +239,13 @@ signed char RawStr::findOffset(const char *ikey, __u32 *start, __u16 *size, long + + idxfd->seek(tryoff, SEEK_SET); + +- __u32 tmpStart; +- __u16 tmpSize; ++ std::uint32_t tmpStart; ++ std::uint16_t tmpSize; + *start = *size = tmpStart = tmpSize = 0; + idxfd->read(&tmpStart, 4); + idxfd->read(&tmpSize, 2); + if (idxoff) +- *idxoff = (__u32)tryoff; ++ *idxoff = (std::uint32_t)tryoff; + + *start = swordtoarch32(tmpStart); + *size = swordtoarch16(tmpSize); +@@ -264,17 +264,17 @@ signed char RawStr::findOffset(const char *ikey, __u32 *start, __u16 *size, long + if (bad) { + if(!awayFromSubstrCheck) + retval = -1; +- *start = (__u32)laststart; ++ *start = (std::uint32_t)laststart; + *size = lastsize; + tryoff = lasttry; + if (idxoff) +- *idxoff = (__u32)tryoff; ++ *idxoff = (std::uint32_t)tryoff; + break; + } + idxfd->read(&tmpStart, 4); + idxfd->read(&tmpSize, 2); + if (idxoff) +- *idxoff = (__u32)tryoff; ++ *idxoff = (std::uint32_t)tryoff; + + *start = swordtoarch32(tmpStart); + *size = swordtoarch16(tmpSize); +@@ -306,12 +306,12 @@ signed char RawStr::findOffset(const char *ikey, __u32 *start, __u16 *size, long + * + */ + +-void RawStr::readText(__u32 istart, __u16 *isize, char **idxbuf, SWBuf &buf) const ++void RawStr::readText(std::uint32_t istart, std::uint16_t *isize, char **idxbuf, SWBuf &buf) const + { + unsigned int ch; + char *idxbuflocal = 0; + getIDXBufDat(istart, &idxbuflocal); +- __u32 start = istart; ++ std::uint32_t start = istart; + + do { + if (*idxbuf) +@@ -368,12 +368,12 @@ void RawStr::readText(__u32 istart, __u16 *isize, char **idxbuf, SWBuf &buf) con + void RawStr::doSetText(const char *ikey, const char *buf, long len) + { + +- __u32 start, outstart; +- __u32 idxoff; +- __u32 endoff; +- __s32 shiftSize; +- __u16 size; +- __u16 outsize; ++ std::uint32_t start, outstart; ++ std::uint32_t idxoff; ++ std::uint32_t endoff; ++ std::int32_t shiftSize; ++ std::uint16_t size; ++ std::uint16_t outsize; + char *tmpbuf = 0; + char *key = 0; + char *dbKey = 0; +@@ -426,7 +426,7 @@ void RawStr::doSetText(const char *ikey, const char *buf, long len) + while (true); // while we're resolving links + } + +- endoff = (__u32)idxfd->seek(0, SEEK_END); ++ endoff = (std::uint32_t)idxfd->seek(0, SEEK_END); + + shiftSize = endoff - idxoff; + +@@ -442,7 +442,7 @@ void RawStr::doSetText(const char *ikey, const char *buf, long len) + memcpy(outbuf + size, buf, len); + size = outsize = size + (len); + +- start = outstart = (__u32)datfd->seek(0, SEEK_END); ++ start = outstart = (std::uint32_t)datfd->seek(0, SEEK_END); + + outstart = archtosword32(start); + outsize = archtosword16(size); +diff --git a/src/modules/common/rawstr4.cpp b/src/modules/common/rawstr4.cpp +index 2d49b3d7..bf249516 100644 +--- a/src/modules/common/rawstr4.cpp ++++ b/src/modules/common/rawstr4.cpp +@@ -145,7 +145,7 @@ void RawStr4::getIDXBufDat(long ioffset, char **buf) const + + void RawStr4::getIDXBuf(long ioffset, char **buf) const + { +- __u32 offset; ++ std::uint32_t offset; + + if ((unsigned long)idxfd > 0) { + idxfd->seek(ioffset, SEEK_SET); +@@ -179,7 +179,7 @@ void RawStr4::getIDXBuf(long ioffset, char **buf) const + * RET: error status -1 general error; -2 new file + */ + +-signed char RawStr4::findOffset(const char *ikey, __u32 *start, __u32 *size, long away, __u32 *idxoff) const ++signed char RawStr4::findOffset(const char *ikey, std::uint32_t *start, std::uint32_t *size, long away, std::uint32_t *idxoff) const + { + char *trybuf, *maxbuf, *key = 0, quitflag = 0; + signed char retval = -1; +@@ -249,12 +249,12 @@ signed char RawStr4::findOffset(const char *ikey, __u32 *start, __u32 *size, lon + + idxfd->seek(tryoff, SEEK_SET); + +- __u32 tmpStart, tmpSize; ++ std::uint32_t tmpStart, tmpSize; + *start = *size = tmpStart = tmpSize = 0; + idxfd->read(&tmpStart, 4); + idxfd->read(&tmpSize, 4); + if (idxoff) +- *idxoff = (__u32)tryoff; ++ *idxoff = (std::uint32_t)tryoff; + + *start = swordtoarch32(tmpStart); + *size = swordtoarch32(tmpSize); +@@ -273,17 +273,17 @@ signed char RawStr4::findOffset(const char *ikey, __u32 *start, __u32 *size, lon + if (bad) { + if(!awayFromSubstrCheck) + retval = -1; +- *start = (__u32)laststart; +- *size = (__u32)lastsize; ++ *start = (std::uint32_t)laststart; ++ *size = (std::uint32_t)lastsize; + tryoff = lasttry; + if (idxoff) +- *idxoff = (__u32)tryoff; ++ *idxoff = (std::uint32_t)tryoff; + break; + } + idxfd->read(&tmpStart, 4); + idxfd->read(&tmpSize, 4); + if (idxoff) +- *idxoff = (__u32)tryoff; ++ *idxoff = (std::uint32_t)tryoff; + + *start = swordtoarch32(tmpStart); + *size = swordtoarch32(tmpSize); +@@ -315,12 +315,12 @@ signed char RawStr4::findOffset(const char *ikey, __u32 *start, __u32 *size, lon + * + */ + +-void RawStr4::readText(__u32 istart, __u32 *isize, char **idxbuf, SWBuf &buf) const ++void RawStr4::readText(std::uint32_t istart, std::uint32_t *isize, char **idxbuf, SWBuf &buf) const + { + unsigned int ch; + char *idxbuflocal = 0; + getIDXBufDat(istart, &idxbuflocal); +- __u32 start = istart; ++ std::uint32_t start = istart; + + do { + if (*idxbuf) +@@ -376,12 +376,12 @@ void RawStr4::readText(__u32 istart, __u32 *isize, char **idxbuf, SWBuf &buf) co + + void RawStr4::doSetText(const char *ikey, const char *buf, long len) { + +- __u32 start, outstart; +- __u32 idxoff; +- __u32 endoff; +- __s32 shiftSize; +- __u32 size; +- __u32 outsize; ++ std::uint32_t start, outstart; ++ std::uint32_t idxoff; ++ std::uint32_t endoff; ++ std::int32_t shiftSize; ++ std::uint32_t size; ++ std::uint32_t outsize; + char *tmpbuf = 0; + char *key = 0; + char *dbKey = 0; +@@ -434,7 +434,7 @@ void RawStr4::doSetText(const char *ikey, const char *buf, long len) { + while (true); // while we're resolving links + } + +- endoff = (__u32)idxfd->seek(0, SEEK_END); ++ endoff = (std::uint32_t)idxfd->seek(0, SEEK_END); + + shiftSize = endoff - idxoff; + +@@ -448,9 +448,9 @@ void RawStr4::doSetText(const char *ikey, const char *buf, long len) { + sprintf(outbuf, "%s%c%c", key, 13, 10); + size = strlen(outbuf); + memcpy(outbuf + size, buf, len); +- size = outsize = size + (__u32)len; ++ size = outsize = size + (std::uint32_t)len; + +- start = outstart = (__u32)datfd->seek(0, SEEK_END); ++ start = outstart = (std::uint32_t)datfd->seek(0, SEEK_END); + + outstart = archtosword32(start); + outsize = archtosword32(size); +diff --git a/src/modules/common/rawverse.cpp b/src/modules/common/rawverse.cpp +index 3e79b88d..39560a3b 100644 +--- a/src/modules/common/rawverse.cpp ++++ b/src/modules/common/rawverse.cpp +@@ -122,8 +122,8 @@ void RawVerse::findOffset(char testmt, long idxoff, long *start, unsigned short + + if (idxfp[testmt-1]->getFd() >= 0) { + idxfp[testmt-1]->seek(idxoff, SEEK_SET); +- __s32 tmpStart; +- __u16 tmpSize; ++ std::int32_t tmpStart; ++ std::uint16_t tmpSize; + idxfp[testmt-1]->read(&tmpStart, 4); + long len = idxfp[testmt-1]->read(&tmpSize, 2); // read size + +@@ -177,8 +177,8 @@ void RawVerse::readText(char testmt, long start, unsigned short size, SWBuf &buf + + void RawVerse::doSetText(char testmt, long idxoff, const char *buf, long len) + { +- __s32 start; +- __u16 size; ++ std::int32_t start; ++ std::uint16_t size; + + idxoff *= 6; + if (!testmt) +@@ -186,7 +186,7 @@ void RawVerse::doSetText(char testmt, long idxoff, const char *buf, long len) + + size = (len < 0) ? strlen(buf) : len; + +- start = (__s32)textfp[testmt-1]->seek(0, SEEK_END); ++ start = (std::int32_t)textfp[testmt-1]->seek(0, SEEK_END); + idxfp[testmt-1]->seek(idxoff, SEEK_SET); + + if (size) { +@@ -217,8 +217,8 @@ void RawVerse::doSetText(char testmt, long idxoff, const char *buf, long len) + */ + + void RawVerse::doLinkEntry(char testmt, long destidxoff, long srcidxoff) { +- __s32 start; +- __u16 size; ++ std::int32_t start; ++ std::uint16_t size; + + destidxoff *= 6; + srcidxoff *= 6; +@@ -282,8 +282,8 @@ char RawVerse::createModule(const char *ipath, const char *v11n) + vk.setVersificationSystem(v11n); + vk.setIntros(1); + +- __s32 offset = 0; +- __u16 size = 0; ++ std::int32_t offset = 0; ++ std::uint16_t size = 0; + offset = archtosword32(offset); + size = archtosword16(size); + +diff --git a/src/modules/common/rawverse4.cpp b/src/modules/common/rawverse4.cpp +index 67a43d8f..35d64f51 100644 +--- a/src/modules/common/rawverse4.cpp ++++ b/src/modules/common/rawverse4.cpp +@@ -123,8 +123,8 @@ void RawVerse4::findOffset(char testmt, long idxoff, long *start, unsigned long + + if (idxfp[testmt-1]->getFd() >= 0) { + idxfp[testmt-1]->seek(idxoff, SEEK_SET); +- __u32 tmpStart; +- __u32 tmpSize; ++ std::uint32_t tmpStart; ++ std::uint32_t tmpSize; + idxfp[testmt-1]->read(&tmpStart, 4); + long len = idxfp[testmt-1]->read(&tmpSize, 4); // read size + +@@ -178,16 +178,16 @@ void RawVerse4::readText(char testmt, long start, unsigned long size, SWBuf &buf + + void RawVerse4::doSetText(char testmt, long idxoff, const char *buf, long len) + { +- __u32 start; +- __u32 size; ++ std::uint32_t start; ++ std::uint32_t size; + + idxoff *= 8; + if (!testmt) + testmt = ((idxfp[1]) ? 1:2); + +- size = (__u32)((len < 0) ? strlen(buf) : len); ++ size = (std::uint32_t)((len < 0) ? strlen(buf) : len); + +- start = (__u32)textfp[testmt-1]->seek(0, SEEK_END); ++ start = (std::uint32_t)textfp[testmt-1]->seek(0, SEEK_END); + idxfp[testmt-1]->seek(idxoff, SEEK_SET); + + if (size) { +@@ -218,8 +218,8 @@ void RawVerse4::doSetText(char testmt, long idxoff, const char *buf, long len) + */ + + void RawVerse4::doLinkEntry(char testmt, long destidxoff, long srcidxoff) { +- __u32 start; +- __u32 size; ++ std::uint32_t start; ++ std::uint32_t size; + + destidxoff *= 8; + srcidxoff *= 8; +@@ -282,8 +282,8 @@ char RawVerse4::createModule(const char *ipath, const char *v11n) + VerseKey vk; + vk.setVersificationSystem(v11n); + vk.setIntros(1); +- __u32 offset = 0; +- __u32 size = 0; ++ std::uint32_t offset = 0; ++ std::uint32_t size = 0; + offset = archtosword32(offset); + size = archtosword32(size); + +diff --git a/src/modules/common/zstr.cpp b/src/modules/common/zstr.cpp +index 324372da..6bbb6e84 100644 +--- a/src/modules/common/zstr.cpp ++++ b/src/modules/common/zstr.cpp +@@ -167,7 +167,7 @@ void zStr::getKeyFromDatOffset(long ioffset, char **buf) const + + void zStr::getKeyFromIdxOffset(long ioffset, char **buf) const + { +- __u32 offset; ++ std::uint32_t offset; + + if (idxfd && idxfd->getFd() >= 0) { + idxfd->seek(ioffset, SEEK_SET); +@@ -194,13 +194,13 @@ signed char zStr::findKeyIndex(const char *ikey, long *idxoff, long away) const + { + char *maxbuf = 0, *trybuf = 0, *key = 0, quitflag = 0; + signed char retval = 0; +- __s32 headoff, tailoff, tryoff = 0, maxoff = 0; +- __u32 start, size; ++ std::int32_t headoff, tailoff, tryoff = 0, maxoff = 0; ++ std::uint32_t start, size; + int diff = 0; + bool awayFromSubstrCheck = false; + + if (idxfd->getFd() >= 0) { +- tailoff = maxoff = (__s32)idxfd->seek(0, SEEK_END) - IDXENTRYSIZE; ++ tailoff = maxoff = (std::int32_t)idxfd->seek(0, SEEK_END) - IDXENTRYSIZE; + if (*ikey) { + headoff = 0; + stdstr(&key, ikey, 3); +@@ -212,7 +212,7 @@ signed char zStr::findKeyIndex(const char *ikey, long *idxoff, long away) const + getKeyFromIdxOffset(maxoff, &maxbuf); + + while (headoff < tailoff) { +- tryoff = ((__s32)lastoff == -1) ? headoff + (((((tailoff / IDXENTRYSIZE) - (headoff / IDXENTRYSIZE))) / 2) * IDXENTRYSIZE) : (__s32)lastoff; ++ tryoff = ((std::int32_t)lastoff == -1) ? headoff + (((((tailoff / IDXENTRYSIZE) - (headoff / IDXENTRYSIZE))) / 2) * IDXENTRYSIZE) : (std::int32_t)lastoff; + lastoff = -1; + + getKeyFromIdxOffset(tryoff, &trybuf); +@@ -268,9 +268,9 @@ signed char zStr::findKeyIndex(const char *ikey, long *idxoff, long away) const + *idxoff = tryoff; + + while (away) { +- __u32 laststart = start; +- __u32 lastsize = size; +- __s32 lasttry = tryoff; ++ std::uint32_t laststart = start; ++ std::uint32_t lastsize = size; ++ std::int32_t lasttry = tryoff; + tryoff += (away > 0) ? IDXENTRYSIZE : -IDXENTRYSIZE; + + bool bad = false; +@@ -328,8 +328,8 @@ void zStr::getText(long offset, char **idxbuf, char **buf) const { + char *ch; + char *idxbuflocal = 0; + getKeyFromIdxOffset(offset, &idxbuflocal); +- __u32 start; +- __u32 size; ++ std::uint32_t start; ++ std::uint32_t size; + + do { + idxfd->seek(offset, SEEK_SET); +@@ -368,16 +368,16 @@ void zStr::getText(long offset, char **idxbuf, char **buf) const { + while (true); // while we're resolving links + + if (idxbuflocal) { +- __u32 localsize = (__u32)strlen(idxbuflocal); ++ std::uint32_t localsize = (std::uint32_t)strlen(idxbuflocal); + localsize = (localsize < (size - 1)) ? localsize : (size - 1); + strncpy(*idxbuf, idxbuflocal, localsize); + (*idxbuf)[localsize] = 0; + free(idxbuflocal); + } +- __u32 block = 0; +- __u32 entry = 0; +- memmove(&block, *buf, sizeof(__u32)); +- memmove(&entry, *buf + sizeof(__u32), sizeof(__u32)); ++ std::uint32_t block = 0; ++ std::uint32_t entry = 0; ++ memmove(&block, *buf, sizeof(std::uint32_t)); ++ memmove(&entry, *buf + sizeof(std::uint32_t), sizeof(std::uint32_t)); + block = swordtoarch32(block); + entry = swordtoarch32(entry); + getCompressedText(block, entry, buf); +@@ -391,10 +391,10 @@ void zStr::getText(long offset, char **idxbuf, char **buf) const { + + void zStr::getCompressedText(long block, long entry, char **buf) const { + +- __u32 size = 0; ++ std::uint32_t size = 0; + + if (cacheBlockIndex != block) { +- __u32 start = 0; ++ std::uint32_t start = 0; + + zdxfd->seek(block * ZDXENTRYSIZE, SEEK_SET); + zdxfd->read(&start, 4); +@@ -418,7 +418,7 @@ void zStr::getCompressedText(long block, long entry, char **buf) const { + cacheBlock = new EntriesBlock(rawBuf, len); + cacheBlockIndex = block; + } +- size = (__u32)cacheBlock->getEntrySize(entry); ++ size = (std::uint32_t)cacheBlock->getEntrySize(entry); + *buf = (*buf) ? (char *)realloc(*buf, size*2 + 1) : (char *)malloc(size*2 + 1); + strcpy(*buf, cacheBlock->getEntry(entry)); + } +@@ -436,11 +436,11 @@ void zStr::setText(const char *ikey, const char *buf, long len) { + + static const char nl[] = {13, 10}; + +- __u32 start, outstart; +- __u32 size, outsize; +- __s32 endoff; ++ std::uint32_t start, outstart; ++ std::uint32_t size, outsize; ++ std::int32_t endoff; + long idxoff = 0; +- __s32 shiftSize; ++ std::int32_t shiftSize; + char *tmpbuf = 0; + char *key = 0; + char *dbKey = 0; +@@ -499,9 +499,9 @@ void zStr::setText(const char *ikey, const char *buf, long len) { + } + } + +- endoff = (__s32)idxfd->seek(0, SEEK_END); ++ endoff = (std::int32_t)idxfd->seek(0, SEEK_END); + +- shiftSize = endoff - (__s32)idxoff; ++ shiftSize = endoff - (std::int32_t)idxoff; + + if (shiftSize > 0) { + idxBytes = new char [ shiftSize ]; +@@ -511,7 +511,7 @@ void zStr::setText(const char *ikey, const char *buf, long len) { + + outbuf = new char [ len + strlen(key) + 5 ]; + sprintf(outbuf, "%s%c%c", key, 13, 10); +- size = (__u32)strlen(outbuf); ++ size = (std::uint32_t)strlen(outbuf); + if (len > 0) { // NOT a link + if (!cacheBlock) { + flushCache(); +@@ -523,20 +523,20 @@ void zStr::setText(const char *ikey, const char *buf, long len) { + cacheBlock = new EntriesBlock(); + cacheBlockIndex = (zdxfd->seek(0, SEEK_END) / ZDXENTRYSIZE); + } +- __u32 entry = cacheBlock->addEntry(buf); ++ std::uint32_t entry = cacheBlock->addEntry(buf); + cacheDirty = true; +- outstart = (__u32)archtosword32(cacheBlockIndex); ++ outstart = (std::uint32_t)archtosword32(cacheBlockIndex); + outsize = archtosword32(entry); +- memcpy (outbuf + size, &outstart, sizeof(__u32)); +- memcpy (outbuf + size + sizeof(__u32), &outsize, sizeof(__u32)); +- size += (sizeof(__u32) * 2); ++ memcpy (outbuf + size, &outstart, sizeof(std::uint32_t)); ++ memcpy (outbuf + size + sizeof(std::uint32_t), &outsize, sizeof(std::uint32_t)); ++ size += (sizeof(std::uint32_t) * 2); + } + else { // link + memcpy(outbuf + size, buf, len); + size += len; + } + +- start = (__u32)datfd->seek(0, SEEK_END); ++ start = (std::uint32_t)datfd->seek(0, SEEK_END); + + outstart = archtosword32(start); + outsize = archtosword32(size); +@@ -593,9 +593,9 @@ void zStr::flushCache() const { + + if (cacheBlock) { + if (cacheDirty) { +- __u32 start = 0; ++ std::uint32_t start = 0; + unsigned long size = 0; +- __u32 outstart = 0, outsize = 0; ++ std::uint32_t outstart = 0, outsize = 0; + + const char *rawBuf = cacheBlock->getRawData(&size); + compressor->Buf(rawBuf, &size); +@@ -611,7 +611,7 @@ void zStr::flushCache() const { + unsigned long zdtSize = zdtfd->seek(0, SEEK_END); + + if ((cacheBlockIndex * ZDXENTRYSIZE) > (zdxSize - ZDXENTRYSIZE)) { // New Block +- start = (__u32)zdtSize; ++ start = (std::uint32_t)zdtSize; + } + else { + zdxfd->seek(cacheBlockIndex * ZDXENTRYSIZE, SEEK_SET); +@@ -626,14 +626,14 @@ void zStr::flushCache() const { + size = outsize; + } + else { // middle and bigger-- we have serious problems, for now let's put it at the end = lots of wasted space +- start = (__u32)zdtSize; ++ start = (std::uint32_t)zdtSize; + } + } + + + + outstart = archtosword32(start); +- outsize = archtosword32((__u32)size); ++ outsize = archtosword32((std::uint32_t)size); + + zdxfd->seek(cacheBlockIndex * ZDXENTRYSIZE, SEEK_SET); + zdtfd->seek(start, SEEK_SET); +diff --git a/src/modules/common/zverse.cpp b/src/modules/common/zverse.cpp +index d54c67d9..6ccd9111 100644 +--- a/src/modules/common/zverse.cpp ++++ b/src/modules/common/zverse.cpp +@@ -149,9 +149,9 @@ zVerse::~zVerse() + + void zVerse::findOffset(char testmt, long idxoff, long *start, unsigned short *size, unsigned long *buffnum) const + { +- __u32 ulBuffNum = 0; // buffer number +- __u32 ulVerseStart = 0; // verse offset within buffer +- __u16 usVerseSize = 0; // verse size ++ std::uint32_t ulBuffNum = 0; // buffer number ++ std::uint32_t ulVerseStart = 0; // verse offset within buffer ++ std::uint16_t usVerseSize = 0; // verse size + // set start to offset in + // set size to + // set +@@ -204,9 +204,9 @@ void zVerse::findOffset(char testmt, long idxoff, long *start, unsigned short *s + */ + + void zVerse::zReadText(char testmt, long start, unsigned short size, unsigned long ulBuffNum, SWBuf &inBuf) const { +- __u32 ulCompOffset = 0; // compressed buffer start +- __u32 ulCompSize = 0; // buffer size compressed +- __u32 ulUnCompSize = 0; // buffer size uncompressed ++ std::uint32_t ulCompOffset = 0; // compressed buffer start ++ std::uint32_t ulCompSize = 0; // buffer size compressed ++ std::uint32_t ulUnCompSize = 0; // buffer size uncompressed + + if (!testmt) { + testmt = ((idxfp[0]) ? 1:2); +@@ -312,14 +312,14 @@ void zVerse::doSetText(char testmt, long idxoff, const char *buf, long len) { + + dirtyCache = true; + +- __u32 start; +- __u16 size; +- __u32 outBufIdx = (__u32)cacheBufIdx; ++ std::uint32_t start; ++ std::uint16_t size; ++ std::uint32_t outBufIdx = (std::uint32_t)cacheBufIdx; + + idxoff *= 10; + size = len; + +- start = (__u32)strlen(cacheBuf); ++ start = (std::uint32_t)strlen(cacheBuf); + + if (!size) + start = outBufIdx = 0; +@@ -338,14 +338,14 @@ void zVerse::doSetText(char testmt, long idxoff, const char *buf, long len) { + + void zVerse::flushCache() const { + if (dirtyCache) { +- __u32 idxoff; +- __u32 start, outstart; +- __u32 size, outsize; +- __u32 zsize, outzsize; ++ std::uint32_t idxoff; ++ std::uint32_t start, outstart; ++ std::uint32_t size, outsize; ++ std::uint32_t zsize, outzsize; + +- idxoff = (__u32)cacheBufIdx * 12; ++ idxoff = (std::uint32_t)cacheBufIdx * 12; + if (cacheBuf) { +- size = outsize = zsize = outzsize = (__u32)strlen(cacheBuf); ++ size = outsize = zsize = outzsize = (std::uint32_t)strlen(cacheBuf); + if (size) { + // if (compressor) { + // delete compressor; +@@ -354,16 +354,16 @@ void zVerse::flushCache() const { + compressor->Buf(cacheBuf); + unsigned long tmpSize; + compressor->zBuf(&tmpSize); +- outzsize = zsize = (__u32)tmpSize; ++ outzsize = zsize = (std::uint32_t)tmpSize; + + SWBuf buf; + buf.setSize(zsize + 5); + memcpy(buf.getRawData(), compressor->zBuf(&tmpSize), tmpSize); +- outzsize = zsize = (__u32)tmpSize; ++ outzsize = zsize = (std::uint32_t)tmpSize; + buf.setSize(zsize); + rawZFilter(buf, 1); // 1 = encipher + +- start = outstart = (__u32)textfp[cacheTestament-1]->seek(0, SEEK_END); ++ start = outstart = (std::uint32_t)textfp[cacheTestament-1]->seek(0, SEEK_END); + + outstart = archtosword32(start); + outsize = archtosword32(size); +@@ -392,9 +392,9 @@ void zVerse::flushCache() const { + */ + + void zVerse::doLinkEntry(char testmt, long destidxoff, long srcidxoff) { +- __s32 bufidx; +- __s32 start; +- __u16 size; ++ std::int32_t bufidx; ++ std::int32_t start; ++ std::uint16_t size; + + destidxoff *= 10; + srcidxoff *= 10; +@@ -429,8 +429,8 @@ char zVerse::createModule(const char *ipath, int blockBound, const char *v11n) + char *buf = new char [ strlen (ipath) + 20 ]; + char retVal = 0; + FileDesc *fd, *fd2; +- __s32 offset = 0; +- __s16 size = 0; ++ std::int32_t offset = 0; ++ std::int16_t size = 0; + VerseKey vk; + + stdstr(&path, ipath); +diff --git a/src/modules/common/zverse4.cpp b/src/modules/common/zverse4.cpp +index c5f7d79b..8496416e 100644 +--- a/src/modules/common/zverse4.cpp ++++ b/src/modules/common/zverse4.cpp +@@ -147,9 +147,9 @@ zVerse4::~zVerse4() + + void zVerse4::findOffset(char testmt, long idxoff, long *start, unsigned long *size, unsigned long *buffnum) const + { +- __u32 ulBuffNum = 0; // buffer number +- __u32 ulVerseStart = 0; // verse offset within buffer +- __u32 usVerseSize = 0; // verse size ++ std::uint32_t ulBuffNum = 0; // buffer number ++ std::uint32_t ulVerseStart = 0; // verse offset within buffer ++ std::uint32_t usVerseSize = 0; // verse size + // set start to offset in + // set size to + // set +@@ -202,9 +202,9 @@ void zVerse4::findOffset(char testmt, long idxoff, long *start, unsigned long *s + */ + + void zVerse4::zReadText(char testmt, long start, unsigned long size, unsigned long ulBuffNum, SWBuf &inBuf) const { +- __u32 ulCompOffset = 0; // compressed buffer start +- __u32 ulCompSize = 0; // buffer size compressed +- __u32 ulUnCompSize = 0; // buffer size uncompressed ++ std::uint32_t ulCompOffset = 0; // compressed buffer start ++ std::uint32_t ulCompSize = 0; // buffer size compressed ++ std::uint32_t ulUnCompSize = 0; // buffer size uncompressed + + if (!testmt) { + testmt = ((idxfp[0]) ? 1:2); +@@ -310,14 +310,14 @@ void zVerse4::doSetText(char testmt, long idxoff, const char *buf, long len) { + + dirtyCache = true; + +- __u32 start; +- __u32 size; +- __u32 outBufIdx = (__u32)cacheBufIdx; ++ std::uint32_t start; ++ std::uint32_t size; ++ std::uint32_t outBufIdx = (std::uint32_t)cacheBufIdx; + + idxoff *= 12; +- size = (__u32)len; ++ size = (std::uint32_t)len; + +- start = (__u32)strlen(cacheBuf); ++ start = (std::uint32_t)strlen(cacheBuf); + + if (!size) + start = outBufIdx = 0; +@@ -336,28 +336,28 @@ void zVerse4::doSetText(char testmt, long idxoff, const char *buf, long len) { + + void zVerse4::flushCache() const { + if (dirtyCache) { +- __u32 idxoff; +- __u32 start, outstart; +- __u32 size, outsize; +- __u32 zsize, outzsize; ++ std::uint32_t idxoff; ++ std::uint32_t start, outstart; ++ std::uint32_t size, outsize; ++ std::uint32_t zsize, outzsize; + +- idxoff = (__u32)cacheBufIdx * 12; ++ idxoff = (std::uint32_t)cacheBufIdx * 12; + if (cacheBuf) { +- size = outsize = zsize = outzsize = (__u32)strlen(cacheBuf); ++ size = outsize = zsize = outzsize = (std::uint32_t)strlen(cacheBuf); + if (size) { + compressor->Buf(cacheBuf); + unsigned long tmpSize; + compressor->zBuf(&tmpSize); +- outzsize = zsize = (__u32)tmpSize; ++ outzsize = zsize = (std::uint32_t)tmpSize; + + SWBuf buf; + buf.setSize(zsize + 5); + memcpy(buf.getRawData(), compressor->zBuf(&tmpSize), tmpSize); +- outzsize = zsize = (__u32)tmpSize; ++ outzsize = zsize = (std::uint32_t)tmpSize; + buf.setSize(zsize); + rawZFilter(buf, 1); // 1 = encipher + +- start = outstart = (__u32)textfp[cacheTestament-1]->seek(0, SEEK_END); ++ start = outstart = (std::uint32_t)textfp[cacheTestament-1]->seek(0, SEEK_END); + + outstart = archtosword32(start); + outsize = archtosword32(size); +@@ -386,9 +386,9 @@ void zVerse4::flushCache() const { + */ + + void zVerse4::doLinkEntry(char testmt, long destidxoff, long srcidxoff) { +- __s32 bufidx; +- __s32 start; +- __u32 size; ++ std::int32_t bufidx; ++ std::int32_t start; ++ std::uint32_t size; + + destidxoff *= 12; + srcidxoff *= 12; +@@ -423,8 +423,8 @@ char zVerse4::createModule(const char *ipath, int blockBound, const char *v11n) + char *buf = new char [ strlen (ipath) + 20 ]; + char retVal = 0; + FileDesc *fd, *fd2; +- __s32 offset = 0; +- __s32 size = 0; ++ std::int32_t offset = 0; ++ std::int32_t size = 0; + VerseKey vk; + + stdstr(&path, ipath); +diff --git a/src/modules/filters/rtfhtml.cpp b/src/modules/filters/rtfhtml.cpp +index c2cf73e0..c92c46e3 100644 +--- a/src/modules/filters/rtfhtml.cpp ++++ b/src/modules/filters/rtfhtml.cpp +@@ -53,8 +53,8 @@ char RTFHTML::processText(SWBuf &text, const SWKey *key, const SWModule *module) + while (isdigit(*++end)); + SWBuf num; + num.append(from, end-from); +- __s16 n = atoi(num.c_str()); +- __u32 u = (__u16)n; ++ std::int16_t n = atoi(num.c_str()); ++ std::uint32_t u = (std::uint16_t)n; + getUTF8FromUniChar(u, &text); + from += (end-from); + continue; +diff --git a/src/modules/filters/utf8greekaccents.cpp b/src/modules/filters/utf8greekaccents.cpp +index 15e885f4..9387ada0 100644 +--- a/src/modules/filters/utf8greekaccents.cpp ++++ b/src/modules/filters/utf8greekaccents.cpp +@@ -48,7 +48,7 @@ namespace { + return &oVals; + } + +- std::map<__u32, SWBuf> converters; ++ std::map converters; + class converters_init { + public: + converters_init() { +@@ -354,9 +354,9 @@ char UTF8GreekAccents::processText(SWBuf &text, const SWKey *key, const SWModule + SWBuf orig = text; + const unsigned char* from = (unsigned char*)orig.c_str(); + text = ""; +- map<__u32, SWBuf>::const_iterator it = converters.end(); ++ map::const_iterator it = converters.end(); + while (*from) { +- __u32 ch = getUniCharFromUTF8(&from, true); ++ std::uint32_t ch = getUniCharFromUTF8(&from, true); + // if ch is bad, then convert to replacement char + if (!ch) ch = 0xFFFD; + +diff --git a/src/modules/filters/utf8utf16.cpp b/src/modules/filters/utf8utf16.cpp +index 7cbfe596..bdd022da 100644 +--- a/src/modules/filters/utf8utf16.cpp ++++ b/src/modules/filters/utf8utf16.cpp +@@ -43,25 +43,25 @@ char UTF8UTF16::processText(SWBuf &text, const SWKey *key, const SWModule *modul + text = ""; + while (*from) { + +- __u32 ch = getUniCharFromUTF8(&from); ++ std::uint32_t ch = getUniCharFromUTF8(&from); + + if (!ch) continue; // invalid char + + if (ch < 0x10000) { + text.setSize(text.size()+2); +- *((__u16 *)(text.getRawData()+(text.size()-2))) = (__u16)ch; ++ *((std::uint16_t *)(text.getRawData()+(text.size()-2))) = (std::uint16_t)ch; + } + else { +- __u16 utf16; +- utf16 = (__s16)((ch - 0x10000) / 0x400 + 0xD800); ++ std::uint16_t utf16; ++ utf16 = (std::int16_t)((ch - 0x10000) / 0x400 + 0xD800); + text.setSize(text.size()+4); +- *((__u16 *)(text.getRawData()+(text.size()-4))) = utf16; +- utf16 = (__s16)((ch - 0x10000) % 0x400 + 0xDC00); +- *((__u16 *)(text.getRawData()+(text.size()-2))) = utf16; ++ *((std::uint16_t *)(text.getRawData()+(text.size()-4))) = utf16; ++ utf16 = (std::int16_t)((ch - 0x10000) % 0x400 + 0xDC00); ++ *((std::uint16_t *)(text.getRawData()+(text.size()-2))) = utf16; + } + } + text.setSize(text.size()+2); +- *((__u16 *)(text.getRawData()+(text.size()-2))) = (__u16)0; ++ *((std::uint16_t *)(text.getRawData()+(text.size()-2))) = (std::uint16_t)0; + text.setSize(text.size()-2); + + return 0; +diff --git a/src/modules/genbook/rawgenbook/rawgenbook.cpp b/src/modules/genbook/rawgenbook/rawgenbook.cpp +index 4074cf9b..47931dc8 100644 +--- a/src/modules/genbook/rawgenbook/rawgenbook.cpp ++++ b/src/modules/genbook/rawgenbook/rawgenbook.cpp +@@ -98,8 +98,8 @@ bool RawGenBook::isWritable() const { + + SWBuf &RawGenBook::getRawEntryBuf() const { + +- __u32 offset = 0; +- __u32 size = 0; ++ std::uint32_t offset = 0; ++ std::uint32_t size = 0; + + const TreeKey &key = getTreeKey(); + +@@ -133,8 +133,8 @@ SWBuf &RawGenBook::getRawEntryBuf() const { + + void RawGenBook::setEntry(const char *inbuf, long len) { + +- __u32 offset = (__u32)archtosword32(bdtfd->seek(0, SEEK_END)); +- __u32 size = 0; ++ std::uint32_t offset = (std::uint32_t)archtosword32(bdtfd->seek(0, SEEK_END)); ++ std::uint32_t size = 0; + TreeKeyIdx *key = ((TreeKeyIdx *)&(getTreeKey())); + + char userData[8]; +@@ -144,7 +144,7 @@ void RawGenBook::setEntry(const char *inbuf, long len) { + + bdtfd->write(inbuf, len); + +- size = (__u32)archtosword32(len); ++ size = (std::uint32_t)archtosword32(len); + memcpy(userData, &offset, 4); + memcpy(userData+4, &size, 4); + key->setUserData(userData, 8); +diff --git a/src/modules/lexdict/rawld/rawld.cpp b/src/modules/lexdict/rawld/rawld.cpp +index 2e758599..e1c3f7c3 100644 +--- a/src/modules/lexdict/rawld/rawld.cpp ++++ b/src/modules/lexdict/rawld/rawld.cpp +@@ -73,8 +73,8 @@ bool RawLD::isWritable() const { + + char RawLD::getEntry(long away) const + { +- __u32 start = 0; +- __u16 size = 0; ++ std::uint32_t start = 0; ++ std::uint16_t size = 0; + char *idxbuf = 0; + char retval = 0; + +@@ -195,8 +195,8 @@ long RawLD::getEntryCount() const { + + + long RawLD::getEntryForKey(const char *key) const { +- __u32 start, offset; +- __u16 size; ++ std::uint32_t start, offset; ++ std::uint16_t size; + + char *buf = new char [ strlen(key) + 6 ]; + strcpy(buf, key); +diff --git a/src/modules/lexdict/rawld4/rawld4.cpp b/src/modules/lexdict/rawld4/rawld4.cpp +index bfbe0cb5..fdfe8706 100644 +--- a/src/modules/lexdict/rawld4/rawld4.cpp ++++ b/src/modules/lexdict/rawld4/rawld4.cpp +@@ -73,8 +73,8 @@ bool RawLD4::isWritable() const { + + char RawLD4::getEntry(long away) const + { +- __u32 start = 0; +- __u32 size = 0; ++ std::uint32_t start = 0; ++ std::uint32_t size = 0; + char *idxbuf = 0; + char retval = 0; + +@@ -193,8 +193,8 @@ long RawLD4::getEntryCount() const { + + + long RawLD4::getEntryForKey(const char *key) const { +- __u32 start, offset; +- __u32 size; ++ std::uint32_t start, offset; ++ std::uint32_t size; + + char *buf = new char [ strlen(key) + 6 ]; + strcpy(buf, key); +diff --git a/src/modules/swmodule.cpp b/src/modules/swmodule.cpp +index 2ae8ca22..50e1a1db 100644 +--- a/src/modules/swmodule.cpp ++++ b/src/modules/swmodule.cpp +@@ -543,7 +543,7 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc + Xapian::MSetIterator i; + for (i = h.begin(); i != h.end(); ++i) { + // cout << "Document ID " << *i << "\t"; +- __u64 score = i.get_percent(); ++ std::uint64_t score = i.get_percent(); + Xapian::Document doc = i.get_document(); + *resultKey = doc.get_data().c_str(); + #elif defined USELUCENE +@@ -551,7 +551,7 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc + Document &doc = h->doc(i); + // set a temporary verse key to this module position + *resultKey = wcharToUTF8(doc.get(_T("key"))); //TODO Does a key always accept utf8? +- __u64 score = (__u64)((__u32)(h->score(i)*100)); ++ std::uint64_t score = (std::uint64_t)((std::uint32_t)(h->score(i)*100)); + #endif + + // check to see if it sets ok (within our bounds) and if not, skip +diff --git a/tests/filtertest.cpp b/tests/filtertest.cpp +index 03c86954..91652b87 100644 +--- a/tests/filtertest.cpp ++++ b/tests/filtertest.cpp +@@ -72,7 +72,7 @@ int main(int argc, char **argv) { + /* + // Example showing safe to cast to u16 stream + unsigned int size = lineBuffer.size() / 2; +- __u16 *wcharBuf = (__u16 *)lineBuffer.getRawData(); ++ std::uint16_t *wcharBuf = (std::uint16_t *)lineBuffer.getRawData(); + for (unsigned int i = 0; i < size; ++i) { + std::wcout << (wchar_t)wcharBuf[i]; // must cast for correct output and because wchar_t is different size on linux we couldn't declare out wcharBuf a wchar_t * + } +diff --git a/tests/utf8norm.cpp b/tests/utf8norm.cpp +index 06143c43..27ebb825 100644 +--- a/tests/utf8norm.cpp ++++ b/tests/utf8norm.cpp +@@ -67,7 +67,7 @@ int main(int argc, char **argv) { + } + const unsigned char *c = (const unsigned char *)filteredContents.getRawData(); + // UTF-32 BOM +- __u32 ch = 0xfeff; ++ std::uint32_t ch = 0xfeff; + // write(STDOUT_FILENO, &ch, 4); + while (c && *c) { + ch = getUniCharFromUTF8(&c); diff --git a/sword.spec b/sword.spec index 45a29e3..57dfd41 100644 --- a/sword.spec +++ b/sword.spec @@ -2,7 +2,7 @@ Name: sword Version: 1.8.1 -Release: 13%{?dist} +Release: 15%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -11,6 +11,7 @@ Patch0: sword-1.8.1-cmake.diff Patch1: sword-1.8.1-icu61.diff Patch2: sword-1.8.1-swig.diff Patch3: sword-1.8.1-swig-perl.diff +Patch4: sword-1.8.1-integer-types.diff BuildRequires: cmake BuildRequires: cmake-data BuildRequires: openssl-devel @@ -84,6 +85,7 @@ Perl bindings for The SWORD Library. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build mkdir build @@ -157,6 +159,12 @@ make tests %changelog +* Mon Aug 19 2019 Jaak Ristioja - 1.8.1-15 +- Fixed conflicting integer types being defined + +* Mon Aug 19 2019 Miro Hrončok - 1.8.1-14 +- Rebuilt for Python 3.8 + * Sun Aug 04 2019 Dominique Corbex - 1.8.1-13 - Added Perl bindings From 6ad2f353dfcca579adfd68c60b2b3c07122e4ce4 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Tue, 27 Aug 2019 22:15:36 -0500 Subject: [PATCH 04/66] Add tests --- tests/installmgr.sh | 7 +++++++ tests/tests.yml | 10 ++++++++++ 2 files changed, 17 insertions(+) create mode 100755 tests/installmgr.sh create mode 100644 tests/tests.yml diff --git a/tests/installmgr.sh b/tests/installmgr.sh new file mode 100755 index 0000000..6680d4f --- /dev/null +++ b/tests/installmgr.sh @@ -0,0 +1,7 @@ +#!/bin/bash +set -ex + +OPTS="--allow-internet-access-and-risk-tracing-and-jail-or-martyrdom" +installmgr $OPTS -init +installmgr $OPTS -sc +installmgr $OPTS -r CrossWire diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..d8f9dc2 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,10 @@ +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + - container + tests: + - installmgr: + dir: . + run: installmgr.sh From c3adb3f974d5846683b0a50061b8be2e0c487a5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Oct 2019 14:39:10 +0200 Subject: [PATCH 05/66] Rebuilt for Python 3.8.0rc1 (#1748018) --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 57dfd41..9540745 100644 --- a/sword.spec +++ b/sword.spec @@ -2,7 +2,7 @@ Name: sword Version: 1.8.1 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -159,6 +159,9 @@ make tests %changelog +* Thu Oct 03 2019 Miro Hrončok - 1.8.1-16 +- Rebuilt for Python 3.8.0rc1 (#1748018) + * Mon Aug 19 2019 Jaak Ristioja - 1.8.1-15 - Fixed conflicting integer types being defined From c9641078a7c3a4798527903c0d5bb59298f7d345 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Fri, 1 Nov 2019 15:53:31 +0000 Subject: [PATCH 06/66] Rebuild for ICU 65 --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 9540745..d0210f9 100644 --- a/sword.spec +++ b/sword.spec @@ -2,7 +2,7 @@ Name: sword Version: 1.8.1 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -159,6 +159,9 @@ make tests %changelog +* Fri Nov 01 2019 Pete Walter - 1.8.1-17 +- Rebuild for ICU 65 + * Thu Oct 03 2019 Miro Hrončok - 1.8.1-16 - Rebuilt for Python 3.8.0rc1 (#1748018) From 7661d120436ccd09518bcd8551f8ac197f926f85 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 00:52:12 +0000 Subject: [PATCH 07/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index d0210f9..d204508 100644 --- a/sword.spec +++ b/sword.spec @@ -2,7 +2,7 @@ Name: sword Version: 1.8.1 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -159,6 +159,9 @@ make tests %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1.8.1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Nov 01 2019 Pete Walter - 1.8.1-17 - Rebuild for ICU 65 From a3361d5879c5ba51c7a83dec51c0a4960f2636c8 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Sun, 26 Apr 2020 00:48:43 -0500 Subject: [PATCH 08/66] Add patch to fix divs --- sword-1.8.1-fix-divs.diff | 75 +++++++++++++++++++++++++++++++++++++++ sword.spec | 8 ++++- 2 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 sword-1.8.1-fix-divs.diff diff --git a/sword-1.8.1-fix-divs.diff b/sword-1.8.1-fix-divs.diff new file mode 100644 index 0000000..d141c2e --- /dev/null +++ b/sword-1.8.1-fix-divs.diff @@ -0,0 +1,75 @@ +Index: trunk/src/mgr/stringmgr.cpp +=================================================================== +--- trunk/src/mgr/stringmgr.cpp (revision 3718) ++++ trunk/src/mgr/stringmgr.cpp (revision 3721) +@@ -20,6 +20,7 @@ + * + */ + ++#include + #include + #include + #include +Index: trunk/src/modules/filters/osisxhtml.cpp +=================================================================== +--- trunk/src/modules/filters/osisxhtml.cpp (revision 3718) ++++ trunk/src/modules/filters/osisxhtml.cpp (revision 3721) +@@ -849,7 +849,11 @@ + else if (tag.isEndTag()) { + outText("", buf, u); + } +- else if (!(type == "colophon")) outText(tag, buf, u); ++ else if (!(type == "colophon")) { ++ if (tag.getAttribute("sID")) tag.setEmpty(false); ++ if (tag.getAttribute("eID")) tag.setEndTag(true); ++ outText(tag, buf, u); ++ } + + } + else if (!strcmp(tag.getName(), "span")) { +Index: trunk/src/utilfuns/utilxml.cpp +=================================================================== +--- trunk/src/utilfuns/utilxml.cpp (revision 3718) ++++ trunk/src/utilfuns/utilxml.cpp (revision 3721) +@@ -291,13 +291,16 @@ + tag.append('/'); + + tag.append(getName()); +- for (StringPairMap::iterator it = attributes.begin(); it != attributes.end(); it++) { +- //tag.appendFormatted(" %s=\"%s\"", it->first.c_str(), it->second.c_str()); +- tag.append(' '); +- tag.append(it->first.c_str()); +- tag.append((strchr(it->second.c_str(), '\"')) ? "=\'" : "=\""); +- tag.append(it->second.c_str()); +- tag.append((strchr(it->second.c_str(), '\"'))? '\'' : '\"'); ++ ++ if (!isEndTag()) { ++ for (StringPairMap::iterator it = attributes.begin(); it != attributes.end(); it++) { ++ //tag.appendFormatted(" %s=\"%s\"", it->first.c_str(), it->second.c_str()); ++ tag.append(' '); ++ tag.append(it->first.c_str()); ++ tag.append((strchr(it->second.c_str(), '\"')) ? "=\'" : "=\""); ++ tag.append(it->second.c_str()); ++ tag.append((strchr(it->second.c_str(), '\"'))? '\'' : '\"'); ++ } + } + + if (isEmpty()) +Index: trunk/include/utilxml.h +=================================================================== +--- trunk/include/utilxml.h (revision 3718) ++++ trunk/include/utilxml.h (revision 3721) +@@ -75,6 +75,13 @@ + * otherwise, we return if we're a simple XML end . + */ + bool isEndTag(const char *eID = 0) const; ++ inline void setEndTag(bool value) { ++ if (!parsed) ++ parse(); ++ endTag = value; ++ if (value) ++ empty = false; ++ } + + const StringList getAttributeNames() const; + int getAttributePartCount(const char *attribName, char partSplit = '|') const; diff --git a/sword.spec b/sword.spec index d204508..daf630c 100644 --- a/sword.spec +++ b/sword.spec @@ -2,7 +2,7 @@ Name: sword Version: 1.8.1 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -12,6 +12,8 @@ Patch1: sword-1.8.1-icu61.diff Patch2: sword-1.8.1-swig.diff Patch3: sword-1.8.1-swig-perl.diff Patch4: sword-1.8.1-integer-types.diff +# svn diff -r3718:3721 +Patch5: sword-1.8.1-fix-divs.diff BuildRequires: cmake BuildRequires: cmake-data BuildRequires: openssl-devel @@ -86,6 +88,7 @@ Perl bindings for The SWORD Library. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build mkdir build @@ -159,6 +162,9 @@ make tests %changelog +* Sun Apr 26 2020 Greg Hellings - 1.8.1-19 +- Added patch to fix upstream markup bug + * Fri Jan 31 2020 Fedora Release Engineering - 1.8.1-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 3c0943126b33db72a3fd66b9efc9109be38cd51f Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Sun, 26 Apr 2020 00:48:43 -0500 Subject: [PATCH 09/66] Add patch to fix divs --- sword-1.8.1-fix-divs.diff | 75 +++++++++++++++++++++++++++++++++++++++ sword.spec | 8 ++++- 2 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 sword-1.8.1-fix-divs.diff diff --git a/sword-1.8.1-fix-divs.diff b/sword-1.8.1-fix-divs.diff new file mode 100644 index 0000000..d141c2e --- /dev/null +++ b/sword-1.8.1-fix-divs.diff @@ -0,0 +1,75 @@ +Index: trunk/src/mgr/stringmgr.cpp +=================================================================== +--- trunk/src/mgr/stringmgr.cpp (revision 3718) ++++ trunk/src/mgr/stringmgr.cpp (revision 3721) +@@ -20,6 +20,7 @@ + * + */ + ++#include + #include + #include + #include +Index: trunk/src/modules/filters/osisxhtml.cpp +=================================================================== +--- trunk/src/modules/filters/osisxhtml.cpp (revision 3718) ++++ trunk/src/modules/filters/osisxhtml.cpp (revision 3721) +@@ -849,7 +849,11 @@ + else if (tag.isEndTag()) { + outText("", buf, u); + } +- else if (!(type == "colophon")) outText(tag, buf, u); ++ else if (!(type == "colophon")) { ++ if (tag.getAttribute("sID")) tag.setEmpty(false); ++ if (tag.getAttribute("eID")) tag.setEndTag(true); ++ outText(tag, buf, u); ++ } + + } + else if (!strcmp(tag.getName(), "span")) { +Index: trunk/src/utilfuns/utilxml.cpp +=================================================================== +--- trunk/src/utilfuns/utilxml.cpp (revision 3718) ++++ trunk/src/utilfuns/utilxml.cpp (revision 3721) +@@ -291,13 +291,16 @@ + tag.append('/'); + + tag.append(getName()); +- for (StringPairMap::iterator it = attributes.begin(); it != attributes.end(); it++) { +- //tag.appendFormatted(" %s=\"%s\"", it->first.c_str(), it->second.c_str()); +- tag.append(' '); +- tag.append(it->first.c_str()); +- tag.append((strchr(it->second.c_str(), '\"')) ? "=\'" : "=\""); +- tag.append(it->second.c_str()); +- tag.append((strchr(it->second.c_str(), '\"'))? '\'' : '\"'); ++ ++ if (!isEndTag()) { ++ for (StringPairMap::iterator it = attributes.begin(); it != attributes.end(); it++) { ++ //tag.appendFormatted(" %s=\"%s\"", it->first.c_str(), it->second.c_str()); ++ tag.append(' '); ++ tag.append(it->first.c_str()); ++ tag.append((strchr(it->second.c_str(), '\"')) ? "=\'" : "=\""); ++ tag.append(it->second.c_str()); ++ tag.append((strchr(it->second.c_str(), '\"'))? '\'' : '\"'); ++ } + } + + if (isEmpty()) +Index: trunk/include/utilxml.h +=================================================================== +--- trunk/include/utilxml.h (revision 3718) ++++ trunk/include/utilxml.h (revision 3721) +@@ -75,6 +75,13 @@ + * otherwise, we return if we're a simple XML end . + */ + bool isEndTag(const char *eID = 0) const; ++ inline void setEndTag(bool value) { ++ if (!parsed) ++ parse(); ++ endTag = value; ++ if (value) ++ empty = false; ++ } + + const StringList getAttributeNames() const; + int getAttributePartCount(const char *attribName, char partSplit = '|') const; diff --git a/sword.spec b/sword.spec index 57dfd41..ac72493 100644 --- a/sword.spec +++ b/sword.spec @@ -2,7 +2,7 @@ Name: sword Version: 1.8.1 -Release: 15%{?dist} +Release: 19%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -12,6 +12,8 @@ Patch1: sword-1.8.1-icu61.diff Patch2: sword-1.8.1-swig.diff Patch3: sword-1.8.1-swig-perl.diff Patch4: sword-1.8.1-integer-types.diff +# svn diff -r3718:3721 +Patch5: sword-1.8.1-fix-divs.diff BuildRequires: cmake BuildRequires: cmake-data BuildRequires: openssl-devel @@ -86,6 +88,7 @@ Perl bindings for The SWORD Library. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build mkdir build @@ -159,6 +162,9 @@ make tests %changelog +* Sun Apr 26 2020 Greg Hellings - 1.8.1-19 +- Added patch to fix upstream markup bug + * Mon Aug 19 2019 Jaak Ristioja - 1.8.1-15 - Fixed conflicting integer types being defined From e797d3ac9a80f71b2a7a629b48945af6503b7e0d Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Fri, 15 May 2020 14:14:42 +0100 Subject: [PATCH 10/66] Rebuild for ICU 67 --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index daf630c..c17dd96 100644 --- a/sword.spec +++ b/sword.spec @@ -2,7 +2,7 @@ Name: sword Version: 1.8.1 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -162,6 +162,9 @@ make tests %changelog +* Fri May 15 2020 Pete Walter - 1.8.1-20 +- Rebuild for ICU 67 + * Sun Apr 26 2020 Greg Hellings - 1.8.1-19 - Added patch to fix upstream markup bug From 10cc2cdb2551b0ca28f8ff1d1c8f6fdfe107327c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 03:51:21 +0200 Subject: [PATCH 11/66] Rebuilt for Python 3.9 --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index c17dd96..14e6830 100644 --- a/sword.spec +++ b/sword.spec @@ -2,7 +2,7 @@ Name: sword Version: 1.8.1 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -162,6 +162,9 @@ make tests %changelog +* Tue May 26 2020 Miro Hrončok - 1.8.1-21 +- Rebuilt for Python 3.9 + * Fri May 15 2020 Pete Walter - 1.8.1-20 - Rebuild for ICU 67 From 1b24e9bc662a08cfcfe2008f4f3dae0b25d42e18 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 22 Jun 2020 19:11:01 +0200 Subject: [PATCH 12/66] Perl 5.32 rebuild --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 14e6830..864fab9 100644 --- a/sword.spec +++ b/sword.spec @@ -2,7 +2,7 @@ Name: sword Version: 1.8.1 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -162,6 +162,9 @@ make tests %changelog +* Mon Jun 22 2020 Jitka Plesnikova - 1.8.1-22 +- Perl 5.32 rebuild + * Tue May 26 2020 Miro Hrončok - 1.8.1-21 - Rebuilt for Python 3.9 From d2c9fcbd12bd953d4d4c43379424ef947a7c54ea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 11:55:10 +0000 Subject: [PATCH 13/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 864fab9..52bb758 100644 --- a/sword.spec +++ b/sword.spec @@ -2,7 +2,7 @@ Name: sword Version: 1.8.1 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -162,6 +162,9 @@ make tests %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.8.1-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jun 22 2020 Jitka Plesnikova - 1.8.1-22 - Perl 5.32 rebuild From edc64a5466d9c0837e6f60a04baabee1b42148fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 09:24:29 +0000 Subject: [PATCH 14/66] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sword.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 52bb758..4d3bf85 100644 --- a/sword.spec +++ b/sword.spec @@ -2,7 +2,7 @@ Name: sword Version: 1.8.1 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -162,6 +162,10 @@ make tests %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 1.8.1-24 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 1.8.1-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 0b1ab536aa51ac0551a0a3b21d20aaabc533435b Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Fri, 11 Sep 2020 13:29:52 -0500 Subject: [PATCH 15/66] Sword 1.9.0RC1 --- .gitignore | 1 + sources | 2 +- sword.spec | 62 +++++++++++++++++++++--------------------------------- 3 files changed, 26 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index 83ee683..df9f7d7 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ sword-1.6.1.tar.gz /sword-1.7.3.900.tar.gz /sword-1.7.4.tar.gz /sword-1.8.1.tar.gz +/sword-1.9.0RC1.tar.gz diff --git a/sources b/sources index 0443583..ac38140 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sword-1.8.1.tar.gz) = 5c08c070ea0c86b7d929bbf94c89730eb5a487986deb9edf01c08d1710356aecd1ab3bde4437a778e5fc1ceb05b63287612ec6161381c0986a36344c27d2ab36 +SHA512 (sword-1.9.0RC1.tar.gz) = 465931a4c83037850c08cf8e00bf389ebdf8098e1fbc7395d913a8bb6d49a9965bdb5b7b10b50f3e780919887daf3e5555131d42086c69f0f1300f771953e16b diff --git a/sword.spec b/sword.spec index 4d3bf85..bfdfc42 100644 --- a/sword.spec +++ b/sword.spec @@ -1,19 +1,13 @@ %define soversion 1.8 +%define pkg_version 1.8.901 Name: sword -Version: 1.8.1 -Release: 24%{?dist} +Version: 1.9.0RC1 +Release: 1%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ Source0: http://www.crosswire.org/ftpmirror/pub/sword/source/v1.8/sword-%{version}.tar.gz -Patch0: sword-1.8.1-cmake.diff -Patch1: sword-1.8.1-icu61.diff -Patch2: sword-1.8.1-swig.diff -Patch3: sword-1.8.1-swig-perl.diff -Patch4: sword-1.8.1-integer-types.diff -# svn diff -r3718:3721 -Patch5: sword-1.8.1-fix-divs.diff BuildRequires: cmake BuildRequires: cmake-data BuildRequires: openssl-devel @@ -70,44 +64,33 @@ Requires: python3 %description -n python3-sword Python bindings for The SWORD Library. -%package -n perl-sword -%{?perl_provide:%perl_provide perl-sword} -Summary: Perl bindings for Sword -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: perl -Requires: perl-XML-LibXML -Requires: perl-HTML-Strip +#%package -n perl-sword +#%{?perl_provide:%perl_provide perl-sword} +#Summary: Perl bindings for Sword +#Requires: %{name}%{?_isa} = %{version}-%{release} +#Requires: perl +#Requires: perl-XML-LibXML +#Requires: perl-HTML-Strip -%description -n perl-sword -Perl bindings for The SWORD Library. +#%description -n perl-sword +#Perl bindings for The SWORD Library. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %build -mkdir build -pushd build %cmake -DLIBSWORD_LIBRARY_TYPE=Shared \ -DSWORD_PYTHON_3:BOOL=TRUE \ -DSWORD_PERL:BOOL=TRUE \ - -DSWORD_BUILD_UTILITIES="Yes" \ + -DSWORD_BUILD_UTILS="Yes" \ -DLIBSWORD_SOVERSION=%{soversion} \ -DLIBDIR=%{_libdir} \ -DSWORD_BUILD_TESTS=Yes \ - -DSWORD_PYTHON_INSTALL_DIR="%{buildroot}%{_prefix}" \ - .. -make %{?_smp_mflags} + -DSWORD_PYTHON_INSTALL_DIR="%{buildroot}%{_prefix}" +%cmake_build %install -pushd build -%make_install -popd +%cmake_install mkdir -p %{buildroot}%{_datadir}/sword/modules find %{buildroot} -type f -name "*.la" -delete -print @@ -153,15 +136,18 @@ make tests %{python3_sitearch}/Sword.py %{python3_sitearch}/_Sword.cpython-%{python3_version_nodots}*-%{_arch}-linux-gnu*.so %{python3_sitearch}/__pycache__/* -%{python3_sitearch}/sword-%{version}-py%{python3_version}.egg-info +%{python3_sitearch}/sword-%{pkg_version}-py%{python3_version}.egg-info -%files -n perl-sword -%{perl_vendorarch}/* -%exclude %dir %{perl_vendorarch}/auto/ -%exclude %{_libdir}/perl5/perllocal.pod +#%files -n perl-sword +#%{perl_vendorarch}/* +#%exclude %dir %{perl_vendorarch}/auto/ +#%exclude %{_libdir}/perl5/perllocal.pod %changelog +* Fri Sep 11 2020 Greg Helling - 1.8.901-1 +- Upstream 1.9.0RC1 release + * Sat Aug 01 2020 Fedora Release Engineering - 1.8.1-24 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 1de7ee5f069f25b7aed87b1aef211f194d410538 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Fri, 2 Oct 2020 09:55:02 -0500 Subject: [PATCH 16/66] Sword 1.9.0RC3 --- .gitignore | 1 + sources | 2 +- sword.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index df9f7d7..75c9e4f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ sword-1.6.1.tar.gz /sword-1.7.4.tar.gz /sword-1.8.1.tar.gz /sword-1.9.0RC1.tar.gz +/sword-1.9.0RC3.tar.gz diff --git a/sources b/sources index ac38140..e34b371 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sword-1.9.0RC1.tar.gz) = 465931a4c83037850c08cf8e00bf389ebdf8098e1fbc7395d913a8bb6d49a9965bdb5b7b10b50f3e780919887daf3e5555131d42086c69f0f1300f771953e16b +SHA512 (sword-1.9.0RC3.tar.gz) = 67b6335f975a689af7f31215d4652f7a4a41aa451ee275a9927018ed5231b3f27a3523658d8310ec66ce24b8754ccd58e519ddedb32cd3912ca53bb561608c69 diff --git a/sword.spec b/sword.spec index bfdfc42..53c3db6 100644 --- a/sword.spec +++ b/sword.spec @@ -1,8 +1,8 @@ %define soversion 1.8 -%define pkg_version 1.8.901 +%define pkg_version 1.8.903 Name: sword -Version: 1.9.0RC1 +Version: 1.9.0RC3 Release: 1%{?dist} Summary: Free Bible Software Project License: GPLv2 @@ -145,7 +145,10 @@ make tests %changelog -* Fri Sep 11 2020 Greg Helling - 1.8.901-1 +* Fri Oct 2 2020 Greg Hellings - 1.8.903-1 +- Upstream 1.9.0RC3 release + +* Fri Sep 11 2020 Greg Hellings - 1.8.901-1 - Upstream 1.9.0RC1 release * Sat Aug 01 2020 Fedora Release Engineering - 1.8.1-24 From 388b610e8f289512e24383c021ca3861e6e8f8c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 2 Oct 2020 20:25:11 +0200 Subject: [PATCH 17/66] https://fedoraproject.org/wiki/Changes/Python_Upstream_Architecture_Names --- sword.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 53c3db6..439acf4 100644 --- a/sword.spec +++ b/sword.spec @@ -134,7 +134,7 @@ make tests %files -n python3-sword %{python3_sitearch}/Sword.py -%{python3_sitearch}/_Sword.cpython-%{python3_version_nodots}*-%{_arch}-linux-gnu*.so +%{python3_sitearch}/_Sword%{python3_ext_suffix} %{python3_sitearch}/__pycache__/* %{python3_sitearch}/sword-%{pkg_version}-py%{python3_version}.egg-info From c82f2d9de5e26973e8856d7dbb1f59fb0653b401 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Tue, 1 Dec 2020 10:49:44 -0600 Subject: [PATCH 18/66] Sword 1.9.0 --- .gitignore | 1 + sources | 2 +- sword.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 75c9e4f..eb752e7 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ sword-1.6.1.tar.gz /sword-1.8.1.tar.gz /sword-1.9.0RC1.tar.gz /sword-1.9.0RC3.tar.gz +/sword-1.9.0.tar.gz diff --git a/sources b/sources index e34b371..8c3a0a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sword-1.9.0RC3.tar.gz) = 67b6335f975a689af7f31215d4652f7a4a41aa451ee275a9927018ed5231b3f27a3523658d8310ec66ce24b8754ccd58e519ddedb32cd3912ca53bb561608c69 +SHA512 (sword-1.9.0.tar.gz) = 9ed3fbb5024af1f93b1473bae0d95534d02a5b00b3c9d41a0f855cee8106dc4e330844080adbee7c3f74c0e5ce1480bf16c87c842421337a341f641bae11137f diff --git a/sword.spec b/sword.spec index 439acf4..b580719 100644 --- a/sword.spec +++ b/sword.spec @@ -1,13 +1,13 @@ -%define soversion 1.8 -%define pkg_version 1.8.903 +%define soversion 1.9 +%define pkg_version 1.9.0 Name: sword -Version: 1.9.0RC3 +Version: 1.9.0 Release: 1%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ -Source0: http://www.crosswire.org/ftpmirror/pub/sword/source/v1.8/sword-%{version}.tar.gz +Source0: http://www.crosswire.org/ftpmirror/pub/sword/source/v1.9/sword-%{version}.tar.gz BuildRequires: cmake BuildRequires: cmake-data BuildRequires: openssl-devel @@ -145,6 +145,9 @@ make tests %changelog +* Tue Dec 1 2020 Greg Hellings - 1.9.0-1 +- Upstream 1.9.0 release + * Fri Oct 2 2020 Greg Hellings - 1.8.903-1 - Upstream 1.9.0RC3 release From e8736bb849d0069dec9c0e319ae64258100310e4 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Wed, 2 Dec 2020 10:30:09 -0600 Subject: [PATCH 19/66] Remove unused patches --- sword-1.8.1-cmake.diff | 13 - sword-1.8.1-fix-divs.diff | 75 -- sword-1.8.1-icu61.diff | 138 --- sword-1.8.1-integer-types.diff | 1488 -------------------------------- sword-1.8.1-swig-perl.diff | 12 - sword-1.8.1-swig.diff | 154 ---- 6 files changed, 1880 deletions(-) delete mode 100644 sword-1.8.1-cmake.diff delete mode 100644 sword-1.8.1-fix-divs.diff delete mode 100644 sword-1.8.1-icu61.diff delete mode 100644 sword-1.8.1-integer-types.diff delete mode 100644 sword-1.8.1-swig-perl.diff delete mode 100644 sword-1.8.1-swig.diff diff --git a/sword-1.8.1-cmake.diff b/sword-1.8.1-cmake.diff deleted file mode 100644 index 5d5eeba..0000000 --- a/sword-1.8.1-cmake.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/options.cmake b/cmake/options.cmake -index 81981c8..19b7004 100644 ---- a/cmake/options.cmake -+++ b/cmake/options.cmake -@@ -44,7 +44,7 @@ _SET_FANCY(SYSCONF_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/etc" "Directory to insta - - _SET_FANCY(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share" "Directory to install global data files. Defaults to ${SWORD_INSTALL_DIR}/share.") - --_SET_FANCY(SWORD_PYTHON_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}" CACHE STRING "Directory where the Python bindings will be installed. Defaults to default Python path.") -+_SET_FANCY(SWORD_PYTHON_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}" STRING "Directory where the Python bindings will be installed. Defaults to default Python path.") - - # Post-processing of variables - MACRO(PROCESS_VERSION LEVEL VALUE) diff --git a/sword-1.8.1-fix-divs.diff b/sword-1.8.1-fix-divs.diff deleted file mode 100644 index d141c2e..0000000 --- a/sword-1.8.1-fix-divs.diff +++ /dev/null @@ -1,75 +0,0 @@ -Index: trunk/src/mgr/stringmgr.cpp -=================================================================== ---- trunk/src/mgr/stringmgr.cpp (revision 3718) -+++ trunk/src/mgr/stringmgr.cpp (revision 3721) -@@ -20,6 +20,7 @@ - * - */ - -+#include - #include - #include - #include -Index: trunk/src/modules/filters/osisxhtml.cpp -=================================================================== ---- trunk/src/modules/filters/osisxhtml.cpp (revision 3718) -+++ trunk/src/modules/filters/osisxhtml.cpp (revision 3721) -@@ -849,7 +849,11 @@ - else if (tag.isEndTag()) { - outText("", buf, u); - } -- else if (!(type == "colophon")) outText(tag, buf, u); -+ else if (!(type == "colophon")) { -+ if (tag.getAttribute("sID")) tag.setEmpty(false); -+ if (tag.getAttribute("eID")) tag.setEndTag(true); -+ outText(tag, buf, u); -+ } - - } - else if (!strcmp(tag.getName(), "span")) { -Index: trunk/src/utilfuns/utilxml.cpp -=================================================================== ---- trunk/src/utilfuns/utilxml.cpp (revision 3718) -+++ trunk/src/utilfuns/utilxml.cpp (revision 3721) -@@ -291,13 +291,16 @@ - tag.append('/'); - - tag.append(getName()); -- for (StringPairMap::iterator it = attributes.begin(); it != attributes.end(); it++) { -- //tag.appendFormatted(" %s=\"%s\"", it->first.c_str(), it->second.c_str()); -- tag.append(' '); -- tag.append(it->first.c_str()); -- tag.append((strchr(it->second.c_str(), '\"')) ? "=\'" : "=\""); -- tag.append(it->second.c_str()); -- tag.append((strchr(it->second.c_str(), '\"'))? '\'' : '\"'); -+ -+ if (!isEndTag()) { -+ for (StringPairMap::iterator it = attributes.begin(); it != attributes.end(); it++) { -+ //tag.appendFormatted(" %s=\"%s\"", it->first.c_str(), it->second.c_str()); -+ tag.append(' '); -+ tag.append(it->first.c_str()); -+ tag.append((strchr(it->second.c_str(), '\"')) ? "=\'" : "=\""); -+ tag.append(it->second.c_str()); -+ tag.append((strchr(it->second.c_str(), '\"'))? '\'' : '\"'); -+ } - } - - if (isEmpty()) -Index: trunk/include/utilxml.h -=================================================================== ---- trunk/include/utilxml.h (revision 3718) -+++ trunk/include/utilxml.h (revision 3721) -@@ -75,6 +75,13 @@ - * otherwise, we return if we're a simple XML end . - */ - bool isEndTag(const char *eID = 0) const; -+ inline void setEndTag(bool value) { -+ if (!parsed) -+ parse(); -+ endTag = value; -+ if (value) -+ empty = false; -+ } - - const StringList getAttributeNames() const; - int getAttributePartCount(const char *attribName, char partSplit = '|') const; diff --git a/sword-1.8.1-icu61.diff b/sword-1.8.1-icu61.diff deleted file mode 100644 index 2129f27..0000000 --- a/sword-1.8.1-icu61.diff +++ /dev/null @@ -1,138 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5cbd06a..1d3a2d2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,4 @@ --# TODO: write FindICU (icu-config only for 2.2 and up) -- currently taken from another CMake system --# limit pkg-config version to >= 0.14, demo, utilities, doc, tests -+# TODO: limit pkg-config version to >= 0.14, demo, utilities, doc, tests - # use BUILD_SHARED_LIBS - # convince perl swig bindings to build properly - # -@@ -13,7 +12,7 @@ - # all posterity and eternity, wherever such transfer is possible. Where it is - # not, then this file is released under the GPLv2 by myself. - PROJECT(libsword CXX C) --CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0) -+CMAKE_MINIMUM_REQUIRED(VERSION 3.7.0) - SET(SWORD_VERSION 1.8.1) - - # Make sure it's an out-of-stream build -@@ -56,7 +55,8 @@ IF(MSVC) - ELSE(MSVC) - FIND_PACKAGE(BZIP2 QUIET) - FIND_PACKAGE(XZ QUIET) -- FIND_PACKAGE(ICU QUIET) -+ FIND_PACKAGE(ICU -+ COMPONENTS data i18n io uc) - FIND_PACKAGE(CURL QUIET) - ENDIF(MSVC) - FIND_PACKAGE(CLucene QUIET) -@@ -237,7 +237,11 @@ ENDIF(WITH_CLUCENE) - IF(WITH_ICU) - INCLUDE_DIRECTORIES(${ICU_INCLUDE_DIRS}) - ADD_DEFINITIONS(${ICU_DEFINITIONS}) -- SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES}) -+ MESSAGE(STATUS "ICU Version: ${ICU_VERSION}") -+ IF("${ICU_VERSION}" VERSION_GREATER "61") -+ ADD_DEFINITIONS(-DU_USING_ICU_NAMESPACE) -+ ENDIF("${ICU_VERSION}" VERSION_GREATER "61") -+ SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ICU_LIBRARIES}) - ENDIF(WITH_ICU) - IF(REGEX_FOUND AND CROSS_COMPILE_MINGW32) - SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${REGEX_LIBRARY}) -diff --git a/cmake/FindICU.cmake b/cmake/FindICU.cmake -deleted file mode 100644 -index 451c2f3..0000000 ---- a/cmake/FindICU.cmake -+++ /dev/null -@@ -1,68 +0,0 @@ --# Finds the International Components for Unicode (ICU) Library --# --# ICU_FOUND - True if ICU found. --# ICU_I18N_FOUND - True if ICU's internationalization library found. --# ICU_INCLUDE_DIRS - Directory to include to get ICU headers --# Note: always include ICU headers as, e.g., --# unicode/utypes.h --# ICU_LIBRARIES - Libraries to link against for the common ICU --# ICU_I18N_LIBRARIES - Libraries to link against for ICU internationaliation --# (note: in addition to ICU_LIBRARIES) -- --# Look for the header file. --find_path( -- ICU_INCLUDE_DIR -- NAMES unicode/utypes.h -- DOC "Include directory for the ICU library") --mark_as_advanced(ICU_INCLUDE_DIR) -- --# Look for the library. --find_library( -- ICU_LIBRARY -- NAMES icuuc cygicuuc cygicuuc32 -- DOC "Libraries to link against for the common parts of ICU") --mark_as_advanced(ICU_LIBRARY) -- --# Copy the results to the output variables. --if(ICU_INCLUDE_DIR AND ICU_LIBRARY) -- set(ICU_FOUND 1) -- set(ICU_LIBRARIES ${ICU_LIBRARY}) -- set(ICU_INCLUDE_DIRS ${ICU_INCLUDE_DIR}) -- -- # Look for the ICU internationalization libraries -- find_library( -- ICU_I18N_LIBRARY -- NAMES icuin icui18n cygicuin cygicuin32 -- DOC "Libraries to link against for ICU internationalization") -- if(MSVC) -- find_library(ICU_DATA_LIBRARY -- NAMES icudt -- DOC "Libraries to link against for ICU data") -- set(ICU_LIBRARIES ${ICU_LIBRARIES} ${ICU_DATA_LIBRARY}) -- endif(MSVC) -- mark_as_advanced(ICU_I18N_LIBRARY) -- mark_as_advanced(ICU_DATA_LIBRARY) -- if (ICU_I18N_LIBRARY) -- set(ICU_I18N_FOUND 1) -- set(ICU_I18N_LIBRARIES ${ICU_I18N_LIBRARY}) -- else (ICU_I18N_LIBRARY) -- set(ICU_I18N_FOUND 0) -- set(ICU_I18N_LIBRARIES) -- endif (ICU_I18N_LIBRARY) --else(ICU_INCLUDE_DIR AND ICU_LIBRARY) -- set(ICU_FOUND 0) -- set(ICU_I18N_FOUND 0) -- set(ICU_LIBRARIES) -- set(ICU_I18N_LIBRARIES) -- set(ICU_INCLUDE_DIRS) --endif(ICU_INCLUDE_DIR AND ICU_LIBRARY) -- --IF(ICU_FOUND) -- IF(NOT ICU_FIND_QUIETLY) -- MESSAGE(STATUS "ICU: Yes ${ICU_I18N_LIBRARY}") -- ENDIF(NOT ICU_FIND_QUIETLY) --ELSE(ICU_FOUND) -- IF(ICU_FIND_REQUIRED) -- MESSAGE(FATAL_ERROR "ICU: No") -- ENDIF(ICU_FIND_REQUIRED) --ENDIF(ICU_FOUND) -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 30818a8..08bc573 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -75,10 +75,12 @@ ENDFOREACH(TEST ${test_PROGRAMS}) - - ######################################################################################## - # The following tests require extra libraries to run --# --FOREACH(ICUTEST icutest translittest) -- TARGET_LINK_LIBRARIES(${ICUTEST} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES}) --ENDFOREACH(ICUTEST icutest translittest) -+# -+IF(WITH_ICU) -+ FOREACH(ICUTEST icutest translittest) -+ TARGET_LINK_LIBRARIES(${ICUTEST} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES}) -+ ENDFOREACH(ICUTEST icutest translittest) -+ENDIF(WITH_ICU) - - # Excluded until I know we have the tests working - ADD_SUBDIRECTORY(testsuite) diff --git a/sword-1.8.1-integer-types.diff b/sword-1.8.1-integer-types.diff deleted file mode 100644 index b6d61db..0000000 --- a/sword-1.8.1-integer-types.diff +++ /dev/null @@ -1,1488 +0,0 @@ -Author: Jaak Ristioja -Date: Sat Aug 24 14:31:34 2019 +0300 - - Removed all __[su](8|16|32|64) types from sysdata.h, use types - -diff --git a/examples/cmdline/search.cpp b/examples/cmdline/search.cpp -index 6e5d0ac9..e80f3541 100644 ---- a/examples/cmdline/search.cpp -+++ b/examples/cmdline/search.cpp -@@ -129,7 +129,7 @@ int main(int argc, char **argv) - // listkey.sort(); - while (!listkey.popError()) { - std::cout << (const char *)listkey; -- if (listkey.getElement()->userData) std::cout << " : " << (__u64)listkey.getElement()->userData << "%"; -+ if (listkey.getElement()->userData) std::cout << " : " << (std::uint64_t)listkey.getElement()->userData << "%"; - std::cout << std::endl; - listkey++; - } -diff --git a/include/rawstr.h b/include/rawstr.h -index d25ebc37..782cd0e0 100644 ---- a/include/rawstr.h -+++ b/include/rawstr.h -@@ -54,8 +54,8 @@ public: - virtual ~RawStr(); - void getIDXBuf(long ioffset, char **buf) const; - void getIDXBufDat(long ioffset, char **buf) const; -- signed char findOffset(const char *key, __u32 *start, __u16 *size, long away = 0, __u32 *idxoff = 0) const; -- void readText(__u32 start, __u16 *size, char **idxbuf, SWBuf &buf) const; -+ signed char findOffset(const char *key, std::uint32_t *start, std::uint16_t *size, long away = 0, std::uint32_t *idxoff = 0) const; -+ void readText(std::uint32_t start, std::uint16_t *size, char **idxbuf, SWBuf &buf) const; - static signed char createModule(const char *path); - }; - -diff --git a/include/rawstr4.h b/include/rawstr4.h -index 0277a25a..95d2e268 100644 ---- a/include/rawstr4.h -+++ b/include/rawstr4.h -@@ -53,8 +53,8 @@ public: - virtual ~RawStr4(); - void getIDXBuf(long ioffset, char **buf) const; - void getIDXBufDat(long ioffset, char **buf) const; -- signed char findOffset(const char *key, __u32 *start, __u32 *size, long away = 0, __u32 *idxoff = 0) const; -- void readText(__u32 start, __u32 *size, char **idxbuf, SWBuf &buf) const; -+ signed char findOffset(const char *key, std::uint32_t *start, std::uint32_t *size, long away = 0, std::uint32_t *idxoff = 0) const; -+ void readText(std::uint32_t start, std::uint32_t *size, char **idxbuf, SWBuf &buf) const; - static signed char createModule(const char *path); - }; - -diff --git a/include/swkey.h b/include/swkey.h -index f7c94f13..68c9e5d6 100644 ---- a/include/swkey.h -+++ b/include/swkey.h -@@ -114,7 +114,7 @@ protected: - public: - - // misc storage for whatever -- __u64 userData; -+ std::uint64_t userData; - - /** initializes instance of SWKey from a string - * All keys can be reduced to a string representation which should be able -diff --git a/include/sysdata.h b/include/sysdata.h -index f979f29f..75bcdefd 100644 ---- a/include/sysdata.h -+++ b/include/sysdata.h -@@ -22,6 +22,9 @@ - - #ifndef SIZEDTYPES_H - #define SIZEDTYPES_H -+ -+#include -+ - /* - * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the - * header files exported to user space -@@ -31,55 +34,34 @@ - #endif - - --typedef signed char __s8; --typedef unsigned char __u8; -- --typedef signed short __s16; --typedef unsigned short __u16; -- --typedef signed int __s32; --typedef unsigned int __u32; -- --#ifdef OS_ANDROID --#elif defined(__GNUC__) --__extension__ typedef __signed__ long long __s64; --__extension__ typedef unsigned long long __u64; --#elif defined(__BORLANDC__) --typedef signed __int64 __s64; --typedef unsigned __int64 __u64; --#else --typedef signed long long __s64; --typedef unsigned long long __u64; --#endif -- - #undef __swswap16 - #undef __swswap32 - #undef __swswap64 - - #define __swswap16(x) \ -- ((__u16)( \ -- (((__u16)(x) & (__u16)0x00ffU) << 8) | \ -- (((__u16)(x) & (__u16)0xff00U) >> 8) )) -+ ((std::uint16_t)( \ -+ (((std::uint16_t)(x) & (std::uint16_t)0x00ffU) << 8) | \ -+ (((std::uint16_t)(x) & (std::uint16_t)0xff00U) >> 8) )) - - - #define __swswap32(x) \ -- ((__u32)( \ -- (((__u32)(x) & (__u32)0x000000ffUL) << 24) | \ -- (((__u32)(x) & (__u32)0x0000ff00UL) << 8) | \ -- (((__u32)(x) & (__u32)0x00ff0000UL) >> 8) | \ -- (((__u32)(x) & (__u32)0xff000000UL) >> 24) )) -+ ((std::uint32_t)( \ -+ (((std::uint32_t)(x) & (std::uint32_t)0x000000ffUL) << 24) | \ -+ (((std::uint32_t)(x) & (std::uint32_t)0x0000ff00UL) << 8) | \ -+ (((std::uint32_t)(x) & (std::uint32_t)0x00ff0000UL) >> 8) | \ -+ (((std::uint32_t)(x) & (std::uint32_t)0xff000000UL) >> 24) )) - - - #define __swswap64(x) \ -- ((__u64)( \ -- (__u64)(((__u64)(x) & (__u64)0x00000000000000ffULL) << 56) | \ -- (__u64)(((__u64)(x) & (__u64)0x000000000000ff00ULL) << 40) | \ -- (__u64)(((__u64)(x) & (__u64)0x0000000000ff0000ULL) << 24) | \ -- (__u64)(((__u64)(x) & (__u64)0x00000000ff000000ULL) << 8) | \ -- (__u64)(((__u64)(x) & (__u64)0x000000ff00000000ULL) >> 8) | \ -- (__u64)(((__u64)(x) & (__u64)0x0000ff0000000000ULL) >> 24) | \ -- (__u64)(((__u64)(x) & (__u64)0x00ff000000000000ULL) >> 40) | \ -- (__u64)(((__u64)(x) & (__u64)0xff00000000000000ULL) >> 56) )) -+ ((std::uint64_t)( \ -+ (std::uint64_t)(((std::uint64_t)(x) & (std::uint64_t)0x00000000000000ffULL) << 56) | \ -+ (std::uint64_t)(((std::uint64_t)(x) & (std::uint64_t)0x000000000000ff00ULL) << 40) | \ -+ (std::uint64_t)(((std::uint64_t)(x) & (std::uint64_t)0x0000000000ff0000ULL) << 24) | \ -+ (std::uint64_t)(((std::uint64_t)(x) & (std::uint64_t)0x00000000ff000000ULL) << 8) | \ -+ (std::uint64_t)(((std::uint64_t)(x) & (std::uint64_t)0x000000ff00000000ULL) >> 8) | \ -+ (std::uint64_t)(((std::uint64_t)(x) & (std::uint64_t)0x0000ff0000000000ULL) >> 24) | \ -+ (std::uint64_t)(((std::uint64_t)(x) & (std::uint64_t)0x00ff000000000000ULL) >> 40) | \ -+ (std::uint64_t)(((std::uint64_t)(x) & (std::uint64_t)0xff00000000000000ULL) >> 56) )) - - - -diff --git a/include/treekeyidx.h b/include/treekeyidx.h -index 331b7e83..3aa6c668 100644 ---- a/include/treekeyidx.h -+++ b/include/treekeyidx.h -@@ -42,12 +42,12 @@ class SWDLLEXPORT TreeKeyIdx : public TreeKey { - TreeNode(); - ~TreeNode(); - void clear(); -- __s32 offset; -- __s32 parent; -- __s32 next; -- __s32 firstChild; -+ std::int32_t offset; -+ std::int32_t parent; -+ std::int32_t next; -+ std::int32_t firstChild; - char *name; -- __u16 dsize; -+ std::uint16_t dsize; - char *userData; - } currentNode; - -diff --git a/include/utilstr.h b/include/utilstr.h -index a20706ed..aeec6db3 100644 ---- a/include/utilstr.h -+++ b/include/utilstr.h -@@ -86,8 +86,8 @@ extern const unsigned char SW_toupper_array[256]; - * unicode codepoint value (0 with buf incremented is invalid UTF8 byte - */ - --inline __u32 getUniCharFromUTF8(const unsigned char **buf, bool skipValidation = false) { -- __u32 ch = 0; -+inline std::uint32_t getUniCharFromUTF8(const unsigned char **buf, bool skipValidation = false) { -+ std::uint32_t ch = 0; - - //case: We're at the end - if (!(**buf)) { -@@ -163,7 +163,7 @@ inline __u32 getUniCharFromUTF8(const unsigned char **buf, bool skipValidation = - * to work with - */ - --inline SWBuf *getUTF8FromUniChar(__u32 uchar, SWBuf *appendTo) { -+inline SWBuf *getUTF8FromUniChar(std::uint32_t uchar, SWBuf *appendTo) { - unsigned long base = appendTo->size(); - - // This would be out of Unicode bounds -diff --git a/include/xzcomprs.h b/include/xzcomprs.h -index f3fe42b2..1483240a 100644 ---- a/include/xzcomprs.h -+++ b/include/xzcomprs.h -@@ -42,7 +42,7 @@ public: - virtual void Decode(void); - virtual void setLevel(int l); - private: -- __u64 memlimit; // memory usage limit during decompression -+ std::uint64_t memlimit; // memory usage limit during decompression - }; - - SWORD_NAMESPACE_END -diff --git a/src/keys/treekeyidx.cpp b/src/keys/treekeyidx.cpp -index c4716868..915873b6 100644 ---- a/src/keys/treekeyidx.cpp -+++ b/src/keys/treekeyidx.cpp -@@ -177,7 +177,7 @@ bool TreeKeyIdx::nextSibling() { - - bool TreeKeyIdx::previousSibling() { - TreeNode iterator; -- __s32 target = currentNode.offset; -+ std::int32_t target = currentNode.offset; - if (currentNode.parent > -1) { - getTreeNodeFromIdxOffset(currentNode.parent, &iterator); - getTreeNodeFromIdxOffset(iterator.firstChild, &iterator); -@@ -207,10 +207,10 @@ void TreeKeyIdx::append() { - while (lastSib.next > -1) { - getTreeNodeFromIdxOffset(lastSib.next, &lastSib); - } -- __u32 idxOffset = (__u32)idxfd->seek(0, SEEK_END); -+ std::uint32_t idxOffset = (std::uint32_t)idxfd->seek(0, SEEK_END); - lastSib.next = idxOffset; - saveTreeNodeOffsets(&lastSib); -- __u32 parent = currentNode.parent; -+ std::uint32_t parent = currentNode.parent; - currentNode.clear(); - currentNode.offset = idxOffset; - currentNode.parent = parent; -@@ -224,10 +224,10 @@ void TreeKeyIdx::appendChild() { - append(); - } - else { -- __u32 idxOffset = (__u32)idxfd->seek(0, SEEK_END); -+ std::uint32_t idxOffset = (std::uint32_t)idxfd->seek(0, SEEK_END); - currentNode.firstChild = idxOffset; - saveTreeNodeOffsets(¤tNode); -- __u32 parent = currentNode.offset; -+ std::uint32_t parent = currentNode.offset; - currentNode.clear(); - currentNode.offset = idxOffset; - currentNode.parent = parent; -@@ -257,7 +257,7 @@ void TreeKeyIdx::remove() { - } - if (!done) { - TreeNode iterator; -- __s32 target = currentNode.offset; -+ std::int32_t target = currentNode.offset; - if (currentNode.parent > -1) { - getTreeNodeFromIdxOffset(currentNode.parent, &iterator); - getTreeNodeFromIdxOffset(iterator.firstChild, &iterator); -@@ -331,8 +331,8 @@ signed char TreeKeyIdx::create(const char *ipath) { - void TreeKeyIdx::getTreeNodeFromDatOffset(long ioffset, TreeNode *node) const { - unsnappedKeyText = ""; - char ch; -- __s32 tmp; -- __u16 tmp2; -+ std::int32_t tmp; -+ std::uint16_t tmp2; - - if (datfd && datfd->getFd() >= 0) { - -@@ -379,7 +379,7 @@ void TreeKeyIdx::getTreeNodeFromDatOffset(long ioffset, TreeNode *node) const { - - char TreeKeyIdx::getTreeNodeFromIdxOffset(long ioffset, TreeNode *node) const { - unsnappedKeyText = ""; -- __u32 offset; -+ std::uint32_t offset; - char error = KEYERR_OUTOFBOUNDS; - - if (ioffset < 0) { -@@ -387,7 +387,7 @@ char TreeKeyIdx::getTreeNodeFromIdxOffset(long ioffset, TreeNode *node) const { - error = 77; // out of bounds but still position to 0; - } - -- node->offset = (__s32)ioffset; -+ node->offset = (std::int32_t)ioffset; - if (idxfd && idxfd->getFd() >= 0) { - idxfd->seek(ioffset, SEEK_SET); - if (idxfd->read(&offset, 4) == 4) { -@@ -421,13 +421,13 @@ void TreeKeyIdx::setOffset(unsigned long offset) { - void TreeKeyIdx::saveTreeNodeOffsets(TreeNode *node) { - unsnappedKeyText = ""; - long datOffset = 0; -- __s32 tmp; -+ std::int32_t tmp; - - if (idxfd && idxfd->getFd() >= 0) { - idxfd->seek(node->offset, SEEK_SET); - if (idxfd->read(&tmp, 4) != 4) { - datOffset = datfd->seek(0, SEEK_END); -- tmp = (__s32)archtosword32(datOffset); -+ tmp = (std::int32_t)archtosword32(datOffset); - idxfd->write(&tmp, 4); - } - else { -@@ -435,13 +435,13 @@ void TreeKeyIdx::saveTreeNodeOffsets(TreeNode *node) { - datfd->seek(datOffset, SEEK_SET); - } - -- tmp = (__s32)archtosword32(node->parent); -+ tmp = (std::int32_t)archtosword32(node->parent); - datfd->write(&tmp, 4); - -- tmp = (__s32)archtosword32(node->next); -+ tmp = (std::int32_t)archtosword32(node->next); - datfd->write(&tmp, 4); - -- tmp = (__s32)archtosword32(node->firstChild); -+ tmp = (std::int32_t)archtosword32(node->firstChild); - datfd->write(&tmp, 4); - } - } -@@ -488,12 +488,12 @@ void TreeKeyIdx::copyFrom(const TreeKeyIdx &ikey) { - - void TreeKeyIdx::saveTreeNode(TreeNode *node) { - long datOffset = 0; -- __s32 tmp; -+ std::int32_t tmp; - if (idxfd && idxfd->getFd() >= 0) { - - idxfd->seek(node->offset, SEEK_SET); - datOffset = datfd->seek(0, SEEK_END); -- tmp = (__s32)archtosword32(datOffset); -+ tmp = (std::int32_t)archtosword32(datOffset); - idxfd->write(&tmp, 4); - - saveTreeNodeOffsets(node); -@@ -502,7 +502,7 @@ void TreeKeyIdx::saveTreeNode(TreeNode *node) { - char null = 0; - datfd->write(&null, 1); - -- __u16 tmp2 = archtosword16(node->dsize); -+ std::uint16_t tmp2 = archtosword16(node->dsize); - datfd->write(&tmp2, 2); - - if (node->dsize) { -diff --git a/src/keys/versekey.cpp b/src/keys/versekey.cpp -index bad90fbf..01101634 100644 ---- a/src/keys/versekey.cpp -+++ b/src/keys/versekey.cpp -@@ -776,7 +776,7 @@ terminate_range: - lastKey->setPosition(TOP); - tmpListKey << *lastKey; - ((VerseKey *)tmpListKey.getElement())->setAutoNormalize(isAutoNormalize()); -- tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); -+ tmpListKey.getElement()->userData = (std::uint64_t)(bufStart+(buf-iBuf.c_str())); - } - else { - if (!dash) { // if last separator was not a dash just add -@@ -790,7 +790,7 @@ terminate_range: - *lastKey = TOP; - tmpListKey << *lastKey; - ((VerseKey *)tmpListKey.getElement())->setAutoNormalize(isAutoNormalize()); -- tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); -+ tmpListKey.getElement()->userData = (std::uint64_t)(bufStart+(buf-iBuf.c_str())); - } - else { - bool f = false; -@@ -805,7 +805,7 @@ terminate_range: - *lastKey = TOP; - tmpListKey << *lastKey; - ((VerseKey *)tmpListKey.getElement())->setAutoNormalize(isAutoNormalize()); -- tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); -+ tmpListKey.getElement()->userData = (std::uint64_t)(bufStart+(buf-iBuf.c_str())); - } - } - else if (expandRange) { -@@ -818,7 +818,7 @@ terminate_range: - newElement->setUpperBound(*curKey); - *lastKey = *curKey; - *newElement = TOP; -- tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); -+ tmpListKey.getElement()->userData = (std::uint64_t)(bufStart+(buf-iBuf.c_str())); - } - } - } -@@ -1049,7 +1049,7 @@ terminate_range: - lastKey->setLowerBound(*curKey); - *lastKey = TOP; - tmpListKey << *lastKey; -- tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); -+ tmpListKey.getElement()->userData = (std::uint64_t)(bufStart+(buf-iBuf.c_str())); - } - else { - if (!dash) { // if last separator was not a dash just add -@@ -1062,7 +1062,7 @@ terminate_range: - lastKey->setUpperBound(*curKey); - *lastKey = TOP; - tmpListKey << *lastKey; -- tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); -+ tmpListKey.getElement()->userData = (std::uint64_t)(bufStart+(buf-iBuf.c_str())); - } - else { - bool f = false; -@@ -1076,7 +1076,7 @@ terminate_range: - lastKey->setUpperBound(*curKey); - *lastKey = TOP; - tmpListKey << *lastKey; -- tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); -+ tmpListKey.getElement()->userData = (std::uint64_t)(bufStart+(buf-iBuf.c_str())); - } - } - else if (expandRange) { -@@ -1088,7 +1088,7 @@ terminate_range: - *curKey = MAXVERSE; - newElement->setUpperBound(*curKey); - *newElement = TOP; -- tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); -+ tmpListKey.getElement()->userData = (std::uint64_t)(bufStart+(buf-iBuf.c_str())); - } - } - } -diff --git a/src/modules/comments/rawfiles/rawfiles.cpp b/src/modules/comments/rawfiles/rawfiles.cpp -index bfd3e1da..d32fb104 100644 ---- a/src/modules/comments/rawfiles/rawfiles.cpp -+++ b/src/modules/comments/rawfiles/rawfiles.cpp -@@ -187,7 +187,7 @@ void RawFiles::deleteEntry() { - - const char *RawFiles::getNextFilename() { - static SWBuf incfile; -- __u32 number = 0; -+ std::uint32_t number = 0; - FileDesc *datafile; - - incfile.setFormatted("%s/incfile", path); -@@ -213,7 +213,7 @@ const char *RawFiles::getNextFilename() { - char RawFiles::createModule(const char *path) { - char *incfile = new char [ strlen (path) + 16 ]; - -- __u32 zero = 0; -+ std::uint32_t zero = 0; - zero = archtosword32(zero); - - FileDesc *datafile; -diff --git a/src/modules/common/entriesblk.cpp b/src/modules/common/entriesblk.cpp -index c2c02e41..d1383711 100644 ---- a/src/modules/common/entriesblk.cpp -+++ b/src/modules/common/entriesblk.cpp -@@ -37,13 +37,13 @@ EntriesBlock::EntriesBlock(const char *iBlock, unsigned long size) { - memcpy(block, iBlock, size); - } - else { -- block = (char *)calloc(1, sizeof(__u32)); -+ block = (char *)calloc(1, sizeof(std::uint32_t)); - } - } - - - EntriesBlock::EntriesBlock() { -- block = (char *)calloc(1, sizeof(__u32)); -+ block = (char *)calloc(1, sizeof(std::uint32_t)); - } - - -@@ -53,22 +53,22 @@ EntriesBlock::~EntriesBlock() { - - - void EntriesBlock::setCount(int count) { -- __u32 rawCount = archtosword32(count); -- memcpy(block, &rawCount, sizeof(__u32)); -+ std::uint32_t rawCount = archtosword32(count); -+ memcpy(block, &rawCount, sizeof(std::uint32_t)); - } - - - int EntriesBlock::getCount() { -- __u32 count = 0; -- memcpy(&count, block, sizeof(__u32)); -+ std::uint32_t count = 0; -+ memcpy(&count, block, sizeof(std::uint32_t)); - count = swordtoarch32(count); - return count; - } - - - void EntriesBlock::getMetaEntry(int index, unsigned long *offset, unsigned long *size) { -- __u32 rawOffset = 0; -- __u32 rawSize = 0; -+ std::uint32_t rawOffset = 0; -+ std::uint32_t rawSize = 0; - *offset = 0; - *size = 0; - if (index >= getCount()) // assert index < count -@@ -84,8 +84,8 @@ void EntriesBlock::getMetaEntry(int index, unsigned long *offset, unsigned long - - - void EntriesBlock::setMetaEntry(int index, unsigned long offset, unsigned long size) { -- __u32 rawOffset = (__u32)archtosword32(offset); -- __u32 rawSize = (__u32)archtosword32(size); -+ std::uint32_t rawOffset = (std::uint32_t)archtosword32(offset); -+ std::uint32_t rawSize = (std::uint32_t)archtosword32(size); - - if (index >= getCount()) // assert index < count - return; -diff --git a/src/modules/common/rawstr.cpp b/src/modules/common/rawstr.cpp -index 0541b5c3..4bec07c5 100644 ---- a/src/modules/common/rawstr.cpp -+++ b/src/modules/common/rawstr.cpp -@@ -145,7 +145,7 @@ void RawStr::getIDXBufDat(long ioffset, char **buf) const - - void RawStr::getIDXBuf(long ioffset, char **buf) const - { -- __u32 offset; -+ std::uint32_t offset; - - if (idxfd && idxfd->getFd() >= 0) { - idxfd->seek(ioffset, SEEK_SET); -@@ -170,7 +170,7 @@ void RawStr::getIDXBuf(long ioffset, char **buf) const - * RET: error status -1 general error; -2 new file - */ - --signed char RawStr::findOffset(const char *ikey, __u32 *start, __u16 *size, long away, __u32 *idxoff) const -+signed char RawStr::findOffset(const char *ikey, std::uint32_t *start, std::uint16_t *size, long away, std::uint32_t *idxoff) const - { - char *trybuf, *maxbuf, *key = 0, quitflag = 0; - signed char retval = -1; -@@ -239,13 +239,13 @@ signed char RawStr::findOffset(const char *ikey, __u32 *start, __u16 *size, long - - idxfd->seek(tryoff, SEEK_SET); - -- __u32 tmpStart; -- __u16 tmpSize; -+ std::uint32_t tmpStart; -+ std::uint16_t tmpSize; - *start = *size = tmpStart = tmpSize = 0; - idxfd->read(&tmpStart, 4); - idxfd->read(&tmpSize, 2); - if (idxoff) -- *idxoff = (__u32)tryoff; -+ *idxoff = (std::uint32_t)tryoff; - - *start = swordtoarch32(tmpStart); - *size = swordtoarch16(tmpSize); -@@ -264,17 +264,17 @@ signed char RawStr::findOffset(const char *ikey, __u32 *start, __u16 *size, long - if (bad) { - if(!awayFromSubstrCheck) - retval = -1; -- *start = (__u32)laststart; -+ *start = (std::uint32_t)laststart; - *size = lastsize; - tryoff = lasttry; - if (idxoff) -- *idxoff = (__u32)tryoff; -+ *idxoff = (std::uint32_t)tryoff; - break; - } - idxfd->read(&tmpStart, 4); - idxfd->read(&tmpSize, 2); - if (idxoff) -- *idxoff = (__u32)tryoff; -+ *idxoff = (std::uint32_t)tryoff; - - *start = swordtoarch32(tmpStart); - *size = swordtoarch16(tmpSize); -@@ -306,12 +306,12 @@ signed char RawStr::findOffset(const char *ikey, __u32 *start, __u16 *size, long - * - */ - --void RawStr::readText(__u32 istart, __u16 *isize, char **idxbuf, SWBuf &buf) const -+void RawStr::readText(std::uint32_t istart, std::uint16_t *isize, char **idxbuf, SWBuf &buf) const - { - unsigned int ch; - char *idxbuflocal = 0; - getIDXBufDat(istart, &idxbuflocal); -- __u32 start = istart; -+ std::uint32_t start = istart; - - do { - if (*idxbuf) -@@ -368,12 +368,12 @@ void RawStr::readText(__u32 istart, __u16 *isize, char **idxbuf, SWBuf &buf) con - void RawStr::doSetText(const char *ikey, const char *buf, long len) - { - -- __u32 start, outstart; -- __u32 idxoff; -- __u32 endoff; -- __s32 shiftSize; -- __u16 size; -- __u16 outsize; -+ std::uint32_t start, outstart; -+ std::uint32_t idxoff; -+ std::uint32_t endoff; -+ std::int32_t shiftSize; -+ std::uint16_t size; -+ std::uint16_t outsize; - char *tmpbuf = 0; - char *key = 0; - char *dbKey = 0; -@@ -426,7 +426,7 @@ void RawStr::doSetText(const char *ikey, const char *buf, long len) - while (true); // while we're resolving links - } - -- endoff = (__u32)idxfd->seek(0, SEEK_END); -+ endoff = (std::uint32_t)idxfd->seek(0, SEEK_END); - - shiftSize = endoff - idxoff; - -@@ -442,7 +442,7 @@ void RawStr::doSetText(const char *ikey, const char *buf, long len) - memcpy(outbuf + size, buf, len); - size = outsize = size + (len); - -- start = outstart = (__u32)datfd->seek(0, SEEK_END); -+ start = outstart = (std::uint32_t)datfd->seek(0, SEEK_END); - - outstart = archtosword32(start); - outsize = archtosword16(size); -diff --git a/src/modules/common/rawstr4.cpp b/src/modules/common/rawstr4.cpp -index 2d49b3d7..bf249516 100644 ---- a/src/modules/common/rawstr4.cpp -+++ b/src/modules/common/rawstr4.cpp -@@ -145,7 +145,7 @@ void RawStr4::getIDXBufDat(long ioffset, char **buf) const - - void RawStr4::getIDXBuf(long ioffset, char **buf) const - { -- __u32 offset; -+ std::uint32_t offset; - - if ((unsigned long)idxfd > 0) { - idxfd->seek(ioffset, SEEK_SET); -@@ -179,7 +179,7 @@ void RawStr4::getIDXBuf(long ioffset, char **buf) const - * RET: error status -1 general error; -2 new file - */ - --signed char RawStr4::findOffset(const char *ikey, __u32 *start, __u32 *size, long away, __u32 *idxoff) const -+signed char RawStr4::findOffset(const char *ikey, std::uint32_t *start, std::uint32_t *size, long away, std::uint32_t *idxoff) const - { - char *trybuf, *maxbuf, *key = 0, quitflag = 0; - signed char retval = -1; -@@ -249,12 +249,12 @@ signed char RawStr4::findOffset(const char *ikey, __u32 *start, __u32 *size, lon - - idxfd->seek(tryoff, SEEK_SET); - -- __u32 tmpStart, tmpSize; -+ std::uint32_t tmpStart, tmpSize; - *start = *size = tmpStart = tmpSize = 0; - idxfd->read(&tmpStart, 4); - idxfd->read(&tmpSize, 4); - if (idxoff) -- *idxoff = (__u32)tryoff; -+ *idxoff = (std::uint32_t)tryoff; - - *start = swordtoarch32(tmpStart); - *size = swordtoarch32(tmpSize); -@@ -273,17 +273,17 @@ signed char RawStr4::findOffset(const char *ikey, __u32 *start, __u32 *size, lon - if (bad) { - if(!awayFromSubstrCheck) - retval = -1; -- *start = (__u32)laststart; -- *size = (__u32)lastsize; -+ *start = (std::uint32_t)laststart; -+ *size = (std::uint32_t)lastsize; - tryoff = lasttry; - if (idxoff) -- *idxoff = (__u32)tryoff; -+ *idxoff = (std::uint32_t)tryoff; - break; - } - idxfd->read(&tmpStart, 4); - idxfd->read(&tmpSize, 4); - if (idxoff) -- *idxoff = (__u32)tryoff; -+ *idxoff = (std::uint32_t)tryoff; - - *start = swordtoarch32(tmpStart); - *size = swordtoarch32(tmpSize); -@@ -315,12 +315,12 @@ signed char RawStr4::findOffset(const char *ikey, __u32 *start, __u32 *size, lon - * - */ - --void RawStr4::readText(__u32 istart, __u32 *isize, char **idxbuf, SWBuf &buf) const -+void RawStr4::readText(std::uint32_t istart, std::uint32_t *isize, char **idxbuf, SWBuf &buf) const - { - unsigned int ch; - char *idxbuflocal = 0; - getIDXBufDat(istart, &idxbuflocal); -- __u32 start = istart; -+ std::uint32_t start = istart; - - do { - if (*idxbuf) -@@ -376,12 +376,12 @@ void RawStr4::readText(__u32 istart, __u32 *isize, char **idxbuf, SWBuf &buf) co - - void RawStr4::doSetText(const char *ikey, const char *buf, long len) { - -- __u32 start, outstart; -- __u32 idxoff; -- __u32 endoff; -- __s32 shiftSize; -- __u32 size; -- __u32 outsize; -+ std::uint32_t start, outstart; -+ std::uint32_t idxoff; -+ std::uint32_t endoff; -+ std::int32_t shiftSize; -+ std::uint32_t size; -+ std::uint32_t outsize; - char *tmpbuf = 0; - char *key = 0; - char *dbKey = 0; -@@ -434,7 +434,7 @@ void RawStr4::doSetText(const char *ikey, const char *buf, long len) { - while (true); // while we're resolving links - } - -- endoff = (__u32)idxfd->seek(0, SEEK_END); -+ endoff = (std::uint32_t)idxfd->seek(0, SEEK_END); - - shiftSize = endoff - idxoff; - -@@ -448,9 +448,9 @@ void RawStr4::doSetText(const char *ikey, const char *buf, long len) { - sprintf(outbuf, "%s%c%c", key, 13, 10); - size = strlen(outbuf); - memcpy(outbuf + size, buf, len); -- size = outsize = size + (__u32)len; -+ size = outsize = size + (std::uint32_t)len; - -- start = outstart = (__u32)datfd->seek(0, SEEK_END); -+ start = outstart = (std::uint32_t)datfd->seek(0, SEEK_END); - - outstart = archtosword32(start); - outsize = archtosword32(size); -diff --git a/src/modules/common/rawverse.cpp b/src/modules/common/rawverse.cpp -index 3e79b88d..39560a3b 100644 ---- a/src/modules/common/rawverse.cpp -+++ b/src/modules/common/rawverse.cpp -@@ -122,8 +122,8 @@ void RawVerse::findOffset(char testmt, long idxoff, long *start, unsigned short - - if (idxfp[testmt-1]->getFd() >= 0) { - idxfp[testmt-1]->seek(idxoff, SEEK_SET); -- __s32 tmpStart; -- __u16 tmpSize; -+ std::int32_t tmpStart; -+ std::uint16_t tmpSize; - idxfp[testmt-1]->read(&tmpStart, 4); - long len = idxfp[testmt-1]->read(&tmpSize, 2); // read size - -@@ -177,8 +177,8 @@ void RawVerse::readText(char testmt, long start, unsigned short size, SWBuf &buf - - void RawVerse::doSetText(char testmt, long idxoff, const char *buf, long len) - { -- __s32 start; -- __u16 size; -+ std::int32_t start; -+ std::uint16_t size; - - idxoff *= 6; - if (!testmt) -@@ -186,7 +186,7 @@ void RawVerse::doSetText(char testmt, long idxoff, const char *buf, long len) - - size = (len < 0) ? strlen(buf) : len; - -- start = (__s32)textfp[testmt-1]->seek(0, SEEK_END); -+ start = (std::int32_t)textfp[testmt-1]->seek(0, SEEK_END); - idxfp[testmt-1]->seek(idxoff, SEEK_SET); - - if (size) { -@@ -217,8 +217,8 @@ void RawVerse::doSetText(char testmt, long idxoff, const char *buf, long len) - */ - - void RawVerse::doLinkEntry(char testmt, long destidxoff, long srcidxoff) { -- __s32 start; -- __u16 size; -+ std::int32_t start; -+ std::uint16_t size; - - destidxoff *= 6; - srcidxoff *= 6; -@@ -282,8 +282,8 @@ char RawVerse::createModule(const char *ipath, const char *v11n) - vk.setVersificationSystem(v11n); - vk.setIntros(1); - -- __s32 offset = 0; -- __u16 size = 0; -+ std::int32_t offset = 0; -+ std::uint16_t size = 0; - offset = archtosword32(offset); - size = archtosword16(size); - -diff --git a/src/modules/common/rawverse4.cpp b/src/modules/common/rawverse4.cpp -index 67a43d8f..35d64f51 100644 ---- a/src/modules/common/rawverse4.cpp -+++ b/src/modules/common/rawverse4.cpp -@@ -123,8 +123,8 @@ void RawVerse4::findOffset(char testmt, long idxoff, long *start, unsigned long - - if (idxfp[testmt-1]->getFd() >= 0) { - idxfp[testmt-1]->seek(idxoff, SEEK_SET); -- __u32 tmpStart; -- __u32 tmpSize; -+ std::uint32_t tmpStart; -+ std::uint32_t tmpSize; - idxfp[testmt-1]->read(&tmpStart, 4); - long len = idxfp[testmt-1]->read(&tmpSize, 4); // read size - -@@ -178,16 +178,16 @@ void RawVerse4::readText(char testmt, long start, unsigned long size, SWBuf &buf - - void RawVerse4::doSetText(char testmt, long idxoff, const char *buf, long len) - { -- __u32 start; -- __u32 size; -+ std::uint32_t start; -+ std::uint32_t size; - - idxoff *= 8; - if (!testmt) - testmt = ((idxfp[1]) ? 1:2); - -- size = (__u32)((len < 0) ? strlen(buf) : len); -+ size = (std::uint32_t)((len < 0) ? strlen(buf) : len); - -- start = (__u32)textfp[testmt-1]->seek(0, SEEK_END); -+ start = (std::uint32_t)textfp[testmt-1]->seek(0, SEEK_END); - idxfp[testmt-1]->seek(idxoff, SEEK_SET); - - if (size) { -@@ -218,8 +218,8 @@ void RawVerse4::doSetText(char testmt, long idxoff, const char *buf, long len) - */ - - void RawVerse4::doLinkEntry(char testmt, long destidxoff, long srcidxoff) { -- __u32 start; -- __u32 size; -+ std::uint32_t start; -+ std::uint32_t size; - - destidxoff *= 8; - srcidxoff *= 8; -@@ -282,8 +282,8 @@ char RawVerse4::createModule(const char *ipath, const char *v11n) - VerseKey vk; - vk.setVersificationSystem(v11n); - vk.setIntros(1); -- __u32 offset = 0; -- __u32 size = 0; -+ std::uint32_t offset = 0; -+ std::uint32_t size = 0; - offset = archtosword32(offset); - size = archtosword32(size); - -diff --git a/src/modules/common/zstr.cpp b/src/modules/common/zstr.cpp -index 324372da..6bbb6e84 100644 ---- a/src/modules/common/zstr.cpp -+++ b/src/modules/common/zstr.cpp -@@ -167,7 +167,7 @@ void zStr::getKeyFromDatOffset(long ioffset, char **buf) const - - void zStr::getKeyFromIdxOffset(long ioffset, char **buf) const - { -- __u32 offset; -+ std::uint32_t offset; - - if (idxfd && idxfd->getFd() >= 0) { - idxfd->seek(ioffset, SEEK_SET); -@@ -194,13 +194,13 @@ signed char zStr::findKeyIndex(const char *ikey, long *idxoff, long away) const - { - char *maxbuf = 0, *trybuf = 0, *key = 0, quitflag = 0; - signed char retval = 0; -- __s32 headoff, tailoff, tryoff = 0, maxoff = 0; -- __u32 start, size; -+ std::int32_t headoff, tailoff, tryoff = 0, maxoff = 0; -+ std::uint32_t start, size; - int diff = 0; - bool awayFromSubstrCheck = false; - - if (idxfd->getFd() >= 0) { -- tailoff = maxoff = (__s32)idxfd->seek(0, SEEK_END) - IDXENTRYSIZE; -+ tailoff = maxoff = (std::int32_t)idxfd->seek(0, SEEK_END) - IDXENTRYSIZE; - if (*ikey) { - headoff = 0; - stdstr(&key, ikey, 3); -@@ -212,7 +212,7 @@ signed char zStr::findKeyIndex(const char *ikey, long *idxoff, long away) const - getKeyFromIdxOffset(maxoff, &maxbuf); - - while (headoff < tailoff) { -- tryoff = ((__s32)lastoff == -1) ? headoff + (((((tailoff / IDXENTRYSIZE) - (headoff / IDXENTRYSIZE))) / 2) * IDXENTRYSIZE) : (__s32)lastoff; -+ tryoff = ((std::int32_t)lastoff == -1) ? headoff + (((((tailoff / IDXENTRYSIZE) - (headoff / IDXENTRYSIZE))) / 2) * IDXENTRYSIZE) : (std::int32_t)lastoff; - lastoff = -1; - - getKeyFromIdxOffset(tryoff, &trybuf); -@@ -268,9 +268,9 @@ signed char zStr::findKeyIndex(const char *ikey, long *idxoff, long away) const - *idxoff = tryoff; - - while (away) { -- __u32 laststart = start; -- __u32 lastsize = size; -- __s32 lasttry = tryoff; -+ std::uint32_t laststart = start; -+ std::uint32_t lastsize = size; -+ std::int32_t lasttry = tryoff; - tryoff += (away > 0) ? IDXENTRYSIZE : -IDXENTRYSIZE; - - bool bad = false; -@@ -328,8 +328,8 @@ void zStr::getText(long offset, char **idxbuf, char **buf) const { - char *ch; - char *idxbuflocal = 0; - getKeyFromIdxOffset(offset, &idxbuflocal); -- __u32 start; -- __u32 size; -+ std::uint32_t start; -+ std::uint32_t size; - - do { - idxfd->seek(offset, SEEK_SET); -@@ -368,16 +368,16 @@ void zStr::getText(long offset, char **idxbuf, char **buf) const { - while (true); // while we're resolving links - - if (idxbuflocal) { -- __u32 localsize = (__u32)strlen(idxbuflocal); -+ std::uint32_t localsize = (std::uint32_t)strlen(idxbuflocal); - localsize = (localsize < (size - 1)) ? localsize : (size - 1); - strncpy(*idxbuf, idxbuflocal, localsize); - (*idxbuf)[localsize] = 0; - free(idxbuflocal); - } -- __u32 block = 0; -- __u32 entry = 0; -- memmove(&block, *buf, sizeof(__u32)); -- memmove(&entry, *buf + sizeof(__u32), sizeof(__u32)); -+ std::uint32_t block = 0; -+ std::uint32_t entry = 0; -+ memmove(&block, *buf, sizeof(std::uint32_t)); -+ memmove(&entry, *buf + sizeof(std::uint32_t), sizeof(std::uint32_t)); - block = swordtoarch32(block); - entry = swordtoarch32(entry); - getCompressedText(block, entry, buf); -@@ -391,10 +391,10 @@ void zStr::getText(long offset, char **idxbuf, char **buf) const { - - void zStr::getCompressedText(long block, long entry, char **buf) const { - -- __u32 size = 0; -+ std::uint32_t size = 0; - - if (cacheBlockIndex != block) { -- __u32 start = 0; -+ std::uint32_t start = 0; - - zdxfd->seek(block * ZDXENTRYSIZE, SEEK_SET); - zdxfd->read(&start, 4); -@@ -418,7 +418,7 @@ void zStr::getCompressedText(long block, long entry, char **buf) const { - cacheBlock = new EntriesBlock(rawBuf, len); - cacheBlockIndex = block; - } -- size = (__u32)cacheBlock->getEntrySize(entry); -+ size = (std::uint32_t)cacheBlock->getEntrySize(entry); - *buf = (*buf) ? (char *)realloc(*buf, size*2 + 1) : (char *)malloc(size*2 + 1); - strcpy(*buf, cacheBlock->getEntry(entry)); - } -@@ -436,11 +436,11 @@ void zStr::setText(const char *ikey, const char *buf, long len) { - - static const char nl[] = {13, 10}; - -- __u32 start, outstart; -- __u32 size, outsize; -- __s32 endoff; -+ std::uint32_t start, outstart; -+ std::uint32_t size, outsize; -+ std::int32_t endoff; - long idxoff = 0; -- __s32 shiftSize; -+ std::int32_t shiftSize; - char *tmpbuf = 0; - char *key = 0; - char *dbKey = 0; -@@ -499,9 +499,9 @@ void zStr::setText(const char *ikey, const char *buf, long len) { - } - } - -- endoff = (__s32)idxfd->seek(0, SEEK_END); -+ endoff = (std::int32_t)idxfd->seek(0, SEEK_END); - -- shiftSize = endoff - (__s32)idxoff; -+ shiftSize = endoff - (std::int32_t)idxoff; - - if (shiftSize > 0) { - idxBytes = new char [ shiftSize ]; -@@ -511,7 +511,7 @@ void zStr::setText(const char *ikey, const char *buf, long len) { - - outbuf = new char [ len + strlen(key) + 5 ]; - sprintf(outbuf, "%s%c%c", key, 13, 10); -- size = (__u32)strlen(outbuf); -+ size = (std::uint32_t)strlen(outbuf); - if (len > 0) { // NOT a link - if (!cacheBlock) { - flushCache(); -@@ -523,20 +523,20 @@ void zStr::setText(const char *ikey, const char *buf, long len) { - cacheBlock = new EntriesBlock(); - cacheBlockIndex = (zdxfd->seek(0, SEEK_END) / ZDXENTRYSIZE); - } -- __u32 entry = cacheBlock->addEntry(buf); -+ std::uint32_t entry = cacheBlock->addEntry(buf); - cacheDirty = true; -- outstart = (__u32)archtosword32(cacheBlockIndex); -+ outstart = (std::uint32_t)archtosword32(cacheBlockIndex); - outsize = archtosword32(entry); -- memcpy (outbuf + size, &outstart, sizeof(__u32)); -- memcpy (outbuf + size + sizeof(__u32), &outsize, sizeof(__u32)); -- size += (sizeof(__u32) * 2); -+ memcpy (outbuf + size, &outstart, sizeof(std::uint32_t)); -+ memcpy (outbuf + size + sizeof(std::uint32_t), &outsize, sizeof(std::uint32_t)); -+ size += (sizeof(std::uint32_t) * 2); - } - else { // link - memcpy(outbuf + size, buf, len); - size += len; - } - -- start = (__u32)datfd->seek(0, SEEK_END); -+ start = (std::uint32_t)datfd->seek(0, SEEK_END); - - outstart = archtosword32(start); - outsize = archtosword32(size); -@@ -593,9 +593,9 @@ void zStr::flushCache() const { - - if (cacheBlock) { - if (cacheDirty) { -- __u32 start = 0; -+ std::uint32_t start = 0; - unsigned long size = 0; -- __u32 outstart = 0, outsize = 0; -+ std::uint32_t outstart = 0, outsize = 0; - - const char *rawBuf = cacheBlock->getRawData(&size); - compressor->Buf(rawBuf, &size); -@@ -611,7 +611,7 @@ void zStr::flushCache() const { - unsigned long zdtSize = zdtfd->seek(0, SEEK_END); - - if ((cacheBlockIndex * ZDXENTRYSIZE) > (zdxSize - ZDXENTRYSIZE)) { // New Block -- start = (__u32)zdtSize; -+ start = (std::uint32_t)zdtSize; - } - else { - zdxfd->seek(cacheBlockIndex * ZDXENTRYSIZE, SEEK_SET); -@@ -626,14 +626,14 @@ void zStr::flushCache() const { - size = outsize; - } - else { // middle and bigger-- we have serious problems, for now let's put it at the end = lots of wasted space -- start = (__u32)zdtSize; -+ start = (std::uint32_t)zdtSize; - } - } - - - - outstart = archtosword32(start); -- outsize = archtosword32((__u32)size); -+ outsize = archtosword32((std::uint32_t)size); - - zdxfd->seek(cacheBlockIndex * ZDXENTRYSIZE, SEEK_SET); - zdtfd->seek(start, SEEK_SET); -diff --git a/src/modules/common/zverse.cpp b/src/modules/common/zverse.cpp -index d54c67d9..6ccd9111 100644 ---- a/src/modules/common/zverse.cpp -+++ b/src/modules/common/zverse.cpp -@@ -149,9 +149,9 @@ zVerse::~zVerse() - - void zVerse::findOffset(char testmt, long idxoff, long *start, unsigned short *size, unsigned long *buffnum) const - { -- __u32 ulBuffNum = 0; // buffer number -- __u32 ulVerseStart = 0; // verse offset within buffer -- __u16 usVerseSize = 0; // verse size -+ std::uint32_t ulBuffNum = 0; // buffer number -+ std::uint32_t ulVerseStart = 0; // verse offset within buffer -+ std::uint16_t usVerseSize = 0; // verse size - // set start to offset in - // set size to - // set -@@ -204,9 +204,9 @@ void zVerse::findOffset(char testmt, long idxoff, long *start, unsigned short *s - */ - - void zVerse::zReadText(char testmt, long start, unsigned short size, unsigned long ulBuffNum, SWBuf &inBuf) const { -- __u32 ulCompOffset = 0; // compressed buffer start -- __u32 ulCompSize = 0; // buffer size compressed -- __u32 ulUnCompSize = 0; // buffer size uncompressed -+ std::uint32_t ulCompOffset = 0; // compressed buffer start -+ std::uint32_t ulCompSize = 0; // buffer size compressed -+ std::uint32_t ulUnCompSize = 0; // buffer size uncompressed - - if (!testmt) { - testmt = ((idxfp[0]) ? 1:2); -@@ -312,14 +312,14 @@ void zVerse::doSetText(char testmt, long idxoff, const char *buf, long len) { - - dirtyCache = true; - -- __u32 start; -- __u16 size; -- __u32 outBufIdx = (__u32)cacheBufIdx; -+ std::uint32_t start; -+ std::uint16_t size; -+ std::uint32_t outBufIdx = (std::uint32_t)cacheBufIdx; - - idxoff *= 10; - size = len; - -- start = (__u32)strlen(cacheBuf); -+ start = (std::uint32_t)strlen(cacheBuf); - - if (!size) - start = outBufIdx = 0; -@@ -338,14 +338,14 @@ void zVerse::doSetText(char testmt, long idxoff, const char *buf, long len) { - - void zVerse::flushCache() const { - if (dirtyCache) { -- __u32 idxoff; -- __u32 start, outstart; -- __u32 size, outsize; -- __u32 zsize, outzsize; -+ std::uint32_t idxoff; -+ std::uint32_t start, outstart; -+ std::uint32_t size, outsize; -+ std::uint32_t zsize, outzsize; - -- idxoff = (__u32)cacheBufIdx * 12; -+ idxoff = (std::uint32_t)cacheBufIdx * 12; - if (cacheBuf) { -- size = outsize = zsize = outzsize = (__u32)strlen(cacheBuf); -+ size = outsize = zsize = outzsize = (std::uint32_t)strlen(cacheBuf); - if (size) { - // if (compressor) { - // delete compressor; -@@ -354,16 +354,16 @@ void zVerse::flushCache() const { - compressor->Buf(cacheBuf); - unsigned long tmpSize; - compressor->zBuf(&tmpSize); -- outzsize = zsize = (__u32)tmpSize; -+ outzsize = zsize = (std::uint32_t)tmpSize; - - SWBuf buf; - buf.setSize(zsize + 5); - memcpy(buf.getRawData(), compressor->zBuf(&tmpSize), tmpSize); -- outzsize = zsize = (__u32)tmpSize; -+ outzsize = zsize = (std::uint32_t)tmpSize; - buf.setSize(zsize); - rawZFilter(buf, 1); // 1 = encipher - -- start = outstart = (__u32)textfp[cacheTestament-1]->seek(0, SEEK_END); -+ start = outstart = (std::uint32_t)textfp[cacheTestament-1]->seek(0, SEEK_END); - - outstart = archtosword32(start); - outsize = archtosword32(size); -@@ -392,9 +392,9 @@ void zVerse::flushCache() const { - */ - - void zVerse::doLinkEntry(char testmt, long destidxoff, long srcidxoff) { -- __s32 bufidx; -- __s32 start; -- __u16 size; -+ std::int32_t bufidx; -+ std::int32_t start; -+ std::uint16_t size; - - destidxoff *= 10; - srcidxoff *= 10; -@@ -429,8 +429,8 @@ char zVerse::createModule(const char *ipath, int blockBound, const char *v11n) - char *buf = new char [ strlen (ipath) + 20 ]; - char retVal = 0; - FileDesc *fd, *fd2; -- __s32 offset = 0; -- __s16 size = 0; -+ std::int32_t offset = 0; -+ std::int16_t size = 0; - VerseKey vk; - - stdstr(&path, ipath); -diff --git a/src/modules/common/zverse4.cpp b/src/modules/common/zverse4.cpp -index c5f7d79b..8496416e 100644 ---- a/src/modules/common/zverse4.cpp -+++ b/src/modules/common/zverse4.cpp -@@ -147,9 +147,9 @@ zVerse4::~zVerse4() - - void zVerse4::findOffset(char testmt, long idxoff, long *start, unsigned long *size, unsigned long *buffnum) const - { -- __u32 ulBuffNum = 0; // buffer number -- __u32 ulVerseStart = 0; // verse offset within buffer -- __u32 usVerseSize = 0; // verse size -+ std::uint32_t ulBuffNum = 0; // buffer number -+ std::uint32_t ulVerseStart = 0; // verse offset within buffer -+ std::uint32_t usVerseSize = 0; // verse size - // set start to offset in - // set size to - // set -@@ -202,9 +202,9 @@ void zVerse4::findOffset(char testmt, long idxoff, long *start, unsigned long *s - */ - - void zVerse4::zReadText(char testmt, long start, unsigned long size, unsigned long ulBuffNum, SWBuf &inBuf) const { -- __u32 ulCompOffset = 0; // compressed buffer start -- __u32 ulCompSize = 0; // buffer size compressed -- __u32 ulUnCompSize = 0; // buffer size uncompressed -+ std::uint32_t ulCompOffset = 0; // compressed buffer start -+ std::uint32_t ulCompSize = 0; // buffer size compressed -+ std::uint32_t ulUnCompSize = 0; // buffer size uncompressed - - if (!testmt) { - testmt = ((idxfp[0]) ? 1:2); -@@ -310,14 +310,14 @@ void zVerse4::doSetText(char testmt, long idxoff, const char *buf, long len) { - - dirtyCache = true; - -- __u32 start; -- __u32 size; -- __u32 outBufIdx = (__u32)cacheBufIdx; -+ std::uint32_t start; -+ std::uint32_t size; -+ std::uint32_t outBufIdx = (std::uint32_t)cacheBufIdx; - - idxoff *= 12; -- size = (__u32)len; -+ size = (std::uint32_t)len; - -- start = (__u32)strlen(cacheBuf); -+ start = (std::uint32_t)strlen(cacheBuf); - - if (!size) - start = outBufIdx = 0; -@@ -336,28 +336,28 @@ void zVerse4::doSetText(char testmt, long idxoff, const char *buf, long len) { - - void zVerse4::flushCache() const { - if (dirtyCache) { -- __u32 idxoff; -- __u32 start, outstart; -- __u32 size, outsize; -- __u32 zsize, outzsize; -+ std::uint32_t idxoff; -+ std::uint32_t start, outstart; -+ std::uint32_t size, outsize; -+ std::uint32_t zsize, outzsize; - -- idxoff = (__u32)cacheBufIdx * 12; -+ idxoff = (std::uint32_t)cacheBufIdx * 12; - if (cacheBuf) { -- size = outsize = zsize = outzsize = (__u32)strlen(cacheBuf); -+ size = outsize = zsize = outzsize = (std::uint32_t)strlen(cacheBuf); - if (size) { - compressor->Buf(cacheBuf); - unsigned long tmpSize; - compressor->zBuf(&tmpSize); -- outzsize = zsize = (__u32)tmpSize; -+ outzsize = zsize = (std::uint32_t)tmpSize; - - SWBuf buf; - buf.setSize(zsize + 5); - memcpy(buf.getRawData(), compressor->zBuf(&tmpSize), tmpSize); -- outzsize = zsize = (__u32)tmpSize; -+ outzsize = zsize = (std::uint32_t)tmpSize; - buf.setSize(zsize); - rawZFilter(buf, 1); // 1 = encipher - -- start = outstart = (__u32)textfp[cacheTestament-1]->seek(0, SEEK_END); -+ start = outstart = (std::uint32_t)textfp[cacheTestament-1]->seek(0, SEEK_END); - - outstart = archtosword32(start); - outsize = archtosword32(size); -@@ -386,9 +386,9 @@ void zVerse4::flushCache() const { - */ - - void zVerse4::doLinkEntry(char testmt, long destidxoff, long srcidxoff) { -- __s32 bufidx; -- __s32 start; -- __u32 size; -+ std::int32_t bufidx; -+ std::int32_t start; -+ std::uint32_t size; - - destidxoff *= 12; - srcidxoff *= 12; -@@ -423,8 +423,8 @@ char zVerse4::createModule(const char *ipath, int blockBound, const char *v11n) - char *buf = new char [ strlen (ipath) + 20 ]; - char retVal = 0; - FileDesc *fd, *fd2; -- __s32 offset = 0; -- __s32 size = 0; -+ std::int32_t offset = 0; -+ std::int32_t size = 0; - VerseKey vk; - - stdstr(&path, ipath); -diff --git a/src/modules/filters/rtfhtml.cpp b/src/modules/filters/rtfhtml.cpp -index c2cf73e0..c92c46e3 100644 ---- a/src/modules/filters/rtfhtml.cpp -+++ b/src/modules/filters/rtfhtml.cpp -@@ -53,8 +53,8 @@ char RTFHTML::processText(SWBuf &text, const SWKey *key, const SWModule *module) - while (isdigit(*++end)); - SWBuf num; - num.append(from, end-from); -- __s16 n = atoi(num.c_str()); -- __u32 u = (__u16)n; -+ std::int16_t n = atoi(num.c_str()); -+ std::uint32_t u = (std::uint16_t)n; - getUTF8FromUniChar(u, &text); - from += (end-from); - continue; -diff --git a/src/modules/filters/utf8greekaccents.cpp b/src/modules/filters/utf8greekaccents.cpp -index 15e885f4..9387ada0 100644 ---- a/src/modules/filters/utf8greekaccents.cpp -+++ b/src/modules/filters/utf8greekaccents.cpp -@@ -48,7 +48,7 @@ namespace { - return &oVals; - } - -- std::map<__u32, SWBuf> converters; -+ std::map converters; - class converters_init { - public: - converters_init() { -@@ -354,9 +354,9 @@ char UTF8GreekAccents::processText(SWBuf &text, const SWKey *key, const SWModule - SWBuf orig = text; - const unsigned char* from = (unsigned char*)orig.c_str(); - text = ""; -- map<__u32, SWBuf>::const_iterator it = converters.end(); -+ map::const_iterator it = converters.end(); - while (*from) { -- __u32 ch = getUniCharFromUTF8(&from, true); -+ std::uint32_t ch = getUniCharFromUTF8(&from, true); - // if ch is bad, then convert to replacement char - if (!ch) ch = 0xFFFD; - -diff --git a/src/modules/filters/utf8utf16.cpp b/src/modules/filters/utf8utf16.cpp -index 7cbfe596..bdd022da 100644 ---- a/src/modules/filters/utf8utf16.cpp -+++ b/src/modules/filters/utf8utf16.cpp -@@ -43,25 +43,25 @@ char UTF8UTF16::processText(SWBuf &text, const SWKey *key, const SWModule *modul - text = ""; - while (*from) { - -- __u32 ch = getUniCharFromUTF8(&from); -+ std::uint32_t ch = getUniCharFromUTF8(&from); - - if (!ch) continue; // invalid char - - if (ch < 0x10000) { - text.setSize(text.size()+2); -- *((__u16 *)(text.getRawData()+(text.size()-2))) = (__u16)ch; -+ *((std::uint16_t *)(text.getRawData()+(text.size()-2))) = (std::uint16_t)ch; - } - else { -- __u16 utf16; -- utf16 = (__s16)((ch - 0x10000) / 0x400 + 0xD800); -+ std::uint16_t utf16; -+ utf16 = (std::int16_t)((ch - 0x10000) / 0x400 + 0xD800); - text.setSize(text.size()+4); -- *((__u16 *)(text.getRawData()+(text.size()-4))) = utf16; -- utf16 = (__s16)((ch - 0x10000) % 0x400 + 0xDC00); -- *((__u16 *)(text.getRawData()+(text.size()-2))) = utf16; -+ *((std::uint16_t *)(text.getRawData()+(text.size()-4))) = utf16; -+ utf16 = (std::int16_t)((ch - 0x10000) % 0x400 + 0xDC00); -+ *((std::uint16_t *)(text.getRawData()+(text.size()-2))) = utf16; - } - } - text.setSize(text.size()+2); -- *((__u16 *)(text.getRawData()+(text.size()-2))) = (__u16)0; -+ *((std::uint16_t *)(text.getRawData()+(text.size()-2))) = (std::uint16_t)0; - text.setSize(text.size()-2); - - return 0; -diff --git a/src/modules/genbook/rawgenbook/rawgenbook.cpp b/src/modules/genbook/rawgenbook/rawgenbook.cpp -index 4074cf9b..47931dc8 100644 ---- a/src/modules/genbook/rawgenbook/rawgenbook.cpp -+++ b/src/modules/genbook/rawgenbook/rawgenbook.cpp -@@ -98,8 +98,8 @@ bool RawGenBook::isWritable() const { - - SWBuf &RawGenBook::getRawEntryBuf() const { - -- __u32 offset = 0; -- __u32 size = 0; -+ std::uint32_t offset = 0; -+ std::uint32_t size = 0; - - const TreeKey &key = getTreeKey(); - -@@ -133,8 +133,8 @@ SWBuf &RawGenBook::getRawEntryBuf() const { - - void RawGenBook::setEntry(const char *inbuf, long len) { - -- __u32 offset = (__u32)archtosword32(bdtfd->seek(0, SEEK_END)); -- __u32 size = 0; -+ std::uint32_t offset = (std::uint32_t)archtosword32(bdtfd->seek(0, SEEK_END)); -+ std::uint32_t size = 0; - TreeKeyIdx *key = ((TreeKeyIdx *)&(getTreeKey())); - - char userData[8]; -@@ -144,7 +144,7 @@ void RawGenBook::setEntry(const char *inbuf, long len) { - - bdtfd->write(inbuf, len); - -- size = (__u32)archtosword32(len); -+ size = (std::uint32_t)archtosword32(len); - memcpy(userData, &offset, 4); - memcpy(userData+4, &size, 4); - key->setUserData(userData, 8); -diff --git a/src/modules/lexdict/rawld/rawld.cpp b/src/modules/lexdict/rawld/rawld.cpp -index 2e758599..e1c3f7c3 100644 ---- a/src/modules/lexdict/rawld/rawld.cpp -+++ b/src/modules/lexdict/rawld/rawld.cpp -@@ -73,8 +73,8 @@ bool RawLD::isWritable() const { - - char RawLD::getEntry(long away) const - { -- __u32 start = 0; -- __u16 size = 0; -+ std::uint32_t start = 0; -+ std::uint16_t size = 0; - char *idxbuf = 0; - char retval = 0; - -@@ -195,8 +195,8 @@ long RawLD::getEntryCount() const { - - - long RawLD::getEntryForKey(const char *key) const { -- __u32 start, offset; -- __u16 size; -+ std::uint32_t start, offset; -+ std::uint16_t size; - - char *buf = new char [ strlen(key) + 6 ]; - strcpy(buf, key); -diff --git a/src/modules/lexdict/rawld4/rawld4.cpp b/src/modules/lexdict/rawld4/rawld4.cpp -index bfbe0cb5..fdfe8706 100644 ---- a/src/modules/lexdict/rawld4/rawld4.cpp -+++ b/src/modules/lexdict/rawld4/rawld4.cpp -@@ -73,8 +73,8 @@ bool RawLD4::isWritable() const { - - char RawLD4::getEntry(long away) const - { -- __u32 start = 0; -- __u32 size = 0; -+ std::uint32_t start = 0; -+ std::uint32_t size = 0; - char *idxbuf = 0; - char retval = 0; - -@@ -193,8 +193,8 @@ long RawLD4::getEntryCount() const { - - - long RawLD4::getEntryForKey(const char *key) const { -- __u32 start, offset; -- __u32 size; -+ std::uint32_t start, offset; -+ std::uint32_t size; - - char *buf = new char [ strlen(key) + 6 ]; - strcpy(buf, key); -diff --git a/src/modules/swmodule.cpp b/src/modules/swmodule.cpp -index 2ae8ca22..50e1a1db 100644 ---- a/src/modules/swmodule.cpp -+++ b/src/modules/swmodule.cpp -@@ -543,7 +543,7 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc - Xapian::MSetIterator i; - for (i = h.begin(); i != h.end(); ++i) { - // cout << "Document ID " << *i << "\t"; -- __u64 score = i.get_percent(); -+ std::uint64_t score = i.get_percent(); - Xapian::Document doc = i.get_document(); - *resultKey = doc.get_data().c_str(); - #elif defined USELUCENE -@@ -551,7 +551,7 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc - Document &doc = h->doc(i); - // set a temporary verse key to this module position - *resultKey = wcharToUTF8(doc.get(_T("key"))); //TODO Does a key always accept utf8? -- __u64 score = (__u64)((__u32)(h->score(i)*100)); -+ std::uint64_t score = (std::uint64_t)((std::uint32_t)(h->score(i)*100)); - #endif - - // check to see if it sets ok (within our bounds) and if not, skip -diff --git a/tests/filtertest.cpp b/tests/filtertest.cpp -index 03c86954..91652b87 100644 ---- a/tests/filtertest.cpp -+++ b/tests/filtertest.cpp -@@ -72,7 +72,7 @@ int main(int argc, char **argv) { - /* - // Example showing safe to cast to u16 stream - unsigned int size = lineBuffer.size() / 2; -- __u16 *wcharBuf = (__u16 *)lineBuffer.getRawData(); -+ std::uint16_t *wcharBuf = (std::uint16_t *)lineBuffer.getRawData(); - for (unsigned int i = 0; i < size; ++i) { - std::wcout << (wchar_t)wcharBuf[i]; // must cast for correct output and because wchar_t is different size on linux we couldn't declare out wcharBuf a wchar_t * - } -diff --git a/tests/utf8norm.cpp b/tests/utf8norm.cpp -index 06143c43..27ebb825 100644 ---- a/tests/utf8norm.cpp -+++ b/tests/utf8norm.cpp -@@ -67,7 +67,7 @@ int main(int argc, char **argv) { - } - const unsigned char *c = (const unsigned char *)filteredContents.getRawData(); - // UTF-32 BOM -- __u32 ch = 0xfeff; -+ std::uint32_t ch = 0xfeff; - // write(STDOUT_FILENO, &ch, 4); - while (c && *c) { - ch = getUniCharFromUTF8(&c); diff --git a/sword-1.8.1-swig-perl.diff b/sword-1.8.1-swig-perl.diff deleted file mode 100644 index 6ff8859..0000000 --- a/sword-1.8.1-swig-perl.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/bindings/swig/perl/CMakeLists.txt b/bindings/swig/perl/CMakeLists.txt -index 3e2e2e9..46f4c8f 100644 ---- a/bindings/swig/perl/CMakeLists.txt -+++ b/bindings/swig/perl/CMakeLists.txt -@@ -23,6 +23,7 @@ WriteMakefile( - 'NAME' => 'Sword', - 'VERSION' => '${SWORD_VERSION}', - 'INC' => '-I${CMAKE_SOURCE_DIR}/include -I${CMAKE_CURRENT_SOURCE_DIR}/..', -+ 'INSTALLDIRS' => 'vendor', - 'DEFINE' => '-DSWIG', - 'LIBS' => '-L${CMAKE_BINARY_DIR} -lsword -lz', - 'FIRST_MAKEFILE' => 'Makefile.perlswig', diff --git a/sword-1.8.1-swig.diff b/sword-1.8.1-swig.diff deleted file mode 100644 index bdf9002..0000000 --- a/sword-1.8.1-swig.diff +++ /dev/null @@ -1,154 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1d3a2d2..f627850 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -293,9 +293,10 @@ INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/install.cmake") - # Bindings are good, right? - # - --IF(NOT SWORD_BINDINGS STREQUAL "" AND SWORD_BINDINGS) -+MESSAGE(STATUS "${SWORD_SWIG_BINDINGS}") -+IF(SWORD_SWIG_BINDINGS) - ADD_SUBDIRECTORY("${CMAKE_CURRENT_SOURCE_DIR}/bindings") --ENDIF(NOT SWORD_BINDINGS STREQUAL "" AND SWORD_BINDINGS) -+ENDIF(SWORD_SWIG_BINDINGS) - - ############################################################################################## - # Utilities are hawt -diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt -index 9caf6d6..729b499 100644 ---- a/bindings/CMakeLists.txt -+++ b/bindings/CMakeLists.txt -@@ -1,5 +1,3 @@ --IF(SWORD_BINDINGS MATCHES ".*Python.*" -- OR SWORD_BINDINGS MATCHES ".*Perl.*") -+IF(SWORD_SWIG_BINDINGS) - ADD_SUBDIRECTORY("${CMAKE_CURRENT_SOURCE_DIR}/swig") --ENDIF(SWORD_BINDINGS MATCHES ".*Python.*" -- OR SWORD_BINDINGS MATCHES ".*Perl.*") -+ENDIF(SWORD_SWIG_BINDINGS) -diff --git a/bindings/swig/CMakeLists.txt b/bindings/swig/CMakeLists.txt -index d2f4b16..93d55f1 100644 ---- a/bindings/swig/CMakeLists.txt -+++ b/bindings/swig/CMakeLists.txt -@@ -15,27 +15,33 @@ IF(NOT SWIG_FOUND) - MESSAGE(FATAL_ERROR "Swig: no") - ELSE(NOT SWIG_FOUND) - MESSAGE(STATUS "Swig: yes") -- -+ - SET(CMAKE_SWIG_FLAGS "-w-451,-402;-shadow;-c++") -- -+ - MACRO(SWORD_SWIG_GENERATE LANG) -- ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/Sword.cxx -+ ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Sword.cxx" - COMMAND ${SWIG_EXECUTABLE} ${CMAKE_SWIG_FLAGS} -${LANG} -o "${CMAKE_CURRENT_BINARY_DIR}/Sword.cxx" - "-I${CMAKE_SOURCE_DIR}/bindings/swig" ${SWIG_INCLUDES} "${CMAKE_SOURCE_DIR}/bindings/swig/sword.i" -- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) -+ WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") - ENDMACRO(SWORD_SWIG_GENERATE) -- -+ - GET_DIRECTORY_PROPERTY(cmake_include_directories INCLUDE_DIRECTORIES) - SET(SWIG_INCLUDES) - FOREACH(directory ${cmake_include_directories}) - SET(SWIG_INCLUDES ${SWIG_INCLUDES} "-I${directory}") - ENDFOREACH(directory ${cmake_include_directories}) -- -- IF(SWORD_BINDINGS MATCHES ".*Python.*") -- ADD_SUBDIRECTORY(python) -- ENDIF(SWORD_BINDINGS MATCHES ".*Python.*") -- -- IF(SWORD_BINDINGS MATCHES ".*Perl.*") -+ -+ IF(SWORD_PYTHON_2) -+ SET(SWORD_PYTHON_VERSION 2) -+ ADD_SUBDIRECTORY(python python2) -+ ENDIF(SWORD_PYTHON_2) -+ -+ IF(SWORD_PYTHON_3) -+ SET(SWORD_PYTHON_VERSION 3) -+ ADD_SUBDIRECTORY(python python3) -+ ENDIF(SWORD_PYTHON_3) -+ -+ IF(SWORD_PERL) - ADD_SUBDIRECTORY(perl) -- ENDIF(SWORD_BINDINGS MATCHES ".*Perl.*") -+ ENDIF(SWORD_PERL) - ENDIF(NOT SWIG_FOUND) -diff --git a/bindings/swig/python/CMakeLists.txt b/bindings/swig/python/CMakeLists.txt -index bbf7561..eced324 100644 ---- a/bindings/swig/python/CMakeLists.txt -+++ b/bindings/swig/python/CMakeLists.txt -@@ -11,6 +11,11 @@ - # - #SWIG_LINK_LIBRARIES(Sword ${PYTHON_LIBRARIES} ${SWORD_LINK_NAME}) - -+UNSET(PYTHON_EXECUTABLE CACHE) -+UNSET(PYTHON_LIBS CACHE) -+SET(PythonInterp_FIND_VERSION "${SWORD_PYTHON_VERSION}") -+SET(PythonInterp_FIND_VERSION_MAJOR "${SWORD_PYTHON_VERSION}") -+SET(PythonLibs_FIND_VERSION "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}") - FIND_PACKAGE(PythonInterp REQUIRED) - FIND_PACKAGE(PythonLibs) - -@@ -38,10 +43,10 @@ FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/setup.py "${PY_SCRIPT}") - - SWORD_SWIG_GENERATE(python) - --ADD_CUSTOM_TARGET(swordswig ALL -- COMMAND python setup.py build -- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Sword.cxx ${SWORD_LINK_NAME} -- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) -+ADD_CUSTOM_TARGET(swordswig_python${SWORD_PYTHON_VERSION} ALL -+ COMMAND "${PYTHON_EXECUTABLE}" setup.py build -+ DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/Sword.cxx" ${SWORD_LINK_NAME} -+ WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") - - # Allow user installation to custom directory - IF(NOT SWORD_PYTHON_INSTALL_DIR STREQUAL "") -diff --git a/bindings/swig/python/install.cmake.in b/bindings/swig/python/install.cmake.in -index 5dbd52e..9b7da58 100644 ---- a/bindings/swig/python/install.cmake.in -+++ b/bindings/swig/python/install.cmake.in -@@ -1,4 +1,4 @@ - EXECUTE_PROCESS(COMMAND -- python setup.py install @SETUP_ARGS@ -+ "@PYTHON_EXECUTABLE@" setup.py install @SETUP_ARGS@ - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" - ) -diff --git a/cmake/options.cmake b/cmake/options.cmake -index 19b7004..b20370e 100644 ---- a/cmake/options.cmake -+++ b/cmake/options.cmake -@@ -46,6 +46,12 @@ _SET_FANCY(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share" "Directory to in - - _SET_FANCY(SWORD_PYTHON_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}" STRING "Directory where the Python bindings will be installed. Defaults to default Python path.") - -+_SET_FANCY(SWORD_PYTHON_2 FALSE STRING "Set to TRUE to build Swig Python bindings for Python 2") -+ -+_SET_FANCY(SWORD_PYTHON_3 FALSE STRING "Set to TRUE to build Swig Python bindings for Python 3") -+ -+_SET_FANCY(SWORD_PERL FALSE STRING "Set to TRUE to build Swig Perl bindings") -+ - # Post-processing of variables - MACRO(PROCESS_VERSION LEVEL VALUE) - SET(SWORD_VERSION_${LEVEL} ${VALUE}) -@@ -74,3 +80,16 @@ SET(SWORD_VERSION_STR "${SWORD_VERSION}") - SET(SWORD_VERSION_NUM "${SWORD_VERSION_MAJOR}${MINOR}${MICRO}${NANO}") - - MESSAGE(STATUS "SWORD Version ${SWORD_VERSION_NUM}") -+ -+IF(SWORD_PYTHON_2 OR SWORD_PYTHON_3 OR SWORD_PERL) -+ MESSAGE(STATUS "Building SWIG Bindings") -+ SET(SWORD_SWIG_BINDINGS 1) -+ELSE() -+ SET(SWORD_SWIG_BINDINGS 0) -+ENDIF() -+ -+IF(SWORD_SWIG_BINDINGS) -+ SET(SWORD_BINDINGS TRUE) -+ELSE() -+ SET(SWORD_BINDINGS FALSE) -+ENDIF() From 8c2bff53f64fff59de20644ae94e7110f9e13a6a Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Mon, 14 Dec 2020 14:45:27 -0600 Subject: [PATCH 20/66] Restore PERL bindings --- cmake-perl-bindings.diff | 105 +++++++++++++++++++++++++++++++++++++++ sword.spec | 30 ++++++----- 2 files changed, 122 insertions(+), 13 deletions(-) create mode 100644 cmake-perl-bindings.diff diff --git a/cmake-perl-bindings.diff b/cmake-perl-bindings.diff new file mode 100644 index 0000000..ea6710a --- /dev/null +++ b/cmake-perl-bindings.diff @@ -0,0 +1,105 @@ +diff -bru a/bindings/swig/perl/CMakeLists.txt b/bindings/swig/perl/CMakeLists.txt +--- a/bindings/swig/perl/CMakeLists.txt 2020-07-29 18:59:48.000000000 +0200 ++++ b/bindings/swig/perl/CMakeLists.txt 2020-11-01 19:56:20.825016280 +0100 +@@ -1,68 +1,35 @@ +-# This method works but there is no good way to install the results of it +-#FIND_PACKAGE(PerlLibs REQUIRED) +-#INCLUDE_DIRECTORIES(${PERL_INCLUDE_PATH}) +-# +-#SET_SOURCE_FILES_PROPERTIES(../sword.i PROPERTIES CPLUSPLUS ON) +-#SET_SOURCE_FILES_PROPERTIES(../sword.i PROPERTIES SWIG_FLAGS "") +-# +-#SWIG_ADD_MODULE(Sword perl +-# "../sword.i" +-#) +-# +-#SWIG_LINK_LIBRARIES(Sword ${PERL_LIBRARY} ${SWORD_LINK_NAME}) +- +-FIND_PACKAGE(Perl REQUIRED) +- +-SET(PERL_MAKEFILE "#!${PERL_EXECUTABLE} +- +-use ExtUtils::MakeMaker; +- +-# See lib/ExtUtils/MakeMaker.pm for details of how to influence +-# the contents of the Makefile that is written +-WriteMakefile( +- 'NAME' => 'Sword', +- 'VERSION' => '${SWORD_VERSION}', +- 'INC' => '-I\"${CMAKE_SOURCE_DIR}/include\" -I\"${CMAKE_CURRENT_SOURCE_DIR}/..\"', +- 'DEFINE' => '-DSWIG', +- 'LIBS' => '-L\"${CMAKE_BINARY_DIR}\" -lsword -lz', +- 'FIRST_MAKEFILE' => 'Makefile.perlswig', +- 'PREREQ_PM' => {}, +- ($] >= 5.005 ? ## Add these new keywords supported since 5.005 +- (ABSTRACT => 'Sword Project perl bindings', # retrieve abstract from module +- AUTHOR => 'Sword Project ') : ()), +-); +- +-rename 'Makefile.perlswig', 'Makefile.perlswig.old' or die \"Can't rename Makefile\"; +-open(INPUT, 'Makefile.perlswig') or die \"Can't open output Makefile\"; +-while () { +- s/\\-lsword/\\-lsword \\-lstdc\\+\\+/; +- print OUTPUT \"$_\"; +-} +- +-close INPUT; +-close OUTPUT;") +-FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/Makefile.PL "${PERL_MAKEFILE}") +- +-SET(SKIP_MAKEFILE "\\.old +-~$ +-\\.bak +-^CVS +-Makefile$") +-FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/Makefile.SKIP "${SKIP_MAKEFILE}") +- +-SWORD_SWIG_GENERATE(perl) +- +-ADD_CUSTOM_COMMAND(OUTPUT MANIFEST Makefile.perlswig +- COMMAND ${PERL_EXECUTABLE} Makefile.PL && make -f Makefile.perlswig clean +- COMMAND ${PERL_EXECUTABLE} Makefile.PL && make -f Makefile.perlswig manifest +- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) +- +-ADD_CUSTOM_TARGET(perlswig ALL +- COMMAND make -f Makefile.perlswig +- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Sword.cxx ${CMAKE_CURRENT_BINARY_DIR}/Makefile.perlswig ${SWORD_LINK_NAME} +- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) ++# Perl Swig bindings + +-INSTALL(SCRIPT install.cmake) ++cmake_minimum_required(VERSION 3.14.7) ++cmake_policy(SET CMP0078 NEW) ++cmake_policy(SET CMP0086 NEW) ++set(UseSWIG_MODULE_VERSION 2) + +-MESSAGE(STATUS "Perl: yes") ++find_package(SWIG REQUIRED) ++include(${SWIG_USE_FILE}) ++ ++find_package(PerlLibs REQUIRED) ++include_directories(${PERL_INCLUDE_PATH}) ++include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) ++ ++ ++set_source_files_properties(../sword.i PROPERTIES CPLUSPLUS ON) ++ ++SWIG_ADD_LIBRARY(Sword ++ TYPE SHARED ++ LANGUAGE perl SOURCES ../sword.i ++ ) ++TARGET_LINK_LIBRARIES(Sword ${PERL_LIBRARIES} ${SWORD_LINK_NAME}) ++ ++ ++install( ++ TARGETS Sword ++ LIBRARY DESTINATION "${LIB_INSTALL_DIR}/perl5/vendor_perl/auto/Sword" ++) ++get_target_property(SWIG_BUILDIR Sword SWIG_SUPPORT_FILES_DIRECTORY) ++ ++message(STATUS "SWIG_BUILDIR=${SWIG_BUILDIR}") ++install( ++ FILES ${SWIG_BUILDIR}/Sword.pm ++ DESTINATION "${LIB_INSTALL_DIR}/perl5/vendor_perl" ++) diff --git a/sword.spec b/sword.spec index b580719..36daaec 100644 --- a/sword.spec +++ b/sword.spec @@ -20,9 +20,12 @@ BuildRequires: cppunit-devel BuildRequires: swig BuildRequires: python3-devel BuildRequires: perl-devel +BuildRequires: perl-macros BuildRequires: gcc BuildRequires: gcc-c++ +Patch0: cmake-perl-bindings.diff + %description The SWORD Project is the CrossWire Bible Society's free Bible software project. Its purpose is to create cross-platform open-source tools-- @@ -64,20 +67,22 @@ Requires: python3 %description -n python3-sword Python bindings for The SWORD Library. -#%package -n perl-sword -#%{?perl_provide:%perl_provide perl-sword} -#Summary: Perl bindings for Sword -#Requires: %{name}%{?_isa} = %{version}-%{release} -#Requires: perl -#Requires: perl-XML-LibXML -#Requires: perl-HTML-Strip +%package -n perl-sword +%{?perl_provide:%perl_provide perl-sword} +Summary: Perl bindings for Sword +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: perl +Requires: perl-XML-LibXML +Requires: perl-HTML-Strip -#%description -n perl-sword -#Perl bindings for The SWORD Library. +%description -n perl-sword +Perl bindings for The SWORD Library. %prep %setup -q +%patch0 -p1 -b .perl + %build %cmake -DLIBSWORD_LIBRARY_TYPE=Shared \ -DSWORD_PYTHON_3:BOOL=TRUE \ @@ -138,10 +143,9 @@ make tests %{python3_sitearch}/__pycache__/* %{python3_sitearch}/sword-%{pkg_version}-py%{python3_version}.egg-info -#%files -n perl-sword -#%{perl_vendorarch}/* -#%exclude %dir %{perl_vendorarch}/auto/ -#%exclude %{_libdir}/perl5/perllocal.pod +%files -n perl-sword +%{perl_vendorarch}/* +%exclude %dir %{perl_vendorarch}/auto/ %changelog From 2d98604e2abb01e403fd767d781b9b5ad221c11f Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Mon, 14 Dec 2020 14:46:55 -0600 Subject: [PATCH 21/66] Add changelog for previous commit --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 36daaec..15bad1b 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Version: 1.9.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -149,6 +149,9 @@ make tests %changelog +* Mon Dec 14 2020 Greg Hellings - 1.9.0-2 +- Restore Perl bindings + * Tue Dec 1 2020 Greg Hellings - 1.9.0-1 - Upstream 1.9.0 release From 0c3d3e143c2b4564963ca806b6a07ca0b38e2572 Mon Sep 17 00:00:00 2001 From: Miroslav Vadkerti Date: Wed, 16 Dec 2020 12:17:30 +0100 Subject: [PATCH 22/66] Pass `yes` to installmgr --init Othewise tests hang on this ``` [root@ip-172-31-26-137 str]# ./installmgr.sh + OPTS=--allow-internet-access-and-risk-tracing-and-jail-or-martyrdom + installmgr --allow-internet-access-and-risk-tracing-and-jail-or-martyrdom -init While connecting to an encrypted install source, SWORD can allow unverified peers, e.g., self-signed certificates. While this is generally considered safe because SWORD only retrieves Bible content and does not send any data to the server, it could still possibly allow a malicious actor to sit between you and the server, as with unencrypted sources. Type no to turn this off. Would you like to allow unverified peers? [yes] ^C ``` Signed-off-by: Miroslav Vadkerti --- tests/installmgr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/installmgr.sh b/tests/installmgr.sh index 6680d4f..daf9ac4 100755 --- a/tests/installmgr.sh +++ b/tests/installmgr.sh @@ -2,6 +2,6 @@ set -ex OPTS="--allow-internet-access-and-risk-tracing-and-jail-or-martyrdom" -installmgr $OPTS -init +yes | installmgr $OPTS -init installmgr $OPTS -sc installmgr $OPTS -r CrossWire From db795738b5bb1d2e22d81c9869189acfd058e1f2 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 22:08:46 +0000 Subject: [PATCH 23/66] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- sword.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/sword.spec b/sword.spec index 15bad1b..be37178 100644 --- a/sword.spec +++ b/sword.spec @@ -8,6 +8,7 @@ Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ Source0: http://www.crosswire.org/ftpmirror/pub/sword/source/v1.9/sword-%{version}.tar.gz +BuildRequires: make BuildRequires: cmake BuildRequires: cmake-data BuildRequires: openssl-devel From 0f2b46bdaa6ff26139b2e265716b2c761928f708 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 21:26:53 +0000 Subject: [PATCH 24/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index be37178..1ecc15e 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Version: 1.9.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -150,6 +150,9 @@ make tests %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.9.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Dec 14 2020 Greg Hellings - 1.9.0-2 - Restore Perl bindings From f800d0b21183b5bda7aaa60c6eb61231fbcd0789 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Wed, 19 May 2021 16:50:16 +0100 Subject: [PATCH 25/66] Rebuild for ICU 69 --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 1ecc15e..b7370df 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Version: 1.9.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -150,6 +150,9 @@ make tests %changelog +* Wed May 19 2021 Pete Walter - 1.9.0-4 +- Rebuild for ICU 69 + * Wed Jan 27 2021 Fedora Release Engineering - 1.9.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From af12ea8ed1e7200baebc7114b3732612c1808633 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 21 May 2021 12:26:49 +0200 Subject: [PATCH 26/66] Perl 5.34 rebuild --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index b7370df..1392bba 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Version: 1.9.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -150,6 +150,9 @@ make tests %changelog +* Fri May 21 2021 Jitka Plesnikova - 1.9.0-5 +- Perl 5.34 rebuild + * Wed May 19 2021 Pete Walter - 1.9.0-4 - Rebuild for ICU 69 From e58637efaca97963d1882f957c42887a79f0291f Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Mon, 24 May 2021 12:49:46 -0500 Subject: [PATCH 27/66] Add epoch tag to hopefully fix sorting --- sword.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sword.spec b/sword.spec index 1392bba..f50a879 100644 --- a/sword.spec +++ b/sword.spec @@ -2,6 +2,7 @@ %define pkg_version 1.9.0 Name: sword +Epoch: 1 Version: 1.9.0 Release: 5%{?dist} Summary: Free Bible Software Project @@ -150,6 +151,9 @@ make tests %changelog +* Mon May 24 2021 Greg Hellings - 1:1.9.0-5 +- Add Epoch tag + * Fri May 21 2021 Jitka Plesnikova - 1.9.0-5 - Perl 5.34 rebuild From 6684563c07c484bfc70dbc3e82fc92213d7894d4 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 21:16:05 +0200 Subject: [PATCH 28/66] Rebuilt for Python 3.10 --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index f50a879..e7a55ba 100644 --- a/sword.spec +++ b/sword.spec @@ -4,7 +4,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -151,6 +151,9 @@ make tests %changelog +* Fri Jun 04 2021 Python Maint - 1:1.9.0-6 +- Rebuilt for Python 3.10 + * Mon May 24 2021 Greg Hellings - 1:1.9.0-5 - Add Epoch tag From fee6086aa984ecd2f00c3b1aa38abfd61c612434 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Wed, 9 Jun 2021 11:04:03 -0500 Subject: [PATCH 29/66] Correct subpackage deps --- sword.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sword.spec b/sword.spec index e7a55ba..faed433 100644 --- a/sword.spec +++ b/sword.spec @@ -4,7 +4,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -39,7 +39,7 @@ texts in over 50 languages. %package devel Summary: Development files for the sword project -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: pkgconfig Requires: curl-devel clucene-core-devel libicu-devel @@ -50,7 +50,7 @@ that uses the sword API, such as Gnomesword or Bibletime. %package utils Summary: Utilities for the sword project -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %description utils This package contains the pre-built utilities for use with the SWORD @@ -63,7 +63,7 @@ latest at the time of the current library release. %package -n python3-sword %{?python_provide:%python_provide python3-sword} Summary: Python bindings for Sword -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: python3 %description -n python3-sword @@ -72,7 +72,7 @@ Python bindings for The SWORD Library. %package -n perl-sword %{?perl_provide:%perl_provide perl-sword} Summary: Perl bindings for Sword -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: perl Requires: perl-XML-LibXML Requires: perl-HTML-Strip @@ -151,6 +151,9 @@ make tests %changelog +* Wed Jun 09 2021 Greg Hellings - 1:1.9.0-7 +- Correct dependencies for subpackages + * Fri Jun 04 2021 Python Maint - 1:1.9.0-6 - Rebuilt for Python 3.10 From 305cf0bc622a54f3bfe787ad1c00b98546ed3461 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Mon, 14 Jun 2021 12:09:43 -0500 Subject: [PATCH 30/66] Update to follow latest Python guidelines --- sword.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sword.spec b/sword.spec index faed433..ff3d6ca 100644 --- a/sword.spec +++ b/sword.spec @@ -9,7 +9,7 @@ Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ Source0: http://www.crosswire.org/ftpmirror/pub/sword/source/v1.9/sword-%{version}.tar.gz -BuildRequires: make +BuildRequires: make BuildRequires: cmake BuildRequires: cmake-data BuildRequires: openssl-devel @@ -65,6 +65,7 @@ latest at the time of the current library release. Summary: Python bindings for Sword Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: python3 +%py_provides python3-Sword %description -n python3-sword Python bindings for The SWORD Library. @@ -140,9 +141,8 @@ make tests %{_bindir}/emptyvss %files -n python3-sword -%{python3_sitearch}/Sword.py +%pycached %{python3_sitearch}/Sword.py %{python3_sitearch}/_Sword%{python3_ext_suffix} -%{python3_sitearch}/__pycache__/* %{python3_sitearch}/sword-%{pkg_version}-py%{python3_version}.egg-info %files -n perl-sword From 9aab7600b647332e2893f527079f81d8d36dafbd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 18:42:33 +0000 Subject: [PATCH 31/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index ff3d6ca..5cc19d1 100644 --- a/sword.spec +++ b/sword.spec @@ -4,7 +4,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -151,6 +151,9 @@ make tests %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1:1.9.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jun 09 2021 Greg Hellings - 1:1.9.0-7 - Correct dependencies for subpackages From a63565abdc74fd7f477578152e05e89171559c8b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 02:06:39 +0000 Subject: [PATCH 32/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 5cc19d1..75300aa 100644 --- a/sword.spec +++ b/sword.spec @@ -4,7 +4,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -151,6 +151,9 @@ make tests %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1:1.9.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1:1.9.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 945d67d6ba3b3f3d9b8e1fb0573b3d9214779f3e Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 30 May 2022 19:43:46 +0200 Subject: [PATCH 33/66] Perl 5.36 rebuild --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 75300aa..d548e07 100644 --- a/sword.spec +++ b/sword.spec @@ -4,7 +4,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -151,6 +151,9 @@ make tests %changelog +* Mon May 30 2022 Jitka Plesnikova - 1:1.9.0-10 +- Perl 5.36 rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 1:1.9.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From d0c48bd7cfef5cdafc066de64994966aa98847ff Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 15:27:58 +0200 Subject: [PATCH 34/66] Rebuilt for Python 3.11 --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index d548e07..9de5d86 100644 --- a/sword.spec +++ b/sword.spec @@ -4,7 +4,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -151,6 +151,9 @@ make tests %changelog +* Mon Jun 13 2022 Python Maint - 1:1.9.0-11 +- Rebuilt for Python 3.11 + * Mon May 30 2022 Jitka Plesnikova - 1:1.9.0-10 - Perl 5.36 rebuild From 602758a0b0a2c9f2f7f929766901b914c2306580 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 09:53:33 +0000 Subject: [PATCH 35/66] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 9de5d86..6f6ea01 100644 --- a/sword.spec +++ b/sword.spec @@ -4,7 +4,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -151,6 +151,9 @@ make tests %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1:1.9.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Python Maint - 1:1.9.0-11 - Rebuilt for Python 3.11 From ad3870200551105ee85dbf68d55cd56fcb5610a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Mon, 1 Aug 2022 15:11:07 +0200 Subject: [PATCH 36/66] Rebuilt for ICU 71.1 --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 6f6ea01..b64bf25 100644 --- a/sword.spec +++ b/sword.spec @@ -4,7 +4,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -151,6 +151,9 @@ make tests %changelog +* Mon Aug 01 2022 Frantisek Zatloukal - 1:1.9.0-13 +- Rebuilt for ICU 71.1 + * Sat Jul 23 2022 Fedora Release Engineering - 1:1.9.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From c122a88faa7e7043bc4d0f3547f32c5a4254e2d6 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 12 Dec 2022 14:36:02 +0100 Subject: [PATCH 37/66] Add BR perl-generators to automatically generates run-time dependencies --- sword.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sword.spec b/sword.spec index b64bf25..ffbf872 100644 --- a/sword.spec +++ b/sword.spec @@ -4,7 +4,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -22,7 +22,7 @@ BuildRequires: cppunit-devel BuildRequires: swig BuildRequires: python3-devel BuildRequires: perl-devel -BuildRequires: perl-macros +BuildRequires: perl-generators BuildRequires: gcc BuildRequires: gcc-c++ @@ -151,6 +151,10 @@ make tests %changelog +* Mon Dec 12 2022 Jitka Plesnikova - 1:1.9.0-14 +- Add BR perl-generators to automatically generates run-time dependencies + for installed Perl files + * Mon Aug 01 2022 Frantisek Zatloukal - 1:1.9.0-13 - Rebuilt for ICU 71.1 From 678d8d45ec401ee01932af227c454c5523861800 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Sat, 31 Dec 2022 03:22:39 +0000 Subject: [PATCH 38/66] Rebuild for ICU 72 --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index ffbf872..a735fb4 100644 --- a/sword.spec +++ b/sword.spec @@ -4,7 +4,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -151,6 +151,9 @@ make tests %changelog +* Sat Dec 31 2022 Pete Walter - 1:1.9.0-15 +- Rebuild for ICU 72 + * Mon Dec 12 2022 Jitka Plesnikova - 1:1.9.0-14 - Add BR perl-generators to automatically generates run-time dependencies for installed Perl files From 34d01c04f1327fcc7cbdc5e82270161f585378f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 04:27:05 +0000 Subject: [PATCH 39/66] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index a735fb4..97b2c8d 100644 --- a/sword.spec +++ b/sword.spec @@ -4,7 +4,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -151,6 +151,9 @@ make tests %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1:1.9.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Dec 31 2022 Pete Walter - 1:1.9.0-15 - Rebuild for ICU 72 From ec2d653471c1a347d5956bb1e5259529bd1b1f3b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 20:54:52 +0200 Subject: [PATCH 40/66] Rebuilt for Python 3.12 --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 97b2c8d..a74bb59 100644 --- a/sword.spec +++ b/sword.spec @@ -4,7 +4,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -151,6 +151,9 @@ make tests %changelog +* Tue Jun 13 2023 Python Maint - 1:1.9.0-17 +- Rebuilt for Python 3.12 + * Sat Jan 21 2023 Fedora Release Engineering - 1:1.9.0-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 65f444fb04f15e025cc4e1f0cb75ed9f1e3f294c Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 30 Jun 2023 12:04:16 +0200 Subject: [PATCH 41/66] Replace requirement of meta-package perl by perl-interpreter --- sword.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sword.spec b/sword.spec index a74bb59..435b548 100644 --- a/sword.spec +++ b/sword.spec @@ -4,7 +4,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -74,7 +74,7 @@ Python bindings for The SWORD Library. %{?perl_provide:%perl_provide perl-sword} Summary: Perl bindings for Sword Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} -Requires: perl +Requires: perl-interpreter Requires: perl-XML-LibXML Requires: perl-HTML-Strip @@ -84,7 +84,7 @@ Perl bindings for The SWORD Library. %prep %setup -q -%patch0 -p1 -b .perl +%patch -P0 -p1 -b .perl %build %cmake -DLIBSWORD_LIBRARY_TYPE=Shared \ @@ -151,6 +151,9 @@ make tests %changelog +* Fri Jun 30 2023 Jitka Plesnikova - 1:1.9.0-18 +- Replace requirement of meta-package perl by perl-interpreter + * Tue Jun 13 2023 Python Maint - 1:1.9.0-17 - Rebuilt for Python 3.12 From 202d0fd0e1bc677803e8eb8c8da7faa94b912ad9 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 11 Jul 2023 15:29:44 +0200 Subject: [PATCH 42/66] Perl 5.38 rebuild --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 435b548..8733e4d 100644 --- a/sword.spec +++ b/sword.spec @@ -4,7 +4,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -151,6 +151,9 @@ make tests %changelog +* Tue Jul 11 2023 Jitka Plesnikova - 1:1.9.0-19 +- Perl 5.38 rebuild + * Fri Jun 30 2023 Jitka Plesnikova - 1:1.9.0-18 - Replace requirement of meta-package perl by perl-interpreter From 2d7873622a01c8f8271221820e1004909f792fcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Tue, 11 Jul 2023 22:22:19 +0200 Subject: [PATCH 43/66] Rebuilt for ICU 73.2 --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 8733e4d..aafeca0 100644 --- a/sword.spec +++ b/sword.spec @@ -4,7 +4,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -151,6 +151,9 @@ make tests %changelog +* Tue Jul 11 2023 František Zatloukal - 1:1.9.0-20 +- Rebuilt for ICU 73.2 + * Tue Jul 11 2023 Jitka Plesnikova - 1:1.9.0-19 - Perl 5.38 rebuild From ec35210df3712b4e9d0dcbd6932fadb9b2da99ed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 02:58:09 +0000 Subject: [PATCH 44/66] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index aafeca0..4d8a0cb 100644 --- a/sword.spec +++ b/sword.spec @@ -4,7 +4,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -151,6 +151,9 @@ make tests %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1:1.9.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jul 11 2023 František Zatloukal - 1:1.9.0-20 - Rebuilt for ICU 73.2 From 196b7b658cf800892419a0dc82022ef82c586984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 Sep 2023 12:05:27 +0200 Subject: [PATCH 45/66] Retired: Fails to install See https://pagure.io/releng/issue/11685 --- .gitignore | 13 - cmake-perl-bindings.diff | 105 -------- dead.package | 3 + sources | 1 - sword.spec | 520 --------------------------------------- tests/installmgr.sh | 7 - tests/tests.yml | 10 - 7 files changed, 3 insertions(+), 656 deletions(-) delete mode 100644 .gitignore delete mode 100644 cmake-perl-bindings.diff create mode 100644 dead.package delete mode 100644 sources delete mode 100644 sword.spec delete mode 100755 tests/installmgr.sh delete mode 100644 tests/tests.yml diff --git a/.gitignore b/.gitignore deleted file mode 100644 index eb752e7..0000000 --- a/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -*.swp -*.rpm -results_sword -sword-1.6.1.tar.gz -/sword-1.6.2.tar.gz -/sword-1.7.2.tar.gz -/sword-1.7.3.tar.gz -/sword-1.7.3.900.tar.gz -/sword-1.7.4.tar.gz -/sword-1.8.1.tar.gz -/sword-1.9.0RC1.tar.gz -/sword-1.9.0RC3.tar.gz -/sword-1.9.0.tar.gz diff --git a/cmake-perl-bindings.diff b/cmake-perl-bindings.diff deleted file mode 100644 index ea6710a..0000000 --- a/cmake-perl-bindings.diff +++ /dev/null @@ -1,105 +0,0 @@ -diff -bru a/bindings/swig/perl/CMakeLists.txt b/bindings/swig/perl/CMakeLists.txt ---- a/bindings/swig/perl/CMakeLists.txt 2020-07-29 18:59:48.000000000 +0200 -+++ b/bindings/swig/perl/CMakeLists.txt 2020-11-01 19:56:20.825016280 +0100 -@@ -1,68 +1,35 @@ --# This method works but there is no good way to install the results of it --#FIND_PACKAGE(PerlLibs REQUIRED) --#INCLUDE_DIRECTORIES(${PERL_INCLUDE_PATH}) --# --#SET_SOURCE_FILES_PROPERTIES(../sword.i PROPERTIES CPLUSPLUS ON) --#SET_SOURCE_FILES_PROPERTIES(../sword.i PROPERTIES SWIG_FLAGS "") --# --#SWIG_ADD_MODULE(Sword perl --# "../sword.i" --#) --# --#SWIG_LINK_LIBRARIES(Sword ${PERL_LIBRARY} ${SWORD_LINK_NAME}) -- --FIND_PACKAGE(Perl REQUIRED) -- --SET(PERL_MAKEFILE "#!${PERL_EXECUTABLE} -- --use ExtUtils::MakeMaker; -- --# See lib/ExtUtils/MakeMaker.pm for details of how to influence --# the contents of the Makefile that is written --WriteMakefile( -- 'NAME' => 'Sword', -- 'VERSION' => '${SWORD_VERSION}', -- 'INC' => '-I\"${CMAKE_SOURCE_DIR}/include\" -I\"${CMAKE_CURRENT_SOURCE_DIR}/..\"', -- 'DEFINE' => '-DSWIG', -- 'LIBS' => '-L\"${CMAKE_BINARY_DIR}\" -lsword -lz', -- 'FIRST_MAKEFILE' => 'Makefile.perlswig', -- 'PREREQ_PM' => {}, -- ($] >= 5.005 ? ## Add these new keywords supported since 5.005 -- (ABSTRACT => 'Sword Project perl bindings', # retrieve abstract from module -- AUTHOR => 'Sword Project ') : ()), --); -- --rename 'Makefile.perlswig', 'Makefile.perlswig.old' or die \"Can't rename Makefile\"; --open(INPUT, 'Makefile.perlswig') or die \"Can't open output Makefile\"; --while () { -- s/\\-lsword/\\-lsword \\-lstdc\\+\\+/; -- print OUTPUT \"$_\"; --} -- --close INPUT; --close OUTPUT;") --FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/Makefile.PL "${PERL_MAKEFILE}") -- --SET(SKIP_MAKEFILE "\\.old --~$ --\\.bak --^CVS --Makefile$") --FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/Makefile.SKIP "${SKIP_MAKEFILE}") -- --SWORD_SWIG_GENERATE(perl) -- --ADD_CUSTOM_COMMAND(OUTPUT MANIFEST Makefile.perlswig -- COMMAND ${PERL_EXECUTABLE} Makefile.PL && make -f Makefile.perlswig clean -- COMMAND ${PERL_EXECUTABLE} Makefile.PL && make -f Makefile.perlswig manifest -- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) -- --ADD_CUSTOM_TARGET(perlswig ALL -- COMMAND make -f Makefile.perlswig -- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Sword.cxx ${CMAKE_CURRENT_BINARY_DIR}/Makefile.perlswig ${SWORD_LINK_NAME} -- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) -+# Perl Swig bindings - --INSTALL(SCRIPT install.cmake) -+cmake_minimum_required(VERSION 3.14.7) -+cmake_policy(SET CMP0078 NEW) -+cmake_policy(SET CMP0086 NEW) -+set(UseSWIG_MODULE_VERSION 2) - --MESSAGE(STATUS "Perl: yes") -+find_package(SWIG REQUIRED) -+include(${SWIG_USE_FILE}) -+ -+find_package(PerlLibs REQUIRED) -+include_directories(${PERL_INCLUDE_PATH}) -+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) -+ -+ -+set_source_files_properties(../sword.i PROPERTIES CPLUSPLUS ON) -+ -+SWIG_ADD_LIBRARY(Sword -+ TYPE SHARED -+ LANGUAGE perl SOURCES ../sword.i -+ ) -+TARGET_LINK_LIBRARIES(Sword ${PERL_LIBRARIES} ${SWORD_LINK_NAME}) -+ -+ -+install( -+ TARGETS Sword -+ LIBRARY DESTINATION "${LIB_INSTALL_DIR}/perl5/vendor_perl/auto/Sword" -+) -+get_target_property(SWIG_BUILDIR Sword SWIG_SUPPORT_FILES_DIRECTORY) -+ -+message(STATUS "SWIG_BUILDIR=${SWIG_BUILDIR}") -+install( -+ FILES ${SWIG_BUILDIR}/Sword.pm -+ DESTINATION "${LIB_INSTALL_DIR}/perl5/vendor_perl" -+) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..d409129 --- /dev/null +++ b/dead.package @@ -0,0 +1,3 @@ +Retired: Fails to install + +See https://pagure.io/releng/issue/11685 diff --git a/sources b/sources deleted file mode 100644 index 8c3a0a0..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (sword-1.9.0.tar.gz) = 9ed3fbb5024af1f93b1473bae0d95534d02a5b00b3c9d41a0f855cee8106dc4e330844080adbee7c3f74c0e5ce1480bf16c87c842421337a341f641bae11137f diff --git a/sword.spec b/sword.spec deleted file mode 100644 index 4d8a0cb..0000000 --- a/sword.spec +++ /dev/null @@ -1,520 +0,0 @@ -%define soversion 1.9 -%define pkg_version 1.9.0 - -Name: sword -Epoch: 1 -Version: 1.9.0 -Release: 21%{?dist} -Summary: Free Bible Software Project -License: GPLv2 -URL: http://www.crosswire.org/sword/ -Source0: http://www.crosswire.org/ftpmirror/pub/sword/source/v1.9/sword-%{version}.tar.gz -BuildRequires: make -BuildRequires: cmake -BuildRequires: cmake-data -BuildRequires: openssl-devel -BuildRequires: curl-devel -BuildRequires: zlib-devel -BuildRequires: libidn-devel -BuildRequires: libicu-devel icu -BuildRequires: clucene-core-devel -BuildRequires: cppunit-devel -BuildRequires: swig -BuildRequires: python3-devel -BuildRequires: perl-devel -BuildRequires: perl-generators -BuildRequires: gcc -BuildRequires: gcc-c++ - -Patch0: cmake-perl-bindings.diff - -%description -The SWORD Project is the CrossWire Bible Society's free Bible software -project. Its purpose is to create cross-platform open-source tools-- -covered by the GNU General Public License-- that allow programmers and -Bible societies to write new Bible software more quickly and easily. We -also create Bible study software for all readers, students, scholars, -and translators of the Bible, and have a growing collection of over 200 -texts in over 50 languages. - -%package devel -Summary: Development files for the sword project -Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} -Requires: pkgconfig -Requires: curl-devel clucene-core-devel libicu-devel - -%description devel -This package contains the development headers and libraries for the -sword API. You need this package if you plan on compiling software -that uses the sword API, such as Gnomesword or Bibletime. - -%package utils -Summary: Utilities for the sword project -Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} - -%description utils -This package contains the pre-built utilities for use with the SWORD -Project. The SWORD Project developers encourage you to use the latest -development version of the utilities rather than those released with -a packaged release as updates to the utilities do not affect the -release schedule of the library. However, these utilities were the -latest at the time of the current library release. - -%package -n python3-sword -%{?python_provide:%python_provide python3-sword} -Summary: Python bindings for Sword -Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} -Requires: python3 -%py_provides python3-Sword - -%description -n python3-sword -Python bindings for The SWORD Library. - -%package -n perl-sword -%{?perl_provide:%perl_provide perl-sword} -Summary: Perl bindings for Sword -Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} -Requires: perl-interpreter -Requires: perl-XML-LibXML -Requires: perl-HTML-Strip - -%description -n perl-sword -Perl bindings for The SWORD Library. - -%prep -%setup -q - -%patch -P0 -p1 -b .perl - -%build -%cmake -DLIBSWORD_LIBRARY_TYPE=Shared \ - -DSWORD_PYTHON_3:BOOL=TRUE \ - -DSWORD_PERL:BOOL=TRUE \ - -DSWORD_BUILD_UTILS="Yes" \ - -DLIBSWORD_SOVERSION=%{soversion} \ - -DLIBDIR=%{_libdir} \ - -DSWORD_BUILD_TESTS=Yes \ - -DSWORD_PYTHON_INSTALL_DIR="%{buildroot}%{_prefix}" -%cmake_build - -%install -%cmake_install -mkdir -p %{buildroot}%{_datadir}/sword/modules - -find %{buildroot} -type f -name "*.la" -delete -print - -%check -make tests - -%files -%doc AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README -%doc samples doc -# Re-enable after upstream includes it with CMake builds -%config(noreplace) %{_sysconfdir}/sword.conf -%{_libdir}/libsword.so.%{soversion} -%{_datadir}/sword - -%files devel -%doc CODINGSTYLE -%{_includedir}/sword/ -%{_libdir}/libsword.so -%{_libdir}/pkgconfig/sword.pc - -%files utils -%{_bindir}/vs2osisref -%{_bindir}/vs2osisreftxt -%{_bindir}/mod2vpl -%{_bindir}/imp2ld -%{_bindir}/diatheke -%{_bindir}/mkfastmod -%{_bindir}/mod2zmod -%{_bindir}/xml2gbs -%{_bindir}/imp2vs -%{_bindir}/installmgr -%{_bindir}/osis2mod -%{_bindir}/tei2mod -%{_bindir}/vpl2mod -%{_bindir}/mod2imp -%{_bindir}/addld -%{_bindir}/imp2gbs -%{_bindir}/mod2osis -%{_bindir}/emptyvss - -%files -n python3-sword -%pycached %{python3_sitearch}/Sword.py -%{python3_sitearch}/_Sword%{python3_ext_suffix} -%{python3_sitearch}/sword-%{pkg_version}-py%{python3_version}.egg-info - -%files -n perl-sword -%{perl_vendorarch}/* -%exclude %dir %{perl_vendorarch}/auto/ - - -%changelog -* Sat Jul 22 2023 Fedora Release Engineering - 1:1.9.0-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jul 11 2023 František Zatloukal - 1:1.9.0-20 -- Rebuilt for ICU 73.2 - -* Tue Jul 11 2023 Jitka Plesnikova - 1:1.9.0-19 -- Perl 5.38 rebuild - -* Fri Jun 30 2023 Jitka Plesnikova - 1:1.9.0-18 -- Replace requirement of meta-package perl by perl-interpreter - -* Tue Jun 13 2023 Python Maint - 1:1.9.0-17 -- Rebuilt for Python 3.12 - -* Sat Jan 21 2023 Fedora Release Engineering - 1:1.9.0-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Dec 31 2022 Pete Walter - 1:1.9.0-15 -- Rebuild for ICU 72 - -* Mon Dec 12 2022 Jitka Plesnikova - 1:1.9.0-14 -- Add BR perl-generators to automatically generates run-time dependencies - for installed Perl files - -* Mon Aug 01 2022 Frantisek Zatloukal - 1:1.9.0-13 -- Rebuilt for ICU 71.1 - -* Sat Jul 23 2022 Fedora Release Engineering - 1:1.9.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 13 2022 Python Maint - 1:1.9.0-11 -- Rebuilt for Python 3.11 - -* Mon May 30 2022 Jitka Plesnikova - 1:1.9.0-10 -- Perl 5.36 rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 1:1.9.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1:1.9.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jun 09 2021 Greg Hellings - 1:1.9.0-7 -- Correct dependencies for subpackages - -* Fri Jun 04 2021 Python Maint - 1:1.9.0-6 -- Rebuilt for Python 3.10 - -* Mon May 24 2021 Greg Hellings - 1:1.9.0-5 -- Add Epoch tag - -* Fri May 21 2021 Jitka Plesnikova - 1.9.0-5 -- Perl 5.34 rebuild - -* Wed May 19 2021 Pete Walter - 1.9.0-4 -- Rebuild for ICU 69 - -* Wed Jan 27 2021 Fedora Release Engineering - 1.9.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Dec 14 2020 Greg Hellings - 1.9.0-2 -- Restore Perl bindings - -* Tue Dec 1 2020 Greg Hellings - 1.9.0-1 -- Upstream 1.9.0 release - -* Fri Oct 2 2020 Greg Hellings - 1.8.903-1 -- Upstream 1.9.0RC3 release - -* Fri Sep 11 2020 Greg Hellings - 1.8.901-1 -- Upstream 1.9.0RC1 release - -* Sat Aug 01 2020 Fedora Release Engineering - 1.8.1-24 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.8.1-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jun 22 2020 Jitka Plesnikova - 1.8.1-22 -- Perl 5.32 rebuild - -* Tue May 26 2020 Miro Hrončok - 1.8.1-21 -- Rebuilt for Python 3.9 - -* Fri May 15 2020 Pete Walter - 1.8.1-20 -- Rebuild for ICU 67 - -* Sun Apr 26 2020 Greg Hellings - 1.8.1-19 -- Added patch to fix upstream markup bug - -* Fri Jan 31 2020 Fedora Release Engineering - 1.8.1-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Nov 01 2019 Pete Walter - 1.8.1-17 -- Rebuild for ICU 65 - -* Thu Oct 03 2019 Miro Hrončok - 1.8.1-16 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Mon Aug 19 2019 Jaak Ristioja - 1.8.1-15 -- Fixed conflicting integer types being defined - -* Mon Aug 19 2019 Miro Hrončok - 1.8.1-14 -- Rebuilt for Python 3.8 - -* Sun Aug 04 2019 Dominique Corbex - 1.8.1-13 -- Added Perl bindings - -* Sat Jul 27 2019 Fedora Release Engineering - 1.8.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.8.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Jan 23 2019 Pete Walter - 1.8.1-10 -- Rebuild for ICU 63 - -* Mon Sep 24 2018 Greg Hellings - 1.8.1-9 -- Remove Python 2 binding build: BZ1627373 - -* Sat Jul 14 2018 Fedora Release Engineering - 1.8.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Jul 11 2018 Greg Hellings - 1.8.1-7 -- Add flags for building ICU 61+ -- Patch Python building for Python 2/3 combined - -* Tue Jul 10 2018 Pete Walter - 1.8.1-6 -- Rebuild for ICU 62 - -* Mon Apr 30 2018 Pete Walter - 1.8.1-5 -- Rebuild for ICU 61.1 - -* Wed Feb 21 2018 Iryna Shcherbina - 1.8.1-4 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Sun Feb 18 2018 Gregory Hellings - 1.8.1-3 -- Remove post/postun for F28+ -- Rename python-sword to python2-sword -- Add BR for gcc/g++ per F28+ changes - -* Fri Feb 09 2018 Fedora Release Engineering -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Jan 08 2018 Greg Hellings - 1.8.1-1 -- Upstream release 1.8.1 -- Add check section - -* Sat Dec 23 2017 Greg Hellings - 1.8.0-1 -- Upstream release 1.8.0 - -* Tue Dec 5 2017 Greg Hellings - 1.7.906-1 -- Testing 1.8.0RC6 - -* Thu Nov 30 2017 Pete Walter - 1.7.4-15 -- Rebuild for ICU 60.1 - -* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 1.7.4-14 -- Add Provides for the old name without %%_isa - -* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 1.7.4-13 -- Python 2 binary package renamed to python2-sword - See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 - -* Thu Aug 03 2017 Fedora Release Engineering - 1.7.4-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.7.4-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon May 15 2017 Fedora Release Engineering - 1.7.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.7.4-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jul 19 2016 Fedora Release Engineering - 1.7.4-8 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Fri Apr 15 2016 David Tardon - 1.7.4-7 -- rebuild for ICU 57.1 - -* Fri Feb 05 2016 Fedora Release Engineering - 1.7.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Oct 28 2015 David Tardon - 1.7.4-5 -- rebuild for ICU 56.1 - -* Fri Jun 19 2015 Fedora Release Engineering - 1.7.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 1.7.4-3 -- Rebuilt for GCC 5 C++11 ABI change - -* Mon Jan 26 2015 David Tardon - 1.7.4-2 -- rebuild for ICU 54.1 - -* Wed Dec 24 2014 Greg Hellings - 1.7.4-1 -- New upstream release -- Removed upstreamed patches - -* Tue Dec 09 2014 Greg Hellings - 1.7.3.900-3 -- Fixed invalid pkg-config - -* Mon Dec 08 2014 Greg Hellings - 1.7.3.900-2 -- Changed to CMake -- Added Python bindings - -* Wed Dec 03 2014 Greg Hellings - 1.7.3.900-1 -- Upstream pre-release version bump - -* Mon Oct 27 2014 Greg Hellings - 1.7.3-9 -- Release bump - -* Tue Aug 26 2014 David Tardon - 1.7.3-7 -- rebuild for ICU 53.1 - -* Mon Aug 18 2014 Fedora Release Engineering - 1.7.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Wed Aug 13 2014 Rex Dieter - 1.7.3-5 -- revert some incompatible "cleanup" (%%make_build undefined on < f21) -- -devel: drop extraneous lib deps (let pkgconfig autoreq handle it as needed) - -* Mon Aug 11 2014 Greg Hellings - 1.7.3-4 -- Change curl-devel for libcurl-devel - -* Sat Aug 02 2014 Christopher Meng - 1.7.3-3 -- devel subpkg cleanup - -* Sun Jun 08 2014 Fedora Release Engineering - 1.7.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue May 06 2014 Greg Hellings - 1.7.3-1 -- New upstream version - -* Thu Feb 13 2014 Greg Hellings - 1.7.2-2 -- Rebuilt for ICU 52 - -* Wed Jan 29 2014 Deji Akingunola - 1.7.2-1 -- Update to sword-1.7.2 - -* Sun Aug 04 2013 Fedora Release Engineering - 1.6.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 01 2013 Parag Nemade - 1.6.2-10 -- Rebuild for icu 50 - -* Sat Jul 21 2012 Fedora Release Engineering - 1.6.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sun May 20 2012 Deji Akingunola - 1.6.2-8 -- Rebuild for icu soname change - -* Wed Feb 22 2012 Deji Akingunola - 1.6.2-7 -- Fix compile error with gcc-4.7 - -* Sat Jan 14 2012 Fedora Release Engineering - 1.6.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Sun Oct 2 2011 Tom Callaway - 1.6.2-5 -- fix compile against clucene2 - -* Fri Sep 09 2011 Caolán McNamara - 1.6.2-4 -- rebuild for icu 4.8.1 - -* Mon Mar 07 2011 Caolán McNamara - 1.6.2-3 -- rebuild for icu 4.6 - -* Wed Feb 09 2011 Fedora Release Engineering - 1.6.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Oct 22 2010 Deji Akingunola - 1.6.2-1 -- Update to version 1.6.2 - -* Fri Apr 02 2010 Caolán McNamara - 1.6.1-3 -- rebuild for icu 4.4 - -* Sat Mar 20 2010 Deji Akingunola - 1.6.1-2 -- Work around regression in curl-7.20.0 (Patch by Karl Kleinpaste), fix #569685 - -* Wed Jan 13 2010 Deji Akingunola - 1.6.1-1 -- Update to version 1.6.1 - -* Sun Jul 26 2009 Fedora Release Engineering - 1.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu May 14 2009 Deji Akingunola - 1.6.0-1 -- Update to version 1.6.0 - -* Wed Feb 25 2009 Fedora Release Engineering - 1.5.11-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Feb 04 2009 Deji Akingunola - 1.5.11-3 -- Add patch to build with gcc-4.4 - -* Tue Jun 03 2008 Caolán McNamara - 1.5.11-2 -- rebuild for new icu - -* Mon May 26 2008 Deji Akingunola - 1.5.11-1 -- Update to version 1.5.11 - -* Thu Feb 21 2008 Deji Akingunola - 1.5.10-3 -- Fix command injection bug (Bug #433723) - -* Thu Jan 10 2008 Deji Akingunola - 1.5.10-2 -- Fix build issue with gcc43 - -* Mon Nov 05 2007 Deji Akingunola - 1.5.10-1 -- Update to version 1.5.10 - -* Tue Sep 25 2007 Deji Akingunola - 1.5.9-7 -- Fix the build failure due to glibc open() check - -* Sat Aug 25 2007 Deji Akingunola - 1.5.9-6 -- Rebuild - -* Fri Aug 03 2007 Deji Akingunola - 1.5.9-5 -- License tag update -- Rebuild for new icu - -* Sat Jan 20 2007 Deji Akingunola - 1.5.9-4 -- Fix an error (libicu-devel not icu-devel) - -* Sat Jan 20 2007 Deji Akingunola - 1.5.9-3 -- Add Requires for the -devel subpackage - -* Sun Jan 14 2007 Deji Akingunola - 1.5.9-2 -- Rebuild with lucene support - -* Wed Nov 08 2006 Deji Akingunola - 1.5.9-1 -- New release -- Build with icu support - -* Wed Sep 20 2006 Deji Akingunola - 1.5.8-9 -- Take over from Michael A. Peters -- Rebuild for FC6 - -* Sat Jun 03 2006 Michael A. Peters - 1.5.8-8 -- Added pkgconfig to devel package Requires - -* Fri Feb 17 2006 Michael A. Peters - 1.5.8-7 -- Rebuild in devel branch - -* Wed Dec 14 2005 Michael A. Peters - 1.5.8-6 -- rebuild in devel branch with new compiler suite -- remove specific release from devel requires of main package -- do not build with %%{_smp_mflags} - -* Mon Nov 21 2005 Michael A. Peters - 1.5.8-5 -- disable static library - -* Sun Nov 13 2005 Michael A. Peters - 1.5.8-4.1 -- Rebuild against new openssl - -* Sat Oct 29 2005 Michael A. Peters - 1.5.8-4 -- Added Arabic support files from Developer mailing list (they have -- been added to the upstream SVN version) - -* Thu Jun 09 2005 Michael A. Peters - 1.5.8-3 -- fix line breaks - -* Mon Jun 06 2005 Michael A. Peters - 1.5.8-1 -- initial CVS checkin for Fedora Extras diff --git a/tests/installmgr.sh b/tests/installmgr.sh deleted file mode 100755 index daf9ac4..0000000 --- a/tests/installmgr.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -ex - -OPTS="--allow-internet-access-and-risk-tracing-and-jail-or-martyrdom" -yes | installmgr $OPTS -init -installmgr $OPTS -sc -installmgr $OPTS -r CrossWire diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index d8f9dc2..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,10 +0,0 @@ -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - - container - tests: - - installmgr: - dir: . - run: installmgr.sh From 4dc4afda3cc9816584fa3c1b073e65f7909e2496 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Thu, 5 Oct 2023 10:29:23 +0200 Subject: [PATCH 46/66] Unretirement request: https://pagure.io/releng/issue/11700 --- .gitignore | 13 + cmake-perl-bindings.diff | 105 ++++++++ dead.package | 3 - sources | 1 + sword.spec | 520 +++++++++++++++++++++++++++++++++++++++ tests/installmgr.sh | 7 + tests/tests.yml | 10 + 7 files changed, 656 insertions(+), 3 deletions(-) create mode 100644 .gitignore create mode 100644 cmake-perl-bindings.diff delete mode 100644 dead.package create mode 100644 sources create mode 100644 sword.spec create mode 100755 tests/installmgr.sh create mode 100644 tests/tests.yml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..eb752e7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ +*.swp +*.rpm +results_sword +sword-1.6.1.tar.gz +/sword-1.6.2.tar.gz +/sword-1.7.2.tar.gz +/sword-1.7.3.tar.gz +/sword-1.7.3.900.tar.gz +/sword-1.7.4.tar.gz +/sword-1.8.1.tar.gz +/sword-1.9.0RC1.tar.gz +/sword-1.9.0RC3.tar.gz +/sword-1.9.0.tar.gz diff --git a/cmake-perl-bindings.diff b/cmake-perl-bindings.diff new file mode 100644 index 0000000..ea6710a --- /dev/null +++ b/cmake-perl-bindings.diff @@ -0,0 +1,105 @@ +diff -bru a/bindings/swig/perl/CMakeLists.txt b/bindings/swig/perl/CMakeLists.txt +--- a/bindings/swig/perl/CMakeLists.txt 2020-07-29 18:59:48.000000000 +0200 ++++ b/bindings/swig/perl/CMakeLists.txt 2020-11-01 19:56:20.825016280 +0100 +@@ -1,68 +1,35 @@ +-# This method works but there is no good way to install the results of it +-#FIND_PACKAGE(PerlLibs REQUIRED) +-#INCLUDE_DIRECTORIES(${PERL_INCLUDE_PATH}) +-# +-#SET_SOURCE_FILES_PROPERTIES(../sword.i PROPERTIES CPLUSPLUS ON) +-#SET_SOURCE_FILES_PROPERTIES(../sword.i PROPERTIES SWIG_FLAGS "") +-# +-#SWIG_ADD_MODULE(Sword perl +-# "../sword.i" +-#) +-# +-#SWIG_LINK_LIBRARIES(Sword ${PERL_LIBRARY} ${SWORD_LINK_NAME}) +- +-FIND_PACKAGE(Perl REQUIRED) +- +-SET(PERL_MAKEFILE "#!${PERL_EXECUTABLE} +- +-use ExtUtils::MakeMaker; +- +-# See lib/ExtUtils/MakeMaker.pm for details of how to influence +-# the contents of the Makefile that is written +-WriteMakefile( +- 'NAME' => 'Sword', +- 'VERSION' => '${SWORD_VERSION}', +- 'INC' => '-I\"${CMAKE_SOURCE_DIR}/include\" -I\"${CMAKE_CURRENT_SOURCE_DIR}/..\"', +- 'DEFINE' => '-DSWIG', +- 'LIBS' => '-L\"${CMAKE_BINARY_DIR}\" -lsword -lz', +- 'FIRST_MAKEFILE' => 'Makefile.perlswig', +- 'PREREQ_PM' => {}, +- ($] >= 5.005 ? ## Add these new keywords supported since 5.005 +- (ABSTRACT => 'Sword Project perl bindings', # retrieve abstract from module +- AUTHOR => 'Sword Project ') : ()), +-); +- +-rename 'Makefile.perlswig', 'Makefile.perlswig.old' or die \"Can't rename Makefile\"; +-open(INPUT, 'Makefile.perlswig') or die \"Can't open output Makefile\"; +-while () { +- s/\\-lsword/\\-lsword \\-lstdc\\+\\+/; +- print OUTPUT \"$_\"; +-} +- +-close INPUT; +-close OUTPUT;") +-FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/Makefile.PL "${PERL_MAKEFILE}") +- +-SET(SKIP_MAKEFILE "\\.old +-~$ +-\\.bak +-^CVS +-Makefile$") +-FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/Makefile.SKIP "${SKIP_MAKEFILE}") +- +-SWORD_SWIG_GENERATE(perl) +- +-ADD_CUSTOM_COMMAND(OUTPUT MANIFEST Makefile.perlswig +- COMMAND ${PERL_EXECUTABLE} Makefile.PL && make -f Makefile.perlswig clean +- COMMAND ${PERL_EXECUTABLE} Makefile.PL && make -f Makefile.perlswig manifest +- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) +- +-ADD_CUSTOM_TARGET(perlswig ALL +- COMMAND make -f Makefile.perlswig +- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Sword.cxx ${CMAKE_CURRENT_BINARY_DIR}/Makefile.perlswig ${SWORD_LINK_NAME} +- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) ++# Perl Swig bindings + +-INSTALL(SCRIPT install.cmake) ++cmake_minimum_required(VERSION 3.14.7) ++cmake_policy(SET CMP0078 NEW) ++cmake_policy(SET CMP0086 NEW) ++set(UseSWIG_MODULE_VERSION 2) + +-MESSAGE(STATUS "Perl: yes") ++find_package(SWIG REQUIRED) ++include(${SWIG_USE_FILE}) ++ ++find_package(PerlLibs REQUIRED) ++include_directories(${PERL_INCLUDE_PATH}) ++include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) ++ ++ ++set_source_files_properties(../sword.i PROPERTIES CPLUSPLUS ON) ++ ++SWIG_ADD_LIBRARY(Sword ++ TYPE SHARED ++ LANGUAGE perl SOURCES ../sword.i ++ ) ++TARGET_LINK_LIBRARIES(Sword ${PERL_LIBRARIES} ${SWORD_LINK_NAME}) ++ ++ ++install( ++ TARGETS Sword ++ LIBRARY DESTINATION "${LIB_INSTALL_DIR}/perl5/vendor_perl/auto/Sword" ++) ++get_target_property(SWIG_BUILDIR Sword SWIG_SUPPORT_FILES_DIRECTORY) ++ ++message(STATUS "SWIG_BUILDIR=${SWIG_BUILDIR}") ++install( ++ FILES ${SWIG_BUILDIR}/Sword.pm ++ DESTINATION "${LIB_INSTALL_DIR}/perl5/vendor_perl" ++) diff --git a/dead.package b/dead.package deleted file mode 100644 index d409129..0000000 --- a/dead.package +++ /dev/null @@ -1,3 +0,0 @@ -Retired: Fails to install - -See https://pagure.io/releng/issue/11685 diff --git a/sources b/sources new file mode 100644 index 0000000..8c3a0a0 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (sword-1.9.0.tar.gz) = 9ed3fbb5024af1f93b1473bae0d95534d02a5b00b3c9d41a0f855cee8106dc4e330844080adbee7c3f74c0e5ce1480bf16c87c842421337a341f641bae11137f diff --git a/sword.spec b/sword.spec new file mode 100644 index 0000000..4d8a0cb --- /dev/null +++ b/sword.spec @@ -0,0 +1,520 @@ +%define soversion 1.9 +%define pkg_version 1.9.0 + +Name: sword +Epoch: 1 +Version: 1.9.0 +Release: 21%{?dist} +Summary: Free Bible Software Project +License: GPLv2 +URL: http://www.crosswire.org/sword/ +Source0: http://www.crosswire.org/ftpmirror/pub/sword/source/v1.9/sword-%{version}.tar.gz +BuildRequires: make +BuildRequires: cmake +BuildRequires: cmake-data +BuildRequires: openssl-devel +BuildRequires: curl-devel +BuildRequires: zlib-devel +BuildRequires: libidn-devel +BuildRequires: libicu-devel icu +BuildRequires: clucene-core-devel +BuildRequires: cppunit-devel +BuildRequires: swig +BuildRequires: python3-devel +BuildRequires: perl-devel +BuildRequires: perl-generators +BuildRequires: gcc +BuildRequires: gcc-c++ + +Patch0: cmake-perl-bindings.diff + +%description +The SWORD Project is the CrossWire Bible Society's free Bible software +project. Its purpose is to create cross-platform open-source tools-- +covered by the GNU General Public License-- that allow programmers and +Bible societies to write new Bible software more quickly and easily. We +also create Bible study software for all readers, students, scholars, +and translators of the Bible, and have a growing collection of over 200 +texts in over 50 languages. + +%package devel +Summary: Development files for the sword project +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} +Requires: pkgconfig +Requires: curl-devel clucene-core-devel libicu-devel + +%description devel +This package contains the development headers and libraries for the +sword API. You need this package if you plan on compiling software +that uses the sword API, such as Gnomesword or Bibletime. + +%package utils +Summary: Utilities for the sword project +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} + +%description utils +This package contains the pre-built utilities for use with the SWORD +Project. The SWORD Project developers encourage you to use the latest +development version of the utilities rather than those released with +a packaged release as updates to the utilities do not affect the +release schedule of the library. However, these utilities were the +latest at the time of the current library release. + +%package -n python3-sword +%{?python_provide:%python_provide python3-sword} +Summary: Python bindings for Sword +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} +Requires: python3 +%py_provides python3-Sword + +%description -n python3-sword +Python bindings for The SWORD Library. + +%package -n perl-sword +%{?perl_provide:%perl_provide perl-sword} +Summary: Perl bindings for Sword +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} +Requires: perl-interpreter +Requires: perl-XML-LibXML +Requires: perl-HTML-Strip + +%description -n perl-sword +Perl bindings for The SWORD Library. + +%prep +%setup -q + +%patch -P0 -p1 -b .perl + +%build +%cmake -DLIBSWORD_LIBRARY_TYPE=Shared \ + -DSWORD_PYTHON_3:BOOL=TRUE \ + -DSWORD_PERL:BOOL=TRUE \ + -DSWORD_BUILD_UTILS="Yes" \ + -DLIBSWORD_SOVERSION=%{soversion} \ + -DLIBDIR=%{_libdir} \ + -DSWORD_BUILD_TESTS=Yes \ + -DSWORD_PYTHON_INSTALL_DIR="%{buildroot}%{_prefix}" +%cmake_build + +%install +%cmake_install +mkdir -p %{buildroot}%{_datadir}/sword/modules + +find %{buildroot} -type f -name "*.la" -delete -print + +%check +make tests + +%files +%doc AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README +%doc samples doc +# Re-enable after upstream includes it with CMake builds +%config(noreplace) %{_sysconfdir}/sword.conf +%{_libdir}/libsword.so.%{soversion} +%{_datadir}/sword + +%files devel +%doc CODINGSTYLE +%{_includedir}/sword/ +%{_libdir}/libsword.so +%{_libdir}/pkgconfig/sword.pc + +%files utils +%{_bindir}/vs2osisref +%{_bindir}/vs2osisreftxt +%{_bindir}/mod2vpl +%{_bindir}/imp2ld +%{_bindir}/diatheke +%{_bindir}/mkfastmod +%{_bindir}/mod2zmod +%{_bindir}/xml2gbs +%{_bindir}/imp2vs +%{_bindir}/installmgr +%{_bindir}/osis2mod +%{_bindir}/tei2mod +%{_bindir}/vpl2mod +%{_bindir}/mod2imp +%{_bindir}/addld +%{_bindir}/imp2gbs +%{_bindir}/mod2osis +%{_bindir}/emptyvss + +%files -n python3-sword +%pycached %{python3_sitearch}/Sword.py +%{python3_sitearch}/_Sword%{python3_ext_suffix} +%{python3_sitearch}/sword-%{pkg_version}-py%{python3_version}.egg-info + +%files -n perl-sword +%{perl_vendorarch}/* +%exclude %dir %{perl_vendorarch}/auto/ + + +%changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1:1.9.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jul 11 2023 František Zatloukal - 1:1.9.0-20 +- Rebuilt for ICU 73.2 + +* Tue Jul 11 2023 Jitka Plesnikova - 1:1.9.0-19 +- Perl 5.38 rebuild + +* Fri Jun 30 2023 Jitka Plesnikova - 1:1.9.0-18 +- Replace requirement of meta-package perl by perl-interpreter + +* Tue Jun 13 2023 Python Maint - 1:1.9.0-17 +- Rebuilt for Python 3.12 + +* Sat Jan 21 2023 Fedora Release Engineering - 1:1.9.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Dec 31 2022 Pete Walter - 1:1.9.0-15 +- Rebuild for ICU 72 + +* Mon Dec 12 2022 Jitka Plesnikova - 1:1.9.0-14 +- Add BR perl-generators to automatically generates run-time dependencies + for installed Perl files + +* Mon Aug 01 2022 Frantisek Zatloukal - 1:1.9.0-13 +- Rebuilt for ICU 71.1 + +* Sat Jul 23 2022 Fedora Release Engineering - 1:1.9.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 1:1.9.0-11 +- Rebuilt for Python 3.11 + +* Mon May 30 2022 Jitka Plesnikova - 1:1.9.0-10 +- Perl 5.36 rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 1:1.9.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1:1.9.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jun 09 2021 Greg Hellings - 1:1.9.0-7 +- Correct dependencies for subpackages + +* Fri Jun 04 2021 Python Maint - 1:1.9.0-6 +- Rebuilt for Python 3.10 + +* Mon May 24 2021 Greg Hellings - 1:1.9.0-5 +- Add Epoch tag + +* Fri May 21 2021 Jitka Plesnikova - 1.9.0-5 +- Perl 5.34 rebuild + +* Wed May 19 2021 Pete Walter - 1.9.0-4 +- Rebuild for ICU 69 + +* Wed Jan 27 2021 Fedora Release Engineering - 1.9.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Dec 14 2020 Greg Hellings - 1.9.0-2 +- Restore Perl bindings + +* Tue Dec 1 2020 Greg Hellings - 1.9.0-1 +- Upstream 1.9.0 release + +* Fri Oct 2 2020 Greg Hellings - 1.8.903-1 +- Upstream 1.9.0RC3 release + +* Fri Sep 11 2020 Greg Hellings - 1.8.901-1 +- Upstream 1.9.0RC1 release + +* Sat Aug 01 2020 Fedora Release Engineering - 1.8.1-24 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.8.1-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jun 22 2020 Jitka Plesnikova - 1.8.1-22 +- Perl 5.32 rebuild + +* Tue May 26 2020 Miro Hrončok - 1.8.1-21 +- Rebuilt for Python 3.9 + +* Fri May 15 2020 Pete Walter - 1.8.1-20 +- Rebuild for ICU 67 + +* Sun Apr 26 2020 Greg Hellings - 1.8.1-19 +- Added patch to fix upstream markup bug + +* Fri Jan 31 2020 Fedora Release Engineering - 1.8.1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Nov 01 2019 Pete Walter - 1.8.1-17 +- Rebuild for ICU 65 + +* Thu Oct 03 2019 Miro Hrončok - 1.8.1-16 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Mon Aug 19 2019 Jaak Ristioja - 1.8.1-15 +- Fixed conflicting integer types being defined + +* Mon Aug 19 2019 Miro Hrončok - 1.8.1-14 +- Rebuilt for Python 3.8 + +* Sun Aug 04 2019 Dominique Corbex - 1.8.1-13 +- Added Perl bindings + +* Sat Jul 27 2019 Fedora Release Engineering - 1.8.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 1.8.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Jan 23 2019 Pete Walter - 1.8.1-10 +- Rebuild for ICU 63 + +* Mon Sep 24 2018 Greg Hellings - 1.8.1-9 +- Remove Python 2 binding build: BZ1627373 + +* Sat Jul 14 2018 Fedora Release Engineering - 1.8.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Jul 11 2018 Greg Hellings - 1.8.1-7 +- Add flags for building ICU 61+ +- Patch Python building for Python 2/3 combined + +* Tue Jul 10 2018 Pete Walter - 1.8.1-6 +- Rebuild for ICU 62 + +* Mon Apr 30 2018 Pete Walter - 1.8.1-5 +- Rebuild for ICU 61.1 + +* Wed Feb 21 2018 Iryna Shcherbina - 1.8.1-4 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Sun Feb 18 2018 Gregory Hellings - 1.8.1-3 +- Remove post/postun for F28+ +- Rename python-sword to python2-sword +- Add BR for gcc/g++ per F28+ changes + +* Fri Feb 09 2018 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Jan 08 2018 Greg Hellings - 1.8.1-1 +- Upstream release 1.8.1 +- Add check section + +* Sat Dec 23 2017 Greg Hellings - 1.8.0-1 +- Upstream release 1.8.0 + +* Tue Dec 5 2017 Greg Hellings - 1.7.906-1 +- Testing 1.8.0RC6 + +* Thu Nov 30 2017 Pete Walter - 1.7.4-15 +- Rebuild for ICU 60.1 + +* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 1.7.4-14 +- Add Provides for the old name without %%_isa + +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 1.7.4-13 +- Python 2 binary package renamed to python2-sword + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + +* Thu Aug 03 2017 Fedora Release Engineering - 1.7.4-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.7.4-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon May 15 2017 Fedora Release Engineering - 1.7.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.7.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jul 19 2016 Fedora Release Engineering - 1.7.4-8 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Fri Apr 15 2016 David Tardon - 1.7.4-7 +- rebuild for ICU 57.1 + +* Fri Feb 05 2016 Fedora Release Engineering - 1.7.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Oct 28 2015 David Tardon - 1.7.4-5 +- rebuild for ICU 56.1 + +* Fri Jun 19 2015 Fedora Release Engineering - 1.7.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 1.7.4-3 +- Rebuilt for GCC 5 C++11 ABI change + +* Mon Jan 26 2015 David Tardon - 1.7.4-2 +- rebuild for ICU 54.1 + +* Wed Dec 24 2014 Greg Hellings - 1.7.4-1 +- New upstream release +- Removed upstreamed patches + +* Tue Dec 09 2014 Greg Hellings - 1.7.3.900-3 +- Fixed invalid pkg-config + +* Mon Dec 08 2014 Greg Hellings - 1.7.3.900-2 +- Changed to CMake +- Added Python bindings + +* Wed Dec 03 2014 Greg Hellings - 1.7.3.900-1 +- Upstream pre-release version bump + +* Mon Oct 27 2014 Greg Hellings - 1.7.3-9 +- Release bump + +* Tue Aug 26 2014 David Tardon - 1.7.3-7 +- rebuild for ICU 53.1 + +* Mon Aug 18 2014 Fedora Release Engineering - 1.7.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Wed Aug 13 2014 Rex Dieter - 1.7.3-5 +- revert some incompatible "cleanup" (%%make_build undefined on < f21) +- -devel: drop extraneous lib deps (let pkgconfig autoreq handle it as needed) + +* Mon Aug 11 2014 Greg Hellings - 1.7.3-4 +- Change curl-devel for libcurl-devel + +* Sat Aug 02 2014 Christopher Meng - 1.7.3-3 +- devel subpkg cleanup + +* Sun Jun 08 2014 Fedora Release Engineering - 1.7.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue May 06 2014 Greg Hellings - 1.7.3-1 +- New upstream version + +* Thu Feb 13 2014 Greg Hellings - 1.7.2-2 +- Rebuilt for ICU 52 + +* Wed Jan 29 2014 Deji Akingunola - 1.7.2-1 +- Update to sword-1.7.2 + +* Sun Aug 04 2013 Fedora Release Engineering - 1.6.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 01 2013 Parag Nemade - 1.6.2-10 +- Rebuild for icu 50 + +* Sat Jul 21 2012 Fedora Release Engineering - 1.6.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sun May 20 2012 Deji Akingunola - 1.6.2-8 +- Rebuild for icu soname change + +* Wed Feb 22 2012 Deji Akingunola - 1.6.2-7 +- Fix compile error with gcc-4.7 + +* Sat Jan 14 2012 Fedora Release Engineering - 1.6.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Sun Oct 2 2011 Tom Callaway - 1.6.2-5 +- fix compile against clucene2 + +* Fri Sep 09 2011 Caolán McNamara - 1.6.2-4 +- rebuild for icu 4.8.1 + +* Mon Mar 07 2011 Caolán McNamara - 1.6.2-3 +- rebuild for icu 4.6 + +* Wed Feb 09 2011 Fedora Release Engineering - 1.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Oct 22 2010 Deji Akingunola - 1.6.2-1 +- Update to version 1.6.2 + +* Fri Apr 02 2010 Caolán McNamara - 1.6.1-3 +- rebuild for icu 4.4 + +* Sat Mar 20 2010 Deji Akingunola - 1.6.1-2 +- Work around regression in curl-7.20.0 (Patch by Karl Kleinpaste), fix #569685 + +* Wed Jan 13 2010 Deji Akingunola - 1.6.1-1 +- Update to version 1.6.1 + +* Sun Jul 26 2009 Fedora Release Engineering - 1.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu May 14 2009 Deji Akingunola - 1.6.0-1 +- Update to version 1.6.0 + +* Wed Feb 25 2009 Fedora Release Engineering - 1.5.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Feb 04 2009 Deji Akingunola - 1.5.11-3 +- Add patch to build with gcc-4.4 + +* Tue Jun 03 2008 Caolán McNamara - 1.5.11-2 +- rebuild for new icu + +* Mon May 26 2008 Deji Akingunola - 1.5.11-1 +- Update to version 1.5.11 + +* Thu Feb 21 2008 Deji Akingunola - 1.5.10-3 +- Fix command injection bug (Bug #433723) + +* Thu Jan 10 2008 Deji Akingunola - 1.5.10-2 +- Fix build issue with gcc43 + +* Mon Nov 05 2007 Deji Akingunola - 1.5.10-1 +- Update to version 1.5.10 + +* Tue Sep 25 2007 Deji Akingunola - 1.5.9-7 +- Fix the build failure due to glibc open() check + +* Sat Aug 25 2007 Deji Akingunola - 1.5.9-6 +- Rebuild + +* Fri Aug 03 2007 Deji Akingunola - 1.5.9-5 +- License tag update +- Rebuild for new icu + +* Sat Jan 20 2007 Deji Akingunola - 1.5.9-4 +- Fix an error (libicu-devel not icu-devel) + +* Sat Jan 20 2007 Deji Akingunola - 1.5.9-3 +- Add Requires for the -devel subpackage + +* Sun Jan 14 2007 Deji Akingunola - 1.5.9-2 +- Rebuild with lucene support + +* Wed Nov 08 2006 Deji Akingunola - 1.5.9-1 +- New release +- Build with icu support + +* Wed Sep 20 2006 Deji Akingunola - 1.5.8-9 +- Take over from Michael A. Peters +- Rebuild for FC6 + +* Sat Jun 03 2006 Michael A. Peters - 1.5.8-8 +- Added pkgconfig to devel package Requires + +* Fri Feb 17 2006 Michael A. Peters - 1.5.8-7 +- Rebuild in devel branch + +* Wed Dec 14 2005 Michael A. Peters - 1.5.8-6 +- rebuild in devel branch with new compiler suite +- remove specific release from devel requires of main package +- do not build with %%{_smp_mflags} + +* Mon Nov 21 2005 Michael A. Peters - 1.5.8-5 +- disable static library + +* Sun Nov 13 2005 Michael A. Peters - 1.5.8-4.1 +- Rebuild against new openssl + +* Sat Oct 29 2005 Michael A. Peters - 1.5.8-4 +- Added Arabic support files from Developer mailing list (they have +- been added to the upstream SVN version) + +* Thu Jun 09 2005 Michael A. Peters - 1.5.8-3 +- fix line breaks + +* Mon Jun 06 2005 Michael A. Peters - 1.5.8-1 +- initial CVS checkin for Fedora Extras diff --git a/tests/installmgr.sh b/tests/installmgr.sh new file mode 100755 index 0000000..daf9ac4 --- /dev/null +++ b/tests/installmgr.sh @@ -0,0 +1,7 @@ +#!/bin/bash +set -ex + +OPTS="--allow-internet-access-and-risk-tracing-and-jail-or-martyrdom" +yes | installmgr $OPTS -init +installmgr $OPTS -sc +installmgr $OPTS -r CrossWire diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..d8f9dc2 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,10 @@ +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + - container + tests: + - installmgr: + dir: . + run: installmgr.sh From 7b1439e7bc52bad6ddbcdfb092c023df9d184798 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Thu, 5 Oct 2023 14:22:52 -0600 Subject: [PATCH 47/66] Revamp packaging, fix Python bindings build failure (fedora#2241414) --- LICENSE_README | 3 ++ migrate-to-setuptools.diff | 82 ++++++++++++++++++++++++++++++++++++++ sources | 2 +- sword.spec | 60 +++++++++++++++++----------- sword_gen_free_tarball.sh | 30 ++++++++++++++ 5 files changed, 153 insertions(+), 24 deletions(-) create mode 100644 LICENSE_README create mode 100644 migrate-to-setuptools.diff create mode 100755 sword_gen_free_tarball.sh diff --git a/LICENSE_README b/LICENSE_README new file mode 100644 index 0000000..e32f5ab --- /dev/null +++ b/LICENSE_README @@ -0,0 +1,3 @@ +Files under the CMake directory originate from code licensed under the BSD-3-Clause license, the Boost Software License or (possibly) the BSD-2-Clause license. Modifications to these files made by the SWORD developers are licensed under GPLv2, effectively mixing code of two different licenses into the same file. + +The files sword-1.9.0/include/ftpparse.h and sword-1.9.0/src/utilfuns/ftpparse.c contain an informal non-free license, however their author (D. J. Bernstein) has placed them into the public domain and alternately allowed them to be used under any one of several FOSS licenses. (See https://cr.yp.to/distributors.html, section "What are the distribution terms for ftpparse?") The versions of these files in SWORD aren't *quite* identical to the originals (they appear to have been modified to work properly and safely in SWORD), but they're very nearly identical. The License field of the package contains the three Fedora-allowable licenses given. diff --git a/migrate-to-setuptools.diff b/migrate-to-setuptools.diff new file mode 100644 index 0000000..2805fd4 --- /dev/null +++ b/migrate-to-setuptools.diff @@ -0,0 +1,82 @@ +From 07b31a74ea920077fa0d69cdab2ab188dd17b322 Mon Sep 17 00:00:00 2001 +From: Aaron Rainbolt +Date: Wed, 27 Sep 2023 10:51:27 -0600 +Subject: [PATCH] Migrate to setuptools + +--- + bindings/swig/oldmake/Makefile.am | 2 +- + bindings/swig/package/Makefile.am | 3 +-- + bindings/swig/package/Makefile.in | 3 +-- + bindings/swig/python/CMakeLists.txt | 7 +++++-- + 4 files changed, 8 insertions(+), 7 deletions(-) + +diff --git a/bindings/swig/oldmake/Makefile.am b/bindings/swig/oldmake/Makefile.am +index 45a37ef..789813b 100644 +--- a/bindings/swig/oldmake/Makefile.am ++++ b/bindings/swig/oldmake/Makefile.am +@@ -76,7 +76,7 @@ python_makebuild: $(PYTHONSWIG) + echo "writing python/setup.py" + @echo "#! /usr/bin/python" > python/setup.py + @echo "" >> python/setup.py +- @echo "from distutils.core import setup, Extension" >> python/setup.py ++ @echo "from setuptools import setup, Extension" >> python/setup.py + @echo "setup (name = \"sword\"," >> python/setup.py + @echo " version = \"$(VERSION)\"," >> python/setup.py + @echo " maintainer = \"Sword Developers\"," >> python/setup.py +diff --git a/bindings/swig/package/Makefile.am b/bindings/swig/package/Makefile.am +index 14500c3..f44974d 100644 +--- a/bindings/swig/package/Makefile.am ++++ b/bindings/swig/package/Makefile.am +@@ -84,8 +84,7 @@ python_makebuild: $(PYTHONSWIG) + echo "writing python/setup.py" + @echo "#! /usr/bin/python" > python/setup.py + @echo "" >> python/setup.py +- @echo "from distutils.core import setup" >> python/setup.py +- @echo "from distutils.extension import Extension" >> python/setup.py ++ @echo "from setuptools import setup, Extension" >> python/setup.py + @echo "import commands" >> python/setup.py + @echo "" >> python/setup.py + @echo "def pkgconfig(*packages, **kw):" >> python/setup.py +diff --git a/bindings/swig/package/Makefile.in b/bindings/swig/package/Makefile.in +index b5f05c9..370a9e7 100644 +--- a/bindings/swig/package/Makefile.in ++++ b/bindings/swig/package/Makefile.in +@@ -938,8 +938,7 @@ python_makebuild: $(PYTHONSWIG) + echo "writing python/setup.py" + @echo "#! /usr/bin/python" > python/setup.py + @echo "" >> python/setup.py +- @echo "from distutils.core import setup" >> python/setup.py +- @echo "from distutils.extension import Extension" >> python/setup.py ++ @echo "from setuptools import setup, Extension" >> python/setup.py + @echo "import commands" >> python/setup.py + @echo "" >> python/setup.py + @echo "def pkgconfig(*packages, **kw):" >> python/setup.py +diff --git a/bindings/swig/python/CMakeLists.txt b/bindings/swig/python/CMakeLists.txt +index cbb4058..247bc79 100644 +--- a/bindings/swig/python/CMakeLists.txt ++++ b/bindings/swig/python/CMakeLists.txt +@@ -25,7 +25,7 @@ ENDIF(NOT PYTHONLIBS_FOUND) + + SET(PY_SCRIPT "#!${PYTHON_EXECUTABLE} + +-from distutils.core import setup, Extension ++from setuptools import setup, Extension + setup( + name='sword', + version='${SWORD_VERSION}', +@@ -51,8 +51,11 @@ ADD_CUSTOM_TARGET(swordswig_python${SWORD_PYTHON_VERSION} ALL + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") + + # Allow user installation to custom directory ++IF(NOT SWORD_PYTHON_INSTALL_ROOT STREQUAL "") ++ SET(SETUP_ARGS "\"--root=${SWORD_PYTHON_INSTALL_ROOT}\"") ++ENDIF(NOT SWORD_PYTHON_INSTALL_ROOT STREQUAL "") + IF(NOT SWORD_PYTHON_INSTALL_DIR STREQUAL "") +- SET(SETUP_ARGS "\"--prefix=${SWORD_PYTHON_INSTALL_DIR}\"") ++ SET(SETUP_ARGS "${SETUP_ARGS}\"--prefix=${SWORD_PYTHON_INSTALL_DIR}\"") + ENDIF(NOT SWORD_PYTHON_INSTALL_DIR STREQUAL "") + CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/install.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/install.cmake") +-- +2.41.0 + diff --git a/sources b/sources index 8c3a0a0..a93ac03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sword-1.9.0.tar.gz) = 9ed3fbb5024af1f93b1473bae0d95534d02a5b00b3c9d41a0f855cee8106dc4e330844080adbee7c3f74c0e5ce1480bf16c87c842421337a341f641bae11137f +SHA512 (sword-1.9.0.tar.gz) = b5a4e30bf088d4b8187fc3addb58a4b6d8ce011f25cecdd4e547f710fa9ffed49c69f36a21ea1c15d1a21205bca09b2fd7c04d6ed176a5c81900a784b9b76d92 diff --git a/sword.spec b/sword.spec index 4d8a0cb..238d952 100644 --- a/sword.spec +++ b/sword.spec @@ -1,33 +1,39 @@ -%define soversion 1.9 -%define pkg_version 1.9.0 +%global soversion 1.9 Name: sword Epoch: 1 Version: 1.9.0 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Free Bible Software Project -License: GPLv2 +License: GPLv2 AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ -Source0: http://www.crosswire.org/ftpmirror/pub/sword/source/v1.9/sword-%{version}.tar.gz +# Source0 tarball is generated by sword_gen_free_tarball.sh, which documents +# repack rationale and automates tarball fetching and repacking +Source0: sword-1.9.0.tar.gz +Source1: sword_gen_free_tarball.sh +Source2: LICENSE_README +# Patch0 was created by a SWORD developer, not applied upstream +Patch0: cmake-perl-bindings.diff +# Patch1 emailed to upstream +Patch1: migrate-to-setuptools.diff BuildRequires: make BuildRequires: cmake -BuildRequires: cmake-data BuildRequires: openssl-devel BuildRequires: curl-devel BuildRequires: zlib-devel BuildRequires: libidn-devel -BuildRequires: libicu-devel icu +BuildRequires: libicu-devel +BuildRequires: icu BuildRequires: clucene-core-devel BuildRequires: cppunit-devel BuildRequires: swig BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildRequires: perl-devel BuildRequires: perl-generators BuildRequires: gcc BuildRequires: gcc-c++ -Patch0: cmake-perl-bindings.diff - %description The SWORD Project is the CrossWire Bible Society's free Bible software project. Its purpose is to create cross-platform open-source tools-- @@ -41,7 +47,9 @@ texts in over 50 languages. Summary: Development files for the sword project Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: pkgconfig -Requires: curl-devel clucene-core-devel libicu-devel +Requires: curl-devel +Requires: clucene-core-devel +Requires: libicu-devel %description devel This package contains the development headers and libraries for the @@ -61,17 +69,15 @@ release schedule of the library. However, these utilities were the latest at the time of the current library release. %package -n python3-sword -%{?python_provide:%python_provide python3-sword} +%py_provides python3-sword Summary: Python bindings for Sword Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: python3 -%py_provides python3-Sword %description -n python3-sword Python bindings for The SWORD Library. %package -n perl-sword -%{?perl_provide:%perl_provide perl-sword} Summary: Perl bindings for Sword Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: perl-interpreter @@ -82,9 +88,7 @@ Requires: perl-HTML-Strip Perl bindings for The SWORD Library. %prep -%setup -q - -%patch -P0 -p1 -b .perl +%autosetup -p1 %build %cmake -DLIBSWORD_LIBRARY_TYPE=Shared \ @@ -94,25 +98,26 @@ Perl bindings for The SWORD Library. -DLIBSWORD_SOVERSION=%{soversion} \ -DLIBDIR=%{_libdir} \ -DSWORD_BUILD_TESTS=Yes \ - -DSWORD_PYTHON_INSTALL_DIR="%{buildroot}%{_prefix}" + -DSWORD_PYTHON_INSTALL_ROOT="%{buildroot}" \ + -DSWORD_PYTHON_INSTALL_DIR="%{_prefix}" %cmake_build %install %cmake_install mkdir -p %{buildroot}%{_datadir}/sword/modules -find %{buildroot} -type f -name "*.la" -delete -print - %check make tests %files -%doc AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README -%doc samples doc +%doc AUTHORS ChangeLog NEWS README +%doc samples/ +%doc doc/ +%license COPYING LICENSE # Re-enable after upstream includes it with CMake builds %config(noreplace) %{_sysconfdir}/sword.conf %{_libdir}/libsword.so.%{soversion} -%{_datadir}/sword +%{_datadir}/sword/ %files devel %doc CODINGSTYLE @@ -143,7 +148,7 @@ make tests %files -n python3-sword %pycached %{python3_sitearch}/Sword.py %{python3_sitearch}/_Sword%{python3_ext_suffix} -%{python3_sitearch}/sword-%{pkg_version}-py%{python3_version}.egg-info +%{python3_sitearch}/sword-%{version}-py%{python3_version}.egg-info/ %files -n perl-sword %{perl_vendorarch}/* @@ -151,6 +156,15 @@ make tests %changelog +* Fri Sep 29 2023 Aaron Rainbolt - 1:1.9.0-22 +- Replace distutils with setuptools in python setup scripts (rhbz#2220606) +- Don't install the INSTALL file as part of the documentation +- Remove Android bindings as they contain a prebuild binary +- Remove gSOAP bindings as they contain a non-free source file +- Remove Objective C bindings as they contain a non-free source file +- Remove win32-related utility code as it is non-free +- Remove some sort of pre-built PalmOS application binary + * Sat Jul 22 2023 Fedora Release Engineering - 1:1.9.0-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sword_gen_free_tarball.sh b/sword_gen_free_tarball.sh new file mode 100755 index 0000000..9847da4 --- /dev/null +++ b/sword_gen_free_tarball.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +# SWORD's gSOAP bindings contain a file at bindings/gsoap/include/stdsoap.h +# that is labeled "All rights reserved." We therefore have to repack the +# tarball to eliminate this file. Doing so most likely ruins the gSOAP +# bindings, so we just remove the gSOAP bindings altogether. +# +# The Objective C bindings have the same problem as the gSOAP bindings. +# +# There's some win32-related code that has a similar problem too. +# +# Also some sort of PalmOS application binary needs removed. +# +# We also remove the Android bindings since they contain a prebuilt .jar file. +# This could be handled in %prep but it's just as easy and probably a bit +# faster to do it here. + +set -e + +wget http://www.crosswire.org/ftpmirror/pub/sword/source/v1.9/sword-1.9.0.tar.gz +test "$(sha512sum sword-1.9.0.tar.gz | cut -d' ' -f1)" = "9ed3fbb5024af1f93b1473bae0d95534d02a5b00b3c9d41a0f855cee8106dc4e330844080adbee7c3f74c0e5ce1480bf16c87c842421337a341f641bae11137f" +tar -xf sword-1.9.0.tar.gz +rm sword-1.9.0.tar.gz +rm -r sword-1.9.0/bindings/gsoap +rm -r sword-1.9.0/bindings/Android +rm -r sword-1.9.0/bindings/objc +rm -r sword-1.9.0/src/utilfuns/win32 +rm sword-1.9.0/utilities/diatheke/pqa/Diatheke.pqa +tar -czf sword-1.9.0.tar.gz sword-1.9.0 +rm -r sword-1.9.0 From b014cd4adb69d09b9f55c96940e43e845369d81e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Sat, 7 Oct 2023 07:04:41 +0000 Subject: [PATCH 48/66] Correct SPDX license formula GPLv2 is not the correct SPDX id. --- sword.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 238d952..bd05b64 100644 --- a/sword.spec +++ b/sword.spec @@ -5,7 +5,7 @@ Epoch: 1 Version: 1.9.0 Release: 22%{?dist} Summary: Free Bible Software Project -License: GPLv2 AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) +License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ # Source0 tarball is generated by sword_gen_free_tarball.sh, which documents # repack rationale and automates tarball fetching and repacking From 8d87410824e5a5d70939a5a8878bddce431e8752 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 04:59:42 +0000 Subject: [PATCH 49/66] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index bd05b64..f81c4c0 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -156,6 +156,9 @@ make tests %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1:1.9.0-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Sep 29 2023 Aaron Rainbolt - 1:1.9.0-22 - Replace distutils with setuptools in python setup scripts (rhbz#2220606) - Don't install the INSTALL file as part of the documentation From f3151a9cdf785c4d455281a9923a1f452ac5aa62 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Wed, 31 Jan 2024 20:16:20 +0000 Subject: [PATCH 50/66] Rebuild for ICU 74 --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index f81c4c0..be6f1b0 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -156,6 +156,9 @@ make tests %changelog +* Wed Jan 31 2024 Pete Walter - 1:1.9.0-24 +- Rebuild for ICU 74 + * Sat Jan 27 2024 Fedora Release Engineering - 1:1.9.0-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 8ddee760f929e06c1abd5444e525dfc7ff42d846 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 09:06:40 +0200 Subject: [PATCH 51/66] Rebuilt for Python 3.13 --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index be6f1b0..800fe6f 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -156,6 +156,9 @@ make tests %changelog +* Fri Jun 07 2024 Python Maint - 1:1.9.0-25 +- Rebuilt for Python 3.13 + * Wed Jan 31 2024 Pete Walter - 1:1.9.0-24 - Rebuild for ICU 74 From c90940a0343272be4e7819fedc0e7bb10e039688 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 12 Jun 2024 13:06:36 +0200 Subject: [PATCH 52/66] Perl 5.40 rebuild --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 800fe6f..af37d40 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -156,6 +156,9 @@ make tests %changelog +* Wed Jun 12 2024 Jitka Plesnikova - 1:1.9.0-26 +- Perl 5.40 rebuild + * Fri Jun 07 2024 Python Maint - 1:1.9.0-25 - Rebuilt for Python 3.13 From e11297126c722c7b7940588bc722f10667d91bf5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 06:51:31 +0000 Subject: [PATCH 53/66] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index af37d40..3f3d52a 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -156,6 +156,9 @@ make tests %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1:1.9.0-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jun 12 2024 Jitka Plesnikova - 1:1.9.0-26 - Perl 5.40 rebuild From cc86d291b2fd701ba6a12838118b8b52a2679867 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Sun, 8 Dec 2024 22:47:18 +0000 Subject: [PATCH 54/66] Rebuild for ICU 76 --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 3f3d52a..df75069 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -156,6 +156,9 @@ make tests %changelog +* Sun Dec 08 2024 Pete Walter - 1:1.9.0-28 +- Rebuild for ICU 76 + * Sat Jul 20 2024 Fedora Release Engineering - 1:1.9.0-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 46af13b4317c784f6bc5184d4371c6bc8dc4faf5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 12:07:25 +0000 Subject: [PATCH 55/66] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index df75069..217ae75 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -156,6 +156,9 @@ make tests %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1:1.9.0-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sun Dec 08 2024 Pete Walter - 1:1.9.0-28 - Rebuild for ICU 76 From 5b21f8175bfb7be709b0031be528672d0ed855a2 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 20:44:59 +0200 Subject: [PATCH 56/66] Rebuilt for Python 3.14 --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 217ae75..a45e018 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -156,6 +156,9 @@ make tests %changelog +* Mon Jun 02 2025 Python Maint - 1:1.9.0-30 +- Rebuilt for Python 3.14 + * Sun Jan 19 2025 Fedora Release Engineering - 1:1.9.0-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b29427f84d7bfac331dd43b73f61ee7c770698ef Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 7 Jul 2025 16:27:13 +0200 Subject: [PATCH 57/66] Perl 5.42 rebuild --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index a45e018..ec70548 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -156,6 +156,9 @@ make tests %changelog +* Mon Jul 07 2025 Jitka Plesnikova - 1:1.9.0-31 +- Perl 5.42 rebuild + * Mon Jun 02 2025 Python Maint - 1:1.9.0-30 - Rebuilt for Python 3.14 From 59dccf301b41f71797d27dd1dbb6bc11327ac6a7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:58:24 +0000 Subject: [PATCH 58/66] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index ec70548..0465c6b 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -156,6 +156,9 @@ make tests %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1:1.9.0-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jul 07 2025 Jitka Plesnikova - 1:1.9.0-31 - Perl 5.42 rebuild From 90aaa0eea0255a3c2ee1ab79483705b436dd4c96 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Sat, 26 Jul 2025 21:26:02 -0500 Subject: [PATCH 59/66] Set minimum CMake version to 3.5 (rhbz#2381472) --- sword.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 0465c6b..75ea453 100644 --- a/sword.spec +++ b/sword.spec @@ -91,7 +91,8 @@ Perl bindings for The SWORD Library. %autosetup -p1 %build -%cmake -DLIBSWORD_LIBRARY_TYPE=Shared \ +%cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ + -DLIBSWORD_LIBRARY_TYPE=Shared \ -DSWORD_PYTHON_3:BOOL=TRUE \ -DSWORD_PERL:BOOL=TRUE \ -DSWORD_BUILD_UTILS="Yes" \ From b731c1ca12f1455c47c37fe7a2a930eeea99b491 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Sat, 26 Jul 2025 21:26:59 -0500 Subject: [PATCH 60/66] Set non-standard CMake variables back to expected values (rhbz#2381665) --- sword.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sword.spec b/sword.spec index 75ea453..10f2218 100644 --- a/sword.spec +++ b/sword.spec @@ -92,6 +92,13 @@ Perl bindings for The SWORD Library. %build %cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ + -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \ + -DLIB_INSTALL_DIR:PATH=%{_libdir} \ + -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \ + -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \ + %if "%{?_lib}" == "lib64" + %{?_cmake_lib_suffix64} \ + %endif -DLIBSWORD_LIBRARY_TYPE=Shared \ -DSWORD_PYTHON_3:BOOL=TRUE \ -DSWORD_PERL:BOOL=TRUE \ From b6db4ed1e7a72637c71ba8c164cab4a1bf7119ea Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Sat, 26 Jul 2025 21:27:34 -0500 Subject: [PATCH 61/66] Migrate InstallMgr test to tmt framework (rhbz#2383081) --- .fmf/version | 1 + tests/installmgr.sh => installmgr_test.sh | 0 plans.fmf | 5 +++++ tests/tests.yml | 10 ---------- 4 files changed, 6 insertions(+), 10 deletions(-) create mode 100644 .fmf/version rename tests/installmgr.sh => installmgr_test.sh (100%) create mode 100644 plans.fmf delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/tests/installmgr.sh b/installmgr_test.sh similarity index 100% rename from tests/installmgr.sh rename to installmgr_test.sh diff --git a/plans.fmf b/plans.fmf new file mode 100644 index 0000000..8f58ed5 --- /dev/null +++ b/plans.fmf @@ -0,0 +1,5 @@ +summary: Run installmgr tests +discover: + how: fmf +execute: + script: installmgr_tests.sh diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index d8f9dc2..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,10 +0,0 @@ -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - - container - tests: - - installmgr: - dir: . - run: installmgr.sh From a99ba19821b574552357f651f3f1f7fa078cb6db Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Sat, 26 Jul 2025 21:29:50 -0500 Subject: [PATCH 62/66] Create changelog entry --- sword.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sword.spec b/sword.spec index 10f2218..9c9e262 100644 --- a/sword.spec +++ b/sword.spec @@ -164,6 +164,11 @@ make tests %changelog +* Sat Jul 26 2025 Aaron Rainbolt - 1:1.9.0-33 +- Set minimum CMake version to 3.5 (rhbz#2381472) +- Set non-standard CMake variables back to expected values (rhbz#2381665) +- Migrate InstallMgr test to tmt framework (rhbz#2383081) + * Fri Jul 25 2025 Fedora Release Engineering - 1:1.9.0-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a65616c2a96dba85cb691267582dd715cec67c63 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Sat, 26 Jul 2025 21:35:46 -0500 Subject: [PATCH 63/66] Set the version number right --- sword.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 9c9e262..42d7688 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ From 61def2183b1175002fb599e9e78254e2a50a4d68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Wed, 6 Aug 2025 09:58:04 +0200 Subject: [PATCH 64/66] Rebuilt for icu 77.1 --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 42d7688..fa19cda 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -164,6 +164,9 @@ make tests %changelog +* Wed Aug 06 2025 František Zatloukal - 1:1.9.0-34 +- Rebuilt for icu 77.1 + * Sat Jul 26 2025 Aaron Rainbolt - 1:1.9.0-33 - Set minimum CMake version to 3.5 (rhbz#2381472) - Set non-standard CMake variables back to expected values (rhbz#2381665) From 1e2cc791e1efdbf04059695362e3100d8002b5a9 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:19:25 +0200 Subject: [PATCH 65/66] Rebuilt for Python 3.14.0rc2 bytecode --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index fa19cda..0fe6dcd 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -164,6 +164,9 @@ make tests %changelog +* Fri Aug 15 2025 Python Maint - 1:1.9.0-35 +- Rebuilt for Python 3.14.0rc2 bytecode + * Wed Aug 06 2025 František Zatloukal - 1:1.9.0-34 - Rebuilt for icu 77.1 From 9cc0caea74086d8dbf97c57d9d89048a1ac3fcc0 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 14:58:40 +0200 Subject: [PATCH 66/66] Rebuilt for Python 3.14.0rc3 bytecode --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 0fe6dcd..3fa6951 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -164,6 +164,9 @@ make tests %changelog +* Fri Sep 19 2025 Python Maint - 1:1.9.0-36 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 1:1.9.0-35 - Rebuilt for Python 3.14.0rc2 bytecode