[SCM] Qt 4 Debian packaging branch, master, updated. debian/4.6.0-1-39-g0ee2b08

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 0ee2b084d8d5b2e772883b0a1abafb0e1ecc3f86
Author: Fathi Boudra <fabo at debian.org>
Date:   Sun Jan 31 11:52:25 2010 +0100

    Merge with kubuntu: add 21_qt_ia32_library_path.diff patch.
---
 debian/changelog                            |    3 +
 debian/patches/21_qt_ia32_library_path.diff |   78 +++++++++++++++++++++++++++
 debian/patches/series                       |    1 +
 3 files changed, 82 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 63baa92..1d676a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,9 @@ qt4-x11 (4:4.6.1-1) UNRELEASED; urgency=low
   * Remove patches:
     - 19_install_qdoc3.diff - merged upstream.
     - 81_hurd_clock_gettime.diff - merged upstream.
+  * Merge with Kubuntu:
+    - add 21_qt_ia32_library_path.diff patch
+      fix ia32 library path (e.g. skype application).
   * Update debian/control:
     - build-depend on firebird2.1-dev instead of firebird2.0-dev.
       (Closes: #564683)
diff --git a/debian/patches/21_qt_ia32_library_path.diff b/debian/patches/21_qt_ia32_library_path.diff
new file mode 100644
index 0000000..7e1a377
--- /dev/null
+++ b/debian/patches/21_qt_ia32_library_path.diff
@@ -0,0 +1,78 @@
+Description: fix ia32 library path (e.g. skype application)
+Forwarded: not-needed
+Origin: kubuntu, http://bazaar.launchpad.net/~kubuntu-members/qt/ubuntu/annotate/head:/debian/patches/kubuntu_04_qt_ia32_library_path.patch
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ia32-libs/+bug/353704
+Author: Bo Thorsen <bo at sonofthor.dk>
+
+--- a/src/corelib/global/qlibraryinfo.cpp
++++ b/src/corelib/global/qlibraryinfo.cpp
+@@ -64,6 +64,10 @@ QT_END_NAMESPACE
+ 
+ #include "qconfig.cpp"
+ 
++#if defined(__linux__) && defined (__i386__)
++  #include <sys/utsname.h>
++#endif
++
+ QT_BEGIN_NAMESPACE
+ 
+ #ifndef QT_NO_SETTINGS
+@@ -213,6 +217,22 @@ QLibraryInfo::buildKey()
+     return QString::fromLatin1(QT_BUILD_KEY);
+ }
+ 
++static inline QString fixLibraryPath32(const QString& path)
++{
++#if defined(__linux__) && defined (__i386__)
++    struct utsname uts;
++
++    uname(&uts);
++    if (!strcmp("x86_64", uts.machine) && (path.startsWith("/usr/lib/")))
++    {
++        QString newPath = "/usr/lib32/" + path.mid(8);
++        if (QFileInfo(newPath).isDir())
++            return newPath;
++    }
++#endif
++    return path;
++}
++
+ /*!
+     \since 4.6
+     Returns the installation date for this build of Qt. The install date will
+@@ -432,7 +452,7 @@ QLibraryInfo::location(LibraryLocation l
+         if (loc == PrefixPath) {
+             // we make the prefix path absolute to the executable's directory
+ #ifdef BOOTSTRAPPING
+-            return QFileInfo(qmake_libraryInfoFile()).absolutePath();
++            return fixLibraryPath32(QFileInfo(qmake_libraryInfoFile()).absolutePath());
+ #else
+             if (QCoreApplication::instance()) {
+ #ifdef Q_OS_MAC
+@@ -441,21 +461,21 @@ QLibraryInfo::location(LibraryLocation l
+                     QCFType<CFURLRef> urlRef = CFBundleCopyBundleURL(bundleRef);
+                     if (urlRef) {
+                         QCFString path = CFURLCopyFileSystemPath(urlRef, kCFURLPOSIXPathStyle);
+-                        return QDir::cleanPath(path + QLatin1String("/Contents/") + ret);
++                        return fixLibraryPath32(QDir::cleanPath(path + QLatin1String("/Contents/") + ret));
+                     }
+                 }
+ #endif
+-                return QDir(QCoreApplication::applicationDirPath()).absoluteFilePath(ret);
++                return fixLibraryPath32(QDir(QCoreApplication::applicationDirPath()).absoluteFilePath(ret));
+             } else {
+-                return QDir::current().absoluteFilePath(ret);
++                return fixLibraryPath32(QDir::current().absoluteFilePath(ret));
+             }
+ #endif
+         } else {
+             // we make any other path absolute to the prefix directory
+-            return QDir(location(PrefixPath)).absoluteFilePath(ret);
++            return fixLibraryPath32(QDir(location(PrefixPath)).absoluteFilePath(ret));
+         }
+     }
+-    return ret;
++    return fixLibraryPath32(ret);
+ }
+ 
+ /*!
diff --git a/debian/patches/series b/debian/patches/series
index 1a3a4b7..0218507 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,6 +23,7 @@
 17_add_postgresql_8.3_support.diff
 18_enable_qt3support_qtwebkit_debug_info.diff
 20_install_qvfb.diff
+21_qt_ia32_library_path.diff
 30_webkit_unaligned_access.diff
 40_alpha_ice.diff
 41_disable_opengl_visibility.diff

-- 
Qt 4 Debian packaging