From ffc65a4ed2201a4327de2466e57ab6c069b2cfae Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 13 Dec 2012 21:28:04 +0100 Subject: new package qt5 --- index.html | 5 ++++ src/qt5-1-cherrypicks.patch | 70 +++++++++++++++++++++++++++++++++++++++++++++ src/qt5.mk | 65 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 140 insertions(+) create mode 100644 src/qt5-1-cherrypicks.patch create mode 100644 src/qt5.mk diff --git a/index.html b/index.html index 3c4e76e..02a202b 100644 --- a/index.html +++ b/index.html @@ -1849,6 +1849,11 @@ USE_OSGPLUGIN(<plugin2>) Qt + qt5 + 5.0.0-rc2 + Qt + + qwt 6.0.2 Qwt diff --git a/src/qt5-1-cherrypicks.patch b/src/qt5-1-cherrypicks.patch new file mode 100644 index 0000000..637ba85 --- /dev/null +++ b/src/qt5-1-cherrypicks.patch @@ -0,0 +1,70 @@ +This file is part of MXE. +See index.html for further information. + +From 7312016b182b5095f6e2c68b4e2d73319d8529ca Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Mon, 24 Sep 2012 19:53:55 +0200 +Subject: [PATCH] use pkg-config for freetype + +Change-Id: Id0b048b44bcebf066c21efeb89f9c1781023a593 + +diff --git a/qtbase/src/plugins/platforms/windows/windows.pro b/qtbase/src/plugins/platforms/windows/windows.pro +index 7f73465..1de1d74 100644 +--- a/qtbase/src/plugins/platforms/windows/windows.pro ++++ b/qtbase/src/plugins/platforms/windows/windows.pro +@@ -169,6 +169,10 @@ contains(QT_CONFIG, freetype) { + qwindowsfontdatabase_ft.h + SOURCES += \ + qwindowsfontdatabase_ft.cpp ++ static { ++ CONFIG += link_pkgconfig ++ PKGCONFIG += freetype2 ++ } + } + + OTHER_FILES += windows.json +-- +1.7.10.4 + +From 10cb8389c6f4bddfd10c54b2a29bb3b7dd78a525 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Thu, 13 Dec 2012 20:23:48 +0100 +Subject: [PATCH] remove duplicate defs (mxe-specific) + + +diff --git a/qtmultimedia/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp b/qtmultimedia/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp +index 3c66d05..10e8037 100644 +--- a/qtmultimedia/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp ++++ b/qtmultimedia/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp +@@ -67,19 +67,19 @@ typedef struct _DDPIXELFORMAT* LPDDPIXELFORMAT; + #else + + extern GUID CLSID_AudioInputDeviceCategory; +-extern GUID CLSID_AudioRendererCategory; +-extern GUID IID_ICreateDevEnum; +-extern GUID CLSID_SystemDeviceEnum; ++//extern GUID CLSID_AudioRendererCategory; ++//extern GUID IID_ICreateDevEnum; ++//extern GUID CLSID_SystemDeviceEnum; + + #ifndef __ICreateDevEnum_INTERFACE_DEFINED__ + #define __ICreateDevEnum_INTERFACE_DEFINED__ + +-DECLARE_INTERFACE_(ICreateDevEnum, IUnknown) +-{ +- STDMETHOD(CreateClassEnumerator)(REFCLSID clsidDeviceClass, +- IEnumMoniker **ppEnumMoniker, +- DWORD dwFlags) PURE; +-}; ++//DECLARE_INTERFACE_(ICreateDevEnum, IUnknown) ++//{ ++// STDMETHOD(CreateClassEnumerator)(REFCLSID clsidDeviceClass, ++// IEnumMoniker **ppEnumMoniker, ++// DWORD dwFlags) PURE; ++//}; + + #endif // __ICreateDevEnum_INTERFACE_DEFINED__ + +-- +1.7.10.4 + diff --git a/src/qt5.mk b/src/qt5.mk new file mode 100644 index 0000000..241771b --- /dev/null +++ b/src/qt5.mk @@ -0,0 +1,65 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qt5 +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 0be5c66e9132e4d7c82a1f6f5569165186dba5f6 +$(PKG)_SUBDIR := qt-everywhere-opensource-src-$($(PKG)_VERSION) +$(PKG)_FILE := qt-everywhere-opensource-src-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := http://releases.qt-project.org/qt5.0/rc2/single/$($(PKG)_FILE) +$(PKG)_DEPS := gcc libodbc++ postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite dbus pcre fontconfig freetype + +define $(PKG)_UPDATE + echo 'Warning: Updates are temporarily disabled for package qt5.' >&2; +endef + +define $(PKG)_BUILD + cd '$(1)' && \ + OPENSSL_LIBS="`'$(TARGET)-pkg-config' --libs-only-l openssl`" \ + PSQL_LIBS="-lpq -lsecur32 `'$(TARGET)-pkg-config' --libs-only-l openssl` -lws2_32" \ + SYBASE_LIBS="-lsybdb `'$(TARGET)-pkg-config' --libs-only-l gnutls` -liconv -lws2_32" \ + ./configure \ + -opensource \ + -confirm-license \ + -fast \ + -xplatform win32-g++ \ + -device-option CROSS_COMPILE=${TARGET}- \ + -device-option PKG_CONFIG='${TARGET}-pkg-config' \ + -force-pkg-config \ + -release \ + -static \ + -prefix '$(PREFIX)/$(TARGET)/qt5' \ + -opengl desktop \ + -no-glib \ + -accessibility \ + -no-reduce-exports \ + -no-rpath \ + -nomake demos \ + -nomake examples \ + -nomake docs \ + -nomake tests \ + -qt-sql-sqlite \ + -qt-sql-odbc \ + -qt-sql-psql \ + -qt-sql-tds -D Q_USE_SYBASE \ + -system-zlib \ + -system-libpng \ + -system-libjpeg \ + -system-sqlite \ + -system-pcre \ + -openssl-linked \ + -dbus-linked \ + -v + + $(MAKE) -C '$(1)' -j '$(JOBS)' + rm -rf '$(PREFIX)/$(TARGET)/qt5' + $(MAKE) -C '$(1)' -j 1 install + + # missing plugin description files + $(INSTALL) -m644 '$(1)/qtbase/mkspecs/modules/qt_plugin_'*'.pri' '$(PREFIX)/$(TARGET)/qt5/mkspecs/modules/' + + 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)' + $(INSTALL) -m755 '$(1)/test-qt/release/test-qt5.exe' '$(PREFIX)/$(TARGET)/bin/' +endef -- cgit v0.12