Your message dated Fri, 11 Jan 2019 06:00:10 +0000
with message-id <[email protected]>
and subject line Bug#913506: fixed in libkiwix 3.1.1-1
has caused the Debian Bug report #913506,
regarding libkiwix FTBFS with ICU 63.1
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
913506: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=913506
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: libkiwix
Source-Version: 0.2.0-1
Severity: important
Tags: patch
Usertags: icu63
Dear Maintainer,
ICU 63.1 recently released, packaged and uploaded to experimental.
Its transition is going to start soon. However your package fails to
build with this version. I attach a patch which fixes the problem.
Please check if it works with the version in Sid and upload the
package when it's feasible for you.
Thanks,
Laszlo/GCS
Description: fix FTBFS with ICU 63.1
Add icu namespace.
Author: Laszlo Boszormenyi (GCS) <[email protected]>
Last-Update: 2018-11-07
---
--- libkiwix-0.2.0.orig/include/common/stringTools.h
+++ libkiwix-0.2.0/include/common/stringTools.h
@@ -38,7 +38,7 @@ namespace kiwix {
std::string beautifyFileSize(const unsigned int number);
std::string urlEncode(const std::string &c);
void printStringInHexadecimal(const char *s);
- void printStringInHexadecimal(UnicodeString s);
+ void printStringInHexadecimal(icu::UnicodeString s);
void stringReplacement(std::string& str, const std::string& oldStr, const std::string& newStr);
std::string encodeDiples(const std::string& str);
--- libkiwix-0.2.0.orig/src/common/regexTools.cpp
+++ libkiwix-0.2.0/src/common/regexTools.cpp
@@ -19,11 +19,11 @@
#include <common/regexTools.h>
-std::map<std::string, RegexMatcher*> regexCache;
+std::map<std::string, icu::RegexMatcher*> regexCache;
-RegexMatcher *buildRegex(const std::string ®ex) {
- RegexMatcher *matcher;
- std::map<std::string, RegexMatcher*>::iterator itr = regexCache.find(regex);
+icu::RegexMatcher *buildRegex(const std::string ®ex) {
+ icu::RegexMatcher *matcher;
+ std::map<std::string, icu::RegexMatcher*>::iterator itr = regexCache.find(regex);
/* Regex is in cache */
if (itr != regexCache.end()) {
@@ -33,8 +33,8 @@ RegexMatcher *buildRegex(const std::stri
/* Regex needs to be parsed (and cached) */
else {
UErrorCode status = U_ZERO_ERROR;
- UnicodeString uregex = UnicodeString(regex.c_str());
- matcher = new RegexMatcher(uregex, UREGEX_CASE_INSENSITIVE, status);
+ icu::UnicodeString uregex = icu::UnicodeString(regex.c_str());
+ matcher = new icu::RegexMatcher(uregex, UREGEX_CASE_INSENSITIVE, status);
regexCache[regex] = matcher;
}
@@ -47,20 +47,20 @@ void freeRegexCache() {
bool matchRegex(const std::string &content, const std::string ®ex) {
ucnv_setDefaultName("UTF-8");
- UnicodeString ucontent = UnicodeString(content.c_str());
- RegexMatcher *matcher = buildRegex(regex);
+ icu::UnicodeString ucontent = icu::UnicodeString(content.c_str());
+ icu::RegexMatcher *matcher = buildRegex(regex);
matcher->reset(ucontent);
return matcher->find();
}
std::string replaceRegex(const std::string &content, const std::string &replacement, const std::string ®ex) {
ucnv_setDefaultName("UTF-8");
- UnicodeString ucontent = UnicodeString(content.c_str());
- UnicodeString ureplacement = UnicodeString(replacement.c_str());
- RegexMatcher *matcher = buildRegex(regex);
+ icu::UnicodeString ucontent = icu::UnicodeString(content.c_str());
+ icu::UnicodeString ureplacement = icu::UnicodeString(replacement.c_str());
+ icu::RegexMatcher *matcher = buildRegex(regex);
matcher->reset(ucontent);
UErrorCode status = U_ZERO_ERROR;
- UnicodeString uresult = matcher->replaceAll(ureplacement, status);
+ icu::UnicodeString uresult = matcher->replaceAll(ureplacement, status);
std::string tmp;
uresult.toUTF8String(tmp);
return tmp;
@@ -68,9 +68,9 @@ std::string replaceRegex(const std::stri
std::string appendToFirstOccurence(const std::string &content, const std::string regex, const std::string &replacement) {
ucnv_setDefaultName("UTF-8");
- UnicodeString ucontent = UnicodeString(content.c_str());
- UnicodeString ureplacement = UnicodeString(replacement.c_str());
- RegexMatcher *matcher = buildRegex(regex);
+ icu::UnicodeString ucontent = icu::UnicodeString(content.c_str());
+ icu::UnicodeString ureplacement = icu::UnicodeString(replacement.c_str());
+ icu::RegexMatcher *matcher = buildRegex(regex);
matcher->reset(ucontent);
if (matcher->find()) {
--- libkiwix-0.2.0.orig/src/common/stringTools.cpp
+++ libkiwix-0.2.0/src/common/stringTools.cpp
@@ -44,8 +44,8 @@ std::string kiwix::removeAccents(const s
loadICUExternalTables();
ucnv_setDefaultName("UTF-8");
UErrorCode status = U_ZERO_ERROR;
- Transliterator *removeAccentsTrans = Transliterator::createInstance("Lower; NFD; [:M:] remove; NFC", UTRANS_FORWARD, status);
- UnicodeString ustring = UnicodeString(text.c_str());
+ icu::Transliterator *removeAccentsTrans = icu::Transliterator::createInstance("Lower; NFD; [:M:] remove; NFC", UTRANS_FORWARD, status);
+ icu::UnicodeString ustring = icu::UnicodeString(text.c_str());
removeAccentsTrans->transliterate(ustring);
delete removeAccentsTrans;
std::string unaccentedText;
@@ -79,7 +79,7 @@ std::string kiwix::beautifyFileSize(cons
}
}
-void kiwix::printStringInHexadecimal(UnicodeString s) {
+void kiwix::printStringInHexadecimal(icu::UnicodeString s) {
std::cout << std::showbase << std::hex;
for (int i=0; i<s.length(); i++) {
char c = (char)((s.getTerminatedBuffer())[i]);
@@ -215,8 +215,8 @@ std::string kiwix::ucFirst (const std::s
std::string result;
- UnicodeString unicodeWord(word.c_str());
- UnicodeString unicodeFirstLetter = UnicodeString(unicodeWord, 0, 1).toUpper();
+ icu::UnicodeString unicodeWord(word.c_str());
+ icu::UnicodeString unicodeFirstLetter = icu::UnicodeString(unicodeWord, 0, 1).toUpper();
unicodeWord.replace(0, 1, unicodeFirstLetter);
unicodeWord.toUTF8String(result);
@@ -229,7 +229,7 @@ std::string kiwix::ucAll (const std::str
std::string result;
- UnicodeString unicodeWord(word.c_str());
+ icu::UnicodeString unicodeWord(word.c_str());
unicodeWord.toUpper().toUTF8String(result);
return result;
@@ -241,8 +241,8 @@ std::string kiwix::lcFirst (const std::s
std::string result;
- UnicodeString unicodeWord(word.c_str());
- UnicodeString unicodeFirstLetter = UnicodeString(unicodeWord, 0, 1).toLower();
+ icu::UnicodeString unicodeWord(word.c_str());
+ icu::UnicodeString unicodeFirstLetter = icu::UnicodeString(unicodeWord, 0, 1).toLower();
unicodeWord.replace(0, 1, unicodeFirstLetter);
unicodeWord.toUTF8String(result);
@@ -255,7 +255,7 @@ std::string kiwix::lcAll (const std::str
std::string result;
- UnicodeString unicodeWord(word.c_str());
+ icu::UnicodeString unicodeWord(word.c_str());
unicodeWord.toLower().toUTF8String(result);
return result;
@@ -267,7 +267,7 @@ std::string kiwix::toTitle (const std::s
std::string result;
- UnicodeString unicodeWord(word.c_str());
+ icu::UnicodeString unicodeWord(word.c_str());
unicodeWord = unicodeWord.toTitle(0);
unicodeWord.toUTF8String(result);
--- End Message ---
--- Begin Message ---
Source: libkiwix
Source-Version: 3.1.1-1
We believe that the bug you reported is fixed in the latest version of
libkiwix, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Kunal Mehta <[email protected]> (supplier of updated libkiwix package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Thu, 10 Jan 2019 19:48:41 -0800
Source: libkiwix
Binary: libkiwix-dev libkiwix3
Architecture: source amd64
Version: 3.1.1-1
Distribution: unstable
Urgency: medium
Maintainer: Kunal Mehta <[email protected]>
Changed-By: Kunal Mehta <[email protected]>
Description:
libkiwix-dev - library of common code for Kiwix (development)
libkiwix3 - library of common code for Kiwix
Closes: 913506
Changes:
libkiwix (3.1.1-1) unstable; urgency=medium
.
* New upstream version 3.1.1
* Have libkiwix-dev depend upon libraries it Requires in kiwix.pc
* Configure Salsa pipeline
* Standards-Version: 4.3.0, no changes needed
* Improve d/copyright
.
libkiwix (3.0.3-1) experimental; urgency=medium
.
* New upstream version 3.0.3 (Closes: #913506)
* Update Vcs-* control fields for move to salsa.debian.org
* Rename package for new soname
* Update d/copyright
* Set Rules-Requires-Root: no
* Standards-Version: 4.2.1
Checksums-Sha1:
69e4e366b89d45915ba9055a8fa918bffe80f19e 2083 libkiwix_3.1.1-1.dsc
ec5331b6aadffba8e7a9e5d2c20d20f59bcedc8c 1357232 libkiwix_3.1.1.orig.tar.gz
8de5acecd6f353e5627051b351c4af4269cf144f 3968 libkiwix_3.1.1-1.debian.tar.xz
1b383bef696ba86dc08c562d7d5a62395f5b9bf1 21436 libkiwix-dev_3.1.1-1_amd64.deb
f891e1427016c3e1dc4be846b6f30d51a14d6a75 2348968
libkiwix3-dbgsym_3.1.1-1_amd64.deb
3f9dac7515604d8159a3e752d4ff57329959437f 137936 libkiwix3_3.1.1-1_amd64.deb
1e9258760663bdac1b949aceb821ef628a076ca8 7367 libkiwix_3.1.1-1_amd64.buildinfo
Checksums-Sha256:
fe8c08830c20ef529e7d893797449134d319301bcdec06da9dff3b0ddbdbd1a9 2083
libkiwix_3.1.1-1.dsc
efeb36ea8b1cfdb5cb9400b04eae9ae42b47ec2828967ec8fcb53fc34de05172 1357232
libkiwix_3.1.1.orig.tar.gz
f4bccb8e48b47ed22402d57bddb400d025acf6716367024c200e8f9232b196fe 3968
libkiwix_3.1.1-1.debian.tar.xz
4fc57f9107f1d6e3e7f5607f0777b6165dfd8c62f487783ef7ea0674a577fc1e 21436
libkiwix-dev_3.1.1-1_amd64.deb
0fbdc382ef7fa7e7b45c14179ec4308c34a0f1c2a009bcaca11d786312a58467 2348968
libkiwix3-dbgsym_3.1.1-1_amd64.deb
1ad292846fca2853c6183c335a1ad84a8dec252403165b89b45900bcbde4a66a 137936
libkiwix3_3.1.1-1_amd64.deb
d0a69f42e4a1c578e8e0687913a111e4ae9c62be996f14d91b69f0e3b8c30b5f 7367
libkiwix_3.1.1-1_amd64.buildinfo
Files:
bc30600f2fc9dbea6c9e18e33035d54e 2083 libs optional libkiwix_3.1.1-1.dsc
8f74834d671b5526adbe06768ddc1e7c 1357232 libs optional
libkiwix_3.1.1.orig.tar.gz
29ffcba7d3f2740d34dfe640035e462c 3968 libs optional
libkiwix_3.1.1-1.debian.tar.xz
4005f305d62bc6236a522b2e0add0e28 21436 libdevel optional
libkiwix-dev_3.1.1-1_amd64.deb
23d480f27e7a6017047f15b41321b84b 2348968 debug optional
libkiwix3-dbgsym_3.1.1-1_amd64.deb
978eff51c0653dfaed57e06a5c156e0c 137936 libs optional
libkiwix3_3.1.1-1_amd64.deb
c20c8e0e899cc1a97087c57a05e1916c 7367 libs optional
libkiwix_3.1.1-1_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQJHBAEBCgAxFiEE+h6fmkHn9DUCyl1jUvyOe+23/KIFAlw4FAsTHGxlZ29rdG1A
ZGViaWFuLm9yZwAKCRBS/I577bf8ooQZEACKhAchQirz0Kl6uNpqEfodpEXIsC9V
SRmb8HHMiZeeMpxN3M8Km86n//1ktX2/zMvsxDk4EJcB1aXfli8ijdKVMVxHYvYf
nzk+KCznqww3vzFAwNR5+0o8oKRNXwbwKU+56BLPnT/TjnG76qtHXFIYejWOsZ16
cImpVMn3YvOeKThJJUMB/GnSK7miJs+YkuOY9fU6x/EiZTKUg2zaK7wzmBrZT8dM
++Jkjx1u21mlTzKxVt8KAh8GyX9sjlwlI5G6aNvD9Dutf52Red89YGc6jI8DnzE/
50EUbFl7zH/XxXETVBCS9CApn1ztYK8nIBwjickGy1mSKcZz/m5s03xCatnl/qGV
UKlj9NZbmFnSW37SaWry519epWjaidl01boQp4NYpqrBpv8/aNuW4LtB9B/iF+wK
d/p0Nc09RsHFmPlOaYnD20TLhfPstK4YhspdjvVw4ahasRWhGAFd/HuFeScx4ES3
oQ2gPnZ0fqMKIFTC8a5lVHG3yqf3eV2s5tXsmaSEsg0xUU7vW26B4f3d4Qs5Tzyh
31Wc5Ntu+vF8mCuQiPiDo+VppNwHvh/GIJdxz57dBNGktvocU4OGahKt7BUP5Whz
ONN/57pXS/yXtq78TAUwoxmEZnSMHloaqJoBBG66p6pG8MMq1zpGPl/8v+J51jnI
qkQFdnO1YKbtmg==
=p4AK
-----END PGP SIGNATURE-----
--- End Message ---
