slackware-current/source/l/qt/patches/qt-everywhere-opensource-src-4.8.3-icu_no_debug.patch
Patrick J Volkerding 125048ad7d Sat May 4 01:29:20 UTC 2019
d/gcc-9.1.0-x86_64-1.txz:  Upgraded.
d/gcc-brig-9.1.0-x86_64-1.txz:  Upgraded.
d/gcc-g++-9.1.0-x86_64-1.txz:  Upgraded.
d/gcc-gfortran-9.1.0-x86_64-1.txz:  Upgraded.
d/gcc-gnat-9.1.0-x86_64-1.txz:  Upgraded.
d/gcc-go-9.1.0-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
d/gcc-objc-9.1.0-x86_64-1.txz:  Upgraded.
d/libtool-2.4.6-x86_64-11.txz:  Rebuilt.
  Recompiled to update embedded GCC version number.
d/llvm-8.0.0-x86_64-2.txz:  Rebuilt.
  Recompiled with -DLLVM_INSTALL_UTILS=ON. Thanks to Lockywolf.
d/swig-4.0.0-x86_64-1.txz:  Upgraded.
l/glib2-2.60.2-x86_64-1.txz:  Upgraded.
l/qt-4.8.7-x86_64-13.txz:  Rebuilt.
  Patched to fix FTBFS with gcc9 (also fixes FTBFS with qtscriptgenerator and
  possibly other projects that use qt4).
2019-05-04 08:59:47 +02:00

23 lines
1.2 KiB
Diff

diff -up qt-everywhere-opensource-src-4.8.3/src/corelib/tools/qlocale_icu.cpp.icu_no_debug qt-everywhere-opensource-src-4.8.3/src/corelib/tools/qlocale_icu.cpp
--- qt-everywhere-opensource-src-4.8.3/src/corelib/tools/qlocale_icu.cpp.icu_no_debug 2012-09-06 02:33:45.000000000 -0500
+++ qt-everywhere-opensource-src-4.8.3/src/corelib/tools/qlocale_icu.cpp 2012-09-11 09:04:21.542379795 -0500
@@ -84,7 +84,9 @@ bool qt_initIcu(const QString &localeStr
QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT));
lib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
if (!lib.load()) {
+#ifndef QT_NO_DEBUG
qWarning() << "Unable to load library icui18n" << lib.errorString();
+#endif
status = ErrorLoading;
return false;
}
@@ -114,7 +116,9 @@ bool qt_initIcu(const QString &localeStr
QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT));
ucLib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
if (!ucLib.load()) {
+#ifndef QT_NO_DEBUG
qWarning() << "Unable to load library icuuc" << ucLib.errorString();
+#endif
status = ErrorLoading;
return false;
}