Branch: refs/heads/master Author: Jiří Techet techet@gmail.com Committer: Jiří Techet techet@gmail.com Date: Mon, 06 Mar 2023 22:27:15 UTC Commit: 5eeafdb949b462c08d1f4f2754b5b373857d6476 https://github.com/geany/geany-osx/commit/5eeafdb949b462c08d1f4f2754b5b37385...
Log Message: ----------- Workaround meson expecting git repository presence
Modified Paths: -------------- geany.modules geany_patches/04-geany_workaround_meson_expecting_git_repository.patch
Modified: geany.modules 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -114,6 +114,7 @@ <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/01git-geany_config_shell.patch" strip="1" /> <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/02-geany_scintilla_candidate_window_pos.patch" strip="1" /> <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/03git-geany_vte_login_shell.patch" strip="1" /> + <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/04-geany_workaround_meson_expecting_git_repository.patch" strip="1" /> </branch> <dependencies> <dep package="geany-deps" />
Modified: geany_patches/04-geany_workaround_meson_expecting_git_repository.patch 31 lines changed, 31 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,31 @@ +From e2e19c1519dd10f9c64dbcb42cb42fe2326887a1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jir=CC=8Ci=CC=81=20Techet?= techet@gmail.com +Date: Mon, 6 Mar 2023 23:22:12 +0100 +Subject: [PATCH] Workaround meson expecting git repository presence + +--- + meson.build | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/meson.build b/meson.build +index 6944a423b..7b6213870 100644 +--- a/meson.build ++++ b/meson.build +@@ -165,13 +165,7 @@ python = pymod.find_installation('python3', modules: doxygen.found() and get_opt + # These two are truly optional + rst2html = find_program('rst2html', required: get_option('html-docs')) + rst2pdf = find_program('rst2pdf', required: get_option('pdf-docs')) +-git = find_program('git', required: false) +-if git.found() +- ret = run_command(git, 'rev-parse', '--short', '--revs-only', 'HEAD', check: true) +- cdata.set_quoted('REVISION', ret.stdout().strip()) +-else +- cdata.set_quoted('REVISION', '-1') +-endif ++cdata.set_quoted('REVISION', '-1') + + python_command = get_option('python-command') + if python_command == '' or python_command == 'auto' +-- +2.37.5 +
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).