pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/py-sip py-sip: updated to 4.19.7
details: https://anonhg.NetBSD.org/pkgsrc/rev/f06223e25432
branches: trunk
changeset: 374985:f06223e25432
user: adam <adam%pkgsrc.org@localhost>
date: Thu Feb 01 21:03:09 2018 +0000
description:
py-sip: updated to 4.19.7
v4.19.7
- The %Docstring directive can now include automatically generated signature
descriptions using the "signature" option.
- typedefs can now have %Docstring directives.
- Bug fixes.
diffstat:
x11/py-sip/Makefile | 5 +-
x11/py-sip/distinfo | 15 ++--
x11/py-sip/patches/patch-aa | 50 ------------------
x11/py-sip/patches/patch-ab | 12 ----
x11/py-sip/patches/patch-configure.py | 50 ++++++++++++++++++
x11/py-sip/patches/patch-sipgen_gencode.c | 82 ------------------------------
x11/py-sip/patches/patch-sipgen_sipgen.sbf | 12 ++++
7 files changed, 71 insertions(+), 155 deletions(-)
diffs (261 lines):
diff -r 904450751905 -r f06223e25432 x11/py-sip/Makefile
--- a/x11/py-sip/Makefile Thu Feb 01 21:00:25 2018 +0000
+++ b/x11/py-sip/Makefile Thu Feb 01 21:03:09 2018 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2018/01/26 15:47:18 jperkin Exp $
+# $NetBSD: Makefile,v 1.52 2018/02/01 21:03:09 adam Exp $
-DISTNAME= sip-4.19.5
+DISTNAME= sip-4.19.7
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION= 1
CATEGORIES= x11 devel python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pyqt/}
diff -r 904450751905 -r f06223e25432 x11/py-sip/distinfo
--- a/x11/py-sip/distinfo Thu Feb 01 21:00:25 2018 +0000
+++ b/x11/py-sip/distinfo Thu Feb 01 21:03:09 2018 +0000
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.40 2018/01/26 15:47:18 jperkin Exp $
+$NetBSD: distinfo,v 1.41 2018/02/01 21:03:09 adam Exp $
-SHA1 (sip-4.19.5.tar.gz) = 654f02563bf0b67253abcee3e2249acfdfb21b08
-RMD160 (sip-4.19.5.tar.gz) = d7b2b3bfd8f350c6be1d6bfe9d3761ad1cb73320
-SHA512 (sip-4.19.5.tar.gz) = 15d0c0daacf11534a61cd3961613e0015afb9f61fd484094008d1b3d344765d03a2bed2eb08c92a347bbe6868622ab1f7dc0a3bd3e2e662a8e08a53ac8e88463
-Size (sip-4.19.5.tar.gz) = 1019157 bytes
-SHA1 (patch-aa) = 813eeed9d8608a2049e3cc819d31876afdada3aa
-SHA1 (patch-ab) = a331efb38a1fadd799e00be34f076c8b8f6e3071
-SHA1 (patch-sipgen_gencode.c) = a9abb5e9fa488ef46864f5c25e1e353494c43378
+SHA1 (sip-4.19.7.tar.gz) = 777885fe8c4617292c253a8571c12110cb82630f
+RMD160 (sip-4.19.7.tar.gz) = 256ebea80277b59861698edb4b583aff3d6d9f4b
+SHA512 (sip-4.19.7.tar.gz) = 0cead34e129d25ee3d908e503a3853289bbfd77c58c563a2046ce7b65bd8f0b318b20af72346cbf4cb7a17e76c9c1374f686b5dabc284d7247897a1648c15f97
+Size (sip-4.19.7.tar.gz) = 1022209 bytes
+SHA1 (patch-configure.py) = 813eeed9d8608a2049e3cc819d31876afdada3aa
+SHA1 (patch-sipgen_sipgen.sbf) = a331efb38a1fadd799e00be34f076c8b8f6e3071
SHA1 (patch-siputils.py) = fa69e6b957697cdb9afb3c44d9d4b42ab8a604f3
diff -r 904450751905 -r f06223e25432 x11/py-sip/patches/patch-aa
--- a/x11/py-sip/patches/patch-aa Thu Feb 01 21:00:25 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-$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...")
diff -r 904450751905 -r f06223e25432 x11/py-sip/patches/patch-ab
--- a/x11/py-sip/patches/patch-ab Thu Feb 01 21:00:25 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2018/01/17 19:16:05 markd Exp $
-
---- sipgen/sipgen.sbf.orig 2017-02-15 12:37:11.000000000 +0000
-+++ sipgen/sipgen.sbf
-@@ -14,6 +14,6 @@
- # SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
--target = sip
-+target = sip@PYVERSSUFFIX@
- sources = main.c transform.c gencode.c extracts.c export.c type_hints.c heap.c parser.c lexer.c
- headers = sip.h parser.h
diff -r 904450751905 -r f06223e25432 x11/py-sip/patches/patch-configure.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/py-sip/patches/patch-configure.py Thu Feb 01 21:03:09 2018 +0000
@@ -0,0 +1,50 @@
+$NetBSD: patch-configure.py,v 1.1 2018/02/01 21:03:09 adam 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...")
diff -r 904450751905 -r f06223e25432 x11/py-sip/patches/patch-sipgen_gencode.c
--- a/x11/py-sip/patches/patch-sipgen_gencode.c Thu Feb 01 21:00:25 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-$NetBSD: patch-sipgen_gencode.c,v 1.1 2018/01/17 19:16:05 markd Exp $
-
-Fixed the handling of the default value of unscoped enums when using
-old compilers. [dd017d3e1454] [tip]
-
---- sipgen/gencode.c 2017-11-06 13:45:14.000000000 +1300
-+++ sipgen/gencode.c 2017-11-11 15:30:06.000000000 +1300
-@@ -305,6 +305,7 @@
- static int isString(argDef *ad);
- static scopedNameDef *stripScope(scopedNameDef *snd, classDef *ecd,
- StripAction strip);
-+static void prEnumMemberScope(enumMemberDef *emd, FILE *fp);
-
-
- /*
-@@ -3295,25 +3296,14 @@
-
- if (!isNoScope(emd->ed))
- {
-- classDef *ecd = emd->ed->ecd;
--
- if (isScopedEnum(emd->ed))
-- {
-- prcode(fp, "::%s::", emd->ed->cname->text);
-- }
-- else if (ecd != NULL)
-- {
-- if (isProtectedEnum(emd->ed))
-- prcode(fp, "sip%C::", classFQCName(ecd));
-- else if (isProtectedClass(ecd))
-- prcode(fp, "%U::", ecd);
-- else
-- prcode(fp, "%S::", classFQCName(ecd));
-- }
-+ prcode(fp, "::%s", emd->ed->cname->text);
-+ else if (emd->ed->ecd != NULL)
-+ prEnumMemberScope(emd, fp);
- else if (mtd != NULL)
-- {
-- prcode(fp, "%S::", mtd->iff->fqcname);
-- }
-+ prcode(fp, "%S", mtd->iff->fqcname);
-+
-+ prcode(fp, "::");
- }
-
- prcode(fp, "%s%s, %d},\n", emd->cname, (generating_c ? "" : ")"), emd->ed->first_alt->enumnr);
-@@ -7592,7 +7582,13 @@
-
- if (ed->members != NULL)
- {
-- prcode(fp, "%E::%s", ed, ed->members->cname);
-+ if (isScopedEnum(ed))
-+ prcode(fp, "%E", ed);
-+ else
-+ prEnumMemberScope(ed->members, fp);
-+
-+ prcode(fp, "::%s", ed->members->cname);
-+
- return;
- }
-
-@@ -15531,3 +15527,19 @@
-
- return snd;
- }
-+
-+
-+/*
-+ * Generate the scope of a member of an unscoped enum.
-+ */
-+static void prEnumMemberScope(enumMemberDef *emd, FILE *fp)
-+{
-+ classDef *ecd = emd->ed->ecd;
-+
-+ if (isProtectedEnum(emd->ed))
-+ prcode(fp, "sip%C", classFQCName(ecd));
-+ else if (isProtectedClass(ecd))
-+ prcode(fp, "%U", ecd);
-+ else
-+ prcode(fp, "%S", classFQCName(ecd));
-+}
diff -r 904450751905 -r f06223e25432 x11/py-sip/patches/patch-sipgen_sipgen.sbf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/py-sip/patches/patch-sipgen_sipgen.sbf Thu Feb 01 21:03:09 2018 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-sipgen_sipgen.sbf,v 1.1 2018/02/01 21:03:09 adam Exp $
+
+--- sipgen/sipgen.sbf.orig 2017-02-15 12:37:11.000000000 +0000
++++ sipgen/sipgen.sbf
+@@ -14,6 +14,6 @@
+ # SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+-target = sip
++target = sip@PYVERSSUFFIX@
+ sources = main.c transform.c gencode.c extracts.c export.c type_hints.c heap.c parser.c lexer.c
+ headers = sip.h parser.h
Home |
Main Index |
Thread Index |
Old Index