[PR PATCH] qt6-declarative: build qmlls tool

[PR PATCH] qt6-declarative: build qmlls tool

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 736 bytes --]

There is a new pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages qt6-lsp
https://github.com/void-linux/void-packages/pull/49836

qt6-declarative: build qmlls tool
QML language server, new in qt6.6. requires qt6-languageserver, a new package

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**


A patch file from https://github.com/void-linux/void-packages/pull/49836.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-lsp-49836.patch --]
[-- Type: text/x-diff, Size: 4243 bytes --]

From 706f1513262e87d1d57d01ee4169fb5c4ac36752 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 13 Apr 2024 20:00:28 -0400
Subject: [PATCH 1/2] New package: qt6-languageserver-6.6.0

---
 common/shlibs                       |  2 ++
 srcpkgs/qt6-languageserver-devel    |  1 +
 srcpkgs/qt6-languageserver/template | 26 ++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-languageserver-devel
 create mode 100644 srcpkgs/qt6-languageserver/template

diff --git a/common/shlibs b/common/shlibs
index 0a53717e57d2a0..5a29c9061df154 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2057,6 +2057,8 @@ libQt6WebEngineCore.so.6 qt6-webengine-6.3.1_1
 libQt6WebEngineQuickDelegatesQml.so.6 qt6-webengine-6.3.1_1
 libQt6WebEngineWidgets.so.6 qt6-webengine-6.3.1_1
 libQt6TextToSpeech.so.6 qt6-speech-6.6.0_1
+libQt6JsonRpc.so.6 qt6-languageserver-6.6.0_1
+libQt6LanguageServer.so.6 qt6-languageserver-6.6.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.13 libnpupnp-6.1.1_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-languageserver-devel b/srcpkgs/qt6-languageserver-devel
new file mode 120000
index 00000000000000..7426b953adab41
--- /dev/null
+++ b/srcpkgs/qt6-languageserver-devel
@@ -0,0 +1 @@
+qt6-languageserver
\ No newline at end of file
diff --git a/srcpkgs/qt6-languageserver/template b/srcpkgs/qt6-languageserver/template
new file mode 100644
index 00000000000000..a152b18f7dcd09
--- /dev/null
+++ b/srcpkgs/qt6-languageserver/template
@@ -0,0 +1,26 @@
+# Template file for 'qt6-languageserver'
+pkgname=qt6-languageserver
+version=6.6.0
+revision=1
+build_style=cmake
+configure_args="-DQT_BUILD_TESTS=ON"
+hostmakedepends="qt6-base"
+makedepends="qt6-base-devel"
+short_desc="Implementation of the Language Server Protocol for Qt6"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="GPL-3.0-only WITH Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
+homepage="https://www.qt.io"
+distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtlanguageserver-everywhere-src-${version}.tar.xz"
+checksum=aec93019862bf63769206fe56a2230cd9e37994806a4bf28415203b4eb9a490e
+
+qt6-languageserver-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 84fbe54c2c44b3a758aabc9c2ce549611c262987 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 13 Apr 2024 20:01:48 -0400
Subject: [PATCH 2/2] qt6-declarative: build qmlls tool

---
 srcpkgs/qt6-declarative/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
index 32625ebc237b66..02f71622e16194 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,14 +1,14 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
 version=6.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DQT_BUILD_TESTS=ON"
 hostmakedepends="qt6-base perl pkg-config wayland-devel qt6-shadertools python3"
-makedepends="qt6-base-devel Vulkan-Headers qt6-shadertools-devel"
+makedepends="qt6-base-devel Vulkan-Headers qt6-shadertools-devel qt6-languageserver-devel"
 short_desc="Cross-platform application and UI framework - Declarative"
 maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
+license="GPL-3.0-only WITH Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://www.qt.io"
 distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtdeclarative-everywhere-src-${version}.tar.xz"
 checksum=1b539bb0a918c8f0307fd07bd4ef0334bf7f8934bbc2eabfc04c433a7d7fa331
@@ -77,7 +77,7 @@ qt6-declarative-tools_package() {
 		for bin in qmlcachegen qmlimportscanner qmltyperegistrar; do
 			vmove usr/lib/qt6/libexec/$bin
 		done
-		for bin in qmlformat qmllint qmlpreview qmlprofiler; do
+		for bin in qmlformat qmllint qmlpreview qmlprofiler qmlls; do
 			vmove usr/lib/qt6/bin/$bin
 		done
 	}

Re: [PR PATCH] [Merged]: qt6-declarative: build qmlls tool

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 575 bytes --]

There's a merged pull request on the void-packages repository

qt6-declarative: build qmlls tool
https://github.com/void-linux/void-packages/pull/49836

Description:
QML language server, new in qt6.6. requires qt6-languageserver, a new package

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**