From 693cc9b6e847a01c1bb692153021aaf9fb0fab25 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 25 Jan 2019 08:09:37 +0000 Subject: gentoo resync : 25.01.2019 --- app-office/Manifest.gz | Bin 9561 -> 9560 bytes app-office/calligra/Manifest | 6 +- app-office/calligra/calligra-3.1.0-r3.ebuild | 12 +- .../files/calligra-3.1.0-poppler-0.72.patch | 43 +- app-office/calligra/metadata.xml | 1 + app-office/libreoffice/Manifest | 16 +- .../files/libreoffice-6.2.0.1-poppler-0.71-1.patch | 164 ------ .../files/libreoffice-6.2.0.1-poppler-0.71-2.patch | 72 --- .../files/libreoffice-6.2.0.1-poppler-0.72.patch | 43 -- .../files/libreoffice-6.2.0.2-poppler-0.73.patch | 101 ---- app-office/libreoffice/libreoffice-6.2.0.2.ebuild | 582 --------------------- app-office/libreoffice/libreoffice-6.2.0.3.ebuild | 576 ++++++++++++++++++++ app-office/libreoffice/libreoffice-6.2.9999.ebuild | 13 +- app-office/libreoffice/libreoffice-9999.ebuild | 13 +- app-office/libreoffice/metadata.xml | 1 + app-office/scribus/Manifest | 5 +- .../scribus-1.5.5_pre20190113-poppler-0.73.patch | 24 - .../scribus/scribus-1.5.5_pre20190113.ebuild | 241 --------- .../scribus/scribus-1.5.5_pre20190124.ebuild | 240 +++++++++ app-office/skrooge/Manifest | 3 +- .../skrooge/files/skrooge-2.17.0-noqtwebkit.patch | 28 + app-office/skrooge/skrooge-2.17.0.ebuild | 12 +- 22 files changed, 905 insertions(+), 1291 deletions(-) delete mode 100644 app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-1.patch delete mode 100644 app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-2.patch delete mode 100644 app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.72.patch delete mode 100644 app-office/libreoffice/files/libreoffice-6.2.0.2-poppler-0.73.patch delete mode 100644 app-office/libreoffice/libreoffice-6.2.0.2.ebuild create mode 100644 app-office/libreoffice/libreoffice-6.2.0.3.ebuild delete mode 100644 app-office/scribus/files/scribus-1.5.5_pre20190113-poppler-0.73.patch delete mode 100644 app-office/scribus/scribus-1.5.5_pre20190113.ebuild create mode 100644 app-office/scribus/scribus-1.5.5_pre20190124.ebuild create mode 100644 app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch (limited to 'app-office') diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz index 712f0ac5fc1e..06639b8f62bd 100644 Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest index f0e7ba263025..a4d99c52a6f2 100644 --- a/app-office/calligra/Manifest +++ b/app-office/calligra/Manifest @@ -4,10 +4,10 @@ AUX calligra-3.1.0-no-webkit.patch 2587 BLAKE2B 9c5de12f3fe100060ec89eec8190ac2d AUX calligra-3.1.0-plan-qt-5.11.patch 3818 BLAKE2B 1a1f619a491cbc3440ec8db091a1a0775c56f37ebb0be1a4ea0815ced8b6d22598b985e1a419bb572edb430c253d3fd5d0194d6f264ed4ac59c10d8d811cbc72 SHA512 fc375a35f5e29efc404f3546b995568f3c0a9cd3fb94e3c98085a897f9e9d08a1ea41ad1359665392b2f7449e552dead236c3617a4462d94ad4fa2689538150d AUX calligra-3.1.0-poppler-0.69.patch 2963 BLAKE2B 8fac1f298d414ac52073dfdb645d00eab1f2c71f876eea08feb8d9057f33b3ff5dbf69abe10984aa15717ef505522b07153341e846ace24a5f80f175dfed4600 SHA512 b408f1333af40c7270a2f14fa5f9069ec16baeceac7e2b91be2e9759d095d6df92a16b33e0b7c6897dbb15f01ae789436f8864cd1dd38ff009c1a77501e32083 AUX calligra-3.1.0-poppler-0.71.patch 6868 BLAKE2B 3787bcc3564598450ec14b9bd4e63559af6ebd3a92f9c80560812f7b9a8f94681987ca6dfa49faee7ed3985d09a7f49d2a2499f9c6acfb5a96a0f8c86d7b8484 SHA512 1376ac7940e6ca0e9615445dc9c16f5ff75db547944dc8a5006520ff30b9d34eced1e5fa679a82535ceb581ae96352d1b6c039b54038290973f456de4d792917 -AUX calligra-3.1.0-poppler-0.72.patch 2053 BLAKE2B 1a69315b986aeb2464a57c5fdb63e2d0c33cb256be64c868af666169ab693109c45ad0ed15f35639020e2e1eb707592694b07896dced4f364e0cff817ce3190a SHA512 216eb134eb24f10492581a30dacd7e7b8259cdac3d6f21423cc773b1752a8464eabb15c6263c5bbe4e8e741cf1e02db07e854b4f2113399773ad6c56025fe1b9 +AUX calligra-3.1.0-poppler-0.72.patch 1777 BLAKE2B 28db9f2f6a69c4460fe5be2907f3ff38b7e1b1ff8e6b5480c1ac532f7884706f47da45709f0791a43146dc58e99e3a789700ac53afba9e99a28e8c0c96913a46 SHA512 4e50c321875a0a685d5401c0b8f8f85a76f873cbc0cd6faeb6798d5a3119e4a8123742d58348752ec7d87c1a3055161aaabbda15759cf8e22f2752ef25375376 AUX calligra-3.1.0-poppler-0.73.patch 1342 BLAKE2B e36495c1f1f6c546666f30473fea46dfbdf47906ee61c2fed325a27117c14d3899703c6ca4667b3185ab9cacf3a5aa79a0c829777100d3088711f8fa359f5752 SHA512 ef5710d4f7fcc8015ce725b6f2f26ae1a8cd9bfe2e857633662696453104661f154309f0d0cc5e30b15b868bb43549d5ab8f81ee4cde31f0465cf795d453d233 AUX calligra-3.1.0-qt-5.11.patch 3537 BLAKE2B 25aa9f832eb49876e0ee28d3af945658f9e93610fa894cb73dc274083febf5d62c97de427c10277f07aa7ef8054f4e0c811c70d4b0c4068cd018a3475c9a7e80 SHA512 f895ee2b9999ab4ff6dae523e4f4ea6f72bd05a8f8163a33f05401b63c08cc3c987a1207d1008ae808db0564c0036194e3d6ab5806c681b793c5191f9e585a7e AUX calligra-3.1.0-stage-qt-5.11.patch 656 BLAKE2B 1a4d8f005fd03395617ba0b225302e40b4aaf75c2a838a3009a3b3b6df7e75afdc798f27f08e76b7ad0ea60766612912d06eebe87c209ad9cab45db4bb3ccf54 SHA512 685bfca658404dc9920c805b97832b0a481a0ec0614bf142978c4ae03329e5e93b28d5af09d021b53c6d7a1316404f87612ab316f6a47c3f174572b50c65989b DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50 SHA512 ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b -EBUILD calligra-3.1.0-r3.ebuild 5775 BLAKE2B 50f09e292397a68ccea880521cff3c8521e5da05617b6b465b23289cc7c10c5dfb756dc3cc1c881e24cfbf99885e893c8cdc3760c138539ebaa54fe469b69083 SHA512 73e72d5e9cfadd295113cb3c79bc9f29b8c33a5bc565528f8d3c21384b1ae5b93637a5c6e6dafcb57545660e2a93f218099533da2f8644ab6d11f639541f89d0 -MISC metadata.xml 1108 BLAKE2B 266bc6539219906527f6e8692cfac1a4c894164466e01bd3ddc290ed665d19af6419ae1a8939002a4ccc719826def4038264ecdd65fca3aef8627106114c804b SHA512 61655e86072fdb828475b721492c3029b834931126af3cd015b2de87f3e7d56a866707d04b04dc36319f45f77fe5f3b650131c1e82a4e65d094288d8effe1893 +EBUILD calligra-3.1.0-r3.ebuild 5903 BLAKE2B 6e8185c7fe26dfab200fd34be8fe59b1a443c485ab4275739d601463c5a7b492c5c6b8ae7c70c5c1c4d4b17a8debe9a8aa0ea0285ac4c4559a810bb4f514f8c1 SHA512 ef19a01ec7be39e7254ba3e117c5c8724aa6e2570ab9a1a64f02c5b0965fc2c9c5fa436d3ccdd9196fca6a25fa5467ae7cd28a52511ce9884b7f27d13f445062 +MISC metadata.xml 1223 BLAKE2B a488977274cd14e919409e0443ebadeefaabdc33a514e806fa2fb1bb3cd0b26fef95c705fcba1bbf7f9d259a7e50f2769a89cf42863c53996fda5cc60712487f SHA512 c965d2effceb77a5cc8696010f538046a703576671368def2c2990b70c00f43105d5a3bf9f438dab1220b2e20003d49596e4adc4b1c90146a13549daacc8bf89 diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild b/app-office/calligra/calligra-3.1.0-r3.ebuild index 24ca06bcb3ab..81597b0d7d19 100644 --- a/app-office/calligra/calligra-3.1.0-r3.ebuild +++ b/app-office/calligra/calligra-3.1.0-r3.ebuild @@ -18,7 +18,7 @@ KEYWORDS="amd64 x86" CAL_FTS=( karbon sheets stage words ) -IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf +IUSE="activities +charts +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})" # TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy) @@ -65,6 +65,7 @@ COMMON_DEPEND=" sys-libs/zlib virtual/libiconv activities? ( $(add_frameworks_dep kactivities) ) + charts? ( dev-libs/kreport ) crypt? ( app-crypt/qca:2[qt5(+)] ) fontconfig? ( media-libs/fontconfig ) gemini? ( $(add_qt_dep qtdeclarative 'widgets') ) @@ -103,7 +104,6 @@ COMMON_DEPEND=" DEPEND="${COMMON_DEPEND} dev-libs/boost sys-devel/gettext - x11-misc/shared-mime-info test? ( $(add_frameworks_dep threadweaver) ) " RDEPEND="${COMMON_DEPEND} @@ -120,8 +120,6 @@ PATCHES=( "${FILESDIR}"/${P}-stage-qt-5.11.patch "${FILESDIR}"/${P}-poppler-0.69.patch "${FILESDIR}"/${P}-poppler-0.71.patch - "${FILESDIR}"/${P}-poppler-0.72.patch # not upstreamable - "${FILESDIR}"/${P}-poppler-0.73.patch "${FILESDIR}"/${P}-no-webkit.patch ) @@ -137,6 +135,11 @@ pkg_setup() { src_prepare() { kde5_src_prepare + if has_version ">=app-text/poppler-0.72"; then + eapply "${FILESDIR}"/${P}-poppler-0.72.patch # not upstreamable + eapply "${FILESDIR}"/${P}-poppler-0.73.patch + fi + if ! use test; then sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \ -i libs/pigment/CMakeLists.txt || die @@ -175,6 +178,7 @@ src_configure() { -DWITH_Iconv=ON -DPRODUCTSET="${myproducts[*]}" $(cmake-utils_use_find_package activities KF5Activities) + $(cmake-utils_use_find_package charts KChart) -DWITH_Qca-qt5=$(usex crypt) -DWITH_Fontconfig=$(usex fontconfig) $(cmake-utils_use_find_package gemini Libgit2) diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch index 3b2e690257be..817a8ddcd679 100644 --- a/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch +++ b/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch @@ -1,54 +1,39 @@ -From 8f20ea906235cbee1d4aac4706e4eb03366875bf Mon Sep 17 00:00:00 2001 -From: "Tobias C. Berner" -Date: Mon, 7 Jan 2019 19:50:48 +0100 -Subject: [PATCH] Make compatible with poppler 0.72 +From 3784fdf0259a14f1f7b20c156dcfe42b45d76896 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Thu, 24 Jan 2019 23:55:02 +0100 +Subject: [PATCH] Fix build with poppler-0.72 +This is a downstream fix without backwards compat, not upstreamable. --- - filters/karbon/pdf/SvgOutputDev.cpp | 13 +++++++++++++ - 1 file changed, 13 insertions(+) + filters/karbon/pdf/SvgOutputDev.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index 4a1fad6bbcf..b1d4ea2d427 100644 +index 391e86cc117..bc72a003efb 100644 --- a/filters/karbon/pdf/SvgOutputDev.cpp +++ b/filters/karbon/pdf/SvgOutputDev.cpp -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -409,7 +410,11 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) +@@ -402,7 +402,7 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) QString str; -+#if POPPLER_CHECK_VERSION(0,72,0) +- const char * p = s->getCString(); + const char * p = s->c_str(); -+#else - const char * p = s->getCString(); -+#endif int len = s->getLength(); CharCode code; Unicode *u = nullptr; -@@ -459,10 +464,18 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) +@@ -451,10 +451,10 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) *d->body << " y=\"" << y << "px\""; if (font && font->getFamily()) { -+#if POPPLER_CHECK_VERSION(0,72,0) +- *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->getCString()) << "\""; + *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->c_str()) << "\""; -+#else - *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->getCString()) << "\""; -+#endif //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->getCString() ); } else if (font && font->getName()) { -+#if POPPLER_CHECK_VERSION(0,72,0) +- *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->getCString()) << "\""; + *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->c_str()) << "\""; -+#else - *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->getCString()) << "\""; -+#endif //debugPdf << "font name:" << QString::fromLatin1( font->getName()->getCString() ); } *d->body << " font-size=\"" << qMax(state->getFontSize(), state->getTransformedFontSize()) << "px\""; -- 2.20.1 + diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml index 575f0b0a9176..d5fb30da6eb0 100644 --- a/app-office/calligra/metadata.xml +++ b/app-office/calligra/metadata.xml @@ -11,6 +11,7 @@ Enable kactivities support + Build chartshape plugin for creating business charts with dev-libs/kreport Enable tablet and 2:1 devices support Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote Build colorengine plugins using media-libs/lcms diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 25bd0ea2e8f3..604fb8a24a20 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -1,10 +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.0.1-poppler-0.71-1.patch 8113 BLAKE2B 731f0a7622da871d901d7392ca2be3ffe4d397e8cb9127bbb5393de9bd861cddef0d99db8b037d5b6e841e1339ad7f815e6a10f5d892741af4971a4d95870244 SHA512 f657e1c31f8734ea646010012c094d2d9508dba7bc6ea9ffa5e02613066f8f75720474c02079148461930cc8dfd1b9c52a2544b0ef888760af790c1f62b3580f -AUX libreoffice-6.2.0.1-poppler-0.71-2.patch 2654 BLAKE2B a0455e8eec3f221e418e24fb81fad849d5908c5239ca0a61ea329edfeddba91b06ca45ee324284a9fcab53dc88d4f290846c66bc1615030446dc588d6453e3ae SHA512 49ffc37d6ce484f9b601831518052fa09c925b51bfebe6965c3bffe3bdf19e2093d3859dcb57e13d6468fd1c5da7512f3164f4309832afd9ed591ab0541dde1d -AUX libreoffice-6.2.0.1-poppler-0.72.patch 1667 BLAKE2B b24a61ecdd7560d5e89ecbebb2cf81ba0d3845bba40603455e549715ea3baaf0cdb9c9999d8c8efc22c4c516ba7239e6a6b8bbf29791ac76cabf1b683e2f866b SHA512 d9b300ff2493f2c1563d60babf2f7ff2620d059e9dadbbd0461d3b8c243130d7e458ba747df5abfa3e8e674a7751279a72be52e46b8077b4132cd46167bfe2ab -AUX libreoffice-6.2.0.2-poppler-0.73.patch 4173 BLAKE2B 929e01c5a597d13be3ae05d93adafe256db39fdfae38bc4373caf5f47b790ef5574d4e97376c7b9fca91bf7467b3ded288550c03c8bdfb1e995c5e5a2bb51c85 SHA512 144e914f57672303baa0473ec049b61c31dd3376fec5b6dc7a791eaeb5e422bde7a0bf500a455651e8d4b1bcd5f4516363deccc098c482a41b4975b33cf54602 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 @@ -12,14 +8,14 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a DIST libreoffice-6.1.4.2.tar.xz 207710664 BLAKE2B 52bab412094c1ff7e184ea65c588360c18b061c3e14b7be07171f6b5831261766e2ac7d7373f5f789d125671da41e8b67d34360d4b7014dcb98df01828aeb094 SHA512 ba81b7744b908f9fe67a83e72c17c08b3b2e99599a5fd4f9cc1f2d81b3fd0ddb8065ae466205f85185ab9420350cea0b2d60108df3e583b74bd1fcd9e4eb0c3c DIST libreoffice-6.1.5.1.tar.xz 207920688 BLAKE2B 7e435a62b880839c752ba90693918242ec29807acb73a22d6101d74f8c8d712a5a26a85cea334a6e66811b7a4f8e016b87932390f2746da4effcb74a416ca973 SHA512 fab7f0bb6fb113c0bfa8bbc0424568c37a04f301d6e44f5755dcbb21cc6df964819a2e143b10f5c6352bfbea438df0b136ba55caf7be3bbbb83bcebba4ceadae -DIST libreoffice-6.2.0.2.tar.xz 213471412 BLAKE2B 61c07f0b6e2c12d197d93346ae4b9f583189a093f9fe49156c5f6ccee4309a77b4a6f6a133a61764d11dd56e7e36734ed4ebf3abab035021c0692477d556acf7 SHA512 6c8e039548b50071e50eea6719a92c11c85da2c7ae73bc70bddc5eb32859823fc5f5ab5867ec0b76d8a094cd21a228d6b0d3a7fa834e8005a2d7a82c7ecdb278 +DIST libreoffice-6.2.0.3.tar.xz 213476336 BLAKE2B e0a44098aa46c86d5fb7d26366d57d4bf395f642cf228a426446067a7037b5199715a7d34a2b28664123f814cc23da7e299da4f93ed8b65c29ae90056cc40399 SHA512 991cab829c88010b5df0c40e6422fd725f7854d256cfa7ffcf595549ccc49aeebe135513b56c5ccdc810ea07b8df186004a3d9e5d84b5d69992996158166d0c1 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f DIST libreoffice-help-6.1.4.2.tar.xz 15757700 BLAKE2B 53c398efb3b839740a9146ea1b0f70f019936c914f7aedf38b7da69faf532ab139a8847d6eb251b2850511e0e7bd169c74fafedd0926dc987659aa27878cf740 SHA512 e24f2f6795856da62f77ebfdcfedc8190b8ecef74e395fc263f0cab4a27c0fe3d95f37665747a590fc7a6a93c6c3473a2a4501c50d415cc602f85838955fe9ab DIST libreoffice-help-6.1.5.1.tar.xz 15756964 BLAKE2B 0d7b32488e2e0ccab0ff067ba19dbbcdcc57f80280c74c6aa0f2e0f6cd49f2eeb67adb1d8f0e88459636d6301329fed3c5837b246571cecfa27a1e334d9b8579 SHA512 f9ae9134eb322f7cfc1cb2a18d23edfaed880925c289d49136d9e7ce026bfa2fbbf148b14a88e8f68d6f5bd8a04a97265c5c15d1eb92ef6fef50a899388617a3 -DIST libreoffice-help-6.2.0.2.tar.xz 16186468 BLAKE2B 3846172642023633420ba83f3c65430dd7c1e5b4fc652e758081175d6b52c412822acd2af1dc31ebcc5344bd4f4b5ba6d49beb4f43f997fd99cbe1ecd69a9f96 SHA512 43c99f3db3d773d3f724600a875b964a65ae3dcab4ab7348289828cf860475a036cd6ba2d54d57cfec4ca259c085932fa479d465475591919e86108c56ed5feb +DIST libreoffice-help-6.2.0.3.tar.xz 16186548 BLAKE2B 95d7fbdaac774032f5ddac121eec5ace9f7964a112f8137d8cf3b999e4ba6685048c027b5635283de9913547c2776ba9b9ab7e28b97cf94fac536decc12fda98 SHA512 7b1c7949ede3fdd6dcc09fd38b62f17d68c5f79e75fb72cedb9d55889d8d8cf261d6614aa5e2e3eae3e26764b2cdb0e4344bef25851daef6041ac3935ad64fb1 EBUILD libreoffice-6.1.4.2.ebuild 16800 BLAKE2B 9bd5e46e7e599f9f916d49f5d72aaa0934257a2b46301c74fb61d0e78c7b93eb0297a7bfca5d99b56d8909e5d289d18fc520f290c2f7512962cf940fe774a950 SHA512 df15098dc1693424aee0db6bda394cc001f5370ee0b841befc040f1e1376bc87287f4f507540d5270442c66cdbe2aacf65571039458ab1a426b89037de22c1e8 EBUILD libreoffice-6.1.5.1.ebuild 16816 BLAKE2B c0d07cc04f85e29740015abc7d190095c417dd576e1db06c0c60481c629c84969a1d6c99c5c960fd630ca4601b402de144caf92ec43c6ca37321b006929f7e93 SHA512 b29570517404db7639cb7cc6d4d9d1ce5ba4454b5e169e388b0020d8a9a4c468459d0a1bf04fe7137013aa2e3bbb4d44f1b6f5e4de3991c10ab0110c4ee6b686 -EBUILD libreoffice-6.2.0.2.ebuild 17013 BLAKE2B 6d6313ac4eff9670e834b9cef896dc19f824506588ffc6d5af797815ae3c3c8fd534cfe5c48819234c14ea83c919bf41e054c8a482553515a3ac8a0aa9a7f5d9 SHA512 2bcff6e4a7b9e7a28cac697f951ace175002dcce6bf4dbbfedb63e2b633a3590336e7be2aa09162996a77c68ddc4780d46baec8a80bfbfbd1ced517ec1c20baa -EBUILD libreoffice-6.2.9999.ebuild 16789 BLAKE2B 91a4aff35a133a4cc312e9c741ec28a15b17d589fa7ad4283b6102b51b559b05a5635f68aaf9d2a75e93f3a89ef6679ce73384aab5976e938dddbd2932b3f031 SHA512 d5a5d64ada357d9d3b9e6aa24da849f520bdf1e2fb9d86bc8c783b5f970b34a84dd08f3bac3b7f52d6e53666cad2bb67aca1f348160e6ce0c100b473d61c7dbf -EBUILD libreoffice-9999.ebuild 16789 BLAKE2B 91a4aff35a133a4cc312e9c741ec28a15b17d589fa7ad4283b6102b51b559b05a5635f68aaf9d2a75e93f3a89ef6679ce73384aab5976e938dddbd2932b3f031 SHA512 d5a5d64ada357d9d3b9e6aa24da849f520bdf1e2fb9d86bc8c783b5f970b34a84dd08f3bac3b7f52d6e53666cad2bb67aca1f348160e6ce0c100b473d61c7dbf -MISC metadata.xml 1008 BLAKE2B 62a25f90e9b01f8fd924e861b0ddf1789e3124474cf73e2fad217e54e0324e38ad5bf37ff703b37bb5946d66e5de8711ff5e9b53a15e0ad368ebb3d04a3a05a3 SHA512 146662ca1c1dd7eb49c00b927657329befd3ee58ac0226ebb5fe81aefe90d7bf66ed6113cbe93774c0b917377eef8c1821a9ede278c9ba791a3ab544a2eaf2c7 +EBUILD libreoffice-6.2.0.3.ebuild 16812 BLAKE2B a06a0a234cc2dfe2c7e24d7f1878f60889f0e8c27d227c5be543a74b9561e42c01944e89f21ded876881d4c77cd8869645a0f7d240802f91fcd91699a12794f9 SHA512 b67e8b9138e6954cdbad9ee9b44b4d85bd3814e13da303ad0d01cf19c25de3d44efae5e2349fe9792733cbbe94b4a9e3eb42e5a2e7fcfc6d7511db4ee0b19a25 +EBUILD libreoffice-6.2.9999.ebuild 16956 BLAKE2B 094ffcc63b1b6bb7d28945bf93ff1ea20aa604235792f659e062064d282f89bcf7d222f482025f81bfd839dafa76d67a0da68cf8864c8c2d3e460ff8c03ca2d2 SHA512 584a65d9473973dbd99fc0af546c3ed056c839b6102368a899cc75e5d6bd32a18d0c2ae74bce0e93370e6aa824fcefc030af580155f753e4553bd9e7610d662c +EBUILD libreoffice-9999.ebuild 16956 BLAKE2B 094ffcc63b1b6bb7d28945bf93ff1ea20aa604235792f659e062064d282f89bcf7d222f482025f81bfd839dafa76d67a0da68cf8864c8c2d3e460ff8c03ca2d2 SHA512 584a65d9473973dbd99fc0af546c3ed056c839b6102368a899cc75e5d6bd32a18d0c2ae74bce0e93370e6aa824fcefc030af580155f753e4553bd9e7610d662c +MISC metadata.xml 1086 BLAKE2B 486defe600d5a74151756ff486e6eca7d529491dfc8db061c6589dc122d9c47e97f8301f28cb86b566ba69e578b9ae6d1e5dae2ca44972e322ccdb1e829aea94 SHA512 c29b3763e187455edc966fb2fdd85cd22faaa5c58b0dbdafc80c9c0ae8ea8400c189723778a86d108869d8891d9d0db5e1e7de931303737178c1e1f084d6f8c7 diff --git a/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-1.patch b/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-1.patch deleted file mode 100644 index 9899f5864ca6..000000000000 --- a/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-1.patch +++ /dev/null @@ -1,164 +0,0 @@ -From 5e8bdd9203dd642111c62a6668ee665a20d4ba19 Mon Sep 17 00:00:00 2001 -From: Mike Kaganski -Date: Tue, 20 Nov 2018 08:45:38 +0100 -Subject: poppler dropped GBool since 0.71 - -See https://lists.freedesktop.org/archives/libreoffice/2018-November/081410.html - -Change-Id: I258e08894486a925bed50a3a4232b6e805af6784 -Reviewed-on: https://gerrit.libreoffice.org/63625 -Tested-by: Jenkins -Reviewed-by: Stephan Bergmann ---- - .../pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 21 +++++++------ - .../pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 35 +++++++++++++--------- - 2 files changed, 31 insertions(+), 25 deletions(-) - -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -index 575a90a..ab74b36 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -514,7 +514,7 @@ void PDFOutDev::printPath( GfxPath* pPath ) - PDFOutDev::PDFOutDev( PDFDoc* pDoc ) : - m_pDoc( pDoc ), - m_aFontMap(), -- m_pUtf8Map( new UnicodeMap("UTF-8", gTrue, &mapUTF8) ), -+ m_pUtf8Map( new UnicodeMap("UTF-8", true, &mapUTF8) ), - m_bSkipImages(false) - { - } -@@ -939,9 +939,9 @@ void PDFOutDev::endTextObject(GfxState*) - } - - void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str, -- int width, int height, GBool invert, -- GBool /*interpolate*/, -- GBool /*inlineImg*/ ) -+ int width, int height, poppler_bool invert, -+ poppler_bool /*interpolate*/, -+ poppler_bool /*inlineImg*/ ) - { - if (m_bSkipImages) - return; -@@ -969,8 +969,8 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str, - - void PDFOutDev::drawImage(GfxState*, Object*, Stream* str, - int width, int height, GfxImageColorMap* colorMap, -- GBool /*interpolate*/, -- int* maskColors, GBool /*inlineImg*/ ) -+ poppler_bool /*interpolate*/, -+ int* maskColors, poppler_bool /*inlineImg*/ ) - { - if (m_bSkipImages) - return; -@@ -1018,11 +1018,10 @@ void PDFOutDev::drawImage(GfxState*, Object*, Stream* str, - void PDFOutDev::drawMaskedImage(GfxState*, Object*, Stream* str, - int width, int height, - GfxImageColorMap* colorMap, -- GBool /*interpolate*/, -+ poppler_bool /*interpolate*/, - Stream* maskStr, - int maskWidth, int maskHeight, -- GBool maskInvert -- , GBool /*maskInterpolate*/ -+ poppler_bool maskInvert, poppler_bool /*maskInterpolate*/ - ) - { - if (m_bSkipImages) -@@ -1036,11 +1035,11 @@ void PDFOutDev::drawMaskedImage(GfxState*, Object*, Stream* str, - void PDFOutDev::drawSoftMaskedImage(GfxState*, Object*, Stream* str, - int width, int height, - GfxImageColorMap* colorMap, -- GBool /*interpolate*/, -+ poppler_bool /*interpolate*/, - Stream* maskStr, - int maskWidth, int maskHeight, - GfxImageColorMap* maskColorMap -- , GBool /*maskInterpolate*/ -+ , poppler_bool /*maskInterpolate*/ - ) - { - if (m_bSkipImages) -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -index da021a2a..a6135fa 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -@@ -130,6 +130,13 @@ namespace pdfi - { return const_cast(familyName); } - }; - -+ // Versions before 0.15 defined GBool as int; 0.15 redefined it as bool; 0.71 dropped GBool -+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 71 -+ typedef GBool poppler_bool; -+#else -+ typedef bool poppler_bool; -+#endif -+ - class PDFOutDev : public OutputDev - { - // not owned by this class -@@ -151,17 +158,17 @@ namespace pdfi - - // Does this device use upside-down coordinates? - // (Upside-down means (0,0) is the top left corner of the page.) -- virtual GBool upsideDown() override { return gTrue; } -+ virtual poppler_bool upsideDown() override { return true; } - - // Does this device use drawChar() or drawString()? -- virtual GBool useDrawChar() override { return gTrue; } -+ virtual poppler_bool useDrawChar() override { return true; } - - // Does this device use beginType3Char/endType3Char? Otherwise, - // text in Type 3 fonts will be drawn with drawChar/drawString. -- virtual GBool interpretType3Chars() override { return gFalse; } -+ virtual poppler_bool interpretType3Chars() override { return false; } - - // Does this device need non-text content? -- virtual GBool needNonText() override { return gTrue; } -+ virtual poppler_bool needNonText() override { return true; } - - //----- initialization and control - -@@ -233,29 +240,29 @@ namespace pdfi - - //----- image drawing - virtual void drawImageMask(GfxState *state, Object *ref, Stream *str, -- int width, int height, GBool invert, -- GBool interpolate, -- GBool inlineImg) override; -+ int width, int height, poppler_bool invert, -+ poppler_bool interpolate, -+ poppler_bool inlineImg) override; - virtual void drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, -- GBool interpolate, -- int *maskColors, GBool inlineImg) override; -+ poppler_bool interpolate, -+ int* maskColors, poppler_bool inlineImg) override; - virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str, - int width, int height, - GfxImageColorMap *colorMap, -- GBool interpolate, -+ poppler_bool interpolate, - Stream *maskStr, int maskWidth, int maskHeight, -- GBool maskInvert -- , GBool maskInterpolate -+ poppler_bool maskInvert, -+ poppler_bool maskInterpolate - ) override; - virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, - int width, int height, - GfxImageColorMap *colorMap, -- GBool interpolate, -+ poppler_bool interpolate, - Stream *maskStr, - int maskWidth, int maskHeight, - GfxImageColorMap *maskColorMap -- , GBool maskInterpolate -+ , poppler_bool maskInterpolate - ) override; - - static void setPageNum( int nNumPages ); --- -cgit v1.1 - diff --git a/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-2.patch b/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-2.patch deleted file mode 100644 index 37b44556219f..000000000000 --- a/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-2.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 8ff41a26caf51544699863c89598d37d93dc1b21 Mon Sep 17 00:00:00 2001 -From: Aleksei Nikiforov -Date: Thu, 22 Nov 2018 17:54:00 +0300 -Subject: Fix build with poppler 0.71 - -Change-Id: I470ece9dc4766e10e1ccb5e99b25a8d8cc4cbf38 -Reviewed-on: https://gerrit.libreoffice.org/63860 -Tested-by: Jenkins -Reviewed-by: Stephan Bergmann ---- - sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 ++++ - sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++ - sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 4 ++-- - 3 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -index ab74b36..101e3be 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -578,7 +578,11 @@ void PDFOutDev::restoreState(GfxState*) - printf( "restoreState\n" ); - } - -+#if POPPLER_CHECK_VERSION(0, 71, 0) -+void PDFOutDev::setDefaultCTM(const double *pMat) -+#else - void PDFOutDev::setDefaultCTM(double *pMat) -+#endif - { - assert(pMat); - -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -index a6135fa..98d8ede 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -@@ -173,7 +173,11 @@ namespace pdfi - //----- initialization and control - - // Set default transform matrix. -+#if POPPLER_CHECK_VERSION(0, 71, 0) -+ virtual void setDefaultCTM(const double *ctm) override; -+#else - virtual void setDefaultCTM(double *ctm) override; -+#endif - - // Start a page. - virtual void startPage(int pageNum, GfxState *state -diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx -index 0f4a35b..b0a6ac4 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx -@@ -69,7 +69,7 @@ int main(int argc, char **argv) - - // read config file - globalParams = new GlobalParams(); -- globalParams->setErrQuiet(gTrue); -+ globalParams->setErrQuiet(true); - #if defined(_MSC_VER) - globalParams->setupBaseFonts(nullptr); - #endif -@@ -145,7 +145,7 @@ int main(int argc, char **argv) - i, - PDFI_OUTDEV_RESOLUTION, - PDFI_OUTDEV_RESOLUTION, -- 0, gTrue, gTrue, gTrue); -+ 0, true, true, true); - rDoc.processLinks(&aOutDev, i); - } - --- -cgit v1.1 - diff --git a/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.72.patch b/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.72.patch deleted file mode 100644 index 7f0b1f71a1ee..000000000000 --- a/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.72.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 65a6c9ae4791188ffcecf489073cf38873ce5e17 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Tue, 8 Jan 2019 11:24:40 +0100 -Subject: Fix build with poppler-0.72 - -Change-Id: I0664d1b39e97b7555c0a3cba442db52b84f37134 -Reviewed-on: https://gerrit.libreoffice.org/65960 -Tested-by: Jenkins -Reviewed-by: Michael Stahl ---- - sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -index 101e3be..dab405b 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -555,7 +555,11 @@ void PDFOutDev::processLink(Link* link, Catalog*) - LinkAction* pAction = link->getAction(); - if (pAction && pAction->getKind() == actionURI) - { -+#if POPPLER_CHECK_VERSION(0, 72, 0) -+ const char* pURI = static_cast(pAction)->getURI()->c_str(); -+#else - const char* pURI = static_cast(pAction)->getURI()->getCString(); -+#endif - - std::vector aEsc( lcl_escapeLineFeeds(pURI) ); - -@@ -757,7 +761,11 @@ void PDFOutDev::updateFont(GfxState *state) - - aFont = it->second; - -+#if POPPLER_CHECK_VERSION(0, 72, 0) -+ std::vector aEsc( lcl_escapeLineFeeds(aFont.familyName.c_str()) ); -+#else - std::vector aEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) ); -+#endif - printf( " %d %d %d %d %f %d %s", - aFont.isEmbedded, - aFont.isBold, --- -cgit v1.1 diff --git a/app-office/libreoffice/files/libreoffice-6.2.0.2-poppler-0.73.patch b/app-office/libreoffice/files/libreoffice-6.2.0.2-poppler-0.73.patch deleted file mode 100644 index fb9112bc3981..000000000000 --- a/app-office/libreoffice/files/libreoffice-6.2.0.2-poppler-0.73.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 9e1522ad1d2c2bd775fa50c2b142eb110a56af72 Mon Sep 17 00:00:00 2001 -From: Michael Stahl -Date: Mon, 14 Jan 2019 15:08:42 +0100 -Subject: sdext: fix build with poppler 0.73 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -... which has removed Guchar, Gushort, Guint, Gulong... - -Change-Id: Ia54ad378031f167f6779f6ffe574b85c1e72f26d -Reviewed-on: https://gerrit.libreoffice.org/66305 -Tested-by: Jenkins -Reviewed-by: Michael Stahl -(cherry picked from commit 50d371ae08c66648d9f32f633b2245e1746e2bb6) -Reviewed-on: https://gerrit.libreoffice.org/66356 -Reviewed-by: Caolán McNamara -Tested-by: Caolán McNamara ---- - sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 ++-- - sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 6 +++++- - sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx | 6 +++--- - 3 files changed, 10 insertions(+), 6 deletions(-) - -(limited to 'sdext/source/pdfimport/xpdfwrapper') - -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -index 575a90a..35490a0 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -298,7 +298,7 @@ static void writePpm_( OutputBuffer& o_rOutputBuf, - o_rOutputBuf.resize(header_size); - - // initialize stream -- Guchar *p; -+ unsigned char *p; - GfxRGB rgb; - std::unique_ptr imgStr( - new ImageStream(str, -@@ -401,7 +401,7 @@ static void writeImage_( OutputBuffer& o_rOutputBuf, - oneColor = { byteToCol( 0xff ), byteToCol( 0xff ), byteToCol( 0xff ) }; - if( colorMap->getColorSpace()->getMode() == csIndexed || colorMap->getColorSpace()->getMode() == csDeviceGray ) - { -- Guchar nIndex = 0; -+ unsigned char nIndex = 0; - colorMap->getRGB( &nIndex, &zeroColor ); - nIndex = 1; - colorMap->getRGB( &nIndex, &oneColor ); -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -index da021a2a..443e757 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -@@ -267,9 +267,13 @@ extern FILE* g_binary_out; - - // note: if you ever change Output_t, please keep in mind that the current code - // relies on it being of 8 bit size --typedef Guchar Output_t; -+typedef unsigned char Output_t; - typedef std::vector< Output_t > OutputBuffer; - -+#if !POPPLER_CHECK_VERSION(0, 73, 0) -+static_assert(std::is_same::value, "unexpected typedef"); -+#endif -+ - #endif // INCLUDED_SDEXT_SOURCE_PDFIMPORT_XPDFWRAPPER_PDFIOUTDEV_GPL_HXX - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx -index 4d9e3bb..b582856 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx -@@ -242,7 +242,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf, - appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image - - // initialize stream -- Guchar *p, *pm; -+ unsigned char *p, *pm; - GfxRGB rgb; - GfxGray alpha; - std::unique_ptr imgStr( -@@ -328,7 +328,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf, - appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image - - // initialize stream -- Guchar *p; -+ unsigned char *p; - GfxRGB rgb; - std::unique_ptr imgStr( - new ImageStream(str, -@@ -374,7 +374,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf, - { - for( int x = 0; x < maskWidth; ++x ) - { -- Guchar aPixel = 0; -+ unsigned char aPixel = 0; - imgStrMask->getPixel( &aPixel ); - int nIndex = (y*height/maskHeight) * (width*4+1) + // mapped line - (x*width/maskWidth)*4 + 1 + 3 // mapped column --- -cgit v1.1 - diff --git a/app-office/libreoffice/libreoffice-6.2.0.2.ebuild b/app-office/libreoffice/libreoffice-6.2.0.2.ebuild deleted file mode 100644 index e2865fbd55d9..000000000000 --- a/app-office/libreoffice/libreoffice-6.2.0.2.ebuild +++ /dev/null @@ -1,582 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,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 eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils 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 mysql 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="" -# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" - -COMMON_DEPEND="${PYTHON_DEPS} - app-arch/unzip - app-arch/zip - app-crypt/gpgme[cxx] - app-text/hunspell:= - >=app-text/libabw-0.1.0 - >=app-text/libebook-0.1 - app-text/libepubgen - >=app-text/libetonyek-0.1 - app-text/libexttextcat - app-text/liblangtag - >=app-text/libmspub-0.1.0 - >=app-text/libmwaw-0.3.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 - net-nds/openldap - 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 - ) - 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] ) -" - -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 - -# 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/intltool - >=dev-util/mdds-1.4.1:1= - media-libs/glm - sys-devel/bison - sys-devel/flex - sys-devel/gettext - sys-devel/ucpp - virtual/pkgconfig - x11-base/xorg-proto - x11-libs/libXt - x11-libs/libXtst - java? ( - dev-java/ant-core - >=virtual/jdk-1.6 - ) - odk? ( >=app-doc/doxygen-1.8.4 ) - test? ( - app-crypt/gnupg - dev-util/cppunit - media-fonts/dejavu - media-fonts/liberation-fonts - ) -" - -PATCHES=( - # "${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" - - # 6.2 branch - "${FILESDIR}"/${PN}-6.2.0.1-poppler-0.71-{1,2}.patch - "${FILESDIR}"/${PN}-6.2.0.1-poppler-0.72.patch - "${FILESDIR}"/${P}-poppler-0.73.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 "/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 ) - - 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 - - # hack for offlinehelp, this needs fixing upstream at some point - # it is broken because we send --without-help - # https://bugs.freedesktop.org/show_bug.cgi?id=46506 - ( - grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die - source "${T}/config_host.mk" 2&> /dev/null - - local path="${WORKDIR}/helpcontent2/source/auxiliary/" - mkdir -p "${path}" || die - - echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\"" - perl "${S}/helpcontent2/helpers/create_ilst.pl" \ - -dir=helpcontent2/source/media/helpimg \ - > "${path}/helpimg.ilst" - [[ -s "${path}/helpimg.ilst" ]] || \ - ewarn "The help images list is empty, something is fishy, report a bug." - ) - - 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 - - # Hack for offlinehelp, this needs fixing upstream at some point. - # It is broken because we send --without-help - # https://bugs.freedesktop.org/show_bug.cgi?id=46506 - insinto /usr/$(get_libdir)/libreoffice/help - doins xmlhelp/util/*.xsl - - pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin - pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/app-office/libreoffice/libreoffice-6.2.0.3.ebuild b/app-office/libreoffice/libreoffice-6.2.0.3.ebuild new file mode 100644 index 000000000000..1855739d749b --- /dev/null +++ b/app-office/libreoffice/libreoffice-6.2.0.3.ebuild @@ -0,0 +1,576 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,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 eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils 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 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="" +# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" + +COMMON_DEPEND="${PYTHON_DEPS} + app-arch/unzip + app-arch/zip + app-crypt/gpgme[cxx] + app-text/hunspell:= + >=app-text/libabw-0.1.0 + >=app-text/libebook-0.1 + app-text/libepubgen + >=app-text/libetonyek-0.1 + app-text/libexttextcat + app-text/liblangtag + >=app-text/libmspub-0.1.0 + >=app-text/libmwaw-0.3.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/mysql-connector-c + 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 + net-nds/openldap + 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 + ) + libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) + libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) + pdfimport? ( app-text/poppler:=[cxx] ) + postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) +" + +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 + +# 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/intltool + >=dev-util/mdds-1.4.1:1= + media-libs/glm + sys-devel/bison + sys-devel/flex + sys-devel/gettext + sys-devel/ucpp + virtual/pkgconfig + x11-base/xorg-proto + x11-libs/libXt + x11-libs/libXtst + java? ( + dev-java/ant-core + >=virtual/jdk-1.6 + ) + odk? ( >=app-doc/doxygen-1.8.4 ) + test? ( + app-crypt/gnupg + dev-util/cppunit + media-fonts/dejavu + media-fonts/liberation-fonts + ) +" + +PATCHES=( + # "${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 "/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 ) + + 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 + + # hack for offlinehelp, this needs fixing upstream at some point + # it is broken because we send --without-help + # https://bugs.freedesktop.org/show_bug.cgi?id=46506 + ( + grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die + source "${T}/config_host.mk" 2&> /dev/null + + local path="${WORKDIR}/helpcontent2/source/auxiliary/" + mkdir -p "${path}" || die + + echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\"" + perl "${S}/helpcontent2/helpers/create_ilst.pl" \ + -dir=helpcontent2/source/media/helpimg \ + > "${path}/helpimg.ilst" + [[ -s "${path}/helpimg.ilst" ]] || \ + ewarn "The help images list is empty, something is fishy, report a bug." + ) + + 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 + + # Hack for offlinehelp, this needs fixing upstream at some point. + # It is broken because we send --without-help + # https://bugs.freedesktop.org/show_bug.cgi?id=46506 + insinto /usr/$(get_libdir)/libreoffice/help + doins xmlhelp/util/*.xsl + + pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/soffice.bin + pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild index c7a98fa7f096..6536b71f5351 100644 --- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild @@ -63,7 +63,7 @@ unset ADDONS_SRC LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird -googledrive gstreamer +gtk gtk2 kde odk pdfimport postgres test vlc +googledrive gstreamer +gtk gtk2 kde +mariadb odk pdfimport postgres test vlc $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" REQUIRED_USE="${PYTHON_REQUIRED_USE} @@ -102,7 +102,6 @@ COMMON_DEPEND="${PYTHON_DEPS} app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* - dev-db/mysql-connector-c dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] @@ -188,6 +187,8 @@ COMMON_DEPEND="${PYTHON_DEPS} ) 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] ) " @@ -401,6 +402,7 @@ src_configure() { --enable-randr --enable-release-build --disable-breakpad + --disable-bundle-mariadb --disable-ccache --disable-dependency-tracking --disable-epm @@ -490,6 +492,7 @@ src_configure() { is-flagq "-flto*" && myeconfargs+=( --enable-lto ) + MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ econf "${myeconfargs[@]}" } @@ -549,7 +552,7 @@ src_install() { 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 + echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED%/}"/etc/env.d/99${PN} || die fi # Hack for offlinehelp, this needs fixing upstream at some point. @@ -558,8 +561,8 @@ src_install() { insinto /usr/$(get_libdir)/libreoffice/help doins xmlhelp/util/*.xsl - pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin - pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin + pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/soffice.bin + pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin } pkg_postinst() { diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index c7a98fa7f096..6536b71f5351 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -63,7 +63,7 @@ unset ADDONS_SRC LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird -googledrive gstreamer +gtk gtk2 kde odk pdfimport postgres test vlc +googledrive gstreamer +gtk gtk2 kde +mariadb odk pdfimport postgres test vlc $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" REQUIRED_USE="${PYTHON_REQUIRED_USE} @@ -102,7 +102,6 @@ COMMON_DEPEND="${PYTHON_DEPS} app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* - dev-db/mysql-connector-c dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] @@ -188,6 +187,8 @@ COMMON_DEPEND="${PYTHON_DEPS} ) 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] ) " @@ -401,6 +402,7 @@ src_configure() { --enable-randr --enable-release-build --disable-breakpad + --disable-bundle-mariadb --disable-ccache --disable-dependency-tracking --disable-epm @@ -490,6 +492,7 @@ src_configure() { is-flagq "-flto*" && myeconfargs+=( --enable-lto ) + MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ econf "${myeconfargs[@]}" } @@ -549,7 +552,7 @@ src_install() { 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 + echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED%/}"/etc/env.d/99${PN} || die fi # Hack for offlinehelp, this needs fixing upstream at some point. @@ -558,8 +561,8 @@ src_install() { insinto /usr/$(get_libdir)/libreoffice/help doins xmlhelp/util/*.xsl - pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin - pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin + pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/soffice.bin + pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin } pkg_postinst() { diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml index 103556859a03..6b514662f9ab 100644 --- a/app-office/libreoffice/metadata.xml +++ b/app-office/libreoffice/metadata.xml @@ -14,6 +14,7 @@ version Use sci-libs/coinor-mp as alternative solver Enable support for remote files on Google Drive Enable legacy gtk2 frontend + Prefer mariadb connector over mysql connector Build the Office Development Kit Enable PDF import via the Poppler library Use media-video/vlc for video embedding diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index ba2f34bfcbcf..0b0ea64b616d 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -1,10 +1,9 @@ AUX scribus-1.5.3-docdir.patch 1309 BLAKE2B 978a5b54992bc2d2e84cc7435ffe15c2ace03a649de6b240a5b7a8a513134eb1ffac3f9a0f8adcf8679bf07f7beef47b4216102f9d3e3c84333b208b68e41e00 SHA512 5f3bd4fe4f61a2c8d2a58e3f480c95d32280358366a7eabc3c483abe1f3ef07ef5e3864be8ffce8b48584da23f81cb9b96b81c83a59ad4f3da5c7a5c34234063 AUX scribus-1.5.3-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27269fa4cd4c4752bd60b228e36973a1c32d5d8156c12782091fa15614ba274be07dee0d92df9ef521f2d4361a2 SHA512 e38fc85e72af67c0fea4c14dad92a759f5065cd4e337ef2257a90f27e39297c6991c467e53e9c51ae247bf2f8c34fa62fa76cf839a53b386c9c378e53756d015 -AUX scribus-1.5.5_pre20190113-poppler-0.73.patch 935 BLAKE2B c4f7e44a3d4a5a4fc2ab34aa164516757f8a76081a7644b100af0f104b4697ea4578495e06fcf74fc9b62226b28ce9b7b08aea29b1bce67b70a3e169c7be7149 SHA512 890868cacc52337e3593a35d80cc9958d7d039275c5f1c21694b22c738d7707893b49db43acf49672d8259a60809c2987fca415f4d0802f115d7c8d3a8dd0623 DIST scribus-1.5.4-poppler-0.64.0.patch.tar.xz 3020 BLAKE2B 3388efe6498545ffef6604a41b9e697a0cb6cd053c4893f9d64349bb2251400aca7a4f7dd193eb94cf69ca3f4ae1a3ba3ed106127c4fa680f396940d8056e669 SHA512 4577b4b737948a2b41dc0cec90ec95ba260959343e4953929696ceab518a2723a28a891b189caf79435e7fc8f8fc0a1012e7079e890d10549cb2ba426d15b568 DIST scribus-1.5.4.tar.xz 72832248 BLAKE2B 64797e865ce44fb01f1e29823e3cb46b2b8f1501e8d07e8b265e93a37961582ec4118d0f32d460bc044e32cf7fa6069732f6b9ce60e4dc4b0b42f914b280e637 SHA512 7875ea5f3db5fb116856cf4cf56b4cce2d0b00d9c4820969f52b89e9bf2b36f96eb9e15b368d392be74d4c6d32e971fc28f6ecbf6661fce5e3b9cb61c4d02403 -DIST scribus-1.5.5_pre20190113.tar.gz 84927002 BLAKE2B ff515bbd66267493e4558fa2cbdca57fb3e9514940c3c7cc48e435e5d78349674f57bdbeeeb0574c7e7e2d1a2d2482a5b16ccc48c62281f2d11c28a5cc38f915 SHA512 1ed9bd3add1a62234b8e26f10a31a015f3a224da588b7b72c854209a45faae61ee949d2986980700132f9d573a426c1283f4e375c25d7ea63ce6b04260a863bb +DIST scribus-1.5.5_pre20190124.tar.gz 85713996 BLAKE2B c4bb181012c5b2d15076239cb06d5b2d88fb24ef67d5e258142a4acb7979a304d5fdbd9163a24aaa47a1c8f354b0b70af7115430173ade9a8e77c1cb489fc849 SHA512 e9bd63c37a4818a5dda151b7bb6b7fa9cf7918949bd5612009646335d630b4b4188c2346c7567a3dc5f857849a2d49967f825320720c12e38a6038c7a0d3c34a EBUILD scribus-1.5.4-r1.ebuild 7187 BLAKE2B 477cbf6e32b2b05eb2a66429fc80dbee31733bb80b035b8b52a0c830415ccf75648ecaf5b9f3e1c002aa6f2414cef2f83e8d5bd0711172ab8d0ba683aa83ee02 SHA512 be389ba247a5e4ebc583314c13b612bd7e7ff5496683cc373b35df84bf2fc38441435db5bcdbf6ca986291d1aa99eca80eb01f7ef324c27d5ba1e5e6c89e4b21 -EBUILD scribus-1.5.5_pre20190113.ebuild 6981 BLAKE2B 5b20df2d8e09b219655aad963f06ab9020ec18e69a62c6dca864e956be0d7748747329994933a4818d9b760a6f4a5c365cda6ff706de28a565888c25d95041a1 SHA512 a7085ccff2f5ae9893434831a1bd0202a51c87bac57ccfc3702e03a6d78b76af9185f180640cf233d85af1171976db67e91c361839088c18413fd89fec2d6231 +EBUILD scribus-1.5.5_pre20190124.ebuild 6973 BLAKE2B c5d81fac259694e33229d99b73244c65517145f8be5875aaccfcd9e51cf68c443155b9f9bfc2a0cebc08529e203042b518a5a6f439facf2116f8fc969345d729 SHA512 1d31fd037e90a5539e2311f34e3afce6f7f791c38617e148a30ed0b0d7084f5159888382b7049c009fb91af56cb0bf9bc3051d06b7bb155398d16e7d6aaac40a EBUILD scribus-9999.ebuild 6870 BLAKE2B 1fb6ae7e846178429e4c4380d7d8d50addf2eb9e9eda75caa23448eb31e3dd65d5eed2382a11274bad92949b43d063a24446f119b2a38098a8788dc99878dd37 SHA512 904507847c4fbce1f80748ad754685df086b27cb3f28c62aaceb4ede07bc16a6011c9508c22a798dda57a9f6aa0a3f59ee5c611d5a640f8e1ad43ee24217c7d6 MISC metadata.xml 845 BLAKE2B 6522fd7c428e4f5f8bd77c03a09408e443e91d45fb0bbe72a312d48f1cdee38ab62a4059940237f18aa2e63b0595b79598846d5acb3d7289427b9d1cae768510 SHA512 18872713a1aa8d6739186ffa60f8f747f8ee9de41339c8a2d20c49d97771ce3967839044f7573bab2d7717a73c2705722071d16441bb458060db5f9e5c15f3d1 diff --git a/app-office/scribus/files/scribus-1.5.5_pre20190113-poppler-0.73.patch b/app-office/scribus/files/scribus-1.5.5_pre20190113-poppler-0.73.patch deleted file mode 100644 index f63f4c6d1eed..000000000000 --- a/app-office/scribus/files/scribus-1.5.5_pre20190113-poppler-0.73.patch +++ /dev/null @@ -1,24 +0,0 @@ -From d34e59bfe495250ba023ba0f99e672ee32300a27 Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Wed, 16 Jan 2019 00:30:35 +0000 -Subject: [PATCH] #15537: changes in poppler 0.73.0 cause build failure - -git-svn-id: svn://scribus.net/trunk/Scribus@22806 11d20701-8431-0410-a711-e3c959e3b870 ---- - scribus/plugins/import/pdf/slaoutput.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h -index c46448b80a..4dac7c3983 100644 ---- a/scribus/plugins/import/pdf/slaoutput.h -+++ b/scribus/plugins/import/pdf/slaoutput.h -@@ -28,7 +28,9 @@ for which a new license (GPL+exception) is in place. - #include "selection.h" - #include "vgradient.h" - -+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 73, 0) - #include -+#endif - #include - #include - #include diff --git a/app-office/scribus/scribus-1.5.5_pre20190113.ebuild b/app-office/scribus/scribus-1.5.5_pre20190113.ebuild deleted file mode 100644 index 77540ffb19bb..000000000000 --- a/app-office/scribus/scribus-1.5.5_pre20190113.ebuild +++ /dev/null @@ -1,241 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="tk?" -CMAKE_MAKEFILE_GENERATOR=ninja -COMMIT=6326f2af85935842fa7a93eb8f86bd2ae698245e -inherit cmake-utils desktop flag-o-matic gnome2-utils python-single-r1 xdg-utils - -DESCRIPTION="Desktop publishing (DTP) and layout program" -HOMEPAGE="https://www.scribus.net/" -SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk" - -#a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a -# Keep this sorted, otherwise eliminating of duplicates below won't work -IUSE_L10N=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de_1901 de_CH de_DE el en_AU en_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU_0 sa sk sk_SK sl sl_SI so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW" - -map_lang() { - local lang=${1/_/-} - case $1 in - # Retain the following, which have a specific subtag - de_*|en_*|pt_*|zh_*) ;; - # Consider all other xx_XX as duplicates of the generic xx tag - *_*) lang=${1%%_*} ;; - esac - echo ${lang} -} - -prev_l= -for l in ${IUSE_L10N}; do - l=$(map_lang ${l}) - [[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}" - prev_l=${l} -done -unset l prev_l - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - tk? ( scripts )" - -# osg -# couple of third_party libs bundled -COMMON_DEPEND="${PYTHON_DEPS} - app-text/libmspub - app-text/libqxp - app-text/poppler:= - dev-libs/hyphen - >=dev-libs/icu-58.2:0= - dev-libs/librevenge - dev-libs/libxml2 - dev-qt/qtcore:5 - dev-qt/qtgui:5[-gles2] - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-libs/fontconfig - media-libs/freetype:2 - >=media-libs/harfbuzz-0.9.42:0=[icu] - media-libs/lcms:2 - media-libs/libcdr - media-libs/libfreehand - media-libs/libpagemaker - media-libs/libpng:0= - media-libs/libvisio - media-libs/libzmf - media-libs/tiff:0 - net-print/cups - sys-libs/zlib[minizip] - virtual/jpeg:0= - >=x11-libs/cairo-1.10.0[X,svg] - boost? ( >=dev-libs/boost-1.62:= ) - hunspell? ( app-text/hunspell:= ) - graphicsmagick? ( media-gfx/graphicsmagick:= ) - osg? ( dev-games/openscenegraph:= ) - pdf? ( app-text/podofo:0= ) - scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] ) -" -RDEPEND="${COMMON_DEPEND} - app-text/ghostscript-gpl -" -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.5.3-docdir.patch - "${FILESDIR}"/${PN}-1.5.3-fpic.patch - "${FILESDIR}"/${P}-poppler-0.73.patch -) - -S="${WORKDIR}"/${PN}-${COMMIT} - -src_prepare() { - rm -r codegen/cheetah || die - cat > cmake/modules/FindZLIB.cmake <<- EOF || die - find_package(PkgConfig) - pkg_check_modules(ZLIB minizip zlib) - SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} ) - SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} ) - MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR ) - EOF - - sed \ - -e "/^\s*unzip\.[ch]/d" \ - -e "/^\s*ioapi\.[ch]/d" \ - -i scribus/CMakeLists.txt Scribus.pro || die - rm scribus/ioapi.[ch] || die - - sed \ - -e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \ - -i resources/templates/CMakeLists.txt || die - - sed \ - -e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \ - -i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test - - cmake-utils_src_prepare -} - -src_configure() { - # bug #550818 - append-cppflags -DHAVE_MEMRCHR - - local _lang lang langs - for _lang in ${IUSE_L10N}; do - lang=$(map_lang ${_lang}) - if use l10n_${lang}; then - # From the CMakeLists.txt - # "#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB;de_DE , etc" - langs+=";${_lang}" - else - # Don't install localized documentation - sed -e "/${_lang}/d" -i doc/CMakeLists.txt || die - safe_delete \ - ./resources/dicts/README_${_lang}.txt \ - ./resources/dicts/README_hyph_${_lang}.txt \ - ./resources/dicts/hyph_${_lang}.dic \ - ./resources/loremipsum/${_lang}.xml - fi - sed -e "/en_EN/d" -i doc/CMakeLists.txt || die - safe_delete \ - ./resources/dicts/README_en_EN.txt \ - ./resources/dicts/README_hyph_en_EN.txt \ - ./resources/dicts/hyph_en_EN.dic \ - ./resources/loremipsum/en_EN.xml - done - - local mycmakeargs=( - -DHAVE_PYTHON=ON - -DPYTHON_INCLUDE_PATH="$(python_get_includedir)" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DWANT_DISTROBUILD=ON - -DDOCDIR="${EPREFIX%/}/usr/share/doc/${PF}/" - -DWANT_GUI_LANG="${langs#;};en" - -DWITH_PODOFO="$(usex pdf)" - -DWITH_BOOST="$(usex boost)" - -DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)" - -DWANT_NOOSG="$(usex !osg)" - -DWANT_DEBUG="$(usex debug)" - -DWANT_HEADERINSTALL="$(usex !minimal)" - -DWANT_HUNSPELL="$(usex hunspell)" - -DWANT_NOEXAMPLES="$(usex !examples)" - -DWANT_NOTEMPLATES="$(usex !templates)" - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - local lang _lang - # en_EN can be deleted always - for _lang in ${IUSE_L10N}; do - lang=$(map_lang ${_lang}) - if ! use l10n_${lang}; then - safe_delete "${ED%/}"/usr/share/man/${_lang} - fi - done - - if ! use scripts; then - rm "${ED%/}"/usr/share/scribus/scripts/*.py || die - elif ! use tk; then - rm "${ED%/}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die - fi - - use scripts && \ - python_fix_shebang "${ED%/}"/usr/share/scribus/scripts && \ - python_optimize "${ED%/}"/usr/share/scribus/scripts - - mv "${ED%/}"/usr/share/doc/${PF}/{en,html} || die - ln -sf html "${ED%/}"/usr/share/doc/${PF}/en || die - cat >> "${T}"/COPYING <<- EOF || die - ${PN} is licensed under the "${LICENSE}". - Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text. - EOF - dodoc "${T}"/COPYING - docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING} - local size - for size in 16 32 128 256; do - newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png - done - newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png - doicon resources/iconsets/*/scribus.png - domenu scribus.desktop -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} - -safe_delete () { - local x - for x in ${@}; do - if [[ -d "${x}" ]]; then - ebegin "Deleting ${x} recursively" - rm -r "${x}" || die - eend $? - elif [[ -f "${x}" ]]; then - ebegin "Deleting ${x}" - rm "${x}" || die - eend $? - fi - done -} diff --git a/app-office/scribus/scribus-1.5.5_pre20190124.ebuild b/app-office/scribus/scribus-1.5.5_pre20190124.ebuild new file mode 100644 index 000000000000..c926514f24cc --- /dev/null +++ b/app-office/scribus/scribus-1.5.5_pre20190124.ebuild @@ -0,0 +1,240 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="tk?" +CMAKE_MAKEFILE_GENERATOR=ninja +COMMIT=1ed85778dd55bcbcfad2bbc276fd4c97f43ad965 +inherit cmake-utils desktop flag-o-matic gnome2-utils python-single-r1 xdg-utils + +DESCRIPTION="Desktop publishing (DTP) and layout program" +HOMEPAGE="https://www.scribus.net/" +SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86" +IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk" + +#a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a +# Keep this sorted, otherwise eliminating of duplicates below won't work +IUSE_L10N=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de_1901 de_CH de_DE el en_AU en_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU_0 sa sk sk_SK sl sl_SI so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW" + +map_lang() { + local lang=${1/_/-} + case $1 in + # Retain the following, which have a specific subtag + de_*|en_*|pt_*|zh_*) ;; + # Consider all other xx_XX as duplicates of the generic xx tag + *_*) lang=${1%%_*} ;; + esac + echo ${lang} +} + +prev_l= +for l in ${IUSE_L10N}; do + l=$(map_lang ${l}) + [[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}" + prev_l=${l} +done +unset l prev_l + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + tk? ( scripts )" + +# osg +# couple of third_party libs bundled +COMMON_DEPEND="${PYTHON_DEPS} + app-text/libmspub + app-text/libqxp + app-text/poppler:= + dev-libs/hyphen + >=dev-libs/icu-58.2:0= + dev-libs/librevenge + dev-libs/libxml2 + dev-qt/qtcore:5 + dev-qt/qtgui:5[-gles2] + dev-qt/qtnetwork:5 + dev-qt/qtopengl:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + media-libs/fontconfig + media-libs/freetype:2 + >=media-libs/harfbuzz-0.9.42:0=[icu] + media-libs/lcms:2 + media-libs/libcdr + media-libs/libfreehand + media-libs/libpagemaker + media-libs/libpng:0= + media-libs/libvisio + media-libs/libzmf + media-libs/tiff:0 + net-print/cups + sys-libs/zlib[minizip] + virtual/jpeg:0= + >=x11-libs/cairo-1.10.0[X,svg] + boost? ( >=dev-libs/boost-1.62:= ) + hunspell? ( app-text/hunspell:= ) + graphicsmagick? ( media-gfx/graphicsmagick:= ) + osg? ( dev-games/openscenegraph:= ) + pdf? ( app-text/podofo:0= ) + scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] ) +" +RDEPEND="${COMMON_DEPEND} + app-text/ghostscript-gpl +" +DEPEND="${COMMON_DEPEND} + dev-qt/linguist-tools:5 + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.5.3-docdir.patch + "${FILESDIR}"/${PN}-1.5.3-fpic.patch +) + +S="${WORKDIR}"/${PN}-${COMMIT} + +src_prepare() { + rm -r codegen/cheetah || die + cat > cmake/modules/FindZLIB.cmake <<- EOF || die + find_package(PkgConfig) + pkg_check_modules(ZLIB minizip zlib) + SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} ) + SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} ) + MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR ) + EOF + + sed \ + -e "/^\s*unzip\.[ch]/d" \ + -e "/^\s*ioapi\.[ch]/d" \ + -i scribus/CMakeLists.txt Scribus.pro || die + rm scribus/ioapi.[ch] || die + + sed \ + -e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \ + -i resources/templates/CMakeLists.txt || die + + sed \ + -e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \ + -i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test + + cmake-utils_src_prepare +} + +src_configure() { + # bug #550818 + append-cppflags -DHAVE_MEMRCHR + + local _lang lang langs + for _lang in ${IUSE_L10N}; do + lang=$(map_lang ${_lang}) + if use l10n_${lang}; then + # From the CMakeLists.txt + # "#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB;de_DE , etc" + langs+=";${_lang}" + else + # Don't install localized documentation + sed -e "/${_lang}/d" -i doc/CMakeLists.txt || die + safe_delete \ + ./resources/dicts/README_${_lang}.txt \ + ./resources/dicts/README_hyph_${_lang}.txt \ + ./resources/dicts/hyph_${_lang}.dic \ + ./resources/loremipsum/${_lang}.xml + fi + sed -e "/en_EN/d" -i doc/CMakeLists.txt || die + safe_delete \ + ./resources/dicts/README_en_EN.txt \ + ./resources/dicts/README_hyph_en_EN.txt \ + ./resources/dicts/hyph_en_EN.dic \ + ./resources/loremipsum/en_EN.xml + done + + local mycmakeargs=( + -DHAVE_PYTHON=ON + -DPYTHON_INCLUDE_PATH="$(python_get_includedir)" + -DPYTHON_LIBRARY="$(python_get_library_path)" + -DWANT_DISTROBUILD=ON + -DDOCDIR="${EPREFIX%/}/usr/share/doc/${PF}/" + -DWANT_GUI_LANG="${langs#;};en" + -DWITH_PODOFO="$(usex pdf)" + -DWITH_BOOST="$(usex boost)" + -DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)" + -DWANT_NOOSG="$(usex !osg)" + -DWANT_DEBUG="$(usex debug)" + -DWANT_HEADERINSTALL="$(usex !minimal)" + -DWANT_HUNSPELL="$(usex hunspell)" + -DWANT_NOEXAMPLES="$(usex !examples)" + -DWANT_NOTEMPLATES="$(usex !templates)" + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + local lang _lang + # en_EN can be deleted always + for _lang in ${IUSE_L10N}; do + lang=$(map_lang ${_lang}) + if ! use l10n_${lang}; then + safe_delete "${ED%/}"/usr/share/man/${_lang} + fi + done + + if ! use scripts; then + rm "${ED%/}"/usr/share/scribus/scripts/*.py || die + elif ! use tk; then + rm "${ED%/}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die + fi + + use scripts && \ + python_fix_shebang "${ED%/}"/usr/share/scribus/scripts && \ + python_optimize "${ED%/}"/usr/share/scribus/scripts + + mv "${ED%/}"/usr/share/doc/${PF}/{en,html} || die + ln -sf html "${ED%/}"/usr/share/doc/${PF}/en || die + cat >> "${T}"/COPYING <<- EOF || die + ${PN} is licensed under the "${LICENSE}". + Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text. + EOF + dodoc "${T}"/COPYING + docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING} + local size + for size in 16 32 128 256; do + newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png + done + newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png + doicon resources/iconsets/*/scribus.png + domenu scribus.desktop +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_mimeinfo_database_update + gnome2_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_mimeinfo_database_update + gnome2_icon_cache_update +} + +safe_delete () { + local x + for x in ${@}; do + if [[ -d "${x}" ]]; then + ebegin "Deleting ${x} recursively" + rm -r "${x}" || die + eend $? + elif [[ -f "${x}" ]]; then + ebegin "Deleting ${x}" + rm "${x}" || die + eend $? + fi + done +} diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest index b456c901c225..2fe44edafe6e 100644 --- a/app-office/skrooge/Manifest +++ b/app-office/skrooge/Manifest @@ -1,5 +1,6 @@ +AUX skrooge-2.17.0-noqtwebkit.patch 783 BLAKE2B 681447209c263fbfb3def61a5b3ef7a98a4a431bf7d9c4ab00f8e30df97f9447e0ca125f15f7b8cfaa1e8cbc76d928cedf055c46709297af550435b8e16b5967 SHA512 e42fb804dd941ea190ab5d2e9e9c556b206b85430a60308f5fb0ecabf66a4bb9659fa40d9bc187ee52a48be345f6ff003182d02842847db84c83c6d69068ab62 DIST skrooge-2.16.2.tar.xz 21005424 BLAKE2B c8e11df29defc714fe71ad4f488cd6207dcc8bfc0cbee28422682f9c683ed7af8200b84f90cfdd0ca6d0bd0292dab46724c6b9afa0155c9f1603bbbe189b001d SHA512 4bc7de279cf55888a258700c2a8450270904066684b1ce0b121cf5eb966da174d969daa3db432781de62d94420e706ab5364e386e053dde7617d967442eae397 DIST skrooge-2.17.0.tar.xz 23421972 BLAKE2B c0e08ef7235a6e05e945fcb92a222cc89e7a99ead4b30ba112fea7b420e150545e002e174b747bf7955415241eb55e8007d97e7fd92fa547a1f596360ab68156 SHA512 e65a1e1ed30af7c76776dbdf22f62d475ec3aece9c866453634d2692c6d1f1d6c00cb04376861cb3b09a990a3202f08dcb70ffe28f3c146cce17ade3a3a67a47 EBUILD skrooge-2.16.2.ebuild 2362 BLAKE2B f2733b59125117086e4d26bbe321feea256ac62cb187b8fc10ba1e74a895248676644d73d5a02613c3655133c0d1d5babc6d1c53f606265a9d60465e6d7a6fc9 SHA512 a46d06ec91d13303ae03201e9e015289392ec4771b4cba76b1b064e650df56cbbb2dbb65b996b5e899485cf4ce545f937aa1ff1d5c70a08b2239438f4612e03e -EBUILD skrooge-2.17.0.ebuild 2498 BLAKE2B 52f7a523a29ad49b2568fa0bfca83e1c4636a9bc42faf658fc4f71a49f3ad85a98d806af7c47d2616c73402ccb34c904a71cf33a980137c355c50e313080f47a SHA512 84e36e0ed95ef81cfff139bb352434cc4e12b89c58ec586552a86c3ec677cc3458e4fcc7ba066f0088400e398d6cdf3de3319856e01373783c92b783aea7a922 +EBUILD skrooge-2.17.0.ebuild 2579 BLAKE2B 619aecc69ca29e7cc6ae1c04691566b18246904d3e76d97b7e700be4226c653dc9ecb803428831e2fe89b7efaee5133c1bc88828605417ac10e27d5016fa27ad SHA512 d18c09c8d4c506d47025af5c80f49235bd2f08c7a24a5ee379c8ec455c43f644169a4b6c0cea2546cc17bcdddaeca69639598a1152bc5265f4e3f96b680175f5 MISC metadata.xml 508 BLAKE2B b55c79406982c895e2c0a3f680944fb561823a3713408f67b4f8de74d03246cd9b52a654d4ec97935d4f7740b9d9f4ebf27d81a9c226dc67d9922500c6e6bde0 SHA512 0b38f9d35783e7fbf2b86b9ead3772416b7080d3df07b801ecd9ef4e5329f7690e6e1b9f817d2fd8947d6735f89cfa57fb516fbcc2b383d5278f27fd89390e97 diff --git a/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch b/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch new file mode 100644 index 000000000000..cb56d16388f5 --- /dev/null +++ b/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch @@ -0,0 +1,28 @@ +From 6ba59f2f707829242ad2410803f48089062c7241 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Thu, 24 Jan 2019 23:20:09 +0100 +Subject: [PATCH] Fix build without Qt5WebKit installed + +--- + skgbasegui/skgtablewithgraph.ui | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/skgbasegui/skgtablewithgraph.ui b/skgbasegui/skgtablewithgraph.ui +index e1a3058aa..df93115f3 100644 +--- a/skgbasegui/skgtablewithgraph.ui ++++ b/skgbasegui/skgtablewithgraph.ui +@@ -151,11 +151,6 @@ + + + +- +- QWebView +- QWidget +-
QtWebKitWidgets/QWebView
+- + + SKGGraphicsView + QWidget +-- +2.20.1 + diff --git a/app-office/skrooge/skrooge-2.17.0.ebuild b/app-office/skrooge/skrooge-2.17.0.ebuild index adde622d056a..063a50e94080 100644 --- a/app-office/skrooge/skrooge-2.17.0.ebuild +++ b/app-office/skrooge/skrooge-2.17.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,6 +16,8 @@ LICENSE="GPL-2" KEYWORDS="~amd64 ~x86" IUSE="activities designer kde ofx webkit" +REQUIRED_USE="test? ( designer )" + COMMON_DEPEND=" $(add_frameworks_dep karchive) $(add_frameworks_dep kcompletion) @@ -62,7 +64,6 @@ DEPEND="${COMMON_DEPEND} $(add_frameworks_dep kwindowsystem) dev-libs/libxslt virtual/pkgconfig - x11-misc/shared-mime-info designer? ( $(add_frameworks_dep kdesignerplugin) $(add_qt_dep designer) @@ -73,11 +74,14 @@ RDEPEND="${COMMON_DEPEND} $(add_qt_dep qtquickcontrols) " -REQUIRED_USE="test? ( designer )" - # hangs + installs files RESTRICT+=" test" +src_prepare() { + use webkit || eapply "${FILESDIR}"/${P}-noqtwebkit.patch # bug 676196 + kde5_src_prepare +} + src_configure() { local mycmakeargs=( -DSKG_BUILD_TEST=$(usex test) -- cgit v1.2.3