From 52f895faaaf01579a8d9528cafec20bf2c873f5c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 17 Jan 2020 22:43:15 +0000 Subject: gentoo resync : 17.01.2010 --- app-office/libreoffice/Manifest | 5 - .../files/libreoffice-6.2-ldap-optional.patch | 178 ------- .../files/libreoffice-6.2.8.2-poppler-0.82.patch | 123 ----- app-office/libreoffice/libreoffice-6.2.8.2.ebuild | 554 --------------------- 4 files changed, 860 deletions(-) delete mode 100644 app-office/libreoffice/files/libreoffice-6.2-ldap-optional.patch delete mode 100644 app-office/libreoffice/files/libreoffice-6.2.8.2-poppler-0.82.patch delete mode 100644 app-office/libreoffice/libreoffice-6.2.8.2.ebuild (limited to 'app-office/libreoffice') diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 910c36bf6cf3..1c463f33a3c2 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -1,8 +1,6 @@ AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0ad4b57a3739d6d34a2941f2ea57d3a5c4ab65e3f3c2376243aa88c9c05b1038cf9bfb7605a370d11513bb4553de2d268010519 SHA512 2aa6d1fc96749b79b3291f6e27630c6cf59d2c743f0dd8603867ba8aec2c17f87b70e1dd031365013f7e9ea53c160e9cb3f48af592a587dc05f3ae4cc1b35df6 AUX libreoffice-5.4-system-pyuno.patch 1399 BLAKE2B d7516b0ac19509dae8eaaac94acad65e35c71b68ea0f2962c41d9422a89993dc90e76b1f7cd3d19f8f3860b443f063ee1c17024c7f56fd3b8470d2b690eb9c32 SHA512 41b57b857a294b8ac234aaf160dbd380008f716ffdf481b7c733f1dab8702876aad827ab9f1b8f2f26778f0b3a6dfdc9e3ae190188a484d9aeb4568df2e9b418 AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba34369137336327f4d1ee27789c5f6229b9a82f4aeab0eaeaf494e60b992c66fcdb276b6423b87713febb14e9eeaffa388369ca8 SHA512 f82e23f15cefd947af20a50e1e4168c9023d5f8b9e19da7f76b141a60be4fa3516ad16400ce26e4d0ff293c570031ac87bbbf6766444e1b31e7bc3ee8ef58083 -AUX libreoffice-6.2-ldap-optional.patch 6188 BLAKE2B 53ad75d5340f40b4229329e79b777464107553459ae56a2cce2e953ebc15b7f3decc4496fa11bed931d83feceb983d3a1613ea452671931244337125e8bd109d SHA512 9098e1208e1a35627f88ccd94f509ed48d28a02eafd45d9a20a4dcc2ea537a29b0f89c4cdec25be3e9af1773e93b7cf6d20dd0d8db9451117e4c61eb261f1548 -AUX libreoffice-6.2.8.2-poppler-0.82.patch 5519 BLAKE2B 412c7f4c1e071f0385a630398f791d381d0b188fcca4e315adb201c80f659e69c9e007f7c231032ac3216aadc4e009a65746429a5f8af6a2e899a7e3e8012e0a SHA512 35f4664102b196008d971052036f016c090970fd0a8b7ec109bf3a08d4595146c0c2d120d4fe82dedb4a7bff318e47991c05d9b07c077bc5e40970279d5a50a8 AUX libreoffice-6.3.3.2-mysql-connector-c-8.patch 1707 BLAKE2B b8fe46888d287384d72819ac38735642bee66885e04d81c0b18124e2fb5c4fdf486368920578d1d44e268d870d3280ecb081d5d65721cb78762ca02ee52e5b6e SHA512 b4a6b2e0e33e4521079b58d522019997337f82d24826fb12aded275ae01985fd286ab4f0bf5f0685cdf1f92ed17ed545b715181b11e7a8b580e7ba0578b2903c AUX libreoffice-6.3.4.2-poppler-0.83.patch 2703 BLAKE2B 6936c91d4b5d8cab3aa17b81410b9cda759f83d034a4ffb0bd1facb890458361d8e0c445d9371448390526d9f1dd850b331436770f86f0182c621f1b22015d2a SHA512 ca572090508577fa01fff00a0b9e5372a11f7876cfdd5c0537c63e89f98c7171c854275ab059657b99a8cec89c3edd7bf22f3a46f375a81c44d207596cc91186 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a @@ -10,12 +8,9 @@ DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325 DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a -DIST libreoffice-6.2.8.2.tar.xz 215070800 BLAKE2B d6bc1e94de1df4dd20dafaeac9702435f305fe15117e8aee02233c6d2e74423bb475aeaf79ff6dcd30e22d69a5d6f0648218819b08003524a2c7b1db340281c4 SHA512 cf1dd708f10ea4b9a3134851cad45fe91c1d535e2b2068f7e65f1cb1bf4076c5c41ec253f628c5b912590e91ccfe16f5c8bcf39bc92df2ec7c8aef84210349bd DIST libreoffice-6.3.4.2.tar.xz 225632492 BLAKE2B 587fe7e6298ded60fa08963f572733eb8e387c00b428201bb6f1de7eddcf9d9ee97438231ed3f961bd22628bde0fd9dfeacb63febdc566cde781bcebb9c9a71d SHA512 2ed687ae805da36635419729066a2924f1e38a6b0f8d2692c42b366450a261012adfcd8a5d7915d9cfd292d07519fc32c596cdb56d7be6b12a49618b18d6f3d2 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f -DIST libreoffice-help-6.2.8.2.tar.xz 13024032 BLAKE2B 524ba3ff77670afeddddbf8be4724b5e54f9b157582cfcac8640e2184b8ae24c8e5e01b924415949f1756c18e2d54b8eab7efb78c979321e50b6d52b741ddd49 SHA512 c1f5b1b3c50da0a47a9724c9fc3544a15b7df72e66c5c2008afeae7732e2b29f0e57e64ce9a216c3237acdb4345715525f32be290f3196ba6e28685fa6c0925c DIST libreoffice-help-6.3.4.2.tar.xz 13191636 BLAKE2B c1696efa0ec9fef9dbcc0c0388de8a384484af1453d200e08820ba910cdcb65638b189566a19868281fd1777213812fde06adb07c1a662302eea1d0a791ff5a0 SHA512 8c74c82c7d73adb1523300d1f7500769f5a623fdba60b440a63c122cbfeb631a6a34ecbcb115b0154a6957be1918306f7d0c1f465030f8e8cfd5c9a1acad17c9 -EBUILD libreoffice-6.2.8.2.ebuild 15975 BLAKE2B 468ac7eff1f82bcfef5e2ba4de884e54dc116c5f676714369df58657139397a1b95a8193a882035d321745329c045405d7eac434effb88ed9d3c2fd5da0d9db5 SHA512 fb6a75af8cf8553c0c83f656d10116a74ee2a5e70375d2b4e6a0db1b8980b17a625d1277f3c4a3949df0be87d526aafc0d270c25ba512577d7b4575be7ae1c8b EBUILD libreoffice-6.3.4.2.ebuild 15997 BLAKE2B 7d4cfabdbb58d8b9fe4d116e453797aa04474bd0873e83e373ef5b10086fe2034dfe1ea3886247ebfd6cbf0945f83d1cebe35699f1f91fa5b20b5136937d4246 SHA512 ebbc44168a791c8f1125c8c007753d7eb035a8165b187cb6fe5d63fc5e1ec05a75a96e6c1cd9a017ed37102c64a2ccd5569d47c7d356fdc62979dc86ac0111c6 EBUILD libreoffice-6.3.9999.ebuild 15960 BLAKE2B 9f06fee05c73e6109ec65809b856d883950bbf9e52606a6924d83f280a8dd15759d02375fcf78267f513dd1b4014b13144f3718a6d851be0de5362a569d9a42d SHA512 4425b3c05d7d043815a01cbebf4bb123c9d51996258fde08f34bf2f3ccce7f1633d7d0bead621557c54493178e379c3ec5fc74083c3674f6367cade83de4f8f9 EBUILD libreoffice-9999.ebuild 15782 BLAKE2B 16a63cbf184700253bdf7c6ea9d98ef4db9a0626e6b1bacef86e814a1dbd76d402bf03bc9a6caf0aa2ca43c6b9da6aa5c4c4c686d8d1578d66eb5e551f1e2827 SHA512 28a995c51ffe8e1de1c372c9c224e5ba1c036473667d4e4f02e8cdc18b5457ba9f26b8bcf4381158456bbb8f1162b580276c933dc67a6e69ea38c22ff9603731 diff --git a/app-office/libreoffice/files/libreoffice-6.2-ldap-optional.patch b/app-office/libreoffice/files/libreoffice-6.2-ldap-optional.patch deleted file mode 100644 index c92689732527..000000000000 --- a/app-office/libreoffice/files/libreoffice-6.2-ldap-optional.patch +++ /dev/null @@ -1,178 +0,0 @@ -From 6776c53b7ce2e431d8636f4e5a755f50f787ec8f Mon Sep 17 00:00:00 2001 -From: Andrew Udvare -Date: Tue, 8 Jan 2019 04:53:51 -0500 -Subject: Make LDAP support optional - -Change-Id: Ifbd3903494a81e7b155bf6468f6ca2c50b3370a4 -Reviewed-on: https://gerrit.libreoffice.org/65958 -Tested-by: Jenkins -Reviewed-by: Markus Mohrhard ---- - Repository.mk | 2 +- - RepositoryExternal.mk | 3 ++- - configure.ac | 24 ++++++++++++++++++++++- - connectivity/Library_postgresql-sdbc-impl.mk | 2 +- - extensions/Module_extensions.mk | 7 ++++++- - external/postgresql/ExternalProject_postgresql.mk | 5 +++-- - postprocess/Rdb_services.mk | 2 +- - 7 files changed, 37 insertions(+), 8 deletions(-) - -diff --git a/Repository.mk b/Repository.mk -index 4ae8528..4d8389b 100644 ---- a/Repository.mk -+++ b/Repository.mk -@@ -389,7 +389,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ - hyphen \ - icg \ - $(if $(ENABLE_JAVA),jdbc) \ -- ldapbe2 \ -+ $(if $(ENABLE_LDAP),ldapbe2) \ - $(if $(filter WNT,$(OS)),WinUserInfoBe) \ - localebe1 \ - log \ -diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk -index 602ff6d..3c9be87 100644 ---- a/RepositoryExternal.mk -+++ b/RepositoryExternal.mk -@@ -2900,7 +2900,7 @@ endef - - endif # SYSTEM_HSQLDB - -- -+ifeq ($(ENABLE_LDAP),TRUE) - ifneq ($(SYSTEM_OPENLDAP),) - - define gb_LinkTarget__use_openldap -@@ -2929,6 +2929,7 @@ $(call gb_LinkTarget_add_libs,$(1), \ - ) - - endef -+endif - - define gb_ExternalProject__use_openldap - $(call gb_ExternalProject_use_external_project,$(1),openldap) -diff --git a/configure.ac b/configure.ac -index f880308..35c7e02 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1519,6 +1519,11 @@ libo_FUZZ_ARG_ENABLE(formula-logger, - ) - ) - -+AC_ARG_ENABLE(ldap, -+ AS_HELP_STRING([--disable-ldap], -+ [Disable LDAP support.]), -+,enable_ldap=yes) -+ - dnl =================================================================== - dnl Optional Packages (--with/without-) - dnl =================================================================== -@@ -9214,12 +9219,29 @@ else - fi - AC_SUBST(SYSTEM_ODBC_HEADERS) - -+dnl =================================================================== -+dnl Enable LDAP support -+dnl =================================================================== -+ -+if test "$_os" != "WINNT" -a "$_os" != "iOS" -a "$_os" != "Android"; then -+AC_MSG_CHECKING([whether to enable LDAP support]) -+ if test "$enable_ldap" != "yes"; then -+ AC_MSG_RESULT([no]) -+ ENABLE_LDAP="" -+ enable_ldap=no -+ else -+ AC_MSG_RESULT([yes]) -+ ENABLE_LDAP="TRUE" -+ AC_DEFINE(HAVE_FEATURE_LDAP) -+ fi -+fi -+AC_SUBST(ENABLE_LDAP) - - dnl =================================================================== - dnl Check for system openldap - dnl =================================================================== - --if test "$_os" != "WINNT" -a "$_os" != "iOS" -a "$_os" != "Android"; then -+if test "$_os" != "WINNT" -a "$_os" != "iOS" -a "$_os" != "Android" -a "$ENABLE_LDAP" != ""; then - AC_MSG_CHECKING([which openldap library to use]) - if test "$with_system_openldap" = "yes"; then - AC_MSG_RESULT([external]) -diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk -index 53cebd0..3d048f3 100644 ---- a/connectivity/Library_postgresql-sdbc-impl.mk -+++ b/connectivity/Library_postgresql-sdbc-impl.mk -@@ -47,7 +47,7 @@ $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\ - postgresql \ - $(if $(filter-out MSC,$(COM)), \ - openssl \ -- openldap \ -+ $(if $(ENABLE_LDAP),openldap) \ - nss3 \ - plc4 \ - ssl3 \ -diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk -index f84a9ca..43dd929 100644 ---- a/extensions/Module_extensions.mk -+++ b/extensions/Module_extensions.mk -@@ -16,7 +16,6 @@ $(eval $(call gb_Module_add_l10n_targets,extensions,\ - ifneq ($(filter-out iOS ANDROID,$(OS)),) - $(eval $(call gb_Module_add_targets,extensions,\ - Library_abp \ -- Library_ldapbe2 \ - $(if $(filter WNT,$(OS)),Library_WinUserInfoBe) \ - Library_log \ - Library_scn \ -@@ -28,6 +27,12 @@ $(eval $(call gb_Module_add_targets,extensions,\ - )) - endif - -+ifeq ($(ENABLE_LDAP),TRUE) -+$(eval $(call gb_Module_add_targets,extensions,\ -+ Library_ldapbe2 \ -+)) -+endif -+ - ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) - $(eval $(call gb_Module_add_targets,extensions,\ - Library_bib \ -diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk -index f6617e5..fc4342c 100644 ---- a/external/postgresql/ExternalProject_postgresql.mk -+++ b/external/postgresql/ExternalProject_postgresql.mk -@@ -10,7 +10,7 @@ - $(eval $(call gb_ExternalProject_ExternalProject,postgresql)) - - $(eval $(call gb_ExternalProject_use_externals,postgresql,\ -- openldap \ -+ $(if $(ENABLE_LDAP),openldap) \ - openssl \ - zlib \ - )) -@@ -64,9 +64,10 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) : - $(if $(DISABLE_OPENSSL),,--with-openssl \ - $(if $(WITH_KRB5), --with-krb5) \ - $(if $(WITH_GSSAPI),--with-gssapi)) \ -+ $(if $(ENABLE_LDAP),,--with-ldap=no) \ - CPPFLAGS="$(postgresql_CPPFLAGS)" \ - LDFLAGS="$(postgresql_LDFLAGS)" \ -- EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4" \ -+ $(if $(ENABLE_LDAP),EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4") \ - && cd src/interfaces/libpq \ - && MAKEFLAGS= && $(MAKE) all-static-lib) - -diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk -index c70d1ca..342f19b 100644 ---- a/postprocess/Rdb_services.mk -+++ b/postprocess/Rdb_services.mk -@@ -293,7 +293,7 @@ $(eval $(call gb_Rdb_add_components,services,\ - desktop/source/offacc/offacc \ - $(if $(DISABLE_GUI),,desktop/source/splash/spl) \ - extensions/source/abpilot/abp \ -- extensions/source/config/ldap/ldapbe2 \ -+ $(if $(ENABLE_LDAP),extensions/source/config/ldap/ldapbe2) \ - $(if $(filter WNT,$(OS)),\ - extensions/source/config/WinUserInfo/WinUserInfoBe \ - ) \ --- -cgit v1.1 diff --git a/app-office/libreoffice/files/libreoffice-6.2.8.2-poppler-0.82.patch b/app-office/libreoffice/files/libreoffice-6.2.8.2-poppler-0.82.patch deleted file mode 100644 index b6c30cd92a16..000000000000 --- a/app-office/libreoffice/files/libreoffice-6.2.8.2-poppler-0.82.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 2eadd46ab81058087af95bdfc1fea28fcdb65998 Mon Sep 17 00:00:00 2001 -From: Rasmus Thomsen -Date: Sat, 26 Oct 2019 14:11:35 +0200 -Subject: Fix build with poppler-0.82 - -Change-Id: I3b6b3faea7986f3e5a6ae4790580d03bc9c955fc -Reviewed-on: https://gerrit.libreoffice.org/81545 -Tested-by: Jenkins -Reviewed-by: Michael Stahl ---- - .../pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 25 ++++++++++++++++++++++ - .../pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 16 +++++++++++++- - 2 files changed, 40 insertions(+), 1 deletion(-) - -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -index ce32a41..3ae3bdc 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -863,11 +863,20 @@ void PDFOutDev::eoClip(GfxState *state) - local offset of character (zero for horizontal writing mode). not - taken into account for output pos updates. Used for vertical writing. - */ -+ -+#if POPPLER_CHECK_VERSION(0, 82, 0) -+void PDFOutDev::drawChar(GfxState *state, double x, double y, -+ double dx, double dy, -+ double originX, double originY, -+ CharCode, int /*nBytes*/, const Unicode *u, int uLen) -+{ -+#else - void PDFOutDev::drawChar(GfxState *state, double x, double y, - double dx, double dy, - double originX, double originY, - CharCode, int /*nBytes*/, Unicode *u, int uLen) - { -+#endif - assert(state); - - if( u == nullptr ) -@@ -979,11 +988,19 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str, - writeBinaryBuffer(aBuf); - } - -+#if POPPLER_CHECK_VERSION(0, 82, 0) -+void PDFOutDev::drawImage(GfxState*, Object*, Stream* str, -+ int width, int height, GfxImageColorMap* colorMap, -+ poppler_bool /*interpolate*/, -+ const int* maskColors, poppler_bool /*inlineImg*/ ) -+{ -+#else - void PDFOutDev::drawImage(GfxState*, Object*, Stream* str, - int width, int height, GfxImageColorMap* colorMap, - poppler_bool /*interpolate*/, - int* maskColors, poppler_bool /*inlineImg*/ ) - { -+#endif - if (m_bSkipImages) - return; - OutputBuffer aBuf; initBuf(aBuf); -@@ -1004,12 +1021,20 @@ void PDFOutDev::drawImage(GfxState*, Object*, Stream* str, - { - GfxRGB aMinRGB; - colorMap->getColorSpace()->getRGB( -+#if POPPLER_CHECK_VERSION(0, 82, 0) -+ reinterpret_cast(maskColors), -+#else - reinterpret_cast(maskColors), -+#endif - &aMinRGB ); - - GfxRGB aMaxRGB; - colorMap->getColorSpace()->getRGB( -+#if POPPLER_CHECK_VERSION(0, 82, 0) -+ reinterpret_cast(maskColors)+gfxColorMaxComps, -+#else - reinterpret_cast(maskColors)+gfxColorMaxComps, -+#endif - &aMaxRGB ); - - aMaskBuf.push_back( colToByte(aMinRGB.r) ); -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -index 1a0c3f0..02f6b59 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -@@ -232,10 +232,17 @@ namespace pdfi - virtual void eoClip(GfxState *state) override; - - //----- text drawing -+#if POPPLER_CHECK_VERSION(0, 82, 0) -+ virtual void drawChar(GfxState *state, double x, double y, -+ double dx, double dy, -+ double originX, double originY, -+ CharCode code, int nBytes, const Unicode *u, int uLen) override; -+#else - virtual void drawChar(GfxState *state, double x, double y, - double dx, double dy, - double originX, double originY, - CharCode code, int nBytes, Unicode *u, int uLen) override; -+#endif - #if POPPLER_CHECK_VERSION(0, 64, 0) - virtual void drawString(GfxState *state, const GooString *s) override; - #else -@@ -248,10 +255,17 @@ namespace pdfi - int width, int height, poppler_bool invert, - poppler_bool interpolate, - poppler_bool inlineImg) override; -+#if POPPLER_CHECK_VERSION(0, 82, 0) - virtual void drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, - poppler_bool interpolate, -- int* maskColors, poppler_bool inlineImg) override; -+ const int* maskColors, poppler_bool inlineImg) override; -+#else -+ virtual void drawImage(GfxState *state, Object *ref, Stream *str, -+ int width, int height, GfxImageColorMap *colorMap, -+ poppler_bool interpolate, -+ int* maskColors, poppler_bool inlineImg) override; -+#endif - virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str, - int width, int height, - GfxImageColorMap *colorMap, --- -cgit v1.1 diff --git a/app-office/libreoffice/libreoffice-6.2.8.2.ebuild b/app-office/libreoffice/libreoffice-6.2.8.2.ebuild deleted file mode 100644 index 96473926765f..000000000000 --- a/app-office/libreoffice/libreoffice-6.2.8.2.ebuild +++ /dev/null @@ -1,554 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{6,7} ) -PYTHON_REQ_USE="threads(+),xml" - -MY_PV="${PV/_alpha/.alpha}" -MY_PV="${MY_PV/_beta/.beta}" -# experimental ; release ; old -# Usually the tarballs are moved a lot so this should make everyone happy. -DEV_URI=" - https://dev-builds.libreoffice.org/pre-releases/src - https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/ - https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src -" -ADDONS_URI="https://dev-www.libreoffice.org/src/" - -BRANDING="${PN}-branding-gentoo-0.8.tar.xz" -# PATCHSET="${P}-patchset-01.tar.xz" - -[[ ${MY_PV} == *9999* ]] && inherit git-r3 -inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils - -DESCRIPTION="A full office productivity suite" -HOMEPAGE="https://www.libreoffice.org" -SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" -[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}" - -# Split modules following git/tarballs; Core MUST be first! -# Help is used for the image generator -# Only release has the tarballs -if [[ ${MY_PV} != *9999* ]]; then - for i in ${DEV_URI}; do - SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz" - SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz" - done - unset i -fi -unset DEV_URI - -# Really required addons -# These are bundles that can't be removed for now due to huge patchsets. -# If you want them gone, patches are welcome. -ADDONS_SRC=( - "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" - # no release for 8 years, should we package it? - "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" - # Does not build with 1.6 rhino at all - "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" - # requirement of rhino - "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" - # not packageable - "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" -) -SRC_URI+=" ${ADDONS_SRC[*]}" - -unset ADDONS_URI -unset ADDONS_SRC - -# Extensions that need extra work: -LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" - -IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird -googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test -$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" - -RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - bluetooth? ( dbus ) - libreoffice_extensions_nlpsolver? ( java ) - libreoffice_extensions_scripting-beanshell? ( java ) - libreoffice_extensions_scripting-javascript? ( java ) - libreoffice_extensions_wiki-publisher? ( java ) -" - -LICENSE="|| ( LGPL-3 MPL-1.1 )" -SLOT="0" -[[ ${MY_PV} == *9999* ]] || \ -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" - -BDEPEND=" - dev-util/intltool - sys-devel/bison - sys-devel/flex - sys-devel/gettext - virtual/pkgconfig - odk? ( >=app-doc/doxygen-1.8.4 ) -" -COMMON_DEPEND="${PYTHON_DEPS} - app-arch/unzip - app-arch/zip - app-crypt/gpgme[cxx] - app-text/hunspell:= - >=app-text/libabw-0.1.0 - >=app-text/libebook-0.1 - app-text/libepubgen - >=app-text/libetonyek-0.1 - app-text/libexttextcat - app-text/liblangtag - >=app-text/libmspub-0.1.0 - >=app-text/libmwaw-0.3.1 - app-text/libnumbertext - >=app-text/libodfgen-0.1.0 - app-text/libqxp - app-text/libstaroffice - app-text/libwpd:0.10[tools] - app-text/libwpg:0.3 - >=app-text/libwps-0.4 - app-text/mythes - >=dev-cpp/clucene-2.3.3.4-r2 - =dev-cpp/libcmis-0.5* - dev-db/unixODBC - dev-lang/perl - dev-libs/boost:=[nls] - dev-libs/expat - dev-libs/hyphen - dev-libs/icu:= - dev-libs/libassuan - dev-libs/libgpg-error - >=dev-libs/liborcus-0.14.0 - dev-libs/librevenge - dev-libs/libxml2 - dev-libs/libxslt - dev-libs/nspr - dev-libs/nss - >=dev-libs/redland-1.0.16 - >=dev-libs/xmlsec-1.2.28[nss] - media-gfx/fontforge - media-gfx/graphite2 - media-libs/fontconfig - media-libs/freetype:2 - >=media-libs/harfbuzz-0.9.42:=[graphite,icu] - media-libs/lcms:2 - >=media-libs/libcdr-0.1.0 - >=media-libs/libepoxy-1.3.1[X] - >=media-libs/libfreehand-0.1.0 - media-libs/libpagemaker - >=media-libs/libpng-1.4:0= - >=media-libs/libvisio-0.1.0 - media-libs/libzmf - net-libs/neon - net-misc/curl - sci-mathematics/lpsolve - sys-libs/zlib - virtual/glu - virtual/jpeg:0 - virtual/opengl - x11-libs/cairo[X] - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - accessibility? ( 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 - gnome-extra/evolution-data-server - ) - firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - gtk? ( - dev-libs/glib:2 - dev-libs/gobject-introspection - gnome-base/dconf - media-libs/mesa[egl] - x11-libs/gtk+:3 - x11-libs/pango - ) - gtk2? ( - x11-libs/gdk-pixbuf - >=x11-libs/gtk+-2.24:2 - x11-libs/pango - ) - kde? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - kde-frameworks/kconfig:5 - kde-frameworks/kcoreaddons:5 - kde-frameworks/ki18n:5 - kde-frameworks/kio:5 - kde-frameworks/kwindowsystem:5 - ) - ldap? ( net-nds/openldap ) - libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) - libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) - mariadb? ( dev-db/mariadb-connector-c ) - !mariadb? ( dev-db/mysql-connector-c ) - pdfimport? ( app-text/poppler:=[cxx] ) - postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) -" -# FIXME: cppunit should be moved to test conditional -# after everything upstream is under gbuild -# as dmake execute tests right away -# tests apparently also need google-carlito-fonts (not packaged) -DEPEND="${COMMON_DEPEND} - >=dev-libs/libatomic_ops-7.2d - dev-perl/Archive-Zip - >=dev-util/cppunit-1.14.0 - >=dev-util/gperf-3 - >=dev-util/mdds-1.4.1:1= - media-libs/glm - sys-devel/ucpp - x11-base/xorg-proto - x11-libs/libXt - x11-libs/libXtst - java? ( - dev-java/ant-core - >=virtual/jdk-1.6 - ) - test? ( - app-crypt/gnupg - dev-util/cppunit - media-fonts/dejavu - media-fonts/liberation-fonts - ) -" -RDEPEND="${COMMON_DEPEND} - !app-office/libreoffice-bin - !app-office/libreoffice-bin-debug - !app-office/openoffice - media-fonts/liberation-fonts - || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) - java? ( >=virtual/jre-1.6 ) - kde? ( kde-frameworks/breeze-icons:* ) -" -if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then - PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*" -else - # Translations are not reliable on live ebuilds - # rather force people to use english only. - PDEPEND="!app-office/libreoffice-l10n" -fi - -PATCHES=( - # master branch - "${FILESDIR}/${PN}-6.2-ldap-optional.patch" - "${FILESDIR}/${P}-poppler-0.82.patch" - # "${WORKDIR}"/${PATCHSET/.tar.xz/} - - # not upstreamable stuff - "${FILESDIR}/${PN}-5.4-system-pyuno.patch" - "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" - "${FILESDIR}/${PN}-6.1-nomancompress.patch" -) - -S="${WORKDIR}/${PN}-${MY_PV}" - -_check_reqs() { - CHECKREQS_MEMORY="512M" - if is-flagq "-g*" && ! is-flagq "-g*0" ; then - CHECKREQS_DISK_BUILD="22G" - else - CHECKREQS_DISK_BUILD="6G" - fi - check-reqs_$1 -} - -pkg_pretend() { - if ! use java && ! use firebird; then - ewarn "If you plan to use Base application you must enable either firebird or java." - fi - - use java || ewarn "Without java, several wizards are not going to be available." - - if has_version "/dev/null) - --with-jvm-path="${EPREFIX}/usr/lib/" - ) - - use libreoffice_extensions_scripting-beanshell && \ - myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) ) - - use libreoffice_extensions_scripting-javascript && \ - myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) ) - fi - - is-flagq "-flto*" && myeconfargs+=( --enable-lto ) - - MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ - econf "${myeconfargs[@]}" -} - -src_compile() { - # more and more LO stuff tries to use OpenGL, including tests during build - # bug 501508, bug 540624, bug 545974 and probably more - addpredict /dev/dri - addpredict /dev/ati - addpredict /dev/nvidiactl - - local target - use test && target="build" || target="build-nocheck" - - # this is not a proper make script - make ${target} || die -} - -src_test() { - make unitcheck || die - make slowcheck || die -} - -src_install() { - # This is not Makefile so no buildserver - make DESTDIR="${D}" distro-pack-install -o build -o check || die - - # bug 593514 - if use gtk; then - dosym libreoffice/program/liblibreofficekitgtk.so \ - /usr/$(get_libdir)/liblibreofficekitgtk.so - fi - - # bash completion aliases - bashcomp_alias \ - libreoffice \ - unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice - - if use branding; then - insinto /usr/$(get_libdir)/${PN}/program - newins "${WORKDIR}/branding-sofficerc" sofficerc - dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die - fi -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} -- cgit v1.2.3