[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.0-1-37-g829510c

[Didier Raboud]

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

The following commit has been merged in the experimental branch:
commit 829510c9c6f01716b8c8eb91871a4c587a6e62d9
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Wed Apr 25 14:20:30 2012 +0200

    Add qt-multiarch-import-path-compat.diff - include legacy pre-multiarch qml import path.
    
    Reviewed-by: Didier Raboud <odyx at debian.org>
---
 debian/changelog                                   |    2 +
 .../patches/qt-multiarch-import-path-compat.diff   |   34 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 37 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4c92380..0152bb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,8 @@ qt4-x11 (4:4.8.1-0r1) UNRELEASED; urgency=low
     no longer uses phonon anyway.
   * Build the documentation in the dh_auto_build-indep target instead of
     dh_auto_install.
+  * Add qt-multiarch-import-path-compat.diff - include legacy pre-multiarch qml
+    import path.
 
   [ Didier Raboud ]
   * Merge the 4:4.7.4-3 unstable release: drop fix-format.diff, merged
diff --git a/debian/patches/qt-multiarch-import-path-compat.diff b/debian/patches/qt-multiarch-import-path-compat.diff
new file mode 100644
index 0000000..f41cf38
--- /dev/null
+++ b/debian/patches/qt-multiarch-import-path-compat.diff
@@ -0,0 +1,34 @@
+Description: include legacy pre-multiarch qml import path
+ A full multiarch system requires an architecture-qualified qml import path for
+ Qt, but installed systems may still have qml imports (e.g., from other
+ distribution packages) in another pre-multiarch directory.  When constructing
+ the import path, include both the configured import path and an import path
+ with the architecture triplet stripped out.
+Author: Felix Geyer <debfx-pkg at fobos.de>
+Last-Update: 2012-04-25
+
+--- a/src/declarative/qml/qdeclarativeimport.cpp	2012-03-14 15:01:13.000000000 +0100
++++ b/src/declarative/qml/qdeclarativeimport.cpp	2012-04-17 15:13:10.811520930 +0200
+@@ -751,6 +751,22 @@
+         addImportPath(installImportsPath);
+     }
+ #else
++    QStringList dirnames = installImportsPath.split(QLatin1Char('/'), QString::SkipEmptyParts);
++    if (dirnames[0] == QLatin1String("usr") && dirnames[1] == QLatin1String("lib") && dirnames[3] == QLatin1String("qt4"))
++    {
++        QString pathSep("/");
++        QString legacyImportPath = pathSep;
++        int i = 0;
++        for (QStringList::const_iterator it = dirnames.constBegin(); it != dirnames.constEnd(); ++it) {
++            if (++i == 3)
++                continue;
++            legacyImportPath = legacyImportPath + *it + pathSep;
++        }
++        if (QFile::exists(legacyImportPath)) {
++            addImportPath(legacyImportPath);
++        }
++    }
++
+     addImportPath(installImportsPath);
+ #endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index de7c2ce..1d5ce14 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -40,6 +40,7 @@ sh.diff
 kfreebsd_monotonic_clock.diff
 powerpc_designer_gstabs.diff
 qt-multiarch-plugin-path-compat.diff
+qt-multiarch-import-path-compat.diff
 fix_qvfb_build.patch
 s390x_jscore.diff
 add_missing_method_for_QBasicAtomicPointer_on_s390.patch

-- 
Qt 4 packaging