From c4b4ce60763ffa8f47598906bbd5abd221bf3a3e Mon Sep 17 00:00:00 2001
From: Scott Talbert <swt@techie.net>
Date: Fri, 25 Oct 2019 22:34:41 -0400
Subject: [PATCH] Unbundle sip

---
 buildtools/config.py |  4 ----
 wscript              | 23 +----------------------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/buildtools/config.py b/buildtools/config.py
index e7691a69..435aaca0 100644
--- a/buildtools/config.py
+++ b/buildtools/config.py
@@ -968,10 +968,6 @@ def updateLicenseFiles(cfg):
         copy_file(opj(cfg.WXDIR, 'docs', filename), opj('license',filename),
                       update=1, verbose=1)
 
-    # Get the sip license too
-    copy_file(opj('sip', 'siplib', 'LICENSE'), opj('license', 'sip-license.txt'),
-              update=1, verbose=1)
-
     # Combine the relevant files into a single LICENSE.txt file
     text = ''
     for filename in ['preamble.txt', 'licence.txt', 'lgpl.txt', 'sip-license.txt']:
diff --git a/wscript b/wscript
index 5ea9cb2e..36d2819b 100644
--- a/wscript
+++ b/wscript
@@ -115,7 +115,7 @@ def configure(conf):
     conf.env.msvc_relwithdebug = conf.options.msvc_relwithdebug
 
     # Ensure that the headers in siplib and Phoenix's src dir can be found
-    conf.env.INCLUDES_WXPY = ['sip/siplib', 'wx/include', 'src']
+    conf.env.INCLUDES_WXPY = ['wx/include', 'src']
 
     if isWindows:
         # Windows/MSVC specific stuff
@@ -577,28 +577,7 @@ def build(bld):
     for name in ['src/__init__.py', 'src/gizmos.py',]:
         copy_file(name, cfg.PKGDIR, update=1, verbose=1)
 
-    # Copy sip's sip.h for distribution with wxPython's header
-    copy_file('sip/siplib/sip.h', 'wx/include/wxPython', update=1, verbose=1)
-
     # Create the build tasks for each of our extension modules.
-    addRelwithdebugFlags(bld, 'siplib')
-    siplib = bld(
-        features = 'c cxx cshlib cxxshlib pyext',
-        target   = makeTargetName(bld, 'siplib'),
-        source   = ['sip/siplib/apiversions.c',
-                    'sip/siplib/array.c',
-                    'sip/siplib/bool.cpp',
-                    'sip/siplib/descriptors.c',
-                    'sip/siplib/int_convertors.c',
-                    'sip/siplib/objmap.c',
-                    'sip/siplib/qtlib.c',
-                    'sip/siplib/siplib.c',
-                    'sip/siplib/threads.c',
-                    'sip/siplib/voidptr.c',
-                    ],
-        uselib   = 'siplib WX WXPY',
-    )
-    makeExtCopyRule(bld, 'siplib')
 
     # Add build rules for each of our ETG generated extension modules
     makeETGRule(bld, 'etg/_core.py',       '_core',      'WX')
-- 
2.21.0