From b7134215e31c1507d0635e29c6a872d60c11b61e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 Dec 2025 22:57:09 +0100 Subject: [PATCH] package/cutelyst: bump version to 3.5.0 Release notes: https://github.com/cutelyst/cutelyst/releases/tag/v3.5.0 "Last release supporting Qt 5.12" Bump package to the latest version compatible with Qt5, fixes build with cmake 4. Removed patch which is included in this release: https://github.com/cutelyst/cutelyst/commit/da9792f33c553031e639a194117ba70167d62eae Updated license hash due to relicense as BSD-3-Clause: https://github.com/cutelyst/cutelyst/commit/47c28edbbc8d0788db329bf87bf975844bef9b36 Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- .checkpackageignore | 1 - ...s.txt-don-t-override-CMAKE_EXE_LINKE.patch | 31 ------------------- package/cutelyst/cutelyst.hash | 4 +-- package/cutelyst/cutelyst.mk | 4 +-- 4 files changed, 4 insertions(+), 36 deletions(-) delete mode 100644 package/cutelyst/0001-server-CMakeLists.txt-don-t-override-CMAKE_EXE_LINKE.patch diff --git a/.checkpackageignore b/.checkpackageignore index 2554347bd7..df1a9258f3 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -291,7 +291,6 @@ package/curlftpfs/0001-fix-CURLOPT_INFILESIZE.patch lib_patch.Sob lib_patch.Upst package/curlftpfs/0002-free_ftpfs_file-memleak-fix.patch lib_patch.Sob lib_patch.Upstream package/curlftpfs/0003-nocache-memleak-fix.patch lib_patch.Sob lib_patch.Upstream package/curlftpfs/0004-fix-musl-build-off-t.patch lib_patch.Upstream -package/cutelyst/0001-server-CMakeLists.txt-don-t-override-CMAKE_EXE_LINKE.patch lib_patch.Upstream package/cwiid/0001-wmdemo-fix-linking-by-adding-the-missing-lbluetooth-.patch lib_patch.Upstream package/cwiid/0002-configure-make-wmgui-build-optional.patch lib_patch.Upstream package/dahdi-tools/0001-no-build-docs.patch lib_patch.Upstream diff --git a/package/cutelyst/0001-server-CMakeLists.txt-don-t-override-CMAKE_EXE_LINKE.patch b/package/cutelyst/0001-server-CMakeLists.txt-don-t-override-CMAKE_EXE_LINKE.patch deleted file mode 100644 index 45b1fcd146..0000000000 --- a/package/cutelyst/0001-server-CMakeLists.txt-don-t-override-CMAKE_EXE_LINKE.patch +++ /dev/null @@ -1,31 +0,0 @@ -From c347aeb43775109cbc2824b99cb10b1b3440c191 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 17 May 2021 21:27:11 +0200 -Subject: [PATCH] server/CMakeLists.txt: don't override CMAKE_EXE_LINKER_FLAGS - -Don't override CMAKE_EXE_LINKER_FLAGS as this could break the build if -CMAKE_EXE_LINKER_FLAGS is already set by the user (for example to pass --latomic) - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/cutelyst/cutelyst/pull/312] ---- - wsgi/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt -index ec5689f7..1ed56859 100644 ---- a/wsgi/CMakeLists.txt -+++ b/wsgi/CMakeLists.txt -@@ -95,7 +95,7 @@ install(TARGETS Cutelyst${PROJECT_VERSION_MAJOR}Qt${QT_VERSION_MAJOR}Server - cxx_generalized_initializers - ) - if (JEMALLOC_FOUND) -- set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} " -Wl,--no-as-needed") -+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-as-needed") - target_link_libraries(cutelyst-wsgi2 PRIVATE ${JEMALLOC_LIBRARIES}) - endif() - --- -2.30.2 - diff --git a/package/cutelyst/cutelyst.hash b/package/cutelyst/cutelyst.hash index d35fdcc890..5103f58138 100644 --- a/package/cutelyst/cutelyst.hash +++ b/package/cutelyst/cutelyst.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 b0e3d658a60d68906f7255b78bad64af1aa07cb3b785fbf61629b7355f089baa cutelyst-2.11.0.tar.gz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 351578d495213c438365f988a70bb8f8c14b1d7dcef79ce0f723dd584388aa77 cutelyst-3.5.0.tar.gz +sha256 ca0c629be86a1691ec413a3f9137a1aa62663d5ec30c5867cf4b283f18eb0bd7 COPYING diff --git a/package/cutelyst/cutelyst.mk b/package/cutelyst/cutelyst.mk index 5313b003ad..9b9e3d4d8a 100644 --- a/package/cutelyst/cutelyst.mk +++ b/package/cutelyst/cutelyst.mk @@ -4,11 +4,11 @@ # ################################################################################ -CUTELYST_VERSION = 2.11.0 +CUTELYST_VERSION = 3.5.0 CUTELYST_SITE = https://github.com/cutelyst/cutelyst/archive/v$(CUTELYST_VERSION) CUTELYST_INSTALL_STAGING = YES CUTELYST_SUPPORTS_IN_SOURCE_BUILD = NO -CUTELYST_LICENSE = LGPL-2.1+ +CUTELYST_LICENSE = BSD-3-Clause CUTELYST_LICENSE_FILES = COPYING CUTELYST_DEPENDENCIES = qt5base