mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

Fix build breakage most probably caused by the last update of net/yaz.

Browse Source 
Submitted by:	pointyhat via kris
This commit is contained in:
Markus Brueffer 2007-01-12 11:08:49 +00:00
parent 3729a4e4e0
commit 832ffa796a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=182191
4 changed files with 90 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
misc/tellico-kde4/files/patch-src-fetch-z3950connection.cpp Normal file
View File

@ -0,0 +1,34 @@
--- src/fetch/z3950connection.cpp.orig Thu Jan 11 18:50:07 2007
+++ src/fetch/z3950connection.cpp Fri Jan 12 11:13:31 2007
@@ -340,16 +340,16 @@
inline
QCString Z3950Connection::toCString(const QString& text_) {
- return iconv(text_.utf8(), QString::fromLatin1("utf-8"), m_sourceCharSet);
+ return iConv(text_.utf8(), QString::fromLatin1("utf-8"), m_sourceCharSet);
}
inline
QString Z3950Connection::toString(const QCString& text_) {
- return QString::fromUtf8(iconv(text_, m_sourceCharSet, QString::fromLatin1("utf-8")));
+ return QString::fromUtf8(iConv(text_, m_sourceCharSet, QString::fromLatin1("utf-8")));
}
// static
-QCString Z3950Connection::iconv(const QCString& text_, const QString& fromCharSet_, const QString& toCharSet_) {
+QCString Z3950Connection::iConv(const QCString& text_, const QString& fromCharSet_, const QString& toCharSet_) {
#if HAVE_YAZ
if(text_.isEmpty()) {
return text_;
@@ -365,9 +365,9 @@
QString charSetLower = fromCharSet_.lower();
charSetLower.remove('-').remove(' ');
if(charSetLower == Latin1Literal("iso5426")) {
- return iconv(Iso5426Converter::toUtf8(text_).utf8(), QString::fromLatin1("utf-8"), toCharSet_);
+ return iConv(Iso5426Converter::toUtf8(text_).utf8(), QString::fromLatin1("utf-8"), toCharSet_);
} else if(charSetLower == Latin1Literal("iso6937")) {
- return iconv(Iso6937Converter::toUtf8(text_).utf8(), QString::fromLatin1("utf-8"), toCharSet_);
+ return iConv(Iso6937Converter::toUtf8(text_).utf8(), QString::fromLatin1("utf-8"), toCharSet_);
}
kdWarning() << "Z3950Fetcher::iconv() - conversion from " << fromCharSet_
<< " to " << toCharSet_ << " is unsupported" << endl;

11
misc/tellico-kde4/files/patch-src-fetch-z3950connection.h Normal file
View File

@ -0,0 +1,11 @@
--- src/fetch/z3950connection.h.orig Fri Jan 12 11:14:04 2007
+++ src/fetch/z3950connection.h Fri Jan 12 11:14:17 2007
@@ -85,7 +85,7 @@
void abort() { m_aborted = true; }
private:
- static QCString iconv(const QCString& text, const QString& fromCharSet, const QString& toCharSet);
+ static QCString iConv(const QCString& text, const QString& fromCharSet, const QString& toCharSet);
static QString toXML(const QCString& marc, const QString& fromCharSet);
bool makeConnection();

34
misc/tellico/files/patch-src-fetch-z3950connection.cpp Normal file
View File

@ -0,0 +1,34 @@
--- src/fetch/z3950connection.cpp.orig Thu Jan 11 18:50:07 2007
+++ src/fetch/z3950connection.cpp Fri Jan 12 11:13:31 2007
@@ -340,16 +340,16 @@
inline
QCString Z3950Connection::toCString(const QString& text_) {
- return iconv(text_.utf8(), QString::fromLatin1("utf-8"), m_sourceCharSet);
+ return iConv(text_.utf8(), QString::fromLatin1("utf-8"), m_sourceCharSet);
}
inline
QString Z3950Connection::toString(const QCString& text_) {
- return QString::fromUtf8(iconv(text_, m_sourceCharSet, QString::fromLatin1("utf-8")));
+ return QString::fromUtf8(iConv(text_, m_sourceCharSet, QString::fromLatin1("utf-8")));
}
// static
-QCString Z3950Connection::iconv(const QCString& text_, const QString& fromCharSet_, const QString& toCharSet_) {
+QCString Z3950Connection::iConv(const QCString& text_, const QString& fromCharSet_, const QString& toCharSet_) {
#if HAVE_YAZ
if(text_.isEmpty()) {
return text_;
@@ -365,9 +365,9 @@
QString charSetLower = fromCharSet_.lower();
charSetLower.remove('-').remove(' ');
if(charSetLower == Latin1Literal("iso5426")) {
- return iconv(Iso5426Converter::toUtf8(text_).utf8(), QString::fromLatin1("utf-8"), toCharSet_);
+ return iConv(Iso5426Converter::toUtf8(text_).utf8(), QString::fromLatin1("utf-8"), toCharSet_);
} else if(charSetLower == Latin1Literal("iso6937")) {
- return iconv(Iso6937Converter::toUtf8(text_).utf8(), QString::fromLatin1("utf-8"), toCharSet_);
+ return iConv(Iso6937Converter::toUtf8(text_).utf8(), QString::fromLatin1("utf-8"), toCharSet_);
}
kdWarning() << "Z3950Fetcher::iconv() - conversion from " << fromCharSet_
<< " to " << toCharSet_ << " is unsupported" << endl;

11
misc/tellico/files/patch-src-fetch-z3950connection.h Normal file
View File

@ -0,0 +1,11 @@
--- src/fetch/z3950connection.h.orig Fri Jan 12 11:14:04 2007
+++ src/fetch/z3950connection.h Fri Jan 12 11:14:17 2007
@@ -85,7 +85,7 @@
void abort() { m_aborted = true; }
private:
- static QCString iconv(const QCString& text, const QString& fromCharSet, const QString& toCharSet);
+ static QCString iConv(const QCString& text, const QString& fromCharSet, const QString& toCharSet);
static QString toXML(const QCString& marc, const QString& fromCharSet);
bool makeConnection();