summaryrefslogtreecommitdiff
path: root/app-office
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-01-07 18:44:07 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-01-07 18:44:07 +0000
commit5001a6c7b6da2956f5b17c695b1e0059dc7b8de5 (patch)
tree0528a53855a7ec96d20cde9edb9031aab030224c /app-office
parenta8b0d35ab742f31538d515dea39716e566d533c0 (diff)
gentoo resync : 07.01.2018
Diffstat (limited to 'app-office')
-rw-r--r--app-office/Manifest.gzbin9747 -> 9755 bytes
-rw-r--r--app-office/libreoffice/Manifest7
-rw-r--r--app-office/libreoffice/files/libreoffice-6.0.0.1-poppler-0.62.patch44
-rw-r--r--app-office/libreoffice/libreoffice-5.4.9999.ebuild3
-rw-r--r--app-office/libreoffice/libreoffice-6.0.9999.ebuild3
-rw-r--r--app-office/libreoffice/libreoffice-9999.ebuild1
-rw-r--r--app-office/orage/Manifest2
-rw-r--r--app-office/orage/orage-4.12.1-r1.ebuild2
8 files changed, 55 insertions, 7 deletions
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 0ff485baaf27..e4ec7ace64c7 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
Binary files differ
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 334d52f84d89..99d20d611c2c 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -3,6 +3,7 @@ AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0a
AUX libreoffice-5.4-system-pyuno.patch 1399 BLAKE2B d7516b0ac19509dae8eaaac94acad65e35c71b68ea0f2962c41d9422a89993dc90e76b1f7cd3d19f8f3860b443f063ee1c17024c7f56fd3b8470d2b690eb9c32 SHA512 41b57b857a294b8ac234aaf160dbd380008f716ffdf481b7c733f1dab8702876aad827ab9f1b8f2f26778f0b3a6dfdc9e3ae190188a484d9aeb4568df2e9b418
AUX libreoffice-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
+AUX libreoffice-6.0.0.1-poppler-0.62.patch 1556 BLAKE2B 58f446358e4c8da29a2afecc9fa1480a11ff3a2c11a750390069013f67c393ce859991b7aeab062f310edd9e7ec4680a2345b8742c5f6850a5af006c17588cbc SHA512 30d55d3d5bbecbe697f7cf735db017d992a41b5032290fce50956187f7e1823fe403613bbdb55cf0ef1b9f2fc3561a479552fb80293cff117c311a838a52686b
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
@@ -16,7 +17,7 @@ DIST libreoffice-help-5.4.2.2.tar.xz 2343504 BLAKE2B 7d446d5b078adc8943be3fced92
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 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 16668 BLAKE2B 0625317ed1b43d21ab6e96f001a69f75ae04cccc6bed712bbb6b6e623f0c1e76795420a4275d63ab53b5e4458a7d23c906e7c68b81a1dc1f094e5bd12a39d5db SHA512 e5e80d8bafaf32d0ff3dad306d456c2b2fa09e003974bca70c7742fde62c2215389ac0876c378e0f235ae9bb1953ce961496bb0dc79cc530f0dc9af96003bf41
+EBUILD libreoffice-5.4.9999.ebuild 17313 BLAKE2B 1701bda68e2ebfdba50ed889d6d13a261a6e8127aa2f47aae68a4e7f39d771f716983f8beee7c927244e101783ba9e50512f35a16c959c979d1475c2baff8b55 SHA512 640c75d7e9b1806249d61006b9b6524c28cf68a6b90936effd0dcca45f5b58bc1b327ed2b37fda815d09c827bd3c5805780bf3e65078fea658518d5219e0fc21
+EBUILD libreoffice-6.0.9999.ebuild 16816 BLAKE2B 8a87c931db0b1e672f9f3c171faae5a7a216a650a36e2c49cb5df11a27f1f0dccfa4c903b3b32f33f4f38ceb17c0a5c71a79191b3a994c2292fae7e7fe7a8b5b SHA512 129d1823e47534741fe38d08e61044b2d86f306a0ce410286811df76fa254fd33fcc63adf92d322b3beefa18fb097479675aecc70a10dc9a7ee57f8558d07a5b
+EBUILD libreoffice-9999.ebuild 16729 BLAKE2B dfd7c65cb13718cacf7ab4a845e43473bc3a4d96ca81ca4f31b8528485825dd15653a9a2f1dfcfe449274aedf6c8706f5dfc1e8fd4a3d832ecb051ee7187ddaf SHA512 51567c3a9066b0a17a62c94225e6700458dca4ffe6f3148e955f384c1260097d4bc5a4af47694a69db8981d1264f01f4dd19dd75756a714622e9a71d9bfaa099
MISC metadata.xml 1393 BLAKE2B 011d5a2e756882852e46eedb9ef66977b93131c570491008a9ebc547b91276bc2e6a7a3db045d3de0758d1ea6ca486d3ea5b4d5c7c667b08534212cce25c0867 SHA512 72cff0c78665cb79e4cb3df72a87af3dc02d9d46f6293a02974602387b50245553d90e1d7d3134d8143ffda809b3a497b43279652ede8ae7eeee9e724918bef7
diff --git a/app-office/libreoffice/files/libreoffice-6.0.0.1-poppler-0.62.patch b/app-office/libreoffice/files/libreoffice-6.0.0.1-poppler-0.62.patch
new file mode 100644
index 000000000000..f0ecc3b990b4
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.0.0.1-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<uLen; ++i )
diff --git a/app-office/libreoffice/libreoffice-5.4.9999.ebuild b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
index 542f04bac545..d6e9a757db62 100644
--- a/app-office/libreoffice/libreoffice-5.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -245,6 +245,7 @@ PATCHES=(
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+ "${FILESDIR}/${PN}-5.4.4.2-poppler-0.62.patch" # bug 642602
)
pkg_pretend() {
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 9b35442a6de3..5fca4ae10c01 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -250,6 +250,7 @@ PATCHES=(
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+ "${FILESDIR}/${PN}-6.0.0.1-poppler-0.62.patch" # bug 642602
)
pkg_pretend() {
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 664bacbda8ea..ba7d38f7d304 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -249,6 +249,7 @@ PATCHES=(
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+ "${FILESDIR}/${PN}-6.0.0.1-poppler-0.62.patch" # bug 642602
)
pkg_pretend() {
diff --git a/app-office/orage/Manifest b/app-office/orage/Manifest
index e66089c5c108..269e30762692 100644
--- a/app-office/orage/Manifest
+++ b/app-office/orage/Manifest
@@ -1,4 +1,4 @@
DIST orage-4.12.1.tar.bz2 2590788 BLAKE2B 0f00b5704e11923c2ceaac81f0956457402a90f65709c165c98b6942745ea3adee176691555a18548ead258951693187e1b3ce9a718abb3b13c2a1c2a4754e7e SHA512 3fec0201171140586cdc9bcf151450a7086515e18b5815afe4fe4c4726ba554c50582b0479e52985b330140c51b7233ef81f678f986f848afbeee74c66b2d196
-EBUILD orage-4.12.1-r1.ebuild 1543 BLAKE2B c9d48a700621a1856e03093769729dc37675d6ff8c9dc37888e6857e8975584ea4d22740e7660ff373084f4a9c09ef26ff22552912eb65d9e2ea8785ec8f5a1b SHA512 85a96bee0251a2106c92936a9a66a241658abc6b83778f52cb5fc941a7983467013026a00108a8b13d1cd137f7730705732f4483861fe20f5ba35a74100deed6
+EBUILD orage-4.12.1-r1.ebuild 1542 BLAKE2B f5b3df4439b04dff0f61babb30cffa5b9f9a912f0be64be663627963ada664813cbe44b35bc7106f89bb5a69552ed451ba5bf3730b20dc9c6a5a632a6e147a84 SHA512 a104e66d9e4b6552b21837b8c312defe48d28b52cc82a91ece9fc44cc6333adc2418b78146e07ac419a1a4a4f00eb0deb84a21b344884836c61996aee625952b
EBUILD orage-4.12.1.ebuild 1605 BLAKE2B 9a1afcbf79c3f71a2f825f5688f8f719623294416edb18cee1cdb37dc0aa12e412189d82c2885e272237e316f52e42612692f3849baea43e810c1940c46d908a SHA512 25d2a0f1aa8e63c3b8246efe5ac49ac86c861bef8dc4ee3287dc502a2b09bd6e908684d1ec788d7667ae25ed4e48f84da0b8c3ba53ff8fc65dc44eed6d400128
MISC metadata.xml 355 BLAKE2B 4ddbf38a80be81b7e131d7c616dfb88dff1e900952c17c4cc4dd26711e720351177d92d8225825dd57354399ecdb8b7bccd18f883fcd927846e8614dd4ac4a99 SHA512 a5d3f875ac31caa10ca77ce8eb38449b3007094d1b9d7d307bd15ee29644c09530d44ac6a4953e10adfa3bd45b6a3fe44dbbb3b80ab7d0c8572c48523ef287eb
diff --git a/app-office/orage/orage-4.12.1-r1.ebuild b/app-office/orage/orage-4.12.1-r1.ebuild
index ab5482d4e4d4..f2b63c1f9460 100644
--- a/app-office/orage/orage-4.12.1-r1.ebuild
+++ b/app-office/orage/orage-4.12.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="berkdb +clock-panel-plugin dbus libnotify"
RDEPEND=">=dev-libs/libical-0.48:=