From 7ff91df7089b0ba1d8d32c7621c8085f3485bc91 Mon Sep 17 00:00:00 2001 From: dkwo Date: Sun, 12 Jan 2025 12:59:39 +0100 Subject: [PATCH] lsp-plugins: update to 1.2.20 --- .../lsp-plugins/patches/aarch64-atomic.patch | 21 ---------- srcpkgs/lsp-plugins/patches/musl-locale.patch | 42 ------------------- srcpkgs/lsp-plugins/template | 7 ++-- 3 files changed, 4 insertions(+), 66 deletions(-) delete mode 100644 srcpkgs/lsp-plugins/patches/aarch64-atomic.patch delete mode 100644 srcpkgs/lsp-plugins/patches/musl-locale.patch diff --git a/srcpkgs/lsp-plugins/patches/aarch64-atomic.patch b/srcpkgs/lsp-plugins/patches/aarch64-atomic.patch deleted file mode 100644 index 86282888c74b18..00000000000000 --- a/srcpkgs/lsp-plugins/patches/aarch64-atomic.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 156be4d61c57d805745b85d7fadb781a4bc581b0 Mon Sep 17 00:00:00 2001 -From: Vladimir Sadovnikov -Date: Mon, 11 Nov 2024 14:50:21 +0300 -Subject: [PATCH] Fixed atomic operations for AArch64 - ---- - modules/lsp-common-lib/include/lsp-plug.in/common/arch/aarch64/atomic.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/modules/lsp-common-lib/include/lsp-plug.in/common/arch/aarch64/atomic.h b/modules/lsp-common-lib/include/lsp-plug.in/common/arch/aarch64/atomic.h -index 388a869..2e6288e 100644 ---- a/modules/lsp-common-lib/include/lsp-plug.in/common/arch/aarch64/atomic.h -+++ b/modules/lsp-common-lib/include/lsp-plug.in/common/arch/aarch64/atomic.h -@@ -203,6 +203,7 @@ namespace lsp - ATOMIC_SWAP_DEF(uint32_t, "", "w") - ATOMIC_SWAP_DEF(int64_t, "", "x") - ATOMIC_SWAP_DEF(uint64_t, "", "x") -+ ATOMIC_SWAP_DEF(void *, "", "x") - } /* namespace lsp */ - - #undef ATOMIC_SWAP_DEF diff --git a/srcpkgs/lsp-plugins/patches/musl-locale.patch b/srcpkgs/lsp-plugins/patches/musl-locale.patch deleted file mode 100644 index 55f37a8deb4c33..00000000000000 --- a/srcpkgs/lsp-plugins/patches/musl-locale.patch +++ /dev/null @@ -1,42 +0,0 @@ -commit b670813cf0757f01ce0d863aad429b7342f29a3e -Author: Daniel Martinez -Date: Mon Oct 14 15:25:09 2024 -0400 - - Add checks around locales - - With musl libc, many of the locale macros are not defined, causing build - errors - - Check that the macros are defined before using them - -diff --git a/src/main/locale.cpp b/src/main/locale.cpp -index 69ea619..ed84f5d 100644 ---- a/modules/lsp-common-lib/src/main/locale.cpp -+++ b/modules/lsp-common-lib/src/main/locale.cpp -@@ -40,14 +40,24 @@ namespace lsp - case LC_MONETARY: flags = LC_MONETARY_MASK; break; - case LC_MESSAGES: flags = LC_MESSAGES_MASK; break; - case LC_ALL: flags = LC_ALL_MASK; break; -- #if defined(PLATFORM_LINUX) -+ #if defined(LC_PAPER) - case LC_PAPER: flags = LC_PAPER_MASK; break; -+ #endif -+ #if defined(LC_NAME) - case LC_NAME: flags = LC_NAME_MASK; break; -+ #endif -+ #if defined(LC_ADDRESS) - case LC_ADDRESS: flags = LC_ADDRESS_MASK; break; -+ #endif -+ #if defined(LC_TELEPHONE) - case LC_TELEPHONE: flags = LC_TELEPHONE_MASK; break; -+ #endif -+ #if defined(LC_MEASUREMENT) - case LC_MEASUREMENT: flags = LC_MEASUREMENT_MASK; break; -+ #endif -+ #if defined(LC_IDENTIFICATION) - case LC_IDENTIFICATION: flags = LC_IDENTIFICATION_MASK; break; -- #endif /* PLATFORM_LINUX */ -+ #endif - - default: - return INVALID_LOCALE; diff --git a/srcpkgs/lsp-plugins/template b/srcpkgs/lsp-plugins/template index feedf060291614..8d6633d73a125f 100644 --- a/srcpkgs/lsp-plugins/template +++ b/srcpkgs/lsp-plugins/template @@ -1,6 +1,6 @@ -# Template file for 'lsp-plugins'. +# Template file for 'lsp-plugins' pkgname=lsp-plugins -version=1.2.19 +version=1.2.20 revision=1 build_style=gnu-makefile make_use_env=yes @@ -17,7 +17,8 @@ license="GPL-3.0-or-later" homepage="https://lsp-plug.in/" changelog="https://raw.githubusercontent.com/sadko4u/lsp-plugins/master/CHANGELOG" distfiles="https://github.com/sadko4u/lsp-plugins/releases/download/$version/lsp-plugins-src-${version}.tar.gz" -checksum=f0536d790fada3d896670683b71a2916a7bef55a2395f314370015535ec8d959 +checksum=ca8860dca6bfb1e7bcaba342c153e5fc5d3a025c91db66a4433e37829fb591c9 +make_check=no # no test suite if [ "$CROSS_BUILD" ]; then hostmakedepends+=" ${makedepends}"