diff options
| author | Vaxry <[email protected]> | 2023-10-10 20:21:57 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-10-10 20:21:57 +0100 |
| commit | 914851b91aeb450592e2d62749169298ac48fb0c (patch) | |
| tree | dc495cfd7cbb507462184c13fb2c66c8f6d407f7 /nix/patches | |
| parent | 3219c84433874c3b852a254b7b3047f0e19913d8 (diff) | |
| download | Hyprland-914851b91aeb450592e2d62749169298ac48fb0c.tar.gz Hyprland-914851b91aeb450592e2d62749169298ac48fb0c.zip | |
internal: better versioning (#3543)
* better versioning
* meson: better versioning
* nix: better versioning
---------
Co-authored-by: Mihai Fufezan <[email protected]>
Diffstat (limited to 'nix/patches')
| -rw-r--r-- | nix/patches/meson-build.patch | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/nix/patches/meson-build.patch b/nix/patches/meson-build.patch index d0cba18a..23442172 100644 --- a/nix/patches/meson-build.patch +++ b/nix/patches/meson-build.patch @@ -1,20 +1,8 @@ diff --git a/meson.build b/meson.build -index f3802553..6a924a79 100644 +index 726933bc..28b4d9ac 100644 --- a/meson.build +++ b/meson.build -@@ -21,9 +21,9 @@ else - endif - - GIT_BRANCH = run_command('git', 'rev-parse', '--abbrev-ref', 'HEAD', check: false).stdout().strip() --GIT_COMMIT_HASH = run_command('git', 'rev-parse', 'HEAD', check: false).stdout().strip() -+GIT_COMMIT_HASH = '@GIT_COMMIT_HASH@' - GIT_COMMIT_MESSAGE = run_command('sh', '-c', 'git show | head -n 5 | tail -n 1', check: false).stdout().strip() --GIT_DIRTY = run_command('sh', '-c', 'git diff-index --quiet HEAD -- || echo "dirty"', check: false).stdout().strip() -+GIT_DIRTY = '@GIT_DIRTY@' - - add_project_arguments( - [ -@@ -39,21 +39,8 @@ add_project_arguments( +@@ -29,20 +29,7 @@ add_project_arguments( ], language: 'cpp') @@ -32,17 +20,24 @@ index f3802553..6a924a79 100644 -have_xwayland = xcb_dep.found() and have_xwlr - -if not have_xwayland -- add_project_arguments('-DNO_XWAYLAND', language: 'cpp') +if get_option('xwayland').disabled() -+ add_project_arguments('-DNO_XWAYLAND', language: 'cpp') + add_project_arguments('-DNO_XWAYLAND', language: 'cpp') endif - backtrace_dep = cpp_compiler.find_library('execinfo', required: false) +@@ -71,8 +58,6 @@ foreach file : headers + install_headers(file, subdir: 'hyprland', preserve_path: true) + endforeach + +-version_h = run_command('sh', '-c', 'scripts/generateVersion.sh') +- + subdir('protocols') + subdir('src') + subdir('hyprctl') diff --git a/src/meson.build b/src/meson.build -index 7b658d31..60aa4057 100644 +index 2065c6f5..55530605 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -7,16 +7,16 @@ executable('Hyprland', src, +@@ -9,16 +9,16 @@ executable('Hyprland', src, server_protos, dependency('wayland-server'), dependency('wayland-client'), |