muon: Update to 0.3.1

[Michael Baeuerle (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Mon Nov 25 16:52:17 2024 +0100
Changeset:	84648b96e8a6041091399bbd69b45cf788c0b629

Modified Files:
	muon/COMMIT_MSG
	muon/Makefile
	muon/distinfo
	muon/patches/patch-tests_project_meson.build
Added Files:
	muon/patches/patch-meson.build

Log Message:
muon: Update to 0.3.1

No changelog provided.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=84648b96e8a6041091399bbd69b45cf788c0b629

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

diffstat:
 muon/COMMIT_MSG                              |   2 +-
 muon/Makefile                                |   2 +-
 muon/distinfo                                |  15 ++--
 muon/patches/patch-meson.build               |  17 +++++
 muon/patches/patch-tests_project_meson.build | 109 +++------------------------
 5 files changed, 37 insertions(+), 108 deletions(-)

diffs:
diff --git a/muon/COMMIT_MSG b/muon/COMMIT_MSG
index 3f66e79a85..5f8cf2916d 100644
--- a/muon/COMMIT_MSG
+++ b/muon/COMMIT_MSG
@@ -1,4 +1,4 @@
-devel/muon: Add muon version 0.3.0
+devel/muon: Add muon version 0.3.1
 
 ## 0.3.0
 
diff --git a/muon/Makefile b/muon/Makefile
index 5bd598076a..66c3e6824e 100644
--- a/muon/Makefile
+++ b/muon/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-PKGNAME=		muon-0.3.0
+PKGNAME=		muon-0.3.1
 DISTNAME=		${PKGNAME:S/muon-//}
 CATEGORIES=		devel
 MASTER_SITES=		https://git.sr.ht/~lattis/muon/archive/
diff --git a/muon/distinfo b/muon/distinfo
index 77900a7cee..ef6c302dbf 100644
--- a/muon/distinfo
+++ b/muon/distinfo
@@ -1,9 +1,10 @@
 $NetBSD$
 
-BLAKE2s (muon-0.3.0/0.3.0.tar.gz) = 831af6f70a771160c51c9611071abcff98be556f553a7b9eb75bf19e4aab9afe
-SHA512 (muon-0.3.0/0.3.0.tar.gz) = 32a0275845bcd6b3fba710d4820c9d88c74f02f9ed50b55118a9df10432ad169d67c713b071a2feeac7f1389fd4010486dcf3e631c33bf7a9af9f485bfad3772
-Size (muon-0.3.0/0.3.0.tar.gz) = 445990 bytes
-BLAKE2s (muon-0.3.0/man.tar.gz) = a29909a298c4140169684bfb3c0156aef8269b1335473f37ed02506dce110f49
-SHA512 (muon-0.3.0/man.tar.gz) = 8dfc00ce366b172196d815e74e9941debcc4a306333f1d8cda8ca31d501bdb72fe3a0ec8df0391731906674fa9d4bf014d96974bc73566f5baf30f10c232d60f
-Size (muon-0.3.0/man.tar.gz) = 8067 bytes
-SHA1 (patch-tests_project_meson.build) = 6bfac6756950c2e6e0016d6b2b3978542f9ae963
+BLAKE2s (muon-0.3.1/0.3.1.tar.gz) = b7ef7da182dbd4d207050d13b57d006ad84384ee0dfdce56db8e69dbf1986233
+SHA512 (muon-0.3.1/0.3.1.tar.gz) = f9113d463bee6ecad6d97de0ea4ab210632e7baac265f32992036a5cab005222965615c3b3f7f0a4f2a5a880143f09d59233f43e9d6e3ae3ec700ba28f6a1bbc
+Size (muon-0.3.1/0.3.1.tar.gz) = 446185 bytes
+BLAKE2s (muon-0.3.1/man.tar.gz) = a4c684299b27f35615bf92d90a1761da8de86cdfeab5b77ac62695d611ab194e
+SHA512 (muon-0.3.1/man.tar.gz) = 1f1f054c0e2331c63245adbd1111552b331ecac337f1902490c5ba6dbe48c858787cb5a3cce00b26491b0dfac1001938b7f4461c7df098098e2202cd4021b8da
+Size (muon-0.3.1/man.tar.gz) = 8067 bytes
+SHA1 (patch-meson.build) = 3399887cc133b97fb6f2f5669ae59ec8d7bbaf8b
+SHA1 (patch-tests_project_meson.build) = dd116edbc57961fd34038197e6ec563fd6752e58
diff --git a/muon/patches/patch-meson.build b/muon/patches/patch-meson.build
new file mode 100644
index 0000000000..125eb502f1
--- /dev/null
+++ b/muon/patches/patch-meson.build
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Disable git (no downloads during build).
+
+--- meson.build.orig	2024-11-25 14:54:48.138610678 +0000
++++ meson.build
+@@ -19,7 +19,9 @@ fs = import('fs')
+ 
+ # version information
+ 
+-git = find_program('git', required: false)
++# Disable git for pkgsrc
++git = find_program('git_disabled', required: false)
++#git = find_program('git', required: false)
+ if git.found() and fs.is_dir('.git')
+     rev = run_command(git, 'rev-parse', '--short', 'HEAD', check: true)
+     git_sha = rev.stdout().strip()
diff --git a/muon/patches/patch-tests_project_meson.build b/muon/patches/patch-tests_project_meson.build
index 9d1460e735..85d91391b8 100644
--- a/muon/patches/patch-tests_project_meson.build
+++ b/muon/patches/patch-tests_project_meson.build
@@ -1,108 +1,19 @@
 $NetBSD$
 
-Disable download of additional tests (not allowed for pkgsrc).
+Fix build without git.
 
---- tests/project/meson.build.orig	2024-09-24 16:08:34.000000000 +0000
+From upstream commit 74174cbb3e9e1386982b18ffd0ab0e4fe72c98b2.
+
+--- tests/project/meson.build.orig	2024-10-07 15:19:19.000000000 +0000
 +++ tests/project/meson.build
-@@ -401,53 +401,54 @@ else
+@@ -401,8 +401,9 @@ else
      endif
  endif
  
--if git.found()
++meson_tests_dir = meson.current_source_dir() / 'meson-tests'
++
+ if git.found()
 -    meson_tests_dir = meson.current_source_dir() / 'meson-tests'
--    meson_tests_sha = '1e565931348f15f3f9b654f46ab4bf5fa009ca4f'
--
--    if fs.is_dir('meson-tests')
--        meson_tests_clean = run_command(git, '-C', meson_tests_dir, 'diff', '--quiet', check: false).returncode() == 0
--
--        # If the meson-tests repo has no modifications and is not up to date,
--        # force update it.
--        if meson_tests_clean and run_command(
--            git,
--            '-C', meson_tests_dir,
--            'merge-base',
--            '--is-ancestor', meson_tests_sha,
--            'HEAD',
--            check: false,
--        ).returncode() != 0
--            warning('force-updating meson-tests repo')
--            run_command(
--                git,
--                '-C', meson_tests_dir,
--                'fetch',
--                '--all',
--                capture: false,
--                check: true,
--            )
--
--            run_command(
--                git,
--                '-C', meson_tests_dir,
--                'reset',
--                '--hard', 'origin/master',
--                capture: false,
--                check: true,
--            )
--        endif
--    else
--        run_command(
--            git,
--            'clone',
--            get_option('meson_tests_repo'),
--            meson_tests_dir,
--            capture: false,
--            check: true,
--        )
--    endif
--endif
-+# Disabled for pkgsrc
-+#if git.found()
-+#    meson_tests_dir = meson.current_source_dir() / 'meson-tests'
-+#    meson_tests_sha = '1e565931348f15f3f9b654f46ab4bf5fa009ca4f'
-+#
-+#    if fs.is_dir('meson-tests')
-+#        meson_tests_clean = run_command(git, '-C', meson_tests_dir, 'diff', '--quiet', check: false).returncode() == 0
-+#
-+#        # If the meson-tests repo has no modifications and is not up to date,
-+#        # force update it.
-+#        if meson_tests_clean and run_command(
-+#            git,
-+#            '-C', meson_tests_dir,
-+#            'merge-base',
-+#            '--is-ancestor', meson_tests_sha,
-+#            'HEAD',
-+#            check: false,
-+#        ).returncode() != 0
-+#            warning('force-updating meson-tests repo')
-+#            run_command(
-+#                git,
-+#                '-C', meson_tests_dir,
-+#                'fetch',
-+#                '--all',
-+#                capture: false,
-+#                check: true,
-+#            )
-+#
-+#            run_command(
-+#                git,
-+#                '-C', meson_tests_dir,
-+#                'reset',
-+#                '--hard', 'origin/master',
-+#                capture: false,
-+#                check: true,
-+#            )
-+#        endif
-+#    else
-+#        run_command(
-+#            git,
-+#            'clone',
-+#            get_option('meson_tests_repo'),
-+#            meson_tests_dir,
-+#            capture: false,
-+#            check: true,
-+#        )
-+#    endif
-+#endif
+     meson_tests_sha = '1e565931348f15f3f9b654f46ab4bf5fa009ca4f'
  
- skip_meson_tests = not fs.is_dir('meson-tests')
- if skip_meson_tests
+     if not fs.is_dir(meson_tests_dir)