# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1606503296 18000
# Node ID 8cfad4a448844ff74dde17d248f950d995daf942
# Parent  9d94b3f9d28c495a4bb82f6546e9ba09ea07fc9b
Restore Qt 5.15 for development
(grafted from 19a6cd0f2f60e5c0075eeb33ee92422c925a8a67)

diff -r 9d94b3f9d28c -r 8cfad4a44884 src/qtbase-1-fixes.patch
--- a/src/qtbase-1-fixes.patch	Thu Jul 29 18:56:03 2021 +0200
+++ b/src/qtbase-1-fixes.patch	Fri Nov 27 13:54:56 2020 -0500
@@ -1,6 +1,6 @@
 This file is part of MXE. See LICENSE.md for licensing information.
 
-From 7c5ba14d5b42334edb6a70239cf231f847f508ef Mon Sep 17 00:00:00 2001
+From 2c59523387b10937ff7d085bc34ec3df68805fea Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Wed, 26 Aug 2015 12:45:43 +0100
 Subject: [PATCH 1/2] cmake: Rearrange STATIC vs INTERFACE targets
@@ -12,10 +12,10 @@
 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 364c23e750..c90dd302cf 100644
+index 309798a767..18156cac9e 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -343,6 +343,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -370,6 +370,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
      list(APPEND _Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_INTERFACE_QT5_MODULE_DEPS}\")
  !!ENDIF
  
@@ -25,10 +25,10 @@
  !!IF !isEmpty(CMAKE_STATIC_TYPE)
      if(NOT Qt5_EXCLUDE_STATIC_DEPENDENCIES)
  !!IF !isEmpty(CMAKE_DEBUG_TYPE)
-@@ -380,9 +383,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
- 
+@@ -411,9 +414,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
      add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
      set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
+ !!ENDIF
 -!!ELSE
 -!!IF equals(TEMPLATE, aux)
 -    add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED)
@@ -36,7 +36,32 @@
      add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED)
  !!ENDIF
 -- 
-2.20.1
+2.25.1
+
+
+From c3fa97702a080eb1a931fd1f41f7a1dd5b775523 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Sun, 11 Jun 2017 00:27:41 +0200
+Subject: [PATCH 2/2] use pkg-config for harfbuzz
+
+Change-Id: Ia65cbb90fd180f1bc10ce077a9a8323a48e51421
+
+diff --git a/src/gui/configure.json b/src/gui/configure.json
+index 5ebcdb99b5..2553cb5cf6 100644
+--- a/src/gui/configure.json
++++ b/src/gui/configure.json
+@@ -303,7 +303,8 @@
+             },
+             "headers": "harfbuzz/hb.h",
+             "sources": [
+-                "-lharfbuzz"
++               { "type": "pkgConfig", "args": "harfbuzz" },
++               "-lharfbuzz"
+             ]
+         },
+         "imf": {
+-- 
+2.25.1
 
 diff -ur qtbase-everywhere-src-5.11.0.orig/mkspecs/common/gcc-base.conf qtbase-everywhere-src-5.11.0/mkspecs/common/gcc-base.conf
 --- qtbase-everywhere-src-5.11.0.orig/mkspecs/common/gcc-base.conf     2018-06-12 07:47:54.488874295 -0400
@@ -65,3 +90,4 @@
  #else
              m_fontDatabase = QPlatformIntegration::fontDatabase();
  #endif
+
diff -r 9d94b3f9d28c -r 8cfad4a44884 src/qtbase.mk
--- a/src/qtbase.mk	Thu Jul 29 18:56:03 2021 +0200
+++ b/src/qtbase.mk	Fri Nov 27 13:54:56 2020 -0500
@@ -3,8 +3,8 @@
 
 PKG             := qtbase
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.14.2
-$(PKG)_CHECKSUM := 9de814d3b9005bf984a78e4b564fbb9413e043c4
+$(PKG)_VERSION  := 5.15.0
+$(PKG)_CHECKSUM := f5191757d1125aa7750a3f5d39321490477cfb65
 $(PKG)_SUBDIR   := $(PKG)-everywhere-src-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-everywhere-src-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://download.qt.io/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
diff -r 9d94b3f9d28c -r 8cfad4a44884 src/qtimageformats.mk
--- a/src/qtimageformats.mk	Thu Jul 29 18:56:03 2021 +0200
+++ b/src/qtimageformats.mk	Fri Nov 27 13:54:56 2020 -0500
@@ -4,7 +4,7 @@
 PKG             := qtimageformats
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION   = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 012e05d4fc3ab480aa769ec71f66f241b6d1436a
+$(PKG)_CHECKSUM := e7c816cb8f06c8e88d4b59d084db29dc5fe45a26
 $(PKG)_SUBDIR    = $(subst qtbase,qtimageformats,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtimageformats,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtimageformats,$(qtbase_URL))
diff -r 9d94b3f9d28c -r 8cfad4a44884 src/qtsvg.mk
--- a/src/qtsvg.mk	Thu Jul 29 18:56:03 2021 +0200
+++ b/src/qtsvg.mk	Fri Nov 27 13:54:56 2020 -0500
@@ -4,7 +4,7 @@
 PKG             := qtsvg
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION   = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := b298847fa6619aa50f8d74f6c146e75fd7c88a48
+$(PKG)_CHECKSUM := 6da4345fcb676f8483c282dee1366db31370775b
 $(PKG)_SUBDIR    = $(subst qtbase,qtsvg,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtsvg,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtsvg,$(qtbase_URL))
diff -r 9d94b3f9d28c -r 8cfad4a44884 src/qttools.mk
--- a/src/qttools.mk	Thu Jul 29 18:56:03 2021 +0200
+++ b/src/qttools.mk	Fri Nov 27 13:54:56 2020 -0500
@@ -4,7 +4,7 @@
 PKG             := qttools
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION   = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := 172794608668d772c9ad6cd289bb84e0b3336999
+$(PKG)_CHECKSUM := 9b5ea97ebe7e3e3be118060b42293c4237a465de
 $(PKG)_SUBDIR    = $(subst qtbase,qttools,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qttools,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qttools,$(qtbase_URL))
diff -r 9d94b3f9d28c -r 8cfad4a44884 src/qttranslations.mk
--- a/src/qttranslations.mk	Thu Jul 29 18:56:03 2021 +0200
+++ b/src/qttranslations.mk	Fri Nov 27 13:54:56 2020 -0500
@@ -3,7 +3,7 @@
 PKG             := qttranslations
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION   = $(qtbase_VERSION)
-$(PKG)_CHECKSUM := cf5e6ebf5a2ef2786908c03cbe191b31efa927e0
+$(PKG)_CHECKSUM := fb7b76c23df5ececfbce35a8f5ffba987807194a
 $(PKG)_SUBDIR    = $(subst qtbase,qttranslations,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qttranslations,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qttranslations,$(qtbase_URL))