Hello community,
here is the log from the commit of package libqt4 for openSUSE:Factory checked
in at 2017-05-18 20:44:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt4 (Old)
and /work/SRC/openSUSE:Factory/.libqt4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt4"
Thu May 18 20:44:07 2017 rev:220 rq:494381 version:4.8.7
Changes:
--------
libqt4-sql-plugins.changes: same change
--- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes 2017-03-09
01:28:06.467062864 +0100
+++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2017-05-18
20:44:08.862590720 +0200
@@ -1,0 +2,6 @@
+Wed May 10 09:04:37 UTC 2017 - fab...@ritter-vogt.de
+
+- Add fix-build-icu59.patch to fix building with ICU4C >= 59
+- Invoke configure with sh to fix build on some older distros
+
+-------------------------------------------------------------------
New:
----
fix-build-icu59.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
libqt4-sql-plugins.spec: same change
++++++ libqt4.spec ++++++
--- /var/tmp/diff_new_pack.gJWzJw/_old 2017-05-18 20:44:14.177840606 +0200
+++ /var/tmp/diff_new_pack.gJWzJw/_new 2017-05-18 20:44:14.181840042 +0200
@@ -144,6 +144,8 @@
Patch168: fix-gcc6-detection.diff
# PATCH-FIX-UPSTREAM fix-moc-parsing-with-glibc-2.25.patch -- Fixes moc
parsing correctly glibc 2.25 system headers
Patch169: fix-moc-parsing-with-glibc-2.25.patch
+# PATCH-FIX-OPENSUSE fix-build-icu59.patch -- Workaround C++11 requirement
+Patch170: fix-build-icu59.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define common_options --opensource -fast -no-separate-debug-info -shared
-xkb -openssl-linked -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama
-sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups
-stl -nis -system-zlib -prefix /usr -L %{_libdir} -libdir %{_libdir} -docdir
%_docdir/%{base_name} -examplesdir %{_libdir}/qt4/examples -demosdir
%{_libdir}/qt4/demos -plugindir %plugindir -translationdir
%{_datadir}/qt4/translations -iconv -sysconfdir /etc/settings -datadir
%{_datadir}/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib
-optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support
-no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle
@@ -457,6 +459,7 @@
%patch167 -p1
%patch168 -p1
%patch169 -p1
+%patch170 -p1
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts}
@@ -482,7 +485,7 @@
CHANGES=`stat --format="%y" %{SOURCE1}|cut --characters=1-10`
sed -i -e "s/qt_instdate=\$TODAY/qt_instdate=$CHANGES/" configure
-echo yes | ./configure %common_options $platform \
+echo yes | sh ./configure %common_options $platform \
-plugin-sql-sqlite -nomake examples -nomake demos -nomake docs \
%ifarch %arm
-no-neon \
++++++ fix-build-icu59.patch ++++++
From: Fabian Vogt <fv...@suse.com>
Subject: Fix build with ICU >= 59
This works around the C++11 requirement of ICU4C >= 59,
resulting in
/usr/include/unicode/umachine.h:347:13: error: 'char16_t' does not name a type
and ultimately:
/usr/include/unicode/uversion.h:167:55: error: 'UChar' does not name a type
---
src/corelib/tools/qlocale_icu.cpp | 3 +++
1 file changed, 3 insertions(+)
--- a/src/corelib/tools/qlocale_icu.cpp
+++ b/src/corelib/tools/qlocale_icu.cpp
@@ -43,6 +43,9 @@
#include "qlibrary.h"
#include "qdebug.h"
+// ICU59 requires C++11, work around that
+typedef qint16 char16_t;
+
#include "unicode/uversion.h"
#include "unicode/ucol.h"
