CVS commit: pkgsrc/x11/py-sip

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Wed Jan 17 19:16:05 UTC 2018

Modified Files:
        pkgsrc/x11/py-sip: Makefile PLIST
        pkgsrc/x11/py-sip/patches: patch-ab
Added Files:
        pkgsrc/x11/py-sip/patches: patch-sipgen_gencode.c

Log Message:
py-sip: update to 4.19.5


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/x11/py-sip/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/x11/py-sip/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/py-sip/patches/patch-ab
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/py-sip/patches/patch-sipgen_gencode.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/py-sip/Makefile
diff -u pkgsrc/x11/py-sip/Makefile:1.48 pkgsrc/x11/py-sip/Makefile:1.49
--- pkgsrc/x11/py-sip/Makefile:1.48     Sat Jul 15 13:20:50 2017
+++ pkgsrc/x11/py-sip/Makefile  Wed Jan 17 19:16:05 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2017/07/15 13:20:50 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2018/01/17 19:16:05 markd Exp $
 
-DISTNAME=      sip-4.17
+DISTNAME=      sip-4.19.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    x11 devel python
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=pyqt/}

Index: pkgsrc/x11/py-sip/PLIST
diff -u pkgsrc/x11/py-sip/PLIST:1.1.1.1 pkgsrc/x11/py-sip/PLIST:1.2
--- pkgsrc/x11/py-sip/PLIST:1.1.1.1     Wed Oct  8 14:10:45 2008
+++ pkgsrc/x11/py-sip/PLIST     Wed Jan 17 19:16:05 2018
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/10/08 14:10:45 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/01/17 19:16:05 markd Exp $
 bin/sip${PYVERSSUFFIX}
 ${PYINC}/sip.h
+${PYSITELIB}/sip.pyi
 ${PYSITELIB}/sip.so
 ${PYSITELIB}/sipconfig.py
 ${PYSITELIB}/sipconfig.pyc

Index: pkgsrc/x11/py-sip/patches/patch-ab
diff -u pkgsrc/x11/py-sip/patches/patch-ab:1.2 pkgsrc/x11/py-sip/patches/patch-ab:1.3
--- pkgsrc/x11/py-sip/patches/patch-ab:1.2      Tue Jan 11 15:14:20 2011
+++ pkgsrc/x11/py-sip/patches/patch-ab  Wed Jan 17 19:16:05 2018
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2011/01/11 15:14:20 drochner Exp $
+$NetBSD: patch-ab,v 1.3 2018/01/17 19:16:05 markd Exp $
 
---- sipgen/sipgen.sbf.orig     2010-12-23 17:37:09.000000000 +0000
+--- 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
@@ -8,5 +8,5 @@ $NetBSD: patch-ab,v 1.2 2011/01/11 15:14
  
 -target = sip
 +target = sip@PYVERSSUFFIX@
- sources = main.c transform.c gencode.c extracts.c export.c heap.c parser.c lexer.c 
+ 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

Added files:

Index: pkgsrc/x11/py-sip/patches/patch-sipgen_gencode.c
diff -u /dev/null pkgsrc/x11/py-sip/patches/patch-sipgen_gencode.c:1.1
--- /dev/null   Wed Jan 17 19:16:05 2018
+++ pkgsrc/x11/py-sip/patches/patch-sipgen_gencode.c    Wed Jan 17 19:16:05 2018
@@ -0,0 +1,82 @@
+$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));
++}