diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-04-23 00:06:15 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-04-23 00:06:15 +0100 |
| commit | 0e1abc96fea41c994e56391bd01c5c9298236783 (patch) | |
| tree | 53f4297b17f44131f819fb0ae2ce606dc7121108 /app-office/calligra | |
| parent | cf59cc78468c9bcfef9e16b7b27c115896d805fd (diff) | |
gentoo auto-resync : 23:04:2023 - 00:06:15
Diffstat (limited to 'app-office/calligra')
| -rw-r--r-- | app-office/calligra/Manifest | 3 | ||||
| -rw-r--r-- | app-office/calligra/calligra-3.2.1-r8.ebuild (renamed from app-office/calligra/calligra-3.2.1-r7.ebuild) | 1 | ||||
| -rw-r--r-- | app-office/calligra/files/calligra-3.2.1-clang-16-configure.patch | 19 |
3 files changed, 22 insertions, 1 deletions
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest index a7acb03a2ef2..dd554d4671e9 100644 --- a/app-office/calligra/Manifest +++ b/app-office/calligra/Manifest @@ -1,6 +1,7 @@ +AUX calligra-3.2.1-clang-16-configure.patch 642 BLAKE2B b22130de9e56abbac5a7a146ac3296293f1f612846e61fb19b9a1df626ecfe9ee350291cf2e35b4441335297adeb0257c3b93cccac1019a504fd63e94de265a2 SHA512 65053589a8ef5c269fb96b6493141c448189dc45e3f765955731f9cd64be85d86303c949ca494afca1b303952728a2ca6a4d8cffb798c766037cd4e514697c4f 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 5887 BLAKE2B 139c769659a90e11e026a72f059510d6c2e8280ba8684afbc487466795463fb37ba0db48a726395e6a849d693d04ad3e1506fdcc6d5f6b1078d4576137392e70 SHA512 e4c700d534a9a09d9bc79c5ddca754c533379cc612d7fca4538b2760ce0dc72a531f8a9afa3cd1eac8c8d3400dfd2d15e5c9b15777b87fa09a24fd9a4f2ba112 +EBUILD calligra-3.2.1-r8.ebuild 5932 BLAKE2B b6ff2e573f663c27a02b8cf09c4acc1f2be4abeb09afe19580c07b30cc406cd0f1723742ce2699688f1e431fcd45c6e8854d7e99ea3740784ac8e52d961b9ff3 SHA512 2cb60f8417ed4f81e879362fee0c68ccff5a4885b499f3eaca91a5380e5d050a9cb75d4f0ca1b25d861ad89a95fbb5c6477c734820d6dd6ceea3eee84791e440 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-r8.ebuild index 27b0ebbf1634..d757ece3bddd 100644 --- a/app-office/calligra/calligra-3.2.1-r7.ebuild +++ b/app-office/calligra/calligra-3.2.1-r8.ebuild @@ -126,6 +126,7 @@ PATCHES=( "${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 + "${FILESDIR}"/${P}-clang-16-configure.patch ) pkg_pretend() { diff --git a/app-office/calligra/files/calligra-3.2.1-clang-16-configure.patch b/app-office/calligra/files/calligra-3.2.1-clang-16-configure.patch new file mode 100644 index 000000000000..c723eca0b75f --- /dev/null +++ b/app-office/calligra/files/calligra-3.2.1-clang-16-configure.patch @@ -0,0 +1,19 @@ +https://invent.kde.org/office/calligra/-/merge_requests/81 +https://invent.kde.org/office/calligra/-/commit/30c905a6a34ad656446839c844abb78a2aa3f586 + +From 30c905a6a34ad656446839c844abb78a2aa3f586 Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Wed, 19 Apr 2023 10:34:25 +0200 +Subject: [PATCH] Avoid implicit declaration of atoi in CMake check + +Future compilers will not support implicit function declarations by +default, so include <stdlib.h> for a declaration of atoi. +--- a/cmake/TestModernZlib.c ++++ b/cmake/TestModernZlib.c +@@ -1,3 +1,4 @@ ++#include <stdlib.h> + #include <string.h> + #include <zlib.h> + +-- +GitLab |