diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-04-22 18:05:24 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-04-22 18:05:24 +0100 |
| commit | cf59cc78468c9bcfef9e16b7b27c115896d805fd (patch) | |
| tree | b46b602c381e3a5e35654cf39e71673c96e49362 /app-office/calligra | |
| parent | 5b52b99ca475070991d8e8d1dff674ffe6ffdea9 (diff) | |
gentoo auto-resync : 22:04:2023 - 18:05:23
Diffstat (limited to 'app-office/calligra')
| -rw-r--r-- | app-office/calligra/Manifest | 3 | ||||
| -rw-r--r-- | app-office/calligra/calligra-3.2.1-r7.ebuild | 2 | ||||
| -rw-r--r-- | app-office/calligra/files/calligra-3.2.1-use-cmake-FindGSL-module.patch | 29 |
3 files changed, 33 insertions, 1 deletions
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest index 9abfaacafe9a..a7acb03a2ef2 100644 --- a/app-office/calligra/Manifest +++ b/app-office/calligra/Manifest @@ -1,5 +1,6 @@ +AUX calligra-3.2.1-use-cmake-FindGSL-module.patch 975 BLAKE2B 8d9750be1f74d0ad099a9d2f258eb8b1fb73f3a891b7cf2e2822c9f50126aa0aaf21188845b95e37c1fdfa00efb33ec49a8b3b824b148d9df29f1e30e299cebd SHA512 e346c71767a07686d18f64849822f54efd5f70f72e871d8537e46b22a646c2d225800632d01b6cde6afa86bae57b1e329991a1d906648c9328f58f4e3ec3c7ea DIST calligra-3.2.1-patchset-1.tar.xz 11924 BLAKE2B 5a71a7960a6d2a4d5e55129f4812fb13a2fb56613283d4582266e1836f107b711be43cb158e29c440fbda6992c03a3f4907f0600d21522fd9ab07c66354234a9 SHA512 26ec818f2415c43b116b716557710361621e1e4446087fe123e29107f82400ec82f19ab3a76dde9b749ed4b9f15da9c05c3fa6137fc814241c48ffc12f5628fc DIST calligra-3.2.1.tar.xz 55207684 BLAKE2B 332629f18adbee649e8d25a1eedf4ee48af7d8cbb79382c70678bacfa89d9a10797eb0ff42cb5aad51ef2c28aa7071e687bd34053cadcc40ac1936bb9a40dc20 SHA512 e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f EBUILD calligra-3.2.1-r5.ebuild 5740 BLAKE2B eee68fd25820fc31aec3ad18ec302b077e1801eef3236d204084047165ca58db1508ac1cbe0a58d8db1775a1515547459bf3153a67356b3f0ac1b220854b9cd3 SHA512 7b06e50abd506e5e1ba761bc1281bbaed0ebb3a42f078bae0f84abdedda00ba0065280fb0ecc96507a88e74559dff235b86032ddd55eee825d93866753e15a4a -EBUILD calligra-3.2.1-r7.ebuild 5785 BLAKE2B b3092dc33175da612e02d060c1787025027bb3f6db288fa08d38088d821e56712815d966c599b3ee2b1bd748231b74c1f5577d981c4bb3d4d1d1ae7bfe4923cf SHA512 737e229fb86fb520f24f3586a47fc02f74a17c1e9484dc31670e65b9d11f3a7891074b2f666c20c7bbebdbb4f034fa75776d88473442934d5694ca1e3656216d +EBUILD calligra-3.2.1-r7.ebuild 5887 BLAKE2B 139c769659a90e11e026a72f059510d6c2e8280ba8684afbc487466795463fb37ba0db48a726395e6a849d693d04ad3e1506fdcc6d5f6b1078d4576137392e70 SHA512 e4c700d534a9a09d9bc79c5ddca754c533379cc612d7fca4538b2760ce0dc72a531f8a9afa3cd1eac8c8d3400dfd2d15e5c9b15777b87fa09a24fd9a4f2ba112 MISC metadata.xml 1279 BLAKE2B a815b1fb41dea6bd2da248722708606b3bb56b4e3df2036e141f0f53bc432a3a40f26cc0edff1425965f72f3b9d4cd8bf3397b538598d248145fd195481a282b SHA512 b59cd1b0469cdc8aa4354bb918152fe66535ca1ed9c3b83178b1753f04128f8ce5fc64a0daab36b8b1aa92568ef5ae9d298539b40a82fa8a974536a55150f5e8 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 <admin@leinir.dk> +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 |