rpms
/
qt
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't spam if libicu is not present at runtime (#759923)

This commit is contained in:
Rex Dieter 2011-12-20 10:23:10 -06:00
parent 41cb7e3491
commit 76de2fcf22
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
qt-everywhere-opensource-src-4.8.0-icu_no_spam.patch Normal file
View File

@ -0,0 +1,21 @@
diff -up qt-everywhere-opensource-src-4.8.0/src/corelib/tools/qlocale_icu.cpp.icu_no_spam qt-everywhere-opensource-src-4.8.0/src/corelib/tools/qlocale_icu.cpp
--- qt-everywhere-opensource-src-4.8.0/src/corelib/tools/qlocale_icu.cpp.icu_no_spam 2011-12-07 23:06:03.000000000 -0600
+++ qt-everywhere-opensource-src-4.8.0/src/corelib/tools/qlocale_icu.cpp 2011-12-20 10:20:19.659502966 -0600
@@ -83,7 +83,7 @@ bool qt_initIcu(const QString &localeStr
// resolve libicui18n
QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT));
if (!lib.load()) {
- qWarning() << "Unable to load library icui18n" << lib.errorString();
+ // qWarning() << "Unable to load library icui18n" << lib.errorString();
status = ErrorLoading;
return false;
}
@@ -112,7 +112,7 @@ bool qt_initIcu(const QString &localeStr
// resolve libicuuc
QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT));
if (!ucLib.load()) {
- qWarning() << "Unable to load library icuuc" << ucLib.errorString();
+ // qWarning() << "Unable to load library icuuc" << ucLib.errorString();
status = ErrorLoading;
return false;
}

9
qt.spec
View File

@ -11,7 +11,7 @@ Summary: Qt toolkit
Name: qt
Epoch: 1
Version: 4.8.0
Release: 2%{?dist}
Release: 3%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
@ -97,6 +97,9 @@ Patch75: qt-ppc64-crash.patch
# add missing method for QBasicAtomicPointer on s390(x)
Patch76: qt-everywhere-opensource-src-4.8.0-s390-atomic.patch
# don't spam if libicu is not present at runtime
Patch77: qt-everywhere-opensource-src-4.8.0-icu_no_spam.patch
# upstream patches
# security patches
@ -424,6 +427,7 @@ popd
%patch74 -p1 -b .tds_no_strict_aliasing
%patch75 -p1 -b .ppc64-crash
%patch76 -p1 -b .s390-atomic
%patch77 -p1 -b .icu_no_spam
# upstream patches
@ -1050,6 +1054,9 @@ fi
%changelog
* Tue Dec 20 2011 Rex Dieter <rdieter@fedoraproject.org> 4.8.0-3
- don't spam if libicu is not present at runtime (#759923)
* Mon Dec 19 2011 Dan Horák <dan[at]dannu.cz> 4.8.0-2
- add missing method for QBasicAtomicPointer on s390(x)