diff options
Diffstat (limited to 'app-office/calligra')
| -rw-r--r-- | app-office/calligra/Manifest | 3 | ||||
| -rw-r--r-- | app-office/calligra/calligra-3.2.1-r9.ebuild | 1 | ||||
| -rw-r--r-- | app-office/calligra/files/calligra-3.2.1-poppler-24.05.0.patch | 42 |
3 files changed, 45 insertions, 1 deletions
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest index ea4198d57a40..7250174e68a6 100644 --- a/app-office/calligra/Manifest +++ b/app-office/calligra/Manifest @@ -1,7 +1,8 @@ AUX calligra-3.2.1-clang-16-configure.patch 642 BLAKE2B b22130de9e56abbac5a7a146ac3296293f1f612846e61fb19b9a1df626ecfe9ee350291cf2e35b4441335297adeb0257c3b93cccac1019a504fd63e94de265a2 SHA512 65053589a8ef5c269fb96b6493141c448189dc45e3f765955731f9cd64be85d86303c949ca494afca1b303952728a2ca6a4d8cffb798c766037cd4e514697c4f AUX calligra-3.2.1-okularpart.patch 2641 BLAKE2B 50018ab2b855dc88226b2a23b2eeac858882cbfeb9feca0d50202d951e23c315c4d4a2e225efc697584655dfb6421aeda4c7c48b3c279d7a4b60986acf2e8bdf SHA512 5c7de9bb020d750cb1565c49b9aabf41b622563823a7d3b3c923d00de495fc19357bd53d3a6fb87baf16c3a7cc41a05ccaab2cc6e425e53940aa5f2617dfc0f4 +AUX calligra-3.2.1-poppler-24.05.0.patch 2656 BLAKE2B 489d01bde30c24c80970f6073aa58fa785bfd86186aea45cb1a06e1f8907be0a2ef35e44f90eb14b315b5d55800639b52cf9f53748aca972ca0a4c328c2c455e SHA512 ae4a1c5654453827c65a2e49acbe23904db66f1179b76db47bd96106c56aa008440908ce712c6926a0fa99f33c89bd23d995df95f463075608b15295e2c3c6e2 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-r9.ebuild 6087 BLAKE2B d8347ce9db6d6e105946476f8b7e05430ca19e33932481d5cbaf9e28e84256dabec52d388347880d9b76699b42cb64237fda17bc5962893823ede7565ce83f32 SHA512 8e7bfc3b2958357df3d69f4b98dd082d2f808d570c745e711011c9986901c17eebfd8ebc93a33702a0fe8b92124c400866874fa70e801aad2de1c94be4fddca0 +EBUILD calligra-3.2.1-r9.ebuild 6142 BLAKE2B 4ba441db86de6ef7cb1f3acce65f7969e53dd031a8cfa94277b83f1f5006e81042f399098456e4b27199d1652dddbef10972805350e98ba67d4e04e765931ee4 SHA512 4d17b3e68d755970323e3d99b3e11adc0676434ff1c51c5952220412a35ff3406a10dc32324e3a582e2b3fa7e0b70d92163cef0263b9acb3d53d6693158a2580 MISC metadata.xml 1279 BLAKE2B a815b1fb41dea6bd2da248722708606b3bb56b4e3df2036e141f0f53bc432a3a40f26cc0edff1425965f72f3b9d4cd8bf3397b538598d248145fd195481a282b SHA512 b59cd1b0469cdc8aa4354bb918152fe66535ca1ed9c3b83178b1753f04128f8ce5fc64a0daab36b8b1aa92568ef5ae9d298539b40a82fa8a974536a55150f5e8 diff --git a/app-office/calligra/calligra-3.2.1-r9.ebuild b/app-office/calligra/calligra-3.2.1-r9.ebuild index 32314e5d0f86..0503c3fba007 100644 --- a/app-office/calligra/calligra-3.2.1-r9.ebuild +++ b/app-office/calligra/calligra-3.2.1-r9.ebuild @@ -130,6 +130,7 @@ PATCHES=( "${WORKDIR}"/${PATCHSET}/${P}-kross-optional.patch # bug 903532 "${FILESDIR}"/${P}-use-cmake-FindGSL-module.patch # bug 903343 "${FILESDIR}"/${P}-clang-16-configure.patch + "${FILESDIR}"/${P}-poppler-24.05.0.patch # bug 933490 ) pkg_pretend() { diff --git a/app-office/calligra/files/calligra-3.2.1-poppler-24.05.0.patch b/app-office/calligra/files/calligra-3.2.1-poppler-24.05.0.patch new file mode 100644 index 000000000000..2ef45d675e3b --- /dev/null +++ b/app-office/calligra/files/calligra-3.2.1-poppler-24.05.0.patch @@ -0,0 +1,42 @@ +diff '--color=auto' -urNp calligra-3.2.1-orig/CMakeLists.txt calligra-3.2.1-dwok/CMakeLists.txt +--- calligra-3.2.1-orig/CMakeLists.txt 2024-06-05 13:06:55.730007129 +0200 ++++ calligra-3.2.1-dwok/CMakeLists.txt 2024-06-05 13:08:00.587082911 +0200 +@@ -104,7 +104,7 @@ if(NOT DEFINED RELEASE_BUILD) + endif() + message(STATUS "Release build: ${RELEASE_BUILD}") + +-set (CMAKE_CXX_STANDARD 17) # required for >=poppler-22.01 ++set (CMAKE_CXX_STANDARD 20) # required for >=poppler-22.04 + + ############ + ############# +diff '--color=auto' -urNp calligra-3.2.1-orig/libs/pigment/lut.h calligra-3.2.1-dwok/libs/pigment/lut.h +--- calligra-3.2.1-orig/libs/pigment/lut.h 2024-06-05 13:06:55.922010313 +0200 ++++ calligra-3.2.1-dwok/libs/pigment/lut.h 2024-06-05 13:09:24.460474108 +0200 +@@ -143,7 +143,7 @@ typedef uint32_t lut_uint32; + template<> \ + class LutKey<_INT_TYPE_> { \ + public: \ +- LutKey<_INT_TYPE_>(_INT_TYPE_ min, _INT_TYPE_ max) : m_min(min), m_max(max) \ ++ LutKey(_INT_TYPE_ min, _INT_TYPE_ max) : m_min(min), m_max(max) \ + { \ + } \ + public: \ +@@ -183,7 +183,7 @@ PARTIAL_LUT_INT_SPECIALIZATION(lut_uint3 + template<> \ + class FullLutKey<_INT_TYPE_> { \ + public: \ +- FullLutKey<_INT_TYPE_>() \ ++ FullLutKey() \ + { \ + } \ + public: \ +@@ -233,7 +233,7 @@ class LutKey<float> { + float f; + }; + public: +- LutKey<float>(float min, float max, float precision) : m_min(min), m_max(max), m_precision(precision) ++ LutKey(float min, float max, float precision) : m_min(min), m_max(max), m_precision(precision) + { + // Those values where computed using the test_linear and setting the shift and then using + // the standard deviation. |