diff options
Diffstat (limited to 'src/qtbase.mk')
| -rw-r--r-- | src/qtbase.mk | 34 |
1 files changed, 29 insertions, 5 deletions
diff --git a/src/qtbase.mk b/src/qtbase.mk index 78198f3..30382e9 100644 --- a/src/qtbase.mk +++ b/src/qtbase.mk @@ -3,12 +3,12 @@ PKG := qtbase $(PKG)_IGNORE := -$(PKG)_VERSION := 5.1.0 -$(PKG)_CHECKSUM := 1fe45064daade31db01fe95f076b500a3d43fd24 +$(PKG)_VERSION := 5.2.1 +$(PKG)_CHECKSUM := 32cfec62138a478361711cb5f6c8d1c60a3d8c08 $(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz -$(PKG)_URL := http://download.qt-project.org/official_releases/qt/5.1/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) -$(PKG)_DEPS := gcc libodbc++ postgresql freetds openssl zlib libpng jpeg sqlite pcre fontconfig freetype dbus icu4c +$(PKG)_URL := http://download.qt-project.org/official_releases/qt/5.2/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) +$(PKG)_DEPS := gcc postgresql freetds openssl zlib libpng jpeg sqlite pcre fontconfig freetype dbus icu4c define $(PKG)_UPDATE $(WGET) -q -O- http://download.qt-project.org/official_releases/qt/5.1/ | \ @@ -38,6 +38,7 @@ define $(PKG)_BUILD -accessibility \ -nomake examples \ -nomake tests \ + -no-sql-mysql \ -qt-sql-sqlite \ -qt-sql-odbc \ -qt-sql-psql \ @@ -51,12 +52,35 @@ define $(PKG)_BUILD -dbus-linked \ -v - $(MAKE) -C '$(1)' -j '$(JOBS)' + # invoke qmake with removed debug options as a workaround for + # https://bugreports.qt-project.org/browse/QTBUG-30898 + $(MAKE) -C '$(1)' -j '$(JOBS)' QMAKE="$(1)/bin/qmake CONFIG-='debug debug_and_release'" 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)' $(INSTALL) -m755 '$(1)/test-qt/release/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' + '$(TARGET)-g++' \ + -W -Wall -Werror -std=c++0x -pedantic \ + '$(TOP_DIR)/src/qt-test.cpp' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG)-pkgconfig.exe' \ + -I'$(1)/test-$(PKG)-pkgconfig' \ + `'$(TARGET)-pkg-config' Qt5Widgets --cflags --libs` + + # 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 ,\ + $(subst -qt-sql-,-plugin-sql-,\ + $($(PKG)_BUILD))) |