qt: fix for icu59
This commit is contained in:
parent
271222cc62
commit
c1df07bfc3
2 changed files with 41 additions and 1 deletions
40
srcpkgs/qt/patches/qt4-icu59.patch
Normal file
40
srcpkgs/qt/patches/qt4-icu59.patch
Normal file
|
@ -0,0 +1,40 @@
|
||||||
|
--- qt-everywhere-opensource-src-4.8.7/src/corelib/tools/qlocale_icu.cpp~ 2017-04-25 07:42:22.000000000 +0000
|
||||||
|
+++ qt-everywhere-opensource-src-4.8.7/src/corelib/tools/qlocale_icu.cpp 2017-04-25 07:44:34.675363008 +0000
|
||||||
|
@@ -43,6 +43,8 @@
|
||||||
|
#include "qlibrary.h"
|
||||||
|
#include "qdebug.h"
|
||||||
|
|
||||||
|
+#define UCHAR_TYPE unsigned short
|
||||||
|
+
|
||||||
|
#include "unicode/uversion.h"
|
||||||
|
#include "unicode/ucol.h"
|
||||||
|
|
||||||
|
--- qt-everywhere-opensource-src-4.8.7/src/corelib/tools/qstring.cpp 2015-05-07 16:14:48.000000000 +0200
|
||||||
|
+++ qt-everywhere-opensource-src-4.8.7/src/corelib/tools/qstring.cpp 2017-05-04 04:26:21.101965075 +0200
|
||||||
|
@@ -6773,7 +6773,7 @@
|
||||||
|
QString locale_arg;
|
||||||
|
if (d.locale_occurrences > 0) {
|
||||||
|
QLocale locale;
|
||||||
|
- if (!locale.numberOptions() & QLocale::OmitGroupSeparator)
|
||||||
|
+ if (~locale.numberOptions() & QLocale::OmitGroupSeparator)
|
||||||
|
flags |= QLocalePrivate::ThousandsGroup;
|
||||||
|
locale_arg = locale.d()->longLongToString(a, -1, base, fieldWidth, flags);
|
||||||
|
}
|
||||||
|
@@ -6817,7 +6817,7 @@
|
||||||
|
QString locale_arg;
|
||||||
|
if (d.locale_occurrences > 0) {
|
||||||
|
QLocale locale;
|
||||||
|
- if (!locale.numberOptions() & QLocale::OmitGroupSeparator)
|
||||||
|
+ if (~locale.numberOptions() & QLocale::OmitGroupSeparator)
|
||||||
|
flags |= QLocalePrivate::ThousandsGroup;
|
||||||
|
locale_arg = locale.d()->unsLongLongToString(a, -1, base, fieldWidth, flags);
|
||||||
|
}
|
||||||
|
@@ -6952,7 +6952,7 @@
|
||||||
|
if (d.locale_occurrences > 0) {
|
||||||
|
QLocale locale;
|
||||||
|
|
||||||
|
- if (!locale.numberOptions() & QLocale::OmitGroupSeparator)
|
||||||
|
+ if (~locale.numberOptions() & QLocale::OmitGroupSeparator)
|
||||||
|
flags |= QLocalePrivate::ThousandsGroup;
|
||||||
|
locale_arg = locale.d()->doubleToString(a, prec, form, fieldWidth, flags);
|
||||||
|
}
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'qt'
|
# Template file for 'qt'
|
||||||
pkgname=qt
|
pkgname=qt
|
||||||
version=4.8.7
|
version=4.8.7
|
||||||
revision=22
|
revision=23
|
||||||
_distname=qt-everywhere-opensource-src
|
_distname=qt-everywhere-opensource-src
|
||||||
patch_args="-Np1"
|
patch_args="-Np1"
|
||||||
wrksrc=${_distname}-${version}
|
wrksrc=${_distname}-${version}
|
||||||
|
|
Loading…
Reference in a new issue