From b8d4e78bb23d31d8a7e605e31dae0335ac86b5d3 Mon Sep 17 00:00:00 2001
From: Silarn <jrim@rimpo.org>
Date: Mon, 6 Apr 2020 09:28:13 -0500
Subject: [PATCH] Updates to Qt, PyQt5, SIP, openssl, NMM, spdlog, python

---
 config.py                     | 20 ++++++++++----------
 patches/pyqt5_configure.patch | 13 +++++++------
 unibuild/projects/pyqt5.py    |  2 +-
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/config.py b/config.py
index 3bc024f..3890b3d 100644
--- a/config.py
+++ b/config.py
@@ -95,21 +95,21 @@ config = {
     'lz4_version_minor': '', # leave empty if no patch version (1.2.3.x)
     'nasm_version': '2.14.02',
     'nuget_version': '4.9.3',
-    'nmm_version': '0.70.11',
-    'openssl_version': '1.1.1d',
-    'pyqt_version': '5.14.1',
-    'pyqt_pypi_hash': '3a/fb/eb51731f2dc7c22d8e1a63ba88fb702727b324c6352183a32f27f73b8116',
+    'nmm_version': '0.71.2',
+    'openssl_version': '1.1.1f',
+    'pyqt_version': '5.14.2',
+    'pyqt_pypi_hash': '4d/81/b9a66a28fb9a7bbeb60e266f06ebc4703e7e42b99e3609bf1b58ddd232b9',
     'pyqt_dev_version': '', # leave empty for a standard release
-    'pyqt_builder_version': '1.2.0',
-    'pyqt_sip_version': '12.7.1',
+    'pyqt_builder_version': '1.3.0',
+    'pyqt_sip_version': '12.7.2',
     'python_version': '3.8',
-    'python_version_minor': '.1',
+    'python_version_minor': '.2',
     'bzip2_version': '1.0.6', # For python
-    'sip_version': '5.1.1',
+    'sip_version': '5.1.2',
     'sip_dev_version': '', # leave empty for a standard release
-    'spdlog_version': 'v1.4.2',
+    'spdlog_version': 'v1.5.0',
     'qt_version': '5.14',
-    'qt_version_minor': '1',
+    'qt_version_minor': '2',
     'qt_version_appveyor': '5.14',
     'qt_version_minor_appveyor': '1',
     'qt_vc_version': '15.0',
diff --git a/patches/pyqt5_configure.patch b/patches/pyqt5_configure.patch
index 79a7d2c..4fab24c 100644
--- a/patches/pyqt5_configure.patch
+++ b/patches/pyqt5_configure.patch
@@ -1,9 +1,9 @@
 --- builder.py	(date 1575938575861)
 +++ builder.py	(date 1575938575861)
-@@ -398,16 +398,29 @@
+@@ -402,17 +402,29 @@
                      'QMAKE_LFLAGS += -Wl,--version-script={}.exp'.format(
                              buildable.target))
-
+ 
 -        pro_lines.append(
 +        if project.py_platform == 'win32':
 +            for include_dir in project.py_include_dir.split(';'):
@@ -15,7 +15,7 @@
                  'INCLUDEPATH += {}'.format(
 -                        self.qmake_quote(project.py_include_dir)))
 +                    self.qmake_quote(project.py_include_dir)))
-
+ 
 +        if project.py_pylib_shlib != "":
 +            pro_lines.append(
 +                    'DEFINES += {}'.format(
@@ -27,9 +27,10 @@
          # TODO: is this still necessary for Python v3.8?
          if not buildable.static:
              pro_lines.extend(['win32 {',
--                    '    LIBS += -L{}'.format(project.py_pylib_dir),
+-                    '    LIBS += -L{}'.format(
+-                            self.qmake_quote(project.py_pylib_dir)),
 +                    '    LIBS += -L{}{}'.format(
-+                        project.py_pylib_dir, '' if project.py_pylib_lib == '' else ' -l' + project.py_pylib_lib),
++                            self.qmake_quote(project.py_pylib_dir), '' if project.py_pylib_lib == '' else ' -l' + project.py_pylib_lib),
                      '}'])
-
+ 
          # Add any installables from the buildable
\ No newline at end of file
diff --git a/unibuild/projects/pyqt5.py b/unibuild/projects/pyqt5.py
index d7fd0cb..8091993 100644
--- a/unibuild/projects/pyqt5.py
+++ b/unibuild/projects/pyqt5.py
@@ -45,7 +45,7 @@ qt_binary_install = config["paths"]["qt_binary_install"]
 __build_base_path = config["__build_base_path"]
 
 enabled_modules = ["QtCore", "QtGui", "QtWidgets", "QtOpenGL", "_QOpenGLFunctions_2_0",
-                   "_QOpenGLFunctions_2_1", "_QOpenGLFunctions_4_1_Core", "_QOpenGLFunctions_ES2"]
+                   "_QOpenGLFunctions_2_1", "_QOpenGLFunctions_4_1_Core"] #, "_QOpenGLFunctions_ES2"]
 
 
 def pyqt5_env():