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

[Pino Toscano]

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

The following commit has been merged in the experimental branch:
commit 8bf0f270dda904b9d98e38735f37d6b8f58462f8
Author: Pino Toscano <pino at debian.org>
Date:   Sun Apr 29 18:46:51 2012 +0200

    fold qt-multiarch-import-path-compat.diff into qt-multiarch-plugin-path-compat.diff
---
 debian/changelog                                   |    2 +-
 .../patches/qt-multiarch-import-path-compat.diff   |   34 ------------------
 .../patches/qt-multiarch-plugin-path-compat.diff   |   36 ++++++++++++++++---
 debian/patches/series                              |    1 -
 4 files changed, 31 insertions(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 92c8b56..c8b528f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,7 +29,7 @@ qt4-x11 (4:4.8.1-0r1) UNRELEASED; urgency=low
   * Fix hyphen-used-as-minus-sign lintian warnings.
   * 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
+  * qt-multiarch-plugin-path-compat.diff: include legacy pre-multiarch qml
     import path.
 
   [ Didier Raboud ]
diff --git a/debian/patches/qt-multiarch-import-path-compat.diff b/debian/patches/qt-multiarch-import-path-compat.diff
deleted file mode 100644
index f41cf38..0000000
--- a/debian/patches/qt-multiarch-import-path-compat.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-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/qt-multiarch-plugin-path-compat.diff b/debian/patches/qt-multiarch-plugin-path-compat.diff
index c2250c1..bd72a6a 100644
--- a/debian/patches/qt-multiarch-plugin-path-compat.diff
+++ b/debian/patches/qt-multiarch-plugin-path-compat.diff
@@ -1,15 +1,14 @@
-Description: include legacy pre-multiarch plugin path
+Description: include legacy pre-multiarch plugin paths
  A full multiarch system requires an architecture-qualified plugin path for
  Qt, but installed systems may still have plugins (e.g., from other
  distribution packages) in another pre-multiarch directory.  When constructing
  the plugin path, include both the configured plugin path and a plugin path
  with the architecture triplet stripped out.
+ .
+ This applies to the general plugin loading system, and to the QML one.
 Author: Steve Langasek <steve.langasek at ubuntu.com>
-Last-Update: 2011-09-23
-
----
- src/corelib/kernel/qcoreapplication.cpp |   17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
+Author: Felix Geyer <debfx-pkg at fobos.de>
+Last-Update: 2012-04-25
 
 --- a/src/corelib/kernel/qcoreapplication.cpp
 +++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -37,3 +36,28 @@ Last-Update: 2011-09-23
  #endif
  
          // If QCoreApplication is not yet instantiated,
+--- 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 1d5ce14..de7c2ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -40,7 +40,6 @@ 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