Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1544791042153380"
MIME-Version: 1.0
Date: Fri, 14 Dec 2018 12:37:22 +0000
From: "Adam Ciarcinski" <adam@netbsd.org>
Subject: CVS commit: pkgsrc/devel/py-gobject
To: pkgsrc-changes@NetBSD.org
Reply-To: adam@netbsd.org
Message-Id: <20181214123722.5FCF7FB16@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1544791042153380
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	adam
Date:		Fri Dec 14 12:37:22 UTC 2018

Modified Files:
	pkgsrc/devel/py-gobject: Makefile distinfo
Added Files:
	pkgsrc/devel/py-gobject/patches: patch-py-compile

Log Message:
py-gobject: Use PEP 3147 filenames


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/devel/py-gobject/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/py-gobject/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/py-gobject/patches/patch-py-compile

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


--_----------=_1544791042153380
Content-Disposition: inline
Content-Length: 3521
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/py-gobject/Makefile
diff -u pkgsrc/devel/py-gobject/Makefile:1.56 pkgsrc/devel/py-gobject/Makefile:1.57
--- pkgsrc/devel/py-gobject/Makefile:1.56	Tue Jan 23 11:23:13 2018
+++ pkgsrc/devel/py-gobject/Makefile	Fri Dec 14 12:37:21 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2018/01/23 11:23:13 adam Exp $
+# $NetBSD: Makefile,v 1.57 2018/12/14 12:37:21 adam Exp $
 
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/^py//}
+PKGREVISION=	1
 
 DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
 
@@ -28,8 +29,6 @@ REPLACE_PYTHON+=	docs/xsl/fixxref.py.in
 
 PYTHON_SELF_CONFLICT=	yes
 
-PY_PEP3147=	no
-
 BUILDLINK_API_DEPENDS.py-gobject-shared+=	py-gobject-shared>=${PKGVERSION_NOREV}
 
 CONFIGURE_ARGS+=	--disable-introspection

Index: pkgsrc/devel/py-gobject/distinfo
diff -u pkgsrc/devel/py-gobject/distinfo:1.27 pkgsrc/devel/py-gobject/distinfo:1.28
--- pkgsrc/devel/py-gobject/distinfo:1.27	Tue Jan 23 11:23:13 2018
+++ pkgsrc/devel/py-gobject/distinfo	Fri Dec 14 12:37:21 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2018/01/23 11:23:13 adam Exp $
+$NetBSD: distinfo,v 1.28 2018/12/14 12:37:21 adam Exp $
 
 SHA1 (pygobject-2.28.7.tar.xz) = 8e3cb8621c2e1d8dbeba5c3c007c7421b936a36c
 RMD160 (pygobject-2.28.7.tar.xz) = e9fea538da79ad27c42434d4a2173b3eb636408b
@@ -9,4 +9,5 @@ SHA1 (patch-configure) = bb69993ce23b278
 SHA1 (patch-dsextras.py) = 9ebb5b418ef902acea227d6d84691285ce2d1863
 SHA1 (patch-glib_Makefile.in) = 859360e5f5df3095236b002129feb4ad85546373
 SHA1 (patch-gobject_Makefile.in) = fa97ba35a52b890a4e7e0c16fc0cac1b215c91c2
+SHA1 (patch-py-compile) = 01584ae9ff16d3b7e29c35eecb5bce6cbac1abcc
 SHA1 (patch-pygi_info.c) = cd2d0f0b16a84c05b805edec89d4508507811c49

Added files:

Index: pkgsrc/devel/py-gobject/patches/patch-py-compile
diff -u /dev/null pkgsrc/devel/py-gobject/patches/patch-py-compile:1.1
--- /dev/null	Fri Dec 14 12:37:22 2018
+++ pkgsrc/devel/py-gobject/patches/patch-py-compile	Fri Dec 14 12:37:22 2018
@@ -0,0 +1,49 @@
+$NetBSD: patch-py-compile,v 1.1 2018/12/14 12:37:22 adam Exp $
+
+Use PEP 3147 filenames (taken from py-gobject3).
+
+--- py-compile.orig	2018-12-14 12:21:40.000000000 +0000
++++ py-compile
+@@ -117,7 +116,7 @@ else
+ fi
+ 
+ $PYTHON -c "
+-import sys, os, py_compile
++import sys, os, py_compile, imp
+ 
+ files = '''$files'''
+ 
+@@ -130,12 +129,19 @@ for file in files.split():
+ 	    continue
+     sys.stdout.write(file)
+     sys.stdout.flush()
+-    py_compile.compile(filepath, filepath + 'c', path)
++    if hasattr(imp, 'get_tag'):
++        py_compile.compile(filepath, imp.cache_from_source(filepath), path)
++    else:
++        py_compile.compile(filepath, filepath + 'c', path)
+ sys.stdout.write('\n')" || exit $?
+ 
+ # this will fail for python < 1.5, but that doesn't matter ...
+ $PYTHON -O -c "
+-import sys, os, py_compile
++import sys, os, py_compile, imp
++
++# pypy does not use .pyo optimization
++if hasattr(sys, 'pypy_translation_info'):
++    sys.exit(0)
+ 
+ files = '''$files'''
+ sys.stdout.write('Byte-compiling python modules (optimized versions) ...\n')
+@@ -147,7 +153,10 @@ for file in files.split():
+ 	    continue
+     sys.stdout.write(file)
+     sys.stdout.flush()
+-    py_compile.compile(filepath, filepath + 'o', path)
++    if hasattr(imp, 'get_tag'):
++        py_compile.compile(filepath, imp.cache_from_source(filepath, False), path)
++    else:
++        py_compile.compile(filepath, filepath + 'o', path)
+ sys.stdout.write('\n')" 2>/dev/null || :
+ 
+ # Local Variables:


--_----------=_1544791042153380--