diff options
Diffstat (limited to 'app-office/libreoffice')
13 files changed, 114 insertions, 2039 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index e202f9adff7b..667f67190923 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -1,13 +1,9 @@ AUX libreoffice-24.2-qtdetect.patch 989 BLAKE2B 01e1c1493293363206cd43ded09b69becd02b0b93c2fcb5fd4387a54424b9fa552ebfa128290a1b0551e6b6fe5de8f57025a2ebf5c75da2ea01bd66f5910f9d6 SHA512 dc00b2afe98f7bf30637c4102e336d6781f76cd7eb6c339c0b369ec2aa50544bc266fd42540fea037c1fcd07ae7e6d1b6503be620db9127084ffe6528f8db4b1 AUX libreoffice-24.2-unused-qt6network.patch 3348 BLAKE2B 9ec1c83e9405128fcf493e6382e822cb577548e68ec46d0971825dec08cefe7ab18fdaf5d028ce747aaec5cdb57f3d2267b96cff997d90990435cda3ae98d47f SHA512 2eb04c76377526c67e28d20bfcdc682a52c7afa754a2e5a0f6df146917050dd9565bd4ae767347db58bb95afa5436baceea33b3e9b1e6c5b96517eb4cf22e1cb +AUX libreoffice-24.2.3.2-fix-bashism.patch 2016 BLAKE2B 4bf97ed1f62232c777715f9f93f65eed50275bd8a00b53ac551024bcccf1faa497ac5e45e56274e86d74f82a1c4094a2c85388503131181af9b2a3e11ba6a75c SHA512 f7f1c46d854d2fbeffa0a65c58447f8a662d85b98b2ec2b8f0734ae382ec8c40ef93f1eb7271e5fd160e6204e176cba9de02fd755a0041c5fa930784dc198960 AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0ad4b57a3739d6d34a2941f2ea57d3a5c4ab65e3f3c2376243aa88c9c05b1038cf9bfb7605a370d11513bb4553de2d268010519 SHA512 2aa6d1fc96749b79b3291f6e27630c6cf59d2c743f0dd8603867ba8aec2c17f87b70e1dd031365013f7e9ea53c160e9cb3f48af592a587dc05f3ae4cc1b35df6 AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba34369137336327f4d1ee27789c5f6229b9a82f4aeab0eaeaf494e60b992c66fcdb276b6423b87713febb14e9eeaffa388369ca8 SHA512 f82e23f15cefd947af20a50e1e4168c9023d5f8b9e19da7f76b141a60be4fa3516ad16400ce26e4d0ff293c570031ac87bbbf6766444e1b31e7bc3ee8ef58083 -AUX libreoffice-7.2.0.4-qt5detect.patch 536 BLAKE2B fd77876d1ca3973ad30c9ebb60bf28e163dd29dcaebaa2b94d84f4c2ab060617d96f4df3d5114f17f882b0cb8b9e2ecdb284fdd1e4aaf8a34cc0c1f06a295c04 SHA512 e1ac7dfc4743cbdea3050b18c1714d06c8bcca4abc51d56e13362c8379fbdd3d37a1916c962fcb1389783c9b1fd72783c9ee45fbb649538ca0fc0cb7b05bcacf -AUX libreoffice-7.5.8.2-icu-74-compatibility.patch 5299 BLAKE2B b1c12af133c48ef3e586c41f2fa1cd4b7b6c4d7e93d783ada5c3670a30eb7e2bf3039df242d2f186270810b479621b38f4e91cde6428ee6453170eaffe326a56 SHA512 d64618c007d35ea873d25c7e40058fdc50de29ce1fe2c573aa8b9d628094d681af8ef31e4cd992b0baa996b097dec9c0a28e4d5881ac17b7916ec3bf330f4128 -AUX libreoffice-7.5.9.2-libxml2-2.12.patch 12445 BLAKE2B 3675c092e6a6d5f357a623fd0381faf53d20f66a555895450f0b437b0ca709a9bb2453a351abcf2e5caaad17dcaa8a9bebf2ede559ad6311c5f382088f44e460 SHA512 ffe0c6a3c696bf7549dcd4b6907d35b271361a53aa730502569b5073ecef15747f40886a554da0b369f549ab2fccb897dba7c1c04332f9271ba98d9ac11dc6ea AUX libreoffice-7.6-unused-qt5network.patch 3218 BLAKE2B 1445716fcfb556d7ef997bf1f5bf8dbb75032e9556d878fd999c6d260b2bff9e445cfec5f2a7537fe5118f31a1574cc21badb62b4a70b2452f694f03e75d2fd7 SHA512 e9861f2acfda59d09fc2f5431e4697a9bbd0927c5a765e35e7418b60ed0aeeafcaac3873fd0222b57facf71f4375a095a75e57574cd36e02f8ade0f264993647 -AUX libreoffice-7.6.5.2-gcc14.patch 1134 BLAKE2B a58f62b255455a827625eeecb43816aae1e66b98c9d93b926f2b000be72787e68a5f7c2e3a9a5301b7c82978275dfe53ec9474fc0bdd6d10801cf473009a0573 SHA512 2f4d00cec8ddf2362b787420f5f6e71f060fd4800291b907918255615cfa0996d7cc199898e69665ec0d6041776025043c796402a02be1192b087632cad9bea3 -AUX libreoffice-7.6.6.3-autoconf-2.72.patch 2967 BLAKE2B 9baf9a3f904abe5bc0f8bd6a6c322412daae3a6c4fb858185eee2c6af715286c9d71c80be93eb955d9e6d8c1ffb12cb194e614549e345976116e2e39727ba2e2 SHA512 8b77f14d396ceaa45b3b3a9ec452e3e6e5a1e277d75d86b9de565ab6fb0de69e8b8b0f185179c23a259300ab52db67e4aee22b6e9ca88ee38dbed75c90b0af9a AUX libreoffice.confd 228 BLAKE2B 7b9ed0d08b91b6e78dd3a2ac242cac48ef141c25bf25713b5fa6c4fdea3d5b0e16b4073a864fbec328edf4008729869fba5236e9cc113ba9bd3d6de5c10153c3 SHA512 6718cfd481b4349d70b718d4811f80ac0eff60d465b9f9eeff8ab9641de1fecb6197023f98bb1fca77a57b48ae2d8e38803f3af3a51191b1df71aa8cc5d33661 AUX libreoffice.initd 507 BLAKE2B d49fd0f48254160fff3eb90a75294c6cf044805352a982ab3d2127426a18a6171e5043c071b59581a1f927a7c499c8abb58820081c6ba6e285097c883917f0e3 SHA512 fee4720898510b1aa07a9ed597d041d1e1edfb8f8b8e9596ef4254d4d3c1e8a959bbd65202a377289910ed28283f9c8a4bdc893d2d0835f37ee28cd3c7cb010d DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a @@ -31,22 +27,16 @@ DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48d 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 frozen-1.1.1.tar.gz 186589 BLAKE2B 5f103311c49777d0d284cabe026fae55f09bd24b2227d56133c48b9f9f0542361f3e007687089145939c12fc6a1af8baf1c76ba76176bdddec3d726e45d705d1 SHA512 e22561a4e634e388e11f95b3005bc711e543013d314f6aaeda34befb2c673aea2d71a717d8822bc8fa85bdc8409945ba2ad91a1bac4f8cb5303080de01a5f60e -DIST libreoffice-24.2.3.2.tar.xz 280246948 BLAKE2B f0694abc23a612e303d694800f6f83a7d307c3fcce40e459a59cce76435cfdd9de57be95910152bbc5a9e124871477e4638f1deef489a19c22fbfbdf1237a91b SHA512 c0313a5f1ea0a860b40debf6bc75bc792ffb152d76fa1372e8e4574eca5c4a8a33748e74636a09e01dab1ae21e08261856c7c11b82080e6e8d6c2dd1a166782b -DIST libreoffice-7.6.4.1.tar.xz 281547116 BLAKE2B 55712cf41e38373476dbc3d6a6f244dc0ba9222caf587c5d8a56c5f952e064e815d752a786d6770891775dc2a43739ae05fb94935006c005b41b3aeca229a866 SHA512 dbfc0cc8aa68e26c89da12156046ccf18201759c0e67757ce259a1150934ad7e2d914837701731fbe00aeab9a2f8c996619eb0892b7907de8012fdd7421da0f6 -DIST libreoffice-7.6.6.3.tar.xz 282144120 BLAKE2B 8d6f39046c9793c8dc5e2667e684c32f61b475b83787c75eeacf441a636c7244b032ae2cd7dac75c3077de63c68382e63bb834f69986ef788d78542df087b19b SHA512 822584e1a191aac08f3141ba2dc2b91b0cbd50635a8506e9f3d00e224c997e1ec83957dd8a7dbede28a0ba28e1a8658d7e0b526bf796db286210393a326e6ca3 -DIST libreoffice-7.6.7.2.tar.xz 282345404 BLAKE2B 7214739ce3e495e07180875834908078975857bed83fbd4f33ccfaaca5b30a0651661da4e42aa59f9c7011fe7ce2c58667c41d48b73f621d2004e8dbbdd0817f SHA512 443d818f35d9cac1af3a911f031b0b8f455eb28afa1a563ee3551b3285810f3b7b19265a64f853eef07e0c550c5d81f95e2774db46bd9dfee7b9aee029eb3747 +DIST libreoffice-24.2.3.2-icu-74.tar.xz 28100 BLAKE2B 5c49749f3e8f23d28dc2463001030eb660e3387480aa1b0611460987f80fa2c965adb4a84d822177452994a072ad94dbff41a43d621b89c37d4133875620a591 SHA512 32c906fb4bfc431baecbc7f01bfcb32227da740b10ff97a53288275e179344070344e594e273a79671070c74423bcc3ea68dec88543d6ab89fb20a57f4c2c114 +DIST libreoffice-24.2.4.2.tar.xz 279938452 BLAKE2B a950463998c5b5478ac2b17c7ef6e9bf579e01b3434a26edb8cd1eb320dbeb444a63ace5a64cc37c98e2f3e8166b0044a5cc28474f6125b645cce6c16ed353c8 SHA512 a0d10ccfd3c88285519a3ff00c429cbeec3591d779769b2264c2bde67aed3921462b5e5a4fda52217a483088f7fd1f518339d9809907b1a8dea54dc66b86ae3e +DIST libreoffice-24.2.6.2.tar.xz 280090508 BLAKE2B f7bc3d1b8cdb1d3212d0aba97b8d7ba2e4b833e8ab796b477b8faa10854b6681d397a239b3085f351c8d28295490d7d3f6c0c62f876b879a367abb0df9053314 SHA512 3609fbfc03d6140e3275e7b8ef23297293df4bede68d9714dc2e7075578ec345ffdba4dfc873eb3dc4ee08080fb7d902daa86c8222f63999fe1df259384858cc DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f -DIST libreoffice-help-24.2.3.2.tar.xz 167014344 BLAKE2B 93c87d5b0e7d35d3335dcb80868a0ea516378e3c46c56e34a1123661db29ab6215f62074feef1078daad04977726bf226de2a7ad281e8b9900ddd7fb1bc23961 SHA512 5ccf579da3791f4a78b17eedc6b641351f69e4e8b4079180dede2f3a4180d1ccc617dff0f49b89fdc93f9e86d8d0630ecbf87437079caf7f0d1b51765ac3e877 -DIST libreoffice-help-7.6.4.1.tar.xz 166959028 BLAKE2B fadcd32c50af1d4607ecd20ef7640cfbd1912361a792c324540dee1b5ee78c5f622b8363a5b96a1afb8256618573a0bb6f919a144de98fe88a1331d9241612f0 SHA512 0f72cd933ab7b897ec36f7b29bc5e568be289ea50ae0844e6083ff4957eab3cd313b39ffbda2e58f59de7962a05b371d8d61043d80323bb474e5436d23d3a859 -DIST libreoffice-help-7.6.6.3.tar.xz 166956596 BLAKE2B 217b32cf9d1882b2a60e436bb6319be5c60807bd7bb8ce373a6a2ecbd8d6f2537bd2a13d58ea14f47532a5a780df1815457adc473e2b0107e5e510db144d90a4 SHA512 07ed22d2161770a39e618075aadc5b42f8f5c436938a0aa29351628e61572e6e1d03642d45541dcfebf57dfdd1e558b23a8d596025fb45a1771652ad2860583f -DIST libreoffice-help-7.6.7.2.tar.xz 166901284 BLAKE2B 636772e6ba11b00d26f0280f3ac564e4c4ab839808ec21eeefdbec7a16e4fdad512466b523f1e58cfd74bfe29f4bc06b7d203e18e5e2a2b1a6ed5b8ff8ec9093 SHA512 724cdb884b37bd847080b4610d1fe2f9b111479585bc097f2ad2a73141565c542d08eab088a36eb3374a3c85a0b803a7c65e43058234076c3ddc99c6f847e3a8 -DIST skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz 10693272 BLAKE2B 67f2bd33d58c58c59f1ee5fb693a6a7e6a1ace52f269ae0fa6617027e93131031b0af9d44c36e371fe5a38c5b7519a61f9bcf4286a13ef5b06ea7e7eb5cb0a0f SHA512 58d50fdd19cc5df640244e0c765aec6addc3e552701b201772584e8bea7cda12047e4a6af41452c6669aadfc026de29a4a4e7c6b31c7dfff30e29e50ed46fe3d +DIST libreoffice-help-24.2.4.2.tar.xz 167013820 BLAKE2B 9345efdfdd47336c623fe6da872eb22278dc8156e29ab049969ea11d947b374dfe0661388a14318afacfc4f0dbf717d16906f71e0d300f52eed0b18fa909f6e7 SHA512 2dc8c7d5976b4784011ac6d3e7a507e433673bf68451a13cbe243b478d32659cbb46f38af345f44efc24ca90dcd4e74f2d53354fd11d738635070ef57da0c317 +DIST libreoffice-help-24.2.6.2.tar.xz 167013048 BLAKE2B 026c783643433da61cf29dcf8edd4dd9d7229d1caf48f47a5a9ced5a9357a3eb9bf780875214189413775742e8fc63c7610549f154911871537563afb4ea4d58 SHA512 0d4ec689649b99e4a1081105d2f4c3966e9230eedd1c1d66c531e507a47fa5cd8a16bc30829b153ae9730d3214be8b75675bb123bfbd2c35a1f8ef7a9300cd4c DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B ce8247de4cd6939b0593adf1c3dc6b78cdf4220fbcd2dfb2b9cf6d80d42f9c49f4d93fbe3cff68d079f04cc5801daf20999b288f7fdc85b58e32035151a3616a SHA512 6c10785ed9ab8cdf3385ebd3f3d13a64b850df9cc7a12e513326a84c7a3e6f6235f9f4dbce128eac2e43a2707fe6a6011716de5985adf4742d55879210bf32e9 DIST zxcvbn-c-2.5.tar.gz 1404434 BLAKE2B f0f22fc8643f785e8f9ed42033d6654c2e67aa4e258bbc4fecf533efcf8b86b6d7e67f9042326247c311c42a4e2b24b844e0bae65cdb2e46ea043a2974ffd857 SHA512 d7199b3cc36cd0e401bd8f857132425908307aefcdb1bb635ee81c34cf71ccbcdf0fe36a336a55da1281692b508881b54773afa41379a448863095f4abd5c0e8 -EBUILD libreoffice-24.2.3.2.ebuild 20418 BLAKE2B a4565590a86e64cfa92b6ad0f476aebb5611db31b1cb8449dea7d97d5988fb3111c11d6ab4c50868f2d69bc063e4815ca6c40f961c5c3bbb9a069cc1495b0493 SHA512 d8bb5810fc80e2fed900b10af38d7d436ae9428282c94a804c93d4d25b5966ab9c1e5755828da8bd10964bd5ff5b08ee7ee7c08d4713d3a924c2346e513570e2 -EBUILD libreoffice-24.2.9999.ebuild 20337 BLAKE2B 127d3de6087ca61860bad4a2987bd693df8b3116d11abeaba6cdea51cd0ccf12fc557db50e2b2720eb83f21d724384bbf01f2036a9803f2932efe3ef76d2c9f4 SHA512 2c37f139a05d5df7bc45d53082cc7e3dd1cc5cb71197682349fb4b809b35f0ddc9cf8ee7bd113be3233cae950960cd907154ab7f2c637fb8b5f5d2e4634e6a54 -EBUILD libreoffice-7.6.4.1.ebuild 19678 BLAKE2B 9437af453ccbf75140b39cb37ff2705630a2499295681fa129945ca6ed96b030a832ac997990e80ee3cfb7d7203f5e3a1e4375677e456e1ff11c6a4dce3a3178 SHA512 c8d41e5bbbc9cbf9f2cd1f3d4dd74aca9074287410c4a2e26e789ed939a691385c6d9c3f62c5144ad2f8af15a9be26206f2470e5908ab10f507b423c459873b0 -EBUILD libreoffice-7.6.6.3.ebuild 19793 BLAKE2B 1c3fba72db8736bd87527ed5e486bf15528ba12562c79754c24fe3f36b692e8be8d2c7db920fe8f1e94dc1f36108f3c86f816bdd9c248a2f7c0a353672ce55d3 SHA512 bfadf2e44a6219ebabe0df83288917c79283b8fcf2ae14493e0ebda0f6b8fbe19ce0bba1eb435e8ca1adb356c1163f8c8c45c7918673339015ee804af67398be -EBUILD libreoffice-7.6.7.2.ebuild 19804 BLAKE2B bca4559e3e358648a0826790577ee5036f62e13d4d91fe20a3324d5b4c7590f6b59525e5d47ed0aaeda97048dbb988ca5f7279b17fc8b4215679545c4210d38d SHA512 7b80e4b6d61cbecbf62a122ccaa1b9008cbe17160db5871307ef37bc5f926861a0fac7e9b3008bc23dacabd16852263545bd5f03d4d19151f6d12a02dcb8ffca -EBUILD libreoffice-9999.ebuild 20337 BLAKE2B 127d3de6087ca61860bad4a2987bd693df8b3116d11abeaba6cdea51cd0ccf12fc557db50e2b2720eb83f21d724384bbf01f2036a9803f2932efe3ef76d2c9f4 SHA512 2c37f139a05d5df7bc45d53082cc7e3dd1cc5cb71197682349fb4b809b35f0ddc9cf8ee7bd113be3233cae950960cd907154ab7f2c637fb8b5f5d2e4634e6a54 +EBUILD libreoffice-24.2.4.2-r1.ebuild 20416 BLAKE2B 6c431ea8cd6d299764a68b584d83f36a2470d2905ec45acfb63a3a39bd70be15ab7110d1e54d1397a028efee5a5832d83c3ff279d2f18c3ec6a77469ac3b0589 SHA512 f264cf1d5da29ab6118fe767b816f0a7d5d6500f4670359bb485b1e3396ca69daa215c4709d0f708e6efe1a85dc6324ba2c61a03d35d1f09095553e3c74d8ded +EBUILD libreoffice-24.2.6.2.ebuild 20719 BLAKE2B f76a7e149a0222eefdff82e712d235c98d238839a39847e8fa2da905254a9bf453f5266c14258ec617767d6a3382950676e97ff9f0ae04a976af20df9819f262 SHA512 a7e5363753647ba3dab0ef3f732bb80ed7669fe48a3e3c1abe1220339487f1b292a4ec29c32929b3a437a80398f5e1979446d91e56cd7081d8c681728403e4de +EBUILD libreoffice-24.2.9999.ebuild 20330 BLAKE2B 68c472618ca2d4e8d1304d8e4a4aa01c0144541d527b3e3e31257a8e90960a7b2dd56857d3dd06892b302e0d14233ecbcadd733f662c478d61c2737587817029 SHA512 29af45dc798b2bf15ce9b948083992e4bf6a71ffd027c4c5d9ea90e5bb2378f2b0c3696005e42ef040fd9946ead9e727bb7147f83f3b785b95d1e9f489af9ec7 +EBUILD libreoffice-9999.ebuild 19906 BLAKE2B 0b242c2390bec879c05a78e17bab5b1363555bd0473f89927a6736d5a68d0da9c8cad53197a58d82ef4869cfead3838814150f9c7d731f49b0fb4388b177c68b SHA512 b225f0125d7bc88fc5b4b24fc8702641f1169f151a852b8dc3d02e8c54a6f4bfe97198020b219e5155f945d71f086874ac59a2dcd7190b88da6636ac3c75c329 MISC metadata.xml 1233 BLAKE2B f93989caf1340cda4c3327a3d3d033d224050848b32b9d80e0b093b024bf124d238f1aae9852d1a6173e8aee79314517dd12e589079e58378e5f63626a80957c SHA512 3af0cefdceeba7a45658a2151b0534f44b9dfe6d3af8374f3061cb098f607a36a2fe134e3c0280ce6d807b523f68e708b51e6f1b4178292a528405e18f12d686 diff --git a/app-office/libreoffice/files/libreoffice-24.2.3.2-fix-bashism.patch b/app-office/libreoffice/files/libreoffice-24.2.3.2-fix-bashism.patch new file mode 100644 index 000000000000..e46339492110 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-24.2.3.2-fix-bashism.patch @@ -0,0 +1,55 @@ +From 4dd9e8fd585210a31bd8a99630a4d958d794ab28 Mon Sep 17 00:00:00 2001 +From: Chris Mayo <aklhfex@gmail.com> +Date: Sat, 18 May 2024 17:13:31 +0100 +Subject: Fix bashism in configure tests for curl and libcmis + +When /bin/sh is dash: + +./configure: 35165: test: yes: unexpected operator +checking whether to enable breakpad... no +./configure: 35218: test: yes: unexpected operator + +Causing HAVE_FEATURE_CURL not to be set to 1 and build to fail: + +sw/source/ui/misc/translatelangselect.cxx:160:24: error: no member named 'TranslateDocumentCancellable' in namespace 'SwTranslateHelper' + 160 | SwTranslateHelper::TranslateDocumentCancellable(m_rWrtSh, aConfig, m_bCancelTranslation); + | ~~~~~~~~~~~~~~~~~~~^ + +Introduced in: + +5bf7c2fa5794 ("Fix --disable-curl build", 2023-09-14) + +Change-Id: Ifbc4bc1a7cde86101ff13b05ec7cee6836798605 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167831 +Tested-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> +Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> +Tested-by: Jenkins +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index fbd6196921a5..59f1c97dbef7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -11079,7 +11079,7 @@ AC_SUBST(ICU_MINOR) + dnl ================================================================== + dnl CURL + dnl ================================================================== +-if test "$enable_curl" == "yes"; then ++if test "$enable_curl" = "yes"; then + AC_DEFINE([HAVE_FEATURE_CURL]) + fi + +@@ -11125,7 +11125,7 @@ AC_SUBST(DEFAULT_CRASHDUMP_VALUE) + dnl ================================================================== + dnl libcmis + dnl ================================================================== +-if test "$enable_libcmis" == "yes"; then ++if test "$enable_libcmis" = "yes"; then + if test "$enable_curl" != "yes"; then + AC_MSG_ERROR([--disable-libcmis must be used when --disable-curl is used]) + fi +-- +cgit v1.2.3 + 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 c905fabf5b30..000000000000 --- 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.5.8.2-icu-74-compatibility.patch b/app-office/libreoffice/files/libreoffice-7.5.8.2-icu-74-compatibility.patch deleted file mode 100644 index 6ac57a4b2c2b..000000000000 --- a/app-office/libreoffice/files/libreoffice-7.5.8.2-icu-74-compatibility.patch +++ /dev/null @@ -1,218 +0,0 @@ -https://bugs.gentoo.org/917618 -https://bugs.documentfoundation.org/show_bug.cgi?id=158108 - -From bcd5d851ebe91fc22edd3ea92be4a674bd13acba Mon Sep 17 00:00:00 2001 -From: Alfred Wingate <parona@protonmail.com> -Date: Mon, 20 Nov 2023 14:47:28 +0200 -Subject: [PATCH] Remove use of the now removed LBCMNoChain options - -* This change removes its use and explicitly prevents chaining where - the rule would have applied. - -https://github.com/unicode-org/icu/commit/84e47620692be90950d090f2f4722494b020ad96 -https://github.com/unicode-org/icu/commit/9d9256f3b792100cda697c7bcf52bacfbc3bca87 - -Signed-off-by: Alfred Wingate <parona@protonmail.com> ---- a/i18npool/source/breakiterator/data/line.txt -+++ b/i18npool/source/breakiterator/data/line.txt -@@ -14,7 +14,6 @@ - # - - !!chain; --!!LBCMNoChain; - - - !!lookAheadHardBreak; -@@ -206,13 +205,13 @@ $CR $LF {100}; - # - $LB4NonBreaks? $LB4Breaks {100}; # LB 5 do not break before hard breaks. - $CAN_CM $CM* $LB4Breaks {100}; --$CM+ $LB4Breaks {100}; -+^$CM+ $LB4Breaks {100}; - - # LB 7 x SP - # x ZW - $LB4NonBreaks [$SP $ZW]; - $CAN_CM $CM* [$SP $ZW]; --$CM+ [$SP $ZW]; -+^$CM+ [$SP $ZW]; - - # - # LB 8 Break after zero width space -@@ -226,14 +225,14 @@ $LB8NonBreaks = [[$LB4NonBreaks] - [$ZW]]; - # See definition of $CAN_CM. - - $CAN_CM $CM+; # Stick together any combining sequences that don't match other rules. --$CM+; -+^$CM+; - - # - # LB 11 Do not break before or after WORD JOINER & related characters. - # - $CAN_CM $CM* $WJcm; - $LB8NonBreaks $WJcm; --$CM+ $WJcm; -+^$CM+ $WJcm; - - $WJcm [^$CAN_CM]; - $WJcm $CAN_CM $CM*; -@@ -243,7 +242,7 @@ $WJcm $CAN_CM $CM*; - # - # (!SP) x GL - [$LB8NonBreaks-$SP] $CM* $GLcm; --$CM+ $GLcm; -+^$CM+ $GLcm; - - # GL x - $GLcm ($LB8Breaks | $SP); -@@ -260,19 +259,19 @@ $GLcm [$LB8NonBreaks-$SP] $CM*; # Don't let a combining mark go onto $CR, $B - # - $LB8NonBreaks $CL; - $CAN_CM $CM* $CL; --$CM+ $CL; # by rule 10, stand-alone CM behaves as AL -+^$CM+ $CL; # by rule 10, stand-alone CM behaves as AL - - $LB8NonBreaks $EX; - $CAN_CM $CM* $EX; --$CM+ $EX; # by rule 10, stand-alone CM behaves as AL -+^$CM+ $EX; # by rule 10, stand-alone CM behaves as AL - - $LB8NonBreaks $IS; - $CAN_CM $CM* $IS; --$CM+ $IS; # by rule 10, stand-alone CM behaves as AL -+^$CM+ $IS; # by rule 10, stand-alone CM behaves as AL - - $LB8NonBreaks $SY; - $CAN_CM $CM* $SY; --$CM+ $SY; # by rule 10, stand-alone CM behaves as AL -+^$CM+ $SY; # by rule 10, stand-alone CM behaves as AL - - - # -@@ -302,7 +301,7 @@ $LB18Breaks = [$LB8Breaks $SP]; - # LB 19 - # x QU - $LB18NonBreaks $CM* $QUcm; --$CM+ $QUcm; -+^$CM+ $QUcm; - - # QU x - $QUcm .?; -@@ -331,7 +330,7 @@ $HLcm ($HYcm | $BAcm) [^$CB]?; - - # LB 22 - ($ALcm | $HLcm) $INcm; --$CM+ $INcm; # by rule 10, any otherwise unattached CM behaves as AL -+^$CM+ $INcm; # by rule 10, any otherwise unattached CM behaves as AL - $IDcm $INcm; - $INcm $INcm; - $NUcm $INcm; -@@ -341,7 +340,7 @@ $NUcm $INcm; - $IDcm $POcm; - $ALcm $NUcm; # includes $LB19 - $HLcm $NUcm; --$CM+ $NUcm; # Rule 10, any otherwise unattached CM behaves as AL -+^$CM+ $NUcm; # Rule 10, any otherwise unattached CM behaves as AL - $NUcm $ALcm; - $NUcm $HLcm; - -@@ -373,7 +372,7 @@ $PRcm ($JLcm | $JVcm | $JTcm | $H2cm | $H3cm); - # LB 28 Do not break between alphabetics - # - ($ALcm | $HLcm) ($ALcm | $HLcm); --$CM+ ($ALcm | $HLcm); # The $CM+ is from rule 10, an unattached CM is treated as AL -+^$CM+ ($ALcm | $HLcm); # The $CM+ is from rule 10, an unattached CM is treated as AL - - # LB 29 - $IScm ($ALcm | $NUcm); -@@ -383,7 +382,7 @@ $IScm ($ALcm | $NUcm); - # and opening or closing punctuation - # - ($ALcm | $HLcm | $NUcm) $OPcm; --$CM+ $OPcm; -+^$CM+ $OPcm; - $CLcm ($ALcm | $HLcm | $NUcm); - - # -@@ -393,32 +392,32 @@ $CLcm ($ALcm | $HLcm | $NUcm); - - !!reverse; - --$CM+ $ALPlus; --$CM+ $BA; --$CM+ $BB; --$CM+ $B2; --$CM+ $CL; --$CM+ $EX; --$CM+ $GL; --$CM+ $HL; --$CM+ $HY; --$CM+ $H2; --$CM+ $H3; --$CM+ $ID; --$CM+ $IN; --$CM+ $IS; --$CM+ $JL; --$CM+ $JV; --$CM+ $JT; --$CM+ $NS; --$CM+ $NU; --$CM+ $OP; --$CM+ $PO; --$CM+ $PR; --$CM+ $QU; --$CM+ $SY; --$CM+ $WJ; --$CM+; -+^$CM+ $ALPlus; -+^$CM+ $BA; -+^$CM+ $BB; -+^$CM+ $B2; -+^$CM+ $CL; -+^$CM+ $EX; -+^$CM+ $GL; -+^$CM+ $HL; -+^$CM+ $HY; -+^$CM+ $H2; -+^$CM+ $H3; -+^$CM+ $ID; -+^$CM+ $IN; -+^$CM+ $IS; -+^$CM+ $JL; -+^$CM+ $JV; -+^$CM+ $JT; -+^$CM+ $NS; -+^$CM+ $NU; -+^$CM+ $OP; -+^$CM+ $PO; -+^$CM+ $PR; -+^$CM+ $QU; -+^$CM+ $SY; -+^$CM+ $WJ; -+^$CM+; - - - # -@@ -468,7 +467,7 @@ $LF $CR; - # X $CM needs to behave like X, where X is not $SP or controls. - # $CM not covered by the above needs to behave like $AL - # Stick together any combining sequences that don't match other rules. --$CM+ $CAN_CM; -+^$CM+ $CAN_CM; - - - # LB 11 -@@ -606,8 +605,8 @@ $CM* ($ALPlus | $HL | $NU) $CM* ($CL | $SY)+ [^$SP]; - !!safe_reverse; - - # LB 7 --$CM+ [^$CM $BK $CR $LF $NL $ZW $SP]; --$CM+ $SP / .; -+^$CM+ [^$CM $BK $CR $LF $NL $ZW $SP]; -+^$CM+ $SP / .; - - # LB 9 - $SP+ $CM* $OP; --- -2.42.1 - diff --git a/app-office/libreoffice/files/libreoffice-7.5.9.2-libxml2-2.12.patch b/app-office/libreoffice/files/libreoffice-7.5.9.2-libxml2-2.12.patch deleted file mode 100644 index bc7ae2a561ff..000000000000 --- a/app-office/libreoffice/files/libreoffice-7.5.9.2-libxml2-2.12.patch +++ /dev/null @@ -1,303 +0,0 @@ -From c8f7408db73d2f2ccacb25a2b4fef8dfebdfc6cb Mon Sep 17 00:00:00 2001 -From: Miklos Vajna <vmiklos@collabora.com> -Date: Mon, 27 Nov 2023 08:02:59 +0100 -Subject: tdf#158302 fix build against system-libxml-2.12 - -Seen in a fedora:40 container, using --with-system-libcmis, ---with-system-liblangtag and --with-system-xmlsec. - -Change-Id: I9d748d3dc0b70dbfdfcb6b99c9ce8440bda6f326 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159980 -Tested-by: Jenkins -Reviewed-by: Miklos Vajna <vmiklos@collabora.com> ---- - drawinglayer/source/tools/primitive2dxmldump.cxx | 1 + - filter/source/xsltfilter/LibXSLTTransformer.cxx | 2 +- - helpcompiler/source/HelpLinker.cxx | 4 ++++ - include/xmloff/xmltoken.hxx | 2 +- - sax/source/fastparser/fastparser.cxx | 2 +- - sc/source/core/tool/interpr7.cxx | 1 + - sc/source/filter/xml/XMLExportDataPilot.cxx | 2 +- - sc/source/filter/xml/XMLExportDatabaseRanges.cxx | 2 +- - sc/source/filter/xml/xmlfilti.cxx | 6 +++--- - unoxml/source/dom/attr.cxx | 1 + - unoxml/source/dom/document.cxx | 1 + - unoxml/source/dom/documentbuilder.cxx | 1 + - unoxml/source/dom/entity.cxx | 1 + - unoxml/source/xpath/xpathapi.cxx | 7 ++++++- - xmloff/source/core/xmltoken.cxx | 2 +- - xmloff/source/style/PageMasterStyleMap.cxx | 2 +- - xmlsecurity/inc/xmlsec-wrapper.h | 1 + - xmlsecurity/inc/xmlsec/saxhelper.hxx | 1 + - 18 files changed, 28 insertions(+), 11 deletions(-) - -diff --git a/drawinglayer/source/tools/primitive2dxmldump.cxx b/drawinglayer/source/tools/primitive2dxmldump.cxx -index 76aefec902ea..f3b9ef1bc919 100644 ---- a/drawinglayer/source/tools/primitive2dxmldump.cxx -+++ b/drawinglayer/source/tools/primitive2dxmldump.cxx -@@ -15,6 +15,7 @@ - - #include <math.h> - #include <memory> -+#include <libxml/parser.h> - #include <sal/log.hxx> - - #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx> -diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx -index 1a7c34805f1b..5e9a7c4bcd35 100644 ---- a/filter/source/xsltfilter/LibXSLTTransformer.cxx -+++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx -@@ -333,7 +333,7 @@ namespace XSLT - } - else - { -- xmlErrorPtr lastErr = xmlGetLastError(); -+ const xmlError* lastErr = xmlGetLastError(); - OUString msg; - if (lastErr) - msg = OStringToOUString(lastErr->message, RTL_TEXTENCODING_UTF8); -diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx -index 3d52834dbe6b..898a8b26392a 100644 ---- a/helpcompiler/source/HelpLinker.cxx -+++ b/helpcompiler/source/HelpLinker.cxx -@@ -815,7 +815,11 @@ static const HelpProcessingException* GpXMLParsingException = nullptr; - - extern "C" { - -+#if LIBXML_VERSION >= 21200 -+static void StructuredXMLErrorFunction(SAL_UNUSED_PARAMETER void *, const xmlError* error) -+#else - static void StructuredXMLErrorFunction(SAL_UNUSED_PARAMETER void *, xmlErrorPtr error) -+#endif - { - std::string aErrorMsg = error->message; - std::string aXMLParsingFile; -diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx -index 4e6441841774..ba42fae4d035 100644 ---- a/include/xmloff/xmltoken.hxx -+++ b/include/xmloff/xmltoken.hxx -@@ -744,7 +744,7 @@ namespace xmloff::token { - XML_EMBEDDED_VISIBLE_AREA, - XML_EMBOSSED, - XML_EMISSIVE_COLOR, -- XML_EMPTY, -+ XML_TOKEN_EMPTY, - XML_EMPTY_LINE_REFRESH, - XML_ENABLE_NUMBERING, - XML_ENABLED, -diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx -index ec8065016a12..e0338e053cf0 100644 ---- a/sax/source/fastparser/fastparser.cxx -+++ b/sax/source/fastparser/fastparser.cxx -@@ -578,7 +578,7 @@ Event& Entity::getEvent( CallbackType aType ) - OUString lclGetErrorMessage( xmlParserCtxtPtr ctxt, std::u16string_view sSystemId, sal_Int32 nLine ) - { - const char* pMessage; -- xmlErrorPtr error = xmlCtxtGetLastError( ctxt ); -+ const xmlError* error = xmlCtxtGetLastError( ctxt ); - if( error && error->message ) - pMessage = error->message; - else -diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx -index 352c7cf70e45..ecb4ea346396 100644 ---- a/sc/source/core/tool/interpr7.cxx -+++ b/sc/source/core/tool/interpr7.cxx -@@ -31,6 +31,7 @@ - #include <cstring> - #include <memory> - #include <string_view> -+#include <libxml/parser.h> - - using namespace com::sun::star; - -diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx -index da65bec0dab7..bd5f16d828ff 100644 ---- a/sc/source/filter/xml/XMLExportDataPilot.cxx -+++ b/sc/source/filter/xml/XMLExportDataPilot.cxx -@@ -123,7 +123,7 @@ void ScXMLExportDataPilot::WriteDPCondition(const ScQueryEntry& aQueryEntry, boo - - if (aQueryEntry.IsQueryByEmpty()) - { -- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, GetXMLToken(XML_EMPTY)); -+ rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, GetXMLToken(XML_TOKEN_EMPTY)); - } - else if (aQueryEntry.IsQueryByNonEmpty()) - { -diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx -index 6905e02d651b..e4307065bd92 100644 ---- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx -+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx -@@ -376,7 +376,7 @@ private: - case SC_EQUAL: - { - if (rEntry.IsQueryByEmpty()) -- return GetXMLToken(XML_EMPTY); -+ return GetXMLToken(XML_TOKEN_EMPTY); - else if (rEntry.IsQueryByNonEmpty()) - return GetXMLToken(XML_NOEMPTY); - -diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx -index 7585ce0c50fa..61f7cfe4a349 100644 ---- a/sc/source/filter/xml/xmlfilti.cxx -+++ b/sc/source/filter/xml/xmlfilti.cxx -@@ -370,7 +370,7 @@ void ScXMLConditionContext::GetOperator( - rEntry.eOp = SC_BOTPERC; - else if (IsXMLToken(aOpStr, XML_BOTTOM_VALUES)) - rEntry.eOp = SC_BOTVAL; -- else if (IsXMLToken(aOpStr, XML_EMPTY)) -+ else if (IsXMLToken(aOpStr, XML_TOKEN_EMPTY)) - rEntry.SetQueryByEmpty(); - else if (aOpStr == u">") - rEntry.eOp = SC_GREATER; -@@ -422,7 +422,7 @@ void SAL_CALL ScXMLConditionContext::endFastElement( sal_Int32 /*nElement*/ ) - if (maQueryItems.empty()) - { - ScQueryEntry::Item& rItem = rEntry.GetQueryItem(); -- if (IsXMLToken(sOperator, XML_EMPTY)) -+ if (IsXMLToken(sOperator, XML_TOKEN_EMPTY)) - return; - if (IsXMLToken(sDataType, XML_NUMBER)) - { -@@ -753,7 +753,7 @@ void SAL_CALL ScXMLDPConditionContext::endFastElement( sal_Int32 /*nElement*/ ) - else - aFilterField.eConnect = SC_AND; - pFilterContext->SetIsCaseSensitive(bIsCaseSensitive); -- if (IsXMLToken(sOperator, XML_EMPTY)) -+ if (IsXMLToken(sOperator, XML_TOKEN_EMPTY)) - aFilterField.SetQueryByEmpty(); - else if (IsXMLToken(sOperator, XML_NOEMPTY)) - aFilterField.SetQueryByNonEmpty(); -diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx -index dd974d910edb..d8d873cdf055 100644 ---- a/unoxml/source/dom/attr.cxx -+++ b/unoxml/source/dom/attr.cxx -@@ -22,6 +22,7 @@ - #include <string.h> - - #include <memory> -+#include <libxml/entities.h> - - #include <osl/diagnose.h> - #include <sal/log.hxx> -diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx -index cb48bd1635f8..0825fc2cd7ed 100644 ---- a/unoxml/source/dom/document.cxx -+++ b/unoxml/source/dom/document.cxx -@@ -41,6 +41,7 @@ - #include <eventdispatcher.hxx> - - #include <string.h> -+#include <libxml/xmlIO.h> - - #include <osl/diagnose.h> - -diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx -index c3cd7663d2fc..3898d58e4be4 100644 ---- a/unoxml/source/dom/documentbuilder.cxx -+++ b/unoxml/source/dom/documentbuilder.cxx -@@ -22,6 +22,7 @@ - #include <string.h> - - #include <libxml/xmlerror.h> -+#include <libxml/parser.h> - - #include <memory> - -diff --git a/unoxml/source/dom/entity.cxx b/unoxml/source/dom/entity.cxx -index ccc8a0872499..98909dfe8f12 100644 ---- a/unoxml/source/dom/entity.cxx -+++ b/unoxml/source/dom/entity.cxx -@@ -22,6 +22,7 @@ - #include <osl/diagnose.h> - - #include <string.h> -+#include <libxml/entities.h> - - using namespace css::uno; - using namespace css::xml::dom; -diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx -index a60083983882..c2b753783176 100644 ---- a/unoxml/source/xpath/xpathapi.cxx -+++ b/unoxml/source/xpath/xpathapi.cxx -@@ -26,6 +26,7 @@ - #include <libxml/xmlerror.h> - #include <libxml/xpath.h> - #include <libxml/xpathInternals.h> -+#include <libxml/xmlIO.h> - - #include <com/sun/star/xml/xpath/XPathException.hpp> - -@@ -217,7 +218,7 @@ namespace XPath - return selectSingleNode(contextNode, expr); - } - -- static OUString make_error_message(xmlErrorPtr pError) -+ static OUString make_error_message(const xmlError* pError) - { - OUStringBuffer buf; - if (pError) { -@@ -259,7 +260,11 @@ namespace XPath - SAL_WARN("unoxml", "libxml2 error: " << str); - } - -+#if LIBXML_VERSION >= 21200 -+ static void structured_error_func(void *, const xmlError* error) -+#else - static void structured_error_func(void *, xmlErrorPtr error) -+#endif - { - SAL_WARN("unoxml", "libxml2 error: " << make_error_message(error)); - } -diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx -index 6879f37db295..e11dc0d16111 100644 ---- a/xmloff/source/core/xmltoken.cxx -+++ b/xmloff/source/core/xmltoken.cxx -@@ -756,7 +756,7 @@ namespace xmloff::token { - TOKEN( "embedded-visible-area", XML_EMBEDDED_VISIBLE_AREA ), - TOKEN( "embossed", XML_EMBOSSED ), - TOKEN( "emissive-color", XML_EMISSIVE_COLOR ), -- TOKEN( "empty", XML_EMPTY ), -+ TOKEN( "empty", XML_TOKEN_EMPTY ), - TOKEN( "empty-line-refresh", XML_EMPTY_LINE_REFRESH ), - TOKEN( "enable-numbering", XML_ENABLE_NUMBERING ), - TOKEN( "enabled", XML_ENABLED ), -diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx -index 7b2cab4751aa..6f631289672b 100644 ---- a/xmloff/source/style/PageMasterStyleMap.cxx -+++ b/xmloff/source/style/PageMasterStyleMap.cxx -@@ -157,7 +157,7 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] = - PLMAP( PROP_FootnoteLineRelativeWidth, XML_NAMESPACE_STYLE, XML__EMPTY, XML_TYPE_PERCENT8|MID_FLAG_SPECIAL_ITEM, CTF_PM_FTN_LINE_WIDTH ), - PLMAP( PROP_FootnoteLineTextDistance, XML_NAMESPACE_STYLE, XML__EMPTY, XML_TYPE_MEASURE|MID_FLAG_SPECIAL_ITEM, CTF_PM_FTN_LINE_DISTANCE ), - PLMAP( PROP_FootnoteLineWeight, XML_NAMESPACE_STYLE, XML_FOOTNOTE_SEP, XML_TYPE_MEASURE16|MID_FLAG_ELEMENT_ITEM, CTF_PM_FTN_LINE_WEIGHT ), -- PLMAP( PROP_FootnoteLineStyle, XML_NAMESPACE_STYLE, XML_EMPTY, XML_TYPE_STRING|MID_FLAG_ELEMENT_ITEM, CTF_PM_FTN_LINE_STYLE ), -+ PLMAP( PROP_FootnoteLineStyle, XML_NAMESPACE_STYLE, XML_TOKEN_EMPTY, XML_TYPE_STRING|MID_FLAG_ELEMENT_ITEM, CTF_PM_FTN_LINE_STYLE ), - PLMAP_EXT(PROP_GutterMargin, XML_NAMESPACE_LO_EXT, XML_MARGIN_GUTTER, XML_TYPE_MEASURE, CTF_PM_MARGINGUTTER), - - ////////////////////////////////////////////////////////////////////////// -diff --git a/xmlsecurity/inc/xmlsec-wrapper.h b/xmlsecurity/inc/xmlsec-wrapper.h -index 7c6d267e8b73..3ad705400c52 100644 ---- a/xmlsecurity/inc/xmlsec-wrapper.h -+++ b/xmlsecurity/inc/xmlsec-wrapper.h -@@ -23,6 +23,7 @@ - - #include <sal/types.h> - -+#include <libxml/parser.h> - #include <xmlsec/base64.h> - #include <xmlsec/bn.h> - #include <xmlsec/errors.h> -diff --git a/xmlsecurity/inc/xmlsec/saxhelper.hxx b/xmlsecurity/inc/xmlsec/saxhelper.hxx -index a49ccef1894c..a5863ffd0e2a 100644 ---- a/xmlsecurity/inc/xmlsec/saxhelper.hxx -+++ b/xmlsecurity/inc/xmlsec/saxhelper.hxx -@@ -23,6 +23,7 @@ - - #include <string_view> - -+#include <libxml/parser.h> - #include <libxml/tree.h> - - #include <rtl/ustring.hxx> --- -cgit v1.2.1 - diff --git a/app-office/libreoffice/files/libreoffice-7.6.5.2-gcc14.patch b/app-office/libreoffice/files/libreoffice-7.6.5.2-gcc14.patch deleted file mode 100644 index a98012320375..000000000000 --- a/app-office/libreoffice/files/libreoffice-7.6.5.2-gcc14.patch +++ /dev/null @@ -1,38 +0,0 @@ -https://github.com/LibreOffice/core/commit/db98a3f1b1a703ea8e1284b8815eea2274abb2db - -From db98a3f1b1a703ea8e1284b8815eea2274abb2db Mon Sep 17 00:00:00 2001 -From: Martin Jambor <mjambor@suse.cz> -Date: Wed, 7 Jun 2023 18:11:45 +0200 -Subject: [PATCH] Add cstdlib include necessary to build with gcc14 libstdc++ - (tdf#155715) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Without explicitely including <cstdlib>, compiling some files -including store/source/storbase.hxx (such as store/source/storpage.cxx -which includes it through store/source/storpage.hxx) will result in -errors: - - error: ‘malloc’ is not a member of ‘std’ - -and - - error: ‘free’ is not a member of ‘std’ - -This patch simply adds the necessary include. - -Change-Id: I3d1fa2a17c5ae9d512f1de9d434dac3d82fc353f -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152712 -Tested-by: Jenkins -Reviewed-by: Stephan Bergmann <sbergman@redhat.com> ---- a/store/source/storbase.hxx -+++ b/store/source/storbase.hxx -@@ -32,6 +32,7 @@ - - #include <store/types.h> - -+#include <cstdlib> - #include <memory> - #include <utility> - diff --git a/app-office/libreoffice/files/libreoffice-7.6.6.3-autoconf-2.72.patch b/app-office/libreoffice/files/libreoffice-7.6.6.3-autoconf-2.72.patch deleted file mode 100644 index 749231a595e5..000000000000 --- a/app-office/libreoffice/files/libreoffice-7.6.6.3-autoconf-2.72.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 78629e74e1e046a9ae4945088e2f7afde6db88d6 Mon Sep 17 00:00:00 2001 -From: Fridrich Strba <fridrich_strba@opensuse.org> -Date: Tue, 12 Mar 2024 11:34:52 +0100 -Subject: Fix build with autoconf 2.72 - -This commit http://git.savannah.gnu.org/gitweb/ -?p=autoconf.git;a=commitdiff; -h=cf09f48841b66fe76f606dd6018bb3a93242a7c9 -changed the internal cache variable name and its content - -The effects show later in message like -/tmp/ccyB6wS6.ltrans9.ltrans.o: in function `comphelper::DocPasswordHelper::decryptGpgSession(com::sun::star::uno::Sequence<com::sun::star::uno::Sequence<com::sun::star::beans::NamedValue> > const&)': -/home/abuild/rpmbuild/BUILD/libreoffice-24.2.1.2/comphelper/source/misc/docpasswordhelper.cxx:705:(.text+0x4fb7): undefined reference to `GpgME::Data::seek(long, int)' -/usr/bin/ld.bfd: /home/abuild/rpmbuild/BUILD/libreoffice-24.2.1.2/comphelper/source/misc/docpasswordhelper.cxx:716:(.text+0x5402): undefined reference to `GpgME::Data::seek(long, int)' -/usr/bin/ld.bfd: /tmp/ccyB6wS6.ltrans13.ltrans.o: in function `comphelper::OStorageHelper::CreateGpgPackageEncryptionData()': -/home/abuild/rpmbuild/BUILD/libreoffice-24.2.1.2/comphelper/source/misc/storagehelper.cxx:507:(.text+0x64e3): undefined reference to `GpgME::Data::seek(long, int)' -/usr/bin/ld.bfd: /home/abuild/rpmbuild/BUILD/libreoffice-24.2.1.2/comphelper/source/misc/storagehelper.cxx:520:(.text+0x6583): undefined reference to `GpgME::Data::seek(long, int)' -collect2: error: ld returned 1 exit status - -Where the type 'off_t' at the time of inclusion of the header and -at the time of compilation of the library differ. - -Change-Id: Ie0486dbc869e84f5fb2688473334cfe464abd570 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164704 -Tested-by: Jenkins -Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164715 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164764 -Reviewed-by: Miklos Vajna <vmiklos@collabora.com> -Reviewed-by: Michael Meeks <michael.meeks@collabora.com> -Tested-by: Stephan Bergmann <stephan.bergmann@allotropia.de> ---- - configure.ac | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 8101a2b2e1dd..758e160400ba 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -7197,7 +7197,9 @@ if test "$_os" != "WINNT"; then - - dnl Check for large file support - AC_SYS_LARGEFILE -- if test -n "$ac_cv_sys_file_offset_bits" -a "$ac_cv_sys_file_offset_bits" != "no"; then -+ if test -n "$ac_cv_sys_largefile_opts" -a "$ac_cv_sys_largefile_opts" != "none needed" -a "$ac_cv_sys_largefile_opts" != "support not detected"; then -+ LFS_CFLAGS="$ac_cv_sys_largefile_opts" -+ elif test -n "$ac_cv_sys_file_offset_bits" -a "$ac_cv_sys_file_offset_bits" != "no"; then - LFS_CFLAGS="-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits" - fi - if test -n "$ac_cv_sys_large_files" -a "$ac_cv_sys_large_files" != "no"; then --- -cgit v1.2.3 - diff --git a/app-office/libreoffice/libreoffice-7.6.7.2.ebuild b/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild index a31c6b56b657..4ee54961e0ee 100644 --- a/app-office/libreoffice/libreoffice-7.6.7.2.ebuild +++ b/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild @@ -26,6 +26,7 @@ inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 mult DESCRIPTION="A full office productivity suite" HOMEPAGE="https://www.libreoffice.org" SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-24.2.3.2-icu-74.tar.xz" [[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}" # Split modules following git/tarballs; Core MUST be first! @@ -51,7 +52,9 @@ ADDONS_SRC=( # not packaged in Gentoo, https://github.com/serge-sans-paille/frozen "${ADDONS_URI}/frozen-1.1.1.tar.gz" # not packaged in Gentoo, https://skia.org/ - "${ADDONS_URI}/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz" + "${ADDONS_URI}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz" + # not packaged in Gentoo, https://github.com/tsyrogit/zxcvbn-c + "${ADDONS_URI}/zxcvbn-c-2.5.tar.gz" "base? ( ${ADDONS_URI}/commons-logging-1.2-src.tar.gz ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip @@ -66,7 +69,11 @@ ADDONS_SRC=( ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip )" - "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" + # Java-WebSocket: not packaged in Gentoo, https://github.com/TooTallNate/Java-WebSocket + "java? ( + ${ADDONS_URI}/Java-WebSocket-1.5.4.tar.gz + ${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 @@ -103,11 +110,12 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" [[ ${MY_PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux" COMMON_DEPEND="${PYTHON_DEPS} app-arch/unzip app-arch/zip + app-crypt/argon2:= app-crypt/gpgme:=[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 @@ -134,7 +142,7 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-libs/expat dev-libs/hyphen dev-libs/icu:= - dev-libs/libassuan + dev-libs/libassuan:= dev-libs/libgpg-error >=dev-libs/liborcus-0.18.0:0/0.18 dev-libs/librevenge @@ -235,7 +243,7 @@ DEPEND="${COMMON_DEPEND} x11-libs/libXtst java? ( dev-java/ant:0 - >=virtual/jdk-11 + >=virtual/jdk-17 ) test? ( app-crypt/gnupg @@ -294,17 +302,18 @@ PATCHES=( # 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" - - # 24.2 branch - "${FILESDIR}/${PN}-7.6.6.3-autoconf-2.72.patch" # bug 925162 - "${FILESDIR}/${PN}-7.6.5.2-gcc14.patch" # bug 928152 + "${FILESDIR}/${PN}-24.2-qtdetect.patch" # TODO: upstream "${FILESDIR}/${PN}-7.6-unused-qt5network.patch" - - # maybe upstreamable - "${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch" + "${FILESDIR}/${PN}-24.2-unused-qt6network.patch" + + # git master + "${FILESDIR}/${PN}-24.2.3.2-fix-bashism.patch" # bug #928733 + # bug #917618, thx to Debian: + "${WORKDIR}/${PN}-24.2.3.2-icu-74/${PN}-24.2.3.2-icu-74.2-reviewed-breakIterator-customizations.patch" + "${WORKDIR}/${PN}-24.2.3.2-icu-74/${PN}-24.2.3.2-icu-74.2-breakiterator-updates.patch" + "${WORKDIR}/${PN}-24.2.3.2-icu-74/${PN}-24.2.3.2-icu-74-unicode.patch" ) S="${WORKDIR}/${PN}-${MY_PV}" @@ -488,10 +497,11 @@ src_configure() { --enable-build-opensymbol --enable-cairo-canvas --enable-largefile - --enable-mergelibs + --enable-mergelibs=more --enable-python=system --enable-randr --enable-release-build + --disable-atspi-tests # bug 933257 --disable-breakpad --disable-bundle-mariadb --disable-ccache @@ -525,6 +535,7 @@ src_configure() { --without-system-jfreereport --without-system-libfixmath --without-system-sane + --without-system-zxcvbn $(use_enable base report-builder) $(use_enable bluetooth sdremote-bluetooth) $(use_enable coinmp) diff --git a/app-office/libreoffice/libreoffice-24.2.3.2.ebuild b/app-office/libreoffice/libreoffice-24.2.6.2.ebuild index b2b4c6c66ef4..0f81657dd272 100644 --- a/app-office/libreoffice/libreoffice-24.2.3.2.ebuild +++ b/app-office/libreoffice/libreoffice-24.2.6.2.ebuild @@ -26,6 +26,7 @@ inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 mult DESCRIPTION="A full office productivity suite" HOMEPAGE="https://www.libreoffice.org" SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-24.2.3.2-icu-74.tar.xz" [[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}" # Split modules following git/tarballs; Core MUST be first! @@ -109,8 +110,8 @@ RESTRICT="!test? ( test )" LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" -#[[ ${MY_PV} == *9999* ]] || \ -#KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux" +[[ ${MY_PV} == *9999* ]] || \ +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86 ~amd64-linux" COMMON_DEPEND="${PYTHON_DEPS} app-arch/unzip @@ -142,7 +143,7 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-libs/expat dev-libs/hyphen dev-libs/icu:= - dev-libs/libassuan + dev-libs/libassuan:= dev-libs/libgpg-error >=dev-libs/liborcus-0.18.0:0/0.18 dev-libs/librevenge @@ -312,16 +313,18 @@ PATCHES=( # "${WORKDIR}"/${PATCHSET/.tar.xz/} # not upstreamable stuff - "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" "${FILESDIR}/${PN}-6.1-nomancompress.patch" "${FILESDIR}/${PN}-24.2-qtdetect.patch" - # maybe upstreamable - "${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch" - # TODO: upstream "${FILESDIR}/${PN}-7.6-unused-qt5network.patch" "${FILESDIR}/${PN}-24.2-unused-qt6network.patch" + + # git master + # bug #917618, thx to Debian: + "${WORKDIR}/${PN}-24.2.3.2-icu-74/${PN}-24.2.3.2-icu-74.2-reviewed-breakIterator-customizations.patch" + "${WORKDIR}/${PN}-24.2.3.2-icu-74/${PN}-24.2.3.2-icu-74.2-breakiterator-updates.patch" + "${WORKDIR}/${PN}-24.2.3.2-icu-74/${PN}-24.2.3.2-icu-74-unicode.patch" ) S="${WORKDIR}/${PN}-${MY_PV}" @@ -514,6 +517,7 @@ src_configure() { --enable-python=system --enable-randr --enable-release-build + --disable-atspi-tests # bug 933257 --disable-breakpad --disable-bundle-mariadb --disable-ccache diff --git a/app-office/libreoffice/libreoffice-24.2.9999.ebuild b/app-office/libreoffice/libreoffice-24.2.9999.ebuild index 1d2cd2085e48..1360d7d1e65e 100644 --- a/app-office/libreoffice/libreoffice-24.2.9999.ebuild +++ b/app-office/libreoffice/libreoffice-24.2.9999.ebuild @@ -142,7 +142,7 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-libs/expat dev-libs/hyphen dev-libs/icu:= - dev-libs/libassuan + dev-libs/libassuan:= dev-libs/libgpg-error >=dev-libs/liborcus-0.18.0:0/0.18 dev-libs/librevenge @@ -312,7 +312,6 @@ PATCHES=( # "${WORKDIR}"/${PATCHSET/.tar.xz/} # not upstreamable stuff - "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" "${FILESDIR}/${PN}-6.1-nomancompress.patch" "${FILESDIR}/${PN}-24.2-qtdetect.patch" @@ -511,6 +510,7 @@ src_configure() { --enable-python=system --enable-randr --enable-release-build + --disable-atspi-tests # bug 933257 --disable-breakpad --disable-bundle-mariadb --disable-ccache diff --git a/app-office/libreoffice/libreoffice-7.6.4.1.ebuild b/app-office/libreoffice/libreoffice-7.6.4.1.ebuild deleted file mode 100644 index e69a806f2b3b..000000000000 --- a/app-office/libreoffice/libreoffice-7.6.4.1.ebuild +++ /dev/null @@ -1,668 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -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=( - # not packaged in Gentoo - "${ADDONS_URI}/dragonbox-1.1.3.tar.gz" - # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c - "${ADDONS_URI}/dtoa-20180411.tgz" - # not packaged in Gentoo, https://github.com/serge-sans-paille/frozen - "${ADDONS_URI}/frozen-1.1.1.tar.gz" - # not packaged in Gentoo, https://skia.org/ - "${ADDONS_URI}/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.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 valgrind vulkan -$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - base? ( java ) - 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 ~loong ppc64 ~riscv x86 ~amd64-linux" - -COMMON_DEPEND="${PYTHON_DEPS} - app-arch/unzip - app-arch/zip - app-crypt/gpgme:=[cxx] - app-text/hunspell:= - >=app-text/libabw-0.1.0 - >=app-text/libebook-0.1 - app-text/libepubgen - >=app-text/libetonyek-0.1 - app-text/libexttextcat - app-text/liblangtag - >=app-text/libmspub-0.1.0 - >=app-text/libmwaw-0.3.21 - >=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.6.2:0= - 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.18.0:0/0.18 - 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.35:=[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-5.1.0:=[graphite,icu] - media-libs/lcms:2 - >=media-libs/libcdr-0.1.0 - >=media-libs/libepoxy-1.3.1[X] - >=media-libs/libfreehand-0.1.0 - media-libs/libjpeg-turbo:= - media-libs/libpagemaker - >=media-libs/libpng-1.4:0= - >=media-libs/libvisio-0.1.0 - media-libs/libwebp:= - media-libs/libzmf - media-libs/openjpeg:= - media-libs/tiff:= - media-libs/zxing-cpp:= - net-misc/curl - sci-mathematics/lpsolve:= - sys-libs/zlib - virtual/opengl - x11-libs/cairo[X] - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - accessibility? ( - $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]') - ) - bluetooth? ( - dev-libs/glib:2 - net-wireless/bluez - ) - coinmp? ( sci-libs/coinor-mp ) - cups? ( net-print/cups ) - dbus? ( sys-apps/dbus ) - eds? ( - dev-libs/glib:2 - >=gnome-base/dconf-0.40.0 - 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? ( - app-accessibility/at-spi2-core:2 - dev-libs/glib:2 - dev-libs/gobject-introspection - gnome-base/dconf - media-libs/mesa[egl(+)] - x11-libs/gtk+:3[X] - x11-libs/pango - ) - kde? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - kde-frameworks/kconfig:5 - kde-frameworks/kcoreaddons:5 - kde-frameworks/ki18n:5 - kde-frameworks/kio:5 - kde-frameworks/kwindowsystem:5 - ) - ldap? ( net-nds/openldap:= ) - libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) - libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 ) - mariadb? ( dev-db/mariadb-connector-c:= ) - !mariadb? ( dev-db/mysql-connector-c:= ) - pdfimport? ( >=app-text/poppler-22.06:=[cxx] ) - postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) -" -# FIXME: cppunit should be moved to test conditional -# after everything upstream is under gbuild -# as dmake execute tests right away -# tests apparently also need google-carlito-fonts (not packaged) -DEPEND="${COMMON_DEPEND} - >=dev-libs/libatomic_ops-7.2d - dev-perl/Archive-Zip - >=dev-util/cppunit-1.14.0 - >=dev-util/gperf-3.1 - dev-util/mdds:1/2.1 - media-libs/glm - x11-base/xorg-proto - x11-libs/libXt - x11-libs/libXtst - java? ( - dev-java/ant-core - >=virtual/jdk-11 - ) - test? ( - app-crypt/gnupg - dev-util/cppunit - media-fonts/dejavu - media-fonts/liberation-fonts - ) - valgrind? ( dev-debug/valgrind ) -" -RDEPEND="${COMMON_DEPEND} - acct-group/libreoffice - acct-user/libreoffice - !app-office/libreoffice-bin - !app-office/libreoffice-bin-debug - media-fonts/liberation-fonts - || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) - java? ( >=virtual/jre-11 ) - kde? ( kde-frameworks/breeze-icons:* ) -" -BDEPEND=" - dev-util/intltool - sys-apps/which - app-alternatives/yacc - app-alternatives/lex - sys-devel/gettext - virtual/pkgconfig - clang? ( - || ( - ( sys-devel/clang:18 - sys-devel/llvm:18 - =sys-devel/lld-18* ) - ( sys-devel/clang:17 - sys-devel/llvm:17 - =sys-devel/lld-17* ) - ( sys-devel/clang:16 - sys-devel/llvm:16 - =sys-devel/lld-16* ) - ( sys-devel/clang:15 - sys-devel/llvm:15 - =sys-devel/lld-15* ) - ) - ) - odk? ( >=app-text/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. - RDEPEND+=" !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" - - # maybe upstreamable - "${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch" - - # 24.2 branch - "${FILESDIR}/${PN}-7.5.9.2-libxml2-2.12.patch" # bug 917691 -) - -S="${WORKDIR}/${PN}-${MY_PV}" - -_check_reqs() { - CHECKREQS_MEMORY="512M" - if is-flagq "-g*" && ! is-flagq "-g*0" ; then - CHECKREQS_DISK_BUILD="22G" - else - CHECKREQS_DISK_BUILD="6G" - fi - check-reqs_$1 -} - -pkg_pretend() { - use base || - ewarn "If you plan to use Base application you must enable USE base." - use java || - ewarn "Without USE java, several wizards are not going to be available." - - [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend -} - -pkg_setup() { - java-pkg-opt-2_pkg_setup - python-single-r1_pkg_setup - xdg_environment_reset - - [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup -} - -src_unpack() { - default - - if [[ ${MY_PV} = *9999* ]]; then - local base_uri branch mypv - base_uri="https://anongit.freedesktop.org/git" - branch="master" - mypv=${MY_PV/.9999} - [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}" - git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}" - git-r3_checkout "${base_uri}/${PN}/core" - LOCOREGIT_VERSION=${EGIT_VERSION} - - git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master" - git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help - fi -} - -src_prepare() { - default - - # sandbox violations on many systems, we don't need it. Bug #646406 - sed -i \ - -e "/KF5_CONFIG/s/kf5-config/no/" \ - configure.ac || die "Failed to disable kf5-config" - - AT_M4DIR="m4" eautoreconf - # hack in the autogen.sh - touch autogen.lastrun - - # sed in the tests - sed -i \ - -e "s#all : build unitcheck#all : build#g" \ - solenv/gbuild/Module.mk || die - sed -i \ - -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \ - -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \ - Makefile.in || die - - sed -i \ - -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \ - -e "s,\$INSTALLDIRNAME.sh,${PN}," \ - bin/distro-install-desktop-integration || die - - if use branding; then - # hack... - mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die - fi - - # Don't list pdfimport support in desktop when built with none, bug # 605464 - if ! use pdfimport; then - sed -i \ - -e ":MimeType: s:application/pdf;::" \ - -e ":Keywords: s:pdf;::" \ - sysui/desktop/menus/draw.desktop || die - fi -} - -src_configure() { - # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys - # Note: these are for Gentoo use ONLY. For your own distribution, please get - # your own set of keys. Feel free to contact chromium@gentoo.org for more info. - local google_default_client_id="329227923882.apps.googleusercontent.com" - local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" - - # Show flags set at the beginning - einfo "Preset CFLAGS: ${CFLAGS}" - einfo "Preset LDFLAGS: ${LDFLAGS}" - - # Workaround for bug #915067 - append-ldflags $(test-flags-CCLD -Wl,--undefined-version) - - 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" - - # Workaround for bug #907905 - filter-lto - - # Not implemented by Clang, bug #903889 - filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch - else - # Force gcc - einfo "Enforcing the use of gcc due to USE=-clang ..." - AR=gcc-ar - CC=${CHOST}-gcc - CXX=${CHOST}-g++ - NM=gcc-nm - RANLIB=gcc-ranlib - - # Apparently the Clang flags get used even for GCC builds sometimes. - # bug #838115 - sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die - fi - - if use custom-cflags ; then - elog "USE=custom-cflags has been selected. You are on your own to make sure that" - elog "the build succeeds. Good luck!" - else - strip-flags - fi - - export LO_CLANG_CC=${CC} - export LO_CLANG_CXX=${CXX} - - # Show flags set at the end - einfo " Used CFLAGS: ${CFLAGS}" - einfo " Used LDFLAGS: ${LDFLAGS}" - - # Ensure we use correct toolchain - tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG - - # optimization flags - export GMAKE_OPTIONS="${MAKEOPTS}" - # System python enablement: - export PYTHON_CFLAGS=$(python_get_CFLAGS) - export PYTHON_LIBS=$(python_get_LIBS) - - use kde && export QT5DIR="$(qt5_get_bindir)/.." - - local gentoo_buildid="Gentoo official package" - if [[ -n ${LOCOREGIT_VERSION} ]]; then - gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})" - fi - - # system headers/libs/...: enforce using system packages - # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad - # --enable-cairo: ensure that cairo is always required - # --enable-*-link: link to the library rather than just dlopen on runtime - # --enable-release-build: build the libreoffice as release - # --disable-fetch-external: prevent dowloading during compile phase - # --enable-extension-integration: enable any extension integration support - # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs - # --disable-report-builder: too much java packages pulled in without pkgs - # --without-system-sane: just sane.h header that is used for scan in writer, - # not linked or anything else, worthless to depend on - # --disable-pdfium: not yet packaged - local myeconfargs=( - --with-system-dicts - --with-system-epoxy - --with-system-headers - --with-system-jars - --with-system-libs - --enable-build-opensymbol - --enable-cairo-canvas - --enable-largefile - --enable-mergelibs - --enable-python=system - --enable-randr - --enable-release-build - --disable-breakpad - --disable-bundle-mariadb - --disable-ccache - --disable-epm - --disable-fetch-external - --disable-gtk3-kde5 - --disable-online-update - --disable-openssl - --disable-pdfium - --disable-qt6 - --with-extra-buildid="${gentoo_buildid}" - --enable-extension-integration - --with-external-dict-dir="${EPREFIX}/usr/share/myspell" - --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" - --with-external-thes-dir="${EPREFIX}/usr/share/myspell" - --with-external-tar="${DISTDIR}" - --with-lang="" - --with-parallelism=$(makeopts_jobs) - --with-system-openjpeg - --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-abseil - --without-system-dragonbox - --without-system-frozen - --without-system-jfreereport - --without-system-libfixmath - --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) - $(use_with valgrind) - ) - - if use eds || use gtk; then - myeconfargs+=( --enable-dconf --enable-gio ) - else - myeconfargs+=( --disable-dconf --disable-gio ) - fi - - # libreoffice extensions handling - for lo_xt in ${LO_EXTS}; do - if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then - myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) ) - else - myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) ) - fi - done - - if use java; then - # hsqldb: system one is too new - myeconfargs+=( - --without-junit - --without-system-hsqldb - --with-ant-home="${ANT_HOME}" - --with-jdk-home="${JAVA_HOME}" - ) - - use libreoffice_extensions_scripting-beanshell && \ - myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) ) - - use libreoffice_extensions_scripting-javascript && \ - myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) ) - fi - - tc-is-lto && myeconfargs+=( --enable-lto ) - - MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ - econf "${myeconfargs[@]}" -} - -src_compile() { - # more and more LO stuff tries to use OpenGL, including tests during build - # bug 501508, bug 540624, bug 545974 and probably more - addpredict /dev/dri - addpredict /dev/ati - addpredict /dev/nvidiactl - - default -} - -src_test() { - emake unitcheck - emake slowcheck -} - -src_install() { - emake DESTDIR="${D}" distro-pack-install -o build -o check - - # bug 593514 - if use gtk; then - dosym libreoffice/program/liblibreofficekitgtk.so \ - /usr/$(get_libdir)/liblibreofficekitgtk.so - fi - - # bash completion aliases - bashcomp_alias \ - libreoffice \ - unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice - - if use branding; then - insinto /usr/$(get_libdir)/${PN}/program - newins "${WORKDIR}/branding-sofficerc" sofficerc - dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die - fi - - # bug 703474 - insinto /usr/include - doins -r include/LibreOfficeKit - - local lodir=/usr/$(get_libdir)/libreoffice - # patching this would break tests - cat <<-EOF > "${T}"/uno.py -import sys, os -sys.path.append('${EPREFIX}${lodir}/program') -os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc') -EOF - sed -e "/^import sys/d" -e "/^import os/d" \ - -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed" - cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die - cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die - - # more system pyuno mess - sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \ - -i "${D}"${lodir}/program/officehelper.py || die - - python_optimize "${D}"${lodir}/program - # link python bridge in site-packages, bug 667802 - local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program - for py in uno.py unohelper.py officehelper.py; do - dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py} - while IFS="" read -d $'\0' -r pyc; do - pyc=${pyc//*\/} - dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc} - done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0) - done - - newinitd "${FILESDIR}/libreoffice.initd" libreoffice - newconfd "${FILESDIR}/libreoffice.confd" libreoffice -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/app-office/libreoffice/libreoffice-7.6.6.3.ebuild b/app-office/libreoffice/libreoffice-7.6.6.3.ebuild deleted file mode 100644 index a55a9183b3ce..000000000000 --- a/app-office/libreoffice/libreoffice-7.6.6.3.ebuild +++ /dev/null @@ -1,672 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -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=( - # not packaged in Gentoo - "${ADDONS_URI}/dragonbox-1.1.3.tar.gz" - # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c - "${ADDONS_URI}/dtoa-20180411.tgz" - # not packaged in Gentoo, https://github.com/serge-sans-paille/frozen - "${ADDONS_URI}/frozen-1.1.1.tar.gz" - # not packaged in Gentoo, https://skia.org/ - "${ADDONS_URI}/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.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 valgrind vulkan -$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - base? ( java ) - 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 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux" - -COMMON_DEPEND="${PYTHON_DEPS} - app-arch/unzip - app-arch/zip - app-crypt/gpgme:=[cxx] - app-text/hunspell:= - >=app-text/libabw-0.1.0 - >=app-text/libebook-0.1 - app-text/libepubgen - >=app-text/libetonyek-0.1 - app-text/libexttextcat - app-text/liblangtag - >=app-text/libmspub-0.1.0 - >=app-text/libmwaw-0.3.21 - >=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.6.2:0= - 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.18.0:0/0.18 - 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.35:=[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-5.1.0:=[graphite,icu] - media-libs/lcms:2 - >=media-libs/libcdr-0.1.0 - >=media-libs/libepoxy-1.3.1[X] - >=media-libs/libfreehand-0.1.0 - media-libs/libjpeg-turbo:= - media-libs/libpagemaker - >=media-libs/libpng-1.4:0= - >=media-libs/libvisio-0.1.0 - media-libs/libwebp:= - media-libs/libzmf - media-libs/openjpeg:= - media-libs/tiff:= - media-libs/zxing-cpp:= - net-misc/curl - sci-mathematics/lpsolve:= - sys-libs/zlib - virtual/opengl - x11-libs/cairo[X] - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - accessibility? ( - $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]') - ) - bluetooth? ( - dev-libs/glib:2 - net-wireless/bluez - ) - coinmp? ( sci-libs/coinor-mp ) - cups? ( net-print/cups ) - dbus? ( sys-apps/dbus ) - eds? ( - dev-libs/glib:2 - >=gnome-base/dconf-0.40.0 - 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? ( - app-accessibility/at-spi2-core:2 - dev-libs/glib:2 - dev-libs/gobject-introspection - gnome-base/dconf - media-libs/mesa[egl(+)] - x11-libs/gtk+:3[X] - x11-libs/pango - ) - kde? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - kde-frameworks/kconfig:5 - kde-frameworks/kcoreaddons:5 - kde-frameworks/ki18n:5 - kde-frameworks/kio:5 - kde-frameworks/kwindowsystem:5 - ) - ldap? ( net-nds/openldap:= ) - libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) - libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 ) - mariadb? ( dev-db/mariadb-connector-c:= ) - !mariadb? ( dev-db/mysql-connector-c:= ) - pdfimport? ( >=app-text/poppler-22.06:=[cxx] ) - postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) -" -# FIXME: cppunit should be moved to test conditional -# after everything upstream is under gbuild -# as dmake execute tests right away -# tests apparently also need google-carlito-fonts (not packaged) -DEPEND="${COMMON_DEPEND} - >=dev-libs/libatomic_ops-7.2d - dev-perl/Archive-Zip - >=dev-util/cppunit-1.14.0 - >=dev-util/gperf-3.1 - dev-util/mdds:1/2.1 - media-libs/glm - x11-base/xorg-proto - x11-libs/libXt - x11-libs/libXtst - java? ( - dev-java/ant:0 - >=virtual/jdk-11 - ) - test? ( - app-crypt/gnupg - dev-util/cppunit - media-fonts/dejavu - media-fonts/liberation-fonts - ) - valgrind? ( dev-debug/valgrind ) -" -RDEPEND="${COMMON_DEPEND} - acct-group/libreoffice - acct-user/libreoffice - !app-office/libreoffice-bin - !app-office/libreoffice-bin-debug - media-fonts/liberation-fonts - || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) - java? ( >=virtual/jre-11 ) - kde? ( kde-frameworks/breeze-icons:* ) -" -BDEPEND=" - dev-util/intltool - sys-apps/which - app-alternatives/yacc - app-alternatives/lex - sys-devel/gettext - virtual/pkgconfig - clang? ( - || ( - ( sys-devel/clang:18 - sys-devel/llvm:18 - =sys-devel/lld-18* ) - ( sys-devel/clang:17 - sys-devel/llvm:17 - =sys-devel/lld-17* ) - ( sys-devel/clang:16 - sys-devel/llvm:16 - =sys-devel/lld-16* ) - ( sys-devel/clang:15 - sys-devel/llvm:15 - =sys-devel/lld-15* ) - ) - ) - odk? ( >=app-text/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. - RDEPEND+=" !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" - - # 24.2 branch - "${FILESDIR}/${P}-autoconf-2.72.patch" # bug 925162 - "${FILESDIR}/${PN}-7.6.5.2-gcc14.patch" # bug 928152 - - # TODO: upstream - "${FILESDIR}/${PN}-7.6-unused-qt5network.patch" - - # maybe upstreamable - "${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch" -) - -S="${WORKDIR}/${PN}-${MY_PV}" - -_check_reqs() { - CHECKREQS_MEMORY="512M" - if is-flagq "-g*" && ! is-flagq "-g*0" ; then - CHECKREQS_DISK_BUILD="22G" - else - CHECKREQS_DISK_BUILD="6G" - fi - check-reqs_$1 -} - -pkg_pretend() { - use base || - ewarn "If you plan to use Base application you must enable USE base." - use java || - ewarn "Without USE java, several wizards are not going to be available." - - [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend -} - -pkg_setup() { - java-pkg-opt-2_pkg_setup - python-single-r1_pkg_setup - xdg_environment_reset - - [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup -} - -src_unpack() { - default - - if [[ ${MY_PV} = *9999* ]]; then - local base_uri branch mypv - base_uri="https://anongit.freedesktop.org/git" - branch="master" - mypv=${MY_PV/.9999} - [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}" - git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}" - git-r3_checkout "${base_uri}/${PN}/core" - LOCOREGIT_VERSION=${EGIT_VERSION} - - git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master" - git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help - fi -} - -src_prepare() { - default - - # sandbox violations on many systems, we don't need it. Bug #646406 - sed -i \ - -e "/KF5_CONFIG/s/kf5-config/no/" \ - configure.ac || die "Failed to disable kf5-config" - - AT_M4DIR="m4" eautoreconf - # hack in the autogen.sh - touch autogen.lastrun - - # sed in the tests - sed -i \ - -e "s#all : build unitcheck#all : build#g" \ - solenv/gbuild/Module.mk || die - sed -i \ - -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \ - -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \ - Makefile.in || die - - sed -i \ - -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \ - -e "s,\$INSTALLDIRNAME.sh,${PN}," \ - bin/distro-install-desktop-integration || die - - if use branding; then - # hack... - mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die - fi - - # Don't list pdfimport support in desktop when built with none, bug # 605464 - if ! use pdfimport; then - sed -i \ - -e ":MimeType: s:application/pdf;::" \ - -e ":Keywords: s:pdf;::" \ - sysui/desktop/menus/draw.desktop || die - fi -} - -src_configure() { - # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys - # Note: these are for Gentoo use ONLY. For your own distribution, please get - # your own set of keys. Feel free to contact chromium@gentoo.org for more info. - local google_default_client_id="329227923882.apps.googleusercontent.com" - local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" - - # Show flags set at the beginning - einfo "Preset CFLAGS: ${CFLAGS}" - einfo "Preset LDFLAGS: ${LDFLAGS}" - - # Workaround for bug #915067 - append-ldflags $(test-flags-CCLD -Wl,--undefined-version) - - 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" - - # Workaround for bug #907905 - filter-lto - - # Not implemented by Clang, bug #903889 - filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch - else - # Force gcc - einfo "Enforcing the use of gcc due to USE=-clang ..." - AR=gcc-ar - CC=${CHOST}-gcc - CXX=${CHOST}-g++ - NM=gcc-nm - RANLIB=gcc-ranlib - - # Apparently the Clang flags get used even for GCC builds sometimes. - # bug #838115 - sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die - fi - - if use custom-cflags ; then - elog "USE=custom-cflags has been selected. You are on your own to make sure that" - elog "the build succeeds. Good luck!" - else - strip-flags - fi - - export LO_CLANG_CC=${CC} - export LO_CLANG_CXX=${CXX} - - # Show flags set at the end - einfo " Used CFLAGS: ${CFLAGS}" - einfo " Used LDFLAGS: ${LDFLAGS}" - - # Ensure we use correct toolchain - tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG - - # optimization flags - export GMAKE_OPTIONS="${MAKEOPTS}" - # System python enablement: - export PYTHON_CFLAGS=$(python_get_CFLAGS) - export PYTHON_LIBS=$(python_get_LIBS) - - use kde && export QT5DIR="$(qt5_get_bindir)/.." - - local gentoo_buildid="Gentoo official package" - if [[ -n ${LOCOREGIT_VERSION} ]]; then - gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})" - fi - - # system headers/libs/...: enforce using system packages - # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad - # --enable-cairo: ensure that cairo is always required - # --enable-*-link: link to the library rather than just dlopen on runtime - # --enable-release-build: build the libreoffice as release - # --disable-fetch-external: prevent dowloading during compile phase - # --enable-extension-integration: enable any extension integration support - # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs - # --disable-report-builder: too much java packages pulled in without pkgs - # --without-system-sane: just sane.h header that is used for scan in writer, - # not linked or anything else, worthless to depend on - # --disable-pdfium: not yet packaged - local myeconfargs=( - --with-system-dicts - --with-system-epoxy - --with-system-headers - --with-system-jars - --with-system-libs - --enable-build-opensymbol - --enable-cairo-canvas - --enable-largefile - --enable-mergelibs - --enable-python=system - --enable-randr - --enable-release-build - --disable-breakpad - --disable-bundle-mariadb - --disable-ccache - --disable-epm - --disable-fetch-external - --disable-gtk3-kde5 - --disable-online-update - --disable-openssl - --disable-pdfium - --disable-qt6 - --with-extra-buildid="${gentoo_buildid}" - --enable-extension-integration - --with-external-dict-dir="${EPREFIX}/usr/share/myspell" - --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" - --with-external-thes-dir="${EPREFIX}/usr/share/myspell" - --with-external-tar="${DISTDIR}" - --with-lang="" - --with-parallelism=$(makeopts_jobs) - --with-system-openjpeg - --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-abseil - --without-system-dragonbox - --without-system-frozen - --without-system-jfreereport - --without-system-libfixmath - --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) - $(use_with valgrind) - ) - - if use eds || use gtk; then - myeconfargs+=( --enable-dconf --enable-gio ) - else - myeconfargs+=( --disable-dconf --disable-gio ) - fi - - # libreoffice extensions handling - for lo_xt in ${LO_EXTS}; do - if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then - myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) ) - else - myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) ) - fi - done - - if use java; then - # hsqldb: system one is too new - myeconfargs+=( - --without-junit - --without-system-hsqldb - --with-ant-home="${ANT_HOME}" - --with-jdk-home="${JAVA_HOME}" - ) - - use libreoffice_extensions_scripting-beanshell && \ - myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) ) - - use libreoffice_extensions_scripting-javascript && \ - myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) ) - fi - - tc-is-lto && myeconfargs+=( --enable-lto ) - - MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ - econf "${myeconfargs[@]}" -} - -src_compile() { - # more and more LO stuff tries to use OpenGL, including tests during build - # bug 501508, bug 540624, bug 545974 and probably more - addpredict /dev/dri - addpredict /dev/ati - addpredict /dev/nvidiactl - - default -} - -src_test() { - emake unitcheck - emake slowcheck -} - -src_install() { - emake DESTDIR="${D}" distro-pack-install -o build -o check - - # bug 593514 - if use gtk; then - dosym libreoffice/program/liblibreofficekitgtk.so \ - /usr/$(get_libdir)/liblibreofficekitgtk.so - fi - - # bash completion aliases - bashcomp_alias \ - libreoffice \ - unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice - - if use branding; then - insinto /usr/$(get_libdir)/${PN}/program - newins "${WORKDIR}/branding-sofficerc" sofficerc - dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die - fi - - # bug 703474 - insinto /usr/include - doins -r include/LibreOfficeKit - - local lodir=/usr/$(get_libdir)/libreoffice - # patching this would break tests - cat <<-EOF > "${T}"/uno.py -import sys, os -sys.path.append('${EPREFIX}${lodir}/program') -os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc') -EOF - sed -e "/^import sys/d" -e "/^import os/d" \ - -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed" - cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die - cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die - - # more system pyuno mess - sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \ - -i "${D}"${lodir}/program/officehelper.py || die - - python_optimize "${D}"${lodir}/program - # link python bridge in site-packages, bug 667802 - local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program - for py in uno.py unohelper.py officehelper.py; do - dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py} - while IFS="" read -d $'\0' -r pyc; do - pyc=${pyc//*\/} - dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc} - done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0) - done - - newinitd "${FILESDIR}/libreoffice.initd" libreoffice - newconfd "${FILESDIR}/libreoffice.confd" libreoffice -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 1d2cd2085e48..a4aacb61b9f0 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -91,13 +91,13 @@ unset ADDONS_SRC 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 qt5 qt6 test valgrind vulkan +googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres qt6 test valgrind vulkan $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" REQUIRED_USE="${PYTHON_REQUIRED_USE} base? ( java ) bluetooth? ( dbus ) - kde? ( || ( qt5 qt6 ) ) + kde? ( qt6 ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) @@ -142,7 +142,7 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-libs/expat dev-libs/hyphen dev-libs/icu:= - dev-libs/libassuan + dev-libs/libassuan:= dev-libs/libgpg-error >=dev-libs/liborcus-0.18.0:0/0.18 dev-libs/librevenge @@ -209,20 +209,11 @@ COMMON_DEPEND="${PYTHON_DEPS} x11-libs/pango ) kde? ( - qt5? ( - kde-frameworks/kconfig:5 - kde-frameworks/kcoreaddons:5 - kde-frameworks/ki18n:5 - kde-frameworks/kio:5 - kde-frameworks/kwindowsystem:5 - ) - qt6? ( - kde-frameworks/kconfig:6 - kde-frameworks/kcoreaddons:6 - kde-frameworks/ki18n:6 - kde-frameworks/kio:6 - kde-frameworks/kwindowsystem:6 - ) + kde-frameworks/kconfig:6 + kde-frameworks/kcoreaddons:6 + kde-frameworks/ki18n:6 + kde-frameworks/kio:6 + kde-frameworks/kwindowsystem:6 ) ldap? ( net-nds/openldap:= ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) @@ -231,12 +222,6 @@ COMMON_DEPEND="${PYTHON_DEPS} !mariadb? ( dev-db/mysql-connector-c:= ) pdfimport? ( >=app-text/poppler-22.06:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) " # FIXME: cppunit should be moved to test conditional @@ -312,7 +297,6 @@ PATCHES=( # "${WORKDIR}"/${PATCHSET/.tar.xz/} # not upstreamable stuff - "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" "${FILESDIR}/${PN}-6.1-nomancompress.patch" "${FILESDIR}/${PN}-24.2-qtdetect.patch" @@ -474,9 +458,6 @@ src_configure() { export PYTHON_CFLAGS=$(python_get_CFLAGS) export PYTHON_LIBS=$(python_get_LIBS) - if use qt5; then - export QT5DIR="$(qt5_get_bindir)/.." - fi if use qt6; then export QT6DIR="$(qt6_get_bindir)/.." fi @@ -511,6 +492,7 @@ src_configure() { --enable-python=system --enable-randr --enable-release-build + --disable-atspi-tests # bug 933257 --disable-breakpad --disable-bundle-mariadb --disable-ccache @@ -520,6 +502,7 @@ src_configure() { --disable-online-update --disable-openssl --disable-pdfium + --disable-qt5 --with-extra-buildid="${gentoo_buildid}" --enable-extension-integration --with-external-dict-dir="${EPREFIX}/usr/share/myspell" @@ -554,11 +537,11 @@ src_configure() { $(use_enable firebird firebird-sdbc) $(use_enable gstreamer gstreamer-1-0) $(use_enable gtk gtk3) + $(use_enable kde kf6) $(use_enable ldap) $(use_enable odk) $(use_enable pdfimport) $(use_enable postgres postgresql-sdbc) - $(use_enable qt5) $(use_enable qt6) $(use_enable vulkan skia) $(use_with accessibility lxml) @@ -570,9 +553,6 @@ src_configure() { $(use_with valgrind) ) - use qt5 && myeconfargs+=( $(use_enable kde kf5) ) - use qt6 && myeconfargs+=( $(use_enable kde kf6) ) - if use eds || use gtk; then myeconfargs+=( --enable-dconf --enable-gio ) else |