From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 585CB15ACFB for ; Sat, 22 Apr 2023 13:35:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7ACF5E0886; Sat, 22 Apr 2023 13:35:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5C723E0886 for ; Sat, 22 Apr 2023 13:35:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 63DCF3411F9 for ; Sat, 22 Apr 2023 13:35:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B1BF4A3F for ; Sat, 22 Apr 2023 13:35:25 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1682170519.591c90d4a4afd60e49e7b89ef42da60a0ce0de58.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/, app-office/calligra/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/calligra/calligra-3.2.1-r7.ebuild app-office/calligra/files/calligra-3.2.1-use-cmake-FindGSL-module.patch X-VCS-Directories: app-office/calligra/files/ app-office/calligra/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 591c90d4a4afd60e49e7b89ef42da60a0ce0de58 X-VCS-Branch: master Date: Sat, 22 Apr 2023 13:35:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 439b6ea3-667e-44b1-8350-b535caf1f349 X-Archives-Hash: 7568200805a18166949734f74f2bf030 commit: 591c90d4a4afd60e49e7b89ef42da60a0ce0de58 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Apr 22 13:32:08 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Apr 22 13:35:19 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=591c90d4 app-office/calligra: USE cmake FindGSL module instead of bundled one Fixes potential build issues. Upstream commit fb545574a3e3b48b937dc4f741048c7033735e04, readjusted on top of our modifications. Closes: https://bugs.gentoo.org/903343 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/calligra/calligra-3.2.1-r7.ebuild | 2 ++ .../calligra-3.2.1-use-cmake-FindGSL-module.patch | 29 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/app-office/calligra/calligra-3.2.1-r7.ebuild b/app-office/calligra/calligra-3.2.1-r7.ebuild index f2e157c7c232..27b0ebbf1634 100644 --- a/app-office/calligra/calligra-3.2.1-r7.ebuild +++ b/app-office/calligra/calligra-3.2.1-r7.ebuild @@ -4,6 +4,7 @@ EAPI=8 CHECKREQS_DISK_BUILD="4G" +CMAKE_REMOVE_MODULES_LIST=( FindGSL ) ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" KFMIN=5.88.0 @@ -124,6 +125,7 @@ PATCHES=( "${WORKDIR}"/${PATCHSET}/${P}-poppler-22.04.0.patch "${WORKDIR}"/${PATCHSET}/${P}-clang-16-c++17.patch "${WORKDIR}"/${PATCHSET}/${P}-kross-optional.patch # bug 903532 + "${FILESDIR}"/${P}-use-cmake-FindGSL-module.patch # bug 903343 ) pkg_pretend() { diff --git a/app-office/calligra/files/calligra-3.2.1-use-cmake-FindGSL-module.patch b/app-office/calligra/files/calligra-3.2.1-use-cmake-FindGSL-module.patch new file mode 100644 index 000000000000..07e31a0ed77d --- /dev/null +++ b/app-office/calligra/files/calligra-3.2.1-use-cmake-FindGSL-module.patch @@ -0,0 +1,29 @@ +From fb545574a3e3b48b937dc4f741048c7033735e04 Mon Sep 17 00:00:00 2001 +From: Dan Leinir Turthra Jensen +Date: Thu, 29 Apr 2021 13:02:39 +0100 +Subject: [PATCH] Fix GSL find module + +This increases the CMake requirement to 3.2 so we can use the GSL find +module that ships with CMake since then. The custom find module +apparently doesn't work right on Windows, so... +--- + sheets/plugins/solver/CMakeLists.txt | 4 +- + 1 filee changed, 2 insertions(+), 2 deletions(-) + +diff --git a/sheets/plugins/solver/CMakeLists.txt b/sheets/plugins/solver/CMakeLists.txt +index 41bc4a77ae9..ecd4bd8d218 100644 +--- a/sheets/plugins/solver/CMakeLists.txt ++++ b/sheets/plugins/solver/CMakeLists.txt +@@ -25,8 +25,8 @@ calligrasheets_viewplugin_desktop_to_json(sheetssolver sheetssolver.desktop) + + + target_link_libraries( sheetssolver +- ${GSL_LIBRARIES} +- ${GSL_CBLAS_LIBRARIES} ++ GSL::gsl ++ GSL::gslcblas + calligrasheetscommon + ) + +-- +GitLab