From b7e02d5ead5d6224de18e0c6f012dc3c7d18bd37 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:17 +0100 Subject: [PATCH] qt6-languageserver: update to 6.8.1. --- ...QtLanguageServer-Enforce-static-buil.patch | 106 ++++++++++++++++++ srcpkgs/qt6-languageserver/template | 4 +- 2 files changed, 108 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/qt6-languageserver/patches/0001-Revert-JSON-RPC-QtLanguageServer-Enforce-static-buil.patch diff --git a/srcpkgs/qt6-languageserver/patches/0001-Revert-JSON-RPC-QtLanguageServer-Enforce-static-buil.patch b/srcpkgs/qt6-languageserver/patches/0001-Revert-JSON-RPC-QtLanguageServer-Enforce-static-buil.patch new file mode 100644 index 00000000000..026ca4d47d1 --- /dev/null +++ b/srcpkgs/qt6-languageserver/patches/0001-Revert-JSON-RPC-QtLanguageServer-Enforce-static-buil.patch @@ -0,0 +1,106 @@ +From f611f50746d7da1814fad7e6a602d7d0d4ad3654 Mon Sep 17 00:00:00 2001 +From: John Zimmermann +Date: Mon, 4 Nov 2024 22:42:56 +0100 +Subject: [PATCH] Revert "JSON-RPC/QtLanguageServer: Enforce static builds" + +This reverts commit 1a9a75cacaf4c45fc399915804f7f25d17747343. +--- + src/jsonrpc/CMakeLists.txt | 2 +- + src/jsonrpc/qtjsonrpcglobal.h | 16 +++++++++++++--- + src/languageserver/CMakeLists.txt | 2 +- + src/languageserver/qtlanguageserverglobal.h | 16 +++++++++++++--- + 4 files changed, 28 insertions(+), 8 deletions(-) + +diff --git a/src/jsonrpc/CMakeLists.txt b/src/jsonrpc/CMakeLists.txt +index c2950b4..f960325 100644 +--- a/src/jsonrpc/CMakeLists.txt ++++ b/src/jsonrpc/CMakeLists.txt +@@ -7,7 +7,6 @@ + + qt_internal_add_module(JsonRpcPrivate + INTERNAL_MODULE +- STATIC + SOURCES + qhttpmessagestreamparser_p.h qhttpmessagestreamparser.cpp + qjsonrpcprotocol.cpp qjsonrpcprotocol_p.h qjsonrpcprotocol_p_p.h +@@ -20,4 +19,5 @@ qt_internal_add_module(JsonRpcPrivate + QT_NO_CONTEXTLESS_CONNECT + PUBLIC_LIBRARIES + Qt::Core ++ NO_GENERATE_CPP_EXPORTS + ) +diff --git a/src/jsonrpc/qtjsonrpcglobal.h b/src/jsonrpc/qtjsonrpcglobal.h +index 7c23910..ee1fefc 100644 +--- a/src/jsonrpc/qtjsonrpcglobal.h ++++ b/src/jsonrpc/qtjsonrpcglobal.h +@@ -6,8 +6,18 @@ + + #include + +-// include qtjsonrpcexports.h here instead +-// if module is no longer unconditionally static +-#define Q_JSONRPC_EXPORT ++QT_BEGIN_NAMESPACE ++ ++#ifndef QT_STATIC ++# if defined(QT_BUILD_JSONRPC_LIB) ++# define Q_JSONRPC_EXPORT Q_DECL_EXPORT ++# else ++# define Q_JSONRPC_EXPORT Q_DECL_IMPORT ++# endif ++#else ++# define Q_JSONRPC_EXPORT ++#endif ++ ++QT_END_NAMESPACE + + #endif // QTJSONRPCGLOBAL_H +diff --git a/src/languageserver/CMakeLists.txt b/src/languageserver/CMakeLists.txt +index e45916c..0242739 100644 +--- a/src/languageserver/CMakeLists.txt ++++ b/src/languageserver/CMakeLists.txt +@@ -7,7 +7,6 @@ + + qt_internal_add_module(LanguageServerPrivate + INTERNAL_MODULE +- STATIC + SOURCES + qlanguageserverprespectypes_p.h + qlanguageserverspec_p.h +@@ -24,6 +23,7 @@ qt_internal_add_module(LanguageServerPrivate + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::JsonRpcPrivate ++ NO_GENERATE_CPP_EXPORTS + ) + + if(MSVC) +diff --git a/src/languageserver/qtlanguageserverglobal.h b/src/languageserver/qtlanguageserverglobal.h +index 872960c..94e31f5 100644 +--- a/src/languageserver/qtlanguageserverglobal.h ++++ b/src/languageserver/qtlanguageserverglobal.h +@@ -5,8 +5,18 @@ + #define QTLANGUAGESERVERGLOBAL_H + #include + +-// include qtlanguageserverexports.h here instead +-// if module is no longer unconditionally static +-#define Q_LANGUAGESERVER_EXPORT ++QT_BEGIN_NAMESPACE ++ ++#ifndef QT_STATIC ++# if defined(QT_BUILD_LANGUAGESERVER_LIB) ++# define Q_LANGUAGESERVER_EXPORT Q_DECL_EXPORT ++# else ++# define Q_LANGUAGESERVER_EXPORT Q_DECL_IMPORT ++# endif ++#else ++# define Q_LANGUAGESERVER_EXPORT ++#endif ++ ++QT_END_NAMESPACE + + #endif // QTLANGUAGESERVERGLOBAL_H +-- +2.47.0 + diff --git a/srcpkgs/qt6-languageserver/template b/srcpkgs/qt6-languageserver/template index 2521c5d684c..6f70892f01d 100644 --- a/srcpkgs/qt6-languageserver/template +++ b/srcpkgs/qt6-languageserver/template @@ -1,6 +1,6 @@ # Template file for 'qt6-languageserver' pkgname=qt6-languageserver -version=6.7.2 +version=6.8.1 revision=1 build_style=cmake configure_args="-DQT_BUILD_TESTS=ON" @@ -11,7 +11,7 @@ maintainer="classabbyamp " 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=b659fe655144ffa061e3ae509eadb42ae373230517295a96935434340e101a92 +checksum=865e9436c1432a53e38a30625b6cee60bf72553ff508047115513a233c8e6d7e subpackages="qt6-languageserver-private-devel qt6-languageserver-devel"