diff options
author | wiz <wiz@pkgsrc.org> | 2014-08-21 21:32:38 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2014-08-21 21:32:38 +0000 |
commit | bda3634db48d6cc22674b255b5fd9ef1839d915b (patch) | |
tree | 245f6e8c61064c86a83ac26e07a29b0e7b0119fc /x11 | |
parent | 9201a1e2a6b85dabd8dad8b7b7f6d731750827a8 (diff) | |
download | pkgsrc-bda3634db48d6cc22674b255b5fd9ef1839d915b.tar.gz |
Update to 4.16.2:
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.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/py-sip/Makefile | 4 | ||||
-rw-r--r-- | x11/py-sip/distinfo | 12 | ||||
-rw-r--r-- | x11/py-sip/patches/patch-aa | 54 | ||||
-rw-r--r-- | x11/py-sip/patches/patch-siputils.py | 15 |
4 files changed, 36 insertions, 49 deletions
diff --git a/x11/py-sip/Makefile b/x11/py-sip/Makefile index d169a016349..b2ba534616f 100644 --- a/x11/py-sip/Makefile +++ b/x11/py-sip/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.42 2014/01/25 10:30:32 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2014/08/21 21:32:38 wiz Exp $ -DISTNAME= sip-4.14.7 +DISTNAME= sip-4.16.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= x11 devel python #MASTER_SITES= http://www.riverbankcomputing.com/static/Downloads/sip4/ diff --git a/x11/py-sip/distinfo b/x11/py-sip/distinfo index 82747051ae9..1a3522804e6 100644 --- a/x11/py-sip/distinfo +++ b/x11/py-sip/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.35 2014/01/10 17:41:07 jperkin Exp $ +$NetBSD: distinfo,v 1.36 2014/08/21 21:32:38 wiz Exp $ -SHA1 (sip-4.14.7.tar.gz) = ee048f6db7257d1eae2d9d2e407c1657c8888023 -RMD160 (sip-4.14.7.tar.gz) = 2148334fa22d0002ec92d3446d9c3536bb1e0c70 -Size (sip-4.14.7.tar.gz) = 754916 bytes -SHA1 (patch-aa) = 353f3c08b4eb27a329221ecfeec6feb0dca4b287 +SHA1 (sip-4.16.2.tar.gz) = 4d3ebce6ec7c31d8a862a6ee307a5f6c3e67349b +RMD160 (sip-4.16.2.tar.gz) = 5bdc04a4c93deed92dc0838baf590b938ea333eb +Size (sip-4.16.2.tar.gz) = 793663 bytes +SHA1 (patch-aa) = 813eeed9d8608a2049e3cc819d31876afdada3aa SHA1 (patch-ab) = 044f78528dc67f7585c15b0fb3ec116ff11e31a6 -SHA1 (patch-siputils.py) = cdacb4733dd6e99a9d88a8febe7a796985f807bd +SHA1 (patch-siputils.py) = 8e5cccfb5e17df54550fc352df35c4065ef36b65 diff --git a/x11/py-sip/patches/patch-aa b/x11/py-sip/patches/patch-aa index 368afecff54..bb36284fbc4 100644 --- a/x11/py-sip/patches/patch-aa +++ b/x11/py-sip/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.8 2013/09/05 15:27:42 drochner Exp $ +$NetBSD: patch-aa,v 1.9 2014/08/21 21:32:39 wiz Exp $ ---- configure.py.orig 2012-02-10 10:03:04.000000000 +0000 +--- configure.py.orig 2014-07-03 10:08:46.000000000 +0000 +++ configure.py @@ -19,6 +19,7 @@ import sys import os @@ -9,8 +9,8 @@ $NetBSD: patch-aa,v 1.8 2013/09/05 15:27:42 drochner Exp $ +import imp from distutils import sysconfig - import siputils -@@ -211,7 +212,7 @@ def set_platform_directories(): + try: +@@ -220,7 +221,7 @@ def set_platform_directories(): plat_py_lib_dir = lib_dir + "/config" plat_bin_dir = sys.exec_prefix + "/bin" @@ -19,34 +19,32 @@ $NetBSD: patch-aa,v 1.8 2013/09/05 15:27:42 drochner Exp $ def patch_files(): -@@ -264,7 +265,7 @@ def create_config(module, template, macr +@@ -273,7 +274,7 @@ def create_config(module, template, macr "sip_version": sip_version, "sip_version_str": sip_version_str, - "platform": opts.platform, -- "sip_bin": os.path.join(opts.sipbindir, "sip"), -+ "sip_bin": os.path.join(opts.sipbindir, "sip%s" % sys.version[0:3]), - "sip_inc_dir": opts.sipincdir, - "sip_mod_dir": opts.sipmoddir, + "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, -@@ -297,11 +298,19 @@ def create_makefiles(macros): - - sipconfig.inform("Creating top level Makefile...") - -+ 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 +@@ -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 + - sipconfig.ParentMakefile( - configuration=cfg, - subdirs=["sipgen", "siplib"], -- installs=(["sipconfig.py", os.path.join(src_dir, "sipdistutils.py")], + 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")], ++ installs = [(["sipconfig.py", os.path.join(src_dir, "sipdistutils.py")], + cfg.sip_mod_dir), ([pyc_file], pyc_dir)] - ).generate() - sipconfig.inform("Creating sip code generator Makefile...") + if opts.use_qmake: + sipconfig.inform("Creating top level .pro file...") diff --git a/x11/py-sip/patches/patch-siputils.py b/x11/py-sip/patches/patch-siputils.py index eafbbfb1062..8cffbe045ce 100644 --- a/x11/py-sip/patches/patch-siputils.py +++ b/x11/py-sip/patches/patch-siputils.py @@ -1,8 +1,8 @@ -$NetBSD: patch-siputils.py,v 1.1 2014/01/10 17:41:07 jperkin Exp $ +$NetBSD: patch-siputils.py,v 1.2 2014/08/21 21:32:39 wiz Exp $ Fix build on Darwin with pkgsrc python. ---- siputils.py.orig 2013-03-28 21:14:10.000000000 +0000 +--- siputils.py.orig 2014-05-10 15:00:48.000000000 +0000 +++ siputils.py @@ -258,6 +258,9 @@ class Makefile: self._installs = installs @@ -14,14 +14,3 @@ Fix build on Darwin with pkgsrc python. # Make sure the destination directory is an absolute path. if dir: self.dir = os.path.abspath(dir) -@@ -1561,8 +1564,8 @@ class ModuleMakefile(Makefile): - # Note that I can't remember why we need a framework build. - dl = get_python_inc().split(os.sep) - -- if "Python.framework" not in dl: -- error("SIP requires Python to be built as a framework") -+ #if "Python.framework" not in dl: -+ # error("SIP requires Python to be built as a framework") - - self.LFLAGS.append("-undefined dynamic_lookup") - |