[SCM] Qt 4 packaging branch, master, updated. debian/4.8.1-1-8-ge896317

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=e896317

The following commit has been merged in the master branch:
commit e896317bbd03d9d0e1644e1a14cd427334f83f39
Author: Pino Toscano <pino at debian.org>
Date:   Mon May 21 22:20:52 2012 +0200

    disable the warnings about not being able to load ICU libraries (#673537)
---
 debian/changelog                      |    2 ++
 debian/patches/no_libicu_message.diff |   30 ++++++++++++++++++++++++++++++
 debian/patches/series                 |    1 +
 3 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f68c651..e469e77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ qt4-x11 (4:4.8.1-2) UNRELEASED; urgency=low
     ppc64; patch QElfParser-fix-type-of-sh_size.patch.
   * 07_trust_dpkg-arch_over_uname-m.diff: fix the hppa case (see bug #672825).
   * Suggest libicu48 in libqtcore4 for the optional locale functions.
+  * Disable the warnings about not being able to load ICU libraries;
+    patch no_libicu_message.diff. (together with the above it Closes: #673537)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 03 May 2012 21:58:22 +0200
 
diff --git a/debian/patches/no_libicu_message.diff b/debian/patches/no_libicu_message.diff
new file mode 100644
index 0000000..0aea3b4
--- /dev/null
+++ b/debian/patches/no_libicu_message.diff
@@ -0,0 +1,30 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Disable the warnings about not being able to dlopen ICU libraries.
+ Most of the applications don't need ICU-based functions for locale-aware
+ string upper- and lower-casing and comparison. If not present, Qt will use the
+ own ways (i.e. those used also in Qt < 4.8).
+Last-Update: 2012-05-21
+Forwarded: not-needed
+
+--- a/src/corelib/tools/qlocale_icu.cpp
++++ b/src/corelib/tools/qlocale_icu.cpp
+@@ -83,7 +83,9 @@
+         // resolve libicui18n
+         QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT));
+         if (!lib.load()) {
++#if 0
+             qWarning() << "Unable to load library icui18n" << lib.errorString();
++#endif
+             status = ErrorLoading;
+             return false;
+         }
+@@ -112,7 +114,9 @@
+         // resolve libicuuc
+         QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT));
+         if (!ucLib.load()) {
++#if 0
+             qWarning() << "Unable to load library icuuc" << ucLib.errorString();
++#endif
+             status = ErrorLoading;
+             return false;
+         }
diff --git a/debian/patches/series b/debian/patches/series
index 2f05347..41201cf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -47,3 +47,4 @@ add_missing_method_for_QBasicAtomicPointer_on_s390.patch
 CVE-2011-3922.patch
 qt_atomic_sparc64.patch
 gcc-4.7.diff
+no_libicu_message.diff

-- 
Qt 4 packaging