Sat May 30 20:46:09 2020 UTC ()
Python config leaks _NETBSD_SOURCE into the build, so ensure it is
provided consistently to undo damage. Spell C++11 mode canonically.


(joerg)
diff -r1.47 -r1.48 pkgsrc/graphics/mypaint/Makefile
diff -r1.10 -r1.11 pkgsrc/graphics/mypaint/distinfo
diff -r0 -r1.1 pkgsrc/graphics/mypaint/patches/patch-setup.py
cvs diff -r1.47 -r1.48 pkgsrc/graphics/mypaint/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/mypaint/Makefile 2020/05/19 12:09:08 1.47
+++ pkgsrc/graphics/mypaint/Makefile 2020/05/30 20:46:09 1.48
@@ -1,34 +1,33 @@ @@ -1,34 +1,33 @@
1# $NetBSD: Makefile,v 1.47 2020/05/19 12:09:08 nia Exp $ 1# $NetBSD: Makefile,v 1.48 2020/05/30 20:46:09 joerg Exp $
2 2
3DISTNAME= mypaint-2.0.0 3DISTNAME= mypaint-2.0.0
4PKGREVISION= 4 4PKGREVISION= 4
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= ${MASTER_SITE_GITHUB:=mypaint/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=mypaint/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8GITHUB_PROJECT= mypaint 8GITHUB_PROJECT= mypaint
9GITHUB_RELEASE= v${PKGVERSION_NOREV} 9GITHUB_RELEASE= v${PKGVERSION_NOREV}
10 10
11MAINTAINER= ryoon@NetBSD.org 11MAINTAINER= ryoon@NetBSD.org
12HOMEPAGE= http://mypaint.org/ 12HOMEPAGE= http://mypaint.org/
13COMMENT= Fast and easy open-source graphics application for digital painters 13COMMENT= Fast and easy open-source graphics application for digital painters
14LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
15 15
16DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3 16DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
17TOOL_DEPENDS+= swig3-[0-9]*:../../devel/swig3 17TOOL_DEPENDS+= swig3-[0-9]*:../../devel/swig3
18 18
19EGG_NAME= MyPaint-${PKGVERSION_NOREV}a0 19EGG_NAME= MyPaint-${PKGVERSION_NOREV}a0
20 20
21 
22USE_LANGUAGES= c c++ 21USE_LANGUAGES= c c++
23 22
24USE_TOOLS+= bash:run msgfmt pkg-config 23USE_TOOLS+= bash:run msgfmt pkg-config
25 24
26pre-configure: 25pre-configure:
27 ${LN} -sf ${PREFIX}/bin/swig3.0 ${BUILDLINK_DIR}/bin/swig 26 ${LN} -sf ${PREFIX}/bin/swig3.0 ${BUILDLINK_DIR}/bin/swig
28 27
29.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 28.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
30.include "../../sysutils/desktop-file-utils/desktopdb.mk" 29.include "../../sysutils/desktop-file-utils/desktopdb.mk"
31.include "../../devel/gettext-lib/buildlink3.mk" 30.include "../../devel/gettext-lib/buildlink3.mk"
32BUILDLINK_API_DEPENDS.libmypaint+= libmypaint>=1.5.0 31BUILDLINK_API_DEPENDS.libmypaint+= libmypaint>=1.5.0
33.include "../../graphics/libmypaint/buildlink3.mk" 32.include "../../graphics/libmypaint/buildlink3.mk"
34BUILDLINK_API_DEPENDS.mypaint-brushes+= mypaint-brushes>=2.0 33BUILDLINK_API_DEPENDS.mypaint-brushes+= mypaint-brushes>=2.0
cvs diff -r1.10 -r1.11 pkgsrc/graphics/mypaint/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/mypaint/distinfo 2020/03/04 13:51:51 1.10
+++ pkgsrc/graphics/mypaint/distinfo 2020/05/30 20:46:09 1.11
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.10 2020/03/04 13:51:51 wiz Exp $ 1$NetBSD: distinfo,v 1.11 2020/05/30 20:46:09 joerg Exp $
2 2
3SHA1 (mypaint-2.0.0.tar.xz) = 334fa13893d20c80805092de665dbbcf03b92ece 3SHA1 (mypaint-2.0.0.tar.xz) = 334fa13893d20c80805092de665dbbcf03b92ece
4RMD160 (mypaint-2.0.0.tar.xz) = 894b276a4f6139a717d8fdfcf8618ecef00222dd 4RMD160 (mypaint-2.0.0.tar.xz) = 894b276a4f6139a717d8fdfcf8618ecef00222dd
5SHA512 (mypaint-2.0.0.tar.xz) = 118d905f4d7ce6adb9779b59d6b3f51b94a9937778b8fe3ed1b31c9b5b77d63110134bdc74849a91d8095e905664227ff43ffe183ad9c7c7ba18fa954ade8a84 5SHA512 (mypaint-2.0.0.tar.xz) = 118d905f4d7ce6adb9779b59d6b3f51b94a9937778b8fe3ed1b31c9b5b77d63110134bdc74849a91d8095e905664227ff43ffe183ad9c7c7ba18fa954ade8a84
6Size (mypaint-2.0.0.tar.xz) = 7316680 bytes 6Size (mypaint-2.0.0.tar.xz) = 7316680 bytes
7SHA1 (patch-lib_meta.py) = 1c8832ff06154255d7ea14037dc728d1fa0ba50e 7SHA1 (patch-lib_meta.py) = 1c8832ff06154255d7ea14037dc728d1fa0ba50e
 8SHA1 (patch-setup.py) = 55b5c2ef1ef8612999c1630b2259f7f54a5cf264
File Added: pkgsrc/graphics/mypaint/patches/patch-setup.py
$NetBSD: patch-setup.py,v 1.1 2020/05/30 20:46:09 joerg Exp $

Don't force pure standard mode as it depends on various extensions
anyway. Explicitly set _NETBSD_SOURCE since Python's config.h pollutes
the namespace with it.

--- setup.py.orig	2020-02-15 15:05:23.000000000 +0000
+++ setup.py
@@ -801,7 +801,7 @@ def get_ext_modules():
     import numpy
 
     extra_compile_args = [
-        '--std=c++11',
+        '-std=gnu++11',
         '-Wall',
         '-Wno-sign-compare',
         '-Wno-write-strings',
@@ -821,6 +821,8 @@ def get_ext_modules():
         # Look up libraries dependencies relative to the library.
         extra_link_args.append('-Wl,-z,origin')
         extra_link_args.append('-Wl,-rpath,$ORIGIN')
+    if sys.platform.startswith("netbsd"):
+        extra_compile_args.append("-D_NETBSD_SOURCE")
 
     initial_deps = ["libmypaint >= 1.5"]
     remaining_deps = [