From fd8781c97a8a74c6e4bc6a91a25b40f0a8f2728d Mon Sep 17 00:00:00 2001
From: Scott Talbert <swt@techie.net>
Date: Fri, 5 Jul 2024 11:08:25 -0400
Subject: [PATCH] Update sip to v6.8.5

---
 buildtools/config.py   | 2 +-
 requirements/devel.txt | 2 +-
 wscript                | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/buildtools/config.py b/buildtools/config.py
index 34418dae..4d5df727 100644
--- a/buildtools/config.py
+++ b/buildtools/config.py
@@ -1065,7 +1065,7 @@ def updateLicenseFiles(cfg):
     # Combine the relevant files into a single LICENSE.txt file
     text = ''
     for filename in ['preamble.txt', 'licence.txt', 'lgpl.txt', 'sip-license.txt']:
-        with open(opj('license', filename), 'r') as f:
+        with open(opj('license', filename), 'r', encoding='utf-8') as f:
             text += f.read() + '\n\n'
     with open('LICENSE.txt', 'w') as f:
         f.write(text)
diff --git a/requirements/devel.txt b/requirements/devel.txt
index 44fa0244..8bf130fb 100644
--- a/requirements/devel.txt
+++ b/requirements/devel.txt
@@ -3,7 +3,7 @@
 appdirs
 setuptools < 45 ; python_version < '3.0'
 setuptools ; python_version >= '3.0'
-sip == 6.8.3
+sip == 6.8.5
 
 wheel
 twine
diff --git a/wscript b/wscript
index 048a3df6..67515d72 100644
--- a/wscript
+++ b/wscript
@@ -570,7 +570,6 @@ def build(bld):
         features = 'c cxx cshlib cxxshlib pyext',
         target   = makeTargetName(bld, 'siplib'),
         source   = ['sip/siplib/apiversions.c',
-                    'sip/siplib/bool.cpp',
                     'sip/siplib/descriptors.c',
                     'sip/siplib/int_convertors.c',
                     'sip/siplib/objmap.c',