diff --git a/devel/meson/Makefile b/devel/meson/Makefile index c2a00d13fd7..e59dc94e3c3 100644 --- a/devel/meson/Makefile +++ b/devel/meson/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.101 2021/11/26 07:24:01 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.102 2021/12/23 08:33:19 ajacoutot Exp $ COMMENT= next-generation build system MODPY_EGG_VERSION= ${GH_TAGNAME} GH_ACCOUNT= mesonbuild GH_PROJECT= meson -GH_TAGNAME= 0.60.2 +GH_TAGNAME= 0.60.3 EPOCH= 0 CATEGORIES= devel diff --git a/devel/meson/distinfo b/devel/meson/distinfo index 8b5ba59df27..c259ab3282d 100644 --- a/devel/meson/distinfo +++ b/devel/meson/distinfo @@ -1,2 +1,2 @@ -SHA256 (meson-0.60.2.tar.gz) = /HwvMVtbY/7gQUsLlLWn0OnHHIybuEhzFOtamjOYS40= -SIZE (meson-0.60.2.tar.gz) = 4141053 +SHA256 (meson-0.60.3.tar.gz) = bBkam0BJ4Mmip9EnWrY1uR9v/sGRLXXfTF7GrPNfdP4= +SIZE (meson-0.60.3.tar.gz) = 4142140 diff --git a/devel/meson/meson.port.mk b/devel/meson/meson.port.mk index 446282af7b1..5b57454ed4d 100644 --- a/devel/meson/meson.port.mk +++ b/devel/meson/meson.port.mk @@ -1,6 +1,6 @@ -# $OpenBSD: meson.port.mk,v 1.71 2021/11/26 07:24:01 ajacoutot Exp $ +# $OpenBSD: meson.port.mk,v 1.72 2021/12/23 08:33:19 ajacoutot Exp $ -BUILD_DEPENDS += devel/meson>=0.60.2v0 +BUILD_DEPENDS += devel/meson>=0.60.3v0 SEPARATE_BUILD ?= Yes .if empty(CONFIGURE_STYLE) diff --git a/devel/meson/patches/patch-mesonbuild_build_py b/devel/meson/patches/patch-mesonbuild_build_py index 2eab57bbbc7..220747b125e 100644 --- a/devel/meson/patches/patch-mesonbuild_build_py +++ b/devel/meson/patches/patch-mesonbuild_build_py @@ -1,4 +1,4 @@ -$OpenBSD: patch-mesonbuild_build_py,v 1.28 2021/11/26 07:24:01 ajacoutot Exp $ +$OpenBSD: patch-mesonbuild_build_py,v 1.29 2021/12/23 08:33:19 ajacoutot Exp $ Index: mesonbuild/build.py --- mesonbuild/build.py.orig @@ -12,7 +12,7 @@ Index: mesonbuild/build.py OptionKey, PerMachineDefaultable, MesonBugException, ) -@@ -2140,6 +2140,21 @@ class SharedLibrary(BuildTarget): +@@ -2139,6 +2139,21 @@ class SharedLibrary(BuildTarget): elif self.soversion: # If unspecified, pick the soversion self.darwin_versions = 2 * [self.soversion] @@ -34,7 +34,7 @@ Index: mesonbuild/build.py # Visual Studio module-definitions file if 'vs_module_defs' in kwargs: -@@ -2209,6 +2224,8 @@ class SharedLibrary(BuildTarget): +@@ -2208,6 +2223,8 @@ class SharedLibrary(BuildTarget): # filename. If ltversion != soversion we create an soversion alias: # libfoo.so.0 -> libfoo.so.0.100.0 # Where libfoo.so.0.100.0 is the actual library