From 8fcdcec5fbdd0e3a77391e4f354218014f59f358 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 Jan 2018 20:45:13 +0000 Subject: gentoo resync : 05.01.2018 --- app-office/libreoffice/Manifest | 5 ++- .../files/libreoffice-5.4.4.2-poppler-0.62.patch | 44 ++++++++++++++++++++++ app-office/libreoffice/libreoffice-5.4.4.2.ebuild | 3 +- app-office/libreoffice/libreoffice-9999.ebuild | 7 ++-- 4 files changed, 52 insertions(+), 7 deletions(-) create mode 100644 app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch (limited to 'app-office/libreoffice') diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 6146751f57b2..334d52f84d89 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -2,6 +2,7 @@ AUX libreoffice-5.2.5.1-glibc-2.24.patch 361 BLAKE2B d95ded4f051c77aed22ce99f627 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-5.4.4.2-gtk3-no-gtk-build.patch 436 BLAKE2B 609d8867eee6830e79cbbbce96b260a9401b8b26385bb0af3a4627a8350f046282c9d8084787be03195bc36ed7cd91465b5017ca0801abaca8a0048cc8994bfb SHA512 d2d3e03c2962f4996839808a0c766d60ec897d764b3b1c8c588ba17da7d2d320083f88b8ade5709bbc359e3529ab5c4510806d7ec2a5aa79899b05da6f802851 +AUX libreoffice-5.4.4.2-poppler-0.62.patch 1556 BLAKE2B 73c6218c1b12308b80db6cf93c1cd3d5fa317b5a65832df942c521f931e9bc1b624b1a50b3f7a34e168dad2c4e8ea9db7169b3f3ee27787f3aa1815f771368bc SHA512 759fb125ac09309c4b7dee4ee2d57c4e275b95dd31dbf5df7ff25dec687fd473815ad307dc4dc500ace11823c9f2b2e7bddf5c986fdfa2eddd3051eee7240cae 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 @@ -14,8 +15,8 @@ DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd234 DIST libreoffice-help-5.4.2.2.tar.xz 2343504 BLAKE2B 7d446d5b078adc8943be3fced92f367101f84c8639b84d86a1b8c2386d8aeec61dc01706078cbb251ad81abebb914acc7f5e977aa17fcd1f55db65c0861814e2 SHA512 ba845653d6388bae53eaa945abebb367fedace81c1949ed975a2ad0c270c688649b385b463256b362a6397f18d214aed9b876869434c6c3868649180e57c3112 DIST libreoffice-help-5.4.4.2.tar.xz 2343352 BLAKE2B d94528f6dcc85730f2443f3a84beff0cd113bb9c423d767c74d831649e56b0c92279474a0f1169ebc0ffd7804d57dba86aaa352e7fd1d9df9721f3ff6059047c SHA512 55abdde1cf0f62d213a897cc30b92ae04960c9b1e6e69c4f86242d2beecd787f44be9c3d0c8684d775ffe40b17d685a71739c9c2f08753649c4e1298fdf94226 EBUILD libreoffice-5.4.2.2.ebuild 17284 BLAKE2B 2f1c4a8f7a661b36fa3eaa8559eeeb9e7140cb3e1cc71ca1f4272512e3a268c7e24e60bebd9088a76f06e546bf0307a6e18626fc2e4fe55f04f7ad081befdc27 SHA512 3fde8087bbe39bc3bbf6509bb2faa9635a9e7ced06df58c67f143de24fc49f9e3742d5e61001a28fa9a0d600e8bb5ff72fb578acdd5637ac37c51679408cc810 -EBUILD libreoffice-5.4.4.2.ebuild 17309 BLAKE2B 186f9d88608fb9b7d4a4d8c807e43fa7dcba24ad3e4078177493522c842daeabbb2ec065953969649761194f32dfbf744ec1087e1628a8e7e3c5fa7a573f8f80 SHA512 78109e2aeeaadfc7e523867f00dbaeed8e9debf85fef6540f44befe08004d53a336b76bab74c5f53e62ed329cd38812bde17810079b08a38e6eaa62a92d079bd +EBUILD libreoffice-5.4.4.2.ebuild 17361 BLAKE2B 7fa4ca01338ac8cd9e07288e672ddd033368a5a0281b4c56c2ebe21d6814fec6d1aedf9f06cab4ffa4d0b54f3285cf64781d205926860e3c03907c1b34171086 SHA512 8f551d2d9de46e3ecf10953ece19d9bd005164c6d407e4b980a57dfa74b82d6fce3481d9466a909a938d17cbcf87e27c57e12c186ae8d2c405d9cb32ac76a9b1 EBUILD libreoffice-5.4.9999.ebuild 17252 BLAKE2B 428ec36f2c5a34e8ae917b665d2e755eb450e3e6429a7b9bc3c752de0acef58456a6ba5e95ed28c826f508027ad2b7a60b2eb348afda1ddc5b70991fd4b57492 SHA512 6ee98390f0f11cfe931cdc4e370c36d485f2cb5b32d2ffc94de94a9824986e0e944b0842a53ee80bf21614c850c17a1dcfceb8c7be8cc72525581c36bb392774 EBUILD libreoffice-6.0.9999.ebuild 16755 BLAKE2B 280e9dafda7955a3e465336c37493a8d48ed266ddbc1c07d5b74d920a136b09890302fb0ee34956bb41151d31d7ba9bd58085b2dac43362ac388c5383e1060e1 SHA512 a3d58083662497e71904c522ecf5c2475bf00d40b97b81639e274416f2feea3b820a93e86b37c996ef98390b303f0f7b80a24e7c226d3d8f5af63c131bf5ec13 -EBUILD libreoffice-9999.ebuild 16755 BLAKE2B 280e9dafda7955a3e465336c37493a8d48ed266ddbc1c07d5b74d920a136b09890302fb0ee34956bb41151d31d7ba9bd58085b2dac43362ac388c5383e1060e1 SHA512 a3d58083662497e71904c522ecf5c2475bf00d40b97b81639e274416f2feea3b820a93e86b37c996ef98390b303f0f7b80a24e7c226d3d8f5af63c131bf5ec13 +EBUILD libreoffice-9999.ebuild 16668 BLAKE2B 0625317ed1b43d21ab6e96f001a69f75ae04cccc6bed712bbb6b6e623f0c1e76795420a4275d63ab53b5e4458a7d23c906e7c68b81a1dc1f094e5bd12a39d5db SHA512 e5e80d8bafaf32d0ff3dad306d456c2b2fa09e003974bca70c7742fde62c2215389ac0876c378e0f235ae9bb1953ce961496bb0dc79cc530f0dc9af96003bf41 MISC metadata.xml 1393 BLAKE2B 011d5a2e756882852e46eedb9ef66977b93131c570491008a9ebc547b91276bc2e6a7a3db045d3de0758d1ea6ca486d3ea5b4d5c7c667b08534212cce25c0867 SHA512 72cff0c78665cb79e4cb3df72a87af3dc02d9d46f6293a02974602387b50245553d90e1d7d3134d8143ffda809b3a497b43279652ede8ae7eeee9e724918bef7 diff --git a/app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch b/app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch new file mode 100644 index 000000000000..e6d7dff898df --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch @@ -0,0 +1,44 @@ +Fix build with >=poppler-0.62.0, cleanup ifdef and raise minimum poppler version. + +--- a/configure.ac 2017-12-12 18:45:07.000000000 +0100 ++++ b/configure.ac 2018-01-04 23:57:16.410999542 +0100 +@@ -10403,7 +10403,7 @@ + if test "$with_system_poppler" = "yes"; then + AC_MSG_RESULT([external]) + SYSTEM_POPPLER=TRUE +- PKG_CHECK_MODULES( POPPLER, poppler >= 0.12.0 ) ++ PKG_CHECK_MODULES( POPPLER, poppler >= 0.21.1 ) + AC_LANG_PUSH([C++]) + save_CXXFLAGS=$CXXFLAGS + save_CPPFLAGS=$CPPFLAGS +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2017-12-12 18:45:07.000000000 +0100 ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2018-01-05 00:29:16.541246738 +0100 +@@ -32,13 +32,11 @@ + #pragma warning(push, 1) + #endif + +-// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1 + // FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1) + // because the internal poppler does not provide poppler-version.h and the macro always returns 0 +-#if POPPLER_CHECK_VERSION(0, 21, 1) +-#include "UTF8.h" +-#elif POPPLER_CHECK_VERSION(0, 21, 0) +-#include "UTF.h" ++// UTF8.h was renamed to UnicodeMapFuncs.h in poppler-0.62.0 ++#if POPPLER_CHECK_VERSION(0, 62, 0) ++#include "UnicodeMapFuncs.h" + #else + #include "UTF8.h" + #endif +@@ -918,7 +916,11 @@ + ); + + // silence spurious warning ++#if POPPLER_CHECK_VERSION(0, 62, 0) ++ (void)&mapUTF16; ++#else + (void)&mapUCS2; ++#endif + + char buf[9]; + for( int i=0; i