From 77d1bb6f8d47023aa21aaee830bf3229837233d1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Mar 2025 01:46:50 +0000 Subject: gentoo auto-resync : 05:03:2025 - 01:46:50 --- app-office/libreoffice/Manifest | 12 +- .../files/libreoffice-25.2.1.2-poppler.patch | 79 +++ .../libreoffice/libreoffice-24.2.7.2-r1.ebuild | 2 +- .../libreoffice/libreoffice-24.2.7.2-r2.ebuild | 2 +- .../libreoffice/libreoffice-25.2.1.2-r1.ebuild | 736 +++++++++++++++++++++ app-office/libreoffice/libreoffice-25.2.1.2.ebuild | 2 +- .../libreoffice/libreoffice-25.2.9999.ebuild | 2 +- app-office/libreoffice/libreoffice-9999.ebuild | 2 +- 8 files changed, 827 insertions(+), 10 deletions(-) create mode 100644 app-office/libreoffice/files/libreoffice-25.2.1.2-poppler.patch create mode 100644 app-office/libreoffice/libreoffice-25.2.1.2-r1.ebuild (limited to 'app-office/libreoffice') diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 0bddc0b06e06..41c5f12e58f2 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -3,6 +3,7 @@ AUX libreoffice-24.2-unused-qt6network.patch 3348 BLAKE2B 9ec1c83e9405128fcf493e AUX libreoffice-25.2-cflags.patch 5975 BLAKE2B 45cf03f511ca9f559af3593157ab56b4b39c158f03fda2a26b189d2bd43efd0c5cf6734862cd3c7b6f437b92159d280cd569e3249c45d907dda9e8fb0d2671c7 SHA512 1b670ab14431b1945807213ff8e059c321ac2f96308889adac355a1c0578e34652e76e6b0019b59aa834dd34b8d1858d04341fdc006dbae4ce8c22dc2a4e78a8 AUX libreoffice-25.2-unused-qt6network.patch 2315 BLAKE2B 4e73a0da320ceed9c87f8e3c0a39031552ba16f78bf8440f1f7d5ba8e0e048208e51eae68e384bcf46c1a45a91ae5cd6b1ab956214f00393832846832281e30e SHA512 29bf3c4c3ccf89d4578ca31a03228c9cf9c87d82f89c94637a7d904eee4617241d5e0f1668dc4927e47d1c6eb787fbfcc5993dab3766d358deff0cbc4529726e AUX libreoffice-25.2-vcl-backend-fallback.patch 539 BLAKE2B 489072275615b248322ac4720bf87856732f340f95a6f0658f714e025d918f964be2ea86ee69ee67859fd1eece0824162e034064e1dcfc2cac8ef7c6e96e74ce SHA512 374d3aaefad2850702c091e141cb5dbe614021b6ac3e7c4077dc2f3859cd6c7e4ea3a277cfa27ac7eb5a6a533d0abe31c3c38500cb1cd459f8a8a5f0c34370aa +AUX libreoffice-25.2.1.2-poppler.patch 3407 BLAKE2B 99a6c1aaa2918dc0406a4a6303c67975b1c7e1874cb2a33ba4abfe3fe3963a9642e9bda9ef276b4cf3ed4f91bba3d1956f2b6546c1b187ec219596955dc99136 SHA512 6a2a62451f43a23ca1379b83f66dc34f334e4edf1f9c281a7e52c5839ddd821b7b674b23acfc1c34bdbad29df035a1f58574d080c6cae1fb08c9c419378f13b2 AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba34369137336327f4d1ee27789c5f6229b9a82f4aeab0eaeaf494e60b992c66fcdb276b6423b87713febb14e9eeaffa388369ca8 SHA512 f82e23f15cefd947af20a50e1e4168c9023d5f8b9e19da7f76b141a60be4fa3516ad16400ce26e4d0ff293c570031ac87bbbf6766444e1b31e7bc3ee8ef58083 AUX libreoffice-7.6-unused-qt5network.patch 3218 BLAKE2B 1445716fcfb556d7ef997bf1f5bf8dbb75032e9556d878fd999c6d260b2bff9e445cfec5f2a7537fe5118f31a1574cc21badb62b4a70b2452f694f03e75d2fd7 SHA512 e9861f2acfda59d09fc2f5431e4697a9bbd0927c5a765e35e7418b60ed0aeeafcaac3873fd0222b57facf71f4375a095a75e57574cd36e02f8ade0f264993647 AUX libreoffice.confd 228 BLAKE2B 7b9ed0d08b91b6e78dd3a2ac242cac48ef141c25bf25713b5fa6c4fdea3d5b0e16b4073a864fbec328edf4008729869fba5236e9cc113ba9bd3d6de5c10153c3 SHA512 6718cfd481b4349d70b718d4811f80ac0eff60d465b9f9eeff8ab9641de1fecb6197023f98bb1fca77a57b48ae2d8e38803f3af3a51191b1df71aa8cc5d33661 @@ -39,9 +40,10 @@ DIST libreoffice-help-25.2.1.2.tar.xz 60010044 BLAKE2B 2349c8d900a8ffe412c2ef37c DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B ce8247de4cd6939b0593adf1c3dc6b78cdf4220fbcd2dfb2b9cf6d80d42f9c49f4d93fbe3cff68d079f04cc5801daf20999b288f7fdc85b58e32035151a3616a SHA512 6c10785ed9ab8cdf3385ebd3f3d13a64b850df9cc7a12e513326a84c7a3e6f6235f9f4dbce128eac2e43a2707fe6a6011716de5985adf4742d55879210bf32e9 DIST skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz 14368844 BLAKE2B 2ed86c0e418474e496e340007f827c14f4340c08fcf4ae6bed299e0550489ada1c1b644a18163fe08b9ddc5d9eaa9e042db20ae7898fb036609df693c8bdebac SHA512 8739b2e8b578accae14928473fb479d7014e9181dc7f363230282d4282f950f1006b2bcd746c12028fb86aeffdfd7d837435d09480cfe94714e81f8365dcf954 DIST zxcvbn-c-2.5.tar.gz 1404434 BLAKE2B f0f22fc8643f785e8f9ed42033d6654c2e67aa4e258bbc4fecf533efcf8b86b6d7e67f9042326247c311c42a4e2b24b844e0bae65cdb2e46ea043a2974ffd857 SHA512 d7199b3cc36cd0e401bd8f857132425908307aefcdb1bb635ee81c34cf71ccbcdf0fe36a336a55da1281692b508881b54773afa41379a448863095f4abd5c0e8 -EBUILD libreoffice-24.2.7.2-r1.ebuild 19818 BLAKE2B 9b3c2a84d71a14d9c8f42a801bb7983d3b0a6b22690c85971f13be76dec300be692bd5cb2788fad5b5b2fc3c9589db5deb86d6618928195316709d27c9a57b66 SHA512 c6db64ffe4fccd41f8dc64b6eb495680d6470210073980d66670c08bd07e89edaf5280668bcfb6ba56f3b3be5dc87f76a4ac5e709cdb01959320cd108e0f9d7f -EBUILD libreoffice-24.2.7.2-r2.ebuild 19898 BLAKE2B 7ed5f3ca09112c3f4285906cbdae7f5cce6270791c5ee809139ba25e95991cd73d981e746888210027daa6b891770fc834c48b6b8399a3912bcf267083e3a8b1 SHA512 945fdc2d79f4bd6864af533eec66372802a14f314442b21eef09fb4904d13da41dc5370e13d4967e25d0184f5623032b65ff455994aace1fde41e1e572fae434 -EBUILD libreoffice-25.2.1.2.ebuild 21910 BLAKE2B 3de7152fe81cf24faf628851c8299bba3a8761225ce0f1eeda60aa2a7a09de66679310e9e5d8c28df6f14bf6f969d2e3eb759626d372c8c0d06dfa7cab8efbb3 SHA512 e5c6f9608ac7d9e2ed41078e5c1e595b1af45bfdba58965cbc165a4d6b0646bc89c9aba246f86960634f6faceebeb701dba398ea5775b7114222b62b2e369285 -EBUILD libreoffice-25.2.9999.ebuild 21910 BLAKE2B 3de7152fe81cf24faf628851c8299bba3a8761225ce0f1eeda60aa2a7a09de66679310e9e5d8c28df6f14bf6f969d2e3eb759626d372c8c0d06dfa7cab8efbb3 SHA512 e5c6f9608ac7d9e2ed41078e5c1e595b1af45bfdba58965cbc165a4d6b0646bc89c9aba246f86960634f6faceebeb701dba398ea5775b7114222b62b2e369285 -EBUILD libreoffice-9999.ebuild 21631 BLAKE2B 8a1d69caf883c23487a0a3567303de081388b139ebdaa5b63be3a8ff056105fd4121dd0691c3a8ebc6217b51eca2db14e94626d6b2ac34e691ffcfd5b8b2664c SHA512 57823e47dabc019af4bc6f75d47bfce52a8e394cf0e90cb8640f92015cc70075528ca86bfc6a33e209b78341375d415a7eda0a10c1777cf1855e8ffdfb0eb5ca +EBUILD libreoffice-24.2.7.2-r1.ebuild 19829 BLAKE2B 5e795fb1b69c5a0b577768a9d3ed75d3b0aef18027e348844aa7989e9734f47b24aa797149b02e360d606516acbbacbf0bab318ac5deabcdf6a805d1476102f8 SHA512 38cc52598760317f3a03fc8e156f56d3b143560c42b598ffdfccf67b5774c17afeaaa87ee039074eaa7ab9d68225d862a4380da37d13f23c14674e05665ce397 +EBUILD libreoffice-24.2.7.2-r2.ebuild 19909 BLAKE2B 3546f9f24fd2ce23e34573e0972f619aeb3f312e2f0a4dcbf1561fc1117565b429db3f107efd46cd27a101d095391af9c825294bbd5949fd147cb32747d8f1de SHA512 baee1edd317c8a667878560e95ccfdc27b8610326f0f1b2eae9388a7b1355e803104079aaf25db4e240b1073884a1c623c02076e65d5368da27001ca732d23af +EBUILD libreoffice-25.2.1.2-r1.ebuild 21977 BLAKE2B 11ee7a41db03cb71173a3c339230f5bc0aafe51450594153259a7195beb411d16f3450996f53aa04c398f3f7ce99587e6eba353e45cc7c4a654d3debf4931900 SHA512 5e82752415740e5f8afcaca98b535d8c2892c3d4d2374e87fc50ad71db67f11dc657307021f7c89198eb0878fed22abfdd0282d6387f572439dd4514108ce14a +EBUILD libreoffice-25.2.1.2.ebuild 21921 BLAKE2B a09b8724fe5f61634d693b0e0f8d849b4a391bd2db4ee739a8e2d7822af6f3a33b1869fb94d8d1afed151dc7688e49edf19bb88ce20d3f3712d159192364db34 SHA512 17d0d54d110592bcb36d58cd5c7e611838f5cbd664b3f2ca1c37ea64297deab3cba0c3d360a16aa94369c831b6ff000b1cd53abf903df4ef3aae5c1190ef2c0f +EBUILD libreoffice-25.2.9999.ebuild 21921 BLAKE2B a09b8724fe5f61634d693b0e0f8d849b4a391bd2db4ee739a8e2d7822af6f3a33b1869fb94d8d1afed151dc7688e49edf19bb88ce20d3f3712d159192364db34 SHA512 17d0d54d110592bcb36d58cd5c7e611838f5cbd664b3f2ca1c37ea64297deab3cba0c3d360a16aa94369c831b6ff000b1cd53abf903df4ef3aae5c1190ef2c0f +EBUILD libreoffice-9999.ebuild 21642 BLAKE2B 649093b690e88d676ebae1490fe7a9335e4d2362e564f328f196c6d06011ab127db05b311e2c73ea3821aa408e94371cb947b3fc3749b741fbf42a98edbe84fe SHA512 0babf72a22298ca903502fe1093f9850c27a17358716be156c77604774f5fcfb7fc0fb098e207f37dd4889eb8df6ef974652c1651c971e5058a268b9620a6a2e MISC metadata.xml 1382 BLAKE2B d0fdf2add07795c3084e4d991d843e0567b3c6af27a93186fd6c0bbfedec44e26b6229cada85a326f50e34f17cefb6c03e8f7cb8f20b0a285961a26de39f4565 SHA512 d37ed6101672dbe9cc2759da7b3f4821572abee35b7994d384d37b124022599a5bbd838990112d4e3935be9e8989699a44ff9e5d25f935ba8de36ca921484336 diff --git a/app-office/libreoffice/files/libreoffice-25.2.1.2-poppler.patch b/app-office/libreoffice/files/libreoffice-25.2.1.2-poppler.patch new file mode 100644 index 000000000000..b7c7cabbedd4 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-25.2.1.2-poppler.patch @@ -0,0 +1,79 @@ +https://github.com/LibreOffice/core/commit/6a442575b7e802d1a3c4c4c18cd59a66d87a9217 +https://github.com/LibreOffice/core/commit/2e33e9aebf10adfb2663389a5051b32aa1c941e6 + +From 6a442575b7e802d1a3c4c4c18cd59a66d87a9217 Mon Sep 17 00:00:00 2001 +From: Robin Candau +Date: Thu, 27 Feb 2025 10:26:53 +0100 +Subject: [PATCH] tdf#165433 Fix PDF imports with (system) poppler >= 25.02.0 + +Since poppler 25.02.0, GlobalParams doesn't have a constructor +that accepts a nullptr anymore, +see upstream poppler b50390f748b59cb0a64b912636ecf6527bd0d12a commit. + +As such, the data directory location defined for SYSTEM_POPPLER +needs to be updated accordingly (when SYSTEM_POPPLER >= 25.02.0), +otherwise PDF imports fail with +"General Error / General input/output error". + +Change-Id: I2a60b03a9ae20aab8d36db2a6827f1f3b9618115 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182282 +Tested-by: Jenkins +Reviewed-by: Xisco Fauli +(cherry picked from commit 406afe11711df9fcabbc829fcff00aef2f44c1d9) +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182307 +--- + sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx +index ebed120708cc2..9b63559be44d9 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx ++++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx +@@ -110,7 +110,11 @@ int main(int argc, char **argv) + + /* Get data directory location */ + #ifdef SYSTEM_POPPLER ++#if POPPLER_CHECK_VERSION(25, 0, 2) ++ const std::string datadir = ""; ++#else + const char* datadir = nullptr; ++#endif + #else + /* Creates an absolute path to the poppler_data directory, by taking the path + * to the xpdfimport executable (provided in argv[0], and concatenating a + +From 2e33e9aebf10adfb2663389a5051b32aa1c941e6 Mon Sep 17 00:00:00 2001 +From: Rene Engelhard +Date: Fri, 28 Feb 2025 06:52:32 +0100 +Subject: [PATCH] fix poppler < 25.02 builds again + +after 406afe11711df9fcabbc829fcff00aef2f44c1d9 +should be #if POPPLER_CHECK_VERSION(25, 2, 0), cf. e.g. +https://cgit.freedesktop.org/libreoffice/core/tree/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx?id=406afe11711df9fcabbc829fcff00aef2f44c1d9#n1325 + +Change-Id: I2b891eaab55a303d74e92335bb15b520af4805bd +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182344 +Reviewed-by: Julien Nabet +Reviewed-by: Xisco Fauli +Reviewed-by: Robin Candau +Tested-by: Jenkins +(cherry picked from commit 344b71a1d1598465d7ebf6768aa68ad1db38d506) +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182359 +--- + sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx +index 9b63559be44d..1cb85e244fbe 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx ++++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx +@@ -110,7 +110,7 @@ int main(int argc, char **argv) + + /* Get data directory location */ + #ifdef SYSTEM_POPPLER +-#if POPPLER_CHECK_VERSION(25, 0, 2) ++#if POPPLER_CHECK_VERSION(25, 2, 0) + const std::string datadir = ""; + #else + const char* datadir = nullptr; + diff --git a/app-office/libreoffice/libreoffice-24.2.7.2-r1.ebuild b/app-office/libreoffice/libreoffice-24.2.7.2-r1.ebuild index 6f36ebc6d425..f79329251657 100644 --- a/app-office/libreoffice/libreoffice-24.2.7.2-r1.ebuild +++ b/app-office/libreoffice/libreoffice-24.2.7.2-r1.ebuild @@ -252,7 +252,7 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} acct-group/libreoffice acct-user/libreoffice - !app-office/libreoffice-bin + ! "${ED}"/etc/env.d/99${PN} || die + fi + + # bug 703474 + insinto /usr/include + doins -r include/LibreOfficeKit + + local lodir=/usr/$(get_libdir)/libreoffice + # patching this would break tests + cat <<-EOF > "${T}"/uno.py +import sys, os +sys.path.append('${EPREFIX}${lodir}/program') +os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc') +EOF + sed -e "/^import sys/d" -e "/^import os/d" \ + -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed" + cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die + cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die + + # more system pyuno mess + sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \ + -i "${D}"${lodir}/program/officehelper.py || die + + python_optimize "${D}"${lodir}/program + # link python bridge in site-packages, bug 667802 + local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program + for py in uno.py unohelper.py officehelper.py; do + dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py} + while IFS="" read -d $'\0' -r pyc; do + pyc=${pyc//*\/} + dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc} + done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0) + done + + newinitd "${FILESDIR}/libreoffice.initd" libreoffice + newconfd "${FILESDIR}/libreoffice.confd" libreoffice +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} diff --git a/app-office/libreoffice/libreoffice-25.2.1.2.ebuild b/app-office/libreoffice/libreoffice-25.2.1.2.ebuild index df30da1a810c..7f33b5747077 100644 --- a/app-office/libreoffice/libreoffice-25.2.1.2.ebuild +++ b/app-office/libreoffice/libreoffice-25.2.1.2.ebuild @@ -255,7 +255,7 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} acct-group/libreoffice acct-user/libreoffice - !app-office/libreoffice-bin + !