commit: 4b46f51497eb96161c40e0a633d49c3e6f384d46 Author: stefson <herrtimson <AT> yahoo <DOT> de> AuthorDate: Sat Dec 24 17:18:45 2016 +0000 Commit: Felix Janda <felix.janda <AT> posteo <DOT> de> CommitDate: Tue Dec 27 22:38:32 2016 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=4b46f514
app-office/libreoffice: version bump to 5.2.3.3-r1 app-office/libreoffice/Manifest | 19 +- .../files/libreoffice-4.4.1.2-fix-includes.patch | 31 --- .../files/libreoffice-4.4.1.2-linux-musl.patch | 68 ----- .../files/libreoffice-5.1.4.2-gcc6.patch | 40 --- .../libreoffice/files/libreoffice-5.2-icu58.patch | 289 +++++++++++++++++++++ ...no.patch => libreoffice-5.2-system-pyuno.patch} | 2 +- .../files/libreoffice-5.2.3.3-fix-includes.patch | 26 ++ .../files/libreoffice-curl-7.50.0.patch | 23 -- ....2-r99.ebuild => libreoffice-5.2.3.3-r1.ebuild} | 113 ++++---- app-office/libreoffice/metadata.xml | 3 +- 10 files changed, 385 insertions(+), 229 deletions(-) diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index b8389b1..7a660dc 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -1,20 +1,17 @@ -AUX libreoffice-4.4-system-pyuno.patch 1598 SHA256 444ba9a06a548952cd82f7ea2ff17e5bd7b04788dc894ef5376bf3440749de9e SHA512 043c78f923b941a1e8985ee16d8e6b23859207eac0f4fdc52fedbce0103d62309aa7aae14e19f8bb26bef9d4213dee9871fcc3770f99be84f3405573e32ced78 WHIRLPOOL 51f85f39847a587551b6887362557771a81b6abc59b926eace36f8e2eb61cd4895486c28d44fe38e77fc1b77b0ed4e142d65f4793bf2161c9d0c5c0abeca07f7 -AUX libreoffice-4.4.1.2-fix-includes.patch 1149 SHA256 2044d4c997472a46e95c68fa8bec19c1424e9074fad05df9f1c0d220dec00281 SHA512 15defc8362fb0e53db32b75d9c4ece73e1ee8bd1cc05b4dd8f072f808e6943b385a5415513b237d3daa130dedce3c6ac6370e05ec0b4a25065ce27aadd269e92 WHIRLPOOL a643af5504f09003409cdbb4e9445481b448fc67c35ef5dc2e35a71301b138c3007e1d78f4bac6128137e37c41d4c6363447eeee44b6aeba8ac68729e4661ea7 -AUX libreoffice-4.4.1.2-linux-musl.patch 1962 SHA256 5cf5a446e5769f6a2df01c5c10702514fe9178334d1e53d3c7df843ca72c6fa2 SHA512 5fb4d5bf5cab21a0c95a9e51a4a138b427a08677c34bc14287c3eb74926b606345d5185c76bbe8957043d79dc33d46cf4aaa5182642c7fb9136dc48ed9e7fabb WHIRLPOOL 3e089da32a5425f1e892c80635489fde99198a5b15e1be94b996c49f2cf77e45144f624d68d9c11aef921bce0ce0ac632d52af348335ba5d61ae6049e9c4282b AUX libreoffice-4.4.1.2-musl-fix-execinfo.patch 736 SHA256 7171dfa651a7ee81b4e13a9fd9131428d9a65af138cac4cb428ae6c3e4bcb1f3 SHA512 567123f990c4a47c2e4cebf99f3486150740015e647ca2b2521e606f3350fc55ceda6c7ac031302da34e8fc90747d66619334fcfda4e7b8998456fe3619ab860 WHIRLPOOL d25df4d89e5739f3586296569345c38d44aeb59c1f6ed83ddd9c76139e6e5b639506c5d761838c2faa70e8a30bb6b68b15c4bdf3255f7658542f70c91bffeb32 AUX libreoffice-5.0.5.2-linux-musl.patch 1908 SHA256 b4fe6b57d1351c4d6a28dc67971c8e43448215c6ab6ffabfde5106da560a5c5d SHA512 cbb465e641616537a8f7c2438bf87661fb409b8337486b5a8ab7f1ecf099c9c4d96f531fef18f8f17ddca4813d3df4162629b93434ac35b7d01c7683de928524 WHIRLPOOL e305c2855c9141e6a1fd296cd8e05e50c388a9a30e4bb8dd4ba60773929abd660ac8940e42f2aad418f58a696f6232570d9000114113aaaf016d74462775c766 -AUX libreoffice-5.1.4.2-gcc6.patch 1595 SHA256 a1f3978a91afee987b46abda4c0f9ecc2ec6d11c467b98153d94006439adcc21 SHA512 d0bd586e093bcc043c13c5d90ea1834a2333511df012a74fbf1a89f2e6c9f44a2e7b78af5654443d89ddcc9a89930b28a4d31e1b3b9c324898c0cef4c2c985af WHIRLPOOL c0ccfac9807b470295e23687a9427619c9ebc5300d12a4908a6289008578b8175633f753e0256a378996e31292bf8cda4c28e932d686257b1736e620776a4205 -AUX libreoffice-curl-7.50.0.patch 814 SHA256 ad365a9569d46509bf621568277cf15ee9fc29f63233e8256f86e1f0640032f2 SHA512 3e861c0f456fecd74116176dffe38e9bfb83959e3bf45e1b11bdeeda6226a7ba17b45cd514642f8f54d2406e98cb15da253b5adb248c4c74b95eb727fe16f9d8 WHIRLPOOL 22ac7f78268681a2e961b20be586db16d70d8f654246bfe8101effdd9315c80949cf604f34965bc6de265c884b42d4794ac28da78a70a9b58b408d6d829960e1 +AUX libreoffice-5.2-icu58.patch 12602 SHA256 42555c654d29d99a9130d6c164af107b9e94c4012cb51a0411e56dae0a3a913c SHA512 364614ee5aa1606f1d4308e4ba8fa942bcf3f3f0483027e74dc2ea3e7cfa3837b45b49d503fee8d5a591790f2489b864e677615e6715c61d9093ce1dbb99bab4 WHIRLPOOL dcae21697344cc5c605138c5f80dcbfedbb005269a8ad0e4ef34ab9a73876db8b82977f8531fccbc3041fc30baf3727192f7451c9073ecee0f723f74ba6f42b8 +AUX libreoffice-5.2-system-pyuno.patch 1590 SHA256 9f42c69cd286561c8ed294d9dff3316cebad2491b5a20880186fd2b30d9aa096 SHA512 34228d6022ba50480940f99d55d8c4bda14becfa51b26af17dadd21e641ac387c04a4f6d4992323248f30f2ca9a37b53741ee8a465a3fccf4be707539a06005b WHIRLPOOL f652a0e7fe681567f9f03c99fe1709e6b9a2346dcd9fd4ed3016b53471a3f20e05eb865a6ff19d3b7dccb0b11c8408fd86d754af1f36024ef137cf33a55d10f2 +AUX libreoffice-5.2.3.3-fix-includes.patch 807 SHA256 51052d983eeea85d8d71385e4eeda61b6a8746854fe046b9a91e12c013d9ed89 SHA512 c9e0b05640d7d0e6053b8dd4735664d761a7d381c5b5cbda059fb7b38ab28531c014b6d38f58a0e1f7171a43d62f04d8ecbb7b6b008d0ad30017228ec7e6601a WHIRLPOOL 105a2f0345a23846af3b50c3571f4602831e96e7691fdce12984ead21f42d9dffb6d0e188133dda3a282f1f73f862f2b424f7406587a26b77a247b3b2e0a4e67 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c WHIRLPOOL 16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5 -DIST 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1652670 SHA256 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a SHA512 5664203e6426880041cdb227e91f79f00d2ca7ae28c6997f61b72cc599aac55838d082d2b2b551bd7a228424c350ddea5d41599b8ca58d444a2cd46c9206ea91 WHIRLPOOL 6486c48b73a4f79760b443cfd397b704eca0fd32b72304ae7e7cfa0f43583b0af15c7384548b5215ae57513ed8366c8f3a74630ab466ba19a63b346af8c5eaca DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 SHA256 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a WHIRLPOOL a5156d06323699d2cbf539f14f5f44f54ebf33e86c7f14e98acd4c6e29c3e496f91dd6792401148ffa32e3dcb1cd4f087ed804e306b241cef86de0aa347d25d4 DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555291 SHA256 b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb SHA512 1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8 WHIRLPOOL d809712c3fcaca922d64f67a14d9dc3e750ecf359687c7ba0e8c6c7fc7750e43721a21ce29d5a3b0b87b83bfe7b71947e701ba4aed0a337ec35ecbb22d8dec34 DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f WHIRLPOOL 8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c -DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0 -DIST libreoffice-5.1.4.2.tar.xz 176233960 SHA256 cae54a79ed858ad92044179b5c33bd29c5770a8eccde04ed80c5ebfd92078385 SHA512 80e79b6a20f85e295fead9fc5f9578d846a889fe6bc7a0f51b76117408ee6c8e7fbddf99c22e2caaac3253f10907121ed3508cefab2fb1b2ccaa90c4cf52c33a WHIRLPOOL 2005e5321b6e25196db535a786c50b66c635b07d1482e562f1595f3f84fbf0c702717d934d50e319822f194f1bdc9d15da1885658042d277ae8535f75f9856ba +DIST ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz 1769329 SHA256 3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 SHA512 2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5 WHIRLPOOL 29ddaef03d46fe08aa2dba200be755817f8e77de3bbbb3ed86dae65e891239f3051f79fdfadec6ae56023197e32e1c44a94385a1ce306081f3bf94be6226f8c7 +DIST libreoffice-5.2.3.3.tar.xz 183870036 SHA256 a8f1365d166bf24ac4b97ed8466f46cca29cf72e7e992bb84d24c3dc8e1c32c1 SHA512 8628a820ad620ca946457adf0b0ed9741f13c67aa061761d04b743340d13ef498f23e75e6183206b34ce7154b1ec3096f8afcb69b2ab02e17c6ef00155e1b084 WHIRLPOOL 17edc4dd47938db71a5b5ec3ba318d02fbcab7c389bdb51432d36f1f018667c58b1ec3b38b09610542653c9442b65950e0daa062149cfeb7e35e699c6c9f89eb DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538 -DIST libreoffice-help-5.1.4.2.tar.xz 1905160 SHA256 60356c3e3a8e5ba8216c18e127cfa2b7d0eb55c69e50f056e8f78a7d9dc735cc SHA512 a8af619dff4b873574afd4b6cfc930543ab58a449a5cfa4b76a0edf242e18a885b6cba1f1a660e9a07e902c367f1a305c2c525f2b0a70e99f56ae5303abef5fe WHIRLPOOL 2e195dac9e6d2280ec3ac36243c4c62010e04763c5510a1f5e06f39e2f6e44aad555b460f72b2f09aba43a9571b3d20b50d6caf4a028e3e6acfe4e37d7598b70 -EBUILD libreoffice-5.1.4.2-r99.ebuild 17705 SHA256 e8b976164fe79af19dadad66cfcabcfb57635db6cad949d86846b9145979d581 SHA512 3e15d068ce14d1aae808195d3de85c28d6b126a91f44eefd77c957a89ec2724c953d10f97e25b274c7942833c3930b968a1947d0bea7821d0f1d7ed8a4f71230 WHIRLPOOL 9cf54ebac945be2b92857b94f003a58bfeaa621b297ec4be51032b9548332537540494a3c32983a84e53d4b0ee648abf63ca65334648e8be8ab9fa43a2d82717 -MISC metadata.xml 1425 SHA256 2ca5293a7d9b6a9a58235149d00aefd8a33f3d93df32a5d4c88b94d96bb0f181 SHA512 42787dbbddbfee01aa4b4c0ee2b6fe8e612e901736d18ab3fff8fd19917b4ab65e04eaee7dd13790ae2aebc52f74ce203fcedab8bdfdcbceabf9fa043d287c1f WHIRLPOOL 65925c5dee093ad51c04be88d33b34cfe677b6a27bc659602f0aa9a550f6ab716d0244ad4a76cf3a5b6ad6d6c9401a4cf8729251c30a141413f382d7b9653157 +DIST libreoffice-help-5.2.3.3.tar.xz 1936920 SHA256 443be26b35c6b454d5d1ca17c58cc33ae90946f8e1003a98118467b49989cd3a SHA512 927421887d2d41538ba79d6d584bf84ad3fd7a58d3b9d95801cf67a0dcce61421934cd273a38803b5519c434232d1aaeb88d52cab391ae7292809ebbb3b501f9 WHIRLPOOL 36da9c200c0174f745827afb099530d06f6489f8be4a521b7dd37441fc2a1f9691a7d4a07e2914dec0f57845f96e4e143133105e5a730eebeb2e1c5c3283d3bb +EBUILD libreoffice-5.2.3.3-r1.ebuild 17724 SHA256 6e94cb917264116f24e75e76603951d412c097a8342355aa23c8732a79de540c SHA512 b4e9814aafa3a0f7f2cc6da9047f8e63e2d8405f9fa8f76154789e9c3490352199a9c39339959973d8157e7ee43f05cea11ba6975dc4c9fe77acd04267a5ac2a WHIRLPOOL 59dfb2dd5ab072e498805eb45850fde5b3f9e160990e52ed1f49474b74bb088c3e89718afa5518e8ad35892eb2c7c9068c9a6baac84d1893dbbef06921012637 +MISC metadata.xml 1506 SHA256 e9682eb8fcf1609f39f15680caa33f2b87151ecca4189964ea750a5e8a09485a SHA512 20e6d0f46aa551074f0f0b794d6c4c92e011bf6ab854c7111fad081f9f9d9fe51e370decbbbe9b2cc74a7d1369e38fe0cb3c2768c2d287fc30346c8e4d6783aa WHIRLPOOL ae9571006a3f933ee16ea4e34e3a3cb1b017ce1734e4e09f4ff9f421031c10ebe7c1b5ee87ff84532c13805ec7b4284e14b4aab3d06767d28268b58a768ce9c1 diff --git a/app-office/libreoffice/files/libreoffice-4.4.1.2-fix-includes.patch b/app-office/libreoffice/files/libreoffice-4.4.1.2-fix-includes.patch deleted file mode 100644 index b1f1b44..0000000 --- a/app-office/libreoffice/files/libreoffice-4.4.1.2-fix-includes.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- libreoffice-4.4.0.3/vcl/inc/headless/svpinst.hxx 2015-02-02 20:38:46.879497689 -0200 -+++ libreoffice-4.4.0.3/vcl/inc/headless/svpinst.hxx 2015-02-02 20:38:55.482831474 -0200 -@@ -32,6 +32,7 @@ - #include <list> - - #include <time.h> -+#include <sys/time.h> - - #define VIRTUAL_DESKTOP_WIDTH 1024 - #define VIRTUAL_DESKTOP_HEIGHT 768 ---- libreoffice-4.4.0.3/vcl/unx/generic/gdi/cairotextrender.cxx 2015-02-02 21:19:22.822959064 -0200 -+++ libreoffice-4.4.0.3/vcl/unx/generic/gdi/cairotextrender.cxx 2015-02-02 21:19:48.312960404 -0200 -@@ -18,6 +18,7 @@ - */ - - #include "cairotextrender.hxx" -+#include "generic/glyphcache.hxx" - - #include <basegfx/polygon/b2dpolypolygon.hxx> - #include <vcl/settings.hxx> ---- libreoffice-4.4.0.3/sd/source/ui/remotecontrol/BluetoothServer.cxx 2015-02-03 08:42:36.590056362 -0200 -+++ libreoffice-4.4.0.3/sd/source/ui/remotecontrol/BluetoothServer.cxx 2015-02-03 08:42:46.030056456 -0200 -@@ -22,7 +22,7 @@ - #include <dbus/dbus.h> - #include <errno.h> - #include <fcntl.h> -- #include <sys/unistd.h> -+ #include <unistd.h> - #include <sys/socket.h> - #include <bluetooth/bluetooth.h> - #include <bluetooth/rfcomm.h> diff --git a/app-office/libreoffice/files/libreoffice-4.4.1.2-linux-musl.patch b/app-office/libreoffice/files/libreoffice-4.4.1.2-linux-musl.patch deleted file mode 100644 index 5c8ab52..0000000 --- a/app-office/libreoffice/files/libreoffice-4.4.1.2-linux-musl.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- libreoffice-4.4.0.3/configure.ac.orig 2015-01-22 22:05:28.000000000 -0200 -+++ libreoffice-4.4.0.3/configure.ac 2015-02-02 20:11:20.639411153 -0200 -@@ -569,7 +569,7 @@ - fi - ;; - --linux-gnu*|k*bsd*-gnu*) -+linux-gnu*|linux-musl*|k*bsd*-gnu*) - test_gtk=yes - build_gstreamer_1_0=yes - build_gstreamer_0_10=yes -@@ -4058,7 +4058,7 @@ - esac - ;; - --linux-gnu*) -+linux-gnu*|linux-musl*) - COM=GCC - GUIBASE=unx - OS=LINUX -@@ -6967,7 +6967,7 @@ - test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" - ;; - -- linux-gnu*) -+ linux-gnu*|linux-musl*) - JAVAINC="-I$JAVA_HOME/include" - JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux" - test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" -@@ -9429,21 +9429,6 @@ - fi - AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA) - --dnl *************************************** --dnl testing libc version for Linux... --dnl *************************************** --if test "$_os" = "Linux"; then -- AC_MSG_CHECKING([whether libc is >= 2.1.1]) -- exec 6>/dev/null # no output -- AC_CHECK_LIB(c, gnu_get_libc_version, HAVE_LIBC=yes; export HAVE_LIBC) -- exec 6>&1 # output on again -- if test "$HAVE_LIBC"; then -- AC_MSG_RESULT([yes]) -- else -- AC_MSG_ERROR([no, upgrade libc]) -- fi --fi -- - dnl ========================================= - dnl Check for the Windows SDK. - dnl ========================================= -@@ -12741,7 +12726,7 @@ - - case "$host_os" in - -- aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*) -+ aix*|dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*) - if test "$ENABLE_JAVA" != "" -a "$JDK"!="gcj"; then - pathmunge "$JAVA_HOME/bin" "after" - fi -@@ -12789,7 +12774,6 @@ - esac - - pathmunge "$SRC_ROOT/solenv/bin" "before" -- pathmunge "." "before" - fi - - AC_SUBST(LO_PATH) diff --git a/app-office/libreoffice/files/libreoffice-5.1.4.2-gcc6.patch b/app-office/libreoffice/files/libreoffice-5.1.4.2-gcc6.patch deleted file mode 100644 index 9e7ee73..0000000 --- a/app-office/libreoffice/files/libreoffice-5.1.4.2-gcc6.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 91fcc0032c2d0d343b914dfe3bea0b0bf1589e91 Mon Sep 17 00:00:00 2001 -From: Rene Engelhard <[email protected]> -Date: Tue, 24 May 2016 16:35:57 +0200 -Subject: [PATCH] KDE4 cflags no /usr/include usage to fix build failure with - gcc6 - -Change-Id: I53106b9ebfa7cc5c7b6c6d6f3bb3a4e5f2261f4f ---- - configure.ac | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 091abb4..86cc7b6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -11117,6 +11117,7 @@ the root of your Qt installation by exporting QT4DIR before running "configure". - if test "x$kde_incdir" = "xno"; then - AC_MSG_ERROR([KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".]) - fi -+ if test "$kde_incdir" = "/usr/include"; then kde_incdir=; fi - - dnl Check for KDE4 libraries - AC_MSG_CHECKING([for KDE4 libraries]) -@@ -11134,7 +11135,12 @@ the root of your Qt installation by exporting QT4DIR before running "configure". - fi - - PKG_CHECK_MODULES([QT4],[QtNetwork QtGui]) -- KDE4_CFLAGS="-I$kde_incdir $QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT" -+ if ! test -z "$kde_incdir"; then -+ KDE4_CFLAGS="-I$kde_incdir $QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT" -+ else -+ KDE4_CFLAGS="$QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT" -+ fi -+ - KDE4_LIBS="-L$kde_libdir -lkio -lkfile -lkdeui -lkdecore -L$qt_lib_dir $QT4_LIBS" - KDE4_CFLAGS=$(printf '%s' "$KDE4_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") - FilterLibs "$KDE4_LIBS" --- -2.9.0 - diff --git a/app-office/libreoffice/files/libreoffice-5.2-icu58.patch b/app-office/libreoffice/files/libreoffice-5.2-icu58.patch new file mode 100644 index 0000000..57fe6dc --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-5.2-icu58.patch @@ -0,0 +1,289 @@ +From 3e42714c76b1347babfdea0564009d8d82a83af4 Mon Sep 17 00:00:00 2001 +From: Eike Rathke <[email protected]> +Date: Wed, 2 Nov 2016 13:07:48 +0100 +Subject: [PATCH] upgrade to ICU 58 + +Change-Id: I4a992447df65b337721a2a2627d974172a14cba5 +Reviewed-on: https://gerrit.libreoffice.org/30487 +Reviewed-by: Eike Rathke <[email protected]> +Tested-by: Eike Rathke <[email protected]> +--- + configure.ac | 2 +- + download.lst | 2 +- + external/icu/icu-ubsan.patch.0 | 11 ------ + external/icu/icu4c-warnings.patch | 12 ------ + .../source/breakiterator/breakiterator_unicode.cxx | 12 ++++++ + i18nutil/source/utility/unicode.cxx | 26 +++++++++++++ + include/svx/ucsubset.hrc | 11 ++++++ + svx/source/dialog/charmap.cxx | 35 +++++++++++++++++ + svx/source/dialog/ucsubset.src | 44 ++++++++++++++++++++++ + 9 files changed, 130 insertions(+), 25 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f06ef8e..66a11a9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -9136,7 +9136,7 @@ SYSTEM_GENBRK= + SYSTEM_GENCCODE= + SYSTEM_GENCMN= + +-ICU_MAJOR=57 ++ICU_MAJOR=58 + ICU_MINOR=1 + ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE" + ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE" +diff --git a/download.lst b/download.lst +index 4571338..0770a4d 100644 +--- a/download.lst ++++ b/download.lst +@@ -62,7 +62,7 @@ export HARFBUZZ_TARBALL := harfbuzz-1.3.2.tar.bz2 + export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip + export HUNSPELL_TARBALL := 33d370f7fe5a030985e445a5672b2067-hunspell-1.4.1.tar.gz + export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz +-export ICU_TARBALL := 976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz ++export ICU_TARBALL := 1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz + export JFREEREPORT_FLOW_ENGINE_TARBALL := ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + export JFREEREPORT_FLUTE_TARBALL := d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + export JFREEREPORT_LIBBASE_TARBALL := eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip +diff --git a/external/icu/icu-ubsan.patch.0 b/external/icu/icu-ubsan.patch.0 +index 6d1d3bc..8a47242 100644 +--- a/external/icu/icu-ubsan.patch.0 ++++ b/external/icu/icu-ubsan.patch.0 +@@ -151,14 +151,3 @@ + length(len), next(subNode) {} + virtual UBool operator==(const Node &other) const; + virtual int32_t markRightEdgesFirst(int32_t edgeNumber); +---- source/common/unifiedcache.h +-+++ source/common/unifiedcache.h +-@@ -139,7 +139,7 @@ +- : CacheKey<T>(other), fLoc(other.fLoc) { } +- virtual ~LocaleCacheKey() { } +- virtual int32_t hashCode() const { +-- return 37 *CacheKey<T>::hashCode() + fLoc.hashCode(); +-+ return 37U *CacheKey<T>::hashCode() + fLoc.hashCode(); +- } +- virtual UBool operator == (const CacheKeyBase &other) const { +- // reflexive +diff --git a/external/icu/icu4c-warnings.patch b/external/icu/icu4c-warnings.patch +index d146093..96608d7 100644 +--- a/external/icu/icu4c-warnings.patch ++++ b/external/icu/icu4c-warnings.patch +@@ -8,15 +8,3 @@ + } \ + } + +---- misc/icu/source/common/unicode/utypes.h +-+++ misc/build/icu/source/common/unicode/utypes.h +-@@ -399,7 +399,7 @@ +- * some Linux/Unix compilers have problems with defining global new/delete. +- * On Windows, it is _MSC_VER>=1200 for MSVC 6.0 and higher. +- */ +--#if defined(__cplusplus) && U_DEBUG && U_OVERRIDE_CXX_ALLOCATION && (_MSC_VER>=1200) && !defined(U_STATIC_IMPLEMENTATION) && (defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || defined(U_IO_IMPLEMENTATION) || defined(U_LAYOUT_IMPLEMENTATION) || defined(U_LAYOUTEX_IMPLEMENTATION)) +-+#if defined(__cplusplus) && U_DEBUG && U_OVERRIDE_CXX_ALLOCATION && defined (_MSC_VER) && (_MSC_VER>=1200) && !defined(U_STATIC_IMPLEMENTATION) && (defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || defined(U_IO_IMPLEMENTATION) || defined(U_LAYOUT_IMPLEMENTATION) || defined(U_LAYOUTEX_IMPLEMENTATION)) +- +- #ifndef U_HIDE_INTERNAL_API +- /** +- +diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx +index 3b0b227..76ae209 100644 +--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx ++++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx +@@ -63,10 +63,13 @@ BreakIterator_Unicode::~BreakIterator_Unicode() + class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator + { + public: ++#if (U_ICU_VERSION_MAJOR_NUM < 58) ++ // RuleBasedBreakIterator::setBreakType() is private as of ICU 58. + inline void publicSetBreakType(int32_t type) + { + setBreakType(type); + }; ++#endif + OOoRuleBasedBreakIterator(UDataMemory* image, + UErrorCode &status) + : RuleBasedBreakIterator(image, status) +@@ -142,12 +145,21 @@ void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const css::lang::Local + } + } + if (rbi) { ++#if (U_ICU_VERSION_MAJOR_NUM < 58) ++ // ICU 58 made RuleBasedBreakIterator::setBreakType() private ++ // instead of protected, so the old workaround of ++ // https://ssl.icu-project.org/trac/ticket/5498 ++ // doesn't work anymore. However, they also claim to have fixed ++ // the cause that an initial fBreakType==-1 would lead to an ++ // endless loop under some circumstances. ++ // Let's see ... + switch (rBreakType) { + case LOAD_CHARACTER_BREAKITERATOR: rbi->publicSetBreakType(UBRK_CHARACTER); break; + case LOAD_WORD_BREAKITERATOR: rbi->publicSetBreakType(UBRK_WORD); break; + case LOAD_SENTENCE_BREAKITERATOR: rbi->publicSetBreakType(UBRK_SENTENCE); break; + case LOAD_LINE_BREAKITERATOR: rbi->publicSetBreakType(UBRK_LINE); break; + } ++#endif + icuBI->aBreakIterator = rbi; + } + } +diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx +index bb82bbf..984c5f7 100644 +--- a/i18nutil/source/utility/unicode.cxx ++++ b/i18nutil/source/utility/unicode.cxx +@@ -957,6 +957,32 @@ OString SAL_CALL unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript) + sRet = "sa-Sidd"; + break; + #endif ++#if (U_ICU_VERSION_MAJOR_NUM >= 58) ++ case USCRIPT_ADLAM: ++ sRet = "mis"; // Adlm - Adlam for Fulani, no language code ++ break; ++ case USCRIPT_BHAIKSUKI: ++ sRet = "mis"; // Bhks - Bhaiksuki for some Buddhist texts, no language code ++ break; ++ case USCRIPT_MARCHEN: ++ sRet = "bo-Marc"; ++ break; ++ case USCRIPT_NEWA: ++ sRet = "new-Newa"; ++ break; ++ case USCRIPT_OSAGE: ++ sRet = "osa-Osge"; ++ break; ++ case USCRIPT_HAN_WITH_BOPOMOFO: ++ sRet = "mis"; // Hanb - Han with Bopomofo, zh-Hanb ? ++ break; ++ case USCRIPT_JAMO: ++ sRet = "mis"; // Jamo - Jamo subset of Hangul, ko-Jamo ? ++ break; ++ case USCRIPT_SYMBOLS_EMOJI: ++ sRet = "mis"; // Zsye - Emoji variant ++ break; ++#endif + } + return sRet; + } +diff --git a/include/svx/ucsubset.hrc b/include/svx/ucsubset.hrc +index adf1cf6..1157a7e 100644 +--- a/include/svx/ucsubset.hrc ++++ b/include/svx/ucsubset.hrc +@@ -291,6 +291,17 @@ + #define RID_SUBSETSTR_OLD_HUNGARIAN (RID_SUBSET_START + 263) + #define RID_SUBSETSTR_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS (RID_SUBSET_START + 264) + #define RID_SUBSETSTR_SUTTON_SIGNWRITING (RID_SUBSET_START + 265) ++#define RID_SUBSETSTR_ADLAM (RID_SUBSET_START + 266) ++#define RID_SUBSETSTR_BHAIKSUKI (RID_SUBSET_START + 267) ++#define RID_SUBSETSTR_CYRILLIC_EXTENDED_C (RID_SUBSET_START + 268) ++#define RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT (RID_SUBSET_START + 269) ++#define RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION (RID_SUBSET_START + 270) ++#define RID_SUBSETSTR_MARCHEN (RID_SUBSET_START + 271) ++#define RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT (RID_SUBSET_START + 272) ++#define RID_SUBSETSTR_NEWA (RID_SUBSET_START + 273) ++#define RID_SUBSETSTR_OSAGE (RID_SUBSET_START + 274) ++#define RID_SUBSETSTR_TANGUT (RID_SUBSET_START + 275) ++#define RID_SUBSETSTR_TANGUT_COMPONENTS (RID_SUBSET_START + 276) + + // RID_SUBSET_END (RID_SUBSET_START + 299) + +diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx +index bcc7cef..ff201a6 100644 +--- a/svx/source/dialog/charmap.cxx ++++ b/svx/source/dialog/charmap.cxx +@@ -1594,6 +1594,41 @@ void SubsetMap::InitList() + aAllSubsets.push_back( Subset( 0x1D800, 0x1DAAF, RID_SUBSETSTR_SUTTON_SIGNWRITING ) ); + break; + #endif ++#if (U_ICU_VERSION_MAJOR_NUM >= 58) ++ case UBLOCK_ADLAM: ++ aAllSubsets.push_back( Subset( 0x1E900, 0x1E95F, RID_SUBSETSTR_ADLAM ) ); ++ break; ++ case UBLOCK_BHAIKSUKI: ++ aAllSubsets.push_back( Subset( 0x11C00, 0x11C6F, RID_SUBSETSTR_BHAIKSUKI ) ); ++ break; ++ case UBLOCK_CYRILLIC_EXTENDED_C: ++ aAllSubsets.push_back( Subset( 0x1C80, 0x1C8F, RID_SUBSETSTR_CYRILLIC_EXTENDED_C ) ); ++ break; ++ case UBLOCK_GLAGOLITIC_SUPPLEMENT: ++ aAllSubsets.push_back( Subset( 0x1E000, 0x1E02F, RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT ) ); ++ break; ++ case UBLOCK_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION: ++ aAllSubsets.push_back( Subset( 0x16FE0, 0x16FFF, RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION ) ); ++ break; ++ case UBLOCK_MARCHEN: ++ aAllSubsets.push_back( Subset( 0x11C70, 0x11CBF, RID_SUBSETSTR_MARCHEN ) ); ++ break; ++ case UBLOCK_MONGOLIAN_SUPPLEMENT: ++ aAllSubsets.push_back( Subset( 0x11660, 0x1167F, RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT ) ); ++ break; ++ case UBLOCK_NEWA: ++ aAllSubsets.push_back( Subset( 0x11400, 0x1147F, RID_SUBSETSTR_NEWA ) ); ++ break; ++ case UBLOCK_OSAGE: ++ aAllSubsets.push_back( Subset( 0x104B0, 0x104FF, RID_SUBSETSTR_OSAGE ) ); ++ break; ++ case UBLOCK_TANGUT: ++ aAllSubsets.push_back( Subset( 0x17000, 0x187FF, RID_SUBSETSTR_TANGUT ) ); ++ break; ++ case UBLOCK_TANGUT_COMPONENTS: ++ aAllSubsets.push_back( Subset( 0x18800, 0x18AFF, RID_SUBSETSTR_TANGUT_COMPONENTS ) ); ++ break; ++#endif + + } + +diff --git a/svx/source/dialog/ucsubset.src b/svx/source/dialog/ucsubset.src +index 06630cc..a7765c3 100644 +--- a/svx/source/dialog/ucsubset.src ++++ b/svx/source/dialog/ucsubset.src +@@ -1079,6 +1079,50 @@ Resource RID_SUBSETMAP + { + Text [ en-US ] = "Sutton Signwriting"; + }; ++ String RID_SUBSETSTR_ADLAM ++ { ++ Text [ en-US ] = "Adlam"; ++ }; ++ String RID_SUBSETSTR_BHAIKSUKI ++ { ++ Text [ en-US ] = "Bhaiksuki"; ++ }; ++ String RID_SUBSETSTR_CYRILLIC_EXTENDED_C ++ { ++ Text [ en-US ] = "Cyrillic Extended-C"; ++ }; ++ String RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT ++ { ++ Text [ en-US ] = "Glagolitic Supplement"; ++ }; ++ String RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION ++ { ++ Text [ en-US ] = "Ideographic Symbols and Punctuation"; ++ }; ++ String RID_SUBSETSTR_MARCHEN ++ { ++ Text [ en-US ] = "Marchen"; ++ }; ++ String RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT ++ { ++ Text [ en-US ] = "Mongolian Supplement"; ++ }; ++ String RID_SUBSETSTR_NEWA ++ { ++ Text [ en-US ] = "Newa"; ++ }; ++ String RID_SUBSETSTR_OSAGE ++ { ++ Text [ en-US ] = "Osage"; ++ }; ++ String RID_SUBSETSTR_TANGUT ++ { ++ Text [ en-US ] = "Tangut"; ++ }; ++ String RID_SUBSETSTR_TANGUT_COMPONENTS ++ { ++ Text [ en-US ] = "Tangut Components"; ++ }; + }; + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +-- +2.10.2 + diff --git a/app-office/libreoffice/files/libreoffice-4.4-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-5.2-system-pyuno.patch similarity index 97% rename from app-office/libreoffice/files/libreoffice-4.4-system-pyuno.patch rename to app-office/libreoffice/files/libreoffice-5.2-system-pyuno.patch index 1cf8e19..e06f81f 100644 --- a/app-office/libreoffice/files/libreoffice-4.4-system-pyuno.patch +++ b/app-office/libreoffice/files/libreoffice-5.2-system-pyuno.patch @@ -10,7 +10,7 @@ index a259bf6..672fa23 100755 +export PYTHONPATH + case "`uname -s`" in - NetBSD|OpenBSD|FreeBSD|DragonFly) + NetBSD|OpenBSD|DragonFly) # this is a temporary hack until we can live with the default search paths diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py index 4ff2606..6a05eed 100644 diff --git a/app-office/libreoffice/files/libreoffice-5.2.3.3-fix-includes.patch b/app-office/libreoffice/files/libreoffice-5.2.3.3-fix-includes.patch new file mode 100644 index 0000000..1c925fc --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-5.2.3.3-fix-includes.patch @@ -0,0 +1,26 @@ +diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx +index f177d86..99bb408 100644 +--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx ++++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx +@@ -21,7 +21,7 @@ + #include <dbus/dbus.h> + #include <errno.h> + #include <fcntl.h> +- #include <sys/unistd.h> ++ #include <unistd.h> + #include <sys/socket.h> + #include <bluetooth/bluetooth.h> + #include <bluetooth/rfcomm.h> +diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx +index 932e928..b65ced7 100644 +--- a/vcl/inc/headless/svpinst.hxx ++++ b/vcl/inc/headless/svpinst.hxx +@@ -30,7 +30,7 @@ + + #include <list> + +-#include <time.h> ++#include <sys/time.h> + + #define VIRTUAL_DESKTOP_WIDTH 1024 + #define VIRTUAL_DESKTOP_HEIGHT 768 diff --git a/app-office/libreoffice/files/libreoffice-curl-7.50.0.patch b/app-office/libreoffice/files/libreoffice-curl-7.50.0.patch deleted file mode 100644 index 4a947d0..0000000 --- a/app-office/libreoffice/files/libreoffice-curl-7.50.0.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0b8e589875ffd84150470832de18ebd79989efc0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <[email protected]> -Date: Mon, 25 Jul 2016 12:08:35 +0100 -Subject: curl 7.50.0 has CURL as typedef struct Curl_easy - -Change-Id: I22e5e2cdf78c38087579071c1b1570a8adc7d3c4 - -diff --git a/ucb/source/ucp/ftp/ftploaderthread.cxx b/ucb/source/ucp/ftp/ftploaderthread.cxx -index be68d9a..315ccb7 100644 ---- a/ucb/source/ucp/ftp/ftploaderthread.cxx -+++ b/ucb/source/ucp/ftp/ftploaderthread.cxx -@@ -71,7 +71,7 @@ FTPLoaderThread::~FTPLoaderThread() { - - - CURL* FTPLoaderThread::handle() { -- CURL* ret = osl_getThreadKeyData(m_threadKey); -+ CURL* ret = static_cast<CURL*>(osl_getThreadKeyData(m_threadKey)); - if(!ret) { - ret = curl_easy_init(); - if (ret != nullptr) { --- -cgit v0.10.2 - diff --git a/app-office/libreoffice/libreoffice-5.1.4.2-r99.ebuild b/app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild similarity index 89% rename from app-office/libreoffice/libreoffice-5.1.4.2-r99.ebuild rename to app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild index 4b508d0..39db593 100644 --- a/app-office/libreoffice/libreoffice-5.1.4.2-r99.ebuild +++ b/app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild @@ -25,7 +25,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz" # PATCHSET="${P}-patchset-01.tar.xz" [[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3" -inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS} +inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS} unset SCM_ECLASS DESCRIPTION="A full office productivity suite" @@ -57,8 +57,7 @@ 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=( - "${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz" - "${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code + "${ADDONS_URI}/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz" # modifies source code "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )" "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" # no release for 8 years, should we package it? @@ -78,8 +77,8 @@ unset ADDONS_SRC # Extensions that need extra work: LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" -IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome google -gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres quickstarter telepathy test vlc +IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive +gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" LICENSE="|| ( LGPL-3 MPL-1.1 )" @@ -103,7 +102,6 @@ COMMON_DEPEND="${PYTHON_DEPS} app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes - app-text/poppler:=[cxx] >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC @@ -112,7 +110,7 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-libs/expat dev-libs/hyphen dev-libs/icu:= - =dev-libs/liborcus-0.9* + =dev-libs/liborcus-0.11* dev-libs/librevenge dev-libs/nspr dev-libs/nss @@ -170,6 +168,7 @@ COMMON_DEPEND="${PYTHON_DEPS} libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) + pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( net-libs/telepathy-glib ) " @@ -206,9 +205,8 @@ DEPEND="${COMMON_DEPEND} dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool - >=dev-util/mdds-0.12.0:0= + >=dev-util/mdds-1.2.0:1= media-libs/glm - net-misc/npapi-sdk sys-devel/bison sys-devel/flex sys-devel/gettext @@ -242,37 +240,33 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} " PATCHES=( - # from 5.2 branch - "${FILESDIR}/${PN}-5.1.4.2-gcc6.patch" - "${FILESDIR}/${PN}-curl-7.50.0.patch" + # from master branch + "${FILESDIR}/${PN}-5.2-icu58.patch" # not upstreamable stuff - "${FILESDIR}/${PN}-4.4-system-pyuno.patch" + "${FILESDIR}/${PN}-5.2-system-pyuno.patch" - # musl fixes - "${FILESDIR}/${PN}-4.4.1.2-fix-includes.patch" - "${FILESDIR}/${PN}-5.0.5.2-linux-musl.patch" + # musl patches "${FILESDIR}/${PN}-4.4.1.2-musl-fix-execinfo.patch" + "${FILESDIR}/${PN}-5.0.5.2-linux-musl.patch" + "${FILESDIR}/${PN}-5.2.3.3-fix-includes.patch" ) -CHECKREQS_MEMORY="512M" - -if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then - CHECKREQS_DISK_BUILD="22G" -elif [[ ${MERGE_TYPE} != binary ]] ; then - CHECKREQS_DISK_BUILD="6G" -fi - pkg_pretend() { use java || \ ewarn "If you plan to use lbase application you should enable java or you will get various crashes." if [[ ${MERGE_TYPE} != binary ]]; then + + CHECKREQS_MEMORY="512M" + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + CHECKREQS_DISK_BUILD="22G" + else + CHECKREQS_DISK_BUILD="6G" + fi check-reqs_pkg_pretend - if [[ $(tc-getCC) == clang ]] ; then - : # ignore clang, which works - elif [[ $(gcc-major-version) -lt 4 ]] || { + if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || { [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then eerror "Compilation with gcc older than 4.7 is not supported" die "Too old gcc found." @@ -295,8 +289,17 @@ pkg_setup() { java-pkg-opt-2_pkg_setup kde4-base_pkg_setup python-single-r1_pkg_setup + xdg_environment_reset - [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup + if [[ ${MERGE_TYPE} != binary ]]; then + CHECKREQS_MEMORY="512M" + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + CHECKREQS_DISK_BUILD="22G" + else + CHECKREQS_DISK_BUILD="6G" + fi + check-reqs_pkg_setup + fi } src_unpack() { @@ -350,6 +353,11 @@ src_prepare() { -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" "${S}/icon-themes/galaxy/brand/intro.png" || die @@ -358,7 +366,6 @@ src_prepare() { src_configure() { local java_opts - local internal_libs local ext_opts # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys @@ -378,16 +385,6 @@ src_configure() { export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser" fi - # sane: just sane.h header that is used for scan in writer, not - # linked or anything else, worthless to depend on - # vigra: just uses templates from there - # it is serious pain in the ass for packaging - # should be replaced by boost::gil if someone interested - internal_libs+=" - --without-system-sane - --without-system-vigra - " - # libreoffice extensions handling for lo_xt in ${LO_EXTS}; do if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then @@ -414,6 +411,12 @@ src_configure() { java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)" fi + if use kde; then + # bug 544108, bug 599076 + export QMAKEQT4="$(qt4_get_bindir)/qmake" + export MOCQT4="$(qt4_get_bindir)/moc" + fi + # system headers/libs/...: enforce using system packages # --enable-cairo: ensure that cairo is always required # --enable-graphite: disabling causes build breakages @@ -423,12 +426,14 @@ src_configure() { # --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 econf \ --docdir="${EPREFIX}/usr/share/doc/${PF}/" \ + --with-system-dicts \ --with-system-headers \ - --with-system-libs \ --with-system-jars \ - --with-system-dicts \ + --with-system-libs \ --enable-cairo-canvas \ --enable-graphite \ --enable-largefile \ @@ -436,17 +441,16 @@ src_configure() { --enable-neon \ --enable-python=system \ --enable-randr \ - --enable-randr-link \ --enable-release-build \ - --disable-hardlink-deliver \ --disable-ccache \ --disable-crashdump \ --disable-dependency-tracking \ --disable-epm \ --disable-fetch-external \ --disable-gstreamer-0-10 \ - --disable-report-builder \ + --disable-hardlink-deliver \ --disable-online-update \ + --disable-report-builder \ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \ --with-build-version="Gentoo official package" \ --enable-extension-integration \ @@ -464,6 +468,7 @@ src_configure() { --without-help \ --with-helppack-integration \ --without-sun-templates \ + --without-system-sane \ $(use_enable bluetooth sdremote-bluetooth) \ $(use_enable coinmp) \ $(use_enable collada) \ @@ -481,6 +486,7 @@ src_configure() { $(use_enable kde kde4) \ $(use_enable mysql ext-mariadb-connector) \ $(use_enable odk) \ + $(use_enable pdfimport) \ $(use_enable postgres postgresql-sdbc) \ $(use_enable quickstarter systray) \ $(use_enable telepathy) \ @@ -488,12 +494,11 @@ src_configure() { $(use_with coinmp system-coinmp) \ $(use_with collada system-opencollada) \ $(use_with gltf system-libgltf) \ - $(use_with google gdrive-client-id ${google_default_client_id}) \ - $(use_with google gdrive-client-secret ${google_default_client_secret}) \ + $(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 mysql system-mysql-cppconn) \ $(use_with odk doxygen) \ - ${internal_libs} \ ${java_opts} \ ${ext_opts} } @@ -539,12 +544,16 @@ src_install() { # This is not Makefile so no buildserver make DESTDIR="${D}" distro-pack-install -o build -o check || die - # Fix bash completion placement - newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN} + # bug 593514 + if use gtk3; then + dosym /usr/$(get_libdir)/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 - rm -rf "${ED}"etc/ || die if use branding; then insinto /usr/$(get_libdir)/${PN}/program @@ -562,10 +571,6 @@ src_install() { # Remove desktop files to support old installs that can't parse mime rm -r "${ED}"usr/share/mimelnk/ || die - # FIXME: Hack add missing file - exeinto /usr/$(get_libdir)/${PN}/program - doexe "${S}"/instdir/program/libsaxlo.so - pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin } diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml index e1f2f47..7900bfe 100644 --- a/app-office/libreoffice/metadata.xml +++ b/app-office/libreoffice/metadata.xml @@ -14,10 +14,11 @@ version</longdescription> <flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag> <flag name="collada">Enable Collada for rendering 3D models stored in *.dae and *.kmz format</flag> <flag name="gltf">Use media-libs/libgltf for inserting 3D models in the glTF format into presentations</flag> - <flag name="google">Enable support for remote files on Google Drive</flag> + <flag name="googledrive">Enable support for remote files on Google Drive</flag> <flag name="gtk3">Enable highly experimental gtk3 frontend</flag> <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag> <flag name="odk">Build the Office Development Kit</flag> + <flag name="pdfimport">Enable PDF import via the Poppler library</flag> <flag name="quickstarter">Build the system tray quickstarter</flag> <flag name="telepathy">Enable document colaboration features using telepathy communication framework.</flag> <flag name="vlc">Use <pkg>media-video/vlc</pkg> for video embedding</flag>
