...
 
Commits (31)
qtbase-opensource-src (5.11.2+dfsg-7dpm2) UNRELEASED; urgency=medium
qtbase-opensource-src (5.11.3+dfsg-2dpm1) unstable; urgency=medium
* Disable problematic features
* Disable features that require a kernel >= 2.6
* Add i386 and arm64 to gles architectures
-- Jonah Brüchert <jbb@kaidan.im> Mon, 24 Dec 2018 01:47:57 +0100
-- Jonah Brüchert <jbb@kaidan.im> Mon, 29 Oct 2018 16:40:26 +0100
qtbase-opensource-src (5.11.2+dfsg-7dpm1) unstable; urgency=medium
qtbase-opensource-src (5.11.3+dfsg-2) unstable; urgency=medium
* Apply patch to support older kernels
* Add i386 and arm64 to gles architectures
[ Lisandro Damián Nicanor Pérez Meyer ]
* Note that the previous upload fixes:
- CVE-2018-15518: “double free or corruption” in QXmlStreamReader
- CVE-2018-19873: QBmpHandler segfault on malformed BMP file
- CVE-2018-19870: Check for QImage allocation failure in qgifhandler
-- Jonah Brüchert <jbb@kaidan.im> Mon, 29 Oct 2018 16:40:26 +0100
[ Simon Quigley ]
* Change my email to tsimonq2@debian.org now that I am a Debian Developer.
* Bump Standards-version to 4.3.0, no changes needed.
[ Dmitry Shachnev ]
* Use $(MAKE) instead of make in debian/rules for parallelization.
-- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Wed, 26 Dec 2018 16:06:23 -0300
qtbase-opensource-src (5.11.3+dfsg-1) experimental; urgency=medium
* Revert the switch of arm64 to OpenGL ES as a result of
<https://lists.debian.org/debian-devel/2018/11/msg00457.html>
* New upstream release.
- Bump Qt build dependencies.
- Bump qtbase-abi to 5-11-3.
* Fix typo in previous changelog entry.
* Delete dont_get_screen_rotation.diff, already applied upstream.
* Refresh patches.
* Delete ssl_max_version.diff. Applied upstream with some changes.
* Create and apply revert_remove_our_use_of_syscall_for-statx.patch. This is
needed for Qt to work with Stretch machines running testing/unstable
chroots but Stretch's kernel.
-- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Wed, 05 Dec 2018 20:54:37 -0300
qtbase-opensource-src (5.11.2+dfsg-8) experimental; urgency=medium
* Switch arm64 to use OpenGL ES instead of desktop OpenGL (Closes: #881333).
- Rename libqt5gui5 to libqt5gui5a.
- Add Breaks+Replaces against libqt5gui5 << 5.11.2+dfsg-8~. This
avoids co-installation of the library.
- Change all related dependencies to new binary name.
- Add a lintian override for package name does not match soname warning.
- Adjust arch qualifications for required packages.
- debian/rules: add arm64 to gles2_architectures.
- Rename debian/libqt5gui5 files to their libqt5gui5a counterparts,
modifying them when necessary.
- Update symbols files arch qualifications accordingly.
* Update symbols files with buildds' logs.
-- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Tue, 20 Nov 2018 20:24:04 -0300
>>>>>>> debian/5.11.3+dfsg-2
qtbase-opensource-src (5.11.2+dfsg-7) unstable; urgency=medium
......
......@@ -7,7 +7,7 @@ Uploaders: Sune Vuorela <sune@debian.org>,
Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>,
Timo Jyrinki <timo@debian.org>,
Dmitry Shachnev <mitya57@debian.org>,
Simon Quigley <tsimonq2@ubuntu.com>
Simon Quigley <tsimonq2@debian.org>
Build-Depends: debhelper (>= 11),
default-libmysqlclient-dev,
dh-exec,
......@@ -65,8 +65,8 @@ Build-Depends: debhelper (>= 11),
publicsuffix,
unixodbc-dev,
zlib1g-dev
Build-Depends-Indep: qttools5-dev-tools (>= 5.11.2-4~) <!nodoc>
Standards-Version: 4.2.1
Build-Depends-Indep: qttools5-dev-tools (>= 5.11.3-1~) <!nodoc>
Standards-Version: 4.3.0
Homepage: http://qt-project.org/
Vcs-Git: https://salsa.debian.org/qt-kde-team/qt/qtbase.git
Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt/qtbase
......@@ -75,7 +75,7 @@ Package: libqt5core5a
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Provides: qtbase-abi-5-11-2
Provides: qtbase-abi-5-11-3
Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: qttranslations5-l10n
Suggests: libthai0
......
# SymbolsHelper-Confirmed: 5.11.0~rc1 amd64
libQt5Concurrent.so.5 libqt5concurrent5 #MINVER#
| libqt5concurrent5 #MINVER#, qtbase-abi-5-11-2
| libqt5concurrent5 #MINVER#, qtbase-abi-5-11-3
* Build-Depends-Package: qtbase5-dev
Qt_5.0@Qt_5.0 5.6.0~beta
Qt_5.10@Qt_5.10 5.10.0
......
# SymbolsHelper-Confirmed: 5.11.2 alpha amd64 kfreebsd-i386
libQt5Core.so.5 libqt5core5a #MINVER#
| libqt5core5a #MINVER#, qtbase-abi-5-11-2
| libqt5core5a #MINVER#, qtbase-abi-5-11-3
* Build-Depends-Package: qtbase5-dev
Qt_5.0@Qt_5.0 5.6.0~beta
Qt_5.10@Qt_5.10 5.10.0
......
# SymbolsHelper-Confirmed: 5.11.1 armel armhf hurd-i386 i386 m68k mips mipsel powerpc powerpcspe
libQt5DBus.so.5 libqt5dbus5 #MINVER#
| libqt5dbus5 #MINVER#, qtbase-abi-5-11-2
| libqt5dbus5 #MINVER#, qtbase-abi-5-11-3
* Build-Depends-Package: qtbase5-dev
Qt_5.0@Qt_5.0 5.6.0~beta
Qt_5.10@Qt_5.10 5.10.0
......
# SymbolsHelper-Confirmed: 5.11.2 amd64
libQt5Gui.so.5 libqt5gui5 #MINVER#
| libqt5gui5 #MINVER#, qtbase-abi-5-11-2
| libqt5gui5 #MINVER#, qtbase-abi-5-11-3
* Build-Depends-Package: qtbase5-dev
Qt_5.0@Qt_5.0 5.6.0~beta
Qt_5.10@Qt_5.10 5.10.0
......
# SymbolsHelper-Confirmed: 5.11.2 amd64 kfreebsd-i386
libQt5Network.so.5 libqt5network5 #MINVER#
| libqt5network5 #MINVER#, qtbase-abi-5-11-2
| libqt5network5 #MINVER#, qtbase-abi-5-11-3
* Build-Depends-Package: qtbase5-dev
Qt_5.0@Qt_5.0 5.6.0~beta
Qt_5.10@Qt_5.10 5.10.0
......
# SymbolsHelper-Confirmed: 5.11.0~rc1 amd64
libQt5OpenGL.so.5 libqt5opengl5 #MINVER#
| libqt5opengl5 #MINVER#, qtbase-abi-5-11-2
| libqt5opengl5 #MINVER#, qtbase-abi-5-11-3
* Build-Depends-Package: qtbase5-dev
Qt_5.0@Qt_5.0 5.6.0~beta
Qt_5.10@Qt_5.10 5.10.0
......
# SymbolsHelper-Confirmed: 5.11.0~rc1 amd64
libQt5PrintSupport.so.5 libqt5printsupport5 #MINVER#
| libqt5printsupport5 #MINVER#, qtbase-abi-5-11-2
| libqt5printsupport5 #MINVER#, qtbase-abi-5-11-3
* Build-Depends-Package: qtbase5-dev
Qt_5.0@Qt_5.0 5.6.0~beta
Qt_5.10@Qt_5.10 5.10.0
......
# SymbolsHelper-Confirmed: 5.11.0~rc1 amd64
libQt5Sql.so.5 libqt5sql5 #MINVER#
| libqt5sql5 #MINVER#, qtbase-abi-5-11-2
| libqt5sql5 #MINVER#, qtbase-abi-5-11-3
* Build-Depends-Package: qtbase5-dev
Qt_5.0@Qt_5.0 5.6.0~beta
Qt_5.10@Qt_5.10 5.10.0
......
# SymbolsHelper-Confirmed: 5.11.0~rc1 amd64
libQt5Test.so.5 libqt5test5 #MINVER#
| libqt5test5 #MINVER#, qtbase-abi-5-11-2
| libqt5test5 #MINVER#, qtbase-abi-5-11-3
* Build-Depends-Package: qtbase5-dev
Qt_5.0@Qt_5.0 5.6.0~beta
Qt_5.10@Qt_5.10 5.10.0
......
# SymbolsHelper-Confirmed: 5.11.2 alpha amd64 kfreebsd-i386
# SymbolsHelper-Confirmed: 5.11.2 alpha amd64 kfreebsd-i386 riscv64
libQt5Widgets.so.5 libqt5widgets5 #MINVER#
| libqt5widgets5 #MINVER#, qtbase-abi-5-11-2
| libqt5widgets5 #MINVER#, qtbase-abi-5-11-3
* Build-Depends-Package: qtbase5-dev
Qt_5.0@Qt_5.0 5.6.0~beta
Qt_5.10@Qt_5.10 5.10.0
......@@ -7820,7 +7820,7 @@ libQt5Widgets.so.5 libqt5widgets5 #MINVER#
(optional=templinst|arch=!kfreebsd-amd64 !x32)_ZNSt17_Temporary_bufferIP5QRectS0_EC2ES1_S1_@Qt_5 5.7.0
(optional=templinst)_ZNSt3_V28__rotateIP5QRectEET_S3_S3_S3_St26random_access_iterator_tag@Qt_5 5.7.0
(optional=templinst)_ZNSt3_V28__rotateIPiEET_S2_S2_S2_St26random_access_iterator_tag@Qt_5 5.7.0
(optional=templinst|arch=alpha hppa mips64el sh4 sparc64 x32)_ZNSt6vectorIN18QWidgetLineControl7CommandESaIS1_EE12emplace_backIJS1_EEERS1_DpOT_@Qt_5_PRIVATE_API 5.11.1 1
(optional=templinst|arch=alpha hppa mips64el riscv64 sh4 sparc64 x32)_ZNSt6vectorIN18QWidgetLineControl7CommandESaIS1_EE12emplace_backIJS1_EEERS1_DpOT_@Qt_5_PRIVATE_API 5.11.1 1
(optional=templinst|arch=!x32)_ZNSt6vectorIN18QWidgetLineControl7CommandESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Qt_5_PRIVATE_API 5.9.1 1
(optional=templinst|arch=amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe ppc64 ppc64el s390x)_ZNSt6vectorIN18QWidgetLineControl7CommandESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Qt_5_PRIVATE_API 5.10.1 1
(optional=templinst|arch=!amd64 !arm64 !x32)_ZNSt6vectorIN18QWidgetLineControl7CommandESaIS1_EE8_M_eraseEN9__gnu_cxx17__normal_iteratorIPS1_S3_EES7_@Qt_5_PRIVATE_API 5.7.1 1
......
# SymbolsHelper-Confirmed: 5.11.0~rc1 amd64
libQt5Xml.so.5 libqt5xml5 #MINVER#
| libqt5xml5 #MINVER#, qtbase-abi-5-11-2
| libqt5xml5 #MINVER#, qtbase-abi-5-11-3
* Build-Depends-Package: qtbase5-dev
Qt_5.0@Qt_5.0 5.6.0~beta
Qt_5.10@Qt_5.10 5.10.0
......
......@@ -13,9 +13,13 @@ Author: Michael Cree <mcree@orcon.net.nz>
Forwarded: https://codereview.qt-project.org/245230
Last-Update: 2018-11-11
---
src/corelib/io/qfilesystemengine_unix.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/src/corelib/io/qfilesystemengine_unix.cpp
+++ b/src/corelib/io/qfilesystemengine_unix.cpp
@@ -303,7 +303,7 @@ mtime(const T &statBuffer, int)
@@ -287,7 +287,7 @@ mtime(const T &statBuffer, int)
{ return timespecToMSecs(statBuffer.st_mtimespec); }
#endif
......
Description: xcb: don't get initial screen rotation
"xcb_randr_get_screen_info" can be slow and in some configurations can
cause short mouse cursor freezes (which will happen on Qt application
startup).
.
Initial screen rotation was used only to not handle possible redundant
screen change event.
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=d4e937a6280f34bc
Last-Update: 2018-10-29
--- a/src/plugins/platforms/xcb/qxcbscreen.cpp
+++ b/src/plugins/platforms/xcb/qxcbscreen.cpp
@@ -118,13 +118,6 @@ QXcbVirtualDesktop::QXcbVirtualDesktop(Q
xcb_depth_next(&depth_iterator);
}
-
- if (connection->hasXRandr()) {
- xcb_connection_t *conn = connection->xcb_connection();
- auto screen_info = Q_XCB_REPLY(xcb_randr_get_screen_info, conn, screen->root);
- if (screen_info)
- m_rotation = screen_info->rotation;
- }
}
QXcbVirtualDesktop::~QXcbVirtualDesktop()
--- a/src/plugins/platforms/xcb/qxcbscreen.h
+++ b/src/plugins/platforms/xcb/qxcbscreen.h
@@ -220,7 +220,7 @@ private:
xcb_randr_crtc_t m_crtc;
xcb_randr_mode_t m_mode = XCB_NONE;
bool m_primary = false;
- uint8_t m_rotation = XCB_RANDR_ROTATION_ROTATE_0;
+ uint8_t m_rotation = 0;
QString m_outputName;
QSizeF m_outputSizeMillimeters;
......@@ -4,6 +4,11 @@ Author: Pino Toscano <pino@debian.org>
Forwarded: no
Last-Update: 2018-02-22
---
qmake/library/ioutils.cpp | 2 +-
src/corelib/io/qfilesystemengine_unix.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- a/qmake/library/ioutils.cpp
+++ b/qmake/library/ioutils.cpp
@@ -222,7 +222,7 @@ bool IoUtils::touchFile(const QString &t
......@@ -17,7 +22,7 @@ Last-Update: 2018-02-22
# else
--- a/src/corelib/io/qfilesystemengine_unix.cpp
+++ b/src/corelib/io/qfilesystemengine_unix.cpp
@@ -1439,7 +1439,7 @@ bool QFileSystemEngine::setFileTime(int
@@ -1407,7 +1407,7 @@ bool QFileSystemEngine::setFileTime(int
return false;
}
......
......@@ -2,9 +2,13 @@ Description: use 128 as a reference DPI for small screens
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=5e6bbbc1b86905c4
Last-Update: 2018-10-29
---
src/plugins/platforms/xcb/qxcbscreen.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- a/src/plugins/platforms/xcb/qxcbscreen.cpp
+++ b/src/plugins/platforms/xcb/qxcbscreen.cpp
@@ -753,7 +753,11 @@ void QXcbScreen::updateGeometry(const QR
@@ -746,7 +746,11 @@ void QXcbScreen::updateGeometry(const QR
m_sizeMillimeters = sizeInMillimeters(geometry.size(), m_virtualDesktop->dpi());
qreal dpi = geometry.width() / physicalSize().width() * qreal(25.4);
......
Description: revert upstream commit that removes use of syscall() and statx(2)
The commit https://code.qt.io/cgit/qt/qtbase.git/commit/?id=b7887f9b4faad222
removes the use of the above mentioned syscalls. This makes Qt not able
to run on current stable servers under a testing/unstable VM.
.
This patch should be removed in testing/unstable after Buster gets released.
Author: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>
Forwarded: not-needed
---
src/corelib/global/minimum-linux_p.h | 7 ----
src/corelib/io/qfilesystemengine_unix.cpp | 45 ++++++++++++++++++++++++++++--
2 files changed, 43 insertions(+), 9 deletions(-)
--- a/src/corelib/global/minimum-linux_p.h
+++ b/src/corelib/global/minimum-linux_p.h
@@ -75,14 +75,9 @@ QT_BEGIN_NAMESPACE
* - accept4 2.6.28
* - renameat2 3.16 QT_CONFIG(renameat2)
* - getrandom 3.17 QT_CONFIG(getentropy)
- * - statx 4.11 QT_CONFIG(statx)
*/
-#if QT_CONFIG(statx)
-# define MINLINUX_MAJOR 4
-# define MINLINUX_MINOR 11
-# define MINLINUX_PATCH 0
-#elif QT_CONFIG(getentropy)
+#if QT_CONFIG(getentropy)
# define MINLINUX_MAJOR 3
# define MINLINUX_MINOR 17
# define MINLINUX_PATCH 0
--- a/src/corelib/io/qfilesystemengine_unix.cpp
+++ b/src/corelib/io/qfilesystemengine_unix.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2018 Intel Corporation.
+** Copyright (C) 2017 Intel Corporation.
** Copyright (C) 2016 The Qt Company Ltd.
** Copyright (C) 2013 Samuel Gaist <samuel.gaist@edeltech.ch>
** Contact: https://www.qt.io/licensing/
@@ -88,6 +88,7 @@ extern "C" NSString *NSTemporaryDirector
#if defined(Q_OS_LINUX)
# include <sys/ioctl.h>
+# include <sys/syscall.h>
# include <sys/sendfile.h>
# include <linux/fs.h>
@@ -95,6 +96,28 @@ extern "C" NSString *NSTemporaryDirector
#ifndef FICLONE
# define FICLONE _IOW(0x94, 9, int)
#endif
+
+# if defined(Q_OS_ANDROID)
+// renameat2() and statx() are disabled on Android because quite a few systems
+// come with sandboxes that kill applications that make system calls outside a
+// whitelist and several Android vendors can't be bothered to update the list.
+# undef SYS_renameat2
+# undef SYS_statx
+# undef STATX_BASIC_STATS
+# else
+# if !QT_CONFIG(renameat2) && defined(SYS_renameat2)
+static int renameat2(int oldfd, const char *oldpath, int newfd, const char *newpath, unsigned flags)
+{ return syscall(SYS_renameat2, oldfd, oldpath, newfd, newpath, flags); }
+# endif
+
+# if !QT_CONFIG(statx) && defined(SYS_statx)
+# include <linux/stat.h>
+static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf)
+{ return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); }
+# elif !QT_CONFIG(statx) && !defined(SYS_statx)
+# undef STATX_BASIC_STATS
+# endif
+# endif // !Q_OS_ANDROID
#endif
#if defined(Q_OS_ANDROID)
@@ -315,8 +338,22 @@ mtime(const T &statBuffer, int)
#ifdef STATX_BASIC_STATS
static int qt_real_statx(int fd, const char *pathname, int flags, struct statx *statxBuffer)
{
+#ifdef Q_ATOMIC_INT8_IS_SUPPORTED
+ static QBasicAtomicInteger<qint8> statxTested = Q_BASIC_ATOMIC_INITIALIZER(0);
+#else
+ static QBasicAtomicInt statxTested = Q_BASIC_ATOMIC_INITIALIZER(0);
+#endif
+
+ if (statxTested.load() == -1)
+ return -ENOSYS;
+
unsigned mask = STATX_BASIC_STATS | STATX_BTIME;
int ret = statx(fd, pathname, flags, mask, statxBuffer);
+ if (ret == -1 && errno == ENOSYS) {
+ statxTested.store(-1);
+ return -ENOSYS;
+ }
+ statxTested.store(1);
return ret == -1 ? -errno : 0;
}
@@ -1252,12 +1289,14 @@ bool QFileSystemEngine::renameFile(const
if (Q_UNLIKELY(srcPath.isEmpty() || tgtPath.isEmpty()))
return emptyFileEntryWarning(), false;
-#if defined(RENAME_NOREPLACE) && QT_CONFIG(renameat2)
+#if defined(RENAME_NOREPLACE) && (QT_CONFIG(renameat2) || defined(SYS_renameat2))
if (renameat2(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_NOREPLACE) == 0)
return true;
+ // If we're using syscall(), check for ENOSYS;
+ // if renameat2 came from libc, we don't accept ENOSYS.
// We can also get EINVAL for some non-local filesystems.
- if (errno != EINVAL) {
+ if ((QT_CONFIG(renameat2) || errno != ENOSYS) && errno != EINVAL) {
error = QSystemError(errno, QSystemError::StandardLibraryError);
return false;
}
# Backported from upstream.
fix-selection-rendering.patch
reference_dpi.diff
dont_get_screen_rotation.diff
remove_need_for_glXGetProcAddressARB.patch
# Debian specific.
......@@ -13,10 +12,7 @@ gnukfreebsd_linker_warnings.diff
armv4.diff
nonlinux_utime.diff
no_arc4random_buf.diff
ssl_max_version.diff
qdoc_default_incdirs.diff
kfreebsd_qstrncpy.diff
alpha_atimensec.diff
# Old kernels
Stop-using-syscall-for-statx-and-renameat2.patch
revert_remove_our_use_of_syscall_for-statx.patch
Description: temporarily use TLS1_2_VERSION instead of TLS_MAX_VERSION
This is a temporary patch to make Qt work with OpenSSL 1.1.0 (in testing)
when compiled against OpenSSL 1.1.1 (in unstable).
.
It can be dropped when OpenSSL 1.1.1 migrates to testing, at the same
time the libqt5network5 dependency on it needs to be bumped to 1.1.1.
Author: Dmitry Shachnev <mitya57@debian.org>
Forwarded: not-needed
Last-Update: 2018-09-11
--- a/src/network/ssl/qsslcontext_openssl11.cpp
+++ b/src/network/ssl/qsslcontext_openssl11.cpp
@@ -124,20 +124,20 @@ init_context:
case QSsl::TlsV1SslV3:
case QSsl::AnyProtocol:
minVersion = SSL3_VERSION;
- maxVersion = TLS_MAX_VERSION;
+ maxVersion = TLS1_2_VERSION;
break;
case QSsl::SecureProtocols:
case QSsl::TlsV1_0OrLater:
minVersion = TLS1_VERSION;
- maxVersion = TLS_MAX_VERSION;
+ maxVersion = TLS1_2_VERSION;
break;
case QSsl::TlsV1_1OrLater:
minVersion = TLS1_1_VERSION;
- maxVersion = TLS_MAX_VERSION;
+ maxVersion = TLS1_2_VERSION;
break;
case QSsl::TlsV1_2OrLater:
minVersion = TLS1_2_VERSION;
- maxVersion = TLS_MAX_VERSION;
+ maxVersion = TLS1_2_VERSION;
break;
case QSsl::SslV2:
// This protocol is not supported by OpenSSL 1.1 and we handle
......@@ -203,7 +203,7 @@ override_dh_auto_build-indep:
override_dh_auto_build-arch:
# Bootstrap corelibs in order to be able to build the helper tools to
# regenerate some upstream-provided files.
cd $(CURDIR)/src; ../bin/qmake; make sub-corelib
cd $(CURDIR)/src; ../bin/qmake; $(MAKE) sub-corelib
# Add here the code to generate the helpers and then the headers.
LC_ALL=C.UTF-8 sh debian/generateTLDs.sh
# Rebuild only the object file that used the generated header.
......@@ -219,11 +219,11 @@ ifeq ($(DEB_HOST_ARCH_CPU),i386)
install -d debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/sse2/
# corelib needs make clean first to be able to rebuild.
cd $(CURDIR)/src/corelib; make clean ; ../../bin/qmake -config sse2; make
cd $(CURDIR)/src/corelib; $(MAKE) clean; ../../bin/qmake -config sse2; $(MAKE)
cp -av lib/libQt5Core.so.* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/sse2/
# gui on turn doesn't needs it, and actually fails if done.
cd $(CURDIR)/src/gui; ../../bin/qmake -config sse2; make
cd $(CURDIR)/src/gui; ../../bin/qmake -config sse2; $(MAKE)
cp -av lib/libQt5Gui.so.* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/sse2/
endif
......