1f4572677a
v4.16.2 3rd July 2014
- Deprecated the %ConsolidatedModule directive as it won't be supported in
SIP v5.
- Bug fixes.
v4.16.1 9th June 2014
- Bug fixes.
v4.16 26th May 2014
- Added the /NoSetter/ variable annotation.
- Added the -B option to sip.
- Changed the handling of timelines (introducing a potential incompatibility)
so that later versions of wrapped libraries can be wrapped so long as they
are compatible with known versions.
- Added support for the 'no_receiver_check' argument to connect() in PyQt
v4.11.
- Added the --configuration option to configure.py.
- Added the --sysroot option to configure.py.
- Added the --target-py-version option to configure.py.
- Added the --no-tools option to configure.py.
- Added the --use-qmake option to configure.py.
- Bug fixes.
v4.15.5 14th March 2014
- The use_arch argument of sipconfig.create_wrapper() can now specify a space
separated set of architectures.
- Bug fixes.
v4.15.4 8th January 2014
- Added SIP_SSIZE_T_FORMAT to the C API.
- Bug fixes (specifically for PyQt5).
v4.15.3 16th October 2013
- Bug fixes (specifically for PyQtChart).
v4.15.2 14th September 2013
- sipConvertToArray() will now optionally take ownership of the array memory.
- Added support for char, unsigned char, short, int, float and double as
array types.
- Bug fixes.
v4.15.1 23rd August 2013
- Fixes a regression in the handling of hidden virtual methods.
v4.15 21st August 2013
- Added the call_super_init argument to the %Module directive to specify that
classes should support cooperative multi-inheritance.
- Added the %FinalisationCode directive.
- Added the /Mixin/ class annotation.
- Added the /NoScope/ enum annotation.
- Added sipConvertFromNewPyType() to the C API.
- Added sipConvertToArray() and sipConvertToTypedArray() to the C API.
- Added sipRegisterProxyResolver() to the C API.
- Bug fixes.
50 lines
1.7 KiB
Text
50 lines
1.7 KiB
Text
$NetBSD: patch-aa,v 1.9 2014/08/21 21:32:39 wiz Exp $
|
|
|
|
--- configure.py.orig 2014-07-03 10:08:46.000000000 +0000
|
|
+++ configure.py
|
|
@@ -19,6 +19,7 @@ import sys
|
|
import os
|
|
import glob
|
|
import optparse
|
|
+import imp
|
|
from distutils import sysconfig
|
|
|
|
try:
|
|
@@ -220,7 +221,7 @@ def set_platform_directories():
|
|
|
|
plat_py_lib_dir = lib_dir + "/config"
|
|
plat_bin_dir = sys.exec_prefix + "/bin"
|
|
- plat_sip_dir = sys.prefix + "/share/sip"
|
|
+ plat_sip_dir = sys.prefix + "/share/sip%s" % sys.version[0:3]
|
|
|
|
|
|
def patch_files():
|
|
@@ -273,7 +274,7 @@ def create_config(module, template, macr
|
|
"sip_version": sip_version,
|
|
"sip_version_str": sip_version_str,
|
|
"platform": build_platform,
|
|
- "sip_bin": os.path.join(sip_bin_dir, "sip"),
|
|
+ "sip_bin": os.path.join(sip_bin_dir, "sip%s" % sys.version[0:3]),
|
|
"sip_inc_dir": sip_inc_dir,
|
|
"sip_mod_dir": sip_module_dir,
|
|
"default_bin_dir": plat_bin_dir,
|
|
@@ -310,9 +311,17 @@ def create_makefiles(macros):
|
|
subdirs = ["siplib"]
|
|
installs = None
|
|
else:
|
|
+ pyc_file = "sipconfig.pyc"
|
|
+ pyc_dir = cfg.sip_mod_dir
|
|
+ try:
|
|
+ pyc_file = imp.cache_from_source("sipconfig.py")
|
|
+ pyc_dir = os.path.join(cfg.sip_mod_dir, "__pycache__")
|
|
+ except AttributeError:
|
|
+ pass
|
|
+
|
|
subdirs = ["sipgen", "siplib"]
|
|
- installs = (["sipconfig.py", os.path.join(src_dir, "sipdistutils.py")],
|
|
- cfg.sip_mod_dir)
|
|
+ installs = [(["sipconfig.py", os.path.join(src_dir, "sipdistutils.py")],
|
|
+ cfg.sip_mod_dir), ([pyc_file], pyc_dir)]
|
|
|
|
if opts.use_qmake:
|
|
sipconfig.inform("Creating top level .pro file...")
|