From 341bca52d5399403a2faa6efe225a3313225b392 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 16 Jun 2016 18:30:48 +0200 Subject: upgrade to Qt 5.7.0 --- index.html | 4 -- src/qt3d-1.patch | 53 -------------------- src/qt3d.mk | 17 ++++--- src/qtactiveqt.mk | 2 +- src/qtbase-1-fixes.patch | 124 ++++++++-------------------------------------- src/qtbase.mk | 12 ++--- src/qtcanvas3d.mk | 2 +- src/qtconnectivity.mk | 2 +- src/qtdeclarative.mk | 2 +- src/qtenginio.mk | 23 --------- src/qtgraphicaleffects.mk | 2 +- src/qtimageformats.mk | 2 +- src/qtlocation.mk | 2 +- src/qtmultimedia-1.patch | 29 ----------- src/qtmultimedia.mk | 2 +- src/qtquickcontrols.mk | 2 +- src/qtquickcontrols2.mk | 2 +- src/qtscript.mk | 2 +- src/qtsensors.mk | 2 +- src/qtserialport.mk | 2 +- src/qtsvg.mk | 2 +- src/qttools.mk | 2 +- src/qttranslations.mk | 2 +- src/qtwebchannel.mk | 2 +- src/qtwebengine.mk | 2 +- src/qtwebkit.mk | 2 +- src/qtwebsockets.mk | 2 +- src/qtwebview.mk | 2 +- src/qtwinextras.mk | 2 +- src/qtxmlpatterns.mk | 2 +- 30 files changed, 59 insertions(+), 249 deletions(-) delete mode 100644 src/qt3d-1.patch delete mode 100644 src/qtenginio.mk delete mode 100644 src/qtmultimedia-1.patch diff --git a/index.html b/index.html index cf0ec3d..8df5c9d 100644 --- a/index.html +++ b/index.html @@ -2330,10 +2330,6 @@ local-pkg-list: $(LOCAL_PKG_LIST) Qt - qtenginio - Qt - - qtgraphicaleffects Qt diff --git a/src/qt3d-1.patch b/src/qt3d-1.patch deleted file mode 100644 index 3193f32..0000000 --- a/src/qt3d-1.patch +++ /dev/null @@ -1,53 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -From f38bd703f75e6cdf234ed8e99560bd65e4f775ea Mon Sep 17 00:00:00 2001 -From: Mark Brand -Date: Fri, 17 Oct 2014 22:30:46 +0200 -Subject: [PATCH] fix static linking - - -diff --git a/src/quick3d/quick3d.pro b/src/quick3d/quick3d.pro -index 03cdd28..5b8e2ef 100644 ---- a/src/quick3d/quick3d.pro -+++ b/src/quick3d/quick3d.pro -@@ -9,7 +9,7 @@ gcov { - CONFIG += static - QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage - QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage --} else { -+} else:!static { - CONFIG += dll - } - -diff --git a/src/threed/threed.pro b/src/threed/threed.pro -index cb5f1d1..8d2be9b 100644 ---- a/src/threed/threed.pro -+++ b/src/threed/threed.pro -@@ -11,7 +11,7 @@ gcov { - CONFIG += static - QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage - QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage --} else { -+} else:!static { - CONFIG += dll - } - - -From: Boris Pek -Date: Wed, 04 May 2016 11:41:04 +0300 -Subject: [PATCH] fix build with GCC >= 6.x - -diff --git a/3rdparty/assimp/code/DXFLoader.cpp b/3rdparty/assimp/code/DXFLoader.cpp -index e372d60..2c1a13d 100644 ---- a/3rdparty/assimp/code/DXFLoader.cpp -+++ b/3rdparty/assimp/code/DXFLoader.cpp -@@ -84,7 +84,7 @@ - - // ------------------------------------------------------------------------------------------------ - // Constructor to be privately used by Importer --DXFImporter::DXFImporter() : buffer(0), groupCode(0), bRepeat(false), mDefaultLayer(false) -+DXFImporter::DXFImporter() : buffer(0), groupCode(0), bRepeat(false) - { - memset(cursor,0,sizeof(cursor)); - } diff --git a/src/qt3d.mk b/src/qt3d.mk index 2288356..1a4efa9 100644 --- a/src/qt3d.mk +++ b/src/qt3d.mk @@ -1,20 +1,23 @@ # This file is part of MXE. # See index.html for further information. + PKG := qt3d $(PKG)_IGNORE := -$(PKG)_VERSION := bcdbf04b74cc7ded4d7b2471347f51b54ff8584b -$(PKG)_CHECKSUM := 7e5e553f0132bc801f11f318f58b4fe3b8b1fd930f4acc23e97757fb6c76049c -$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) -$(PKG)_FILE := qt-$(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://github.com/qtproject/qt3d/archive/$($(PKG)_VERSION).tar.gz +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := a8248a1779b561ea450e92345e8187bacac359df0e92ad61a1ad7652bb233e29 +$(PKG)_SUBDIR = $(subst qtbase,qt3d,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qt3d,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qt3d,$(qtbase_URL)) $(PKG)_DEPS := gcc qtbase qtdeclarative -$(PKG)_UPDATE = $(call MXE_GET_GITHUB_SHA, qtproject/qt3d, master) +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef define $(PKG)_BUILD # invoke qmake with removed debug options as a workaround for # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG+=git_build CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtactiveqt.mk b/src/qtactiveqt.mk index 2e6fd6b..f17803f 100644 --- a/src/qtactiveqt.mk +++ b/src/qtactiveqt.mk @@ -4,7 +4,7 @@ PKG := qtactiveqt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 6adc7be3859d2c0e54ed7edf6caa35e3863dfa3d476ea40cd9acf7c965ca3277 +$(PKG)_CHECKSUM := 9b78055dbd3c59e6cc312cd88ffb8503a34cfc397f26114039b38c5894913c91 $(PKG)_SUBDIR = $(subst qtbase,qtactiveqt,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtactiveqt,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtactiveqt,$(qtbase_URL)) diff --git a/src/qtbase-1-fixes.patch b/src/qtbase-1-fixes.patch index e754135..bab33dc 100644 --- a/src/qtbase-1-fixes.patch +++ b/src/qtbase-1-fixes.patch @@ -3,10 +3,10 @@ See index.html for further information. Contains ad hoc patches for cross building. -From 54b168c305f54e60de0e32501b166faa7f5913e0 Mon Sep 17 00:00:00 2001 +From 9e13228f4af09b93f6cd123635784e4988694ac2 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 6 Aug 2015 23:35:08 +0200 -Subject: [PATCH 1/8] fix qwindows plugin linking with system-freetype (MXE +Subject: [PATCH 1/6] fix qwindows plugin linking with system-freetype (MXE specific) Change-Id: I8783e3ab2d19011b083dd3c471107298a17293c4 @@ -22,13 +22,13 @@ index 39280de..e152b0d 100644 + win32:shared:LIBS_PRIVATE += -lfreetype } -- -2.5.0 +2.7.4 -From 26b89d11b4e51d3aa2aab14dd52216ef8b1c7950 Mon Sep 17 00:00:00 2001 +From 2d7638835de6b5f16cf64e6cf4eede1f8a9ccedb Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 21 Jun 2014 13:12:49 +0200 -Subject: [PATCH 2/8] use pkg-config for harfbuzz (MXE specific) +Subject: [PATCH 2/6] use pkg-config for harfbuzz (MXE specific) Change-Id: Id4e4c37d68b63c9f480d72a561d95d4d2a5ded50 @@ -55,13 +55,13 @@ index 7443368..c24e684 100644 + PKGCONFIG += harfbuzz } -- -2.5.0 +2.7.4 -From fa5ca49b4ffc1911a597b294ef2d4b5ecb983cad Mon Sep 17 00:00:00 2001 +From 172b7bf1f113b1ea443a64ad4f9a2ecda6ee06e2 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 8 Dec 2014 14:15:12 +0100 -Subject: [PATCH 3/8] fix oci config test on windows +Subject: [PATCH 3/6] fix oci config test on windows Change-Id: If1ce2241682259ca495b0ba68bf18410f8548922 @@ -75,21 +75,21 @@ index 3ffda1d..39b6f3759 100644 -LIBS += -lclntsh +!win32:LIBS += -lclntsh -- -2.5.0 +2.7.4 -From 7fd641a032c7b4ce1b14d7ca02da646b0a0c34d5 Mon Sep 17 00:00:00 2001 +From 7756e4e14ae5b33fea04416bd4f238ca1dfe4d30 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 6 Aug 2015 13:24:56 +0200 -Subject: [PATCH 4/8] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows +Subject: [PATCH 4/6] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows Change-Id: I53c110ef40e3d14cc49fa23aa5d294611cac2ffa diff --git a/configure b/configure -index 7651e29..4a4b478 100755 +index 43b55f0..de2c3ec 100755 --- a/configure +++ b/configure -@@ -4575,7 +4575,7 @@ fi +@@ -4656,7 +4656,7 @@ fi [ "$XPLATFORM_ANDROID" = "yes" ] && QMakeVar add styles "android" # check IPC support @@ -99,13 +99,13 @@ index 7651e29..4a4b478 100755 if compileTest unix/ipc_posix "ipc_posix" ; then QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC" -- -2.5.0 +2.7.4 -From 959d3a71bced8c00967a16f23c6f9305e56fafcd Mon Sep 17 00:00:00 2001 +From e40fdb058ec440d14e3037c530f8181561622f50 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 6 Oct 2015 09:53:20 +0200 -Subject: [PATCH 5/8] fix building mysql driver under mingw +Subject: [PATCH 5/6] fix building mysql driver under mingw Change-Id: I9c4e821d5b3a6919566c6b684cb4916827feb6a9 @@ -123,73 +123,13 @@ index 3cfb614..8b7063f 100644 !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) { use_libmysqlclient_r:LIBS += -lmysqlclient_r -- -2.5.0 +2.7.4 -From a6f45e15cf19e29afc5f42d1e87feb2b4f7e9532 Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Sun, 18 Oct 2015 23:11:28 +0300 -Subject: [PATCH 6/8] configure: fix log corruption with option -v - -This bug occurs if ./configure is called with -v on systems on -which fd proc entries point to the files/devices they are open -on instead of being magic nodes which would basically dup() the -actual fds (e.g., Linux). - -In this case, the command "tee $tty" appends to /dev/stderr, which -may be already opened by the parent process. This breaks the log file. - -Normally, the log file starts with - - This is the Qt Open Source Edition. - ... - -but with `-v` flag it would start with output of awkprog and maybe -some zero bytes. Zero bytes are observed on Debian Wheezy. - - DEFAULT_INCDIRS=... - ... - ^@^@^@^@^@^@^@^@^@^@^@^@... - Done running configuration tests. - ... - -To fix this problem, the output of `...` is saved to a variable, and -then eval'd and echo'd (if -v). - -This solution was found by Tony Theodore. -https://github.com/mxe/mxe/issues/938#issuecomment-149770348 - -Change-Id: Id0c28598890e813774cc92f38ee46a0697b34e77 -Reviewed-by: Oswald Buddenhagen -Reviewed-by: Thiago Macieira -(cherry picked from commit 45fe3f1cde1e516d1ddccddb5e33ea4316497c36) - -diff --git a/configure b/configure -index 4a4b478..a5c0fd5 100755 ---- a/configure -+++ b/configure -@@ -3639,10 +3639,9 @@ END { - print "DEFAULT_LIBDIRS=\"/lib\n/usr/lib\"\n"; - }' - --unset tty --[ "$OPT_VERBOSE" = "yes" ] && tty=/dev/stderr --eval "`LC_ALL=C $TEST_COMPILER $SYSROOT_FLAG $TEST_COMPILER_CXXFLAGS -xc++ -E -v - < /dev/null 2>&1 > /dev/null | $AWK "$awkprog" | tee $tty`" --unset tty -+awkprog_result=`LC_ALL=C $TEST_COMPILER $SYSROOT_FLAG $TEST_COMPILER_CXXFLAGS -xc++ -E -v - < /dev/null 2>&1 > /dev/null | $AWK "$awkprog"` -+eval "$awkprog_result" -+[ "$OPT_VERBOSE" = "yes" ] && echo "$awkprog_result" - - echo "Done running configuration tests." - --- -2.5.0 - - -From 6064564099df17f7cddded8ec0c68d9e57d29ae9 Mon Sep 17 00:00:00 2001 +From 236aecbd657f06d0b18bc25b93d5390ac644daaf Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 26 Aug 2015 12:45:43 +0100 -Subject: [PATCH 7/8] cmake: Rearrange STATIC vs INTERFACE targets +Subject: [PATCH 6/6] cmake: Rearrange STATIC vs INTERFACE targets Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED) for header-only modules when building Qt5 statically. @@ -219,29 +159,5 @@ index d2358ca..6b1dc95 100644 !!ENDIF !!ENDIF -- -2.5.0 - - -From e74803bac8aa2fd2106f678b2b11584fdb582bc3 Mon Sep 17 00:00:00 2001 -From: Boris Pek -Date: Wed, 24 Feb 2016 19:39:46 +0300 -Subject: [PATCH 8/8] Fix ar error: `u' modifier ignored since `D' is the - default (see `U') - - -diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf -index 61963c7..25cf750 100644 ---- a/mkspecs/win32-g++/qmake.conf -+++ b/mkspecs/win32-g++/qmake.conf -@@ -104,7 +104,7 @@ QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2 - QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain - - QMAKE_IDL = midl --QMAKE_LIB = $${CROSS_COMPILE}ar -ru -+QMAKE_LIB = $${CROSS_COMPILE}ar -rc - QMAKE_RC = $${CROSS_COMPILE}windres - - QMAKE_STRIP = $${CROSS_COMPILE}strip --- -2.5.0 +2.7.4 diff --git a/src/qtbase.mk b/src/qtbase.mk index e4575be..d803d19 100644 --- a/src/qtbase.mk +++ b/src/qtbase.mk @@ -3,12 +3,12 @@ PKG := qtbase $(PKG)_IGNORE := -$(PKG)_VERSION := 5.6.0 -$(PKG)_CHECKSUM := 6efa8a5c559e92b2e526d48034e858023d5fd3c39115ac1bfd3bb65834dbd67a +$(PKG)_VERSION := 5.7.0 +$(PKG)_CHECKSUM := 3e7b6d123cab23a587ccbc45173296b33786faa409dba0494e4658fda3ede646 $(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.6/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) -$(PKG)_DEPS := gcc dbus fontconfig freetds freetype harfbuzz jpeg libpng libmysqlclient openssl pcre postgresql sqlite zlib +$(PKG)_URL := http://download.qt.io/official_releases/qt/5.7/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) +$(PKG)_DEPS := gcc dbus freetds harfbuzz jpeg libpng libmysqlclient openssl pcre postgresql sqlite zlib define $(PKG)_UPDATE $(WGET) -q -O- http://download.qt-project.org/official_releases/qt/5.5/ | \ @@ -52,8 +52,8 @@ define $(PKG)_BUILD -system-libpng \ -system-libjpeg \ -system-sqlite \ - -fontconfig \ - -system-freetype \ + -no-fontconfig \ + -no-freetype \ -system-harfbuzz \ -system-pcre \ -openssl-linked \ diff --git a/src/qtcanvas3d.mk b/src/qtcanvas3d.mk index dca97f2..cb20086 100644 --- a/src/qtcanvas3d.mk +++ b/src/qtcanvas3d.mk @@ -4,7 +4,7 @@ PKG := qtcanvas3d $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 66add59e826a0161f4a4dc3ec0b44c17fad1451390b4f7c67af23ee7429d9ecf +$(PKG)_CHECKSUM := 7871b3fd4c1a561c5b3eb57746e8504bc5d8fa626f9df578e619f9e823e3bd97 $(PKG)_SUBDIR = $(subst qtbase,qtcanvas3d,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtcanvas3d,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtcanvas3d,$(qtbase_URL)) diff --git a/src/qtconnectivity.mk b/src/qtconnectivity.mk index 31a4839..b946671 100644 --- a/src/qtconnectivity.mk +++ b/src/qtconnectivity.mk @@ -4,7 +4,7 @@ PKG := qtconnectivity $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 0c5cb0c100006759b6954a36e7dc66f8f1ac2b61b3f639152cf6ecb8d48a40eb +$(PKG)_CHECKSUM := 9844ca7ec5be187a77dfd7e95051fb267006f6c77157ecb0b8ceeac103a32703 $(PKG)_SUBDIR = $(subst qtbase,qtconnectivity,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtconnectivity,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtconnectivity,$(qtbase_URL)) diff --git a/src/qtdeclarative.mk b/src/qtdeclarative.mk index d122395..bb686a6 100644 --- a/src/qtdeclarative.mk +++ b/src/qtdeclarative.mk @@ -4,7 +4,7 @@ PKG := qtdeclarative $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 8c55f053f0e348577b56da541af74d02d0f2b61c9a6c15152b03dad03dfde04c +$(PKG)_CHECKSUM := 86de6239f3aee2e5f561c16ad7b6e47d8f341c293d4ed11c85acbc21888cf9f4 $(PKG)_SUBDIR = $(subst qtbase,qtdeclarative,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtdeclarative,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtdeclarative,$(qtbase_URL)) diff --git a/src/qtenginio.mk b/src/qtenginio.mk deleted file mode 100644 index 83e566e..0000000 --- a/src/qtenginio.mk +++ /dev/null @@ -1,23 +0,0 @@ -# This file is part of MXE. -# See index.html for further information. - -PKG := qtenginio -$(PKG)_IGNORE := -$(PKG)_VERSION = 1.6.0 -$(PKG)_CHECKSUM := 627ddcfbbfc3ec1a83c9dbb5f24287b5cd6cb5d3b9d09af4d1c444c6ac147f0c -$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION) -$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz -$(PKG)_URL := $(subst $(qtbase_FILE),$($(PKG)_FILE),$(qtbase_URL)) -$(PKG)_DEPS := gcc qtbase - -define $(PKG)_UPDATE - echo $(qtbase_VERSION) -endef - -define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' - $(MAKE) -C '$(1)' -j '$(JOBS)' - $(MAKE) -C '$(1)' -j 1 install -endef diff --git a/src/qtgraphicaleffects.mk b/src/qtgraphicaleffects.mk index 5706c26..18d1365 100644 --- a/src/qtgraphicaleffects.mk +++ b/src/qtgraphicaleffects.mk @@ -4,7 +4,7 @@ PKG := qtgraphicaleffects $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 01e911fdcf85a13b927cba341d15a0baeead3eba85c4532b1b45bb5c334416e8 +$(PKG)_CHECKSUM := c816539ce345e502425a94c624332df78f53aeebc460d76b53b79b59cb938de7 $(PKG)_SUBDIR = $(subst qtbase,qtgraphicaleffects,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtgraphicaleffects,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtgraphicaleffects,$(qtbase_URL)) diff --git a/src/qtimageformats.mk b/src/qtimageformats.mk index cfe44f4..0e867d5 100644 --- a/src/qtimageformats.mk +++ b/src/qtimageformats.mk @@ -4,7 +4,7 @@ PKG := qtimageformats $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 2c854275a689a513ba24f4266cc6017d76875336671c2c8801b4b7289081bada +$(PKG)_CHECKSUM := ef3344a44194d1414be585f8c8a652ffe217c663a22b6e26d3bb5e114f3f62e5 $(PKG)_SUBDIR = $(subst qtbase,qtimageformats,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtimageformats,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtimageformats,$(qtbase_URL)) diff --git a/src/qtlocation.mk b/src/qtlocation.mk index f354203..b7a87f5 100644 --- a/src/qtlocation.mk +++ b/src/qtlocation.mk @@ -4,7 +4,7 @@ PKG := qtlocation $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 360e1519d0fcafe4f86923d224e76d56dd785dfb0e1a19fd2e2b0016799653c9 +$(PKG)_CHECKSUM := 70273367342493a77c050f033a92d96e79925aa70308746e9681d8661f4aa865 $(PKG)_SUBDIR = $(subst qtbase,qtlocation,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtlocation,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtlocation,$(qtbase_URL)) diff --git a/src/qtmultimedia-1.patch b/src/qtmultimedia-1.patch deleted file mode 100644 index 82471da..0000000 --- a/src/qtmultimedia-1.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a0ac50f7a95b3f66519fac62e892b98376576036 Mon Sep 17 00:00:00 2001 -From: Mark Brand -Date: Wed, 16 Mar 2016 15:18:00 +0100 -Subject: [PATCH] fix include case - -Change-Id: I135deca455ca2ff6bb3969aca990fe9d1c2dd345 - -diff --git a/src/plugins/common/evr/evrdefs.h b/src/plugins/common/evr/evrdefs.h -index 3b2c253..7b1af05 100644 ---- a/src/plugins/common/evr/evrdefs.h -+++ b/src/plugins/common/evr/evrdefs.h -@@ -35,12 +35,12 @@ - #define EVRDEFS_H - - #include --#include -+#include - #include - #include - #include - #include --#include -+#include - - extern const CLSID clsid_EnhancedVideoRenderer; - extern const GUID mr_VIDEO_RENDER_SERVICE; --- -2.5.0 - diff --git a/src/qtmultimedia.mk b/src/qtmultimedia.mk index df798fc..ab43590 100644 --- a/src/qtmultimedia.mk +++ b/src/qtmultimedia.mk @@ -4,7 +4,7 @@ PKG := qtmultimedia $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 103f99d6cd266f5c4485546a75ef0c6ee7e88dc901a0be21447cf89159370686 +$(PKG)_CHECKSUM := 05ae705bda224a600b06e390aa7b1448c4a6a52d2d37842d2121fb4a5d84b559 $(PKG)_SUBDIR = $(subst qtbase,qtmultimedia,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtmultimedia,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtmultimedia,$(qtbase_URL)) diff --git a/src/qtquickcontrols.mk b/src/qtquickcontrols.mk index 46a2d6b..4f87010 100644 --- a/src/qtquickcontrols.mk +++ b/src/qtquickcontrols.mk @@ -4,7 +4,7 @@ PKG := qtquickcontrols $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := ec0896792f2a08d109ab3791aa4e47747aab22ebfad281005c4bf8f26f9f788b +$(PKG)_CHECKSUM := d8e19a77100fff109585ccc62116e63dd11ce9486056a8eb5b64159b7ecdec32 $(PKG)_SUBDIR = $(subst qtbase,qtquickcontrols,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtquickcontrols,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtquickcontrols,$(qtbase_URL)) diff --git a/src/qtquickcontrols2.mk b/src/qtquickcontrols2.mk index e7fc90c..c004abf 100644 --- a/src/qtquickcontrols2.mk +++ b/src/qtquickcontrols2.mk @@ -4,7 +4,7 @@ PKG := qtquickcontrols2 $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 59ec6ea2282931bc0d0748b3979a52e1a322e7ef8d1e5490b8a34931e8b9fee0 +$(PKG)_CHECKSUM := 63f5b0777992c32bd602b88de657e202cd6d5e8ba0371c6d5da16fb8c7481045 $(PKG)_SUBDIR = $(subst qtbase,qtquickcontrols2,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtquickcontrols2,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtquickcontrols2,$(qtbase_URL)) diff --git a/src/qtscript.mk b/src/qtscript.mk index d8ce6df..5632e0b 100644 --- a/src/qtscript.mk +++ b/src/qtscript.mk @@ -4,7 +4,7 @@ PKG := qtscript $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := ac7475197d9a0f3c7284f002390e2427fef84ec90dc590630431a848099c5042 +$(PKG)_CHECKSUM := 9c44e1fd294989ae62b1e452c25fd15574042e84e1377b59cd9ec67241428000 $(PKG)_SUBDIR = $(subst qtbase,qtscript,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtscript,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtscript,$(qtbase_URL)) diff --git a/src/qtsensors.mk b/src/qtsensors.mk index 2ace18d..f5ec184 100644 --- a/src/qtsensors.mk +++ b/src/qtsensors.mk @@ -4,7 +4,7 @@ PKG := qtsensors $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 518f392fec5e01aaa7f95e9141678cc99b02ed067ebbd24c38c1420067c59c2e +$(PKG)_CHECKSUM := 283dcc66a24c4367e865fa8301b6ea04d0cb78bd0f166fd09a6bb42e1e3731be $(PKG)_SUBDIR = $(subst qtbase,qtsensors,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtsensors,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtsensors,$(qtbase_URL)) diff --git a/src/qtserialport.mk b/src/qtserialport.mk index 0f12d86..eeef50e 100644 --- a/src/qtserialport.mk +++ b/src/qtserialport.mk @@ -4,7 +4,7 @@ PKG := qtserialport $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 16ee7fb66bb997df674a12a7a5a1450e2a2b860c8d34d237f3631d9f60853c1f +$(PKG)_CHECKSUM := 5ce150d843a243854736489d4a71205a8ca8dc8f93626ec29d1aa7a249a08265 $(PKG)_SUBDIR = $(subst qtbase,qtserialport,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtserialport,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtserialport,$(qtbase_URL)) diff --git a/src/qtsvg.mk b/src/qtsvg.mk index 6aa713d..f59511c 100644 --- a/src/qtsvg.mk +++ b/src/qtsvg.mk @@ -4,7 +4,7 @@ PKG := qtsvg $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 798799319138bb40b6187f4ecc1099956a0d62148f78512e9cb085d1fa5f641f +$(PKG)_CHECKSUM := a1f89f035aed48bf8843ff1880c4b54dc2e3a5160dbd743aec03e13831cdd881 $(PKG)_SUBDIR = $(subst qtbase,qtsvg,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtsvg,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtsvg,$(qtbase_URL)) diff --git a/src/qttools.mk b/src/qttools.mk index d2ec864..b7c3709 100644 --- a/src/qttools.mk +++ b/src/qttools.mk @@ -4,7 +4,7 @@ PKG := qttools $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 0d244c61bbe5505cb94310e980b06ef13dd573511e80ccbdc060f71d5462219d +$(PKG)_CHECKSUM := 6f45ad73cf6a6fea20d93d881551e938b7f7a62b6d50bf98b5f8c0b70e4d9500 $(PKG)_SUBDIR = $(subst qtbase,qttools,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttools,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttools,$(qtbase_URL)) diff --git a/src/qttranslations.mk b/src/qttranslations.mk index 1667336..4fe159d 100644 --- a/src/qttranslations.mk +++ b/src/qttranslations.mk @@ -4,7 +4,7 @@ PKG := qttranslations $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 9809351f0922b2d91aeb5d8e5756665eea0b2cbcaab74a570f6e5bf08574cd49 +$(PKG)_CHECKSUM := 0a0ed428f6a3a01b49c80e0d2b80199f66d77578588d2929923097c77c795a6d $(PKG)_SUBDIR = $(subst qtbase,qttranslations,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttranslations,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttranslations,$(qtbase_URL)) diff --git a/src/qtwebchannel.mk b/src/qtwebchannel.mk index 136b25b..045874d 100644 --- a/src/qtwebchannel.mk +++ b/src/qtwebchannel.mk @@ -4,7 +4,7 @@ PKG := qtwebchannel $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := c25424935e866e77f31e5ebc50fc97eaedd4d77f6e967bfc59ce7fa6a7b4c14f +$(PKG)_CHECKSUM := 3ab4cd177cc742ee5015f2b7f943c16ce13380b840f824436b5005485b749816 $(PKG)_SUBDIR = $(subst qtbase,qtwebchannel,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtwebchannel,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtwebchannel,$(qtbase_URL)) diff --git a/src/qtwebengine.mk b/src/qtwebengine.mk index bc1c60f..f21db08 100644 --- a/src/qtwebengine.mk +++ b/src/qtwebengine.mk @@ -4,7 +4,7 @@ PKG := qtwebengine $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 8aa2b5ad6c9f98a781aa99303eab3a40bbe74d26a543eea6b4145f5f47c76a03 +$(PKG)_CHECKSUM := 985762fff5cd8a1a0d2a644a4a51238676898685f9ff1a78c3f2800025d6dc5d $(PKG)_SUBDIR = $(subst qtbase,qtwebengine,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtwebengine,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtwebengine,$(qtbase_URL)) diff --git a/src/qtwebkit.mk b/src/qtwebkit.mk index 1a758eb..22e4e28 100644 --- a/src/qtwebkit.mk +++ b/src/qtwebkit.mk @@ -4,7 +4,7 @@ PKG := qtwebkit $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 9ca72373841f3a868a7bcc696956cdb0ad7f5e678c693659f6f0b919fdd16dfe +$(PKG)_CHECKSUM := c7a3253cbf8e6035c54c3b08d8a9457bd82efbce71d4b363c8f753fd07bd34df $(PKG)_SUBDIR = $(subst qtbase,qtwebkit,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtwebkit,$(qtbase_FILE)) $(PKG)_URL = $(subst /submodules/,/,$(subst official_releases/qt,community_releases,$(subst qtbase,qtwebkit,$(qtbase_URL)))) diff --git a/src/qtwebsockets.mk b/src/qtwebsockets.mk index 60a898a..a087ec9 100644 --- a/src/qtwebsockets.mk +++ b/src/qtwebsockets.mk @@ -4,7 +4,7 @@ PKG := qtwebsockets $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 268ab869fe3d0d22abd9668851155db79aff2f386bc448051b6ef477841d719f +$(PKG)_CHECKSUM := 741be11a907f82807a786e6a53ae7316c0b3864491b692e8719c381e0f158b43 $(PKG)_SUBDIR = $(subst qtbase,qtwebsockets,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtwebsockets,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtwebsockets,$(qtbase_URL)) diff --git a/src/qtwebview.mk b/src/qtwebview.mk index fa23999..78efc17 100644 --- a/src/qtwebview.mk +++ b/src/qtwebview.mk @@ -4,7 +4,7 @@ PKG := qtwebview $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := a48fa53e9e012102774c3faa6c99113918442f891952cd97ef67e05544800b57 +$(PKG)_CHECKSUM := 801a3faf312fa0235d489c63aa224d477a70cfe1b1ef7803cbe311a8c29e51c4 $(PKG)_SUBDIR = $(subst qtbase,qtwebview,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtwebview,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtwebview,$(qtbase_URL)) diff --git a/src/qtwinextras.mk b/src/qtwinextras.mk index 9a30719..13a69d7 100644 --- a/src/qtwinextras.mk +++ b/src/qtwinextras.mk @@ -4,7 +4,7 @@ PKG := qtwinextras $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 58951c5334a7dc7f9c3fd62747c1420cced6318dec9ec845a3d14b1e10a8bb93 +$(PKG)_CHECKSUM := 8dabe231a4fdaa74acc2f79a44391a49ef779db8d0acf41cbb29f2c71d9e07ba $(PKG)_SUBDIR = $(subst qtbase,qtwinextras,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtwinextras,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtwinextras,$(qtbase_URL)) diff --git a/src/qtxmlpatterns.mk b/src/qtxmlpatterns.mk index c628e52..dc5b6af 100644 --- a/src/qtxmlpatterns.mk +++ b/src/qtxmlpatterns.mk @@ -4,7 +4,7 @@ PKG := qtxmlpatterns $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := baed1b3bd3f010b8c4a96b4ca7a595b665d43d2e5758b55a364dbc9f2ac819d4 +$(PKG)_CHECKSUM := 38882a4ea5d711be07d10695759359045f7f9d64727a65e1d5e6515d55c7e20b $(PKG)_SUBDIR = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtxmlpatterns,$(qtbase_URL)) -- cgit v0.12