[SCM] Qt 4 Debian packaging branch, master, updated. debian/4.6.0-1-61-gd6caf6f
Fathi Boudra
fabo at alioth.debian.org
Thu Feb 4 10:54:00 UTC 2010
The following commit has been merged in the master branch:
commit d6caf6f99a3d18b391b99053e4a499c2708e589a
Author: Fathi Boudra <fabo at kde.org>
Date: Thu Feb 4 11:52:56 2010 +0100
Fix qt_ia32_library_path patch: use QLatin1String.
Thanks to Alessandro Ghersi.
---
debian/patches/21_qt_ia32_library_path.diff | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/patches/21_qt_ia32_library_path.diff b/debian/patches/21_qt_ia32_library_path.diff
index 2344e4d..50ed914 100644
--- a/debian/patches/21_qt_ia32_library_path.diff
+++ b/debian/patches/21_qt_ia32_library_path.diff
@@ -27,9 +27,9 @@ Author: Bo Thorsen <bo at sonofthor.dk>
+ struct utsname uts;
+
+ uname(&uts);
-+ if (!strcmp("x86_64", uts.machine) && (path.startsWith("/usr/lib/")))
++ if (!strcmp("x86_64", uts.machine) && (path.startsWith(QLatin1String("/usr/lib/"))))
+ {
-+ QString newPath = "/usr/lib32/" + path.mid(8);
++ QString newPath = QLatin1String("/usr/lib32/") + path.mid(8);
+ if (QFileInfo(newPath).isDir())
+ return newPath;
+ }
--
Qt 4 Debian packaging
More information about the pkg-kde-commits
mailing list