diff options
Diffstat (limited to 'app-office/libreoffice')
| -rw-r--r-- | app-office/libreoffice/Manifest | 7 | ||||
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-7.2.0.4-qt5detect.patch | 13 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-7.1.9999.ebuild | 4 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999.ebuild | 15 |
4 files changed, 30 insertions, 9 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 0eaa54d8c7c8..0c584e4c6705 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -2,6 +2,7 @@ AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0a AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba34369137336327f4d1ee27789c5f6229b9a82f4aeab0eaeaf494e60b992c66fcdb276b6423b87713febb14e9eeaffa388369ca8 SHA512 f82e23f15cefd947af20a50e1e4168c9023d5f8b9e19da7f76b141a60be4fa3516ad16400ce26e4d0ff293c570031ac87bbbf6766444e1b31e7bc3ee8ef58083 AUX libreoffice-7.0.3.1-qt5detect.patch 1065 BLAKE2B bce0bb8d36f903516f437520e0b1a99080984933173ac30686136632a795f16b8e82f7bfb9dfe77b048154cf3616b3c6c96fd7c563284212ce4b3f9a4490f368 SHA512 e4273fcb2140c50c9030ef3ffeb451169c2e04fcf7e43650ad1d0928fa18ebe77dd482e2686fbaf9660aebfc17b9ce22b3dfa76f2248ae4af9bc51826e2785c2 AUX libreoffice-7.1.3.2-bashism.patch 1092 BLAKE2B 0c14e7a282cafe030a39b15551695e61bd9fd70090589e4b94b0839a31b28e634f927b7a21e73de74ea890fc575ab23923a14ad9e226a626dec331db9014391f SHA512 abafcf90b93078c1ec8cc8bf807ec089fc0f79a3eb0823a1da4026a40281369998b72a2c894dc268c56af586476d39991099b99a2f9a74d03fac98b856d4e84d +AUX libreoffice-7.2.0.4-qt5detect.patch 536 BLAKE2B fd77876d1ca3973ad30c9ebb60bf28e163dd29dcaebaa2b94d84f4c2ab060617d96f4df3d5114f17f882b0cb8b9e2ecdb284fdd1e4aaf8a34cc0c1f06a295c04 SHA512 e1ac7dfc4743cbdea3050b18c1714d06c8bcca4abc51d56e13362c8379fbdd3d37a1916c962fcb1389783c9b1fd72783c9ee45fbb649538ca0fc0cb7b05bcacf DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c DIST 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip 1180582 BLAKE2B b2b91f608cccdc823c11ce946ecf12b8cb7b1218fa8763ed7b64cf2567114f0703b4103a4eb2369874a4006112396470d1a0a72e6f186c9fac629cbca0fe18d6 SHA512 9fe106bbdb55365f589246e5a0d10bbe9b35224132b66a1823dc6361633a67f2acc0e8c393dc7ed70d086858d16d242b8806b8b2184c98e3d20d0be85bed9c44 @@ -21,14 +22,16 @@ DIST db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip 1396007 BLAKE2B 8012d DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48dff6df5c857a6bd0510a92aa6d9b9660ad63b2344d5195fef072e526f8d7900791b15442923b63196dda3f SHA512 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85 DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a39ee9798182b70ba650fa954234b964e33278ac4fe3f84f8c3218ad49f12d139079328036b4f9d80cde967888c0a66393c34dedf27af69dac02c5aff SHA512 9091d3628d9c75c068507537afc9e10bfb79c1abfd36ad697af3d592a1cc049ba6640f665bfc53cc520b6a26c21d70b0275106843444b441484c2178f2784743 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114 +DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa8b9e470e10044dbfd3812391f29e1421df8d7ac3869955698ddbc9575feebcfbac27bb074a60ccc0527dca1c3 SHA512 295ab15115e75b1f6074f17d3538afe0de9b2b77ab454f5c63cb05e8df11886d82942fbf21ba01486052e3f6c75b0636b99d8e660cd3472dc4b87c31d3cd557b DIST libreoffice-7.1.3.2.tar.xz 244104432 BLAKE2B f73bd448f94bc88a1dc775d032ce849ee1dd610c4077c709ffbe40d8c99527c7775cfe2309a636093182ac988ecf44a4b61df0e0a83b332fcc77a05edb602791 SHA512 d7329475cad5bece9358b29bc590da1841c3c0b4aef511508d9398519c514fa176c90675857f1830925818f2dcc8b9c0986e5d34d3a33cce617e4ada23c60a72 DIST libreoffice-7.1.5.2.tar.xz 244350068 BLAKE2B ac3c7f5cabcb27ce3ed31febb04ce54b93bc8b4fa716259d1b93d5364e75b85af3352ad70a023b56271e769f5537b3f3151e837ee13498e08f1871e5b47d778c SHA512 dad5ffd344a7bad88ed8e77df4fb17b42237715e7b1feb7a7de164f2fbf6698feefedeb57974d8275067a06c0da60e9b07a333ccc1bb2f6d55a6b52408bd9b5f DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f DIST libreoffice-help-7.1.3.2.tar.xz 111785416 BLAKE2B 12d97764976ae0e4736638e9b758c5920d38d608e66fc3343d74178a935632396e1e07fbb98b6f380fd103c3f5e2edf917726a760420f6dfd3d2e42aaa215096 SHA512 576dbea391777a907275b630ed704dd3d9ad0627f8a18da1cbd23fe28df04c3a509583c2404f810df3aaac15ef0881e2c1e0a55c9f31618715586628873367eb DIST libreoffice-help-7.1.5.2.tar.xz 111785852 BLAKE2B 18962fe9260f6cf8ec7b1676f077b9f43e0277769b31b8e2c22cf83ac2963f3e92448901bc12f56dfb579da8a8a1ce20d6bd34c4bc3449f7e0972c03d22f63be SHA512 c669b6c4bfc3c6f46e4ee0bf86b158054f7178b9785273d9aba8183236b2ff6dbaf5584d5e4fb09bba3a8d010373599e7473a4ba15c229087c689198ceeee1c7 DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d +DIST skia-m94-975fcdd755dfc5d57cddbb25857e0c4ac29abe98.tar.xz 11672176 BLAKE2B 64d7821656002d23be839079dedffe1132497992aaef97ec734d6e430f2eda69f5344ca7fe75dd68fee847fa4c6638b4fc28194a951b91498ece5c6d4bcf3e44 SHA512 ae66fa7caeb5a328d96cd1c35eb8700080be5d3e3764e35b8056b03948e44b8bb8266284c87b44f9200accb95dbb8a2771a6e5ba067d34a7fbd33b1ababf19f8 EBUILD libreoffice-7.1.3.2.ebuild 19593 BLAKE2B 0ad7019e0cef8ab019f5993897ba2641c95258cf21251b0b86266a1c9af92e01153895be1198b234ad4381546366642412739ba79d9aee1cb258ae2bcd48f717 SHA512 909cf68a3d06c287feac0b104a9f3e262e5216b11722029f486e2e982f99d07d259db4e04125c9016d19c350d7599f5e6b72ffbae59c9bb070d4569136bda740 EBUILD libreoffice-7.1.5.2.ebuild 19609 BLAKE2B 83226e67fcd0f3fb54690687dcf0c8ee7426c1d97a9be7b4fcb3702752aa06ac3eb9d815b34d9614e758d920fee56ed5858a387261818d270bd04517a59d686b SHA512 cfd2da54051e21a35ff93999c14dd0fda841bc081d1398990a1674f820d3cd66a55bf50769f39e5bc97f76d21fd70e8ab9e9ed34af93baef4e539c2a90eeabaa -EBUILD libreoffice-7.1.9999.ebuild 19530 BLAKE2B 200d1bd15a68070a7dc1f11a57bf06af8f4da3f1fddc77572e6ebb9dbcdf6e1cbf341c7232ec8b20d9ab5c35a800fc47c896df31c0534fc0ac9a33c72e05f97c SHA512 a3ddf9d003d4410c630afa09198e535ac774b49ab68a57512d814c0574cc2a602ee106d7aa1e67f9ed81f00b7ccdd3e94db25eee76eb133b05a380242650a634 -EBUILD libreoffice-9999.ebuild 19514 BLAKE2B 1e87e2b25207d53d88727d2347b853ca778f791c83220fc52d4563e8ddbf1267d0e0e3d587e39ad997d8f6351330ec78a4369756f15059cb0a6821bb83e96b0e SHA512 445c191747de6e1000ccad00f5ba7981e28ff113eb11490f15a417aae40042d94eec748f0f40ff56c38b97e05690604b2427e4ce2c04c96364bc6563ea4e49eb +EBUILD libreoffice-7.1.9999.ebuild 19705 BLAKE2B 6feb38a509865791e552e526178fb11f76252f5627dad71b60b3a4608a20a6baedc268957fd188a42dee3ddae1e036dd42466678ee40b5be83fb5705cd4b6542 SHA512 7e7abcf0c149cb86b5d6e2145888c357688f568920d7cd33c96cdda5863e99e1a3a8f2755080f91c3340de98628b536aaf02a5c604245119ee60e9f5d7d50006 +EBUILD libreoffice-9999.ebuild 19489 BLAKE2B a44938998e31862c66ac3922816a667acd7661a1091a43c2a37d7fabb808cf23b8872be9c9283d39c502be93574b53c61bf50dfe22c7369c08467165ff75a599 SHA512 723d773d7fe361874057689082196f8fad38e68338125c106f4dc5762e17677213722d927d1b8921ee3bcb0cbb2240c38f3a8d1047953fba3ef75a879c6be1f2 MISC metadata.xml 1221 BLAKE2B 2cc713dbc6d112ac21f8846f9dad48c09972c0d6846a253773280564cf9370934ec798a1579d894d7679c591045542cf2c8cb8a308bf097ce5eac64f40fda3f0 SHA512 c1ab6a23d6fa4ed6b2d77b08c895f653890998a8ed7fb2fa69251adacc9a96e32c0d1298a2b7c287efe85d37a2707e740b6b036174b7b6e39d37a25e3866e957 diff --git a/app-office/libreoffice/files/libreoffice-7.2.0.4-qt5detect.patch b/app-office/libreoffice/files/libreoffice-7.2.0.4-qt5detect.patch new file mode 100644 index 000000000000..c905fabf5b30 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-7.2.0.4-qt5detect.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index 971d7ad440c5..adb01509ab29 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -12683,7 +12683,7 @@ then + + dnl Check for Meta Object Compiler + +- AC_PATH_PROGS( MOC5, [moc-qt5 moc], no, [`dirname $qt5_libdir`/bin:$QT5DIR/bin:$PATH]) ++ AC_PATH_PROGS( MOC5, [moc-qt5 moc], no, [$QT5DIR/bin]) + if test "$MOC5" = "no"; then + AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify + the root of your Qt installation by exporting QT5DIR before running "configure".]) diff --git a/app-office/libreoffice/libreoffice-7.1.9999.ebuild b/app-office/libreoffice/libreoffice-7.1.9999.ebuild index 7ce776f6f001..229e39b60b6a 100644 --- a/app-office/libreoffice/libreoffice-7.1.9999.ebuild +++ b/app-office/libreoffice/libreoffice-7.1.9999.ebuild @@ -44,6 +44,9 @@ 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=( + # broken against latest upstream release, too many patches on top: + # https://github.com/tdf/libcmis/pull/43 + "${ADDONS_URI}/libcmis-0.5.2.tar.xz" # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c "${ADDONS_URI}/dtoa-20180411.tgz" # not packaged in Gentoo, https://skia.org/ @@ -507,6 +510,7 @@ src_configure() { --with-system-gpgmepp --without-system-jfreereport --without-system_apache_commons + --without-system-libcmis --without-system-sane --without-system-qrcodegen $(use_enable base report-builder) diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 45f856b59db4..48469b754b1d 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -44,12 +44,13 @@ 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=( + # broken against latest upstream release, too many patches on top: + # https://github.com/tdf/libcmis/pull/43 + "${ADDONS_URI}/libcmis-0.5.2.tar.xz" # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c "${ADDONS_URI}/dtoa-20180411.tgz" # not packaged in Gentoo, https://skia.org/ - "${ADDONS_URI}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz" - # QR code generating library for >=libreoffice-6.4, bug #691740 - "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz" + "${ADDONS_URI}/skia-m94-975fcdd755dfc5d57cddbb25857e0c4ac29abe98.tar.xz" "base? ( ${ADDONS_URI}/commons-logging-1.2-src.tar.gz ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip @@ -136,7 +137,6 @@ COMMON_DEPEND="${PYTHON_DEPS} >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC - >=games-engines/box2d-2.4.1:0 dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat @@ -152,6 +152,7 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] + >=games-engines/box2d-2.4.1:0 media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig @@ -165,6 +166,7 @@ COMMON_DEPEND="${PYTHON_DEPS} >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf + media-libs/zxing-cpp >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve @@ -291,7 +293,7 @@ PATCHES=( # not upstreamable stuff "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" "${FILESDIR}/${PN}-6.1-nomancompress.patch" - "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch" + "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch" ) S="${WORKDIR}/${PN}-${MY_PV}" @@ -463,7 +465,6 @@ src_configure() { # --without-system-sane: just sane.h header that is used for scan in writer, # not linked or anything else, worthless to depend on # --disable-pdfium: not yet packaged - # --without-system-qrcodegen: has no real build system and LO is the only user local myeconfargs=( --with-system-dicts --with-system-epoxy @@ -506,8 +507,8 @@ src_configure() { --with-system-gpgmepp --without-system-jfreereport --without-system_apache_commons + --without-system-libcmis --without-system-sane - --without-system-qrcodegen $(use_enable base report-builder) $(use_enable bluetooth sdremote-bluetooth) $(use_enable coinmp) |