diff options
author | Yixun Lan <dlan@gentoo.org> | 2022-09-29 09:10:15 +0800 |
---|---|---|
committer | Yixun Lan <dlan@gentoo.org> | 2022-10-13 04:55:45 +0800 |
commit | 33edb3a6f5d753a2e84bf2e23338bc164a142b98 (patch) | |
tree | 7b75be891911e0f5acba58149460263da6db6eac | |
parent | sys-firmware/u-boot-bin: version bump to rc5 (diff) | |
download | riscv-33edb3a6f5d753a2e84bf2e23338bc164a142b98.tar.gz riscv-33edb3a6f5d753a2e84bf2e23338bc164a142b98.tar.bz2 riscv-33edb3a6f5d753a2e84bf2e23338bc164a142b98.zip |
app-office/libreoffice: import from portage
copy from 4a4787e7f0c without modification
Signed-off-by: Yixun Lan <dlan@gentoo.org>
13 files changed, 1013 insertions, 0 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest new file mode 100644 index 0000000..e41d0f5 --- /dev/null +++ b/app-office/libreoffice/Manifest @@ -0,0 +1,24 @@ +DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a +DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c +DIST 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip 1180582 BLAKE2B b2b91f608cccdc823c11ce946ecf12b8cb7b1218fa8763ed7b64cf2567114f0703b4103a4eb2369874a4006112396470d1a0a72e6f186c9fac629cbca0fe18d6 SHA512 9fe106bbdb55365f589246e5a0d10bbe9b35224132b66a1823dc6361633a67f2acc0e8c393dc7ed70d086858d16d242b8806b8b2184c98e3d20d0be85bed9c44 +DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a +DIST 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip 153157 BLAKE2B e02fced286aab6f6597b04bba37186e6f7d0793ef807c4530e15da5464e9302880278472fdc79dc27a9be15600127bebe30651a6027ef1b0a7cfc40ce56a395a SHA512 a7c3044a0a7c67881f78eddc4b3faf05e29b20755a59cdbb9a0a49bd21be5aaa95d4ea5eaabdd6f005a421981fb7c55fee590d4c9592fe363ba27ae590652bd4 +DIST 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip 5750610 BLAKE2B b9f3ef8baa6fe11b2aef25ee6ebe36d7f4c0e688022f27c6a0186a94d909c4c2166ffe5d70644207f56971888e2478e57cd1e76a252abf3825987350c4c7de45 SHA512 8eaa9eed3bff16a16483d0754756c181089eb705ea34ded7f9f6db90a591cbce3f0551f28d097bd2f44de813cb818720c430e79e516939e0398b72bf4614f4cd +DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f +DIST 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip 762419 BLAKE2B 9cbcda7d7644ede32a19b7bd5e29cae348229b9396a205809db480ed67bf12d243652d4ec3bf817f6d369e594a6d6ac3ebebfd03a80ed94f3106f78421d00077 SHA512 12ab17a4db3f7c834b21e59ff6f6f6456630d8626db7fb908867b20204295d4fba8969e79a3694ca66cb24e9f0e5a0fa4b9d2d3f748691b7f93985f9e666ce5f +DIST 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip 2938721 BLAKE2B 86cf869561f653e449611ca2f014b340d7d0cba46b7d37a9455cbbc184b6a5c7e0e26ac84909aef08ae8639a402cef3bfc93ec901de018060f16413eaff0f748 SHA512 17ba9d2c0376fb7326d53bb1e3796610176a1af426d1b9073b5f7cf06c93d865e585c495e75c52fb8e426d7c453e751356a9ca9a54dc821ddadb6c8160ed5ba6 +DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a +DIST ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip 2929311 BLAKE2B 02f59a60592d92f97f1098b501617d1408cabeab7b5a85b2f20ade584536e71823c392ce86084a944cada86310d48afb475535b47420f9b54eff582ce1d77d85 SHA512 58c1aa3965bf3a5f5d0facb67a5e42cec04e3f74e59cd7348ea2a9f6d9cafdce5552677c6b6d9c4cf2b31f52751695f2e53b2cee658e5f2eacb1393534a53c0e +DIST ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip 743031 BLAKE2B 85ddb6e24475f32e4fa105add3ace0afa686b739e34958e8a47653668153d1bebcec77dbdeeb83bef566453e624fd7ebb0595f7d429005dac1c9af30f861e708 SHA512 654d2408c11349c90ae7d80b0c1997ee831004bc4ee36a706a0d8a84617fd0f82a97c5b45ab2388d60085afaec59a02eada007a8a1e14c3b366cabd36b7607ec +DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9 +DIST d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip 207563 BLAKE2B 0b7bb7b801a553950644ea1cdd522b43744ed6e2f5c71df0360e6e93f3f04eb33d9585c977783b0572a63f47017ba12becc5255a8aba9255c3e64ff7ae7eaef7 SHA512 71164f5e052db4fc16d1eb6ceb66d2b483d4912d874e371399047761e1d82e95d14288be5a7952c40f0ce39366f0706e726720e6e7171a00ce7bb55632cbf10c +DIST db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip 1396007 BLAKE2B 8012d5c740b74b589f435d59934397111b9e645e965b2c6fd5c12bdc20fd6a9dc93410b40e61fd1dfd058747803bc113cfd6c73fc9e777e5f074cb6b750f93c0 SHA512 4476024e7f307617719714fbf0999409aa11d730bc316f833bb6627d1b83abb42460417be588c193ecb49d6b926dd1f411934d8a8abebe00a3e85c0047dad0a6 +DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48dff6df5c857a6bd0510a92aa6d9b9660ad63b2344d5195fef072e526f8d7900791b15442923b63196dda3f SHA512 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85 +DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a39ee9798182b70ba650fa954234b964e33278ac4fe3f84f8c3218ad49f12d139079328036b4f9d80cde967888c0a66393c34dedf27af69dac02c5aff SHA512 9091d3628d9c75c068507537afc9e10bfb79c1abfd36ad697af3d592a1cc049ba6640f665bfc53cc520b6a26c21d70b0275106843444b441484c2178f2784743 +DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114 +DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa8b9e470e10044dbfd3812391f29e1421df8d7ac3869955698ddbc9575feebcfbac27bb074a60ccc0527dca1c3 SHA512 295ab15115e75b1f6074f17d3538afe0de9b2b77ab454f5c63cb05e8df11886d82942fbf21ba01486052e3f6c75b0636b99d8e660cd3472dc4b87c31d3cd557b +DIST libreoffice-7.3.5.2-patchset-01.tar.xz 12700 BLAKE2B 353f6552d31616dfeb32287173bbd70366045ec437c8735e701bff357032f5ef2358920c5d8495142551116999b034db6611a72536edf14fe13ea9cace3a931c SHA512 dbd8b4b494159845efbe9ad76d5822188b9868aff8ef488793f4e2b0f2f0290942322651e8b53dd71db81cba559e3510732801d0c643cb2af9526cb1e1837891 +DIST libreoffice-7.3.6.2.tar.xz 256616324 BLAKE2B 52456e529ae2898101824882f124a5b039a1dfb98fd77dfceef39a41a3af871123c56b83a73d0aaf92e1cea57f35af442ca0a17814a1374538a9495ac601cee0 SHA512 8f61e9c09b344cf120bc6f9463344b28644e52738360ddeb1a29d9d2294d24132b070902a089531869e11487f5a7153fc4752e6636af7ef57269d23c8187ec86 +DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f +DIST libreoffice-help-7.3.6.2.tar.xz 112209384 BLAKE2B 629a9dae6464adb33ed4494df8cbf59305a686b0bab21d55e3c139b87c5e3eee3e77ef1f22be84973d6e51a1ffb74aa74fd7f91b82223b2e3cc6d3bc900e7305 SHA512 7a98e8d3b146638bdb608d86b617bb45ff2649957ad9391aadfbb32fb18a4c8d15675bd24076dbb2b635569bfdab988f7cac461cfe04e53b3febfb2aa35d6189 +DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76 diff --git a/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch b/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch new file mode 100644 index 0000000..a6e732f --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch @@ -0,0 +1,11 @@ +--- a/shell/source/unix/misc/senddoc.sh 2017-06-15 15:44:22.000000000 +0200 ++++ b/shell/source/unix/misc/senddoc.sh 2017-06-25 01:00:08.525435930 +0200 +@@ -389,6 +389,8 @@ + elif [ -n "$DESKTOP_LAUNCH" ]; then + # http://lists.freedesktop.org/pipermail/xdg/2004-August/002873.html + MAILER=${DESKTOP_LAUNCH} ++ elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kde-open5 ] ; then ++ MAILER=/usr/bin/kde-open5 + elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kde-open ] ; then + MAILER=/usr/bin/kde-open + elif [ -x /usr/bin/xdg-open ] ; then diff --git a/app-office/libreoffice/files/libreoffice-6.1-nomancompress.patch b/app-office/libreoffice/files/libreoffice-6.1-nomancompress.patch new file mode 100644 index 0000000..ea6eb8b --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-6.1-nomancompress.patch @@ -0,0 +1,29 @@ +--- a/bin/distro-install-desktop-integration 2018-10-29 20:55:29.000000000 +0100 ++++ b/bin/distro-install-desktop-integration 2018-11-22 02:03:36.464866894 +0100 +@@ -39,22 +39,20 @@ + + create_man_link() + { +- echo "Install $MANDIR/man1/$1.1.gz" ++ echo "Install $MANDIR/man1/$1.1" + + mkdir -p $DESTDIR$MANDIR/man1 + echo ".so man1/$2.1" >| $DESTDIR$MANDIR/man1/$1.1 +- gzip -f $DESTDIR$MANDIR/man1/$1.1 +- test -f "$DESTDIR/$3" && echo "$MANDIR/man1/$1.1.gz" >>"$DESTDIR/$3" ++ test -f "$DESTDIR/$3" && echo "$MANDIR/man1/$1.1" >>"$DESTDIR/$3" + } + + install_man() + { +- echo "Install $MANDIR/man1/$1.1.gz" ++ echo "Install $MANDIR/man1/$1.1" + + mkdir -p $DESTDIR$MANDIR/man1 + cp "${SRCDIR?}"/sysui/desktop/man/$1.1 $DESTDIR$MANDIR/man1 || exit 1; +- gzip -f $DESTDIR$MANDIR/man1/$1.1 +- test -f "$DESTDIR/$2" && echo "$MANDIR/man1/$1.1.gz" >>"$DESTDIR/$2" ++ test -f "$DESTDIR/$2" && echo "$MANDIR/man1/$1.1" >>"$DESTDIR/$2" + } + + diff --git a/app-office/libreoffice/files/libreoffice-7.2.0.4-qt5detect.patch b/app-office/libreoffice/files/libreoffice-7.2.0.4-qt5detect.patch new file mode 100644 index 0000000..c905fab --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-7.2.0.4-qt5detect.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index 971d7ad440c5..adb01509ab29 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -12683,7 +12683,7 @@ then + + dnl Check for Meta Object Compiler + +- AC_PATH_PROGS( MOC5, [moc-qt5 moc], no, [`dirname $qt5_libdir`/bin:$QT5DIR/bin:$PATH]) ++ AC_PATH_PROGS( MOC5, [moc-qt5 moc], no, [$QT5DIR/bin]) + if test "$MOC5" = "no"; then + AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify + the root of your Qt installation by exporting QT5DIR before running "configure".]) diff --git a/app-office/libreoffice/files/libreoffice-7.2.6.2-poppler-22.03.0.patch b/app-office/libreoffice/files/libreoffice-7.2.6.2-poppler-22.03.0.patch new file mode 100644 index 0000000..be4a399 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-7.2.6.2-poppler-22.03.0.patch @@ -0,0 +1,33 @@ +From 001ec0e10616a3a55fa7898bb68c983e94b7ce66 Mon Sep 17 00:00:00 2001 +From: foutrelis <foutrelis@eb2447ed-0c53-47e4-bac8-5bc4a241df78> +Date: Wed, 2 Mar 2022 12:58:09 +0000 +Subject: [PATCH] upgpkg: libreoffice-fresh 7.3.0-7: poppler 22.03.0 rebuild + +diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx +index ad6320139..e5f6d9c68 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx ++++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx +@@ -138,6 +138,15 @@ int main(int argc, char **argv) + _setmode( _fileno( g_binary_out ), _O_BINARY ); + #endif + ++#if POPPLER_CHECK_VERSION(22, 3, 0) ++ PDFDoc aDoc( std::make_unique<GooString>(pFileName), ++ GooString(pOwnerPasswordStr), ++ GooString(pUserPasswordStr) ); ++ ++ PDFDoc aErrDoc( std::make_unique<GooString>(pErrFileName), ++ GooString(pOwnerPasswordStr), ++ GooString(pUserPasswordStr) ); ++#else + PDFDoc aDoc( pFileName, + pOwnerPasswordStr, + pUserPasswordStr ); +@@ -145,6 +154,7 @@ int main(int argc, char **argv) + PDFDoc aErrDoc( pErrFileName, + pOwnerPasswordStr, + pUserPasswordStr ); ++#endif + + // Check various permissions for aDoc. + PDFDoc &rDoc = aDoc.isOk()? aDoc: aErrDoc; diff --git a/app-office/libreoffice/files/libreoffice-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch b/app-office/libreoffice/files/libreoffice-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch new file mode 100644 index 0000000..22de747 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/843311 + +From: Sam James <sam@gentoo.org> +Date: Sun, 8 May 2022 21:22:49 +0000 +Subject: [PATCH] Add missing nSize set for Poppler 22.04.0 + +Thanks-to: Stephan Hartmann <sultan@gentoo.org> +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +@@ -478,6 +478,10 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, const GfxState* st + char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize ); + #else + std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() ); ++ if( pBuf ) ++ { ++ nSize = pBuf->size(); ++ } + #endif + if( pBuf ) + { +@@ -502,6 +506,10 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const + char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize ); + #else + std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() ); ++ if( pBuf ) ++ { ++ nSize = pBuf->size(); ++ } + #endif + if( !pBuf ) + return; diff --git a/app-office/libreoffice/files/libreoffice-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch b/app-office/libreoffice/files/libreoffice-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch new file mode 100644 index 0000000..39cb13b --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch @@ -0,0 +1,78 @@ +https://bugs.gentoo.org/843311 +https://cgit.freebsd.org/ports/commit/?id=d9b5ef800dbd0366eae81b03bfa89689ec73c6f7 + +(sam: adapt version check to 22.4.0) + +From: Sam James <sam@gentoo.org> +Date: Sun, 8 May 2022 21:20:25 +0000 +Subject: [PATCH 1/2] Import FreeBSD patch for Poppler 22.04.0 build + +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +@@ -474,11 +474,17 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, const GfxState* st + { + // TODO(P3): Unfortunately, need to read stream twice, since + // we must write byte count to stdout before ++#if !POPPLER_CHECK_VERSION(22, 4, 0) + char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize ); ++#else ++ std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() ); ++#endif + if( pBuf ) + { + aNewFont.isEmbedded = true; ++#if !POPPLER_CHECK_VERSION(22, 4, 0) + gfree(pBuf); ++#endif + } + } + +@@ -492,21 +498,32 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const + return; + + int nSize = 0; +- char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize ); ++#if !POPPLER_CHECK_VERSION(22, 4, 0) ++ char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize ); ++#else ++ std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() ); ++#endif + if( !pBuf ) + return; + + // ---sync point--- see SYNC STREAMS above + fflush(stdout); +- ++#if !POPPLER_CHECK_VERSION(22, 4, 0) + if( fwrite(pBuf, sizeof(char), nSize, g_binary_out) != static_cast<size_t>(nSize) ) ++#else ++ if( fwrite(reinterpret_cast<char*>(pBuf.value().data()), sizeof(char), nSize, g_binary_out) != static_cast<size_t>(nSize) ) ++#endif + { +- gfree(pBuf); ++#if !POPPLER_CHECK_VERSION(22, 4, 0) ++ gfree(pBuf); ++#endif + exit(1); // error + } + // ---sync point--- see SYNC STREAMS above + fflush(g_binary_out); +- gfree(pBuf); ++#if !POPPLER_CHECK_VERSION(22, 4, 0) ++ gfree(pBuf); ++#endif + } + + #if POPPLER_CHECK_VERSION(0, 83, 0) +@@ -759,7 +776,11 @@ void PDFOutDev::updateFont(GfxState *state) + { + assert(state); + ++#if !POPPLER_CHECK_VERSION(22, 4, 0) + GfxFont *gfxFont = state->getFont(); ++#else ++ GfxFont *gfxFont = state->getFont().get(); ++#endif + if( !gfxFont ) + return; + diff --git a/app-office/libreoffice/files/libreoffice-7.3.5.2-gpgme-1.18.0.patch b/app-office/libreoffice/files/libreoffice-7.3.5.2-gpgme-1.18.0.patch new file mode 100644 index 0000000..d8dae52 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-7.3.5.2-gpgme-1.18.0.patch @@ -0,0 +1,48 @@ +https://bugs.gentoo.org/865321 +https://lists.freedesktop.org/archives/libreoffice/2022-August/089261.html +https://github.com/LibreOffice/core/commit/aa0b2b756c17d43d2e8c828a909ee2815e332377 + +From: Rene Engelhard <rene@debian.org> +Date: Wed, 24 Aug 2022 09:55:33 +0200 +Subject: [PATCH] Make configure work with gpgme >= 1.18 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Sam James wrote: +> gpgme-1.18.0 dropped a bunch of internal symbols, +> including progress_callback (see e.g. callbacks.h +> which has a comment at the top saying it's internal). + +Plausibly the workaround to not link against older KDE-specific distro +packages is not needed anymore. + +Check for main as a workaround as we do for other C++ libraries, too. + +Change-Id: I57065a5b5b23b9eadb73b01e4f3a289552c3bde4 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138667 +Tested-by: Jenkins +Reviewed-by: Sam James <sam@gentoo.org> +Reviewed-by: René Engelhard <rene@debian.org> +(cherry picked from commit b4a94d681a99a6a3eeb6aaa4d2f4dfab8f7c000b) +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138553 +Tested-by: René Engelhard <rene@debian.org> +--- a/configure.ac ++++ b/configure.ac +@@ -12537,12 +12537,11 @@ elif test \( \( "$_os" = "Linux" -o "$_os" = "Darwin" \) -a "$ENABLE_NSS" = TRUE + # C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way + AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ GPGMEPP_CFLAGS=-I/usr/include/gpgme++ ], + [AC_MSG_ERROR([gpgmepp headers not found, install gpgmepp >= 1.14 development package])], []) +- # progress_callback is the only func with plain C linkage +- # checking for it also filters out older, KDE-dependent libgpgmepp versions +- AC_CHECK_LIB(gpgmepp, progress_callback, [ GPGMEPP_LIBS=-lgpgmepp ], +- [AC_MSG_ERROR(gpgmepp not found or not functional)], []) + AC_CHECK_HEADER(gpgme.h, [], + [AC_MSG_ERROR([gpgme headers not found, install gpgme development package])], []) ++ AC_CHECK_LIB(gpgmepp, main, [], ++ [AC_MSG_ERROR(gpgmepp not found or not functional)], []) ++ GPGMEPP_LIBS=-lgpgmepp + else + AC_MSG_RESULT([internal]) + BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP" + diff --git a/app-office/libreoffice/files/libreoffice-7.3.5.2-poppler-22.09.0.patch b/app-office/libreoffice/files/libreoffice-7.3.5.2-poppler-22.09.0.patch new file mode 100644 index 0000000..f269d53 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-7.3.5.2-poppler-22.09.0.patch @@ -0,0 +1,46 @@ +https://gerrit.libreoffice.org/c/core/+/139249 + +From 8bad83bf044661357b02b695e6f53e2e19dea396 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 2 Sep 2022 04:31:18 +0100 +Subject: [PATCH] Fix build with Poppler 22.09.0 + +With Poppler 22.09.0, LO fails to build with: +``` +/var/tmp/portage/app-office/libreoffice-7.3.5.2/work/libreoffice-7.3.5.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx:682:36: error: too many arguments to function call, expected single argument 'start', have 3 arguments + state->getLineDash(&dashArray, &arrayLen, &startOffset); + ~~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~ +/usr/include/poppler/GfxState.h:1506:32: note: 'getLineDash' declared here + const std::vector<double> &getLineDash(double *start) + ^ +1 error generated. +``` + +Poppler changed the getLineDash interface: +``` +- void getLineDash(double **dash, int *length, double *start) ++ const std::vector<double> &getLineDash(double *start) +``` + +Signed-off-by: Sam James <sam@gentoo.org> +Change-Id: I29e18f20d7650a7fcac1bc8ab4aaa04aaa2ab8fb +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +@@ -678,8 +678,16 @@ void PDFOutDev::updateLineDash(GfxState *state) + return; + assert(state); + +- double* dashArray; int arrayLen; double startOffset; ++ int arrayLen; double startOffset; ++#if POPPLER_CHECK_VERSION(22, 9, 0) ++ const double* dashArray; ++ const std::vector<double> &dash = state->getLineDash(&startOffset); ++ dashArray = dash.data(); ++ arrayLen = dash.size(); ++#else ++ double* dashArray; + state->getLineDash(&dashArray, &arrayLen, &startOffset); ++#endif + + printf( "updateLineDash" ); + if( arrayLen && dashArray ) diff --git a/app-office/libreoffice/files/libreoffice.confd b/app-office/libreoffice/files/libreoffice.confd new file mode 100644 index 0000000..df1a269 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice.confd @@ -0,0 +1,5 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Default options for the soffice daemon +libreoffice_opts="--accept=\"socket,host=localhost,port=8100,tcpNoDelay=1;urp;\"" diff --git a/app-office/libreoffice/files/libreoffice.initd b/app-office/libreoffice/files/libreoffice.initd new file mode 100644 index 0000000..ecd6501 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice.initd @@ -0,0 +1,14 @@ +#!/sbin/openrc-run +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +description="LibreOffice headless daemon for generating documents" +name="LibreOffice headless daemon" +pidfile="/run/soffice.pid" +soffice_args="${libreoffice_opts}" + +command="/usr/bin/soffice" +command_args="--nodefault --nofirststartwizard --nolockcheck --nologo --norestore --headless ${soffice_args}" +command_background="true" +command_group="libreoffice" +command_user="libreoffice" diff --git a/app-office/libreoffice/libreoffice-7.3.6.2.ebuild b/app-office/libreoffice/libreoffice-7.3.6.2.ebuild new file mode 100644 index 0000000..7237092 --- /dev/null +++ b/app-office/libreoffice/libreoffice-7.3.6.2.ebuild @@ -0,0 +1,658 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_REQ_USE="threads(+),xml(+)" + +MY_PV="${PV/_alpha/.alpha}" +MY_PV="${MY_PV/_beta/.beta}" +# experimental ; release ; old +# Usually the tarballs are moved a lot so this should make everyone happy. +DEV_URI=" + https://dev-builds.libreoffice.org/pre-releases/src + https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/ + https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src +" +ADDONS_URI="https://dev-www.libreoffice.org/src/" + +BRANDING="${PN}-branding-gentoo-0.8.tar.xz" +PATCHSET="${PN}-7.3.5.2-patchset-01.tar.xz" + +[[ ${MY_PV} == *9999* ]] && inherit git-r3 +inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils + +DESCRIPTION="A full office productivity suite" +HOMEPAGE="https://www.libreoffice.org" +SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" +[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~xen0n/distfiles/app-office/libreoffice/${PATCHSET}" + +# Split modules following git/tarballs; Core MUST be first! +# Help is used for the image generator +# Only release has the tarballs +if [[ ${MY_PV} != *9999* ]]; then + for i in ${DEV_URI}; do + SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz" + SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz" + done + unset i +fi +unset DEV_URI + +# Really required addons +# These are bundles that can't be removed for now due to huge patchsets. +# If you want them gone, patches are welcome. +ADDONS_SRC=( + # broken against latest upstream release, too many patches on top: + # https://github.com/tdf/libcmis/pull/43 + "${ADDONS_URI}/libcmis-0.5.2.tar.xz" + # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c + "${ADDONS_URI}/dtoa-20180411.tgz" + # not packaged in Gentoo, https://skia.org/ + "${ADDONS_URI}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz" + "base? ( + ${ADDONS_URI}/commons-logging-1.2-src.tar.gz + ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip + ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip + ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip + ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip + ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip + ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + )" + "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" + # no release for 8 years, should we package it? + "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" + # Does not build with 1.6 rhino at all + "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" + # requirement of rhino + "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" + # not packageable + "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" +) +SRC_URI+=" ${ADDONS_SRC[*]}" + +unset ADDONS_URI +unset ADDONS_SRC + +# Extensions that need extra work: +LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" + +IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird +googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan +$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + base? ( firebird java ) + bluetooth? ( dbus ) + gtk? ( dbus ) + libreoffice_extensions_nlpsolver? ( java ) + libreoffice_extensions_scripting-beanshell? ( java ) + libreoffice_extensions_scripting-javascript? ( java ) + libreoffice_extensions_wiki-publisher? ( java ) +" + +RESTRICT="!test? ( test )" + +LICENSE="|| ( LGPL-3 MPL-1.1 )" +SLOT="0" + +[[ ${MY_PV} == *9999* ]] || \ +KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 x86 ~amd64-linux" + +COMMON_DEPEND="${PYTHON_DEPS} + app-arch/unzip + app-arch/zip + app-crypt/gpgme:=[cxx] + app-text/hunspell:= + >=app-text/libabw-0.1.0 + >=app-text/libebook-0.1 + app-text/libepubgen + >=app-text/libetonyek-0.1 + app-text/libexttextcat + app-text/liblangtag + >=app-text/libmspub-0.1.0 + >=app-text/libmwaw-0.3.1 + >=app-text/libnumbertext-1.0.6 + >=app-text/libodfgen-0.1.0 + app-text/libqxp + app-text/libstaroffice + app-text/libwpd:0.10[tools] + app-text/libwpg:0.3 + >=app-text/libwps-0.4 + app-text/mythes + dev-cpp/abseil-cpp:= + >=dev-cpp/clucene-2.3.3.4-r2 + >=dev-cpp/libcmis-0.5.2 + dev-db/unixODBC + dev-lang/perl + dev-libs/boost:=[nls] + dev-libs/expat + dev-libs/hyphen + dev-libs/icu:= + dev-libs/libassuan + dev-libs/libgpg-error + >=dev-libs/liborcus-0.17.2:0/0.17 + dev-libs/librevenge + dev-libs/libxml2 + dev-libs/libxslt + dev-libs/nspr + dev-libs/nss + >=dev-libs/redland-1.0.16 + >=dev-libs/xmlsec-1.2.28[nss] + >=games-engines/box2d-2.4.1:0 + media-gfx/fontforge + media-gfx/graphite2 + media-libs/fontconfig + >=media-libs/freetype-2.11.0-r1:2 + >=media-libs/harfbuzz-0.9.42:=[graphite,icu] + media-libs/lcms:2 + >=media-libs/libcdr-0.1.0 + >=media-libs/libepoxy-1.3.1[X] + >=media-libs/libfreehand-0.1.0 + media-libs/libjpeg-turbo:= + media-libs/libpagemaker + >=media-libs/libpng-1.4:0= + >=media-libs/libvisio-0.1.0 + media-libs/libzmf + media-libs/openjpeg:= + media-libs/zxing-cpp:= + >=net-libs/neon-0.31.1:= + net-misc/curl + sci-mathematics/lpsolve + sys-libs/zlib + virtual/opengl + x11-libs/cairo[X] + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender + accessibility? ( + $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]') + ) + bluetooth? ( + dev-libs/glib:2 + net-wireless/bluez + ) + coinmp? ( sci-libs/coinor-mp ) + cups? ( net-print/cups ) + dbus? ( sys-apps/dbus[X] ) + eds? ( + dev-libs/glib:2 + gnome-base/dconf + gnome-extra/evolution-data-server + ) + firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + ) + gtk? ( + dev-libs/glib:2 + dev-libs/gobject-introspection + gnome-base/dconf + media-libs/mesa[egl(+)] + x11-libs/gtk+:3[X] + x11-libs/pango + ) + kde? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + kde-frameworks/kconfig:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/ki18n:5 + kde-frameworks/kio:5 + kde-frameworks/kwindowsystem:5 + ) + ldap? ( net-nds/openldap:= ) + libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) + libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 ) + mariadb? ( dev-db/mariadb-connector-c:= ) + !mariadb? ( dev-db/mysql-connector-c:= ) + pdfimport? ( >=app-text/poppler-22.06:=[cxx] ) + postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) +" +# FIXME: cppunit should be moved to test conditional +# after everything upstream is under gbuild +# as dmake execute tests right away +# tests apparently also need google-carlito-fonts (not packaged) +DEPEND="${COMMON_DEPEND} + >=dev-libs/libatomic_ops-7.2d + dev-perl/Archive-Zip + >=dev-util/cppunit-1.14.0 + >=dev-util/gperf-3.1 + dev-util/mdds:1/2.0 + media-libs/glm + sys-devel/ucpp + x11-base/xorg-proto + x11-libs/libXt + x11-libs/libXtst + java? ( + dev-java/ant-core + >=virtual/jdk-11 + ) + test? ( + app-crypt/gnupg + dev-util/cppunit + media-fonts/dejavu + media-fonts/liberation-fonts + ) +" +RDEPEND="${COMMON_DEPEND} + acct-group/libreoffice + acct-user/libreoffice + !app-office/libreoffice-bin + !app-office/libreoffice-bin-debug + media-fonts/liberation-fonts + || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) + java? ( >=virtual/jre-11 ) + kde? ( kde-frameworks/breeze-icons:* ) +" +BDEPEND=" + dev-util/intltool + sys-apps/which + sys-devel/bison + sys-devel/flex + sys-devel/gettext + virtual/pkgconfig + clang? ( + || ( + ( sys-devel/clang:15 + sys-devel/llvm:15 + =sys-devel/lld-15* ) + ( sys-devel/clang:14 + sys-devel/llvm:14 + =sys-devel/lld-14* ) + ( sys-devel/clang:13 + sys-devel/llvm:13 + =sys-devel/lld-13* ) + ) + ) + odk? ( >=app-doc/doxygen-1.8.4 ) +" +if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then + PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*" +else + # Translations are not reliable on live ebuilds + # rather force people to use english only. + PDEPEND="!app-office/libreoffice-l10n" +fi + +PATCHES=( + "${WORKDIR}"/${PATCHSET/.tar.xz/} + + # not upstreamable stuff + "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" + "${FILESDIR}/${PN}-6.1-nomancompress.patch" + "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch" + + # 7.4 branch + "${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch" + + # pending upstream + "${FILESDIR}/${PN}-7.3.5.2-poppler-22.09.0.patch" +) + +S="${WORKDIR}/${PN}-${MY_PV}" + +_check_reqs() { + CHECKREQS_MEMORY="512M" + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + CHECKREQS_DISK_BUILD="22G" + else + CHECKREQS_DISK_BUILD="6G" + fi + check-reqs_$1 +} + +pkg_pretend() { + use base || + ewarn "If you plan to use Base application you must enable USE base." + use java || + ewarn "Without USE java, several wizards are not going to be available." + + [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend +} + +pkg_setup() { + java-pkg-opt-2_pkg_setup + python-single-r1_pkg_setup + xdg_environment_reset + + [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup +} + +src_unpack() { + default + + if [[ ${MY_PV} = *9999* ]]; then + local base_uri branch mypv + base_uri="https://anongit.freedesktop.org/git" + branch="master" + mypv=${MY_PV/.9999} + [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}" + git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}" + git-r3_checkout "${base_uri}/${PN}/core" + LOCOREGIT_VERSION=${EGIT_VERSION} + + git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master" + git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help + fi +} + +src_prepare() { + default + + # sandbox violations on many systems, we don't need it. Bug #646406 + sed -i \ + -e "/KF5_CONFIG/s/kf5-config/no/" \ + configure.ac || die "Failed to disable kf5-config" + + AT_M4DIR="m4" eautoreconf + # hack in the autogen.sh + touch autogen.lastrun + + # sed in the tests + sed -i \ + -e "s#all : build unitcheck#all : build#g" \ + solenv/gbuild/Module.mk || die + sed -i \ + -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \ + -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \ + Makefile.in || die + + sed -i \ + -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \ + -e "s,\$INSTALLDIRNAME.sh,${PN}," \ + bin/distro-install-desktop-integration || die + + if use branding; then + # hack... + mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die + fi + + # Don't list pdfimport support in desktop when built with none, bug # 605464 + if ! use pdfimport; then + sed -i \ + -e ":MimeType: s:application/pdf;::" \ + -e ":Keywords: s:pdf;::" \ + sysui/desktop/menus/draw.desktop || die + fi +} + +src_configure() { + # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys + # Note: these are for Gentoo use ONLY. For your own distribution, please get + # your own set of keys. Feel free to contact chromium@gentoo.org for more info. + local google_default_client_id="329227923882.apps.googleusercontent.com" + local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" + + # Show flags set at the beginning + einfo "Preset CFLAGS: ${CFLAGS}" + einfo "Preset LDFLAGS: ${LDFLAGS}" + + if use clang ; then + # Force clang + einfo "Enforcing the use of clang due to USE=clang ..." + AR=llvm-ar + CC=${CHOST}-clang + CXX=${CHOST}-clang++ + NM=llvm-nm + RANLIB=llvm-ranlib + LDFLAGS+=" -fuse-ld=lld" + else + # Force gcc + einfo "Enforcing the use of gcc due to USE=-clang ..." + AR=gcc-ar + CC=${CHOST}-gcc + CXX=${CHOST}-g++ + NM=gcc-nm + RANLIB=gcc-ranlib + + # Apparently the Clang flags get used even for GCC builds sometimes. + # bug #838115 + sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die + fi + + if use custom-cflags ; then + elog "USE=custom-cflags has been selected. You are on your own to make sure that" + elog "the build succeeds. Good luck!" + else + strip-flags + fi + + export LO_CLANG_CC=${CC} + export LO_CLANG_CXX=${CXX} + + # Show flags set at the end + einfo " Used CFLAGS: ${CFLAGS}" + einfo " Used LDFLAGS: ${LDFLAGS}" + + # Ensure we use correct toolchain + tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG + + if use vulkan && ! use clang ; then + ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang." + fi + + # optimization flags + export GMAKE_OPTIONS="${MAKEOPTS}" + # System python enablement: + export PYTHON_CFLAGS=$(python_get_CFLAGS) + export PYTHON_LIBS=$(python_get_LIBS) + + use kde && export QT5DIR="$(qt5_get_bindir)/.." + + local gentoo_buildid="Gentoo official package" + if [[ -n ${LOCOREGIT_VERSION} ]]; then + gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})" + fi + + # system headers/libs/...: enforce using system packages + # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad + # --enable-cairo: ensure that cairo is always required + # --enable-*-link: link to the library rather than just dlopen on runtime + # --enable-release-build: build the libreoffice as release + # --disable-fetch-external: prevent dowloading during compile phase + # --enable-extension-integration: enable any extension integration support + # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs + # --disable-report-builder: too much java packages pulled in without pkgs + # --without-system-sane: just sane.h header that is used for scan in writer, + # not linked or anything else, worthless to depend on + # --disable-pdfium: not yet packaged + local myeconfargs=( + --with-system-dicts + --with-system-epoxy + --with-system-headers + --with-system-jars + --with-system-libs + --enable-build-opensymbol + --enable-cairo-canvas + --enable-largefile + --enable-mergelibs + --enable-python=system + --enable-randr + --enable-release-build + --disable-breakpad + --disable-bundle-mariadb + --disable-ccache + --disable-epm + --disable-fetch-external + --disable-gtk3-kde5 + --disable-online-update + --disable-openssl + --disable-pdfium + --disable-qt6 + --with-extra-buildid="${gentoo_buildid}" + --enable-extension-integration + --with-external-dict-dir="${EPREFIX}/usr/share/myspell" + --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" + --with-external-thes-dir="${EPREFIX}/usr/share/myspell" + --with-external-tar="${DISTDIR}" + --with-lang="" + --with-parallelism=$(makeopts_jobs) + --with-system-abseil + --with-system-openjpeg + --with-system-ucpp + --with-tls=nss + --with-vendor="Gentoo Foundation" + --with-webdav="neon" + --with-x + --without-fonts + --without-myspell-dicts + --with-help="html" + --without-helppack-integration + --with-system-gpgmepp + --without-system-jfreereport + --without-system-libcmis + --without-system-sane + $(use_enable base report-builder) + $(use_enable bluetooth sdremote-bluetooth) + $(use_enable coinmp) + $(use_enable cups) + $(use_enable dbus) + $(use_enable debug) + $(use_enable eds evolution2) + $(use_enable firebird firebird-sdbc) + $(use_enable gstreamer gstreamer-1-0) + $(use_enable gtk gtk3) + $(use_enable kde kf5) + $(use_enable kde qt5) + $(use_enable ldap) + $(use_enable odk) + $(use_enable pdfimport) + $(use_enable postgres postgresql-sdbc) + $(use_enable vulkan skia) + $(use_with accessibility lxml) + $(use_with coinmp system-coinmp) + $(use_with googledrive gdrive-client-id ${google_default_client_id}) + $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) + $(use_with java) + $(use_with odk doxygen) + ) + + if use eds || use gtk; then + myeconfargs+=( --enable-dconf --enable-gio ) + else + myeconfargs+=( --disable-dconf --disable-gio ) + fi + + # libreoffice extensions handling + for lo_xt in ${LO_EXTS}; do + if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then + myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) ) + else + myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) ) + fi + done + + if use java; then + # hsqldb: system one is too new + myeconfargs+=( + --without-junit + --without-system-hsqldb + --with-ant-home="${ANT_HOME}" + --with-jdk-home="${JAVA_HOME}" + ) + + use libreoffice_extensions_scripting-beanshell && \ + myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) ) + + use libreoffice_extensions_scripting-javascript && \ + myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) ) + fi + + is-flagq "-flto*" && myeconfargs+=( --enable-lto ) + + MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ + econf "${myeconfargs[@]}" +} + +src_compile() { + # more and more LO stuff tries to use OpenGL, including tests during build + # bug 501508, bug 540624, bug 545974 and probably more + addpredict /dev/dri + addpredict /dev/ati + addpredict /dev/nvidiactl + + default +} + +src_test() { + emake unitcheck + emake slowcheck +} + +src_install() { + emake DESTDIR="${D}" distro-pack-install -o build -o check + + # bug 593514 + if use gtk; then + dosym libreoffice/program/liblibreofficekitgtk.so \ + /usr/$(get_libdir)/liblibreofficekitgtk.so + fi + + # bash completion aliases + bashcomp_alias \ + libreoffice \ + unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice + + if use branding; then + insinto /usr/$(get_libdir)/${PN}/program + newins "${WORKDIR}/branding-sofficerc" sofficerc + dodir /etc/env.d + echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${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/metadata.xml b/app-office/libreoffice/metadata.xml new file mode 100644 index 0000000..45aa15b --- /dev/null +++ b/app-office/libreoffice/metadata.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>office@gentoo.org</email> + <name>Gentoo Office project</name> + </maintainer> + <longdescription>LibreOffice is the successor of OpenOffice.org. +This ebuild allows you to compile it yourself. Unfortunately this +compilation can take up to a day depending on the speed of your +computer. It will however make a snappier LibreOffice than the binary +version</longdescription> + <use> + <flag name="base">Enable full support for LibreOffice Base databases (involves additional bundled libs)</flag> + <flag name="clang">Use Clang compiler instead of GCC</flag> + <flag name="coinmp">Use <pkg>sci-libs/coinor-mp</pkg> as alternative solver</flag> + <flag name="googledrive">Enable support for remote files on Google Drive</flag> + <flag name="mariadb">Prefer mariadb connector over mysql connector</flag> + <flag name="odk">Build the Office Development Kit</flag> + <flag name="pdfimport">Enable PDF import via the Poppler library</flag> + <flag name="vulkan">Enable Vulkan usage via the skia library (clang recommended)</flag> + </use> +</pkgmetadata> |