changeset 4310:2c34ec679fb3

qt5: update to 5.7.1 * src/qtbase-1-fixes.patch: update patch from mxe.cc * src/qtbase.mk: update version, checksum, use -no-pch * src/qtimageformats-1.patch: update patch from mxe.cc * src/qtimageformats.mk: update checksum * src/qtsvg.mk: update checksum * src/qttools.mk: update checksum
author John D
date Sun, 01 Jan 2017 08:00:17 -0500
parents 7384a91ed38a
children 8528b1ccd529
files src/qtbase-1-fixes.patch src/qtbase.mk src/qtimageformats-1.patch src/qtimageformats.mk src/qtsvg.mk src/qttools.mk
diffstat 6 files changed, 75 insertions(+), 89 deletions(-) [+]
line wrap: on
line diff
--- a/src/qtbase-1-fixes.patch	Sun Jan 01 07:56:30 2017 -0500
+++ b/src/qtbase-1-fixes.patch	Sun Jan 01 08:00:17 2017 -0500
@@ -1,9 +1,6 @@
-This file is part of MXE.
-See index.html for further information.
+This file is part of MXE. See LICENSE.md for licensing information.
 
-Contains ad hoc patches for cross building.
-
-From 9e13228f4af09b93f6cd123635784e4988694ac2 Mon Sep 17 00:00:00 2001
+From 62efa18a61560a7757acffbd4ac6ca7b153155cc Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 6 Aug 2015 23:35:08 +0200
 Subject: [PATCH 1/8] fix qwindows plugin linking with system-freetype (MXE
@@ -22,10 +19,10 @@
 +    win32:shared:LIBS_PRIVATE += -lfreetype
  }
 -- 
-2.7.4
+2.9.3
 
 
-From 2d7638835de6b5f16cf64e6cf4eede1f8a9ccedb Mon Sep 17 00:00:00 2001
+From 5a15e0374758b7786204d98b66f49b4fd3daea79 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Sat, 21 Jun 2014 13:12:49 +0200
 Subject: [PATCH 2/8] use pkg-config for harfbuzz (MXE specific)
@@ -55,10 +52,10 @@
 +    PKGCONFIG += harfbuzz
  }
 -- 
-2.7.4
+2.9.3
 
 
-From 172b7bf1f113b1ea443a64ad4f9a2ecda6ee06e2 Mon Sep 17 00:00:00 2001
+From bc002ee2a8418c7afcba362d155ba1a591bc3d1a Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Mon, 8 Dec 2014 14:15:12 +0100
 Subject: [PATCH 3/8] fix oci config test on windows
@@ -75,10 +72,10 @@
 -LIBS += -lclntsh
 +!win32:LIBS += -lclntsh
 -- 
-2.7.4
+2.9.3
 
 
-From 7756e4e14ae5b33fea04416bd4f238ca1dfe4d30 Mon Sep 17 00:00:00 2001
+From 92d2ae7b6eb175b4f15e5f0f231a9c29824d6f57 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 6 Aug 2015 13:24:56 +0200
 Subject: [PATCH 4/8] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows
@@ -86,11 +83,11 @@
 Change-Id: I53c110ef40e3d14cc49fa23aa5d294611cac2ffa
 
 diff --git a/configure b/configure
-index 43b55f0..de2c3ec 100755
+index ba94d08..50e6dfb 100755
 --- a/configure
 +++ b/configure
-@@ -4656,7 +4656,7 @@ fi
- [ "$XPLATFORM_ANDROID" = "yes" ] && QMakeVar add styles "android"
+@@ -4677,7 +4677,7 @@ fi
+ [ "$XPLATFORM_ANDROID" != "no" ] && QMakeVar add styles "android"
  
  # check IPC support
 -if ! compileTest unix/ipc_sysv "ipc_sysv" ; then
@@ -99,10 +96,34 @@
      if compileTest unix/ipc_posix "ipc_posix" ; then
          QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC"
 -- 
-2.7.4
+2.9.3
 
 
-From 236aecbd657f06d0b18bc25b93d5390ac644daaf Mon Sep 17 00:00:00 2001
+From f0054e940467a64dffc0c3cc070233fdf2848d43 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Tue, 6 Oct 2015 09:53:20 +0200
+Subject: [PATCH 5/8] fix building mysql driver under mingw
+
+Change-Id: I9c4e821d5b3a6919566c6b684cb4916827feb6a9
+
+diff --git a/src/sql/drivers/mysql/qsql_mysql.pri b/src/sql/drivers/mysql/qsql_mysql.pri
+index 3cfb614..8b7063f 100644
+--- a/src/sql/drivers/mysql/qsql_mysql.pri
++++ b/src/sql/drivers/mysql/qsql_mysql.pri
+@@ -4,7 +4,7 @@ SOURCES += $$PWD/qsql_mysql.cpp
+ QMAKE_CXXFLAGS *= $$QT_CFLAGS_MYSQL
+ LIBS += $$QT_LFLAGS_MYSQL
+ 
+-unix {
++if (unix|mingw) {
+     isEmpty(QT_LFLAGS_MYSQL) {
+         !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) {
+             use_libmysqlclient_r:LIBS += -lmysqlclient_r
+-- 
+2.9.3
+
+
+From 26229596fbb711bc222c831eca3a9e5b62c7acc6 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Wed, 26 Aug 2015 12:45:43 +0100
 Subject: [PATCH 6/8] cmake: Rearrange STATIC vs INTERFACE targets
@@ -135,75 +156,13 @@
  !!ENDIF
  !!ENDIF
 -- 
-2.7.4
+2.9.3
 
 
-From 0d1b11391894345be8a1fe084afb3799fc828488 Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira@intel.com>
-Date: Wed, 18 May 2016 14:40:20 -0700
-Subject: [PATCH 7/8] Fix linking of the minimal platform plugin on OS X
-
-platformsupport/fontdatabases/fontdatabases.pri disables all font
-databases except CoreText on OS X, so this is required for
-linking. Otherwise, we get undefined reference linker errors:
-
-Undefined symbols for architecture x86_64:
-  "vtable for QBasicFontDatabase", referenced from:
-      QMinimalIntegration::fontDatabase() const in
-  qminimalintegration.o
-
-Change-Id: I31298e973803b4d6eedbf61607056114d1556584
-Reviewed-by: Jake Petroules <jake.petroules@qt.io>
-(cherry picked from commit 16864c42d6bc0ee6b3e3fa03123ef5884557ceea)
-
-diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro
-index 0d31d66..bd6f2d8 100644
---- a/src/plugins/platforms/minimal/minimal.pro
-+++ b/src/plugins/platforms/minimal/minimal.pro
-@@ -11,6 +11,7 @@ HEADERS =   qminimalintegration.h \
- OTHER_FILES += minimal.json
- 
- CONFIG += qpa/genericunixfontdatabase
-+darwin: DEFINES += QT_NO_FONTCONFIG
- 
- PLUGIN_TYPE = platforms
- PLUGIN_CLASS_NAME = QMinimalIntegrationPlugin
--- 
-2.7.4
-
-
-From f504f5805be3cc27e19632e15b29eaaaac0e92e8 Mon Sep 17 00:00:00 2001
-From: Boris Pek <tehnick-8@yandex.ru>
-Date: Sun, 19 Jun 2016 03:15:43 +0300
-Subject: [PATCH 8/8] Fix build of the minimal platform plugin for MS Windows
-
-when qtbase is configured with -fontconfig and -system-freetype.
-
-This fix is necessary after 060e0f6628fd185994911307c59f5355acaaf18f.
-Used the same approach as in 16864c42d6bc0ee6b3e3fa03123ef5884557ceea.
-
-Change-Id: Idece0dc11d89e38266c95de1769be751c06324ef
-(cherry picked from commit 02d2969fafe5088bb1c80eb58b2736df447326cd)
-
-diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro
-index bd6f2d8..4b63461 100644
---- a/src/plugins/platforms/minimal/minimal.pro
-+++ b/src/plugins/platforms/minimal/minimal.pro
-@@ -12,6 +12,7 @@ OTHER_FILES += minimal.json
- 
- CONFIG += qpa/genericunixfontdatabase
- darwin: DEFINES += QT_NO_FONTCONFIG
-+win32: DEFINES += QT_NO_FONTCONFIG
- 
- PLUGIN_TYPE = platforms
- PLUGIN_CLASS_NAME = QMinimalIntegrationPlugin
--- 
-2.7.4
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 59fd7fdff5bf0cda3c7a11982ee96f50d8eddec1 Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Sat, 16 Jul 2016 20:31:07 +1000
-Subject: [PATCH] Fix pkgconfig file and library naming
+Subject: [PATCH 7/8] Fix pkgconfig file and library naming
 
 See: https://codereview.qt-project.org/#/c/165394/
      https://bugreports.qt.io/browse/QTBUG-30898
@@ -228,7 +187,7 @@
 Change-Id: If75336ec7d21a7ec0cb6d245fe87c64afcb5a644
 
 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index 1111111..2222222 100644
+index d9011f5..1993a7f 100644
 --- a/mkspecs/features/qt_module.prf
 +++ b/mkspecs/features/qt_module.prf
 @@ -244,6 +244,10 @@ load(qt_installs)
@@ -265,3 +224,30 @@
  }
 -
 -TARGET = $$qt5LibraryTarget($$TARGET$$QT_LIBINFIX)  # Do this towards the end
+-- 
+2.9.3
+
+
+From a2ed2c9fe74b549cb163f89a56df6eec3af553fa Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Thu, 15 Dec 2016 17:20:56 +0100
+Subject: [PATCH 8/8] fix mysql config test
+
+The config test already gets link flags which should include
+the library. Blindly adding it to the end of the list can break
+static linking.
+
+Change-Id: Ief71c4ad64cbbb1b141b0ef5549f42a36bbd125b
+
+diff --git a/config.tests/unix/mysql/mysql.pro b/config.tests/unix/mysql/mysql.pro
+index 06d1880..ca6d6aa 100644
+--- a/config.tests/unix/mysql/mysql.pro
++++ b/config.tests/unix/mysql/mysql.pro
+@@ -1,3 +1,3 @@
+ SOURCES = mysql.cpp
+ CONFIG -= qt dylib
+-LIBS += -lmysqlclient
++LIBS *= -lmysqlclient
+-- 
+2.9.3
+
--- a/src/qtbase.mk	Sun Jan 01 07:56:30 2017 -0500
+++ b/src/qtbase.mk	Sun Jan 01 08:00:17 2017 -0500
@@ -3,8 +3,8 @@
 
 PKG             := qtbase
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.7.0
-$(PKG)_CHECKSUM := ba835ff158932eebbf1ed9f678414923dfd7cce4
+$(PKG)_VERSION  := 5.7.1
+$(PKG)_CHECKSUM := a3ddcde8978d3a05bb4342fce364a792472a16e6
 $(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://download.qt.io/official_releases/qt/5.7/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
@@ -53,6 +53,7 @@
             -system-pcre \
             -no-openssl \
             -dbus-linked \
+	    -no-pch \
             -v \
             $($(PKG)_CONFIGURE_OPTS)
 
--- a/src/qtimageformats-1.patch	Sun Jan 01 07:56:30 2017 -0500
+++ b/src/qtimageformats-1.patch	Sun Jan 01 08:00:17 2017 -0500
@@ -1,5 +1,4 @@
-This file is part of MXE.
-See index.html for further information.
+This file is part of MXE. See LICENSE.md for licensing information.
 
 From 30f968c6f65c5668a9760ccfd48312b786ab318b Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
--- a/src/qtimageformats.mk	Sun Jan 01 07:56:30 2017 -0500
+++ b/src/qtimageformats.mk	Sun Jan 01 08:00:17 2017 -0500
@@ -4,7 +4,7 @@
 PKG             := qtimageformats
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION   = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 09e93423d69e660951d75b136bbed6d7e441c438
+$(PKG)_CHECKSUM := 4cf8e6183e8280adcd6765c5ae1d2ea27a868a1f
 $(PKG)_SUBDIR    = $(subst qtbase,qtimageformats,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtimageformats,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtimageformats,$(qtbase_URL))
--- a/src/qtsvg.mk	Sun Jan 01 07:56:30 2017 -0500
+++ b/src/qtsvg.mk	Sun Jan 01 08:00:17 2017 -0500
@@ -4,7 +4,7 @@
 PKG             := qtsvg
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION   = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := abc54beebba305a13dd8578c2e8524d4eb7a9d02
+$(PKG)_CHECKSUM := 1915053a55152502440b7ba856333138854843d9
 $(PKG)_SUBDIR    = $(subst qtbase,qtsvg,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtsvg,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtsvg,$(qtbase_URL))
--- a/src/qttools.mk	Sun Jan 01 07:56:30 2017 -0500
+++ b/src/qttools.mk	Sun Jan 01 08:00:17 2017 -0500
@@ -4,7 +4,7 @@
 PKG             := qttools
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION   = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 235287cc39426e99e6870e63951f7db9a285ad0c
+$(PKG)_CHECKSUM := cd658a77a14dc503781b717259f3de0281d48d79
 $(PKG)_SUBDIR    = $(subst qtbase,qttools,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qttools,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qttools,$(qtbase_URL))