From c5203ff4b5e1d079d3f540ba40ceae318a915fb7a7829f6cd8ac3013d3707ebb Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 30 May 2022 12:20:31 +0000 Subject: [PATCH 1/5] Accepting request 979699 from home:uncomfyhalomacro:branches:editors - Update to version 22.05: * Fix the VERSION file * mention the requirement of C++ compiler for building grammar in doc (#2592) * Fix release action * add 22.05 changelog notes (#2584) * add section on syntax tree motions to the usage docs (#2568) * Changing Macro color to avoid color confusion * update Erlang grammar and queries * update Gleam grammar and queries * Add `parameter.around` text object query * build(deps): bump once_cell from 1.10.0 to 1.12.0 OBS-URL: https://build.opensuse.org/request/show/979699 OBS-URL: https://build.opensuse.org/package/show/editors/helix?expand=0&rev=18 --- _service | 11 +++++------ helix-22.03~0.tar.xz | 3 --- helix-22.05.tar.zst | 3 +++ helix.changes | 15 +++++++++++++++ helix.spec | 44 +++++++++++++------------------------------- vendor.tar.xz | 3 --- vendor.tar.zst | 3 +++ 7 files changed, 39 insertions(+), 43 deletions(-) delete mode 100644 helix-22.03~0.tar.xz create mode 100644 helix-22.05.tar.zst delete mode 100644 vendor.tar.xz create mode 100644 vendor.tar.zst diff --git a/_service b/_service index 9219b79..0baa4a8 100644 --- a/_service +++ b/_service @@ -1,11 +1,10 @@ https://github.com/helix-editor/helix - @PARENT_TAG@~@TAG_OFFSET@ + @PARENT_TAG@ git - 22.03 - * - (\d+\.\d+\.\d+)~0 + 27609f50652e28b9bb7a190322fbb8f7c4479c28 + (.*) \1 enable socvirnyl.estela@gmail.com @@ -13,12 +12,12 @@ *.tar - xz + zst helix - xz + zst true diff --git a/helix-22.03~0.tar.xz b/helix-22.03~0.tar.xz deleted file mode 100644 index eddda31..0000000 --- a/helix-22.03~0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f62ab1b5c16f46e75fcf86e37bdae64878b3bd474b76125d64412c25cb41148 -size 637492 diff --git a/helix-22.05.tar.zst b/helix-22.05.tar.zst new file mode 100644 index 0000000..7f0d58b --- /dev/null +++ b/helix-22.05.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2c6a749f0167d2f5ac8d7a76740b3af3c5362f602d44dbc8546180d6eabde03 +size 1087232 diff --git a/helix.changes b/helix.changes index 8247b95..c11ef54 100644 --- a/helix.changes +++ b/helix.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sun May 29 16:53:38 UTC 2022 - socvirnyl.estela@gmail.com + +- Update to version 22.05: + * Fix the VERSION file + * mention the requirement of C++ compiler for building grammar in doc (#2592) + * Fix release action + * add 22.05 changelog notes (#2584) + * add section on syntax tree motions to the usage docs (#2568) + * Changing Macro color to avoid color confusion + * update Erlang grammar and queries + * update Gleam grammar and queries + * Add `parameter.around` text object query + * build(deps): bump once_cell from 1.10.0 to 1.12.0 + ------------------------------------------------------------------- Thu May 19 01:47:59 UTC 2022 - Soc Virnyl Estela diff --git a/helix.spec b/helix.spec index b6db558..024bad5 100644 --- a/helix.spec +++ b/helix.spec @@ -20,13 +20,13 @@ %global rustflags -Clink-arg=-Wl,-z,relro,-z,now -C debuginfo=2 Name: helix -Version: 22.03~0 +Version: 22.05 Release: 0 Summary: A post-modern modal text editor written in Rust License: (Apache-2.0 OR MIT) AND BSD-3-Clause AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT or Unlicense) AND (Zlib OR Apache-2.0 OR MIT) AND Apache-2.0 AND BSL-1.0 AND ISC AND MIT AND MPL-2.0+ AND Zlib AND MPL-2.0 URL: https://github.com/helix-editor/helix -Source0: %{name}-%{version}.tar.xz -Source1: vendor.tar.xz +Source0: %{name}-%{version}.tar.zst +Source1: vendor.tar.zst Source2: cargo_config Source3: helix.sh Source4: helix-rpmlintrc @@ -140,22 +140,18 @@ install -Dm755 %{SOURCE3} %{buildroot}%{_bindir}/%{name} %{_helix_runtimedir}/queries/c-sharp/highlights.scm %{_helix_runtimedir}/queries/c-sharp/injections.scm %{_helix_runtimedir}/queries/c/highlights.scm -%{_helix_runtimedir}/queries/c/indents.toml %{_helix_runtimedir}/queries/c/injections.scm %{_helix_runtimedir}/queries/c/textobjects.scm %{_helix_runtimedir}/queries/cmake/highlights.scm -%{_helix_runtimedir}/queries/cmake/indents.toml %{_helix_runtimedir}/queries/cmake/injections.scm %{_helix_runtimedir}/queries/cmake/textobjects.scm %{_helix_runtimedir}/queries/comment/highlights.scm %{_helix_runtimedir}/queries/cpp/highlights.scm -%{_helix_runtimedir}/queries/cpp/indents.toml %{_helix_runtimedir}/queries/cpp/injections.scm %{_helix_runtimedir}/queries/cpp/textobjects.scm %{_helix_runtimedir}/queries/css/highlights.scm %{_helix_runtimedir}/queries/css/injections.scm %{_helix_runtimedir}/queries/dart/highlights.scm -%{_helix_runtimedir}/queries/dart/indents.toml %{_helix_runtimedir}/queries/dart/injections.scm %{_helix_runtimedir}/queries/dart/locals.scm %{_helix_runtimedir}/queries/dockerfile/highlights.scm @@ -169,7 +165,6 @@ install -Dm755 %{SOURCE3} %{buildroot}%{_bindir}/%{name} %{_helix_runtimedir}/queries/erlang/highlights.scm %{_helix_runtimedir}/queries/erlang/injections.scm %{_helix_runtimedir}/queries/fish/highlights.scm -%{_helix_runtimedir}/queries/fish/indents.toml %{_helix_runtimedir}/queries/fish/injections.scm %{_helix_runtimedir}/queries/fish/textobjects.scm %{_helix_runtimedir}/queries/git-commit/highlights.scm @@ -180,11 +175,9 @@ install -Dm755 %{SOURCE3} %{buildroot}%{_bindir}/%{name} %{_helix_runtimedir}/queries/git-rebase/injections.scm %{_helix_runtimedir}/queries/glsl/folds.scm %{_helix_runtimedir}/queries/glsl/highlights.scm -%{_helix_runtimedir}/queries/glsl/indents.toml %{_helix_runtimedir}/queries/glsl/injections.scm %{_helix_runtimedir}/queries/glsl/locals.scm %{_helix_runtimedir}/queries/go/highlights.scm -%{_helix_runtimedir}/queries/go/indents.toml %{_helix_runtimedir}/queries/go/injections.scm %{_helix_runtimedir}/queries/go/locals.scm %{_helix_runtimedir}/queries/go/tags.scm @@ -195,7 +188,6 @@ install -Dm755 %{SOURCE3} %{buildroot}%{_bindir}/%{name} %{_helix_runtimedir}/queries/haskell/locals.scm %{_helix_runtimedir}/queries/hcl/folds.scm %{_helix_runtimedir}/queries/hcl/highlights.scm -%{_helix_runtimedir}/queries/hcl/indents.toml %{_helix_runtimedir}/queries/hcl/injections.scm %{_helix_runtimedir}/queries/html/highlights.scm %{_helix_runtimedir}/queries/html/injections.scm @@ -206,12 +198,10 @@ install -Dm755 %{SOURCE3} %{buildroot}%{_bindir}/%{name} %{_helix_runtimedir}/queries/javascript/highlights-jsx.scm %{_helix_runtimedir}/queries/javascript/highlights-params.scm %{_helix_runtimedir}/queries/javascript/highlights.scm -%{_helix_runtimedir}/queries/javascript/indents.toml %{_helix_runtimedir}/queries/javascript/injections.scm %{_helix_runtimedir}/queries/javascript/locals.scm %{_helix_runtimedir}/queries/javascript/tags.scm %{_helix_runtimedir}/queries/json/highlights.scm -%{_helix_runtimedir}/queries/json/indents.toml %{_helix_runtimedir}/queries/julia/folds.scm %{_helix_runtimedir}/queries/julia/highlights.scm %{_helix_runtimedir}/queries/julia/injections.scm @@ -229,48 +219,48 @@ install -Dm755 %{SOURCE3} %{buildroot}%{_bindir}/%{name} %{_helix_runtimedir}/queries/ledger/highlights.scm %{_helix_runtimedir}/queries/ledger/injections.scm %{_helix_runtimedir}/queries/llvm-mir-yaml/highlights.scm -%{_helix_runtimedir}/queries/llvm-mir-yaml/indents.toml + %{_helix_runtimedir}/queries/llvm-mir-yaml/injections.scm %{_helix_runtimedir}/queries/llvm-mir/highlights.scm -%{_helix_runtimedir}/queries/llvm-mir/indents.toml + %{_helix_runtimedir}/queries/llvm-mir/injections.scm %{_helix_runtimedir}/queries/llvm-mir/textobjects.scm %{_helix_runtimedir}/queries/llvm/highlights.scm -%{_helix_runtimedir}/queries/llvm/indents.toml + %{_helix_runtimedir}/queries/llvm/injections.scm %{_helix_runtimedir}/queries/llvm/locals.scm %{_helix_runtimedir}/queries/llvm/textobjects.scm %{_helix_runtimedir}/queries/lua/highlights.scm -%{_helix_runtimedir}/queries/lua/indents.toml + %{_helix_runtimedir}/queries/lua/injections.scm %{_helix_runtimedir}/queries/make/highlights.scm %{_helix_runtimedir}/queries/make/injections.scm %{_helix_runtimedir}/queries/markdown/highlights.scm %{_helix_runtimedir}/queries/markdown/injections.scm %{_helix_runtimedir}/queries/nix/highlights.scm -%{_helix_runtimedir}/queries/nix/indents.toml + %{_helix_runtimedir}/queries/ocaml-interface/highlights.scm %{_helix_runtimedir}/queries/ocaml-interface/injections.scm %{_helix_runtimedir}/queries/ocaml/highlights.scm -%{_helix_runtimedir}/queries/ocaml/indents.toml + %{_helix_runtimedir}/queries/ocaml/injections.scm %{_helix_runtimedir}/queries/ocaml/locals.scm %{_helix_runtimedir}/queries/org/highlights.scm %{_helix_runtimedir}/queries/org/injections.scm %{_helix_runtimedir}/queries/perl/highlights.scm -%{_helix_runtimedir}/queries/perl/indents.toml + %{_helix_runtimedir}/queries/perl/injections.scm %{_helix_runtimedir}/queries/perl/textobjects.scm %{_helix_runtimedir}/queries/php/highlights.scm -%{_helix_runtimedir}/queries/php/indents.toml + %{_helix_runtimedir}/queries/php/injections.scm %{_helix_runtimedir}/queries/php/tags.scm %{_helix_runtimedir}/queries/php/textobjects.scm %{_helix_runtimedir}/queries/protobuf/highlights.scm -%{_helix_runtimedir}/queries/protobuf/indents.toml + %{_helix_runtimedir}/queries/protobuf/injections.scm %{_helix_runtimedir}/queries/python/highlights.scm -%{_helix_runtimedir}/queries/python/indents.toml + %{_helix_runtimedir}/queries/python/injections.scm %{_helix_runtimedir}/queries/python/tags.scm %{_helix_runtimedir}/queries/python/textobjects.scm @@ -279,24 +269,19 @@ install -Dm755 %{SOURCE3} %{buildroot}%{_bindir}/%{name} %{_helix_runtimedir}/queries/rescript/injections.scm %{_helix_runtimedir}/queries/rescript/textobjects.scm %{_helix_runtimedir}/queries/ruby/highlights.scm -%{_helix_runtimedir}/queries/ruby/indents.toml %{_helix_runtimedir}/queries/ruby/injections.scm %{_helix_runtimedir}/queries/ruby/locals.scm %{_helix_runtimedir}/queries/ruby/tags.scm %{_helix_runtimedir}/queries/rust/highlights.scm -%{_helix_runtimedir}/queries/rust/indents.toml %{_helix_runtimedir}/queries/rust/injections.scm %{_helix_runtimedir}/queries/rust/locals.scm %{_helix_runtimedir}/queries/rust/textobjects.scm %{_helix_runtimedir}/queries/scala/highlights.scm -%{_helix_runtimedir}/queries/scala/indents.toml %{_helix_runtimedir}/queries/scala/injections.scm %{_helix_runtimedir}/queries/solidity/highlights.scm %{_helix_runtimedir}/queries/svelte/highlights.scm -%{_helix_runtimedir}/queries/svelte/indents.toml %{_helix_runtimedir}/queries/svelte/injections.scm %{_helix_runtimedir}/queries/tablegen/highlights.scm -%{_helix_runtimedir}/queries/tablegen/indents.toml %{_helix_runtimedir}/queries/tablegen/injections.scm %{_helix_runtimedir}/queries/tablegen/textobjects.scm %{_helix_runtimedir}/queries/toml/highlights.scm @@ -308,7 +293,6 @@ install -Dm755 %{SOURCE3} %{buildroot}%{_bindir}/%{name} %{_helix_runtimedir}/queries/twig/highlights.scm %{_helix_runtimedir}/queries/twig/injections.scm %{_helix_runtimedir}/queries/typescript/highlights.scm -%{_helix_runtimedir}/queries/typescript/indents.toml %{_helix_runtimedir}/queries/typescript/injections.scm %{_helix_runtimedir}/queries/typescript/locals.scm %{_helix_runtimedir}/queries/typescript/tags.scm @@ -317,10 +301,8 @@ install -Dm755 %{SOURCE3} %{buildroot}%{_bindir}/%{name} %{_helix_runtimedir}/queries/wgsl/highlights.scm %{_helix_runtimedir}/queries/wgsl/injections.scm %{_helix_runtimedir}/queries/yaml/highlights.scm -%{_helix_runtimedir}/queries/yaml/indents.toml %{_helix_runtimedir}/queries/yaml/injections.scm %{_helix_runtimedir}/queries/zig/highlights.scm -%{_helix_runtimedir}/queries/zig/indents.toml %{_helix_runtimedir}/queries/zig/injections.scm %{_helix_runtimedir}/themes/README.md %{_helix_runtimedir}/themes/base16_default_dark.toml diff --git a/vendor.tar.xz b/vendor.tar.xz deleted file mode 100644 index 4c17465..0000000 --- a/vendor.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d327482e0b555ad199920152a60a379fb5869ddc70db23761a3529390ae10246 -size 14385504 diff --git a/vendor.tar.zst b/vendor.tar.zst new file mode 100644 index 0000000..c6e9a08 --- /dev/null +++ b/vendor.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e05342e6818fa44f6c118fc5905e828207fa54902e6da977cdf69d2c9873130 +size 21729718 From 1efa4e6bc906d550a9e9369ac61c99c5c7c5dc0d899fa17d08a52c84aa2b48b2 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Mon, 30 May 2022 14:50:15 +0000 Subject: [PATCH 2/5] Accepting request 979876 from home:uncomfyhalomacro:branches:editors Fixed build errors. :D OBS-URL: https://build.opensuse.org/request/show/979876 OBS-URL: https://build.opensuse.org/package/show/editors/helix?expand=0&rev=19 --- README.SUSE | 45 ------- _service | 25 ++-- helix-22.05.tar.xz | 3 + helix-22.05.tar.zst | 3 - helix.sh | 9 -- helix.spec | 309 ++++++++++++++++++++++++++++++-------------- vendor.tar.xz | 3 + vendor.tar.zst | 3 - 8 files changed, 231 insertions(+), 169 deletions(-) delete mode 100644 README.SUSE create mode 100644 helix-22.05.tar.xz delete mode 100644 helix-22.05.tar.zst delete mode 100644 helix.sh create mode 100644 vendor.tar.xz delete mode 100644 vendor.tar.zst diff --git a/README.SUSE b/README.SUSE deleted file mode 100644 index 10d37bd..0000000 --- a/README.SUSE +++ /dev/null @@ -1,45 +0,0 @@ -HELIX EDITOR FOR YOUR INFORMATION - -Soc Virnyl Estela - -This is a small document that explains how to run/use helix. -Because of the limitations of cargo-packaging in openSUSE Build Service, -we have to resort on some workarounds before running helix. - -TABLE OF CONTENTS - - The Name of the launcher binary - Before running helix - Fetching and building grammars - Troubleshooting - Documentation - -THE NAME OF THE LAUNCHER BINARY - -The launcher binary is renamed as 'helix', alias hx='helix' if you were using 'hx'. - -BEFORE RUNNING HELIX - -Helix needs its runtime files so make sure to copy/symlink the runtime/ directory -into the config directory (for example ~/.config/helix/runtime).If you see an error when -launching helix, copy the runtime directory. -Runtime directory is found in '/usr/lib64/helix/runtime'. - -FETCHING AND BUILDING GRAMMARS - -Run 'helix --grammar fetch' then 'helix --grammar build' to install the grammars. -To customize language-specific settings, you can copy '/usr/share/doc/packages/helix/languages.toml' -to '~/.helix/' or '~/.config/helix'. - -TROUBLESHOOTING - -If you see an error when launching helix for the first time, it might be -because you did not copy the runtime directory. -Otherwise, open an issue at: - - https://github.com/helix-editor/helix/issues/new - -DOCUMENTATION - - https://docs.helix-editor.com - diff --git a/_service b/_service index 0baa4a8..5938074 100644 --- a/_service +++ b/_service @@ -1,23 +1,18 @@ - - https://github.com/helix-editor/helix - @PARENT_TAG@ - git - 27609f50652e28b9bb7a190322fbb8f7c4479c28 - (.*) - \1 - enable - socvirnyl.estela@gmail.com - - - - *.tar - zst + + true + https + github.com + helix-editor/helix/releases/download/22.05/helix-22.05-source.tar.xz + + *.tar + xz + helix - zst + xz true diff --git a/helix-22.05.tar.xz b/helix-22.05.tar.xz new file mode 100644 index 0000000..19822f2 --- /dev/null +++ b/helix-22.05.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a68b8576e0cf0757a3debbc6cf7e2691585b8027ecec623acbb7853177d948da +size 66646816 diff --git a/helix-22.05.tar.zst b/helix-22.05.tar.zst deleted file mode 100644 index 7f0d58b..0000000 --- a/helix-22.05.tar.zst +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2c6a749f0167d2f5ac8d7a76740b3af3c5362f602d44dbc8546180d6eabde03 -size 1087232 diff --git a/helix.sh b/helix.sh deleted file mode 100644 index 742bfd2..0000000 --- a/helix.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -if [ "$USER" = "root" ] -then - HELIX_RUNTIME=/usr/lib64/helix/runtime exec /usr/lib64/helix/hx "$@" -else - mkdir -p "$HOME/.config/helix/runtime" - exec /usr/lib64/helix/hx "$@" -fi diff --git a/helix.spec b/helix.spec index 024bad5..bf4163b 100644 --- a/helix.spec +++ b/helix.spec @@ -16,8 +16,7 @@ # -%global _helix_runtimedir %{_sharedstatedir}/%{name}/runtime/ -%global rustflags -Clink-arg=-Wl,-z,relro,-z,now -C debuginfo=2 +%global _helix_runtimedir %{_sharedstatedir}/%{name}/runtime Name: helix Version: 22.05 @@ -25,14 +24,13 @@ Release: 0 Summary: A post-modern modal text editor written in Rust License: (Apache-2.0 OR MIT) AND BSD-3-Clause AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT or Unlicense) AND (Zlib OR Apache-2.0 OR MIT) AND Apache-2.0 AND BSL-1.0 AND ISC AND MIT AND MPL-2.0+ AND Zlib AND MPL-2.0 URL: https://github.com/helix-editor/helix -Source0: %{name}-%{version}.tar.zst -Source1: vendor.tar.zst +Source0: %{name}-%{version}.tar.xz +Source1: vendor.tar.xz Source2: cargo_config -Source3: helix.sh -Source4: helix-rpmlintrc -Source5: README.SUSE +Source3: helix-rpmlintrc +BuildRequires: c++_compiler +BuildRequires: c_compiler BuildRequires: cargo-packaging -BuildRequires: rust >= 1.46 ExclusiveArch: %{rust_arches} %description @@ -40,168 +38,245 @@ A kakoune/neovim inspired modal text editor with built-in LSP and has treesitter support for syntax highlighting and improved navigation %prep -%autosetup -a1 +%autosetup -a1 -n %{name} mkdir -p .cargo cp %{SOURCE2} .cargo/config -cp %{SOURCE5} docs/README.SUSE %build -export RUSTFLAGS="%{rustflags}" - -# We must disable fetching and building the treesitter grammars because this is a limitation with OBS cargo-packaging for now export HELIX_DISABLE_AUTO_GRAMMAR_BUILD=true -cargo build --locked --offline --release +%{cargo_build} +HELIX_RUNTIME="$PWD/runtime" ./target/release/hx --grammar build %install mkdir -p %{buildroot}%{_libdir}/%{name} mkdir -p %{buildroot}%{_helix_runtimedir} -install -m 0755 %{_builddir}/%{name}-%{version}/target/release/hx %{buildroot}%{_libdir}/%{name}/hx +install -m 0755 %{_builddir}/%{name}/target/release/hx %{buildroot}%{_libdir}/%{name}/hx cp -rv "runtime/queries" %{buildroot}%{_helix_runtimedir} cp -rv "runtime/themes" %{buildroot}%{_helix_runtimedir} +find "%{_builddir}/%{name}/runtime/grammars" -type f -name '*.so' -exec \ + install -Dm 755 {} -t "%{_buildroot}%{_helix_runtimedir}/grammars" \; install -Dm644 runtime/tutor.txt -t %{buildroot}%{_helix_runtimedir} ln -sv %{_helix_runtimedir} %{buildroot}%{_libdir}/%{name}/runtime install -D -d -m 0755 %{buildroot}%{_bindir} -install -Dm755 %{SOURCE3} %{buildroot}%{_bindir}/%{name} +ln -sv %{_libdir}/%{name}/hx %{buildroot}%{_bindir}/%{name} %files %license LICENSE -%doc README.md docs/README.SUSE CHANGELOG.md languages.toml docs/CONTRIBUTING.md docs/architecture.md docs/vision.md +%doc README.md CHANGELOG.md languages.toml docs/CONTRIBUTING.md docs/architecture.md docs/vision.md + +# hx symlinked as helix %{_bindir}/%{name} -%dir %{_sharedstatedir}/%{name} + +# The real hx binary +%{_libdir}/%{name}/hx + +# Runtimes and runtime files +%dir %{_libdir}/%{name}/ +%dir %{_sharedstatedir}/%{name}/ %dir %{_helix_runtimedir} %dir %{_helix_runtimedir}/queries -%dir %{_helix_runtimedir}/queries/bash -%dir %{_helix_runtimedir}/queries/c -%dir %{_helix_runtimedir}/queries/c-sharp -%dir %{_helix_runtimedir}/queries/cmake -%dir %{_helix_runtimedir}/queries/comment -%dir %{_helix_runtimedir}/queries/cpp -%dir %{_helix_runtimedir}/queries/css -%dir %{_helix_runtimedir}/queries/dart -%dir %{_helix_runtimedir}/queries/dockerfile -%dir %{_helix_runtimedir}/queries/elixir -%dir %{_helix_runtimedir}/queries/elm -%dir %{_helix_runtimedir}/queries/erlang -%dir %{_helix_runtimedir}/queries/fish -%dir %{_helix_runtimedir}/queries/git-commit -%dir %{_helix_runtimedir}/queries/git-config -%dir %{_helix_runtimedir}/queries/git-diff -%dir %{_helix_runtimedir}/queries/git-rebase -%dir %{_helix_runtimedir}/queries/glsl -%dir %{_helix_runtimedir}/queries/go -%dir %{_helix_runtimedir}/queries/graphql -%dir %{_helix_runtimedir}/queries/haskell -%dir %{_helix_runtimedir}/queries/hcl -%dir %{_helix_runtimedir}/queries/html -%dir %{_helix_runtimedir}/queries/iex -%dir %{_helix_runtimedir}/queries/java -%dir %{_helix_runtimedir}/queries/javascript -%dir %{_helix_runtimedir}/queries/json -%dir %{_helix_runtimedir}/queries/julia -%dir %{_helix_runtimedir}/queries/kotlin -%dir %{_helix_runtimedir}/queries/latex -%dir %{_helix_runtimedir}/queries/lean -%dir %{_helix_runtimedir}/queries/ledger -%dir %{_helix_runtimedir}/queries/llvm -%dir %{_helix_runtimedir}/queries/llvm-mir -%dir %{_helix_runtimedir}/queries/llvm-mir-yaml -%dir %{_helix_runtimedir}/queries/lua -%dir %{_helix_runtimedir}/queries/make -%dir %{_helix_runtimedir}/queries/markdown -%dir %{_helix_runtimedir}/queries/nix -%dir %{_helix_runtimedir}/queries/ocaml -%dir %{_helix_runtimedir}/queries/ocaml-interface -%dir %{_helix_runtimedir}/queries/org -%dir %{_helix_runtimedir}/queries/perl -%dir %{_helix_runtimedir}/queries/php -%dir %{_helix_runtimedir}/queries/protobuf -%dir %{_helix_runtimedir}/queries/python -%dir %{_helix_runtimedir}/queries/regex -%dir %{_helix_runtimedir}/queries/rescript -%dir %{_helix_runtimedir}/queries/ruby -%dir %{_helix_runtimedir}/queries/rust -%dir %{_helix_runtimedir}/queries/scala -%dir %{_helix_runtimedir}/queries/solidity -%dir %{_helix_runtimedir}/queries/svelte -%dir %{_helix_runtimedir}/queries/tablegen -%dir %{_helix_runtimedir}/queries/toml -%dir %{_helix_runtimedir}/queries/tsq -%dir %{_helix_runtimedir}/queries/tsx -%dir %{_helix_runtimedir}/queries/twig -%dir %{_helix_runtimedir}/queries/typescript -%dir %{_helix_runtimedir}/queries/vue -%dir %{_helix_runtimedir}/queries/wgsl -%dir %{_helix_runtimedir}/queries/yaml -%dir %{_helix_runtimedir}/queries/zig %dir %{_helix_runtimedir}/themes +%{_helix_runtimedir}/queries/bash +%{_helix_runtimedir}/queries/c +%{_helix_runtimedir}/queries/c-sharp +%{_helix_runtimedir}/queries/cairo +%{_helix_runtimedir}/queries/cmake +%{_helix_runtimedir}/queries/comment +%{_helix_runtimedir}/queries/cpon +%{_helix_runtimedir}/queries/cpp +%{_helix_runtimedir}/queries/css +%{_helix_runtimedir}/queries/dart +%{_helix_runtimedir}/queries/devicetree +%{_helix_runtimedir}/queries/dockerfile +%{_helix_runtimedir}/queries/eex +%{_helix_runtimedir}/queries/ejs +%{_helix_runtimedir}/queries/elixir +%{_helix_runtimedir}/queries/elm +%{_helix_runtimedir}/queries/erb +%{_helix_runtimedir}/queries/erlang +%{_helix_runtimedir}/queries/fish +%{_helix_runtimedir}/queries/gdscript +%{_helix_runtimedir}/queries/git-attributes +%{_helix_runtimedir}/queries/git-commit +%{_helix_runtimedir}/queries/git-config +%{_helix_runtimedir}/queries/git-diff +%{_helix_runtimedir}/queries/git-ignore +%{_helix_runtimedir}/queries/git-rebase +%{_helix_runtimedir}/queries/gleam +%{_helix_runtimedir}/queries/glsl +%{_helix_runtimedir}/queries/go +%{_helix_runtimedir}/queries/gomod +%{_helix_runtimedir}/queries/gowork +%{_helix_runtimedir}/queries/graphql +%{_helix_runtimedir}/queries/hare +%{_helix_runtimedir}/queries/haskell +%{_helix_runtimedir}/queries/hcl +%{_helix_runtimedir}/queries/heex +%{_helix_runtimedir}/queries/html +%{_helix_runtimedir}/queries/iex +%{_helix_runtimedir}/queries/java +%{_helix_runtimedir}/queries/javascript +%{_helix_runtimedir}/queries/json +%{_helix_runtimedir}/queries/jsx +%{_helix_runtimedir}/queries/julia +%{_helix_runtimedir}/queries/kotlin +%{_helix_runtimedir}/queries/latex +%{_helix_runtimedir}/queries/lean +%{_helix_runtimedir}/queries/ledger +%{_helix_runtimedir}/queries/llvm +%{_helix_runtimedir}/queries/llvm-mir +%{_helix_runtimedir}/queries/llvm-mir-yaml +%{_helix_runtimedir}/queries/lua +%{_helix_runtimedir}/queries/make +%{_helix_runtimedir}/queries/markdown +%{_helix_runtimedir}/queries/meson +%{_helix_runtimedir}/queries/nickel +%{_helix_runtimedir}/queries/nix +%{_helix_runtimedir}/queries/nu +%{_helix_runtimedir}/queries/ocaml +%{_helix_runtimedir}/queries/ocaml-interface +%{_helix_runtimedir}/queries/odin +%{_helix_runtimedir}/queries/org +%{_helix_runtimedir}/queries/perl +%{_helix_runtimedir}/queries/php +%{_helix_runtimedir}/queries/protobuf +%{_helix_runtimedir}/queries/python +%{_helix_runtimedir}/queries/r +%{_helix_runtimedir}/queries/regex +%{_helix_runtimedir}/queries/rescript +%{_helix_runtimedir}/queries/rmarkdown +%{_helix_runtimedir}/queries/ron +%{_helix_runtimedir}/queries/ruby +%{_helix_runtimedir}/queries/rust +%{_helix_runtimedir}/queries/scala +%{_helix_runtimedir}/queries/scheme +%{_helix_runtimedir}/queries/solidity +%{_helix_runtimedir}/queries/sql +%{_helix_runtimedir}/queries/sshclientconfig +%{_helix_runtimedir}/queries/svelte +%{_helix_runtimedir}/queries/swift +%{_helix_runtimedir}/queries/tablegen +%{_helix_runtimedir}/queries/toml +%{_helix_runtimedir}/queries/tsq +%{_helix_runtimedir}/queries/tsx +%{_helix_runtimedir}/queries/twig +%{_helix_runtimedir}/queries/typescript +%{_helix_runtimedir}/queries/vala +%{_helix_runtimedir}/queries/verilog +%{_helix_runtimedir}/queries/vue +%{_helix_runtimedir}/queries/wgsl +%{_helix_runtimedir}/queries/yaml +%{_helix_runtimedir}/queries/zig + %{_helix_runtimedir}/queries/bash/highlights.scm %{_helix_runtimedir}/queries/bash/injections.scm %{_helix_runtimedir}/queries/c-sharp/highlights.scm %{_helix_runtimedir}/queries/c-sharp/injections.scm %{_helix_runtimedir}/queries/c/highlights.scm +%{_helix_runtimedir}/queries/c/indents.scm %{_helix_runtimedir}/queries/c/injections.scm %{_helix_runtimedir}/queries/c/textobjects.scm +%{_helix_runtimedir}/queries/cairo/highlights.scm +%{_helix_runtimedir}/queries/cairo/injections.scm %{_helix_runtimedir}/queries/cmake/highlights.scm +%{_helix_runtimedir}/queries/cmake/indents.scm %{_helix_runtimedir}/queries/cmake/injections.scm %{_helix_runtimedir}/queries/cmake/textobjects.scm %{_helix_runtimedir}/queries/comment/highlights.scm +%{_helix_runtimedir}/queries/cpon/highlights.scm +%{_helix_runtimedir}/queries/cpon/indents.scm %{_helix_runtimedir}/queries/cpp/highlights.scm +%{_helix_runtimedir}/queries/cpp/indents.scm %{_helix_runtimedir}/queries/cpp/injections.scm %{_helix_runtimedir}/queries/cpp/textobjects.scm %{_helix_runtimedir}/queries/css/highlights.scm %{_helix_runtimedir}/queries/css/injections.scm %{_helix_runtimedir}/queries/dart/highlights.scm +%{_helix_runtimedir}/queries/dart/indents.scm %{_helix_runtimedir}/queries/dart/injections.scm %{_helix_runtimedir}/queries/dart/locals.scm +%{_helix_runtimedir}/queries/devicetree/highlights.scm +%{_helix_runtimedir}/queries/devicetree/indents.scm %{_helix_runtimedir}/queries/dockerfile/highlights.scm %{_helix_runtimedir}/queries/dockerfile/injections.scm +%{_helix_runtimedir}/queries/eex/highlights.scm +%{_helix_runtimedir}/queries/eex/injections.scm +%{_helix_runtimedir}/queries/ejs/highlights.scm +%{_helix_runtimedir}/queries/ejs/injections.scm %{_helix_runtimedir}/queries/elixir/highlights.scm %{_helix_runtimedir}/queries/elixir/injections.scm %{_helix_runtimedir}/queries/elm/highlights.scm %{_helix_runtimedir}/queries/elm/injections.scm %{_helix_runtimedir}/queries/elm/locals.scm %{_helix_runtimedir}/queries/elm/tags.scm +%{_helix_runtimedir}/queries/erb/highlights.scm +%{_helix_runtimedir}/queries/erb/injections.scm %{_helix_runtimedir}/queries/erlang/highlights.scm %{_helix_runtimedir}/queries/erlang/injections.scm %{_helix_runtimedir}/queries/fish/highlights.scm +%{_helix_runtimedir}/queries/fish/indents.scm %{_helix_runtimedir}/queries/fish/injections.scm %{_helix_runtimedir}/queries/fish/textobjects.scm +%{_helix_runtimedir}/queries/gdscript/highlights.scm +%{_helix_runtimedir}/queries/gdscript/indents.scm +%{_helix_runtimedir}/queries/gdscript/tags.scm +%{_helix_runtimedir}/queries/git-attributes/highlights.scm %{_helix_runtimedir}/queries/git-commit/highlights.scm %{_helix_runtimedir}/queries/git-commit/injections.scm %{_helix_runtimedir}/queries/git-config/highlights.scm %{_helix_runtimedir}/queries/git-diff/highlights.scm +%{_helix_runtimedir}/queries/git-ignore/highlights.scm %{_helix_runtimedir}/queries/git-rebase/highlights.scm %{_helix_runtimedir}/queries/git-rebase/injections.scm +%{_helix_runtimedir}/queries/gleam/highlights.scm +%{_helix_runtimedir}/queries/gleam/locals.scm %{_helix_runtimedir}/queries/glsl/folds.scm %{_helix_runtimedir}/queries/glsl/highlights.scm +%{_helix_runtimedir}/queries/glsl/indents.scm %{_helix_runtimedir}/queries/glsl/injections.scm %{_helix_runtimedir}/queries/glsl/locals.scm %{_helix_runtimedir}/queries/go/highlights.scm +%{_helix_runtimedir}/queries/go/indents.scm %{_helix_runtimedir}/queries/go/injections.scm %{_helix_runtimedir}/queries/go/locals.scm %{_helix_runtimedir}/queries/go/tags.scm %{_helix_runtimedir}/queries/go/textobjects.scm +%{_helix_runtimedir}/queries/gomod/highlights.scm +%{_helix_runtimedir}/queries/gomod/injections.scm +%{_helix_runtimedir}/queries/gowork/highlights.scm +%{_helix_runtimedir}/queries/gowork/injections.scm %{_helix_runtimedir}/queries/graphql/highlights.scm +%{_helix_runtimedir}/queries/hare/highlights.scm +%{_helix_runtimedir}/queries/hare/indents.scm +%{_helix_runtimedir}/queries/hare/locals.scm %{_helix_runtimedir}/queries/haskell/highlights.scm %{_helix_runtimedir}/queries/haskell/injections.scm %{_helix_runtimedir}/queries/haskell/locals.scm %{_helix_runtimedir}/queries/hcl/folds.scm %{_helix_runtimedir}/queries/hcl/highlights.scm +%{_helix_runtimedir}/queries/hcl/indents.scm %{_helix_runtimedir}/queries/hcl/injections.scm +%{_helix_runtimedir}/queries/heex/highlights.scm +%{_helix_runtimedir}/queries/heex/injections.scm %{_helix_runtimedir}/queries/html/highlights.scm %{_helix_runtimedir}/queries/html/injections.scm %{_helix_runtimedir}/queries/iex/highlights.scm %{_helix_runtimedir}/queries/iex/injections.scm %{_helix_runtimedir}/queries/java/highlights.scm %{_helix_runtimedir}/queries/java/injections.scm -%{_helix_runtimedir}/queries/javascript/highlights-jsx.scm %{_helix_runtimedir}/queries/javascript/highlights-params.scm %{_helix_runtimedir}/queries/javascript/highlights.scm +%{_helix_runtimedir}/queries/javascript/indents.scm %{_helix_runtimedir}/queries/javascript/injections.scm %{_helix_runtimedir}/queries/javascript/locals.scm %{_helix_runtimedir}/queries/javascript/tags.scm %{_helix_runtimedir}/queries/json/highlights.scm +%{_helix_runtimedir}/queries/json/indents.scm +%{_helix_runtimedir}/queries/jsx/highlights.scm +%{_helix_runtimedir}/queries/jsx/indents.scm +%{_helix_runtimedir}/queries/jsx/injections.scm +%{_helix_runtimedir}/queries/jsx/locals.scm %{_helix_runtimedir}/queries/julia/folds.scm %{_helix_runtimedir}/queries/julia/highlights.scm %{_helix_runtimedir}/queries/julia/injections.scm @@ -219,69 +294,98 @@ install -Dm755 %{SOURCE3} %{buildroot}%{_bindir}/%{name} %{_helix_runtimedir}/queries/ledger/highlights.scm %{_helix_runtimedir}/queries/ledger/injections.scm %{_helix_runtimedir}/queries/llvm-mir-yaml/highlights.scm - +%{_helix_runtimedir}/queries/llvm-mir-yaml/indents.scm %{_helix_runtimedir}/queries/llvm-mir-yaml/injections.scm %{_helix_runtimedir}/queries/llvm-mir/highlights.scm - +%{_helix_runtimedir}/queries/llvm-mir/indents.scm %{_helix_runtimedir}/queries/llvm-mir/injections.scm %{_helix_runtimedir}/queries/llvm-mir/textobjects.scm %{_helix_runtimedir}/queries/llvm/highlights.scm - +%{_helix_runtimedir}/queries/llvm/indents.scm %{_helix_runtimedir}/queries/llvm/injections.scm %{_helix_runtimedir}/queries/llvm/locals.scm %{_helix_runtimedir}/queries/llvm/textobjects.scm %{_helix_runtimedir}/queries/lua/highlights.scm - +%{_helix_runtimedir}/queries/lua/indents.scm %{_helix_runtimedir}/queries/lua/injections.scm %{_helix_runtimedir}/queries/make/highlights.scm %{_helix_runtimedir}/queries/make/injections.scm %{_helix_runtimedir}/queries/markdown/highlights.scm %{_helix_runtimedir}/queries/markdown/injections.scm +%{_helix_runtimedir}/queries/meson/highlights.scm +%{_helix_runtimedir}/queries/meson/indents.scm +%{_helix_runtimedir}/queries/nickel/highlights.scm +%{_helix_runtimedir}/queries/nickel/indents.scm %{_helix_runtimedir}/queries/nix/highlights.scm - +%{_helix_runtimedir}/queries/nix/indents.scm +%{_helix_runtimedir}/queries/nu/folds.scm +%{_helix_runtimedir}/queries/nu/highlights.scm +%{_helix_runtimedir}/queries/nu/injections.scm +%{_helix_runtimedir}/queries/nu/locals.scm %{_helix_runtimedir}/queries/ocaml-interface/highlights.scm %{_helix_runtimedir}/queries/ocaml-interface/injections.scm %{_helix_runtimedir}/queries/ocaml/highlights.scm - +%{_helix_runtimedir}/queries/ocaml/indents.scm %{_helix_runtimedir}/queries/ocaml/injections.scm %{_helix_runtimedir}/queries/ocaml/locals.scm +%{_helix_runtimedir}/queries/odin/highlights.scm %{_helix_runtimedir}/queries/org/highlights.scm %{_helix_runtimedir}/queries/org/injections.scm %{_helix_runtimedir}/queries/perl/highlights.scm - +%{_helix_runtimedir}/queries/perl/indents.scm %{_helix_runtimedir}/queries/perl/injections.scm %{_helix_runtimedir}/queries/perl/textobjects.scm %{_helix_runtimedir}/queries/php/highlights.scm - +%{_helix_runtimedir}/queries/php/indents.scm %{_helix_runtimedir}/queries/php/injections.scm %{_helix_runtimedir}/queries/php/tags.scm %{_helix_runtimedir}/queries/php/textobjects.scm %{_helix_runtimedir}/queries/protobuf/highlights.scm - +%{_helix_runtimedir}/queries/protobuf/indents.scm %{_helix_runtimedir}/queries/protobuf/injections.scm %{_helix_runtimedir}/queries/python/highlights.scm - +%{_helix_runtimedir}/queries/python/indents.scm %{_helix_runtimedir}/queries/python/injections.scm %{_helix_runtimedir}/queries/python/tags.scm %{_helix_runtimedir}/queries/python/textobjects.scm +%{_helix_runtimedir}/queries/r/highlights.scm +%{_helix_runtimedir}/queries/r/locals.scm %{_helix_runtimedir}/queries/regex/highlights.scm %{_helix_runtimedir}/queries/rescript/highlights.scm %{_helix_runtimedir}/queries/rescript/injections.scm %{_helix_runtimedir}/queries/rescript/textobjects.scm +%{_helix_runtimedir}/queries/rmarkdown/highlights.scm +%{_helix_runtimedir}/queries/rmarkdown/indents.scm +%{_helix_runtimedir}/queries/rmarkdown/injections.scm +%{_helix_runtimedir}/queries/ron/highlights.scm +%{_helix_runtimedir}/queries/ron/indents.scm +%{_helix_runtimedir}/queries/ron/injections.scm %{_helix_runtimedir}/queries/ruby/highlights.scm +%{_helix_runtimedir}/queries/ruby/indents.scm %{_helix_runtimedir}/queries/ruby/injections.scm %{_helix_runtimedir}/queries/ruby/locals.scm %{_helix_runtimedir}/queries/ruby/tags.scm +%{_helix_runtimedir}/queries/ruby/textobjects.scm %{_helix_runtimedir}/queries/rust/highlights.scm +%{_helix_runtimedir}/queries/rust/indents.scm %{_helix_runtimedir}/queries/rust/injections.scm %{_helix_runtimedir}/queries/rust/locals.scm %{_helix_runtimedir}/queries/rust/textobjects.scm %{_helix_runtimedir}/queries/scala/highlights.scm +%{_helix_runtimedir}/queries/scala/indents.scm %{_helix_runtimedir}/queries/scala/injections.scm +%{_helix_runtimedir}/queries/scheme/highlights.scm +%{_helix_runtimedir}/queries/scheme/injections.scm %{_helix_runtimedir}/queries/solidity/highlights.scm +%{_helix_runtimedir}/queries/sql/highlights.scm +%{_helix_runtimedir}/queries/sshclientconfig/highlights.scm %{_helix_runtimedir}/queries/svelte/highlights.scm +%{_helix_runtimedir}/queries/svelte/indents.scm %{_helix_runtimedir}/queries/svelte/injections.scm +%{_helix_runtimedir}/queries/swift/highlights.scm +%{_helix_runtimedir}/queries/swift/locals.scm %{_helix_runtimedir}/queries/tablegen/highlights.scm +%{_helix_runtimedir}/queries/tablegen/indents.scm %{_helix_runtimedir}/queries/tablegen/injections.scm %{_helix_runtimedir}/queries/tablegen/textobjects.scm %{_helix_runtimedir}/queries/toml/highlights.scm @@ -293,24 +397,36 @@ install -Dm755 %{SOURCE3} %{buildroot}%{_bindir}/%{name} %{_helix_runtimedir}/queries/twig/highlights.scm %{_helix_runtimedir}/queries/twig/injections.scm %{_helix_runtimedir}/queries/typescript/highlights.scm +%{_helix_runtimedir}/queries/typescript/indents.scm %{_helix_runtimedir}/queries/typescript/injections.scm %{_helix_runtimedir}/queries/typescript/locals.scm %{_helix_runtimedir}/queries/typescript/tags.scm +%{_helix_runtimedir}/queries/vala/highlights.scm +%{_helix_runtimedir}/queries/verilog/highlights.scm +%{_helix_runtimedir}/queries/verilog/injections.scm +%{_helix_runtimedir}/queries/verilog/locals.scm +%{_helix_runtimedir}/queries/verilog/textobjects.scm %{_helix_runtimedir}/queries/vue/highlights.scm %{_helix_runtimedir}/queries/vue/injections.scm %{_helix_runtimedir}/queries/wgsl/highlights.scm %{_helix_runtimedir}/queries/wgsl/injections.scm %{_helix_runtimedir}/queries/yaml/highlights.scm +%{_helix_runtimedir}/queries/yaml/indents.scm %{_helix_runtimedir}/queries/yaml/injections.scm %{_helix_runtimedir}/queries/zig/highlights.scm +%{_helix_runtimedir}/queries/zig/indents.scm %{_helix_runtimedir}/queries/zig/injections.scm %{_helix_runtimedir}/themes/README.md +%{_helix_runtimedir}/themes/autumn.toml %{_helix_runtimedir}/themes/base16_default_dark.toml %{_helix_runtimedir}/themes/base16_default_light.toml %{_helix_runtimedir}/themes/base16_terminal.toml %{_helix_runtimedir}/themes/bogster.toml +%{_helix_runtimedir}/themes/boo_berry.toml +%{_helix_runtimedir}/themes/catpuccin.toml %{_helix_runtimedir}/themes/dark_plus.toml %{_helix_runtimedir}/themes/dracula.toml +%{_helix_runtimedir}/themes/dracula_at_night.toml %{_helix_runtimedir}/themes/everforest_dark.toml %{_helix_runtimedir}/themes/everforest_light.toml %{_helix_runtimedir}/themes/gruvbox.toml @@ -322,19 +438,24 @@ install -Dm755 %{SOURCE3} %{buildroot}%{_bindir}/%{name} %{_helix_runtimedir}/themes/monokai_pro_octagon.toml %{_helix_runtimedir}/themes/monokai_pro_ristretto.toml %{_helix_runtimedir}/themes/monokai_pro_spectrum.toml +%{_helix_runtimedir}/themes/night_owl.toml %{_helix_runtimedir}/themes/nord.toml %{_helix_runtimedir}/themes/onedark.toml +%{_helix_runtimedir}/themes/onelight.toml +%{_helix_runtimedir}/themes/pop-dark.toml %{_helix_runtimedir}/themes/rose_pine.toml %{_helix_runtimedir}/themes/rose_pine_dawn.toml %{_helix_runtimedir}/themes/serika-dark.toml %{_helix_runtimedir}/themes/serika-light.toml +%{_helix_runtimedir}/themes/snazzy.toml %{_helix_runtimedir}/themes/solarized_dark.toml %{_helix_runtimedir}/themes/solarized_light.toml %{_helix_runtimedir}/themes/spacebones_light.toml +%{_helix_runtimedir}/themes/tokyonight.toml +%{_helix_runtimedir}/themes/tokyonight_storm.toml %{_helix_runtimedir}/tutor.txt -%dir %{_libdir}/%{name} +# Symlinked runtime directory %{_libdir}/%{name}/runtime -%{_libdir}/%{name}/hx %changelog diff --git a/vendor.tar.xz b/vendor.tar.xz new file mode 100644 index 0000000..2635f32 --- /dev/null +++ b/vendor.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:052125e99362fa984f9efdf1df02e6f6a19b3b235e03b97ed80f6cd013212769 +size 14431928 diff --git a/vendor.tar.zst b/vendor.tar.zst deleted file mode 100644 index c6e9a08..0000000 --- a/vendor.tar.zst +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9e05342e6818fa44f6c118fc5905e828207fa54902e6da977cdf69d2c9873130 -size 21729718 From b05f6ac555f476610f4ef8818f2a00acdce5c322e0587d03d1caca6011aedaa3 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Mon, 30 May 2022 14:59:42 +0000 Subject: [PATCH 3/5] Accepting request 979878 from home:uncomfyhalomacro:branches:editors fix typo OBS-URL: https://build.opensuse.org/request/show/979878 OBS-URL: https://build.opensuse.org/package/show/editors/helix?expand=0&rev=20 --- helix.spec | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 77 insertions(+), 1 deletion(-) diff --git a/helix.spec b/helix.spec index bf4163b..e286a3c 100644 --- a/helix.spec +++ b/helix.spec @@ -54,7 +54,7 @@ install -m 0755 %{_builddir}/%{name}/target/release/hx %{buildroot}%{_libdir}/%{ cp -rv "runtime/queries" %{buildroot}%{_helix_runtimedir} cp -rv "runtime/themes" %{buildroot}%{_helix_runtimedir} find "%{_builddir}/%{name}/runtime/grammars" -type f -name '*.so' -exec \ - install -Dm 755 {} -t "%{_buildroot}%{_helix_runtimedir}/grammars" \; + install -Dm 755 {} -t "%{buildroot}%{_helix_runtimedir}/grammars" \; install -Dm644 runtime/tutor.txt -t %{buildroot}%{_helix_runtimedir} ln -sv %{_helix_runtimedir} %{buildroot}%{_libdir}/%{name}/runtime install -D -d -m 0755 %{buildroot}%{_bindir} @@ -76,7 +76,81 @@ ln -sv %{_libdir}/%{name}/hx %{buildroot}%{_bindir}/%{name} %dir %{_helix_runtimedir} %dir %{_helix_runtimedir}/queries %dir %{_helix_runtimedir}/themes +%dir %{_helix_runtimedir}/grammars +# Grammars +%{_helix_runtimedir}/grammars/rust.so +%{_helix_runtimedir}/grammars/tablegen.so +%{_helix_runtimedir}/grammars/regex.so +%{_helix_runtimedir}/grammars/c.so +%{_helix_runtimedir}/grammars/protobuf.so +%{_helix_runtimedir}/grammars/haskell.so +%{_helix_runtimedir}/grammars/ledger.so +%{_helix_runtimedir}/grammars/elixir.so +%{_helix_runtimedir}/grammars/fish.so +%{_helix_runtimedir}/grammars/embedded-template.so +%{_helix_runtimedir}/grammars/tsq.so +%{_helix_runtimedir}/grammars/graphql.so +%{_helix_runtimedir}/grammars/vue.so +%{_helix_runtimedir}/grammars/sql.so +%{_helix_runtimedir}/grammars/python.so +%{_helix_runtimedir}/grammars/svelte.so +%{_helix_runtimedir}/grammars/iex.so +%{_helix_runtimedir}/grammars/json.so +%{_helix_runtimedir}/grammars/rescript.so +%{_helix_runtimedir}/grammars/git-diff.so +%{_helix_runtimedir}/grammars/bash.so +%{_helix_runtimedir}/grammars/tsx.so +%{_helix_runtimedir}/grammars/dart.so +%{_helix_runtimedir}/grammars/javascript.so +%{_helix_runtimedir}/grammars/ocaml-interface.so +%{_helix_runtimedir}/grammars/cpp.so +%{_helix_runtimedir}/grammars/git-commit.so +%{_helix_runtimedir}/grammars/r.so +%{_helix_runtimedir}/grammars/gdscript.so +%{_helix_runtimedir}/grammars/comment.so +%{_helix_runtimedir}/grammars/latex.so +%{_helix_runtimedir}/grammars/eex.so +%{_helix_runtimedir}/grammars/git-rebase.so +%{_helix_runtimedir}/grammars/julia.so +%{_helix_runtimedir}/grammars/toml.so +%{_helix_runtimedir}/grammars/llvm.so +%{_helix_runtimedir}/grammars/php.so +%{_helix_runtimedir}/grammars/perl.so +%{_helix_runtimedir}/grammars/go.so +%{_helix_runtimedir}/grammars/nix.so +%{_helix_runtimedir}/grammars/gleam.so +%{_helix_runtimedir}/grammars/erlang.so +%{_helix_runtimedir}/grammars/solidity.so +%{_helix_runtimedir}/grammars/cmake.so +%{_helix_runtimedir}/grammars/glsl.so +%{_helix_runtimedir}/grammars/typescript.so +%{_helix_runtimedir}/grammars/zig.so +%{_helix_runtimedir}/grammars/llvm-mir.so +%{_helix_runtimedir}/grammars/markdown.so +%{_helix_runtimedir}/grammars/make.so +%{_helix_runtimedir}/grammars/ocaml.so +%{_helix_runtimedir}/grammars/heex.so +%{_helix_runtimedir}/grammars/css.so +%{_helix_runtimedir}/grammars/lua.so +%{_helix_runtimedir}/grammars/swift.so +%{_helix_runtimedir}/grammars/dockerfile.so +%{_helix_runtimedir}/grammars/elm.so +%{_helix_runtimedir}/grammars/scala.so +%{_helix_runtimedir}/grammars/wgsl.so +%{_helix_runtimedir}/grammars/html.so +%{_helix_runtimedir}/grammars/ruby.so +%{_helix_runtimedir}/grammars/c-sharp.so +%{_helix_runtimedir}/grammars/lean.so +%{_helix_runtimedir}/grammars/git-config.so +%{_helix_runtimedir}/grammars/kotlin.so +%{_helix_runtimedir}/grammars/twig.so +%{_helix_runtimedir}/grammars/hcl.so +%{_helix_runtimedir}/grammars/org.so +%{_helix_runtimedir}/grammars/yaml.so +%{_helix_runtimedir}/grammars/java.solidity + +# Queries %{_helix_runtimedir}/queries/bash %{_helix_runtimedir}/queries/c %{_helix_runtimedir}/queries/c-sharp @@ -416,6 +490,8 @@ ln -sv %{_libdir}/%{name}/hx %{buildroot}%{_bindir}/%{name} %{_helix_runtimedir}/queries/zig/highlights.scm %{_helix_runtimedir}/queries/zig/indents.scm %{_helix_runtimedir}/queries/zig/injections.scm + +# Themes %{_helix_runtimedir}/themes/README.md %{_helix_runtimedir}/themes/autumn.toml %{_helix_runtimedir}/themes/base16_default_dark.toml From a0d368c169369715e64ae062d252abc62955d2e8299ef13e5695d12274a037a9 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Mon, 30 May 2022 15:08:17 +0000 Subject: [PATCH 4/5] fix typo (again) OBS-URL: https://build.opensuse.org/package/show/editors/helix?expand=0&rev=21 --- helix.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helix.spec b/helix.spec index e286a3c..8355937 100644 --- a/helix.spec +++ b/helix.spec @@ -148,7 +148,7 @@ ln -sv %{_libdir}/%{name}/hx %{buildroot}%{_bindir}/%{name} %{_helix_runtimedir}/grammars/hcl.so %{_helix_runtimedir}/grammars/org.so %{_helix_runtimedir}/grammars/yaml.so -%{_helix_runtimedir}/grammars/java.solidity +%{_helix_runtimedir}/grammars/java.so # Queries %{_helix_runtimedir}/queries/bash From 99fe475412a20604ea9d4a26f990ba96562207d5dcc6f217ed0dcd78af225401 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Mon, 30 May 2022 23:08:10 +0000 Subject: [PATCH 5/5] Accepting request 979976 from home:uncomfyhalomacro:branches:editors - remove false positive by adding filter to shared-library-without-dependency-information OBS-URL: https://build.opensuse.org/request/show/979976 OBS-URL: https://build.opensuse.org/package/show/editors/helix?expand=0&rev=22 --- helix-rpmlintrc | 2 + helix.changes | 5 ++ helix.spec | 159 +++++++++++++++++++++++++++--------------------- 3 files changed, 98 insertions(+), 68 deletions(-) diff --git a/helix-rpmlintrc b/helix-rpmlintrc index e573e55..f7a23c7 100644 --- a/helix-rpmlintrc +++ b/helix-rpmlintrc @@ -1 +1,3 @@ addFilter("files-duplicate") +addFilter("shared-library-without-dependency-information") + diff --git a/helix.changes b/helix.changes index c11ef54..d028ce9 100644 --- a/helix.changes +++ b/helix.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 30 23:06:18 UTC 2022 - Soc Virnyl Estela + +- remove false positive by adding filter to shared-library-without-dependency-information + ------------------------------------------------------------------- Sun May 29 16:53:38 UTC 2022 - socvirnyl.estela@gmail.com diff --git a/helix.spec b/helix.spec index 8355937..ad9985b 100644 --- a/helix.spec +++ b/helix.spec @@ -48,18 +48,25 @@ export HELIX_DISABLE_AUTO_GRAMMAR_BUILD=true HELIX_RUNTIME="$PWD/runtime" ./target/release/hx --grammar build %install +# Debug info for helix's runtime grammars is not needed nor make sense +%global __debug_install_post %{nil} +%global debug_package %{nil} + mkdir -p %{buildroot}%{_libdir}/%{name} mkdir -p %{buildroot}%{_helix_runtimedir} install -m 0755 %{_builddir}/%{name}/target/release/hx %{buildroot}%{_libdir}/%{name}/hx cp -rv "runtime/queries" %{buildroot}%{_helix_runtimedir} cp -rv "runtime/themes" %{buildroot}%{_helix_runtimedir} find "%{_builddir}/%{name}/runtime/grammars" -type f -name '*.so' -exec \ - install -Dm 755 {} -t "%{buildroot}%{_helix_runtimedir}/grammars" \; + install --verbose -Dm 755 {} -t "%{buildroot}%{_helix_runtimedir}/grammars" \; install -Dm644 runtime/tutor.txt -t %{buildroot}%{_helix_runtimedir} ln -sv %{_helix_runtimedir} %{buildroot}%{_libdir}/%{name}/runtime install -D -d -m 0755 %{buildroot}%{_bindir} ln -sv %{_libdir}/%{name}/hx %{buildroot}%{_bindir}/%{name} +# HACK for disabling debuginfo? +touch %{_builddir}/%{name}/debugsourcefiles.list + %files %license LICENSE %doc README.md CHANGELOG.md languages.toml docs/CONTRIBUTING.md docs/architecture.md docs/vision.md @@ -71,84 +78,100 @@ ln -sv %{_libdir}/%{name}/hx %{buildroot}%{_bindir}/%{name} %{_libdir}/%{name}/hx # Runtimes and runtime files -%dir %{_libdir}/%{name}/ -%dir %{_sharedstatedir}/%{name}/ +%dir %{_libdir}/%{name} +%dir %{_sharedstatedir}/%{name} %dir %{_helix_runtimedir} %dir %{_helix_runtimedir}/queries %dir %{_helix_runtimedir}/themes %dir %{_helix_runtimedir}/grammars # Grammars -%{_helix_runtimedir}/grammars/rust.so -%{_helix_runtimedir}/grammars/tablegen.so -%{_helix_runtimedir}/grammars/regex.so -%{_helix_runtimedir}/grammars/c.so -%{_helix_runtimedir}/grammars/protobuf.so -%{_helix_runtimedir}/grammars/haskell.so -%{_helix_runtimedir}/grammars/ledger.so -%{_helix_runtimedir}/grammars/elixir.so -%{_helix_runtimedir}/grammars/fish.so -%{_helix_runtimedir}/grammars/embedded-template.so -%{_helix_runtimedir}/grammars/tsq.so -%{_helix_runtimedir}/grammars/graphql.so -%{_helix_runtimedir}/grammars/vue.so -%{_helix_runtimedir}/grammars/sql.so -%{_helix_runtimedir}/grammars/python.so -%{_helix_runtimedir}/grammars/svelte.so -%{_helix_runtimedir}/grammars/iex.so -%{_helix_runtimedir}/grammars/json.so -%{_helix_runtimedir}/grammars/rescript.so -%{_helix_runtimedir}/grammars/git-diff.so %{_helix_runtimedir}/grammars/bash.so -%{_helix_runtimedir}/grammars/tsx.so -%{_helix_runtimedir}/grammars/dart.so -%{_helix_runtimedir}/grammars/javascript.so -%{_helix_runtimedir}/grammars/ocaml-interface.so -%{_helix_runtimedir}/grammars/cpp.so -%{_helix_runtimedir}/grammars/git-commit.so -%{_helix_runtimedir}/grammars/r.so -%{_helix_runtimedir}/grammars/gdscript.so -%{_helix_runtimedir}/grammars/comment.so -%{_helix_runtimedir}/grammars/latex.so -%{_helix_runtimedir}/grammars/eex.so -%{_helix_runtimedir}/grammars/git-rebase.so -%{_helix_runtimedir}/grammars/julia.so -%{_helix_runtimedir}/grammars/toml.so -%{_helix_runtimedir}/grammars/llvm.so -%{_helix_runtimedir}/grammars/php.so -%{_helix_runtimedir}/grammars/perl.so -%{_helix_runtimedir}/grammars/go.so -%{_helix_runtimedir}/grammars/nix.so -%{_helix_runtimedir}/grammars/gleam.so -%{_helix_runtimedir}/grammars/erlang.so -%{_helix_runtimedir}/grammars/solidity.so -%{_helix_runtimedir}/grammars/cmake.so -%{_helix_runtimedir}/grammars/glsl.so -%{_helix_runtimedir}/grammars/typescript.so -%{_helix_runtimedir}/grammars/zig.so -%{_helix_runtimedir}/grammars/llvm-mir.so -%{_helix_runtimedir}/grammars/markdown.so -%{_helix_runtimedir}/grammars/make.so -%{_helix_runtimedir}/grammars/ocaml.so -%{_helix_runtimedir}/grammars/heex.so -%{_helix_runtimedir}/grammars/css.so -%{_helix_runtimedir}/grammars/lua.so -%{_helix_runtimedir}/grammars/swift.so -%{_helix_runtimedir}/grammars/dockerfile.so -%{_helix_runtimedir}/grammars/elm.so -%{_helix_runtimedir}/grammars/scala.so -%{_helix_runtimedir}/grammars/wgsl.so -%{_helix_runtimedir}/grammars/html.so -%{_helix_runtimedir}/grammars/ruby.so %{_helix_runtimedir}/grammars/c-sharp.so -%{_helix_runtimedir}/grammars/lean.so +%{_helix_runtimedir}/grammars/c.so +%{_helix_runtimedir}/grammars/cairo.so +%{_helix_runtimedir}/grammars/cmake.so +%{_helix_runtimedir}/grammars/comment.so +%{_helix_runtimedir}/grammars/cpon.so +%{_helix_runtimedir}/grammars/cpp.so +%{_helix_runtimedir}/grammars/css.so +%{_helix_runtimedir}/grammars/dart.so +%{_helix_runtimedir}/grammars/devicetree.so +%{_helix_runtimedir}/grammars/dockerfile.so +%{_helix_runtimedir}/grammars/eex.so +%{_helix_runtimedir}/grammars/elixir.so +%{_helix_runtimedir}/grammars/elm.so +%{_helix_runtimedir}/grammars/embedded-template.so +%{_helix_runtimedir}/grammars/erlang.so +%{_helix_runtimedir}/grammars/fish.so +%{_helix_runtimedir}/grammars/gdscript.so +%{_helix_runtimedir}/grammars/git-commit.so %{_helix_runtimedir}/grammars/git-config.so -%{_helix_runtimedir}/grammars/kotlin.so -%{_helix_runtimedir}/grammars/twig.so +%{_helix_runtimedir}/grammars/git-diff.so +%{_helix_runtimedir}/grammars/git-rebase.so +%{_helix_runtimedir}/grammars/gitattributes.so +%{_helix_runtimedir}/grammars/gitignore.so +%{_helix_runtimedir}/grammars/gleam.so +%{_helix_runtimedir}/grammars/glsl.so +%{_helix_runtimedir}/grammars/go.so +%{_helix_runtimedir}/grammars/gomod.so +%{_helix_runtimedir}/grammars/gowork.so +%{_helix_runtimedir}/grammars/graphql.so +%{_helix_runtimedir}/grammars/hare.so +%{_helix_runtimedir}/grammars/haskell.so %{_helix_runtimedir}/grammars/hcl.so -%{_helix_runtimedir}/grammars/org.so -%{_helix_runtimedir}/grammars/yaml.so +%{_helix_runtimedir}/grammars/heex.so +%{_helix_runtimedir}/grammars/html.so +%{_helix_runtimedir}/grammars/iex.so %{_helix_runtimedir}/grammars/java.so +%{_helix_runtimedir}/grammars/javascript.so +%{_helix_runtimedir}/grammars/json.so +%{_helix_runtimedir}/grammars/julia.so +%{_helix_runtimedir}/grammars/kotlin.so +%{_helix_runtimedir}/grammars/latex.so +%{_helix_runtimedir}/grammars/lean.so +%{_helix_runtimedir}/grammars/ledger.so +%{_helix_runtimedir}/grammars/llvm-mir.so +%{_helix_runtimedir}/grammars/llvm.so +%{_helix_runtimedir}/grammars/lua.so +%{_helix_runtimedir}/grammars/make.so +%{_helix_runtimedir}/grammars/markdown.so +%{_helix_runtimedir}/grammars/meson.so +%{_helix_runtimedir}/grammars/nickel.so +%{_helix_runtimedir}/grammars/nix.so +%{_helix_runtimedir}/grammars/nu.so +%{_helix_runtimedir}/grammars/ocaml-interface.so +%{_helix_runtimedir}/grammars/ocaml.so +%{_helix_runtimedir}/grammars/odin.so +%{_helix_runtimedir}/grammars/org.so +%{_helix_runtimedir}/grammars/perl.so +%{_helix_runtimedir}/grammars/php.so +%{_helix_runtimedir}/grammars/protobuf.so +%{_helix_runtimedir}/grammars/python.so +%{_helix_runtimedir}/grammars/r.so +%{_helix_runtimedir}/grammars/regex.so +%{_helix_runtimedir}/grammars/rescript.so +%{_helix_runtimedir}/grammars/ruby.so +%{_helix_runtimedir}/grammars/rust.so +%{_helix_runtimedir}/grammars/scala.so +%{_helix_runtimedir}/grammars/scheme.so +%{_helix_runtimedir}/grammars/solidity.so +%{_helix_runtimedir}/grammars/sql.so +%{_helix_runtimedir}/grammars/sshclientconfig.so +%{_helix_runtimedir}/grammars/svelte.so +%{_helix_runtimedir}/grammars/swift.so +%{_helix_runtimedir}/grammars/tablegen.so +%{_helix_runtimedir}/grammars/toml.so +%{_helix_runtimedir}/grammars/tsq.so +%{_helix_runtimedir}/grammars/tsx.so +%{_helix_runtimedir}/grammars/twig.so +%{_helix_runtimedir}/grammars/typescript.so +%{_helix_runtimedir}/grammars/vala.so +%{_helix_runtimedir}/grammars/verilog.so +%{_helix_runtimedir}/grammars/vue.so +%{_helix_runtimedir}/grammars/wgsl.so +%{_helix_runtimedir}/grammars/yaml.so +%{_helix_runtimedir}/grammars/zig.so # Queries %{_helix_runtimedir}/queries/bash