CVS commit: pkgsrc/devel/meson

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Tue Oct  3 01:21:36 UTC 2023

Modified Files:
        pkgsrc/devel/meson: Makefile distinfo
        pkgsrc/devel/meson/patches: patch-mesonbuild_compilers_detect.py

Log Message:
meson: now also accommodate cython-3.12

(Placed last as Python 3.12 has never been a pkgsrc default. So far.)


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/devel/meson/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/devel/meson/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_detect.py

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

Modified files:

Index: pkgsrc/devel/meson/Makefile
diff -u pkgsrc/devel/meson/Makefile:1.58 pkgsrc/devel/meson/Makefile:1.59
--- pkgsrc/devel/meson/Makefile:1.58    Sun Oct  1 16:04:49 2023
+++ pkgsrc/devel/meson/Makefile Tue Oct  3 01:21:36 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2023/10/01 16:04:49 adam Exp $
+# $NetBSD: Makefile,v 1.59 2023/10/03 01:21:36 gutteridge Exp $
 
 DISTNAME=      meson-1.2.2
+PKGREVISION=   1
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/meson/}
 

Index: pkgsrc/devel/meson/distinfo
diff -u pkgsrc/devel/meson/distinfo:1.51 pkgsrc/devel/meson/distinfo:1.52
--- pkgsrc/devel/meson/distinfo:1.51    Sun Oct  1 16:04:49 2023
+++ pkgsrc/devel/meson/distinfo Tue Oct  3 01:21:36 2023
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.51 2023/10/01 16:04:49 adam Exp $
+$NetBSD: distinfo,v 1.52 2023/10/03 01:21:36 gutteridge Exp $
 
 BLAKE2s (meson-1.2.2.tar.gz) = c5e60d7f3f9e099382e394474b8014a6a5e2d5deb283f077254a33a277d0a174
 SHA512 (meson-1.2.2.tar.gz) = 8dde3235f31862953e2f4db2527e441dfa9413b5f7545c85949ebc0f3b58819307ca124bf04d481d6f1425d6a4c93051239a659554322af893c97b651379fa86
 Size (meson-1.2.2.tar.gz) = 2190455 bytes
-SHA1 (patch-mesonbuild_compilers_detect.py) = 378283e53e61e93af15dbf0b0fb9e9bda198fd82
+SHA1 (patch-mesonbuild_compilers_detect.py) = 433c20bcf613817f0df9a73859909f8c257af243
 SHA1 (patch-mesonbuild_compilers_mixins_gnu.py) = 34c2f6f215d5aed1d6c422187f733d0d488ebb4f
 SHA1 (patch-mesonbuild_dependencies_dev.py) = 2165f1ee4ad5d9689eb2fb7e94841503336070b9
 SHA1 (patch-mesonbuild_linkers_linkers.py) = 4ca793f71aac2119f94464bb2beb83ed3da3e9a0

Index: pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_detect.py
diff -u pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_detect.py:1.4 pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_detect.py:1.5
--- pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_detect.py:1.4 Sun Sep 24 18:54:06 2023
+++ pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_detect.py     Tue Oct  3 01:21:36 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-mesonbuild_compilers_detect.py,v 1.4 2023/09/24 18:54:06 gutteridge Exp $
+$NetBSD: patch-mesonbuild_compilers_detect.py,v 1.5 2023/10/03 01:21:36 gutteridge Exp $
 
 Specify c++ language when making CXX parse standard input.
 Fixes problem where graphics/MesaLib fails to build due to:
@@ -15,7 +15,7 @@ Also account for multiple versions of cy
  defaults['swift'] = ['swiftc']
  defaults['vala'] = ['valac']
 -defaults['cython'] = ['cython', 'cython3'] # Official name is cython, but Debian renamed it to cython3.
-+defaults['cython'] = ['cython', 'cython-3.11', 'cython-3.10', 'cython-3.9', 'cython-3.8'] # Handle pkgsrc multi-versions.
++defaults['cython'] = ['cython', 'cython-3.11', 'cython-3.10', 'cython-3.9', 'cython-3.8', 'cython-3.12'] # Handle pkgsrc multi-versions.
  defaults['static_linker'] = ['ar', 'gar']
  defaults['strip'] = ['strip']
  defaults['vs_static_linker'] = ['lib']