Created
June 2, 2017 06:32
-
-
Save rkfg/0dfb4611b5fa29377c08ec31e0cfa0d2 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/qtbase-1-fixes.patch b/src/qtbase-1-fixes.patch | |
index c3f14eab..85e25dc2 100644 | |
--- a/src/qtbase-1-fixes.patch | |
+++ b/src/qtbase-1-fixes.patch | |
@@ -104,91 +104,26 @@ index 31d6285..8e24520 100644 | |
-- | |
2.9.3 | |
- | |
-From e4da2904bcab29d15ad137508390bec0595c0e72 Mon Sep 17 00:00:00 2001 | |
-From: Mark Brand <[email protected]> | |
-Date: Sun, 29 Jan 2017 13:02:16 +0100 | |
-Subject: [PATCH 3/5] reenable fontconfig for win32 (MXE-specific) | |
- | |
-Change-Id: I05b036366bd402e43309742412bcf8ca91fe125f | |
- | |
-diff --git a/src/gui/configure.json b/src/gui/configure.json | |
-index 1f50116..dd94429 100644 | |
---- a/src/gui/configure.json | |
-+++ b/src/gui/configure.json | |
-@@ -471,7 +471,7 @@ | |
- }, | |
- "fontconfig": { | |
- "label": "Fontconfig", | |
-- "condition": "!config.win32 && !config.darwin && features.system-freetype && libs.fontconfig", | |
-+ "condition": "!config.darwin && features.system-freetype && libs.fontconfig", | |
- "output": [ "privateFeature", "feature" ] | |
- }, | |
- "gbm": { | |
-diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp | |
-index 03c7250..7d0ffbd 100644 | |
---- a/src/plugins/platforms/minimal/qminimalintegration.cpp | |
-+++ b/src/plugins/platforms/minimal/qminimalintegration.cpp | |
-@@ -120,7 +120,11 @@ QPlatformFontDatabase *QMinimalIntegration::fontDatabase() const | |
- if (m_options & EnableFonts) { | |
- #if QT_CONFIG(fontconfig) | |
- if (!m_fontDatabase) | |
-+#ifdef Q_OS_WIN | |
-+ m_fontDatabase = new QBasicFontDatabase; | |
-+#else | |
- m_fontDatabase = new QGenericUnixFontDatabase; | |
-+#endif | |
- #else | |
- return QPlatformIntegration::fontDatabase(); | |
- #endif | |
--- | |
-2.9.3 | |
- | |
- | |
-From db3c6f5fecb9b93f3553273576954d363d0630bc Mon Sep 17 00:00:00 2001 | |
-From: Mark Brand <[email protected]> | |
-Date: Sun, 29 Jan 2017 14:00:06 +0100 | |
-Subject: [PATCH 4/5] fix included file name case | |
- | |
-Change-Id: I026787441aa43128aec001cfe1a7bc8d37799826 | |
- | |
-diff --git a/src/plugins/platforms/windows/qwin10helpers.cpp b/src/plugins/platforms/windows/qwin10helpers.cpp | |
-index 977bbfd..12cccd1 100644 | |
---- a/src/plugins/platforms/windows/qwin10helpers.cpp | |
-+++ b/src/plugins/platforms/windows/qwin10helpers.cpp | |
-@@ -57,7 +57,7 @@ | |
- #endif | |
- | |
- #ifdef HAS_UI_VIEW_SETTINGS_INTEROP | |
--# include <UIViewSettingsInterop.h> | |
-+# include <uiviewsettingsinterop.h> | |
- #endif | |
- | |
- #ifndef HAS_UI_VIEW_SETTINGS_INTEROP | |
--- | |
-2.9.3 | |
- | |
- | |
-From ddf845adb0080016c2f69fcfa7e23edf70e5151a Mon Sep 17 00:00:00 2001 | |
-From: Mark Brand <[email protected]> | |
-Date: Sun, 29 Jan 2017 16:22:03 +0100 | |
-Subject: [PATCH 5/5] fix treatment of SYBASE_LIBS | |
- | |
-Change-Id: I4c9914cf7ef9d91feb0718a57f2551c1eeed47e0 | |
- | |
-diff --git a/src/sql/configure.pri b/src/sql/configure.pri | |
-index 1d8847b..229b6a1 100644 | |
---- a/src/sql/configure.pri | |
-+++ b/src/sql/configure.pri | |
-@@ -76,7 +76,7 @@ defineTest(qtConfLibrary_sybaseEnv) { | |
- libs += "-L$${sybase}/lib" | |
- libs += $$getenv(SYBASE_LIBS) | |
- !isEmpty(libs) { | |
-- $${1}.libs = "$$val_escape(libs)" | |
-+ $${1}.libs = $$libs | |
- export($${1}.libs) | |
- } | |
- return(true) | |
--- | |
-2.9.3 | |
- | |
+diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri | |
+index eba0593..aee6927 100644 | |
+--- a/src/plugins/platforms/windows/windows.pri | |
++++ b/src/plugins/platforms/windows/windows.pri | |
+@@ -124,6 +124,7 @@ contains(QT_CONFIG, freetype) { | |
+ SOURCES += \ | |
+ $$PWD/qwindowsfontdatabase_ft.cpp | |
+ } else:contains(QT_CONFIG, system-freetype) { | |
++ CONFIG += qpa/basicunixfontdatabase | |
+ include($$QT_SOURCE_TREE/src/platformsupport/fontdatabases/basic/basic.pri) | |
+ HEADERS += \ | |
+ $$PWD/qwindowsfontdatabase_ft.h | |
+ | |
+ | |
+diff --git a/mkspecs/features/qpa/basicunixfontdatabase.prf b/mkspecs/features/qpa/basicunixfontdatabase.prf | |
+index 261eadb..7189d52 100644 | |
+--- a/mkspecs/features/qpa/basicunixfontdatabase.prf | |
++++ b/mkspecs/features/qpa/basicunixfontdatabase.prf | |
+@@ -1,3 +1,3 @@ | |
+ contains(QT_CONFIG, system-freetype) { | |
+- LIBS += -lfreetype | |
++ LIBS += -lfreetype -lbz2 | |
+ } | |
diff --git a/src/qtbase.mk b/src/qtbase.mk | |
index bb671210..08959708 100644 | |
--- a/src/qtbase.mk | |
+++ b/src/qtbase.mk | |
@@ -4,11 +4,11 @@ PKG := qtbase | |
$(PKG)_WEBSITE := https://www.qt.io/ | |
$(PKG)_DESCR := Qt | |
$(PKG)_IGNORE := | |
-$(PKG)_VERSION := 5.8.0 | |
-$(PKG)_CHECKSUM := c17111ae02a44dc7be1ec2cf979a47ee9e58edf4904041a525c21f4fa53fc005 | |
+$(PKG)_VERSION := 5.5.1 | |
+$(PKG)_CHECKSUM := dfa4e8a4d7e4c6b69285e7e8833eeecd819987e1bdbe5baa6b6facd4420de916 | |
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION) | |
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz | |
-$(PKG)_URL := https://download.qt.io/official_releases/qt/5.8/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) | |
+$(PKG)_URL := https://download.qt.io/archive/qt/5.5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) | |
$(PKG)_DEPS := gcc dbus fontconfig freetds freetype harfbuzz jpeg libmysqlclient libpng openssl pcre postgresql sqlite zlib | |
define $(PKG)_UPDATE | |
@@ -30,7 +30,6 @@ define $(PKG)_BUILD | |
PKG_CONFIG_LIBDIR="$(PREFIX)/$(TARGET)/lib/pc" \ | |
./configure \ | |
-opensource \ | |
- -c++std c++11 \ | |
-confirm-license \ | |
-xplatform win32-g++ \ | |
-device-option CROSS_COMPILE=${TARGET}- \ | |
diff --git a/src/qtmultimedia.mk b/src/qtmultimedia.mk | |
index f341d1d7..2b498695 100644 | |
--- a/src/qtmultimedia.mk | |
+++ b/src/qtmultimedia.mk | |
@@ -5,7 +5,7 @@ $(PKG)_WEBSITE := https://www.qt.io/ | |
$(PKG)_DESCR := Qt | |
$(PKG)_IGNORE := | |
$(PKG)_VERSION = $(qtbase_VERSION) | |
-$(PKG)_CHECKSUM := a8bc044834f95208261915feefe5e2fdb6761b76f0f99e21062963bd9f9d4a07 | |
+$(PKG)_CHECKSUM := 7cc7ca99f41587c188303670499e5c75101f9a8cb6178e8f29cc941e637d957f | |
$(PKG)_SUBDIR = $(subst qtbase,qtmultimedia,$(qtbase_SUBDIR)) | |
$(PKG)_FILE = $(subst qtbase,qtmultimedia,$(qtbase_FILE)) | |
$(PKG)_URL = $(subst qtbase,qtmultimedia,$(qtbase_URL)) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment