diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
commit | bd4aeefe33e63f613512604e47bfca7b2187697d (patch) | |
tree | adb35b5a9a00ee7ea591ab0c987f70167c23b597 /app-office/libreoffice | |
parent | 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff) |
gentoo resync : 03.11.2019
Diffstat (limited to 'app-office/libreoffice')
-rw-r--r-- | app-office/libreoffice/Manifest | 21 | ||||
-rw-r--r-- | app-office/libreoffice/files/libreoffice-6.2.8.2-poppler-0.82.patch | 123 | ||||
-rw-r--r-- | app-office/libreoffice/files/libreoffice-6.3.3.2-mysql-connector-c-8.patch | 45 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-6.2.5.2.ebuild | 553 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-6.2.8.2.ebuild (renamed from app-office/libreoffice/libreoffice-6.2.7.1.ebuild) | 3 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-6.3.3.2.ebuild (renamed from app-office/libreoffice/libreoffice-6.3.2.2.ebuild) | 3 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-6.3.9999.ebuild | 3 | ||||
-rw-r--r-- | app-office/libreoffice/metadata.xml | 1 |
8 files changed, 186 insertions, 566 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 82712fe31b5c..ae8dc5d96a5d 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -2,21 +2,20 @@ AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0a 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 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a 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.5.2.tar.xz 215008848 BLAKE2B 5dd1ef185820944816e01c8ed6a7873a5a8fe6f7f4b41fad279729970d85ff868f51ed573e8b3d0a554ffd1f8e295b6ff2e493e7f7250f8cb1c7c2a40115abf4 SHA512 b46b6731c415ab354ad7d876cb8905cb9eae2ca71639abf049ea7f5930601c957cc0eb04a2cd06949073ba5e94778ecdb449692ed8bbfbd95b05f6e7980d8d10 -DIST libreoffice-6.2.7.1.tar.xz 215022744 BLAKE2B 717acc3c310d3d973464b422176ccb4aae1481f2537c419e3afd031a2c2967a7b20b4cc5b60499befcae279441176a275f339e65534c4eb9d7395c6e050ba6e3 SHA512 9ed37c7957bb214a3de0b3dadea9debd5056d641052a669904d543a7065f1f5c721e09ddda800dfb478ff0474f71a275c7208077cb7b6566786d3b637f42860b -DIST libreoffice-6.3.2.2.tar.xz 224752776 BLAKE2B 397d125714ae591d174ea185a488ecb652946de76d015c4ffb85e1c27ed34f87b5808ac41309b52fba117aab67097a0c378284721f0e5f3eb8e3284c799ed8dd SHA512 f0576f5a5b2c91ee6c003cbf9772580c564e05f66c3b34ddee4b723095aaa3a55070df3d70d7e6b8be68e23a7e204c1237496d7e798f9494282cadba0eacf930 +DIST libreoffice-6.2.8.2.tar.xz 215070800 BLAKE2B d6bc1e94de1df4dd20dafaeac9702435f305fe15117e8aee02233c6d2e74423bb475aeaf79ff6dcd30e22d69a5d6f0648218819b08003524a2c7b1db340281c4 SHA512 cf1dd708f10ea4b9a3134851cad45fe91c1d535e2b2068f7e65f1cb1bf4076c5c41ec253f628c5b912590e91ccfe16f5c8bcf39bc92df2ec7c8aef84210349bd +DIST libreoffice-6.3.3.2.tar.xz 224944844 BLAKE2B 16d58d1b34f6a7da5a9cb32dade8f15ce074f516b77d6481f1befec75572f2533f3ae19964ce2688ff121789241a11823f05768b3386bc755f015a243af6c55a SHA512 4809ce26c48419e1e8408bdd71e7aeec3940bad150afeb90034013fbe8757c37417da3a996f8935aac3103806e14bd47dee7e560051d6718a75e6b869a2b1934 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f -DIST libreoffice-help-6.2.5.2.tar.xz 13023680 BLAKE2B f1f3a03104c1270e59f2b9130a29e1fbc99a9bf76b2bf4cedef8dc61487c9a2036f143501ad7fcd0c056c8b72446305b7a4ca9a719b11200ade5feca35e5e7ea SHA512 14f964161bd827a5846ec667ae1dac80d1485450e172da44010103e31f3872df62595e8b1b1d45c720caac9256d2adaf8f5a0bb80d059d35f1c560b533eb764c -DIST libreoffice-help-6.2.7.1.tar.xz 13024328 BLAKE2B fcdb01a52abb90773baa96b0c25fc04bf928e13b940a5cadd7eb455a3004f83d339252346d7c615fbe511cee7e093560c99bf6ff6bd2e5e832d57d4d1053ebc6 SHA512 b4599bf6854efa800483cf16132c9809ea439d29ea63c7621a0f04ce19609a7a1966d86862342f911cde22a3bd19fe5b96ad9bdb34d5255eb716352a8ce9bbaa -DIST libreoffice-help-6.3.2.2.tar.xz 13192064 BLAKE2B 83c742faa698370e1561133d4c7351619639b343068691d830433ff5dfa4af20ba7f89428b67275f7f19c947dd84e4c03aa330e4ddd684dbd19acee14e842ba9 SHA512 34f34abbd21e37ea6f8ed860af27bbd641cb98331f235b84c5b5cc4e3fa01d9f43a32469f5df4f4cf4dde0e804ba12e73fdd6d357413d5d7641c32396abf09f1 -EBUILD libreoffice-6.2.5.2.ebuild 15899 BLAKE2B 6b9b2d2796c8a5b0a95d119c5116c8a869ba6de5d02545c9eaa62de4707676fb26f1b110f780a0cb974f7ef0c615b478def2c5831e8f5ce80bd86a7ed3431651 SHA512 84616ca7a99ef94806c51641d3fa9aaf003ac519d4ad931de3bf3dd9f2d1317fda9237fd027fe51e658fb3b41545d7bfc88acac23b3caeef11735c8b45394e97 -EBUILD libreoffice-6.2.7.1.ebuild 15913 BLAKE2B 5be44140d8c1a9a1d63f75f4cc4a7e604c8c18455f5e9bdef6fe0b60196d6bb35df6e4c8b762b12c84d567e45af32c118114cda0558eff8160e955e94437c008 SHA512 c7ec217d520244ad8088ac04c075544ab937e053ea154a82dbfb9d7da577967a465c71a83b2e64ef64e368c3ff7aa12066648e9abfacdb00f3c11c397e447b97 -EBUILD libreoffice-6.3.2.2.ebuild 15855 BLAKE2B b9146205df96d0fc5028e02b5fd9d1f2baf85f3dfabff2b7609a122c55659567d592365f5ab93dea0f6d7e75e9d0b725353518065a9b66601fbd74fc4c38f987 SHA512 5323904e58df9fb5cde0902c5d039b0d61d9573f881fee165806e658d4b31ec236b0cc3b65d7be278bd770b03f9b7bc305b5be213defef83836cbdba4757d6d9 -EBUILD libreoffice-6.3.9999.ebuild 15855 BLAKE2B b9146205df96d0fc5028e02b5fd9d1f2baf85f3dfabff2b7609a122c55659567d592365f5ab93dea0f6d7e75e9d0b725353518065a9b66601fbd74fc4c38f987 SHA512 5323904e58df9fb5cde0902c5d039b0d61d9573f881fee165806e658d4b31ec236b0cc3b65d7be278bd770b03f9b7bc305b5be213defef83836cbdba4757d6d9 +DIST libreoffice-help-6.2.8.2.tar.xz 13024032 BLAKE2B 524ba3ff77670afeddddbf8be4724b5e54f9b157582cfcac8640e2184b8ae24c8e5e01b924415949f1756c18e2d54b8eab7efb78c979321e50b6d52b741ddd49 SHA512 c1f5b1b3c50da0a47a9724c9fc3544a15b7df72e66c5c2008afeae7732e2b29f0e57e64ce9a216c3237acdb4345715525f32be290f3196ba6e28685fa6c0925c +DIST libreoffice-help-6.3.3.2.tar.xz 13192080 BLAKE2B 108f33d77ec24ac5f5b669aae72dc23f0ae1800038d9028a3c92b6dfbe09003cb6d9f89a6675162c8cb058ac850a0e7c5544f8692c527cfa83bd32ba28149a50 SHA512 c4d994c4047aeee5e35207228e2b62ccc7d7303ae8fcbfb52cbf73950f232ad8d45953ee364379d3834e79c59ab79df920ec624ebe4b7214f955c2bd89af7cee +EBUILD libreoffice-6.2.8.2.ebuild 15950 BLAKE2B 5ccf935dddc916af4f0edd7f3d0d9cf1625061ac9d40732bc6e7448986db37b72c03c9bfb57c5c37fad0eb1d6ce839bc203f07596b1e0987cc9500fa74a899b9 SHA512 cd7098ffffc5c06d924ea132968ab495b2b124e95171ae96c31b10fae01c38b6d36b8d5b911f38c8b6052b8a6d537067661a00c8437bae6edf6c06153f2f6e26 +EBUILD libreoffice-6.3.3.2.ebuild 15980 BLAKE2B 761dd6e50808db0eb34582281a6a40365e8021bb4d5137e8a76ecbfb4735655a465a322cc70a0b2bf2566598c3df2d3a2aecaf0e5faeb4301b64e2a6b393acb6 SHA512 e0dfa11d5134178e8951f3ca9d323e997178180bbf9cf52d83ec634a37399af3a0ba7dcf4c70cb99ee4c3fcdd3cc520efae261477a384684495b9ab2247d0644 +EBUILD libreoffice-6.3.9999.ebuild 15942 BLAKE2B 822d251c7b2a37c6a1658ec83d5f2a5b97242b9b7dd86e6e646f2ca0b6e4c33f96ea0d49aa1e55a825ef5c3ceda553ac18ac0d1654b025b0f026816ceaf984e3 SHA512 328d05f143ab2c0dbeb1dccc38571d0f60477d6eeafadadcf16c1bb43d7a41d389b83bd6b450b6212c179698125718afd44789d608222c81e8ddbc7651317a3f EBUILD libreoffice-9999.ebuild 15764 BLAKE2B a7796af30d5dfa59da00a579eb514090ee66c28746af04f1662cb1376368b7b4b2ef7fb4b2e3c4ebfafcaaeea96e64680e9a6c144990d1559615afcc294f23d2 SHA512 f2cc4860b46f45870451c053b4b5c6bb6f4ff37e84b10bc7f04dcfeaa8f27543f70785aafe99f8b917d2ad39b7ae0a8ff1a55040d9d2bef3274939bdc611dc30 -MISC metadata.xml 1086 BLAKE2B 486defe600d5a74151756ff486e6eca7d529491dfc8db061c6589dc122d9c47e97f8301f28cb86b566ba69e578b9ae6d1e5dae2ca44972e322ccdb1e829aea94 SHA512 c29b3763e187455edc966fb2fdd85cd22faaa5c58b0dbdafc80c9c0ae8ea8400c189723778a86d108869d8891d9d0db5e1e7de931303737178c1e1f084d6f8c7 +MISC metadata.xml 1007 BLAKE2B 9cfefc8eb71dad67a632810e4b3b91e17534565b245bfd71f2b34819fb96edef9617be5a899778e4ca5f54c7963d43f0a23615c003bd175c41c6f59d245e449c SHA512 5d470c6d1099a5c932e5a7418a72df7999df949c3ca2911efe7a18a900cd7580b00c540eae91478894f86368d7c9840a5a22cd1b2971382d06274caa3c572223 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 new file mode 100644 index 000000000000..b6c30cd92a16 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-6.2.8.2-poppler-0.82.patch @@ -0,0 +1,123 @@ +From 2eadd46ab81058087af95bdfc1fea28fcdb65998 Mon Sep 17 00:00:00 2001 +From: Rasmus Thomsen <oss@cogitri.dev> +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 <michael.stahl@cib.de> +--- + .../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<const GfxColor*>(maskColors), ++#else + reinterpret_cast<GfxColor*>(maskColors), ++#endif + &aMinRGB ); + + GfxRGB aMaxRGB; + colorMap->getColorSpace()->getRGB( ++#if POPPLER_CHECK_VERSION(0, 82, 0) ++ reinterpret_cast<const GfxColor*>(maskColors)+gfxColorMaxComps, ++#else + reinterpret_cast<GfxColor*>(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/files/libreoffice-6.3.3.2-mysql-connector-c-8.patch b/app-office/libreoffice/files/libreoffice-6.3.3.2-mysql-connector-c-8.patch new file mode 100644 index 000000000000..5fa7b343f4f7 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-6.3.3.2-mysql-connector-c-8.patch @@ -0,0 +1,45 @@ +From 5917ba8bc645a2b105ec089101b8a664481b5b61 Mon Sep 17 00:00:00 2001 +From: Peter Levine <plevine457@gmail.com> +Date: Thu, 17 Oct 2019 23:08:57 -0400 +Subject: Fix building against MySQL Connector/C 8 + +In MySQL Connector/C 8, my_bool is replaced by bool. It was +previously defined as char. When building against +MySQL Connector/C 8, this leads to type punning build errors. +Redefine affected members of struct BindMetaData as bool if using +version 8 of greater. Otherwise, default to char. + +Change-Id: If12b975d95afae86502867cb334cb4195802f91d +Reviewed-on: https://gerrit.libreoffice.org/81002 +Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> +Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> +--- + .../source/drivers/mysqlc/mysqlc_preparedstatement.hxx | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx +index 1df2c70..3450473 100644 +--- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx ++++ b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx +@@ -39,11 +39,17 @@ using ::com::sun::star::uno::Reference; + using ::com::sun::star::uno::RuntimeException; + using ::com::sun::star::uno::Type; + ++#if defined MYSQL_VERSION_ID && (MYSQL_VERSION_ID >= 80000) && !defined MARIADB_BASE_VERSION ++using my_bool = bool; ++#else ++using my_bool = char; ++#endif ++ + struct BindMetaData + { +- char is_null = 0; ++ my_bool is_null = 0; + unsigned long length = 0; +- char error = 0; ++ my_bool error = 0; + }; + + typedef ::cppu::ImplHelper5<css::sdbc::XPreparedStatement, css::sdbc::XParameters, +-- +cgit v1.1 diff --git a/app-office/libreoffice/libreoffice-6.2.5.2.ebuild b/app-office/libreoffice/libreoffice-6.2.5.2.ebuild deleted file mode 100644 index c66bae1fdfd2..000000000000 --- a/app-office/libreoffice/libreoffice-6.2.5.2.ebuild +++ /dev/null @@ -1,553 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{5,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 vlc -$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - bluetooth? ( dbus ) - libreoffice_extensions_nlpsolver? ( java ) - libreoffice_extensions_scripting-beanshell? ( java ) - libreoffice_extensions_scripting-javascript? ( java ) - libreoffice_extensions_wiki-publisher? ( java ) -" - -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.24[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/qtx11extras:5 - dev-qt/qtwidgets: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:* ) - vlc? ( media-video/vlc ) -" -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" - # "${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() { - use java || \ - ewarn "If you plan to use Base application you should enable java or you will get various crashes." - - if has_version "<app-office/libreoffice-5.3.0[firebird]"; then - ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so" - ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version." - ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base" - fi - - [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend -} - -pkg_setup() { - java-pkg-opt-2_pkg_setup - python-single-r1_pkg_setup - xdg_environment_reset - - [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup -} - -src_unpack() { - default - - if [[ ${MY_PV} = *9999* ]]; then - local base_uri branch mypv - base_uri="https://anongit.freedesktop.org/git" - branch="master" - mypv=${MY_PV/.9999} - [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}" - git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}" - git-r3_checkout "${base_uri}/${PN}/core" - LOCOREGIT_VERSION=${EGIT_VERSION} - - git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master" - git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help - fi -} - -src_prepare() { - default - - # sandbox violations on many systems, we don't need it. Bug #646406 - sed -i \ - -e "/KF5_CONFIG/s/kf5-config/no/" \ - configure.ac || die "Failed to disable kf5-config" - - AT_M4DIR="m4" eautoreconf - # hack in the autogen.sh - touch autogen.lastrun - - # system pyuno mess - sed -i \ - -e "s:%eprefix%:${EPREFIX}:g" \ - -e "s:%libdir%:$(get_libdir):g" \ - pyuno/source/module/uno.py \ - pyuno/source/officehelper.py || die - # sed in the tests - sed -i \ - -e "s#all : build unitcheck#all : build#g" \ - solenv/gbuild/Module.mk || die - sed -i \ - -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \ - -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \ - Makefile.in || die - - sed -i \ - -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \ - -e "s,\$INSTALLDIRNAME.sh,${PN}," \ - bin/distro-install-desktop-integration || die - - if use branding; then - # hack... - mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die - fi - - # Don't list pdfimport support in desktop when built with none, bug # 605464 - if ! use pdfimport; then - sed -i \ - -e ":MimeType: s:application/pdf;::" \ - -e ":Keywords: s:pdf;::" \ - sysui/desktop/menus/draw.desktop || die - fi -} - -src_configure() { - # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys - # Note: these are for Gentoo use ONLY. For your own distribution, please get - # your own set of keys. Feel free to contact chromium@gentoo.org for more info. - local google_default_client_id="329227923882.apps.googleusercontent.com" - local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" - - # optimization flags - export GMAKE_OPTIONS="${MAKEOPTS}" - # System python enablement: - export PYTHON_CFLAGS=$(python_get_CFLAGS) - export PYTHON_LIBS=$(python_get_LIBS) - - if use kde; then - export QT_SELECT=5 # bug 639620 needs proper fix though - export QT5DIR="$(qt5_get_bindir)/../" - export MOC5="$(qt5_get_bindir)/moc" - fi - - local gentoo_buildid="Gentoo official package" - if [[ -n ${LOCOREGIT_VERSION} ]]; then - gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})" - fi - - # system headers/libs/...: enforce using system packages - # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad - # --enable-cairo: ensure that cairo is always required - # --enable-*-link: link to the library rather than just dlopen on runtime - # --enable-release-build: build the libreoffice as release - # --disable-fetch-external: prevent dowloading during compile phase - # --enable-extension-integration: enable any extension integration support - # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs - # --disable-report-builder: too much java packages pulled in without pkgs - # --without-system-sane: just sane.h header that is used for scan in writer, - # not linked or anything else, worthless to depend on - # --disable-pdfium: not yet packaged - local myeconfargs=( - --with-system-dicts - --with-system-epoxy - --with-system-headers - --with-system-jars - --with-system-libs - --enable-build-opensymbol - --enable-cairo-canvas - --enable-largefile - --enable-mergelibs - --enable-neon - --enable-python=system - --enable-randr - --enable-release-build - --disable-breakpad - --disable-bundle-mariadb - --disable-ccache - --disable-dependency-tracking - --disable-epm - --disable-fetch-external - --disable-gstreamer-0-10 - --disable-online-update - --disable-openssl - --disable-pdfium - --disable-report-builder - --with-build-version="${gentoo_buildid}" - --enable-extension-integration - --with-external-dict-dir="${EPREFIX}/usr/share/myspell" - --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" - --with-external-thes-dir="${EPREFIX}/usr/share/myspell" - --with-external-tar="${DISTDIR}" - --with-lang="" - --with-parallelism=$(makeopts_jobs) - --with-system-ucpp - --with-tls=nss - --with-vendor="Gentoo Foundation" - --with-x - --without-fonts - --without-myspell-dicts - --with-help="html" - --without-helppack-integration - --with-system-gpgmepp - --without-system-sane - $(use_enable bluetooth sdremote-bluetooth) - $(use_enable coinmp) - $(use_enable cups) - $(use_enable dbus) - $(use_enable debug) - $(use_enable eds evolution2) - $(use_enable firebird firebird-sdbc) - $(use_enable gstreamer gstreamer-1-0) - $(use_enable gtk gtk3) - $(use_enable gtk2 gtk) - $(use_enable kde kde5) - $(use_enable kde qt5) - $(use_enable ldap) - $(use_enable odk) - $(use_enable pdfimport) - $(use_enable postgres postgresql-sdbc) - $(use_enable vlc) - $(use_with accessibility lxml) - $(use_with coinmp system-coinmp) - $(use_with googledrive gdrive-client-id ${google_default_client_id}) - $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) - $(use_with java) - $(use_with odk doxygen) - ) - - if use gtk && use kde; then - myeconfargs+=( --enable-gtk3-kde5 ) - fi - - if use eds || use gtk; then - myeconfargs+=( --enable-dconf --enable-gio ) - else - myeconfargs+=( --disable-dconf --disable-gio ) - fi - - # libreoffice extensions handling - for lo_xt in ${LO_EXTS}; do - if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then - myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) ) - else - myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) ) - fi - done - - if use java; then - # hsqldb: system one is too new - myeconfargs+=( - --without-junit - --without-system-hsqldb - --with-ant-home="${ANT_HOME}" - --with-jdk-home=$(java-config --jdk-home 2>/dev/null) - --with-jvm-path="${EPREFIX}/usr/lib/" - ) - - use libreoffice_extensions_scripting-beanshell && \ - myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) ) - - use libreoffice_extensions_scripting-javascript && \ - myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) ) - fi - - is-flagq "-flto*" && myeconfargs+=( --enable-lto ) - - MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ - econf "${myeconfargs[@]}" -} - -src_compile() { - # more and more LO stuff tries to use OpenGL, including tests during build - # bug 501508, bug 540624, bug 545974 and probably more - addpredict /dev/dri - addpredict /dev/ati - addpredict /dev/nvidiactl - - local target - use test && target="build" || target="build-nocheck" - - # this is not a proper make script - make ${target} || die -} - -src_test() { - make unitcheck || die - make slowcheck || die -} - -src_install() { - # This is not Makefile so no buildserver - make DESTDIR="${D}" distro-pack-install -o build -o check || die - - # bug 593514 - if use gtk; then - dosym libreoffice/program/liblibreofficekitgtk.so \ - /usr/$(get_libdir)/liblibreofficekitgtk.so - fi - - # bash completion aliases - bashcomp_alias \ - libreoffice \ - unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice - - if use branding; then - insinto /usr/$(get_libdir)/${PN}/program - newins "${WORKDIR}/branding-sofficerc" sofficerc - dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die - fi -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/app-office/libreoffice/libreoffice-6.2.7.1.ebuild b/app-office/libreoffice/libreoffice-6.2.8.2.ebuild index 8a89bd5092ba..35ceeee6bfbf 100644 --- a/app-office/libreoffice/libreoffice-6.2.7.1.ebuild +++ b/app-office/libreoffice/libreoffice-6.2.8.2.ebuild @@ -77,7 +77,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" [[ ${MY_PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" BDEPEND=" dev-util/intltool @@ -246,6 +246,7 @@ fi PATCHES=( # master branch "${FILESDIR}/${PN}-6.2-ldap-optional.patch" + "${FILESDIR}/${P}-poppler-0.82.patch" # "${WORKDIR}"/${PATCHSET/.tar.xz/} # not upstreamable stuff diff --git a/app-office/libreoffice/libreoffice-6.3.2.2.ebuild b/app-office/libreoffice/libreoffice-6.3.3.2.ebuild index 6d7145dfa932..c7fc98d14c9f 100644 --- a/app-office/libreoffice/libreoffice-6.3.2.2.ebuild +++ b/app-office/libreoffice/libreoffice-6.3.3.2.ebuild @@ -244,6 +244,9 @@ else fi PATCHES=( + # master branch + "${FILESDIR}/${P}-mysql-connector-c-8.patch" # bug #692422 + "${FILESDIR}/${PN}-6.2.8.2-poppler-0.82.patch" # "${WORKDIR}"/${PATCHSET/.tar.xz/} # not upstreamable stuff diff --git a/app-office/libreoffice/libreoffice-6.3.9999.ebuild b/app-office/libreoffice/libreoffice-6.3.9999.ebuild index 6d7145dfa932..9834ebf899b8 100644 --- a/app-office/libreoffice/libreoffice-6.3.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.3.9999.ebuild @@ -250,6 +250,9 @@ PATCHES=( "${FILESDIR}/${PN}-5.4-system-pyuno.patch" "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" "${FILESDIR}/${PN}-6.1-nomancompress.patch" + + # master branch + "${FILESDIR}/${PN}-6.3.3.2-mysql-connector-c-8.patch" # bug #692422 ) S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml index 6b514662f9ab..38a66bc313df 100644 --- a/app-office/libreoffice/metadata.xml +++ b/app-office/libreoffice/metadata.xml @@ -17,6 +17,5 @@ version</longdescription> <flag name="mariadb">Prefer mariadb connector over mysql connector</flag> <flag name="odk">Build the Office Development Kit</flag> <flag name="pdfimport">Enable PDF import via the Poppler library</flag> - <flag name="vlc">Use <pkg>media-video/vlc</pkg> for video embedding</flag> </use> </pkgmetadata> |