commit: e3eb8c19366ad768293c078fd786d7f9c40ec050 Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> AuthorDate: Sat Jul 16 20:51:30 2022 +0000 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> CommitDate: Sat Jul 16 20:51:30 2022 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=e3eb8c19
Misc cleanup of packages now fixed in ::gentoo Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> app-office/libreoffice/Manifest | 25 - .../files/libreoffice-5.3.4.2-kioclient5.patch | 11 - .../files/libreoffice-6.1-nomancompress.patch | 29 - ...eoffice-6.1.4.2-disable-liborcus-unittest.patch | 13 - .../files/libreoffice-6.1.4.2-musl-stacksize.patch | 39 -- .../files/libreoffice-7.2.0.4-qt5detect.patch | 13 - .../libreoffice-7.2.2.2-makefile-gengal.patch | 90 --- .../files/libreoffice-7.2.5.2-linux-musl.patch | 74 --- .../libreoffice-7.2.5.2-musl-fix-execinfo.patch | 53 -- .../libreoffice-7.2.6.2-poppler-22.03.0.patch | 33 - .../libreoffice/libreoffice-7.2.5.2-r1.ebuild | 668 -------------------- .../libreoffice/libreoffice-7.2.6.2-r1.ebuild | 671 --------------------- app-office/libreoffice/metadata.xml | 23 - net-misc/spice-gtk/Manifest | 3 - net-misc/spice-gtk/files/README.gentoo | 14 - .../spice-gtk-0.37-adjust-to-window-scaling.patch | 132 ---- .../spice-gtk-0.39-fix-finding-pyparsing.patch | 13 - net-misc/spice-gtk/metadata.xml | 18 - net-misc/spice-gtk/spice-gtk-0.39-r2.ebuild | 132 ---- net-misc/spice-gtk/spice-gtk-0.40-r1.ebuild | 153 ----- 20 files changed, 2207 deletions(-) diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest deleted file mode 100644 index 8cdd7bef..00000000 --- a/app-office/libreoffice/Manifest +++ /dev/null @@ -1,25 +0,0 @@ -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.2.5.2.tar.xz 252977224 BLAKE2B c8221824ed4747ad7fd9534c6c3d612fa711f78b382587345c5a5604a263b7697fb03c77c1927343052ebcd0aa8db2d693208599137bc8884eeb1bf408951463 SHA512 a84682597e10fabb8c1605b785510fa5fe861f3056f61bd01513e1de6ebdb8a343d254af063cd977e4379348ad28d8a457989b3d42014f1c18d5d85626f6dfe8 -DIST libreoffice-7.2.6.2.tar.xz 252995284 BLAKE2B b807e666d39b4302b0a33f84f7e8797bc41ec9e1814bfe57f0e06c8bbbf3b8bf89a70a25caa65401f402a593acce04cb1118bd13bbd961d7feeac295511e36e4 SHA512 2b1a92d98595d4a40bf699ebf5ee3cbf4daeb765a8d37ae035f459f2a74c2ce27e53747307d9875aaec7d1d5a2693266ea81b7fe1281c33653c9fa4bbd727242 -DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f -DIST libreoffice-help-7.2.5.2.tar.xz 112080572 BLAKE2B 9c07cec6cd6c639335c38af65f3dccf331200422f670fa225e355117062f5ad2a8173c5f59ee63137aa480e8db307b0671e4a7a0ff503ea3a034e126e0464120 SHA512 70ffcb1a96637dabd9a658151d2b88a92dd8a89cd396609339ec5470b93fbc2ae589a434b4f09d22fc8ad515369a646dd8040c33e6a91977dd7158f57cd48e00 -DIST libreoffice-help-7.2.6.2.tar.xz 112079748 BLAKE2B f9d96d6d72e70f28f12dcf656cf8fd22bc8e563ec53c840cf7cd668e3de677ee73a3f3099e7c62c6034cd4d23915b9e7a94012340c6a7db7f8822e4c8c6d0887 SHA512 05f02eb1afaa90547ca388008e02c4a48c191984e77d4022adf02089f69a3b4792cdc065e160f59fbf2f5554b062ff0d6853b12aa9abb9b180dd7c4c855e4d8b -DIST skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz 10630696 BLAKE2B a3d42d08a0622de591d177184b6225cf62e3048d02d8f2012b6b02aae186b644c899c4e73b528b3528a4acec6cec07e3576dd6d97b130fedf3b2ec5b2ddf4ed7 SHA512 625ed461d85ce5c5c73ffd20bc3f2c9b5fe6ba557693b793b387ffb434d4f0d9056bd9befe6760c55e9e47f09c02373a49b8ac106162a40d940ea351e8c873c0 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 deleted file mode 100644 index a6e732f7..00000000 --- a/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index ea6eb8b8..00000000 --- a/app-office/libreoffice/files/libreoffice-6.1-nomancompress.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- 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-6.1.4.2-disable-liborcus-unittest.patch b/app-office/libreoffice/files/libreoffice-6.1.4.2-disable-liborcus-unittest.patch deleted file mode 100644 index afdca6bb..00000000 --- a/app-office/libreoffice/files/libreoffice-6.1.4.2-disable-liborcus-unittest.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/sc/qa/unit/subsequent_filters-test.cxx 2018-02-22 18:45:41.000000000 +0100 -+++ b/sc/qa/unit/subsequent_filters-test.cxx 2018-03-02 11:24:08.616015560 +0100 -@@ -2395,7 +2395,9 @@ - CPPUNIT_ASSERT_MESSAGE("Style Name1 : Doesn't have Attribute background, but it should have.", - pStyleSheet->GetItemSet().HasItem(ATTR_BACKGROUND, &pItem)); - const SvxBrushItem* pBackground = static_cast<const SvxBrushItem*>(pItem); -- CPPUNIT_ASSERT_EQUAL(Color(254, 255, 204), pBackground->GetColor()); -+ /* This test fails with liborcus >= 0.13.3 -+ * CPPUNIT_ASSERT_EQUAL(Color(254, 255, 204), pBackground->GetColor()); -+ */ - - CPPUNIT_ASSERT_MESSAGE("Style Name1 : Doesn't have Attribute border, but it should have.", - pStyleSheet->GetItemSet().HasItem(ATTR_BORDER, &pItem)); diff --git a/app-office/libreoffice/files/libreoffice-6.1.4.2-musl-stacksize.patch b/app-office/libreoffice/files/libreoffice-6.1.4.2-musl-stacksize.patch deleted file mode 100644 index 9968ccbd..00000000 --- a/app-office/libreoffice/files/libreoffice-6.1.4.2-musl-stacksize.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -Naur libreoffice-6.1.0.3/sal/osl/unx/thread.cxx libreoffice-6.1.0.3-patched/sal/osl/unx/thread.cxx ---- libreoffice-6.1.0.3/sal/osl/unx/thread.cxx 2018-08-02 22:54:54.000000000 +0300 -+++ libreoffice-6.1.0.3-patched/sal/osl/unx/thread.cxx 2018-09-05 18:21:38.552838233 +0300 -@@ -249,7 +249,7 @@ - short nFlags) - { - Thread_Impl* pImpl; --#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS) -+#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS) || (defined LINUX && !defined __GLIBC__) - pthread_attr_t attr; - size_t stacksize; - #endif -@@ -265,7 +265,7 @@ - - pthread_mutex_lock (&(pImpl->m_Lock)); - --#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS) -+#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS) || (defined LINUX && !defined __GLIBC__) - if (pthread_attr_init(&attr) != 0) - return nullptr; - -@@ -282,7 +282,7 @@ - - if ((nRet = pthread_create ( - &(pImpl->m_hThread), --#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS) -+#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS) || (defined LINUX && !defined __GLIBC__) - &attr, - #else - PTHREAD_ATTR_DEFAULT, -@@ -301,7 +301,7 @@ - return nullptr; - } - --#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS) -+#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS) || (defined LINUX && !defined __GLIBC__) - pthread_attr_destroy(&attr); - #endif - 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 deleted file mode 100644 index c905fabf..00000000 --- a/app-office/libreoffice/files/libreoffice-7.2.0.4-qt5detect.patch +++ /dev/null @@ -1,13 +0,0 @@ -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.2.2-makefile-gengal.patch b/app-office/libreoffice/files/libreoffice-7.2.2.2-makefile-gengal.patch deleted file mode 100644 index 5fd0179c..00000000 --- a/app-office/libreoffice/files/libreoffice-7.2.2.2-makefile-gengal.patch +++ /dev/null @@ -1,90 +0,0 @@ -https://github.com/LibreOffice/core/commit/0e7d4d99beda181f4e22725e4b8295d25489696f -https://bugs.gentoo.org/821265 - -From 0e7d4d99beda181f4e22725e4b8295d25489696f Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann <[email protected]> -Date: Sun, 22 Aug 2021 11:26:38 +0200 -Subject: [PATCH] gengal needs Library_localedata_en now - -Whatever caused that requirement, but a from-scratch build of e.g. -Gallery_backgrounds failed for me (with a follow-on SIGABRT after -"framework/source/services/desktop.cxx:176: Desktop::~Desktop(): Who forgot to -dispose this service?") because it failed to load -instdir/program/../program/liblocaledata_en.so at - -> #1 0x00007fffda0b9671 in i18npool::LocaleDataImpl::getFunctionSymbol(com::sun::star::lang::Locale const&, char const*) (this=0x159b630, rLocale=..., pFunction=0x7fffda136ed8 "getAllFormats0") at i18npool/source/localedata/localedata.cxx:1460 -> #2 0x00007fffda0b6a93 in i18npool::LocaleDataImpl::FormatSection::getFunc(i18npool::LocaleDataImpl&, com::sun::star::lang::Locale const&, char const*) (this=0x7fffffffc840, rLocaleData=..., rL=..., pName=0x7fffda136ed8 "getAllFormats0") at i18npool/source/localedata/localedata.cxx:857 -> #3 0x00007fffda0b6b5c in i18npool::LocaleDataImpl::getAllFormats(com::sun::star::lang::Locale const&) (this=0x159b630, rLocale=...) at i18npool/source/localedata/localedata.cxx:865 -> #4 0x00007fffda0d4815 in NumberFormatCodeMapper::getFormats(com::sun::star::lang::Locale const&) (this=0x1594fa0, rLocale=...) at i18npool/source/numberformatcode/numberformatcode.cxx:150 -> #5 0x00007fffda0d4155 in NumberFormatCodeMapper::getAllFormatCode(short, com::sun::star::lang::Locale const&) (this=0x1594fa0, formatUsage=8, rLocale=...) at i18npool/source/numberformatcode/numberformatcode.cxx:92 -> #6 0x00007ffff572a824 in LocaleDataWrapper::loadCurrencyFormats() (this=0x159b3f0) at unotools/source/i18n/localedatawrapper.cxx:544 -> #7 0x00007ffff572777e in LocaleDataWrapper::loadData() (this=0x159b3f0) at unotools/source/i18n/localedatawrapper.cxx:131 -> #8 0x00007ffff57271b4 in LocaleDataWrapper::LocaleDataWrapper(LanguageTag const&, std::__debug::vector<rtl::OUString, std::allocator<rtl::OUString> > const&) (this=0x159b3f0, rLanguageTag=..., rOverrideDateAcceptancePatterns=std::__debug::vector of length 0, capacity 0) at unotools/source/i18n/localedatawrapper.cxx:80 -> #9 0x00007ffff5766fd6 in SvtSysLocale_Impl::SvtSysLocale_Impl() (this=0x158a4e0) at unotools/source/misc/syslocale.cxx:67 -> #10 0x00007ffff5768ad7 in std::construct_at<SvtSysLocale_Impl>(SvtSysLocale_Impl*) (__location=0x158a4e0) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/stl_construct.h:97 -> #11 0x00007ffff5768b1c in std::allocator_traits<std::allocator<SvtSysLocale_Impl> >::construct<SvtSysLocale_Impl>(std::allocator<SvtSysLocale_Impl>&, SvtSysLocale_Impl*) (__a=..., __p=0x158a4e0) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/alloc_traits.h:514 -> #12 0x00007ffff57688c2 in std::_Sp_counted_ptr_inplace<SvtSysLocale_Impl, std::allocator<SvtSysLocale_Impl>, (__gnu_cxx::_Lock_policy)2>::_Sp_counted_ptr_inplace<>(std::allocator<SvtSysLocale_Impl>) (this=0x158a4d0, __a=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr_base.h:519 -> #13 0x00007ffff576860a in std::__shared_count<(__gnu_cxx::_Lock_policy)2>::__shared_count<SvtSysLocale_Impl, std::allocator<SvtSysLocale_Impl>>(SvtSysLocale_Impl*&, std::_Sp_alloc_shared_tag<std::allocator<SvtSysLocale_Impl> >) (this=0x7fffffffd0a8, __p=@0x7fffffffd0a0: 0x0, __a=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr_base.h:650 -> #14 0x00007ffff57684c6 in std::__shared_ptr<SvtSysLocale_Impl, (__gnu_cxx::_Lock_policy)2>::__shared_ptr<std::allocator<SvtSysLocale_Impl>>(std::_Sp_alloc_shared_tag<std::allocator<SvtSysLocale_Impl> >) (this=0x7fffffffd0a0, __tag=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr_base.h:1342 -> #15 0x00007ffff576838d in std::shared_ptr<SvtSysLocale_Impl>::shared_ptr<std::allocator<SvtSysLocale_Impl>>(std::_Sp_alloc_shared_tag<std::allocator<SvtSysLocale_Impl> >) (this=0x7fffffffd0a0, __tag=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr.h:409 -> #16 0x00007ffff5768164 in std::allocate_shared<SvtSysLocale_Impl, std::allocator<SvtSysLocale_Impl>>(std::allocator<SvtSysLocale_Impl> const&) (__a=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr.h:863 -> #17 0x00007ffff5767dfc in std::make_shared<SvtSysLocale_Impl>() () at ~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr.h:879 -> #18 0x00007ffff5767583 in SvtSysLocale::SvtSysLocale() (this=0x7fffffffd120) at unotools/source/misc/syslocale.cxx:122 -> #19 0x00007ffff015148f in FwkResId(TranslateId) (aId=...) at framework/source/fwe/classes/fwkresid.cxx:22 -> #20 0x00007ffff025f333 in framework::Desktop::constructorInit() (this=0x1588850) at framework/source/services/desktop.cxx:106 -> #21 0x00007ffff0265c1c in (anonymous namespace)::createDesktop(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) (context=...) at framework/source/services/desktop.cxx:1764 -> #22 0x00007ffff0265ce5 in framework::getDesktop(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) (context=...) at framework/source/services/desktop.cxx:1773 -> #23 0x00007ffff0265d9e in com_sun_star_comp_framework_Desktop_get_implementation(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) (context=0x522200) at framework/source/services/desktop.cxx:1782 -> #24 0x00007ffff5a5d864 in std::__invoke_impl<com::sun::star::uno::XInterface*, com::sun::star::uno::XInterface* (*&)(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&), com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&>(std::__invoke_other, com::sun::star::uno::XInterface* (*&)(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&), com::sun::star::uno::XComponentContext*&&, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) (__f=@0x54bb58: 0x7ffff0265d5f <com_sun_star_comp_framework_Desktop_get_implementation(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&)>) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/invoke.h:61 -> #25 0x00007ffff5a551f4 in std::__invoke_r<com::sun::star::uno::XInterface*, com::sun::star::uno::XInterface* (*&)(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&), com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&>(com::sun::star::uno::XInterface* (*&)(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&), com::sun::star::uno::XComponentContext*&&, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) (__fn=@0x54bb58: 0x7ffff0265d5f <com_sun_star_comp_framework_Desktop_get_implementation(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&)>) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/invoke.h:114 -> #26 0x00007ffff5a4d254 in std::_Function_handler<com::sun::star::uno::XInterface* (com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&), com::sun::star::uno::XInterface* (*)(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&)>::_M_invoke(std::_Any_data const&, com::sun::star::uno::XComponentContext*&&, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) (__functor=..., __args#0=@0x7fffffffd4f0: 0x522200, __args#1=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/std_function.h:291 -> #27 0x00007ffff5a3f913 in std::function<com::sun::star::uno::XInterface* (com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&)>::operator()(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) const (this=0x54bb58, __args#0=0x522200, __args#1=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/std_function.h:568 -> #28 0x00007ffff5a2a396 in cppuhelper::ServiceManager::Data::Implementation::doCreateInstance(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) (this=0x54baa0, context=...) at cppuhelper/source/servicemanager.cxx:704 -> #29 0x00007ffff5a2a12a in cppuhelper::ServiceManager::Data::Implementation::createInstance(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, bool) (this=0x54baa0, context=..., singletonRequest=false) at cppuhelper/source/servicemanager.cxx:672 -> #30 0x00007ffff5a2d02d in cppuhelper::ServiceManager::createInstanceWithContext(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) (this=0x523450, aServiceSpecifier=..., Context=...) at cppuhelper/source/servicemanager.cxx:1003 -> #31 0x00007ffff6cd9922 in com::sun::star::frame::Desktop::create(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) (the_context=...) at workdir/UnoApiHeadersTarget/offapi/normal/com/sun/star/frame/Desktop.hpp:38 -> #32 0x00007ffff6cd8c07 in SfxApplication::Initialize_Impl() (this=0x1588150) at sfx2/source/appl/appinit.cxx:182 -> #33 0x00007ffff6cb776a in SfxApplication::GetOrCreate() () at sfx2/source/appl/app.cxx:122 -> #34 0x0000000000405ecf in (anonymous namespace)::GalApp::Main() (this=0x4204e0 <vclmain::createApplication()::aGalApp>) at svx/source/gengal/gengal.cxx:254 -> #35 0x00007ffff2dd6777 in ImplSVMain() () at vcl/source/app/svmain.cxx:199 -> #36 0x00007ffff2dd6898 in SVMain() () at vcl/source/app/svmain.cxx:231 -> #37 0x0000000000410f1f in sal_main() () at vcl/source/salmain/salmain.cxx:34 -> #38 0x0000000000410efa in main(int, char**) (argc=10, argv=0x7fffffffded8) at vcl/source/salmain/salmain.cxx:29 - -This fix should remove the need for the cross-build--only fix -0e142fa01972ad28182ca54b855d0ecae0d5c83b "cross-toolset: gengal now needs -localedata_en", which it reverts. - -Change-Id: If71b7249c19619a83911c7624e3d99077decba31 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120837 -Tested-by: Jenkins -Reviewed-by: Stephan Bergmann <[email protected]> ---- - RepositoryExternal.mk | 1 + - solenv/gbuild/extensions/pre_BuildTools.mk | 1 - - 2 files changed, 1 insertion(+), 1 deletion(-) - -diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk -index 6e732c94793b2..15cfbfde3d4ac 100644 ---- a/RepositoryExternal.mk -+++ b/RepositoryExternal.mk -@@ -3875,6 +3875,7 @@ endef - define gb_Executable__register_gengal - $(call gb_Executable_add_runtime_dependencies,gengal,\ - $(call gb_Library_get_target_for_build,$(CPPU_ENV_FOR_BUILD)_uno) \ -+ $(call gb_Library_get_target_for_build,localedata_en) \ - $(if $(filter MACOSX,$(OS_FOR_BUILD)),$(call gb_Library_get_target_for_build,vclplug_osx)) \ - $(if $(filter WNT,$(OS_FOR_BUILD)),$(call gb_Library_get_target_for_build,vclplug_win)) \ - $(if $(filter host,$(gb_Side)),$(call gb_Package_get_target,postprocess_images)) \ -diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk b/solenv/gbuild/extensions/pre_BuildTools.mk -index e08906068d246..84e2ea533673f 100644 ---- a/solenv/gbuild/extensions/pre_BuildTools.mk -+++ b/solenv/gbuild/extensions/pre_BuildTools.mk -@@ -47,7 +47,6 @@ gb_BUILD_TOOLS = \ - $(foreach executable,$(gb_BUILD_TOOLS_executables),$(call gb_Executable_get_runtime_dependencies,$(executable))) \ - $(foreach executable,$(gb_BUILD_TOOLS_executables_extern),$(call gb_ExternalExecutable_get_dependencies,$(executable))) \ - $(INSTROOT)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) \ -- $(if $(WITH_GALLERY_BUILD),$(call gb_Library_get_target,localedata_en)) \ - - endif - diff --git a/app-office/libreoffice/files/libreoffice-7.2.5.2-linux-musl.patch b/app-office/libreoffice/files/libreoffice-7.2.5.2-linux-musl.patch deleted file mode 100644 index 02ae6dc5..00000000 --- a/app-office/libreoffice/files/libreoffice-7.2.5.2-linux-musl.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 9e10d040b12bd0aa5c4c95848763426cd9aaf089 Mon Sep 17 00:00:00 2001 -From: -Date: Thu, 3 Feb 2022 18:27:20 -0600 -Subject: [PATCH] check for musl - ---- - configure.ac | 23 ++++------------------- - 1 file changed, 4 insertions(+), 19 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 092fb04cc..ce4e408a6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -879,7 +879,7 @@ solaris*) - fi - ;; - --linux-gnu*|k*bsd*-gnu*) -+linux-gnu*|linux-musl*|k*bsd*-gnu*) - using_freetype_fontconfig=yes - using_x11=yes - build_skia=yes -@@ -4933,7 +4933,7 @@ kfreebsd*) - esac - ;; - --linux-gnu*) -+linux-gnu*|linux-musl*) - COM=GCC - OS=LINUX - RTL_OS=Linux -@@ -8593,7 +8593,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAINC"; then - test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" - ;; - -- linux-gnu*) -+ linux-gnu*|linux-musl*) - JAVAINC="-I$JAVA_HOME/include" - JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux" - test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" -@@ -11235,21 +11235,6 @@ AC_SUBST(SYSTEM_LIBNUMBERTEXT) - AC_SUBST(SYSTEM_LIBNUMBERTEXT_DATA) - AC_SUBST(LIBNUMBERTEXT_CFLAGS) - --dnl *************************************** --dnl testing libc version for Linux... --dnl *************************************** --if test "$_os" = "Linux"; then -- AC_MSG_CHECKING([whether libc is >= 2.1.1]) -- exec 6>/dev/null # no output -- AC_CHECK_LIB(c, gnu_get_libc_version, HAVE_LIBC=yes; export HAVE_LIBC) -- exec 6>&1 # output on again -- if test "$HAVE_LIBC"; then -- AC_MSG_RESULT([yes]) -- else -- AC_MSG_ERROR([no, upgrade libc]) -- fi --fi -- - dnl ========================================= - dnl Check for uuidgen - dnl ========================================= -@@ -14221,7 +14206,7 @@ else - - case "$host_os" in - -- aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*) -+ aix*|dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*) - if test "$ENABLE_JAVA" != ""; then - pathmunge "$JAVA_HOME/bin" "after" - fi --- -2.34.1 - diff --git a/app-office/libreoffice/files/libreoffice-7.2.5.2-musl-fix-execinfo.patch b/app-office/libreoffice/files/libreoffice-7.2.5.2-musl-fix-execinfo.patch deleted file mode 100644 index f94ff883..00000000 --- a/app-office/libreoffice/files/libreoffice-7.2.5.2-musl-fix-execinfo.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 1ceea1e405fd375e38b69f842324ed97913e09a0 Mon Sep 17 00:00:00 2001 -From: Jory Pratt <[email protected]> -Date: Thu, 3 Feb 2022 18:33:46 -0600 -Subject: [PATCH] musl fix execinfo - ---- - sal/osl/unx/backtrace.c | 2 +- - sal/osl/unx/backtrace.h | 2 +- - sal/osl/unx/signal.cxx | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c -index 26005f771..01215c648 100644 ---- a/sal/osl/unx/backtrace.c -+++ b/sal/osl/unx/backtrace.c -@@ -212,7 +212,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd ) - } - } - --#elif !defined LINUX && !defined MACOSX && !defined IOS -+#elif !defined (__GLIBC__) && !defined MACOSX && !defined IOS - - int backtrace( void **buffer, int max_frames ) - { -diff --git a/sal/osl/unx/backtrace.h b/sal/osl/unx/backtrace.h -index 5fafc1c90..408c12c69 100644 ---- a/sal/osl/unx/backtrace.h -+++ b/sal/osl/unx/backtrace.h -@@ -20,7 +20,7 @@ - #ifndef INCLUDED_SAL_OSL_UNX_BACKTRACE_H - #define INCLUDED_SAL_OSL_UNX_BACKTRACE_H - --#if defined (LINUX) -+#if defined (LINUX) && defined (__GLIBC__) - - #include <execinfo.h> - -diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx -index 79721def6..95c07bd20 100644 ---- a/sal/osl/unx/signal.cxx -+++ b/sal/osl/unx/signal.cxx -@@ -36,7 +36,7 @@ - - #endif /* MACOSX */ - --#ifdef LINUX -+#if defined(LINUX) && defined(__GLIBC__) - #include <execinfo.h> - #include <link.h> - #define INCLUDE_BACKTRACE --- -2.34.1 - 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 deleted file mode 100644 index be4a3999..00000000 --- a/app-office/libreoffice/files/libreoffice-7.2.6.2-poppler-22.03.0.patch +++ /dev/null @@ -1,33 +0,0 @@ -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/libreoffice-7.2.5.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.2.5.2-r1.ebuild deleted file mode 100644 index feaa5058..00000000 --- a/app-office/libreoffice/libreoffice-7.2.5.2-r1.ebuild +++ /dev/null @@ -1,668 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -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="${P}-patchset-01.tar.xz" - -[[ ${MY_PV} == *9999* ]] && inherit git-r3 -inherit autotools bash-completion-r1 check-reqs eapi8-dosym 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/~asturm/distfiles/${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-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.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 ~ppc64 x86" - -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/clucene-2.3.3.4-r2 - >=dev-cpp/libcmis-0.5.2 - dev-db/unixODBC - dev-lang/perl - >=dev-libs/boost-1.72.0:=[nls] - dev-libs/expat - dev-libs/hyphen - dev-libs/icu:= - dev-libs/libassuan - dev-libs/libgpg-error - dev-libs/liborcus:0/0.16 - 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/libpagemaker - >=media-libs/libpng-1.4:0= - >=media-libs/libvisio-0.1.0 - media-libs/libzmf - media-libs/zxing-cpp - >=net-libs/neon-0.31.1:= - net-misc/curl - sci-mathematics/lpsolve - sys-libs/zlib - virtual/jpeg:0 - 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.6 ) - mariadb? ( dev-db/mariadb-connector-c ) - !mariadb? ( dev-db/mysql-connector-c ) - pdfimport? ( app-text/poppler:=[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/1.5 - media-libs/glm - sys-devel/ucpp - x11-base/xorg-proto - x11-libs/libXt - x11-libs/libXtst - java? ( - dev-java/ant-core - || ( - dev-java/openjdk:11 - dev-java/openjdk-bin:11 - ) - ) - test? ( - app-crypt/gnupg - dev-util/cppunit - media-fonts/dejavu - media-fonts/liberation-fonts - ) -" -RDEPEND="${COMMON_DEPEND} - !app-office/libreoffice-bin - !app-office/libreoffice-bin-debug - media-fonts/liberation-fonts - || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) - java? ( || ( - dev-java/openjdk:11 - dev-java/openjdk-jre-bin:11 - >=virtual/jre-1.8 - ) ) - kde? ( kde-frameworks/breeze-icons:* ) -" -BDEPEND=" - dev-util/intltool - sys-devel/bison - sys-devel/flex - sys-devel/gettext - virtual/pkgconfig - clang? ( - || ( - ( sys-devel/clang:13 - sys-devel/llvm:13 - =sys-devel/lld-13* ) - ( sys-devel/clang:12 - sys-devel/llvm:12 - =sys-devel/lld-12* ) - ( sys-devel/clang:11 - sys-devel/llvm:11 - =sys-devel/lld-11* ) - ) - ) - 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.3 branch - "${FILESDIR}/${PN}-7.2.2.2-makefile-gengal.patch" - - # musl compatibility by AlpineLinux - "${FILESDIR}/${PN}-7.2.5.2-linux-musl.patch" - "${FILESDIR}/${PN}-7.2.5.2-musl-fix-execinfo.patch" - "${FILESDIR}/${PN}-6.1.4.2-disable-liborcus-unittest.patch" - "${FILESDIR}/${PN}-6.1.4.2-musl-stacksize.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() { - if use x86; then - elog "Unfortunately for packaging reasons on x86, various Java-based wizards," - elog "most notably Report Builder in LibreOffice Base, will not be available." - elog "See also: https://bugs.gentoo.org/785640"; - else - 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." - fi - - [[ ${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 [email protected] 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 - 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 - --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-ucpp - --with-tls=nss - --with-vendor="Gentoo Foundation" - --with-webdav - --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}" - ) - if has_version "dev-java/openjdk:11"; then - myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" ) - elif has_version "dev-java/openjdk-bin:11"; then - myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" ) - fi - - 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 js.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 - - local target - use test && target="build" || target="build-nocheck" - - # this is not a proper make script - make ${target} || die -} - -src_test() { - make unitcheck || die - make slowcheck || die -} - -src_install() { - # This is not Makefile so no buildserver - 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 - dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py} - while IFS="" read -d $'\0' -r pyc; do - pyc=${pyc//*\/} - dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc} - done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0) - done -} - -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-7.2.6.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild deleted file mode 100644 index d14d190b..00000000 --- a/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild +++ /dev/null @@ -1,671 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -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="${P}-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/~asturm/distfiles/${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-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.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 ~ppc64 ~x86" - -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/clucene-2.3.3.4-r2 - >=dev-cpp/libcmis-0.5.2 - dev-db/unixODBC - dev-lang/perl - >=dev-libs/boost-1.72.0:=[nls] - dev-libs/expat - dev-libs/hyphen - dev-libs/icu:= - dev-libs/libassuan - dev-libs/libgpg-error - dev-libs/liborcus:0/0.16 - 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/libpagemaker - >=media-libs/libpng-1.4:0= - >=media-libs/libvisio-0.1.0 - media-libs/libzmf - media-libs/zxing-cpp - >=net-libs/neon-0.31.1:= - net-misc/curl - sci-mathematics/lpsolve - sys-libs/zlib - virtual/jpeg:0 - 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:=[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/1.5 - media-libs/glm - sys-devel/ucpp - x11-base/xorg-proto - x11-libs/libXt - x11-libs/libXtst - java? ( - dev-java/ant-core - || ( - dev-java/openjdk:11 - dev-java/openjdk-bin:11 - ) - ) - test? ( - app-crypt/gnupg - dev-util/cppunit - media-fonts/dejavu - media-fonts/liberation-fonts - ) -" -RDEPEND="${COMMON_DEPEND} - !app-office/libreoffice-bin - !app-office/libreoffice-bin-debug - media-fonts/liberation-fonts - || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) - java? ( || ( - dev-java/openjdk:11 - dev-java/openjdk-jre-bin:11 - >=virtual/jre-1.8 - ) ) - kde? ( kde-frameworks/breeze-icons:* ) -" -BDEPEND=" - dev-util/intltool - sys-devel/bison - sys-devel/flex - sys-devel/gettext - virtual/pkgconfig - clang? ( - || ( - ( sys-devel/clang:13 - sys-devel/llvm:13 - =sys-devel/lld-13* ) - ( sys-devel/clang:12 - sys-devel/llvm:12 - =sys-devel/lld-12* ) - ( sys-devel/clang:11 - sys-devel/llvm:11 - =sys-devel/lld-11* ) - ) - ) - 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" - - # TODO upstream - "${FILESDIR}/${P}-poppler-22.03.0.patch" # by Archlinux - - # 7.3 branch - "${FILESDIR}/${PN}-7.2.2.2-makefile-gengal.patch" - - # musl compatibility by AlpineLinux - "${FILESDIR}/${PN}-7.2.5.2-linux-musl.patch" - "${FILESDIR}/${PN}-7.2.5.2-musl-fix-execinfo.patch" - "${FILESDIR}/${PN}-6.1.4.2-disable-liborcus-unittest.patch" - "${FILESDIR}/${PN}-6.1.4.2-musl-stacksize.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() { - if use x86; then - elog "Unfortunately for packaging reasons on x86, various Java-based wizards," - elog "most notably Report Builder in LibreOffice Base, will not be available." - elog "See also: https://bugs.gentoo.org/785640"; - else - 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." - fi - - [[ ${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 [email protected] 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 - 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 - --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-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}" - ) - if has_version "dev-java/openjdk:11"; then - myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" ) - elif has_version "dev-java/openjdk-bin:11"; then - myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" ) - fi - - 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 - - local target - use test && target="build" || target="build-nocheck" - - # this is not a proper make script - make ${target} || die -} - -src_test() { - make unitcheck || die - make slowcheck || die -} - -src_install() { - # This is not Makefile so no buildserver - 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 -} - -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 deleted file mode 100644 index 4ac97430..00000000 --- a/app-office/libreoffice/metadata.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</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 sci-libs/coinor-mp 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> diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest deleted file mode 100644 index d4a02b6d..00000000 --- a/net-misc/spice-gtk/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST spice-gtk-0.39.tar.xz 845528 BLAKE2B c886c4c9f0e51d7f2bf6dbfe574f1a2bcab249f863cb7da1f009410572cdaa7a35ef98fc370a7e74f7e490ad3bfe8ffa832601f8bb0b0894b90ec1de76495ce9 SHA512 ff0f3ca6b10a2c415f2fa8d61464c5710aaa2a46c2c83909f146fa45f01151e756d9c3d79cb162dd3d0c1279b6ef55a67fc5c1266af2cb5b46ac1eaa0254c8d2 -DIST spice-gtk-0.40-meson-0.63.patch.xz 5932 BLAKE2B 5188e46236024575543125226404a24490faf37e9b764e8b8e2935620c6a908f6ca93f35c2a414306bb3c6646c0e47b2fd12ced83a7829ad8c118a1188b44ed8 SHA512 7b4ea4cf48b1e95bbc81c7eaa54b135333a8dba8167959e8baa7b50398d6542f2ac3d98fdb493995abb47b2a6bfb2ac75c393dda795cf69b7335ca6e3b1ddb70 -DIST spice-gtk-0.40.tar.xz 848688 BLAKE2B 1046361ca40037bca826759bd7dc86f522640d39c08b1579f8e25bc2a2510665034445f7421d4de0485df9ef868e19779000c643035842f18e16555e3a1936b3 SHA512 b6db8b56c5c36158d97b3f7690d18883c4d6076e4ed1de1763fc704f9a2397b60d6170b70882d7d0a977b32be334756b7a27d66849f53e4d3b82abb8a54a0892 diff --git a/net-misc/spice-gtk/files/README.gentoo b/net-misc/spice-gtk/files/README.gentoo deleted file mode 100644 index e18b6d8e..00000000 --- a/net-misc/spice-gtk/files/README.gentoo +++ /dev/null @@ -1,14 +0,0 @@ - -If you choose to enable the video streaming support of gstreamer, -please try to install addtional gst-plugins which matching the video codecs - -One the client side: - mjpeg,x264 media-plugins/gst-plugins-libav:1.0 - vpx media-plugins/gst-plugins-vpx:1.0 - -One the server side (which app-emulation/qemu running), you should also install -additional gstreamer plugins for the app-emulation/spice package: - mjpeg media-plugins/gst-plugins-libav:1.0 - vpx media-plugins/gst-plugins-vpx:1.0 - x264 media-plugins/gst-plugins-x264:1.0 - diff --git a/net-misc/spice-gtk/files/spice-gtk-0.37-adjust-to-window-scaling.patch b/net-misc/spice-gtk/files/spice-gtk-0.37-adjust-to-window-scaling.patch deleted file mode 100644 index 504cb7c4..00000000 --- a/net-misc/spice-gtk/files/spice-gtk-0.37-adjust-to-window-scaling.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 262c84081fbd3cfc3d92e6ae9a60a780549d6c2f Mon Sep 17 00:00:00 2001 -From: Snir Sheriber <[email protected]> -Date: Thu, 28 Feb 2019 11:44:34 +0200 -Subject: [PATCH] Adjust to window scaling - -When GDK_SCALE is != 1 and egl is used, the image presented does not -fit to the window (scale of 2 is often used with hidpi monitors). -Usually this is not a problem since all components are adjusted by -gdk/gtk but with egl, pixel-based data is not being scaled. In this -case window's scale value can be used in order to determine whether -to use a pixel resource with higher resolution data. - -In order to reproduce the problem set spice with virgl/Intel-vGPU -and run spice-gtk with GDK_SCALE=2 - -This issue was also reported at freedesktop gitlab repo: -https://gitlab.freedesktop.org/spice/spice-gtk/issues/99 - -Signed-off-by: Snir Sheriber <[email protected]> -Acked-by: Victor Toso <[email protected]> ---- - src/spice-widget-egl.c | 7 ++++--- - src/spice-widget.c | 27 +++++++++++++++++++-------- - 2 files changed, 23 insertions(+), 11 deletions(-) - -diff --git a/src/spice-widget-egl.c b/src/spice-widget-egl.c -index 43fccd7..7bae4e5 100644 ---- a/src/spice-widget-egl.c -+++ b/src/spice-widget-egl.c -@@ -360,9 +360,9 @@ gboolean spice_egl_realize_display(SpiceDisplay *display, GdkWindow *win, GError - DISPLAY_DEBUG(display, "egl realize"); - if (!spice_widget_init_egl_win(display, win, err)) - return FALSE; -- -- spice_egl_resize_display(display, gdk_window_get_width(win), -- gdk_window_get_height(win)); -+ gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display)); -+ spice_egl_resize_display(display, gdk_window_get_width(win) * scale_factor, -+ gdk_window_get_height(win) * scale_factor); - - return TRUE; - } -@@ -426,6 +426,7 @@ void spice_egl_unrealize_display(SpiceDisplay *display) - #endif - } - -+/* w and h should be adjusted to gdk scaling */ - G_GNUC_INTERNAL - void spice_egl_resize_display(SpiceDisplay *display, int w, int h) - { -diff --git a/src/spice-widget.c b/src/spice-widget.c -index 1f2a154..a9ba1f1 100644 ---- a/src/spice-widget.c -+++ b/src/spice-widget.c -@@ -1382,7 +1382,8 @@ static void set_egl_enabled(SpiceDisplay *display, bool enabled) - } - - if (enabled && d->egl.context_ready) { -- spice_egl_resize_display(display, d->ww, d->wh); -+ gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display)); -+ spice_egl_resize_display(display, d->ww * scale_factor, d->wh * scale_factor); - } - - d->egl.enabled = enabled; -@@ -1978,11 +1979,14 @@ static void transform_input(SpiceDisplay *display, - SpiceDisplayPrivate *d = display->priv; - int display_x, display_y, display_w, display_h; - double is; -+ gint scale_factor = 1; - - spice_display_get_scaling(display, NULL, - &display_x, &display_y, - &display_w, &display_h); -- -+ if (egl_enabled(d)) { -+ scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display)); -+ } - /* For input we need a different scaling factor in order to - be able to reach the full width of a display. For instance, consider - a display of 100 pixels showing in a window 10 pixels wide. The normal -@@ -1998,7 +2002,7 @@ static void transform_input(SpiceDisplay *display, - coordinates in the inverse direction (window -> display) as the fb size - (display -> window). - */ -- is = (double)(d->area.width-1) / (double)(display_w-1); -+ is = ((double)(d->area.width-1) / (double)(display_w-1)) * scale_factor; - - window_x -= display_x; - window_y -= display_y; -@@ -2183,8 +2187,10 @@ static void size_allocate(GtkWidget *widget, GtkAllocation *conf, gpointer data) - d->wh = conf->height; - recalc_geometry(widget); - #if HAVE_EGL -- if (egl_enabled(d)) -- spice_egl_resize_display(display, conf->width, conf->height); -+ if (egl_enabled(d)) { -+ gint scale_factor = gtk_widget_get_scale_factor(widget); -+ spice_egl_resize_display(display, conf->width * scale_factor, conf->height * scale_factor); -+ } - #endif - } - -@@ -2942,10 +2948,14 @@ void spice_display_get_scaling(SpiceDisplay *display, - int ww, wh; - int x, y, w, h; - double s; -+ gint scale_factor = 1; - - if (gtk_widget_get_realized (GTK_WIDGET(display))) { -- ww = gtk_widget_get_allocated_width(GTK_WIDGET(display)); -- wh = gtk_widget_get_allocated_height(GTK_WIDGET(display)); -+ if (egl_enabled(d)) { -+ scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display)); -+ } -+ ww = gtk_widget_get_allocated_width(GTK_WIDGET(display)) * scale_factor; -+ wh = gtk_widget_get_allocated_height(GTK_WIDGET(display)) * scale_factor; - } else { - ww = fbw; - wh = fbh; -@@ -3091,7 +3101,8 @@ void spice_display_widget_gl_scanout(SpiceDisplay *display) - g_clear_error(&err); - } - -- spice_egl_resize_display(display, d->ww, d->wh); -+ gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display)); -+ spice_egl_resize_display(display, d->ww * scale_factor, d->wh * scale_factor); - } - #endif - --- -2.21.0 - diff --git a/net-misc/spice-gtk/files/spice-gtk-0.39-fix-finding-pyparsing.patch b/net-misc/spice-gtk/files/spice-gtk-0.39-fix-finding-pyparsing.patch deleted file mode 100644 index 9a3cdd09..00000000 --- a/net-misc/spice-gtk/files/spice-gtk-0.39-fix-finding-pyparsing.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://gitlab.freedesktop.org/spice/spice-common/-/issues/5 -https://bugs.gentoo.org/820074 ---- a/subprojects/spice-common/meson.build -+++ b/subprojects/spice-common/meson.build -@@ -132,7 +132,7 @@ if spice_common_generate_client_code or spice_common_generate_server_code - if get_option('python-checks') - foreach module : ['six', 'pyparsing'] - message('Checking for python module @0@'.format(module)) -- cmd = run_command(python, '-m', module) -+ cmd = run_command(python, '-c', 'import @0@'.format(module)) - if cmd.returncode() != 0 - error('Python module @0@ not found'.format(module)) - endif diff --git a/net-misc/spice-gtk/metadata.xml b/net-misc/spice-gtk/metadata.xml deleted file mode 100644 index 8ad630bb..00000000 --- a/net-misc/spice-gtk/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Virtualization Project</name> - </maintainer> - <use> - <flag name="gtk3">Build the spice client (spicy), requires <pkg>x11-libs/gtk+</pkg>:3</flag> - <flag name="policykit">Enable <pkg>sys-auth/polkit</pkg> support for the - usbredir acl helper</flag> - <flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to redirect USB - devices to another machine over TCP</flag> - <flag name="mjpeg">Enable builtin mjpeg video decoder</flag> - <flag name="webdav">Support for folder-sharing between guest and client - using <pkg>net-libs/phodav</pkg></flag> - </use> -</pkgmetadata> diff --git a/net-misc/spice-gtk/spice-gtk-0.39-r2.ebuild b/net-misc/spice-gtk/spice-gtk-0.39-r2.ebuild deleted file mode 100644 index 6dea41b3..00000000 --- a/net-misc/spice-gtk/spice-gtk-0.39-r2.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -VALA_MIN_API_VERSION="0.14" -VALA_USE_DEPEND="vapigen" - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit desktop meson python-any-r1 readme.gentoo-r1 vala xdg-utils - -DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI" -HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"; - -LICENSE="LGPL-2.1" -SLOT="0" -SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz"; -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="+gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala wayland webdav" - -# TODO: -# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h -# * use external pnp.ids as soon as that means not pulling in gnome-desktop -RDEPEND=" - >=dev-libs/glib-2.46:2 - dev-libs/json-glib:0= - media-libs/gst-plugins-base:1.0 - media-libs/gst-plugins-good:1.0 - media-libs/gstreamer:1.0[introspection?] - media-libs/opus - sys-libs/zlib - virtual/jpeg:0= - >=x11-libs/cairo-1.2 - >=x11-libs/pixman-0.17.7 - gtk3? ( x11-libs/gtk+:3[introspection?] ) - introspection? ( dev-libs/gobject-introspection ) - dev-libs/openssl:0= - lz4? ( app-arch/lz4 ) - sasl? ( dev-libs/cyrus-sasl ) - smartcard? ( app-emulation/qemu[smartcard] ) - usbredir? ( - sys-apps/hwdata - >=sys-apps/usbredir-0.4.2 - virtual/libusb:1 - policykit? ( - sys-apps/acl - >=sys-auth/polkit-0.110-r1 - ) - ) - webdav? ( - net-libs/phodav:2.0 - >=net-libs/libsoup-2.49.91:2.4 ) -" -# TODO: spice-gtk has an automagic dependency on x11-libs/libva without a -# configure knob. The package is relatively lightweight so we just depend -# on it unconditionally for now. It would be cleaner to transform this into -# a USE="vaapi" conditional and patch the buildsystem... -RDEPEND="${RDEPEND} - amd64? ( x11-libs/libva:= ) - arm64? ( x11-libs/libva:= ) - x86? ( x11-libs/libva:= ) -" -DEPEND="${RDEPEND} - >=app-emulation/spice-protocol-0.14.3 - dev-perl/Text-CSV - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.14 - >=dev-util/intltool-0.40.0 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -BDEPEND=" - $(python_gen_any_dep ' - dev-python/six[${PYTHON_USEDEP}] - dev-python/pyparsing[${PYTHON_USEDEP}] - ') -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.39-fix-finding-pyparsing.patch -) - -python_check_deps() { - has_version -b "dev-python/six[${PYTHON_USEDEP}]" && - has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]" -} - -src_prepare() { - default - use vala && vala_src_prepare -} - -src_configure() { - local emesonargs=( - $(meson_feature gtk3 gtk) - $(meson_feature introspection) - $(meson_use mjpeg builtin-mjpeg) - $(meson_feature policykit polkit) - $(meson_feature lz4) - $(meson_feature sasl) - $(meson_feature smartcard) - $(meson_feature usbredir) - $(meson_feature vala vapi) - $(meson_feature webdav) - $(meson_feature wayland wayland-protocols) - ) - - if use elibc_musl; then - emesonargs+=( - -Dcoroutine=gthread - ) - fi - - if use usbredir; then - emesonargs+=( - -Dusb-acl-helper-dir=/usr/libexec - -Dusb-ids-path="${EPREFIX}/usr/share/hwdata/usb.ids" - ) - fi - - meson_src_configure -} - -src_install() { - meson_src_install - - make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;" - readme.gentoo_create_doc -} diff --git a/net-misc/spice-gtk/spice-gtk-0.40-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.40-r1.ebuild deleted file mode 100644 index e5c997ef..00000000 --- a/net-misc/spice-gtk/spice-gtk-0.40-r1.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VALA_MIN_API_VERSION="0.14" -VALA_USE_DEPEND="vapigen" - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg - -DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI" -HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"; -if [[ ${PV} == *9999* ]] ; then - EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git"; - inherit git-r3 - - SPICE_PROTOCOL_VER=9999 -else - SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz"; - SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-meson-0.63.patch.xz"; - KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86" - - SPICE_PROTOCOL_VER=0.14.3 -fi - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="+gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala wayland webdav" - -# TODO: -# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h -# * use external pnp.ids as soon as that means not pulling in gnome-desktop -RDEPEND=" - >=dev-libs/glib-2.46:2 - dev-libs/json-glib:0= - media-libs/gst-plugins-base:1.0 - media-libs/gst-plugins-good:1.0 - media-libs/gstreamer:1.0[introspection?] - media-libs/opus - media-libs/libjpeg-turbo:= - sys-libs/zlib - >=x11-libs/cairo-1.2 - >=x11-libs/pixman-0.17.7 - x11-libs/libX11 - gtk3? ( x11-libs/gtk+:3[introspection?] ) - introspection? ( dev-libs/gobject-introspection ) - dev-libs/openssl:= - lz4? ( app-arch/lz4 ) - sasl? ( dev-libs/cyrus-sasl ) - smartcard? ( app-emulation/qemu[smartcard] ) - usbredir? ( - sys-apps/hwdata - >=sys-apps/usbredir-0.4.2 - virtual/libusb:1 - policykit? ( - sys-apps/acl - >=sys-auth/polkit-0.110-r1 - ) - ) - webdav? ( - net-libs/phodav:2.0 - >=net-libs/libsoup-2.49.91:2.4 - ) -" -# TODO: spice-gtk has an automagic dependency on x11-libs/libva without a -# configure knob. The package is relatively lightweight so we just depend -# on it unconditionally for now. It would be cleaner to transform this into -# a USE="vaapi" conditional and patch the buildsystem... -RDEPEND="${RDEPEND} - amd64? ( x11-libs/libva:= ) - arm64? ( x11-libs/libva:= ) - x86? ( x11-libs/libva:= ) -" -DEPEND="${RDEPEND} - >=app-emulation/spice-protocol-${SPICE_PROTOCOL_VER}" -BDEPEND=" - dev-perl/Text-CSV - dev-util/glib-utils - >=sys-devel/gettext-0.17 - virtual/pkgconfig - vala? ( $(vala_depend) ) - $(python_gen_any_dep ' - dev-python/six[${PYTHON_USEDEP}] - dev-python/pyparsing[${PYTHON_USEDEP}] - ') -" - -PATCHES=( - "${WORKDIR}"/${P}-meson-0.63.patch -) - -python_check_deps() { - python_has_version "dev-python/six[${PYTHON_USEDEP}]" && - python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]" -} - -src_prepare() { - default - - use vala && vala_setup -} - -src_configure() { - local emesonargs=( - $(meson_feature gtk3 gtk) - $(meson_feature introspection) - $(meson_use mjpeg builtin-mjpeg) - $(meson_feature policykit polkit) - $(meson_feature lz4) - $(meson_feature sasl) - $(meson_feature smartcard) - $(meson_feature usbredir) - $(meson_feature vala vapi) - $(meson_feature webdav) - $(meson_feature wayland wayland-protocols) - ) - - if use elibc_musl; then - emesonargs+=( - -Dcoroutine=gthread - ) - fi - - if use usbredir; then - emesonargs+=( - -Dusb-acl-helper-dir=/usr/libexec - -Dusb-ids-path="${EPREFIX}"/usr/share/hwdata/usb.ids - ) - fi - - meson_src_configure -} - -src_install() { - meson_src_install - - if use usbredir && use policykit; then - # bug #775554 (and bug #851657) - fowners root:root /usr/libexec/spice-client-glib-usb-acl-helper - fperms 4755 /usr/libexec/spice-client-glib-usb-acl-helper - fi - - make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;" - readme.gentoo_create_doc -} - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "Sound support (via pulseaudio)" media-plugins/gst-plugins-pulse -}
