packages: qt4/qt4-locale.patch - updated for 4.7
shadzik
shadzik at pld-linux.org
Tue Sep 21 21:44:57 CEST 2010
Author: shadzik Date: Tue Sep 21 19:44:57 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated for 4.7
---- Files affected:
packages/qt4:
qt4-locale.patch (1.14 -> 1.15)
---- Diffs:
================================================================
Index: packages/qt4/qt4-locale.patch
diff -u packages/qt4/qt4-locale.patch:1.14 packages/qt4/qt4-locale.patch:1.15
--- packages/qt4/qt4-locale.patch:1.14 Wed Dec 2 15:53:33 2009
+++ packages/qt4/qt4-locale.patch Tue Sep 21 21:44:52 2010
@@ -1,128 +1,3 @@
-diff -Nur qt-x11-opensource-src-4.2.1.orig/src/corelib/kernel/qtranslator.cpp qt-x11-opensource-src-4.2.1.chng/src/corelib/kernel/qtranslator.cpp
---- qt-x11-opensource-src-4.2.1.orig/src/corelib/kernel/qtranslator.cpp 2006-10-20 17:35:15.000000000 +0200
-+++ qt-x11-opensource-src-4.2.1.chng/src/corelib/kernel/qtranslator.cpp 2006-11-28 14:17:12.000000000 +0100
-@@ -37,6 +37,7 @@
- #include "qalgorithms.h"
- #include "qhash.h"
- #include "qtranslator_p.h"
-+#include <qlibraryinfo.h>
-
- #if defined(Q_OS_UNIX)
- #define QT_USE_MMAP
-@@ -377,33 +378,72 @@
- QString delims;
- delims = search_delimiters.isNull() ? QString::fromLatin1("_.") : search_delimiters;
-
-- for (;;) {
-- QFileInfo fi;
--
-- realname = prefix + fname + (suffix.isNull() ? QString::fromLatin1(".qm") : suffix);
-- fi.setFile(realname);
-- if (fi.isReadable())
-- break;
--
-- realname = prefix + fname;
-- fi.setFile(realname);
-- if (fi.isReadable())
-- break;
-+ if (directory == QLibraryInfo::location(QLibraryInfo::TranslationsPath)) {
-+ QString locale;
-+ int idelim = 0, leftmost;
-+
-+ for (;;) {
-+ leftmost = filename.size();
-+ for (int i = 0; i < (int)delims.length(); i++) {
-+ int k = filename.indexOf(delims[i], idelim);
-+ if ((k > 0)&&(k < leftmost))
-+ leftmost = k;
-+ }
-+
-+ if (leftmost == filename.size())
-+ return false;
-+
-+ idelim = leftmost + 1;
-+ fname = filename.left(leftmost);
-+ locale = filename.mid(leftmost+1);
-+
-+ while (!locale.isEmpty()) {
-+ QFileInfo fi;
-+ realname = prefix + locale + QString::fromLatin1("/LC_MESSAGES/") + fname + QString::fromLatin1(".qm");
-+
-+ fi.setFile(realname);
-+ if (fi.isReadable())
-+ break;
-+
-+ int rightmost = 0;
-+ for (int i = 0; i < (int)delims.length(); i++) {
-+ int k = locale.lastIndexOf(delims[i]);
-+ if (k > rightmost)
-+ rightmost = k;
-+ }
-+ locale.truncate(rightmost);
-+ }
-+ if (!locale.isEmpty())
-+ break;
-+ }
-+ } else {
-+ for (;;) {
-+ QFileInfo fi;
-+
-+ realname = prefix + fname + (suffix.isNull() ? QString::fromLatin1(".qm") : suffix);
-+ fi.setFile(realname);
-+ if (fi.isReadable())
-+ break;
-+
-+ realname = prefix + fname;
-+ fi.setFile(realname);
-+ if (fi.isReadable())
-+ break;
-+
-+ int rightmost = 0;
-+ for (int i = 0; i < (int)delims.length(); i++) {
-+ int k = fname.lastIndexOf(delims[i]);
-+ if (k > rightmost)
-+ rightmost = k;
-+ }
-+
-+ // no truncations? fail
-+ if (rightmost == 0)
-+ return false;
-
-- int rightmost = 0;
-- for (int i = 0; i < (int)delims.length(); i++) {
-- int k = fname.lastIndexOf(delims[i]);
-- if (k > rightmost)
-- rightmost = k;
-+ fname.truncate(rightmost);
- }
--
-- // no truncations? fail
-- if (rightmost == 0)
-- return false;
--
-- fname.truncate(rightmost);
- }
--
- // realname is now the fully qualified name of a readable file.
-
- bool ok = false;
-diff -Nur qt-x11-opensource-src-4.2.1.orig/tools/assistant/compat/main.cpp qt-x11-opensource-src-4.2.1.chng/tools/assistant/main.cpp
---- qt-x11-opensource-src-4.2.1.orig/tools/assistant/compat/main.cpp 2006-10-20 17:35:28.000000000 +0200
-+++ qt-x11-opensource-src-4.2.1.chng/tools/assistant/compat/main.cpp 2006-11-28 14:23:03.000000000 +0100
-@@ -310,11 +310,11 @@
- resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
-
- QTranslator translator( 0 );
-- translator.load( QLatin1String("assistant_adp_") + QLocale::system().name(), resourceDir );
-+ translator.load( QLatin1String("qt4-assistant_adp_") + QLocale::system().name(), resourceDir );
- a.installTranslator( &translator );
-
- QTranslator qtTranslator( 0 );
-- qtTranslator.load( QLatin1String("qt_") + QLocale::system().name(), resourceDir );
-+ qtTranslator.load( QLatin1String("qt4_") + QLocale::system().name(), resourceDir );
- a.installTranslator( &qtTranslator );
-
- Config *conf = Config::loadConfig( profileName );
diff -Nur qt-x11-opensource-src-4.2.1.orig/tools/designer/src/designer/qdesigner.cpp qt-x11-opensource-src-4.2.1.chng/tools/designer/src/designer/qdesigner.cpp
--- qt-x11-opensource-src-4.2.1.orig/tools/designer/src/designer/qdesigner.cpp 2006-10-20 17:35:40.000000000 +0200
+++ qt-x11-opensource-src-4.2.1.chng/tools/designer/src/designer/qdesigner.cpp 2006-11-28 14:22:20.000000000 +0100
@@ -155,3 +30,110 @@
app.installTranslator(&qtTranslator);
else
app.removeTranslator(&translator);
+--- qt-everywhere-opensource-src-4.7.0/src/corelib/kernel/qtranslator.cpp.orig 2010-09-10 11:05:25.000000000 +0200
++++ qt-everywhere-opensource-src-4.7.0/src/corelib/kernel/qtranslator.cpp 2010-09-21 21:36:42.645202096 +0200
+@@ -55,6 +55,7 @@
+ #include "qalgorithms.h"
+ #include "qhash.h"
+ #include "qtranslator_p.h"
++#include <qlibraryinfo.h>
+
+ #if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
+ #define QT_USE_MMAP
+@@ -407,31 +408,71 @@
+ QString delims;
+ delims = search_delimiters.isNull() ? QString::fromLatin1("_.") : search_delimiters;
+
+- for (;;) {
+- QFileInfo fi;
+-
+- realname = prefix + fname + (suffix.isNull() ? QString::fromLatin1(".qm") : suffix);
+- fi.setFile(realname);
+- if (fi.isReadable() && fi.isFile())
+- break;
+-
+- realname = prefix + fname;
+- fi.setFile(realname);
+- if (fi.isReadable() && fi.isFile())
+- break;
+-
+- int rightmost = 0;
+- for (int i = 0; i < (int)delims.length(); i++) {
+- int k = fname.lastIndexOf(delims[i]);
+- if (k > rightmost)
+- rightmost = k;
+- }
+-
+- // no truncations? fail
+- if (rightmost == 0)
+- return false;
+-
+- fname.truncate(rightmost);
++ if (directory == QLibraryInfo::location(QLibraryInfo::TranslationsPath)) {
++ QString locale;
++ int idelim = 0, leftmost;
++
++ for (;;) {
++ leftmost = filename.size();
++ for (int i = 0; i < (int)delims.length(); i++) {
++ int k = filename.indexOf(delims[i], idelim);
++ if ((k > 0)&&(k < leftmost))
++ leftmost = k;
++ }
++
++ if (leftmost == filename.size())
++ return false;
++
++ idelim = leftmost + 1;
++ fname = filename.left(leftmost);
++ locale = filename.mid(leftmost+1);
++
++ while (!locale.isEmpty()) {
++ QFileInfo fi;
++ realname = prefix + locale + QString::fromLatin1("/LC_MESSAGES/") + fname + QString::fromLatin1(".qm");
++
++ fi.setFile(realname);
++ if (fi.isReadable())
++ break;
++
++ int rightmost = 0;
++ for (int i = 0; i < (int)delims.length(); i++) {
++ int k = locale.lastIndexOf(delims[i]);
++ if (k > rightmost)
++ rightmost = k;
++ }
++ locale.truncate(rightmost);
++ }
++ if (!locale.isEmpty())
++ break;
++ }
++ } else {
++ for (;;) {
++ QFileInfo fi;
++
++ realname = prefix + fname + (suffix.isNull() ? QString::fromLatin1(".qm") : suffix);
++ fi.setFile(realname);
++ if (fi.isReadable())
++ break;
++
++ realname = prefix + fname;
++ fi.setFile(realname);
++ if (fi.isReadable())
++ break;
++
++ int rightmost = 0;
++ for (int i = 0; i < (int)delims.length(); i++) {
++ int k = fname.lastIndexOf(delims[i]);
++ if (k > rightmost)
++ rightmost = k;
++ }
++
++ // no truncations? fail
++ if (rightmost == 0)
++ return false;
++
++ fname.truncate(rightmost);
++ }
+ }
+
+ // realname is now the fully qualified name of a readable file.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt4/qt4-locale.patch?r1=1.14&r2=1.15&f=u
More information about the pld-cvs-commit
mailing list