From 9f793b72dce2430eb9cf8af055701ca2de5c8232 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 19 Jul 2017 15:22:57 +1000 Subject: add qt5 freeze example plugin (e.g. winxp support) --- plugins/examples/qt5-freeze/README.md | 46 ++++ plugins/examples/qt5-freeze/qt3d.mk | 23 ++ plugins/examples/qt5-freeze/qt5.mk | 10 + plugins/examples/qt5-freeze/qtactiveqt-1.patch | 24 ++ plugins/examples/qt5-freeze/qtactiveqt.mk | 23 ++ plugins/examples/qt5-freeze/qtbase-1-fixes.patch | 253 +++++++++++++++++++++ plugins/examples/qt5-freeze/qtbase.mk | 107 +++++++++ plugins/examples/qt5-freeze/qtcanvas3d.mk | 23 ++ plugins/examples/qt5-freeze/qtcharts.mk | 23 ++ plugins/examples/qt5-freeze/qtconnectivity.mk | 23 ++ plugins/examples/qt5-freeze/qtdatavis3d.mk | 23 ++ .../examples/qt5-freeze/qtdeclarative-render2d.mk | 23 ++ plugins/examples/qt5-freeze/qtdeclarative.mk | 23 ++ plugins/examples/qt5-freeze/qtgamepad.mk | 23 ++ plugins/examples/qt5-freeze/qtgraphicaleffects.mk | 23 ++ plugins/examples/qt5-freeze/qtimageformats-1.patch | 79 +++++++ plugins/examples/qt5-freeze/qtimageformats.mk | 23 ++ plugins/examples/qt5-freeze/qtlocation.mk | 23 ++ plugins/examples/qt5-freeze/qtmultimedia.mk | 23 ++ plugins/examples/qt5-freeze/qtpurchasing.mk | 23 ++ plugins/examples/qt5-freeze/qtquickcontrols.mk | 23 ++ plugins/examples/qt5-freeze/qtquickcontrols2.mk | 23 ++ plugins/examples/qt5-freeze/qtscript.mk | 23 ++ plugins/examples/qt5-freeze/qtscxml.mk | 23 ++ plugins/examples/qt5-freeze/qtsensors.mk | 23 ++ plugins/examples/qt5-freeze/qtserialbus.mk | 23 ++ plugins/examples/qt5-freeze/qtserialport.mk | 23 ++ plugins/examples/qt5-freeze/qtsvg.mk | 23 ++ plugins/examples/qt5-freeze/qttools-1.patch | 24 ++ plugins/examples/qt5-freeze/qttools.mk | 31 +++ plugins/examples/qt5-freeze/qttranslations.mk | 24 ++ plugins/examples/qt5-freeze/qtvirtualkeyboard.mk | 23 ++ plugins/examples/qt5-freeze/qtwebchannel.mk | 23 ++ plugins/examples/qt5-freeze/qtwebkit-1-fixes.patch | 47 ++++ plugins/examples/qt5-freeze/qtwebkit.mk | 25 ++ plugins/examples/qt5-freeze/qtwebsockets.mk | 23 ++ plugins/examples/qt5-freeze/qtwebview.mk | 23 ++ plugins/examples/qt5-freeze/qtwinextras-1.patch | 25 ++ plugins/examples/qt5-freeze/qtwinextras.mk | 23 ++ plugins/examples/qt5-freeze/qtxmlpatterns-1.patch | 23 ++ plugins/examples/qt5-freeze/qtxmlpatterns.mk | 23 ++ 41 files changed, 1362 insertions(+) create mode 100644 plugins/examples/qt5-freeze/README.md create mode 100644 plugins/examples/qt5-freeze/qt3d.mk create mode 100644 plugins/examples/qt5-freeze/qt5.mk create mode 100644 plugins/examples/qt5-freeze/qtactiveqt-1.patch create mode 100644 plugins/examples/qt5-freeze/qtactiveqt.mk create mode 100644 plugins/examples/qt5-freeze/qtbase-1-fixes.patch create mode 100644 plugins/examples/qt5-freeze/qtbase.mk create mode 100644 plugins/examples/qt5-freeze/qtcanvas3d.mk create mode 100644 plugins/examples/qt5-freeze/qtcharts.mk create mode 100644 plugins/examples/qt5-freeze/qtconnectivity.mk create mode 100644 plugins/examples/qt5-freeze/qtdatavis3d.mk create mode 100644 plugins/examples/qt5-freeze/qtdeclarative-render2d.mk create mode 100644 plugins/examples/qt5-freeze/qtdeclarative.mk create mode 100644 plugins/examples/qt5-freeze/qtgamepad.mk create mode 100644 plugins/examples/qt5-freeze/qtgraphicaleffects.mk create mode 100644 plugins/examples/qt5-freeze/qtimageformats-1.patch create mode 100644 plugins/examples/qt5-freeze/qtimageformats.mk create mode 100644 plugins/examples/qt5-freeze/qtlocation.mk create mode 100644 plugins/examples/qt5-freeze/qtmultimedia.mk create mode 100644 plugins/examples/qt5-freeze/qtpurchasing.mk create mode 100644 plugins/examples/qt5-freeze/qtquickcontrols.mk create mode 100644 plugins/examples/qt5-freeze/qtquickcontrols2.mk create mode 100644 plugins/examples/qt5-freeze/qtscript.mk create mode 100644 plugins/examples/qt5-freeze/qtscxml.mk create mode 100644 plugins/examples/qt5-freeze/qtsensors.mk create mode 100644 plugins/examples/qt5-freeze/qtserialbus.mk create mode 100644 plugins/examples/qt5-freeze/qtserialport.mk create mode 100644 plugins/examples/qt5-freeze/qtsvg.mk create mode 100644 plugins/examples/qt5-freeze/qttools-1.patch create mode 100644 plugins/examples/qt5-freeze/qttools.mk create mode 100644 plugins/examples/qt5-freeze/qttranslations.mk create mode 100644 plugins/examples/qt5-freeze/qtvirtualkeyboard.mk create mode 100644 plugins/examples/qt5-freeze/qtwebchannel.mk create mode 100644 plugins/examples/qt5-freeze/qtwebkit-1-fixes.patch create mode 100644 plugins/examples/qt5-freeze/qtwebkit.mk create mode 100644 plugins/examples/qt5-freeze/qtwebsockets.mk create mode 100644 plugins/examples/qt5-freeze/qtwebview.mk create mode 100644 plugins/examples/qt5-freeze/qtwinextras-1.patch create mode 100644 plugins/examples/qt5-freeze/qtwinextras.mk create mode 100644 plugins/examples/qt5-freeze/qtxmlpatterns-1.patch create mode 100644 plugins/examples/qt5-freeze/qtxmlpatterns.mk diff --git a/plugins/examples/qt5-freeze/README.md b/plugins/examples/qt5-freeze/README.md new file mode 100644 index 0000000..bda7dfe --- /dev/null +++ b/plugins/examples/qt5-freeze/README.md @@ -0,0 +1,46 @@ +Freezing Qt5 version +-------------------------------- + +This plugin demonstrates freezing a version of Qt5 in a local plugin, +possibly for Win XP support (see #1827, #1734). It's possible to simply +stay on a git checkout, but then other toolchain features are also +frozen. + +*N.B.* This is unsupported and exists solely as an example of how one +might maintain a local version. + +##### Overview + +Basic outline is to checkout a version, copy the makefile and patches, +and lock the patches to the ones in this directory instead of core +MXE src: + +``` +export PLUGIN_DIR=plugins/examples/qt5-freeze +rm -rf $PLUGIN_DIR +mkdir -p $PLUGIN_DIR + +# parent of Qt 5.8 update +git checkout a0f9e61 + +# find all Qt5 modules and copy +export QT5_PKGS=`grep -l qtbase_VERSION src/*.mk | sed -n 's,src/\(.*\)\.mk.*,\1,p' | tr '\n' ','` +export QT5_PKGS=${QT5_PKGS}qtbase +cp `eval echo src/{$QT5_PKGS}.mk` $PLUGIN_DIR +cp `eval echo src/{$QT5_PKGS}-*.patch` $PLUGIN_DIR + +# set $(PKG)_PATCHES to only look for patches in the current directory +# on macos, use `gsed` instead of `sed` +find $PLUGIN_DIR -name "qt[^5]*.mk" -exec sed -i '9i$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch)))' {} \; +git checkout master +``` + +Now you'll have all the right versions, just some minor changes since +`mysql` doesn't support XP (see #1394). In a real local scenario, the +package should also be removed from `$(PKG)_DEPS` and `qtbase.mk` +modified. `MXE_PLUGIN_DIRS` can also be added to `settings.mk` + +``` +make qt5 MXE_PLUGIN_DIRS=$PLUGIN_DIR qtbase_CONFIGURE_OPTS='-no-sql-mysql' + +``` diff --git a/plugins/examples/qt5-freeze/qt3d.mk b/plugins/examples/qt5-freeze/qt3d.mk new file mode 100644 index 0000000..3a8e676 --- /dev/null +++ b/plugins/examples/qt5-freeze/qt3d.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qt3d +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := 1d74cf431777b8086d771ab0d4d2c01f9c28eb14cc2d73d7f838a665d1f707ea +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(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 + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' || $(MAKE) -C '$(1)' -j 1 + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/examples/qt5-freeze/qt5.mk b/plugins/examples/qt5-freeze/qt5.mk new file mode 100644 index 0000000..deef457 --- /dev/null +++ b/plugins/examples/qt5-freeze/qt5.mk @@ -0,0 +1,10 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qt5 +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_DEPS := $(patsubst $(TOP_DIR)/src/%.mk,%,\ + $(shell grep -l 'qtbase_VERSION' \ + $(TOP_DIR)/src/qt*.mk \ + --exclude '$(TOP_DIR)/src/qt5.mk')) diff --git a/plugins/examples/qt5-freeze/qtactiveqt-1.patch b/plugins/examples/qt5-freeze/qtactiveqt-1.patch new file mode 100644 index 0000000..d8d72b2 --- /dev/null +++ b/plugins/examples/qt5-freeze/qtactiveqt-1.patch @@ -0,0 +1,24 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +From 72357fef95ee2247f79032b2096b3c23938882d5 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Wed, 21 May 2014 08:59:53 +0200 +Subject: [PATCH] Revert "idc is a host tool" + +This reverts commit a52db1a707f84eae74ce1cc3d1058f026e81ac13. + +Conflicts: + src/tools/idc/idc.pro + +diff --git a/src/tools/idc/idc.pro b/src/tools/idc/idc.pro +index 1898ed5..524ee2e 100644 +--- a/src/tools/idc/idc.pro ++++ b/src/tools/idc/idc.pro +@@ -1,4 +1,3 @@ +-option(host_build) + CONFIG += force_bootstrap + SOURCES = main.cpp + +-- +2.1.4 + diff --git a/plugins/examples/qt5-freeze/qtactiveqt.mk b/plugins/examples/qt5-freeze/qtactiveqt.mk new file mode 100644 index 0000000..d01e814 --- /dev/null +++ b/plugins/examples/qt5-freeze/qtactiveqt.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtactiveqt +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := 0c09920de273fa12e40f6486a4715267e2fe54991303b6ddfdac69fe9a24a1d5 +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qtactiveqt,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtactiveqt,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtactiveqt,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/examples/qt5-freeze/qtbase-1-fixes.patch b/plugins/examples/qt5-freeze/qtbase-1-fixes.patch new file mode 100644 index 0000000..31ff2ab --- /dev/null +++ b/plugins/examples/qt5-freeze/qtbase-1-fixes.patch @@ -0,0 +1,253 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +From 62efa18a61560a7757acffbd4ac6ca7b153155cc 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 + specific) + +Change-Id: I8783e3ab2d19011b083dd3c471107298a17293c4 + +diff --git a/src/3rdparty/freetype_dependency.pri b/src/3rdparty/freetype_dependency.pri +index 39280de..e152b0d 100644 +--- a/src/3rdparty/freetype_dependency.pri ++++ b/src/3rdparty/freetype_dependency.pri +@@ -4,4 +4,5 @@ contains(QT_CONFIG, freetype) { + } else:contains(QT_CONFIG, system-freetype) { + # pull in the proper freetype2 include directory + include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri) ++ win32:shared:LIBS_PRIVATE += -lfreetype + } +-- +2.9.3 + + +From 5a15e0374758b7786204d98b66f49b4fd3daea79 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) + +Change-Id: Id4e4c37d68b63c9f480d72a561d95d4d2a5ded50 + +diff --git a/config.tests/unix/harfbuzz/harfbuzz.pro b/config.tests/unix/harfbuzz/harfbuzz.pro +index 32edd6e..a7f2c28 100644 +--- a/config.tests/unix/harfbuzz/harfbuzz.pro ++++ b/config.tests/unix/harfbuzz/harfbuzz.pro +@@ -1,3 +1,4 @@ + SOURCES = harfbuzz.cpp + CONFIG -= qt dylib +-LIBS += -lharfbuzz ++CONFIG += link_pkgconfig ++PKGCONFIG += harfbuzz +diff --git a/src/3rdparty/harfbuzz_dependency.pri b/src/3rdparty/harfbuzz_dependency.pri +index 7443368..c24e684 100644 +--- a/src/3rdparty/harfbuzz_dependency.pri ++++ b/src/3rdparty/harfbuzz_dependency.pri +@@ -2,5 +2,6 @@ contains(QT_CONFIG, harfbuzz) { + INCLUDEPATH += $$PWD/harfbuzz-ng/include + LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtharfbuzzng$$qtPlatformTargetSuffix() + } else:contains(QT_CONFIG, system-harfbuzz) { +- LIBS_PRIVATE += -lharfbuzz ++ CONFIG += link_pkgconfig ++ PKGCONFIG += harfbuzz + } +-- +2.9.3 + + +From bc002ee2a8418c7afcba362d155ba1a591bc3d1a 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 + +Change-Id: If1ce2241682259ca495b0ba68bf18410f8548922 + +diff --git a/config.tests/unix/oci/oci.pro b/config.tests/unix/oci/oci.pro +index 3ffda1d..39b6f3759 100644 +--- a/config.tests/unix/oci/oci.pro ++++ b/config.tests/unix/oci/oci.pro +@@ -1,3 +1,3 @@ + SOURCES = oci.cpp + CONFIG -= qt dylib +-LIBS += -lclntsh ++!win32:LIBS += -lclntsh +-- +2.9.3 + + +From 92d2ae7b6eb175b4f15e5f0f231a9c29824d6f57 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 + +Change-Id: I53c110ef40e3d14cc49fa23aa5d294611cac2ffa + +diff --git a/configure b/configure +index ba94d08..50e6dfb 100755 +--- a/configure ++++ b/configure +@@ -4677,7 +4677,7 @@ fi + [ "$XPLATFORM_ANDROID" != "no" ] && QMakeVar add styles "android" + + # check IPC support +-if ! compileTest unix/ipc_sysv "ipc_sysv" ; then ++if [ "$XPLATFORM_MINGW" = "no" ] && ! compileTest unix/ipc_sysv "ipc_sysv" ; then + # SYSV IPC is not supported - check POSIX IPC + if compileTest unix/ipc_posix "ipc_posix" ; then + QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC" +-- +2.9.3 + + +From f0054e940467a64dffc0c3cc070233fdf2848d43 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 + +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 +Date: Wed, 26 Aug 2015 12:45:43 +0100 +Subject: [PATCH 6/8] cmake: Rearrange STATIC vs INTERFACE targets + +Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED) +for header-only modules when building Qt5 statically. + +Source: https://git.io/vzWJz +See also: https://github.com/mxe/mxe/issues/1185 + +diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +index d2358ca..6b1dc95 100644 +--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -222,13 +222,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + endif() + !!ENDIF + ++!!IF equals(TEMPLATE, aux) ++ add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED) ++!!ELSE + !!IF !isEmpty(CMAKE_STATIC_TYPE) + add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED) + set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX") + !!ELSE +-!!IF equals(TEMPLATE, aux) +- add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED) +-!!ELSE + add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED) + !!ENDIF + !!ENDIF +-- +2.9.3 + + +From 59fd7fdff5bf0cda3c7a11982ee96f50d8eddec1 Mon Sep 17 00:00:00 2001 +From: Tony Theodore +Date: Sat, 16 Jul 2016 20:31:07 +1000 +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 + +Currently, *.pc files are generated with debug suffix `d` in `-release` +mode and without the suffix in `-debug` or `-debug-and-release`. This +can be worked around by `CONIFG-=debug_and_release`, however, a more +predictable and consistent naming approach would be preferable. + +This change mimics the *.prl file and lib conventions: + + -release: creates normal *.pc files and lib names + -release -force-debug-info: normal as above + -debug: creates *d.pc and *d lib names + -debug-and-release: creates both + -default: creates both (default link: debug) + +and should be unsurprising to users of `pkg-config`. At very least, +it's deterministic and easily incorporated into build systems. + +Task-number: 30898 +Change-Id: If75336ec7d21a7ec0cb6d245fe87c64afcb5a644 + +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index d9011f5..1993a7f 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -244,6 +244,10 @@ load(qt_installs) + + load(qt_targets) + ++# Set TARGET towards the end but before pkgconfig setup to keep naming ++# conventions consistent with *prl files ++TARGET = $$qt5LibraryTarget($$TARGET$$QT_LIBINFIX) ++ + # this builds on top of qt_common + !internal_module:!lib_bundle:if(unix|mingw) { + CONFIG += create_pc +@@ -254,12 +258,12 @@ load(qt_targets) + QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS/raw] + QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] + QMAKE_PKGCONFIG_CFLAGS = -I${includedir}/$$MODULE_INCNAME +- QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt, "Qt$$QT_MAJOR_VERSION ") +- QMAKE_PKGCONFIG_FILE = $$replace(TARGET, ^Qt, Qt$$QT_MAJOR_VERSION) ++ QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt$$QT_MAJOR_VERSION, "Qt$$QT_MAJOR_VERSION ") ++ QMAKE_PKGCONFIG_FILE = $$TARGET + for(i, MODULE_DEPENDS): \ +- QMAKE_PKGCONFIG_REQUIRES += $$replace(QT.$${i}.name, ^Qt, Qt$$eval(QT.$${i}.MAJOR_VERSION)) ++ QMAKE_PKGCONFIG_REQUIRES += $$replace(QT.$${i}.name, ^Qt, Qt$$eval(QT.$${i}.MAJOR_VERSION))$$qtPlatformTargetSuffix() + isEmpty(QMAKE_PKGCONFIG_DESCRIPTION): \ +- QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt, "Qt ") module ++ QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt$$QT_MAJOR_VERSION, "Qt ") module + pclib_replace.match = $$lib_replace.match + !isEmpty(lib_replace.replace): \ + pclib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR +@@ -293,5 +297,3 @@ win32 { + # On other platforms, Qt's own compilation goes needs to compile the Qt 5.0 API + DEFINES *= QT_DISABLE_DEPRECATED_BEFORE=0x050000 + } +- +-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 +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 + diff --git a/plugins/examples/qt5-freeze/qtbase.mk b/plugins/examples/qt5-freeze/qtbase.mk new file mode 100644 index 0000000..5545580 --- /dev/null +++ b/plugins/examples/qt5-freeze/qtbase.mk @@ -0,0 +1,107 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtbase +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION := 5.7.1 +$(PKG)_CHECKSUM := edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(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) +$(PKG)_DEPS := gcc dbus fontconfig freetds freetype harfbuzz jpeg libmysqlclient libpng openssl pcre postgresql sqlite zlib + +define $(PKG)_UPDATE + $(WGET) -q -O- http://download.qt-project.org/official_releases/qt/5.5/ | \ + $(SED) -n 's,.*href="\(5\.[0-9]\.[^/]*\)/".*,\1,p' | \ + grep -iv -- '-rc' | \ + sort | + tail -1 +endef + +define $(PKG)_BUILD + # ICU is buggy. See #653. TODO: reenable it some time in the future. + cd '$(1)' && \ + OPENSSL_LIBS="`'$(TARGET)-pkg-config' --libs-only-l openssl`" \ + PSQL_LIBS="-lpq -lsecur32 `'$(TARGET)-pkg-config' --libs-only-l openssl pthreads` -lws2_32" \ + SYBASE_LIBS="-lsybdb `'$(TARGET)-pkg-config' --libs-only-l gnutls` -liconv -lws2_32" \ + ./configure \ + -opensource \ + -c++std c++11 \ + -confirm-license \ + -xplatform win32-g++ \ + -device-option CROSS_COMPILE=${TARGET}- \ + -device-option PKG_CONFIG='${TARGET}-pkg-config' \ + -force-pkg-config \ + -no-use-gold-linker \ + -release \ + -static \ + -prefix '$(PREFIX)/$(TARGET)/qt5' \ + -no-icu \ + -opengl desktop \ + -no-glib \ + -accessibility \ + -nomake examples \ + -nomake tests \ + -plugin-sql-mysql \ + -mysql_config $(PREFIX)/$(TARGET)/bin/mysql_config \ + -plugin-sql-sqlite \ + -plugin-sql-odbc \ + -plugin-sql-psql \ + -plugin-sql-tds -D Q_USE_SYBASE \ + -system-zlib \ + -system-libpng \ + -system-libjpeg \ + -system-sqlite \ + -fontconfig \ + -system-freetype \ + -system-harfbuzz \ + -system-pcre \ + -openssl-linked \ + -dbus-linked \ + -no-pch \ + -v \ + $($(PKG)_CONFIGURE_OPTS) + + $(MAKE) -C '$(1)' -j '$(JOBS)' + rm -rf '$(PREFIX)/$(TARGET)/qt5' + $(MAKE) -C '$(1)' -j 1 install + ln -sf '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PREFIX)/bin/$(TARGET)'-qmake-qt5 + + mkdir '$(1)/test-qt' + cd '$(1)/test-qt' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PWD)/src/qt-test.pro' + $(MAKE) -C '$(1)/test-qt' -j '$(JOBS)' $(BUILD_TYPE) + $(INSTALL) -m755 '$(1)/test-qt/$(BUILD_TYPE)/test-qt5.exe' '$(PREFIX)/$(TARGET)/bin/' + + # build test the manual way + mkdir '$(1)/test-$(PKG)-pkgconfig' + '$(PREFIX)/$(TARGET)/qt5/bin/uic' -o '$(1)/test-$(PKG)-pkgconfig/ui_qt-test.h' '$(TOP_DIR)/src/qt-test.ui' + '$(PREFIX)/$(TARGET)/qt5/bin/moc' \ + -o '$(1)/test-$(PKG)-pkgconfig/moc_qt-test.cpp' \ + -I'$(1)/test-$(PKG)-pkgconfig' \ + '$(TOP_DIR)/src/qt-test.hpp' + '$(PREFIX)/$(TARGET)/qt5/bin/rcc' -name qt-test -o '$(1)/test-$(PKG)-pkgconfig/qrc_qt-test.cpp' '$(TOP_DIR)/src/qt-test.qrc' + '$(TARGET)-g++' \ + -W -Wall -Werror -std=c++0x -pedantic \ + '$(TOP_DIR)/src/qt-test.cpp' \ + '$(1)/test-$(PKG)-pkgconfig/moc_qt-test.cpp' \ + '$(1)/test-$(PKG)-pkgconfig/qrc_qt-test.cpp' \ + -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG)-pkgconfig.exe' \ + -I'$(1)/test-$(PKG)-pkgconfig' \ + `'$(TARGET)-pkg-config' Qt5Widgets$(BUILD_TYPE_SUFFIX) --cflags --libs` + + # setup cmake toolchain + echo 'set(CMAKE_SYSTEM_PREFIX_PATH "$(PREFIX)/$(TARGET)/qt5" ${CMAKE_SYSTEM_PREFIX_PATH})' > '$(CMAKE_TOOLCHAIN_DIR)/$(PKG).cmake' + + # batch file to run test programs + (printf 'set PATH=..\\lib;..\\qt5\\bin;..\\qt5\\lib;%%PATH%%\r\n'; \ + printf 'set QT_QPA_PLATFORM_PLUGIN_PATH=..\\qt5\\plugins\r\n'; \ + printf 'test-qt5.exe\r\n'; \ + printf 'test-qtbase-pkgconfig.exe\r\n';) \ + > '$(PREFIX)/$(TARGET)/bin/test-qt5.bat' +endef + + +$(PKG)_BUILD_SHARED = $(subst -static ,-shared ,\ + $($(PKG)_BUILD)) diff --git a/plugins/examples/qt5-freeze/qtcanvas3d.mk b/plugins/examples/qt5-freeze/qtcanvas3d.mk new file mode 100644 index 0000000..6073a2e --- /dev/null +++ b/plugins/examples/qt5-freeze/qtcanvas3d.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtcanvas3d +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := a887083817b77710f6b5401cec4713a03147ed16fa5cf5fb8de4495807bebdb4 +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qtcanvas3d,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtcanvas3d,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtcanvas3d,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase qtdeclarative + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/examples/qt5-freeze/qtcharts.mk b/plugins/examples/qt5-freeze/qtcharts.mk new file mode 100644 index 0000000..6f53e45 --- /dev/null +++ b/plugins/examples/qt5-freeze/qtcharts.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtcharts +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := 85feee6992cdef1ab42947a83cbf806a29224d704ee5dc97ee5038c75b633fe3 +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qtcharts,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtcharts,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtcharts,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase qtdeclarative qtmultimedia + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/examples/qt5-freeze/qtconnectivity.mk b/plugins/examples/qt5-freeze/qtconnectivity.mk new file mode 100644 index 0000000..1bd2915 --- /dev/null +++ b/plugins/examples/qt5-freeze/qtconnectivity.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtconnectivity +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := b3e8b9068304dc5605a8fdf0695102032fd1a216f2c2d4d53a7e4d4dda3ab966 +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qtconnectivity,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtconnectivity,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtconnectivity,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase qtdeclarative + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/examples/qt5-freeze/qtdatavis3d.mk b/plugins/examples/qt5-freeze/qtdatavis3d.mk new file mode 100644 index 0000000..3e0ea00 --- /dev/null +++ b/plugins/examples/qt5-freeze/qtdatavis3d.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtdatavis3d +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := 1bff85dcdeed98ad8f0e191f77e7c0e9d57af719c51791044b9c15e939b800f8 +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qtdatavis3d,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtdatavis3d,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtdatavis3d,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase qtdeclarative qtmultimedia + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/examples/qt5-freeze/qtdeclarative-render2d.mk b/plugins/examples/qt5-freeze/qtdeclarative-render2d.mk new file mode 100644 index 0000000..7f27122 --- /dev/null +++ b/plugins/examples/qt5-freeze/qtdeclarative-render2d.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtdeclarative-render2d +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := 831913488bb887993ae8701e5966f53875667a774c0230fc5dc39d6077828c7f +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qtdeclarative-render2d,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtdeclarative-render2d,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtdeclarative-render2d,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase qtdeclarative + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/examples/qt5-freeze/qtdeclarative.mk b/plugins/examples/qt5-freeze/qtdeclarative.mk new file mode 100644 index 0000000..ed7c95b --- /dev/null +++ b/plugins/examples/qt5-freeze/qtdeclarative.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtdeclarative +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := fd13dd3059d20694a857ed30ee56a2ade908c0cb93246f9804a65f7a2d775d56 +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qtdeclarative,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtdeclarative,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtdeclarative,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase qtsvg qtxmlpatterns + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/examples/qt5-freeze/qtgamepad.mk b/plugins/examples/qt5-freeze/qtgamepad.mk new file mode 100644 index 0000000..5e22c71 --- /dev/null +++ b/plugins/examples/qt5-freeze/qtgamepad.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtgamepad +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := bb2b2165e3bcbf37a7e03c3e1cac4fe9771b087dad7ab9566ba5f7f4f4929182 +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qtgamepad,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtgamepad,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtgamepad,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase qtdeclarative + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/examples/qt5-freeze/qtgraphicaleffects.mk b/plugins/examples/qt5-freeze/qtgraphicaleffects.mk new file mode 100644 index 0000000..cdcaf49 --- /dev/null +++ b/plugins/examples/qt5-freeze/qtgraphicaleffects.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtgraphicaleffects +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := 2c68fabe599fa2f318562dc22003df6797e91d00761dbf1f337cdc7fbacd4dc8 +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qtgraphicaleffects,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtgraphicaleffects,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtgraphicaleffects,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase qtdeclarative + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/examples/qt5-freeze/qtimageformats-1.patch b/plugins/examples/qt5-freeze/qtimageformats-1.patch new file mode 100644 index 0000000..f43fa4e --- /dev/null +++ b/plugins/examples/qt5-freeze/qtimageformats-1.patch @@ -0,0 +1,79 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +From 30f968c6f65c5668a9760ccfd48312b786ab318b Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Thu, 3 Nov 2011 14:11:02 +0100 +Subject: [PATCH 1/2] add pkg-config support for libtiff-4 + +Change-Id: I387517e04fed7729e5acf28bacdfc289fb2d17bd + +diff --git a/config.tests/libtiff/libtiff.pro b/config.tests/libtiff/libtiff.pro +index f7ac4c1..bd2c6b0 100644 +--- a/config.tests/libtiff/libtiff.pro ++++ b/config.tests/libtiff/libtiff.pro +@@ -2,5 +2,7 @@ SOURCES = libtiff.cpp + CONFIG -= qt dylib + mac:CONFIG -= app_bundle + win32:CONFIG += console +-unix|mingw: LIBS += -ltiff ++CONFIG += link_pkgconfig ++packagesExist(libtiff-4):PKGCONFIG += libtiff-4 ++else:if(unix|win32-g++*): LIBS += -ltiff + else:win32: LIBS += libtiff.lib +diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro +index 0f841ab..fa22141 100644 +--- a/src/plugins/imageformats/tiff/tiff.pro ++++ b/src/plugins/imageformats/tiff/tiff.pro +@@ -10,7 +10,9 @@ wince*: SOURCES += qfunctions_wince.cpp + OTHER_FILES += tiff.json + + config_libtiff { +- unix|mingw: LIBS += -ltiff ++ CONFIG += link_pkgconfig ++ packagesExist(libtiff-4):PKGCONFIG += libtiff-4 ++ else:if(unix|win32-g++*): LIBS += -ltiff + else:win32: LIBS += libtiff.lib + } else { + include($$PWD/../../../3rdparty/libtiff.pri) +-- +1.8.4.5 + + +From c791e0599f640cf637d5f925b111dbd7a5569244 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Wed, 19 Dec 2012 23:29:52 +0100 +Subject: [PATCH 2/2] add pkg-config support for libmng (mxe-specific) + +Change-Id: I1216f35a01a974321efa2463b687c121baa22667 + +diff --git a/config.tests/libmng/libmng.pro b/config.tests/libmng/libmng.pro +index adc096e..a20a0a0 100644 +--- a/config.tests/libmng/libmng.pro ++++ b/config.tests/libmng/libmng.pro +@@ -2,5 +2,7 @@ SOURCES = libmng.cpp + CONFIG -= qt dylib + mac:CONFIG -= app_bundle + win32:CONFIG += console +-unix|mingw: LIBS += -lmng ++CONFIG += link_pkgconfig ++packagesExist(libmng):PKGCONFIG += libmng ++else:if(unix|win32-g++*): LIBS += -lmng + else:win32: LIBS += libmng.lib +diff --git a/src/plugins/imageformats/mng/qmnghandler.pri b/src/plugins/imageformats/mng/qmnghandler.pri +index 5c0fff1..00cd0b3 100644 +--- a/src/plugins/imageformats/mng/qmnghandler.pri ++++ b/src/plugins/imageformats/mng/qmnghandler.pri +@@ -3,7 +3,9 @@ INCLUDEPATH *= $$PWD + HEADERS += $$PWD/qmnghandler_p.h + SOURCES += $$PWD/qmnghandler.cpp + config_libmng { +- unix|mingw: LIBS += -lmng ++ CONFIG += link_pkgconfig ++ packagesExist(libmng):PKGCONFIG += libmng ++ else:if(unix|win32-g++*): LIBS += -lmng + else:win32: LIBS += libmng.lib + } else { + include($$PWD/../../../3rdparty/libmng.pri) +-- +1.8.4.5 + diff --git a/plugins/examples/qt5-freeze/qtimageformats.mk b/plugins/examples/qt5-freeze/qtimageformats.mk new file mode 100644 index 0000000..4ee8c57 --- /dev/null +++ b/plugins/examples/qt5-freeze/qtimageformats.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtimageformats +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := 4f97a2a2b269f8a45576256ad9f452320c9c9de6d9c7cc1751fdeac36b0f77f4 +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qtimageformats,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtimageformats,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtimageformats,$(qtbase_URL)) +$(PKG)_DEPS := gcc jasper libmng libwebp qtbase tiff + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/examples/qt5-freeze/qtlocation.mk b/plugins/examples/qt5-freeze/qtlocation.mk new file mode 100644 index 0000000..29a3ba8 --- /dev/null +++ b/plugins/examples/qt5-freeze/qtlocation.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtlocation +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := f9e9e64e757008c2341504a1916a219ee0cf2b1b42bfa72156e62dfe9dfbf39f +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qtlocation,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtlocation,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtlocation,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase qtdeclarative qtmultimedia + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/examples/qt5-freeze/qtmultimedia.mk b/plugins/examples/qt5-freeze/qtmultimedia.mk new file mode 100644 index 0000000..76e4d73 --- /dev/null +++ b/plugins/examples/qt5-freeze/qtmultimedia.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtmultimedia +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := a52b177fbf02600a0c8bd995ce7c2041c673bc1332c02b60e0e95bb9ebab7def +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qtmultimedia,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtmultimedia,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtmultimedia,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/examples/qt5-freeze/qtpurchasing.mk b/plugins/examples/qt5-freeze/qtpurchasing.mk new file mode 100644 index 0000000..a31fd96 --- /dev/null +++ b/plugins/examples/qt5-freeze/qtpurchasing.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtpurchasing +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := f694757929cefa31643daab4bde1fbda8d76c79eda0ee6094e1d86efd4cb7b42 +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qtpurchasing,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtpurchasing,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtpurchasing,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase qtdeclarative + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/examples/qt5-freeze/qtquickcontrols.mk b/plugins/examples/qt5-freeze/qtquickcontrols.mk new file mode 100644 index 0000000..3d04523 --- /dev/null +++ b/plugins/examples/qt5-freeze/qtquickcontrols.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtquickcontrols +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := 6feb1a736bf93af98c40d04cde6b36c113e4cdf84ccb9b306ca92ef9b1779e9d +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qtquickcontrols,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtquickcontrols,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtquickcontrols,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase qtdeclarative + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/examples/qt5-freeze/qtquickcontrols2.mk b/plugins/examples/qt5-freeze/qtquickcontrols2.mk new file mode 100644 index 0000000..f8c7942 --- /dev/null +++ b/plugins/examples/qt5-freeze/qtquickcontrols2.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtquickcontrols2 +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := f2e8acd0badbf604f28258b063c94ba71e28147c53c435ae9eb484497cf3e7ec +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qtquickcontrols2,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtquickcontrols2,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtquickcontrols2,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase qtdeclarative + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/examples/qt5-freeze/qtscript.mk b/plugins/examples/qt5-freeze/qtscript.mk new file mode 100644 index 0000000..58e8492 --- /dev/null +++ b/plugins/examples/qt5-freeze/qtscript.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtscript +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := 5bf91a1c53020d91d454d4bb0f930ada98c5fc008fda78f2d7171152920da426 +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qtscript,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtscript,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtscript,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/examples/qt5-freeze/qtscxml.mk b/plugins/examples/qt5-freeze/qtscxml.mk new file mode 100644 index 0000000..dc64b1c --- /dev/null +++ b/plugins/examples/qt5-freeze/qtscxml.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtscxml +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := 9dad4ab220a715b6a63df1d4a196bfa963a1ce7e6e57e7b36462c5dab09db38c +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qtscxml,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtscxml,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtscxml,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase qtdeclarative + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/examples/qt5-freeze/qtsensors.mk b/plugins/examples/qt5-freeze/qtsensors.mk new file mode 100644 index 0000000..2a63c96 --- /dev/null +++ b/plugins/examples/qt5-freeze/qtsensors.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtsensors +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := ccb3942edb5e615e9a43c147d87a09f19690eafbc56be0cdf4f73b7e510f3b10 +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qtsensors,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtsensors,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtsensors,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/examples/qt5-freeze/qtserialbus.mk b/plugins/examples/qt5-freeze/qtserialbus.mk new file mode 100644 index 0000000..6176fa5 --- /dev/null +++ b/plugins/examples/qt5-freeze/qtserialbus.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtserialbus +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := 727edbe0f29659119cfcfbc9ce7c7063af319ec441bc9a5156ebda28e820b157 +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qtserialbus,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtserialbus,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtserialbus,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase qtserialport + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/examples/qt5-freeze/qtserialport.mk b/plugins/examples/qt5-freeze/qtserialport.mk new file mode 100644 index 0000000..0bcb218 --- /dev/null +++ b/plugins/examples/qt5-freeze/qtserialport.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtserialport +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := 76d5e19bd392b72602ba3bfe3c0d03c10962674604cf814efa2c910f98cf5a26 +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qtserialport,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtserialport,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtserialport,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/examples/qt5-freeze/qtsvg.mk b/plugins/examples/qt5-freeze/qtsvg.mk new file mode 100644 index 0000000..fa60bc2 --- /dev/null +++ b/plugins/examples/qt5-freeze/qtsvg.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtsvg +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := b0f017db8cf18e655e8a6635bc4ddbdbad6f8ef839857451b78942630a4c3947 +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qtsvg,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtsvg,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtsvg,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/examples/qt5-freeze/qttools-1.patch b/plugins/examples/qt5-freeze/qttools-1.patch new file mode 100644 index 0000000..3b797c1 --- /dev/null +++ b/plugins/examples/qt5-freeze/qttools-1.patch @@ -0,0 +1,24 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +From 3dc7b77a86b4d399836472484a5b3448a27f1a1e Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Wed, 21 May 2014 11:31:45 +0200 +Subject: [PATCH] disable windeployqt (MXE specific) + + +diff --git a/src/src.pro b/src/src.pro +index 722b32e..66ce5bf 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -27,7 +27,7 @@ android { + + qtHaveModule(dbus): SUBDIRS += qdbus + +-win32|winrt:SUBDIRS += windeployqt ++#win32|winrt:SUBDIRS += windeployqt + winrt:SUBDIRS += winrtrunner + qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag + +-- +2.1.2 + diff --git a/plugins/examples/qt5-freeze/qttools.mk b/plugins/examples/qt5-freeze/qttools.mk new file mode 100644 index 0000000..9fa6adf --- /dev/null +++ b/plugins/examples/qt5-freeze/qttools.mk @@ -0,0 +1,31 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qttools +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := 64197022686c3d8b11a8639f102e2caf03cc325a30e7a32ba66881648ac2dfac +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qttools,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qttools,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qttools,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtactiveqt qtbase qtdeclarative + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install + + # test QUiLoader + mkdir '$(1)'.test + cd '$(1)'.test && '$(TARGET)-cmake' '$(PWD)/src/qttools-test' + $(MAKE) -C '$(1)'.test + cp '$(1)'.test/mxe-cmake-qtuitools.exe \ + '$(PREFIX)/$(TARGET)/bin/test-qttools.exe' +endef + diff --git a/plugins/examples/qt5-freeze/qttranslations.mk b/plugins/examples/qt5-freeze/qttranslations.mk new file mode 100644 index 0000000..0202da4 --- /dev/null +++ b/plugins/examples/qt5-freeze/qttranslations.mk @@ -0,0 +1,24 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qttranslations +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := 16ecdb09532724e80fa6202e5604d80877923b652b771b6020cea36bee0258e7 +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qttranslations,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qttranslations,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qttranslations,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase qttools + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef + diff --git a/plugins/examples/qt5-freeze/qtvirtualkeyboard.mk b/plugins/examples/qt5-freeze/qtvirtualkeyboard.mk new file mode 100644 index 0000000..a2d0bc2 --- /dev/null +++ b/plugins/examples/qt5-freeze/qtvirtualkeyboard.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtvirtualkeyboard +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := b28b8b937ed15d794c5ebc93e9556d08a0c9761a434864ebf2b454554e652add +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qtvirtualkeyboard,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtvirtualkeyboard,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtvirtualkeyboard,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/examples/qt5-freeze/qtwebchannel.mk b/plugins/examples/qt5-freeze/qtwebchannel.mk new file mode 100644 index 0000000..da62620 --- /dev/null +++ b/plugins/examples/qt5-freeze/qtwebchannel.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtwebchannel +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := 63ab3ac76ff993009cfa978162a764e05b763cacb70d1a862893f8de4492319b +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qtwebchannel,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtwebchannel,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtwebchannel,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase qtdeclarative qtwebsockets + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/examples/qt5-freeze/qtwebkit-1-fixes.patch b/plugins/examples/qt5-freeze/qtwebkit-1-fixes.patch new file mode 100644 index 0000000..4590929 --- /dev/null +++ b/plugins/examples/qt5-freeze/qtwebkit-1-fixes.patch @@ -0,0 +1,47 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore +Date: Wed, 18 Jan 2017 19:38:56 +1100 +Subject: [PATCH] fix msys build + +Taken from: +https://github.com/Alexpux/Qt-builds/blob/master/patches/qt/5.0.x/qt-5.0.0-fix-build-under-msys.patch + +diff --git a/Source/WebCore/DerivedSources.pri b/Source/WebCore/DerivedSources.pri +index 1111111..2222222 100644 +--- a/Source/WebCore/DerivedSources.pri ++++ b/Source/WebCore/DerivedSources.pri +@@ -752,7 +752,7 @@ IDL_ATTRIBUTES_FILE = $$PWD/bindings/scripts/IDLAttributes.txt + preprocessIdls.input = IDL_ATTRIBUTES_FILE + preprocessIdls.script = $$PREPROCESS_IDLS_SCRIPT + # FIXME : We need to use only perl at some point. +-win_cmd_shell: preprocessIdls.commands = type nul > $$IDL_FILES_TMP $$EOC ++win_cmd_shell: preprocessIdls.commands = cat /dev/null > $$IDL_FILES_TMP $$EOC + else: preprocessIdls.commands = cat /dev/null > $$IDL_FILES_TMP $$EOC + for(binding, IDL_BINDINGS) { + # We need "$$binding" instead of "$$binding ", because Windows' echo writes trailing whitespaces. (http://wkb.ug/88304) + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Martchus +Date: Sun, 25 Sep 2016 22:21:54 +0200 +Subject: [PATCH] Include intrin.h for declaration of _mm_mfence + +taken from: +https://aur.archlinux.org/cgit/aur.git/tree/0007-Include-intrin.h-for-declaration-of-_mm_mfence.patch?h=mingw-w64-qt5-webkit + +diff --git a/Source/WTF/wtf/Atomics.h b/Source/WTF/wtf/Atomics.h +index 1111111..2222222 100644 +--- a/Source/WTF/wtf/Atomics.h ++++ b/Source/WTF/wtf/Atomics.h +@@ -68,6 +68,8 @@ + #elif !COMPILER(GCC) + extern "C" void _ReadWriteBarrier(void); + #pragma intrinsic(_ReadWriteBarrier) ++#else ++#include + #endif + #include + #elif OS(QNX) diff --git a/plugins/examples/qt5-freeze/qtwebkit.mk b/plugins/examples/qt5-freeze/qtwebkit.mk new file mode 100644 index 0000000..62a7832 --- /dev/null +++ b/plugins/examples/qt5-freeze/qtwebkit.mk @@ -0,0 +1,25 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtwebkit +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := a46cf7c89339645f94a5777e8ae5baccf75c5fc87ab52c9dafc25da3327b5f03 +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(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)))) +$(PKG)_DEPS := gcc qtbase qtmultimedia sqlite + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD_SHARED + # looks for build tools with .exe suffix and tries to use win_flex + $(SED) -i 's,\.exe,,' '$(1)/Tools/qmake/mkspecs/features/functions.prf' + cd '$(1)' && mkdir -p .git && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' FLEX=flex + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/examples/qt5-freeze/qtwebsockets.mk b/plugins/examples/qt5-freeze/qtwebsockets.mk new file mode 100644 index 0000000..00369d7 --- /dev/null +++ b/plugins/examples/qt5-freeze/qtwebsockets.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtwebsockets +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := 5c2a75b68e7f2e98530659b33bb08edee83013832dbf99cc5b40afc8a90652d1 +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qtwebsockets,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtwebsockets,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtwebsockets,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/examples/qt5-freeze/qtwebview.mk b/plugins/examples/qt5-freeze/qtwebview.mk new file mode 100644 index 0000000..96ef4b5 --- /dev/null +++ b/plugins/examples/qt5-freeze/qtwebview.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtwebview +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := b3bcf9693e0205263f5d227f2204cf12c3a3d1e200b3114723511ee3bdf2159f +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qtwebview,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtwebview,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtwebview,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/examples/qt5-freeze/qtwinextras-1.patch b/plugins/examples/qt5-freeze/qtwinextras-1.patch new file mode 100644 index 0000000..c8176c6 --- /dev/null +++ b/plugins/examples/qt5-freeze/qtwinextras-1.patch @@ -0,0 +1,25 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +From dc0cb681cde6899b40923570c29adcf1c20c54cb Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Thu, 6 Aug 2015 20:41:14 +0200 +Subject: [PATCH] fix undefined reference to `__imp_CreateRectRgn' + +Change-Id: I707d168173b210034e3dff9580388fb630d858f8 + +diff --git a/src/winextras/winextras.pro b/src/winextras/winextras.pro +index 7f6bba4..835b2e7 100644 +--- a/src/winextras/winextras.pro ++++ b/src/winextras/winextras.pro +@@ -47,7 +47,7 @@ QMAKE_DOCS = $$PWD/doc/qtwinextras.qdocconf + + DEFINES += NTDDI_VERSION=0x06010000 _WIN32_WINNT=0x0601 + LIBS_PRIVATE += -lole32 -lshlwapi -lshell32 +-win32:!qtHaveModule(opengl)|contains(QT_CONFIG, dynamicgl):LIBS_PRIVATE += -lgdi32 ++win32:shared|!qtHaveModule(opengl)|contains(QT_CONFIG, dynamicgl):LIBS_PRIVATE += -lgdi32 + + OTHER_FILES += \ + doc/qtwinextras.qdocconf \ +-- +2.1.4 + diff --git a/plugins/examples/qt5-freeze/qtwinextras.mk b/plugins/examples/qt5-freeze/qtwinextras.mk new file mode 100644 index 0000000..068a5a3 --- /dev/null +++ b/plugins/examples/qt5-freeze/qtwinextras.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtwinextras +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := 241463a49fef3543b47a2874bd373ddf5a88321de169730db09ae333018ef3cc +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qtwinextras,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtwinextras,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtwinextras,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase qtdeclarative qtmultimedia + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/examples/qt5-freeze/qtxmlpatterns-1.patch b/plugins/examples/qt5-freeze/qtxmlpatterns-1.patch new file mode 100644 index 0000000..f90018c --- /dev/null +++ b/plugins/examples/qt5-freeze/qtxmlpatterns-1.patch @@ -0,0 +1,23 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +From 5a2c60539f7cf6626bbeef3cca44aa172a64cc23 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Sat, 18 May 2013 17:03:55 +0200 +Subject: [PATCH] mingw build fix: _fileno + + +diff --git a/tools/xmlpatterns/xmlpatterns.pro b/tools/xmlpatterns/xmlpatterns.pro +index 0f1ee4f..2fdebb1 100644 +--- a/tools/xmlpatterns/xmlpatterns.pro ++++ b/tools/xmlpatterns/xmlpatterns.pro +@@ -11,6 +11,7 @@ HEADERS = main.h \ + qapplicationargument.cpp \ + qapplicationargumentparser.cpp + ++win32-g++*:QMAKE_CXXFLAGS += -U__STRICT_ANSI__ + load(qt_tool) + + # with c++11 / __STRICT_ANSI__ mingw.org stdio.h doesn't declare e.g. _fileno +-- +1.8.4.5 + diff --git a/plugins/examples/qt5-freeze/qtxmlpatterns.mk b/plugins/examples/qt5-freeze/qtxmlpatterns.mk new file mode 100644 index 0000000..6f6af7b --- /dev/null +++ b/plugins/examples/qt5-freeze/qtxmlpatterns.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtxmlpatterns +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := a805938c2ab1379d7dc83dcec606edd7950b5155c073b9eb53c53e62deb5f8e5 +$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/$(PKG)-[0-9]*.patch))) +$(PKG)_SUBDIR = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtxmlpatterns,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef -- cgit v0.12