jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

qt: remove dependency on icu

Browse source 
I can't fix the build with icu-62.1 so remove the dependency and
configure with '-no-icu' to keep qt4 alive for some more time.

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
This commit is contained in:
Jürgen Buchmüller 2018-10-23 12:20:50 +02:00
parent f0638c727a
commit 3e23b4b7f5
No known key found for this signature in database
GPG key ID: 6764EC32352D0647
2 changed files with 5 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
srcpkgs/qt/patches/qt4-icu59.patch
View file

@ -1,40 +0,0 @@
--- 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);
}

9
srcpkgs/qt/template
View file

@ -15,13 +15,13 @@ checksum=e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
hostmakedepends="perl sqlite pkg-config"
makedepends="
MesaLib-devel libressl-devel unixodbc-devel libXv-devel libXinerama-devel
libXrandr-devel libXcursor-devel glib-devel icu-devel cups-devel sqlite-devel
libXrandr-devel libXcursor-devel glib-devel cups-devel sqlite-devel
alsa-lib-devel libmng-devel libSM-devel gtk+-devel libnotify-devel
libmysqlclient-devel postgresql-libs-devel pulseaudio-devel tslib-devel"
depends="qtchooser hicolor-icon-theme icu-libs"
depends="qtchooser hicolor-icon-theme"
replaces="qt-qtconfig>=0"
CXXFLAGS="-std=gnu++98 -Wno-deprecated -fno-delete-null-pointer-checks -fno-lifetime-dse"
CXXFLAGS="-std=gnu++98 -Wno-deprecated -fno-delete-null-pointer-checks -fno-lifetime-dse -Wno-class-memaccess"
if [ -n "$CROSS_BUILD" ]; then
hostmakedepends+=" qt-qmake qt-host-tools"
@ -183,6 +183,7 @@ _EOF
_opts+=" -system-sqlite"
_opts+=" -shared"
_opts+=" -graphicssystem raster"
_opts+=" -no-icu"
_opts+=" -no-openvg"
_opts+=" -no-phonon"
_opts+=" -no-phonon-backend"
@ -347,7 +348,7 @@ qt-devel-tools_package() {
}
}
qt-devel_package() {
depends="qt-qmake qt-devel-tools qt-host-tools libX11-devel icu-devel qt>=${version}_${revision}"
depends="qt-qmake qt-devel-tools qt-host-tools libX11-devel qt>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
for f in lrelease lupdate moc qdbuscpp2xml qdbusxml2cpp qt3to4 \