diff options
Diffstat (limited to 'app-office/libreoffice')
-rw-r--r-- | app-office/libreoffice/Manifest | 14 | ||||
-rw-r--r-- | app-office/libreoffice/files/libreoffice-6.4.3.2-boost-1.73.patch | 118 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-6.3.5.2.ebuild | 558 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-6.4.3.2.ebuild | 5 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-6.4.4.2.ebuild (renamed from app-office/libreoffice/libreoffice-6.3.9999.ebuild) | 50 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-6.4.9999.ebuild | 5 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-9999.ebuild | 5 |
7 files changed, 157 insertions, 598 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index cce54ec601a3..8bb4fb1ee813 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -4,6 +4,7 @@ AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba343 AUX libreoffice-6.3.3.2-mysql-connector-c-8.patch 1707 BLAKE2B b8fe46888d287384d72819ac38735642bee66885e04d81c0b18124e2fb5c4fdf486368920578d1d44e268d870d3280ecb081d5d65721cb78762ca02ee52e5b6e SHA512 b4a6b2e0e33e4521079b58d522019997337f82d24826fb12aded275ae01985fd286ab4f0bf5f0685cdf1f92ed17ed545b715181b11e7a8b580e7ba0578b2903c AUX libreoffice-6.3.4.2-poppler-0.83.patch 2703 BLAKE2B 6936c91d4b5d8cab3aa17b81410b9cda759f83d034a4ffb0bd1facb890458361d8e0c445d9371448390526d9f1dd850b331436770f86f0182c621f1b22015d2a SHA512 ca572090508577fa01fff00a0b9e5372a11f7876cfdd5c0537c63e89f98c7171c854275ab059657b99a8cec89c3edd7bf22f3a46f375a81c44d207596cc91186 AUX libreoffice-6.4.2.2-poppler-0.86.patch 777 BLAKE2B 1e798ef4a66dd872963e3436e6b38d0a1741a1ddc4f3615f70d322d1ec506a66ac1d9306af95c7cd0b8b40d8347384f74928ece93a4484a8c36ce96b14977531 SHA512 dc34c2c86661760975ade1777d46899e05436819f82ada97f2ff9feb8a80a67d881c90c8157f3e3fd0850cdd5eb12c0000dc8670943d85d4dd19e0cfa772f4bd +AUX libreoffice-6.4.3.2-boost-1.73.patch 4356 BLAKE2B 3fc87602e75c612d03cd657ec82598bd11238bb97acac2f070ee11758c229d4e481b76125206fbdc5d8966ae3f5f9586798f73136b87f2556bb9c859642eca94 SHA512 927a3ee94ca1e9eae34768b688b980ec937abccbab4d5b12409b0c459c92a7c666d4ffbb113b9173c1e29ced1cbd67df12335acca62e8377278d8b53ed89380e DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a @@ -12,17 +13,16 @@ DIST QR-Code-generator-1.4.0.tar.gz 146339 BLAKE2B b2cb329877426861e0245747ac1e8 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48dff6df5c857a6bd0510a92aa6d9b9660ad63b2344d5195fef072e526f8d7900791b15442923b63196dda3f SHA512 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85 DIST libreoffice-6.3.4.2.tar.xz 225632492 BLAKE2B 587fe7e6298ded60fa08963f572733eb8e387c00b428201bb6f1de7eddcf9d9ee97438231ed3f961bd22628bde0fd9dfeacb63febdc566cde781bcebb9c9a71d SHA512 2ed687ae805da36635419729066a2924f1e38a6b0f8d2692c42b366450a261012adfcd8a5d7915d9cfd292d07519fc32c596cdb56d7be6b12a49618b18d6f3d2 -DIST libreoffice-6.3.5.2.tar.xz 226222804 BLAKE2B f4b996f8eedf58f7e2ec1d1d796aecf1cc35f394cc5800b1e15db60534096a91e329f9744c8582dae85a12fb6c849be8cceff8998b45074ecc9535f7afce542c SHA512 041ee00e347f6ef229a97b56d9ceee6c0fa80a56436cc2dce909878d08d617d316731a7a21cdc4b6d5ef800f3d00d3ee67c69f770912028261f1552e79899a1a DIST libreoffice-6.4.3.2.tar.xz 230409812 BLAKE2B f9cdad1540c45525bd70596dc3033e3466fcdf3d96547222b936141e49ff6d45581ca59d0e42c4bb79fcb63586d748ccafae712369e024105235e2a9b69be7ce SHA512 ee11c704fa7184ffe371aa36c835c4c7fb06ef03d08fa0a5a9e647e80610db275e091d1ac79c1fe11af0c7f14dd72c821da9e7e6ba59573fc88cec79f84c873a +DIST libreoffice-6.4.4.2.tar.xz 231325236 BLAKE2B 25e1c765cb0ff9c195ca46a9fe857eef22ab6319da6b069e2c5c093a8f13eac2e1c5efa31fbacd4e3acbdc07e75745ff5c62c180cb61141319422720405a4638 SHA512 8e2b6a2d34fbc182ce4ec0b6d6bfb30665ff5cee0a27a22551c71d4eddf63b812d676ea8dea9a2e4bb028a2365b5e23908679efbe4696032e1abeedecb85b8d3 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f DIST libreoffice-help-6.3.4.2.tar.xz 13191636 BLAKE2B c1696efa0ec9fef9dbcc0c0388de8a384484af1453d200e08820ba910cdcb65638b189566a19868281fd1777213812fde06adb07c1a662302eea1d0a791ff5a0 SHA512 8c74c82c7d73adb1523300d1f7500769f5a623fdba60b440a63c122cbfeb631a6a34ecbcb115b0154a6957be1918306f7d0c1f465030f8e8cfd5c9a1acad17c9 -DIST libreoffice-help-6.3.5.2.tar.xz 13192732 BLAKE2B 79e869d8d2bb91243e9fe2ba279bfcd4f3b759904fdd2efbeb1add773cb732621a41841c4064ad63ad9713a53e626c50bfcc1b3d9137ddb4fe73fca39f710bb9 SHA512 aec83b210cc596131aa5bcb37012a98cc42c365274c4f80e8e87595f4f50d8f36588256616738ba3c2c9a8a61d03ed5e6c33a4b588561c5084cd008c5dbe787a DIST libreoffice-help-6.4.3.2.tar.xz 88297704 BLAKE2B bbd1af159c8b8db1909335f37095812ec3ce81d73644a30a85f3e37daeabeb9a158451b8e586f24d4b7544c8cd0948eeb20ede464384c3277d196f33322e63fb SHA512 9f8c1bcde27d153389d124af1393d0939262c85a1624f0b475a5515b5737612cb607d04742a069534771eee51ba98896926804ec7001d6bc2110dccdd6e7615a +DIST libreoffice-help-6.4.4.2.tar.xz 88296340 BLAKE2B 73ef558b830e0e2899eb72727e0eb81327807ff2d474c8d956700a09bcadc73cbff26688063f91d3a496afa55ab9a7d4847d84334b89fe4fafe17fb445fbb33d SHA512 7084428e63a458c4e35c135b16dd980fa98695be0ba974cac656a7ef6cb15b059a082891c3f74b72a62f92549afefe46c14ab30b5491fd9e3fea6d5923720b3d DIST skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz 8218672 BLAKE2B cfeb805d82ce1f5dd70c7365983fa8107d5ccda9409b2654c032115cdf8a1c32fa0451162b0cceec3dcc0054e3d0d0e13583ea93843b0d0a6eb948cc31c15ce0 SHA512 1018fc1cc8a7edc15745cc20791f9a22e5b318018ba619d6cb5b6995d3e81ab93c910bb3a42734872d3be54893c2ce7db507b2c61088660b2ce6630ff9b36ebb EBUILD libreoffice-6.3.4.2-r1.ebuild 16002 BLAKE2B 0a8d8f51f5e5adce47608c1610e41661961ccd7611a610e036bc05aeab9af31bebac0ddc0818f2ee03dea0829a66e2d9b5c1eb5608aed45fdad47f60962e1168 SHA512 1e338f01b7b7f1a62e01375af679fe3e0c09401bf2c8549d55c72c6227bf475433534048d7a47cbb2e66577212c7afdc4d9dfb313fc2e5fcdb0c07a65a1a4464 -EBUILD libreoffice-6.3.5.2.ebuild 15965 BLAKE2B cbcd130588a323d4a3c66f5deb7f791cbc2e4bc0b9ab28cf1ccbac9cc0331508cad10f996704ec524b903d3402a312ac9b20d6b77c3c11768e42b9e6a5b078e5 SHA512 58157f7f0bdc8874d3943279ce0f4b1a1706c3d5a33f5e60e899a3f17afd9548a651d0d3ca618051fbab5fbcd16d610047f5c20794fbcc4e5582a6a1f5d1edb2 -EBUILD libreoffice-6.3.9999.ebuild 15962 BLAKE2B f57424a4140936f4cd1d1eb53a30d1763c306b702aadfe35cf72f0af5643fa763ad6be4a9c5db126d04101501de744cd1bc33698a17608f9cbfddc6a57c574d2 SHA512 c26434db9e8d83e4b7d6a872849e8ab96b6b772642dc6ba65edf8f08ffc93dbfbb8edd0856cacdf2a098412eb284a81ec3120cbb85222146ed0b06bdebb6c23e -EBUILD libreoffice-6.4.3.2.ebuild 15710 BLAKE2B 43b545920104bbb9f807b2dcae80ec42a1d193ea8e6e4f53dd93d3ab7a659fe42772f1393bbdcc9480f5c5fdafa5aed6589d150bc9ecfe42c876bf63963be059 SHA512 be8dc91395d7ca675c3a9ca802a2d0c6ad85e55f6b872d7b8eb531106ccf87ec8f38b12e73a6db4e8249b3036a236a0a950e95f0c260137855f676930a4e371a -EBUILD libreoffice-6.4.9999.ebuild 15598 BLAKE2B 1a411c3bad01eaa27306894aee870b397366fc57f31323eb3a42d4ce7c5d14d99f70926d2dca3d978664163e734a70620600f4597335bf3fb7cdee2a9d7b69b6 SHA512 4484cf3d4f6d985a54fc9fe76edb7f55081733f891a44f194cf0dd8fd0306d70271637d56b6ff34b4cd78012199754d0cdf6b1e61c36b580d0601894c50867de -EBUILD libreoffice-9999.ebuild 15812 BLAKE2B 66051678cce896841f7cd5a2126569a4013b8a85bd285349ba4694c6e0bae2f62f565999553bfb72017d300874dfd32fac68f37d7f03facb1ea1931f70452936 SHA512 be515741d72c13de64bc4f928bd75d5768ed4f6ae932f70ab9f3a2f5f87cf2a660374cea3a2ea921dc8e4d1b36a36b890d2bd9c7c5318c6c2921fb0df72ed598 +EBUILD libreoffice-6.4.3.2.ebuild 15774 BLAKE2B 4d490d6be48c200cba924bba56bcf3aebf4cff3fa10cd0fdbb8ff96c3a3f728d149c5f227594d5698998470cf4039322b759bcd6c1f9889cb2652855f72b3ce1 SHA512 7cb9f8865b65aa4ed6b91e2789405a6d0f843bcbd8b929bcf3b6fa6dfa878dc447842c3596e44a67327ccb569c4061b6536de094f2e3ab94e8cc041343c1c53a +EBUILD libreoffice-6.4.4.2.ebuild 15803 BLAKE2B 01d2996181c7b6b8dbe08ca568fe8998015aedca2e66b554212865eef400a99b0b76dd694031c9f0369b846bba2c955ef7e8a836d936fa36f92f4233c4d48335 SHA512 ea3795d62c5d18bc4259dd40f454b0a1020ccc5e093f809a5b34f8886c4c1c8aac19b79682c43fa8b7fe56fcc8df76ec8795ca17c7c9273748cf700cd6a25867 +EBUILD libreoffice-6.4.9999.ebuild 15617 BLAKE2B 836265601e6c0304b513d065af4785e226a64769b1241fc1623aa0e55b046050e322f5655cf7c6cdb488a3e9c9cecc7eb29b55702c71b7a658d852e28a78295c SHA512 ba3ef44e35a535e6a6003c49707af89b861c9f212ccce4e58c8f1ef9c2d6ad827c27ceecb032359ece1db0bdc764c82b18514d1b75a28be5c5f1fe6c9950d68a +EBUILD libreoffice-9999.ebuild 15831 BLAKE2B de4c0f66695a349885255ad12238c2c1951c5cdc9d743bacc09d564ba8df55360c22dd22fbc76e2ae853e932c9007c913dd0057b9b80bfdb3c175770b7c02969 SHA512 d3b8bca1a81b9e9f710bc70ad0f0408c482db670fd8647accbbc7b9750d67ea407093fe6fbd4074c3ed3a3eada6893378989bd90351a51eac7ae45f221bdedf9 MISC metadata.xml 1007 BLAKE2B 9cfefc8eb71dad67a632810e4b3b91e17534565b245bfd71f2b34819fb96edef9617be5a899778e4ca5f54c7963d43f0a23615c003bd175c41c6f59d245e449c SHA512 5d470c6d1099a5c932e5a7418a72df7999df949c3ca2911efe7a18a900cd7580b00c540eae91478894f86368d7c9840a5a22cd1b2971382d06274caa3c572223 diff --git a/app-office/libreoffice/files/libreoffice-6.4.3.2-boost-1.73.patch b/app-office/libreoffice/files/libreoffice-6.4.3.2-boost-1.73.patch new file mode 100644 index 000000000000..0eb406999223 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-6.4.3.2-boost-1.73.patch @@ -0,0 +1,118 @@ +From 55c724b93dfd4c9a1afb10d60fbc2d7a9a66cf61 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> +Date: Wed, 29 Jan 2020 12:44:52 +0000 +Subject: replace boost::bimap in sdext pdfimport +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +the error message with boost 1.69 and gcc 10 is so ungodly its easier to throw +bimap out and use something simpler + +Change-Id: Ie324a0b81931bbd427483878a87beeca455ada18 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87683 +Tested-by: Jenkins +Reviewed-by: Caolán McNamara <caolanm@redhat.com> +--- + sdext/source/pdfimport/inc/pdfiprocessor.hxx | 12 ++++-------- + sdext/source/pdfimport/tree/pdfiprocessor.cxx | 21 ++++++++++++--------- + 2 files changed, 16 insertions(+), 17 deletions(-) + +diff --git a/sdext/source/pdfimport/inc/pdfiprocessor.hxx b/sdext/source/pdfimport/inc/pdfiprocessor.hxx +index 89f9d601b7b0..9e08d6a6a765 100644 +--- a/sdext/source/pdfimport/inc/pdfiprocessor.hxx ++++ b/sdext/source/pdfimport/inc/pdfiprocessor.hxx +@@ -37,9 +37,6 @@ + #include "treevisitorfactory.hxx" + #include "genericelements.hxx" + +-#include <boost/bimap/bimap.hpp> +-#include <boost/bimap/unordered_set_of.hpp> +- + namespace pdfi + { + +@@ -160,10 +157,8 @@ namespace pdfi + typedef std::unordered_map<sal_Int32,FontAttributes> IdToFontMap; + typedef std::unordered_map<FontAttributes,sal_Int32,FontAttrHash> FontToIdMap; + +- typedef boost::bimaps::bimap< +- boost::bimaps::unordered_set_of<GraphicsContext, GraphicsContextHash>, +- boost::bimaps::unordered_set_of<sal_Int32> +- > GCToIdBiMap; ++ typedef std::unordered_map<sal_Int32,GraphicsContext> IdToGCMap; ++ typedef std::unordered_map<GraphicsContext, sal_Int32, GraphicsContextHash> GCToIdMap; + + typedef std::vector<GraphicsContext> GraphicsContextStack; + +@@ -178,7 +173,8 @@ namespace pdfi + + GraphicsContextStack m_aGCStack; + sal_Int32 m_nNextGCId; +- GCToIdBiMap m_aGCToId; ++ IdToGCMap m_aIdToGC; ++ GCToIdMap m_aGCToId; + + ImageContainer m_aImages; + +diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx +index c6baa7fee8b2..ed2eaf6510b9 100644 +--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx ++++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx +@@ -54,6 +54,7 @@ namespace pdfi + m_aFontToId(), + m_aGCStack(), + m_nNextGCId( 1 ), ++ m_aIdToGC(), + m_aGCToId(), + m_aImages(), + m_nPages(0), +@@ -65,12 +66,13 @@ namespace pdfi + aDefFont.isBold = false; + aDefFont.isItalic = false; + aDefFont.size = 10*PDFI_OUTDEV_RESOLUTION/72; +- m_aIdToFont[ 0 ] = aDefFont; +- m_aFontToId[ aDefFont ] = 0; ++ m_aIdToFont.insert({0, aDefFont}); ++ m_aFontToId.insert({aDefFont, 0}); + + GraphicsContext aDefGC; + m_aGCStack.push_back( aDefGC ); +- m_aGCToId.insert(GCToIdBiMap::relation(aDefGC, 0)); ++ m_aGCToId.insert({aDefGC, 0}); ++ m_aIdToGC.insert({0, aDefGC}); + } + + void PDFIProcessor::setPageNum( sal_Int32 nPages ) +@@ -468,12 +470,13 @@ const FontAttributes& PDFIProcessor::getFont( sal_Int32 nFontId ) const + sal_Int32 PDFIProcessor::getGCId( const GraphicsContext& rGC ) + { + sal_Int32 nGCId = 0; +- auto it = m_aGCToId.left.find( rGC ); +- if( it != m_aGCToId.left.end() ) ++ auto it = m_aGCToId.find( rGC ); ++ if( it != m_aGCToId.end() ) + nGCId = it->second; + else + { +- m_aGCToId.insert(GCToIdBiMap::relation(rGC, m_nNextGCId)); ++ m_aGCToId.insert({rGC, m_nNextGCId}); ++ m_aIdToGC.insert({m_nNextGCId, rGC}); + nGCId = m_nNextGCId; + m_nNextGCId++; + } +@@ -483,9 +486,9 @@ sal_Int32 PDFIProcessor::getGCId( const GraphicsContext& rGC ) + + const GraphicsContext& PDFIProcessor::getGraphicsContext( sal_Int32 nGCId ) const + { +- auto it = m_aGCToId.right.find( nGCId ); +- if( it == m_aGCToId.right.end() ) +- it = m_aGCToId.right.find( 0 ); ++ auto it = m_aIdToGC.find( nGCId ); ++ if( it == m_aIdToGC.end() ) ++ it = m_aIdToGC.find( 0 ); + return it->second; + } + +-- +cgit v1.2.1 diff --git a/app-office/libreoffice/libreoffice-6.3.5.2.ebuild b/app-office/libreoffice/libreoffice-6.3.5.2.ebuild deleted file mode 100644 index 0132cdd8dd5b..000000000000 --- a/app-office/libreoffice/libreoffice-6.3.5.2.ebuild +++ /dev/null @@ -1,558 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -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=( - "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 bluetooth +branding coinmp +cups dbus debug eds firebird -googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test -$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - bluetooth? ( 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 ~amd64-linux ~x86-linux" - -BDEPEND=" - dev-util/intltool - sys-devel/bison - sys-devel/flex - sys-devel/gettext - virtual/pkgconfig - odk? ( >=app-doc/doxygen-1.8.4 ) -" -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 - >=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:=[nls] - dev-libs/expat - dev-libs/hyphen - dev-libs/icu:= - dev-libs/libassuan - dev-libs/libgpg-error - =dev-libs/liborcus-0.14* - 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] - media-gfx/fontforge - media-gfx/graphite2 - media-libs/fontconfig - media-libs/freetype: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 - net-libs/neon - net-misc/curl - sci-mathematics/lpsolve - sys-libs/zlib - virtual/glu - 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_MULTI_USEDEP}] - ') - ) - bluetooth? ( - dev-libs/glib:2 - net-wireless/bluez - ) - coinmp? ( sci-libs/coinor-mp ) - cups? ( net-print/cups ) - dbus? ( sys-apps/dbus ) - 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 - x11-libs/pango - ) - gtk2? ( - x11-libs/gdk-pixbuf - >=x11-libs/gtk+-2.24:2 - 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.4*:1= - media-libs/glm - sys-devel/ucpp - x11-base/xorg-proto - x11-libs/libXt - x11-libs/libXtst - java? ( - dev-java/ant-core - >=virtual/jdk-1.6 - ) - 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 - !app-office/openoffice - media-fonts/liberation-fonts - || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) - java? ( >=virtual/jre-1.6 ) - kde? ( kde-frameworks/breeze-icons:* ) -" -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.4-system-pyuno.patch" - "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" - "${FILESDIR}/${PN}-6.1-nomancompress.patch" - - # master branch - "${FILESDIR}/${PN}-6.3.3.2-mysql-connector-c-8.patch" # bug #692422 -) - -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 java && ! use firebird; then - ewarn "If you plan to use Base application you must enable either firebird or java." - fi - - use java || ewarn "Without java, several wizards are not going to be available." - - if has_version "<app-office/libreoffice-5.3.0[firebird]"; then - ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so" - ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version." - ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base" - 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 - - # system pyuno mess - sed -i \ - -e "s:%eprefix%:${EPREFIX}:g" \ - -e "s:%libdir%:$(get_libdir):g" \ - pyuno/source/module/uno.py \ - pyuno/source/officehelper.py || die - # sed in the tests - sed -i \ - -e "s#all : build unitcheck#all : build#g" \ - solenv/gbuild/Module.mk || die - sed -i \ - -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \ - -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \ - Makefile.in || die - - sed -i \ - -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \ - -e "s,\$INSTALLDIRNAME.sh,${PN}," \ - bin/distro-install-desktop-integration || die - - if use branding; then - # hack... - mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die - fi - - # Don't list pdfimport support in desktop when built with none, bug # 605464 - if ! use pdfimport; then - sed -i \ - -e ":MimeType: s:application/pdf;::" \ - -e ":Keywords: s:pdf;::" \ - sysui/desktop/menus/draw.desktop || die - fi -} - -src_configure() { - # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys - # Note: these are for Gentoo use ONLY. For your own distribution, please get - # your own set of keys. Feel free to contact chromium@gentoo.org for more info. - local google_default_client_id="329227923882.apps.googleusercontent.com" - local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" - - # optimization flags - export GMAKE_OPTIONS="${MAKEOPTS}" - # System python enablement: - export PYTHON_CFLAGS=$(python_get_CFLAGS) - export PYTHON_LIBS=$(python_get_LIBS) - - if use kde; then - export QT_SELECT=5 # bug 639620 needs proper fix though - export QT5DIR="$(qt5_get_bindir)/../" - export MOC5="$(qt5_get_bindir)/moc" - fi - - 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-neon - --enable-python=system - --enable-randr - --enable-release-build - --disable-breakpad - --disable-bundle-mariadb - --disable-ccache - --disable-epm - --disable-fetch-external - --disable-gstreamer-0-10 - --disable-gtk3-kde5 - --disable-online-update - --disable-openssl - --disable-pdfium - --disable-report-builder - --disable-vlc - --with-build-version="${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-x - --without-fonts - --without-myspell-dicts - --with-help="html" - --without-helppack-integration - --with-system-gpgmepp - --without-system-sane - $(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 gtk2 gtk) - $(use_enable kde kde5) - $(use_enable kde qt5) - $(use_enable ldap) - $(use_enable odk) - $(use_enable pdfimport) - $(use_enable postgres postgresql-sdbc) - $(use_with accessibility lxml) - $(use_with coinmp system-coinmp) - $(use_with googledrive gdrive-client-id ${google_default_client_id}) - $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) - $(use_with java) - $(use_with odk doxygen) - ) - - if use eds || use gtk; then - myeconfargs+=( --enable-dconf --enable-gio ) - else - myeconfargs+=( --disable-dconf --disable-gio ) - fi - - # libreoffice extensions handling - for lo_xt in ${LO_EXTS}; do - if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then - myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) ) - else - myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) ) - fi - done - - if use java; then - # hsqldb: system one is too new - myeconfargs+=( - --without-junit - --without-system-hsqldb - --with-ant-home="${ANT_HOME}" - --with-jdk-home=$(java-config --jdk-home 2>/dev/null) - --with-jvm-path="${EPREFIX}/usr/lib/" - ) - - 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 - make DESTDIR="${D}" distro-pack-install -o build -o check || die - - # 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 -} - -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-6.4.3.2.ebuild b/app-office/libreoffice/libreoffice-6.4.3.2.ebuild index 604dc556242d..13bdfc7c5199 100644 --- a/app-office/libreoffice/libreoffice-6.4.3.2.ebuild +++ b/app-office/libreoffice/libreoffice-6.4.3.2.ebuild @@ -82,7 +82,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" [[ ${MY_PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" BDEPEND=" dev-util/intltool @@ -253,6 +253,9 @@ PATCHES=( "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" "${FILESDIR}/${PN}-6.1-nomancompress.patch" + # git master + "${FILESDIR}/${P}-boost-1.73.patch" # bug 721806 + # TODO: upstream (for now taken from Arch Linux) "${FILESDIR}/${PN}-6.4.2.2-poppler-0.86.patch" # bug 711102 ) diff --git a/app-office/libreoffice/libreoffice-6.3.9999.ebuild b/app-office/libreoffice/libreoffice-6.4.4.2.ebuild index c66886c27b09..d2afc055304d 100644 --- a/app-office/libreoffice/libreoffice-6.3.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.4.4.2.ebuild @@ -44,6 +44,8 @@ unset DEV_URI # These are bundles that can't be removed for now due to huge patchsets. # If you want them gone, patches are welcome. ADDONS_SRC=( + # QR code generating library for >=libreoffice-6.4 + "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz" "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 )" @@ -62,12 +64,13 @@ unset ADDONS_SRC # Extensions that need extra work: LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" -IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird -googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test +IUSE="accessibility bluetooth +branding coinmp +cups +dbus debug eds firebird +googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" REQUIRED_USE="${PYTHON_REQUIRED_USE} bluetooth? ( dbus ) + gtk? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) @@ -78,6 +81,7 @@ RESTRICT="!test? ( test )" LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" + [[ ${MY_PV} == *9999* ]] || \ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" @@ -114,13 +118,13 @@ COMMON_DEPEND="${PYTHON_DEPS} >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl - dev-libs/boost:=[nls] + >=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.14* + >=dev-libs/liborcus-0.15.0 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt @@ -153,9 +157,7 @@ COMMON_DEPEND="${PYTHON_DEPS} x11-libs/libXrandr x11-libs/libXrender accessibility? ( - $(python_gen_cond_dep ' - dev-python/lxml[${PYTHON_MULTI_USEDEP}] - ') + $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]') ) bluetooth? ( dev-libs/glib:2 @@ -163,7 +165,7 @@ COMMON_DEPEND="${PYTHON_DEPS} ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) - dbus? ( sys-apps/dbus ) + dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf @@ -182,11 +184,6 @@ COMMON_DEPEND="${PYTHON_DEPS} x11-libs/gtk+:3 x11-libs/pango ) - gtk2? ( - x11-libs/gdk-pixbuf - >=x11-libs/gtk+-2.24:2 - x11-libs/pango - ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -215,7 +212,7 @@ DEPEND="${COMMON_DEPEND} dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3.1 - dev-util/mdds:1/1.4 + dev-util/mdds:1/1.5 media-libs/glm sys-devel/ucpp x11-base/xorg-proto @@ -223,7 +220,7 @@ DEPEND="${COMMON_DEPEND} x11-libs/libXtst java? ( dev-java/ant-core - >=virtual/jdk-1.6 + >=virtual/jdk-1.8 ) test? ( app-crypt/gnupg @@ -238,7 +235,7 @@ RDEPEND="${COMMON_DEPEND} !app-office/openoffice media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) - java? ( >=virtual/jre-1.6 ) + java? ( >=virtual/jre-1.8 ) kde? ( kde-frameworks/breeze-icons:* ) " if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then @@ -257,8 +254,11 @@ PATCHES=( "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" "${FILESDIR}/${PN}-6.1-nomancompress.patch" - # master branch - "${FILESDIR}/${PN}-6.3.3.2-mysql-connector-c-8.patch" # bug #692422 + # git master + "${FILESDIR}/${PN}-6.4.3.2-boost-1.73.patch" # bug 721806 + + # TODO: upstream (for now taken from Arch Linux) + "${FILESDIR}/${PN}-6.4.2.2-poppler-0.86.patch" # bug 711102 ) S="${WORKDIR}/${PN}-${MY_PV}" @@ -280,12 +280,6 @@ pkg_pretend() { use java || ewarn "Without java, several wizards are not going to be available." - if has_version "<app-office/libreoffice-5.3.0[firebird]"; then - ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so" - ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version." - ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base" - fi - [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend } @@ -397,6 +391,7 @@ src_configure() { # --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 + # --without-system-qrencode: has no real build system and LO is the only user local myeconfargs=( --with-system-dicts --with-system-epoxy @@ -416,7 +411,6 @@ src_configure() { --disable-ccache --disable-epm --disable-fetch-external - --disable-gstreamer-0-10 --disable-gtk3-kde5 --disable-online-update --disable-openssl @@ -441,6 +435,7 @@ src_configure() { --without-helppack-integration --with-system-gpgmepp --without-system-sane + --without-system-qrcodegen $(use_enable bluetooth sdremote-bluetooth) $(use_enable coinmp) $(use_enable cups) @@ -450,8 +445,7 @@ src_configure() { $(use_enable firebird firebird-sdbc) $(use_enable gstreamer gstreamer-1-0) $(use_enable gtk gtk3) - $(use_enable gtk2 gtk) - $(use_enable kde kde5) + $(use_enable kde kf5) $(use_enable kde qt5) $(use_enable ldap) $(use_enable odk) @@ -524,7 +518,7 @@ src_test() { src_install() { # This is not Makefile so no buildserver - make DESTDIR="${D}" distro-pack-install -o build -o check || die + emake DESTDIR="${D}" distro-pack-install -o build -o check # bug 593514 if use gtk; then diff --git a/app-office/libreoffice/libreoffice-6.4.9999.ebuild b/app-office/libreoffice/libreoffice-6.4.9999.ebuild index 96cb01612639..e42e510981a9 100644 --- a/app-office/libreoffice/libreoffice-6.4.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.4.9999.ebuild @@ -64,12 +64,13 @@ unset ADDONS_SRC # Extensions that need extra work: LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" -IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird +IUSE="accessibility bluetooth +branding coinmp +cups +dbus debug eds firebird googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" REQUIRED_USE="${PYTHON_REQUIRED_USE} bluetooth? ( dbus ) + gtk? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) @@ -164,7 +165,7 @@ COMMON_DEPEND="${PYTHON_DEPS} ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) - dbus? ( sys-apps/dbus ) + dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 536c445e0306..3e5059a20356 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -68,12 +68,13 @@ unset ADDONS_SRC # Extensions that need extra work: LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" -IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird +IUSE="accessibility bluetooth +branding coinmp +cups +dbus debug eds firebird googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" REQUIRED_USE="${PYTHON_REQUIRED_USE} bluetooth? ( dbus ) + gtk? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) @@ -168,7 +169,7 @@ COMMON_DEPEND="${PYTHON_DEPS} ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) - dbus? ( sys-apps/dbus ) + dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf |