[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2024-03-28 Thread Andreas Sturmlechner 
commit: 7643b42096da1f4403a501a4a5930dec2d1c88c2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 28 18:44:14 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 28 18:48:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7643b420

app-office/libreoffice: Fix build with dev-build/autoconf-2.72

Closes: https://bugs.gentoo.org/925162
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/libreoffice-7.6.6.3-autoconf-2.72.patch  | 53 ++
 app-office/libreoffice/libreoffice-7.6.6.3.ebuild  |  3 ++
 2 files changed, 56 insertions(+)

diff --git 
a/app-office/libreoffice/files/libreoffice-7.6.6.3-autoconf-2.72.patch 
b/app-office/libreoffice/files/libreoffice-7.6.6.3-autoconf-2.72.patch
new file mode 100644
index ..749231a595e5
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.6.6.3-autoconf-2.72.patch
@@ -0,0 +1,53 @@
+From 78629e74e1e046a9ae4945088e2f7afde6db88d6 Mon Sep 17 00:00:00 2001
+From: Fridrich Strba 
+Date: Tue, 12 Mar 2024 11:34:52 +0100
+Subject: Fix build with autoconf 2.72
+
+This commit http://git.savannah.gnu.org/gitweb/
+?p=autoconf.git;a=commitdiff;
+h=cf09f48841b66fe76f606dd6018bb3a93242a7c9
+changed the internal cache variable name and its content
+
+The effects show later in message like
+/tmp/ccyB6wS6.ltrans9.ltrans.o: in function 
`comphelper::DocPasswordHelper::decryptGpgSession(com::sun::star::uno::Sequence
 > const&)':
+/home/abuild/rpmbuild/BUILD/libreoffice-24.2.1.2/comphelper/source/misc/docpasswordhelper.cxx:705:(.text+0x4fb7):
 undefined reference to `GpgME::Data::seek(long, int)'
+/usr/bin/ld.bfd: 
/home/abuild/rpmbuild/BUILD/libreoffice-24.2.1.2/comphelper/source/misc/docpasswordhelper.cxx:716:(.text+0x5402):
 undefined reference to `GpgME::Data::seek(long, int)'
+/usr/bin/ld.bfd: /tmp/ccyB6wS6.ltrans13.ltrans.o: in function 
`comphelper::OStorageHelper::CreateGpgPackageEncryptionData()':
+/home/abuild/rpmbuild/BUILD/libreoffice-24.2.1.2/comphelper/source/misc/storagehelper.cxx:507:(.text+0x64e3):
 undefined reference to `GpgME::Data::seek(long, int)'
+/usr/bin/ld.bfd: 
/home/abuild/rpmbuild/BUILD/libreoffice-24.2.1.2/comphelper/source/misc/storagehelper.cxx:520:(.text+0x6583):
 undefined reference to `GpgME::Data::seek(long, int)'
+collect2: error: ld returned 1 exit status
+
+Where the type 'off_t' at the time of inclusion of the header and
+at the time of compilation of the library differ.
+
+Change-Id: Ie0486dbc869e84f5fb2688473334cfe464abd570
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164704
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann 
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164715
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164764
+Reviewed-by: Miklos Vajna 
+Reviewed-by: Michael Meeks 
+Tested-by: Stephan Bergmann 
+---
+ configure.ac | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8101a2b2e1dd..758e160400ba 100644
+--- a/configure.ac
 b/configure.ac
+@@ -7197,7 +7197,9 @@ if test "$_os" != "WINNT"; then
+ 
+ dnl Check for large file support
+ AC_SYS_LARGEFILE
+-if test -n "$ac_cv_sys_file_offset_bits" -a "$ac_cv_sys_file_offset_bits" 
!= "no"; then
++if test -n "$ac_cv_sys_largefile_opts"  -a "$ac_cv_sys_largefile_opts" != 
"none needed" -a "$ac_cv_sys_largefile_opts" != "support not detected"; then
++LFS_CFLAGS="$ac_cv_sys_largefile_opts"
++elif test -n "$ac_cv_sys_file_offset_bits" -a 
"$ac_cv_sys_file_offset_bits" != "no"; then
+ LFS_CFLAGS="-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
+ fi
+ if test -n "$ac_cv_sys_large_files" -a "$ac_cv_sys_large_files" != "no"; 
then
+-- 
+cgit v1.2.3
+

diff --git a/app-office/libreoffice/libreoffice-7.6.6.3.ebuild 
b/app-office/libreoffice/libreoffice-7.6.6.3.ebuild
index 968f3b9be2f7..847e7e9ebb21 100644
--- a/app-office/libreoffice/libreoffice-7.6.6.3.ebuild
+++ b/app-office/libreoffice/libreoffice-7.6.6.3.ebuild
@@ -296,6 +296,9 @@ PATCHES=(
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
 
+   # 24.2 branch
+   "${FILESDIR}/${P}-autoconf-2.72.patch" # bug 925162
+
# TODO: upstream
"${FILESDIR}/${PN}-7.6-unused-qt5network.patch"

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2024-03-12 Thread Andreas Sturmlechner 
commit: 422996a7e7149c2f5a5d5b6e5e135d865657ecb2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Mar 12 11:31:01 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Mar 12 11:49:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=422996a7

app-office/libreoffice: add 7.6.6.1 w/o KEYWORDS

Bug: https://bugs.gentoo.org/926227
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/libreoffice/Manifest|   2 +
 .../files/libreoffice-7.6.6.1-detect-plasma6.patch | 153 +
 app-office/libreoffice/libreoffice-7.6.6.1.ebuild  | 668 +
 3 files changed, 823 insertions(+)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 3fac1038a8bb..20840c185dfb 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -22,10 +22,12 @@ DIST frozen-1.1.1.tar.gz 186589 BLAKE2B 
5f103311c49777d0d284cabe026fae55f09bd24b
 DIST libreoffice-24.2.2.1.tar.xz 280628072 BLAKE2B 
f9b22b25bdd58278de020fa67ec6ab3d7a3986c75d7931ea82b69dc5d330876be1aaf4cd3ef7cde6e9eb2554ee7d156c04bb8729e13a5e622e8e68b4e28cba08
 SHA512 
62840468733eabb4a4b9784802e1710e2a697ebe6fa3d6246bcc9d08b97a8af189b259fe8af6f2add4d1cf706df40431fc26d92be318dd9b547f05de992368d5
 DIST libreoffice-7.6.4.1.tar.xz 281547116 BLAKE2B 
55712cf41e38373476dbc3d6a6f244dc0ba9222caf587c5d8a56c5f952e064e815d752a786d6770891775dc2a43739ae05fb94935006c005b41b3aeca229a866
 SHA512 
dbfc0cc8aa68e26c89da12156046ccf18201759c0e67757ce259a1150934ad7e2d914837701731fbe00aeab9a2f8c996619eb0892b7907de8012fdd7421da0f6
 DIST libreoffice-7.6.5.2.tar.xz 281916516 BLAKE2B 
b0e21dbc9a1c76027065862ca7ea24eba21ffe5dc1862ff50941644f291122396fbf94141cdbed84c54b0251f3c4452db1e4714ec30c35e416a6450a6caf7f2f
 SHA512 
b6289b1c9b7d363a04f8f63b16994a1820468cb4b270a639279046965b8b773cd9aec40eca57528b17990679a6e8a29a17c5e643b50fe5a5c971928904472602
+DIST libreoffice-7.6.6.1.tar.xz 282150652 BLAKE2B 
5327e945aeb05d793c647a21fe96cabdb5116617ba4c18423a57fe4ea8f62bab681b6da77f52e16493f6b4ab3e2555f5205f7bf2102320503c07821c9ac7c913
 SHA512 
26e51eb3d9124be4cf88eeb838f83d3341826b96382bc70b8e4737399410da5da770493f08c33ca3667b6bffb69097ceea79170e3785f9fdf0b27db21d134690
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B 
f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883
 SHA512 
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-24.2.2.1.tar.xz 167069480 BLAKE2B 
ca1c551a38b2c4250e2c39216e476fab67d72df4adcf5f3ced2e83b0b2ec6f3ae0596a9c7eeb8bfca27e360bfb2b2d32c90e6c1216f0204bc971fe9ba2277446
 SHA512 
51daafb453d5bfb296a4985a51cb69c1bc0e8559546061440713c3cb6a8021ff54989c02f9d34bd00734e4d4b32d9533d9cffb80f4bcd3fffbed1b6c48a19cb3
 DIST libreoffice-help-7.6.4.1.tar.xz 166959028 BLAKE2B 
fadcd32c50af1d4607ecd20ef7640cfbd1912361a792c324540dee1b5ee78c5f622b8363a5b96a1afb8256618573a0bb6f919a144de98fe88a1331d9241612f0
 SHA512 
0f72cd933ab7b897ec36f7b29bc5e568be289ea50ae0844e6083ff4957eab3cd313b39ffbda2e58f59de7962a05b371d8d61043d80323bb474e5436d23d3a859
 DIST libreoffice-help-7.6.5.2.tar.xz 166958152 BLAKE2B 
440a268b8a5ea13abc553a0154f56c39eaec88024e268b1a40f016fb53f368df7610b0e53cbf3a6b9ca87ca7c753d086ad1944b48bab11d1861862c1b345e61c
 SHA512 
f7b2a068f0bfcb35f3ad521c3c41ce26dd0f1abcc2c002e654ea951131b60451b81af964bf8c870615d14c8330bcd1c6d0b941caba390aa86ec6fb53dfe200c3
+DIST libreoffice-help-7.6.6.1.tar.xz 166956308 BLAKE2B 
26ec36b28f7e6725817c88668d9156fa3acd7e247a6fe21affad6fc08c6b0e71c952d07576a37bfb548030d40bb45cb6079acf7f5da669c85e96f33564afc595
 SHA512 
aa427fc1e053138bd5a54da99846dee5b454bd328253226e2925b36f3869881e1e3ae8ca501157bb4d8c325071df1caa587654142f22c616f6939979347e3271
 DIST skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz 10693272 
BLAKE2B 
67f2bd33d58c58c59f1ee5fb693a6a7e6a1ace52f269ae0fa6617027e93131031b0af9d44c36e371fe5a38c5b7519a61f9bcf4286a13ef5b06ea7e7eb5cb0a0f
 SHA512 
58d50fdd19cc5df640244e0c765aec6addc3e552701b201772584e8bea7cda12047e4a6af41452c6669aadfc026de29a4a4e7c6b31c7dfff30e29e50ed46fe3d
 DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 
BLAKE2B 
ce8247de4cd6939b0593adf1c3dc6b78cdf4220fbcd2dfb2b9cf6d80d42f9c49f4d93fbe3cff68d079f04cc5801daf20999b288f7fdc85b58e32035151a3616a
 SHA512 
6c10785ed9ab8cdf3385ebd3f3d13a64b850df9cc7a12e513326a84c7a3e6f6235f9f4dbce128eac2e43a2707fe6a6011716de5985adf4742d55879210bf32e9
 DIST zxcvbn-c-2.5.tar.gz 1404434 BLAKE2B 
f0f22fc8643f785e8f9ed42033d6654c2e67aa4e258bbc4fecf533efcf8b86b6d7e67f9042326247c311c42a4e2b24b844e0bae65cdb2e46ea043a2974ffd857
 SHA512 
d7199b3cc36cd0e401bd8f857132425908307aefcdb1bb635ee81c34cf71ccbcdf0fe36a336a55da1281692b508881b54773afa41379a448863095f4abd5c0e8

diff --git 
a/app-office/libreoffice/files/libreoffice-7.6.6.1-detect-plasma6.patch

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2024-03-10 Thread Andreas Sturmlechner 
commit: d8d0c38330e3b5fb2b78451472adae2b0d5b747a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar 10 15:58:32 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Mar 10 16:30:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8d0c383

app-office/libreoffice: drop 24.2.1.2

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/libreoffice/Manifest|   2 -
 .../files/libreoffice-24.2-kf6-buildfix.patch  |  13 -
 .../files/libreoffice-24.2-kf6-configure.patch |  61 --
 app-office/libreoffice/libreoffice-24.2.1.2.ebuild | 698 -
 4 files changed, 774 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index e6c133476b6b..3fac1038a8bb 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,12 +19,10 @@ DIST dtoa-20180411.tgz 48893 BLAKE2B 
4a03dc67e44353ae1c0653c8305d2df9bcfef16b48d
 DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B 
d3ac085a39ee9798182b70ba650fa954234b964e33278ac4fe3f84f8c3218ad49f12d139079328036b4f9d80cde967888c0a66393c34dedf27af69dac02c5aff
 SHA512 
9091d3628d9c75c068507537afc9e10bfb79c1abfd36ad697af3d592a1cc049ba6640f665bfc53cc520b6a26c21d70b0275106843444b441484c2178f2784743
 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 
2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b
 SHA512 
c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
 DIST frozen-1.1.1.tar.gz 186589 BLAKE2B 
5f103311c49777d0d284cabe026fae55f09bd24b2227d56133c48b9f9f0542361f3e007687089145939c12fc6a1af8baf1c76ba76176bdddec3d726e45d705d1
 SHA512 
e22561a4e634e388e11f95b3005bc711e543013d314f6aaeda34befb2c673aea2d71a717d8822bc8fa85bdc8409945ba2ad91a1bac4f8cb5303080de01a5f60e
-DIST libreoffice-24.2.1.2.tar.xz 280349652 BLAKE2B 
4035f85c8c155e2131e972c94355d360a538a9460c62e6ea416b123b9564bfecc100c8c7ce07f22ecd8f14ba140077da9d8aeaed9ad3be5171d1ffdbede53ce2
 SHA512 
650a61a56759109a17e65bcd31b9876b19ac7c71996854566ea8f6e8039276bd29173c80b3a2d4466cd2c6fcb63d4b95f3d4c78bd7ad22bdd190b801b5665a56
 DIST libreoffice-24.2.2.1.tar.xz 280628072 BLAKE2B 
f9b22b25bdd58278de020fa67ec6ab3d7a3986c75d7931ea82b69dc5d330876be1aaf4cd3ef7cde6e9eb2554ee7d156c04bb8729e13a5e622e8e68b4e28cba08
 SHA512 
62840468733eabb4a4b9784802e1710e2a697ebe6fa3d6246bcc9d08b97a8af189b259fe8af6f2add4d1cf706df40431fc26d92be318dd9b547f05de992368d5
 DIST libreoffice-7.6.4.1.tar.xz 281547116 BLAKE2B 
55712cf41e38373476dbc3d6a6f244dc0ba9222caf587c5d8a56c5f952e064e815d752a786d6770891775dc2a43739ae05fb94935006c005b41b3aeca229a866
 SHA512 
dbfc0cc8aa68e26c89da12156046ccf18201759c0e67757ce259a1150934ad7e2d914837701731fbe00aeab9a2f8c996619eb0892b7907de8012fdd7421da0f6
 DIST libreoffice-7.6.5.2.tar.xz 281916516 BLAKE2B 
b0e21dbc9a1c76027065862ca7ea24eba21ffe5dc1862ff50941644f291122396fbf94141cdbed84c54b0251f3c4452db1e4714ec30c35e416a6450a6caf7f2f
 SHA512 
b6289b1c9b7d363a04f8f63b16994a1820468cb4b270a639279046965b8b773cd9aec40eca57528b17990679a6e8a29a17c5e643b50fe5a5c971928904472602
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B 
f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883
 SHA512 
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-24.2.1.2.tar.xz 167070728 BLAKE2B 
fd265ddc95b7a7638d0edd61682bc48332bb5ea04a171bfb30a16f2705d28697b7860a5ecaa12491ce57ee74f90cfb4f19de62d83d954e9d7c58ba46b2831113
 SHA512 
bac54ac89f4c97434c354f3f281602fd8720546f549a687940bd028bedbd2841241429ee11983f805322136a8376453bcbbc6c87b8d032c025a50da95b1ce851
 DIST libreoffice-help-24.2.2.1.tar.xz 167069480 BLAKE2B 
ca1c551a38b2c4250e2c39216e476fab67d72df4adcf5f3ced2e83b0b2ec6f3ae0596a9c7eeb8bfca27e360bfb2b2d32c90e6c1216f0204bc971fe9ba2277446
 SHA512 
51daafb453d5bfb296a4985a51cb69c1bc0e8559546061440713c3cb6a8021ff54989c02f9d34bd00734e4d4b32d9533d9cffb80f4bcd3fffbed1b6c48a19cb3
 DIST libreoffice-help-7.6.4.1.tar.xz 166959028 BLAKE2B 
fadcd32c50af1d4607ecd20ef7640cfbd1912361a792c324540dee1b5ee78c5f622b8363a5b96a1afb8256618573a0bb6f919a144de98fe88a1331d9241612f0
 SHA512 
0f72cd933ab7b897ec36f7b29bc5e568be289ea50ae0844e6083ff4957eab3cd313b39ffbda2e58f59de7962a05b371d8d61043d80323bb474e5436d23d3a859
 DIST libreoffice-help-7.6.5.2.tar.xz 166958152 BLAKE2B 
440a268b8a5ea13abc553a0154f56c39eaec88024e268b1a40f016fb53f368df7610b0e53cbf3a6b9ca87ca7c753d086ad1944b48bab11d1861862c1b345e61c
 SHA512 
f7b2a068f0bfcb35f3ad521c3c41ce26dd0f1abcc2c002e654ea951131b60451b81af964bf8c870615d14c8330bcd1c6d0b941caba390aa86ec6fb53dfe200c3

diff --git a/app-office/libreoffice/files/libreoffice-24.2-kf6-buildfix.patch

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2024-03-03 Thread Sam James 
commit: 321f0cac07cd882e8ab7f74d7fd5c80c84dcd4a4
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar  4 04:21:42 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar  4 04:21:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=321f0cac

app-office/libreoffice: fix build w/ GCC 14

Signed-off-by: Sam James  gentoo.org>

 .../files/libreoffice-7.6.5.2-gcc14.patch  | 38 ++
 app-office/libreoffice/libreoffice-7.6.5.2.ebuild  |  3 ++
 2 files changed, 41 insertions(+)

diff --git a/app-office/libreoffice/files/libreoffice-7.6.5.2-gcc14.patch 
b/app-office/libreoffice/files/libreoffice-7.6.5.2-gcc14.patch
new file mode 100644
index ..a98012320375
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.6.5.2-gcc14.patch
@@ -0,0 +1,38 @@
+https://github.com/LibreOffice/core/commit/db98a3f1b1a703ea8e1284b8815eea2274abb2db
+
+From db98a3f1b1a703ea8e1284b8815eea2274abb2db Mon Sep 17 00:00:00 2001
+From: Martin Jambor 
+Date: Wed, 7 Jun 2023 18:11:45 +0200
+Subject: [PATCH] Add cstdlib include necessary to build with gcc14 libstdc++
+ (tdf#155715)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Without explicitely including , compiling some files
+including store/source/storbase.hxx (such as store/source/storpage.cxx
+which includes it through store/source/storpage.hxx) will result in
+errors:
+
+  error: ‘malloc’ is not a member of ‘std’
+
+and
+
+  error: ‘free’ is not a member of ‘std’
+
+This patch simply adds the necessary include.
+
+Change-Id: I3d1fa2a17c5ae9d512f1de9d434dac3d82fc353f
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152712
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann 
+--- a/store/source/storbase.hxx
 b/store/source/storbase.hxx
+@@ -32,6 +32,7 @@
+ 
+ #include 
+ 
++#include 
+ #include 
+ #include 
+ 

diff --git a/app-office/libreoffice/libreoffice-7.6.5.2.ebuild 
b/app-office/libreoffice/libreoffice-7.6.5.2.ebuild
index 938dfe9ad75d..f13092052517 100644
--- a/app-office/libreoffice/libreoffice-7.6.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.6.5.2.ebuild
@@ -296,6 +296,9 @@ PATCHES=(
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
 
+   # upstream
+   "${FILESDIR}/${PN}-7.6.5.2-gcc14.patch"
+
# maybe upstreamable
"${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch"
 )

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2024-01-28 Thread Andreas Sturmlechner 
commit: 39f7beea6f0956479fb82b3d774ca0777cd0aae7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan 28 10:22:57 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan 28 16:28:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39f7beea

app-office/libreoffice: Fix build with KF6

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../libreoffice/files/libreoffice-24.2-kf6-buildfix.patch   | 13 +
 app-office/libreoffice/libreoffice-24.2.0.3.ebuild  |  7 +++
 2 files changed, 20 insertions(+)

diff --git a/app-office/libreoffice/files/libreoffice-24.2-kf6-buildfix.patch 
b/app-office/libreoffice/files/libreoffice-24.2-kf6-buildfix.patch
new file mode 100644
index ..7fefb4a51f7b
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-24.2-kf6-buildfix.patch
@@ -0,0 +1,13 @@
+Source: 
https://raw.githubusercontent.com/OpenMandrivaAssociation/libreoffice/master/libreoffice-24.2-kf6-buildfix.patch
+
+--- a/configure.ac
 b/configure.ac
+@@ -13465,7 +13465,7 @@ then
+ AC_MSG_ERROR([KF6 libraries not found.  Please specify the root of 
your KF6 installation by exporting KF6DIR before running "configure".])
+ fi
+ 
+-KF6_CFLAGS="-I$kf6_incdir -I$kf6_incdir/KCoreAddons -I$kf6_incdir/KI18n 
-I$kf6_incdir/KConfigCore -I$kf6_incdir/KWindowSystem -I$kf6_incdir/KIO 
-I$kf6_incdir/KIOCore -I$kf6_incdir/KIOWidgets -I$kf6_incdir/KIOFileWidgets 
-I$qt6_incdir -I$qt6_incdir/QtCore -I$qt6_incdir/QtGui -I$qt6_incdir/QtWidgets 
-I$qt6_incdir/QtNetwork -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT 
-DQT_NO_VERSION_TAGGING"
++KF6_CFLAGS="-I$kf6_incdir -I$kf6_incdir/KCoreAddons -I$kf6_incdir/KI18n 
-I$kf6_incdir/KConfig -I$kf6_incdir/KConfigCore -I$kf6_incdir/KWindowSystem 
-I$kf6_incdir/KIO -I$kf6_incdir/KIOCore -I$kf6_incdir/KIOWidgets 
-I$kf6_incdir/KIOFileWidgets -I$qt6_incdir -I$qt6_incdir/QtCore 
-I$qt6_incdir/QtGui -I$qt6_incdir/QtWidgets -I$qt6_incdir/QtNetwork 
-DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT -DQT_NO_VERSION_TAGGING"
+ KF6_LIBS="-L$kf6_libdir -lKF6CoreAddons -lKF6I18n -lKF6ConfigCore 
-lKF6WindowSystem -lKF6KIOCore -lKF6KIOWidgets -lKF6KIOFileWidgets 
-L$qt6_libdir -lQt6Core -lQt6Gui -lQt6Widgets -lQt6Network"
+ KF6_CFLAGS=$(printf '%s' "$KF6_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
+ 

diff --git a/app-office/libreoffice/libreoffice-24.2.0.3.ebuild 
b/app-office/libreoffice/libreoffice-24.2.0.3.ebuild
index 27202c7f0efc..4c68aafe99c5 100644
--- a/app-office/libreoffice/libreoffice-24.2.0.3.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.0.3.ebuild
@@ -312,6 +312,13 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-24.2-qtdetect.patch"
+
+   # not yet upstream, sourced from Mandriva
+   "${FILESDIR}/${PN}-24.2-kf6-buildfix.patch"
+
+   # maybe upstreamable
+   "${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch"
+
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2023-11-21 Thread Andreas Sturmlechner 
commit: 843bdb95b1c4ffa74c35a5f5100dd90c224195fb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov 21 20:39:38 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 21 22:19:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=843bdb95

app-office/libreoffice: Update dev-cpp/libcmis min version/slot op

Closes: https://bugs.gentoo.org/915608
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/libreoffice-7.5.8.2-libcmis-0.6.patch| 39 ++
 ...8.2-r1.ebuild => libreoffice-7.5.8.2-r2.ebuild} |  6 +++-
 app-office/libreoffice/libreoffice-.ebuild |  2 +-
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/app-office/libreoffice/files/libreoffice-7.5.8.2-libcmis-0.6.patch 
b/app-office/libreoffice/files/libreoffice-7.5.8.2-libcmis-0.6.patch
new file mode 100644
index ..ae029a3c9a2c
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.5.8.2-libcmis-0.6.patch
@@ -0,0 +1,39 @@
+From e9320e567d6bca32783d0f716f386761d03a875a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= 
+Date: Mon, 13 Nov 2023 10:13:50 +
+Subject: upgrade libcmis
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Change-Id: Ie2d5f3f8208f9952db5be10905b5905cd03b91de
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159366
+Tested-by: Jenkins
+Reviewed-by: Caolán McNamara 
+(cherry picked from commit 3368447e826d4204086e4d8bfe59af4412c16233)
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159454
+Reviewed-by: Michael Stahl 
+(cherry picked from commit 25b159729f1202ca2a42de5e76f22718d68400c8)
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159589
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'configure.ac')
+
+diff --git a/configure.ac b/configure.ac
+index a88c81646c40..bdd08abeeeb5 100644
+--- a/configure.ac
 b/configure.ac
+@@ -7532,7 +7532,7 @@ AC_SUBST(GPERF)
+ dnl ===
+ dnl Check for system libcmis
+ dnl ===
+-libo_CHECK_SYSTEM_MODULE([libcmis],[LIBCMIS],[libcmis-0.5 >= 0.5.2],enabled)
++libo_CHECK_SYSTEM_MODULE([libcmis],[LIBCMIS],[libcmis-0.6 >= 0.6.1],enabled)
+ 
+ dnl ===
+ dnl C++11
+-- 
+cgit v1.2.1
+

diff --git a/app-office/libreoffice/libreoffice-7.5.8.2-r1.ebuild 
b/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild
similarity index 99%
rename from app-office/libreoffice/libreoffice-7.5.8.2-r1.ebuild
rename to app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild
index 71f73d7ece24..855040bd7842 100644
--- a/app-office/libreoffice/libreoffice-7.5.8.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild
@@ -126,7 +126,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=app-text/libwps-0.4
app-text/mythes
>=dev-cpp/clucene-2.3.3.4-r2
-   >=dev-cpp/libcmis-0.5.2-r2
+   >=dev-cpp/libcmis-0.5.2-r2:=
dev-db/unixODBC
dev-lang/perl
dev-libs/boost:=[nls]
@@ -351,6 +351,10 @@ src_unpack() {
 }
 
 src_prepare() {
+   if has_version '>=dev-cpp/libcmis-0.6.1'; then
+   PATCHES+=( "${FILESDIR}/${P}-libcmis-0.6.patch" ) # from 7.5.9.1
+   fi
+
default
 
# sandbox violations on many systems, we don't need it. Bug #646406

diff --git a/app-office/libreoffice/libreoffice-.ebuild 
b/app-office/libreoffice/libreoffice-.ebuild
index a24e522bc074..a706f71b5698 100644
--- a/app-office/libreoffice/libreoffice-.ebuild
+++ b/app-office/libreoffice/libreoffice-.ebuild
@@ -127,7 +127,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=app-text/libwps-0.4
app-text/mythes
>=dev-cpp/clucene-2.3.3.4-r2
-   >=dev-cpp/libcmis-0.5.2-r2
+   >=dev-cpp/libcmis-0.6.2:0=
dev-db/unixODBC
dev-lang/perl
dev-libs/boost:=[nls]

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2023-11-20 Thread Sam James 
commit: 1d633f275b2486e6dbb4a6efaf7442ec8ae9fb0d
Author: Alfred Wingate  protonmail  com>
AuthorDate: Mon Nov 20 12:17:36 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 20 13:32:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d633f27

app-office/libreoffice: fix icu-74 incompatibility

* This is only the bare minimum patch to allow icu-74 to compile.
  Upstream should do a proper sync of the data file(s) as the last sync
  was in 2009 with a few minor changes here and there causing it to
  diverge.

Closes: https://bugs.gentoo.org/917618
Signed-off-by: Alfred Wingate  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33915
Signed-off-by: Sam James  gentoo.org>

 .../libreoffice-7.5.8.2-icu-74-compatibility.patch | 218 +++
 .../libreoffice/libreoffice-7.5.8.2-r1.ebuild  | 664 +
 2 files changed, 882 insertions(+)

diff --git 
a/app-office/libreoffice/files/libreoffice-7.5.8.2-icu-74-compatibility.patch 
b/app-office/libreoffice/files/libreoffice-7.5.8.2-icu-74-compatibility.patch
new file mode 100644
index ..6ac57a4b2c2b
--- /dev/null
+++ 
b/app-office/libreoffice/files/libreoffice-7.5.8.2-icu-74-compatibility.patch
@@ -0,0 +1,218 @@
+https://bugs.gentoo.org/917618
+https://bugs.documentfoundation.org/show_bug.cgi?id=158108
+
+From bcd5d851ebe91fc22edd3ea92be4a674bd13acba Mon Sep 17 00:00:00 2001
+From: Alfred Wingate 
+Date: Mon, 20 Nov 2023 14:47:28 +0200
+Subject: [PATCH] Remove use of the now removed LBCMNoChain options
+
+* This change removes its use and explicitly prevents chaining where
+  the rule would have applied.
+
+https://github.com/unicode-org/icu/commit/84e47620692be90950d090f2f4722494b020ad96
+https://github.com/unicode-org/icu/commit/9d9256f3b792100cda697c7bcf52bacfbc3bca87
+
+Signed-off-by: Alfred Wingate 
+--- a/i18npool/source/breakiterator/data/line.txt
 b/i18npool/source/breakiterator/data/line.txt
+@@ -14,7 +14,6 @@
+ #
+ 
+ !!chain;
+-!!LBCMNoChain;
+ 
+ 
+ !!lookAheadHardBreak;
+@@ -206,13 +205,13 @@ $CR $LF {100};
+ #
+ $LB4NonBreaks?  $LB4Breaks {100};# LB 5  do not break before hard breaks.
+ $CAN_CM $CM*$LB4Breaks {100};
+-$CM+$LB4Breaks {100};
++^$CM+   $LB4Breaks {100};
+ 
+ # LB 7 x SP
+ #  x ZW
+ $LB4NonBreaks [$SP $ZW];
+ $CAN_CM $CM*  [$SP $ZW];
+-$CM+  [$SP $ZW];
++^$CM+ [$SP $ZW];
+ 
+ #
+ # LB 8 Break after zero width space
+@@ -226,14 +225,14 @@ $LB8NonBreaks = [[$LB4NonBreaks] - [$ZW]];
+ #See definition of $CAN_CM.
+ 
+ $CAN_CM $CM+;   #  Stick together any combining sequences 
that don't match other rules.
+-$CM+;
++^$CM+;
+ 
+ #
+ # LB 11  Do not break before or after WORD JOINER & related characters.
+ #
+ $CAN_CM $CM*  $WJcm;
+ $LB8NonBreaks $WJcm;
+-$CM+  $WJcm;
++^$CM+  $WJcm;
+ 
+ $WJcm [^$CAN_CM];
+ $WJcm $CAN_CM $CM*;
+@@ -243,7 +242,7 @@ $WJcm $CAN_CM $CM*;
+ #
+ # (!SP) x GL
+ [$LB8NonBreaks-$SP] $CM* $GLcm;
+-$CM+   $GLcm;
++^$CM+   $GLcm;
+ 
+ # GL  x
+ $GLcm ($LB8Breaks | $SP);
+@@ -260,19 +259,19 @@ $GLcm [$LB8NonBreaks-$SP] $CM*; # Don't let a 
combining mark go onto $CR, $B
+ #
+ $LB8NonBreaks $CL;
+ $CAN_CM $CM*  $CL;
+-$CM+  $CL;  # by rule 10, stand-alone CM behaves as AL
++^$CM+ $CL;  # by rule 10, stand-alone CM behaves as AL
+ 
+ $LB8NonBreaks $EX;
+ $CAN_CM $CM*  $EX;
+-$CM+  $EX;  # by rule 10, stand-alone CM behaves as AL
++^$CM+ $EX;  # by rule 10, stand-alone CM behaves as AL
+ 
+ $LB8NonBreaks $IS;
+ $CAN_CM $CM*  $IS;
+-$CM+  $IS;  # by rule 10, stand-alone CM behaves as AL
++^$CM+ $IS;  # by rule 10, stand-alone CM behaves as AL
+ 
+ $LB8NonBreaks $SY;
+ $CAN_CM $CM*  $SY;
+-$CM+  $SY;  # by rule 10, stand-alone CM behaves as AL
++^$CM+ $SY;  # by rule 10, stand-alone CM behaves as AL
+ 
+ 
+ #
+@@ -302,7 +301,7 @@ $LB18Breaks= [$LB8Breaks $SP];
+ # LB 19
+ # x QU
+ $LB18NonBreaks $CM* $QUcm;
+-$CM+$QUcm;
++^$CM+   $QUcm;
+ 
+ # QU  x
+ $QUcm .?;
+@@ -331,7 +330,7 @@ $HLcm ($HYcm | $BAcm) [^$CB]?;
+ 
+ # LB 22
+ ($ALcm | $HLcm) $INcm;
+-$CM+ $INcm; #  by rule 10, any otherwise unattached CM behaves as AL
++^$CM+$INcm; #  by rule 10, any otherwise unattached CM behaves as AL
+ $IDcm$INcm;
+ $INcm$INcm;
+ $NUcm$INcm;
+@@ -341,7 +340,7 @@ $NUcm$INcm;
+ $IDcm  $POcm;
+ $ALcm  $NUcm;   # includes $LB19
+ $HLcm  $NUcm;
+-$CM+   $NUcm;   # Rule 10, any otherwise unattached CM behaves as AL
++^$CM+  $NUcm;   # Rule 10, any otherwise unattached CM behaves as AL
+ $NUcm  $ALcm;
+ $NUcm  $HLcm;
+ 
+@@ -373,7 +372,7 @@ $PRcm ($JLcm | $JVcm | $JTcm | $H2cm | $H3cm);
+ # LB 28   Do not break between

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2023-11-03 Thread Sam James 
commit: 87f7190edb773b267fe88529b36a442583e09435
Author: Kostadin Shishmanov  tutanota  com>
AuthorDate: Wed Nov  1 15:48:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov  3 23:56:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87f7190e

app-office/libreoffice: fix build with gcc 14 for 7.5.x

Closes: https://bugs.gentoo.org/916621
Signed-off-by: Kostadin Shishmanov  tutanota.com>
Closes: https://github.com/gentoo/gentoo/pull/33623
Signed-off-by: Sam James  gentoo.org>

 .../files/libreoffice-7.5.6.2-gcc-14.patch | 64 ++
 app-office/libreoffice/libreoffice-7.5.6.2.ebuild  |  1 +
 app-office/libreoffice/libreoffice-7.5.7.1.ebuild  |  1 +
 app-office/libreoffice/libreoffice-7.5.8.2.ebuild  |  1 +
 app-office/libreoffice/libreoffice-7.5..ebuild |  1 +
 5 files changed, 68 insertions(+)

diff --git a/app-office/libreoffice/files/libreoffice-7.5.6.2-gcc-14.patch 
b/app-office/libreoffice/files/libreoffice-7.5.6.2-gcc-14.patch
new file mode 100644
index ..1d73ea97d807
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.5.6.2-gcc-14.patch
@@ -0,0 +1,64 @@
+From db98a3f1b1a703ea8e1284b8815eea2274abb2db Mon Sep 17 00:00:00 2001
+From: Martin Jambor 
+Date: Wed, 7 Jun 2023 18:11:45 +0200
+Subject: [PATCH] Add cstdlib include necessary to build with gcc14 libstdc++
+ (tdf#155715)
+
+Without explicitely including , compiling some files
+including store/source/storbase.hxx (such as store/source/storpage.cxx
+which includes it through store/source/storpage.hxx) will result in
+errors:
+
+  error: ‘malloc’ is not a member of ‘std’
+
+and
+
+  error: ‘free’ is not a member of ‘std’
+
+This patch simply adds the necessary include.
+
+Change-Id: I3d1fa2a17c5ae9d512f1de9d434dac3d82fc353f
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152712
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann 
+---
+ store/source/storbase.hxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx
+index feac0db962272..207cbf40a8d3c 100644
+--- a/store/source/storbase.hxx
 b/store/source/storbase.hxx
+@@ -32,6 +32,7 @@
+ 
+ #include 
+ 
++#include 
+ #include 
+ #include 
+
+From 436c879b355f2cde763b0386df92e0d3708180a7 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann 
+Date: Mon, 5 Jun 2023 13:52:01 +0200
+Subject: [PATCH] Missing include (for std::find_if)
+
+Change-Id: I91d70d72ea6cb18ed4fde2f3b3a3d037668767e5
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152615
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann 
+---
+ libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx 
b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
+index a89b8fc7fc72e..7127581856fce 100644
+--- a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
 b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
+@@ -16,6 +16,7 @@
+ 
+ #include 
+ 
++#include 
+ #include 
+ #include 
+ #include 

diff --git a/app-office/libreoffice/libreoffice-7.5.6.2.ebuild 
b/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
index c8c2708fb0b1..218687cea076 100644
--- a/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
@@ -294,6 +294,7 @@ PATCHES=(
 
# git master
"${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch"
+   "${FILESDIR}/${PN}-7.5.6.2-gcc-14.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"

diff --git a/app-office/libreoffice/libreoffice-7.5.7.1.ebuild 
b/app-office/libreoffice/libreoffice-7.5.7.1.ebuild
index 5d22adeb817d..b59666e8479d 100644
--- a/app-office/libreoffice/libreoffice-7.5.7.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.7.1.ebuild
@@ -294,6 +294,7 @@ PATCHES=(
 
# git master
"${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch"
+   "${FILESDIR}/${PN}-7.5.6.2-gcc-14.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"

diff --git a/app-office/libreoffice/libreoffice-7.5.8.2.ebuild 
b/app-office/libreoffice/libreoffice-7.5.8.2.ebuild
index d17697cc93d8..996c240bfb6e 100644
--- a/app-office/libreoffice/libreoffice-7.5.8.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.8.2.ebuild
@@ -294,6 +294,7 @@ PATCHES=(
 
# git master
"${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch"
+   "${FILESDIR}/${PN}-7.5.6.2-gcc-14.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"

diff --git a/app-office/libreoffice/libreoffice-7.5..ebuild 
b/app-office/libreoffice/libreoffice-7.5..ebuild
index d17697cc93d8..996c240bfb6e 100644
--- a/app-office/libreoffice/libreoffice-7.5..ebuild
+++ b/app-office/libreoffice/libreoffice-7.5..ebuild
@@ -294,6 +294,7 @@ PATCHES=(
 
# git master
"${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch"
+   "${FILESDIR}/${PN}-7.5.6.2-gcc-14.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2023-02-01 Thread Andreas Sturmlechner 
commit: ef15cec2485f36b19bc3f71602fb2bcfb3ff8360
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jan 30 23:07:06 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Feb  1 18:22:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef15cec2

app-office/libreoffice: add 7.4.5.1

Bug: https://bugs.gentoo.org/891903
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/libreoffice/Manifest|   2 +
 .../libreoffice-7.4.5.1-fix-webdav-upload.patch| 107 
 app-office/libreoffice/libreoffice-7.4.5.1.ebuild  | 663 +
 3 files changed, 772 insertions(+)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 31c4bb7f5a67..0215a413a5db 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -21,8 +21,10 @@ DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 
7de242393c28fc8289bb598b34e704eb2affaaa
 DIST libreoffice-7.3.5.2-patchset-01.tar.xz 12700 BLAKE2B 
353f6552d31616dfeb32287173bbd70366045ec437c8735e701bff357032f5ef2358920c5d8495142551116999b034db6611a72536edf14fe13ea9cace3a931c
 SHA512 
dbd8b4b494159845efbe9ad76d5822188b9868aff8ef488793f4e2b0f2f0290942322651e8b53dd71db81cba559e3510732801d0c643cb2af9526cb1e1837891
 DIST libreoffice-7.3.7.2.tar.xz 256653492 BLAKE2B 
aa3e096ba46d6e23b0e6439a435a6d75fdc9da309885a28d96dc5a4fc05d854a8e4f633d9f4d623af18f6a80ca036409fb26b9a9843fb9a18144468b58ef5ad4
 SHA512 
f7b6279f5ef9f5ad8290d2bdf4fd54f8df7775a21094ba762dbd9299effab31d4f2c6dff9f4b3d9c5673596931df1d16b195474b547007bfc9a396c47e5e181c
 DIST libreoffice-7.4.4.2.tar.xz 264346748 BLAKE2B 
4498a615df78816e579173be585b61dfd16958f16fc29d3171f09f17e4caa370fc6cbe427c7a79c28f8a23a7ecd036b21488188fb4ef035a8ccb2ef877bb1363
 SHA512 
8205d1980cc282a3f18214cdfa036788a4b288c72e153716b807d5ad0cf8e5ec42c3223b783d75bfe92ea7f6caa7eadcd5ebf88ff899742a3b1733c1e36807de
+DIST libreoffice-7.4.5.1.tar.xz 264347796 BLAKE2B 
89403e25137e74f1c50b720c140a799284bd2277d132b24bfd5bac5e3eb1d8d2adfc7a3417886c4c4d0777c563bbd43346de58bc6a9f2162f5b5a5f57b22dff7
 SHA512 
1a3deebeeb0789c00997b0d88a197fd5708e8518938670271e5a90d754f11cee4e25ad46a3171fb7184de828a6ee9ceb37993832f001b10f8435416a2286e266
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B 
f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883
 SHA512 
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-7.3.7.2.tar.xz 112210852 BLAKE2B 
3a3148d6ff9c743c97c0371290b3264f8e9eb8eb5aba3176b2e88f296abc2856f364866ba6ebb9f6364b5c98255c8593d23e3d54db6bcc27eecde53ac9a1b393
 SHA512 
c223ee49626e36b11a86c077001efc27ca2df9aa10ddb068e04c8ab8a0ea1942ca71b97c2f7379bf856ba7d12a5ca94f2fd8d8058703e2276af3595b75049030
 DIST libreoffice-help-7.4.4.2.tar.xz 112594808 BLAKE2B 
5cb59edeacca40eec1955828b76ae94f000fb386a6ebe7dae71b62f95c7207f47af376923395abcb78e619aed410481343bac12a7390578e6fdc4e8ae0b1daa4
 SHA512 
24132f52a3452c5d90825c1c1ec6f9ac3faa8b7cdd3bbfa36d97221327a6ca2677d2c03c115f2d8990ecc43f7a492c26a8c1a2dd45fe40eab8deab99593ccf50
+DIST libreoffice-help-7.4.5.1.tar.xz 112594972 BLAKE2B 
c38b1f36a764c775f7a6b5f357ef94d925e1d9d0c6c5dbddcd08688b9bbd6c9bb296e96366f4e14c73003e0434a6632dbdc8abd6580f410701e2bd0627226a2a
 SHA512 
a725557ea4890ce0f424c2d985398e67056dde2a369be2d8282f042bd7ec2715f32e1134be020480717b4d469192c61ef0748fcfed067bcda04cd0e9317d87f7
 DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 
BLAKE2B 
d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a
 SHA512 
1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
 DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 
2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3
 SHA512 
fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76

diff --git 
a/app-office/libreoffice/files/libreoffice-7.4.5.1-fix-webdav-upload.patch 
b/app-office/libreoffice/files/libreoffice-7.4.5.1-fix-webdav-upload.patch
new file mode 100644
index ..9b70f62c7d19
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.4.5.1-fix-webdav-upload.patch
@@ -0,0 +1,107 @@
+From 30ca48f4dc0e65a3798e6b21574bc80f6d4953fa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?L=C3=A1szl=C3=B3=20N=C3=A9meth?= 
+Date: Wed, 25 Jan 2023 12:08:14 +0100
+Subject: tdf#152493 ucb WebDAV: fix upload using HTTP 1.0 fallback
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix broken libcurl upload to Vibe 4.0.6 WebDAV server
+using HTTP 1.0 fallback.
+
+Regression

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2023-01-29 Thread Sam James 
commit: 3fae1aff9ce351bf561bb18cd9332b200d76b7d6
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 30 03:52:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 30 03:52:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fae1aff

app-office/libreoffice: fix build w/ gcc 13

Closes: https://bugs.gentoo.org/892523
Signed-off-by: Sam James  gentoo.org>

 .../files/libreoffice-7.4.4.2-gcc-13.patch | 82 ++
 app-office/libreoffice/libreoffice-7.4.4.2.ebuild  |  1 +
 2 files changed, 83 insertions(+)

diff --git a/app-office/libreoffice/files/libreoffice-7.4.4.2-gcc-13.patch 
b/app-office/libreoffice/files/libreoffice-7.4.4.2-gcc-13.patch
new file mode 100644
index ..e27637416db4
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.4.4.2-gcc-13.patch
@@ -0,0 +1,82 @@
+https://bugs.gentoo.org/892523
+https://gerrit.libreoffice.org/c/core/+/141833
+https://gerrit.libreoffice.org/c/core/+/145552
+https://github.com/LibreOffice/core/commit/3e009159cd1801507f6e965444a7dade5497f89a
+https://github.com/LibreOffice/core/commit/5877c6b118c99c9ec807a111471bfd67720a5086
+
+From 3e009159cd1801507f6e965444a7dade5497f89a Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann 
+Date: Wed, 26 Oct 2022 08:06:01 +0200
+Subject: [PATCH] external/skia: Missing include
+
+...at least when building with Visual Studio 2022 Preview 17.4.0,
+
+> In file included from 
workdir/UnpackedTarball/skia/src/core/SkKeyHelpers.cpp:14:
+> workdir/UnpackedTarball/skia\src/core/SkShaderCodeDictionary.h(45,43): 
error: no type named 'string' in namespace 'std'
+> using GenerateGlueCodeForEntry = std::string (*)(const std::string& 
resultName,
+>  ~^
+
+etc.
+
+Change-Id: Idd8dafb4e57e04088ee60954ecfa601cc7588e55
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141833
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann 
+--- a/external/skia/UnpackedTarball_skia.mk
 b/external/skia/UnpackedTarball_skia.mk
+@@ -38,6 +38,7 @@ skia_patches := \
+ allow-no-es2restrictions.patch.1 \
+ vk_mem_alloc.patch.1 \
+ tdf148624.patch.1 \
++missing-include.patch.0 \
+
+ $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
+ 
+--- /dev/null
 b/external/skia/missing-include.patch.0
+@@ -0,0 +1,10 @@
++--- src/core/SkShaderCodeDictionary.h
+ src/core/SkShaderCodeDictionary.h
++@@ -9,6 +9,7 @@
++ #define SkShaderCodeDictionary_DEFINED
++ 
++ #include 
+++#include 
++ #include 
++ #include 
++ #include "include/core/SkSpan.h"
+
+From 5877c6b118c99c9ec807a111471bfd67720a5086 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann 
+Date: Mon, 16 Jan 2023 08:16:00 +0100
+Subject: [PATCH] external/skia: Missing include
+
+> In file included from 
workdir/UnpackedTarball/skia/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.cpp:27:
+> In file included from 
workdir/UnpackedTarball/skia/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.h:35:
+> 
workdir/UnpackedTarball/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h:2817:9:
 error: use of undeclared identifier 'snprintf'
+> snprintf(outStr, strLen, "%u", static_cast(num));
+> ^
+
+etc.
+
+Change-Id: I4f13c8a137f23ef62d67c3b4dfa8f1c0ddfc5ec9
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145552
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann 
+--- a/external/skia/missing-include.patch.0
 b/external/skia/missing-include.patch.0
+@@ -8,3 +8,13 @@
+  #include 
+  #include 
+  #include "include/core/SkSpan.h"
++--- third_party/vulkanmemoryallocator/include/vk_mem_alloc.h
+ third_party/vulkanmemoryallocator/include/vk_mem_alloc.h
++@@ -2570,6 +2570,7 @@
++ #include 
++ #include 
++ #include 
+++#include 
++ 
++ #ifdef _MSC_VER
++ #include  // For functions like __popcnt, _BitScanForward etc.
+

diff --git a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild 
b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
index 9e8e362925ae..c470475c8bda 100644
--- a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
@@ -298,6 +298,7 @@ PATCHES=(
"${FILESDIR}/${PN}-7.3.7.2-boost-1.81-locale.patch"
"${FILESDIR}/${PN}-7.3.7.2-zxing-cpp-1.4.0.patch"
"${FILESDIR}/${PN}-7.4.4.2-zxing-cpp-1.4.0-c++17.patch"
+   "${FILESDIR}/${PN}-7.4.4.2-gcc-13.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2023-01-13 Thread Sam James 
commit: c530f3090fb695e76a9f0376c0597418523d70e4
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 13 19:07:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 13 19:08:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c530f309

app-office/libreoffice: fix build w/ USE=clang & clang <16

Closes: https://bugs.gentoo.org/890324
Signed-off-by: Sam James  gentoo.org>

 ...libreoffice-7.4.4.2-zxing-cpp-1.4.0-c++17.patch | 36 ++
 app-office/libreoffice/libreoffice-7.4.4.2.ebuild  |  1 +
 2 files changed, 37 insertions(+)

diff --git 
a/app-office/libreoffice/files/libreoffice-7.4.4.2-zxing-cpp-1.4.0-c++17.patch 
b/app-office/libreoffice/files/libreoffice-7.4.4.2-zxing-cpp-1.4.0-c++17.patch
new file mode 100644
index ..0c47a14fe308
--- /dev/null
+++ 
b/app-office/libreoffice/files/libreoffice-7.4.4.2-zxing-cpp-1.4.0-c++17.patch
@@ -0,0 +1,36 @@
+https://gerrit.libreoffice.org/c/core/+/145479
+
+From a7a6b436f1a83321ccba5b6b44a275205aa729e0 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Fri, 13 Jan 2023 15:09:59 +
+Subject: [PATCH] configure.ac: Fix build with --with-system-zxing and < Clang
+ 16
+
+Clang 15 and older default to -std=c++14, not -std=c++17 (unlike Clang 16 
onwards).
+
+This doesn't show up with GCC because GCC 11 onwards defaults to -std=c++17.
+
+The new version of libzxing requires C++ 17, per its release notes. Adapt
+the configure check accordingly to pass -std=c++17 when checking for its
+headers and save accordingly if successful.
+
+(Do this via ${CXXFLAGS_CXX11} which has the appropriate switch
+for our compiler, despite its name.)
+
+Bug: https://bugs.gentoo.org/890324
+Change-Id: Iaaa8fdc05eea0e26416b605bfda8f2d831f8729c
+Signed-off-by: Sam James 
+--- a/configure.ac
 b/configure.ac
+@@ -11187,7 +11187,7 @@ else
+ continue
+ fi
+ dnl TODO: White space in $i would cause problems:
+-CXXFLAGS="$save_CXXFLAGS -I$i/ZXing"
++CXXFLAGS="$save_CXXFLAGS ${CXXFLAGS_CXX11} -I$i/ZXing"
+ AC_CHECK_HEADER(MultiFormatWriter.h, [ZXING_CFLAGS=-I$i/ZXing; 
break],
+ [unset ac_cv_header_MultiFormatWriter_h], [#include 
])
+ done
+-- 
+2.39.0
+

diff --git a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild 
b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
index 1c1165c55a5f..7ce3b1b6b9f2 100644
--- a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
@@ -297,6 +297,7 @@ PATCHES=(
# 7.5 branch
"${FILESDIR}/${PN}-7.3.7.2-boost-1.81-locale.patch"
"${FILESDIR}/${PN}-7.3.7.2-zxing-cpp-1.4.0.patch"
+   "${FILESDIR}/${PN}-7.4.4.2-zxing-cpp-1.4.0-c++17.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2023-01-09 Thread Andreas Sturmlechner 
commit: 05c841fbf1f173837c1078ebf9b1ae076317413f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jan  9 21:09:42 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan 10 00:04:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05c841fb

app-office/libreoffice: backport patch for >=zxing-cpp-1.4.0

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../libreoffice-7.3.7.2-zxing-cpp-1.4.0.patch  | 59 ++
 app-office/libreoffice/libreoffice-7.3.7.2.ebuild  |  5 +-
 app-office/libreoffice/libreoffice-7.4.3.2.ebuild  |  7 +--
 app-office/libreoffice/libreoffice-7.4.4.2.ebuild  | 15 +++---
 app-office/libreoffice/libreoffice-7.4..ebuild | 15 +++---
 5 files changed, 82 insertions(+), 19 deletions(-)

diff --git 
a/app-office/libreoffice/files/libreoffice-7.3.7.2-zxing-cpp-1.4.0.patch 
b/app-office/libreoffice/files/libreoffice-7.3.7.2-zxing-cpp-1.4.0.patch
new file mode 100644
index ..52b383a9d3e9
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.3.7.2-zxing-cpp-1.4.0.patch
@@ -0,0 +1,59 @@
+From 15e5d86cc55ad94ac946e04d5e25b84be5810970 Mon Sep 17 00:00:00 2001
+From: "Brett T. Warden" 
+Date: Fri, 30 Dec 2022 08:43:25 +0100
+Subject: Remove dependency on BitArray.h from zxing-1.2.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In zxing-1.4.0, numerous headers are no longer public. Rework the
+ConvertToSVGFormat method so it uses bitmatrix.get instead of
+bitmatrix.getRow, similar to the ToSVG method in zxing itself.
+
+See https://github.com/zxing-cpp/zxing-cpp/issues/361
+
+Change-Id: Ie25eb8f782e8799fbd57c24ef79bba92acf0f9ff
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144874
+Tested-by: René Engelhard 
+Reviewed-by: René Engelhard 
+Tested-by: Jenkins
+Reviewed-by: Caolán McNamara 
+---
+ cui/source/dialogs/QrCodeGenDialog.cxx | 5 +
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx 
b/cui/source/dialogs/QrCodeGenDialog.cxx
+index f8cbac1d758d..817be7f21ede 100644
+--- a/cui/source/dialogs/QrCodeGenDialog.cxx
 b/cui/source/dialogs/QrCodeGenDialog.cxx
+@@ -27,7 +27,6 @@
+ #endif
+ 
+ #include 
+-#include 
+ #include 
+ #include 
+ #include 
+@@ -79,7 +78,6 @@ OString ConvertToSVGFormat(const ZXing::BitMatrix& bitmatrix)
+ OStringBuffer sb;
+ const int width = bitmatrix.width();
+ const int height = bitmatrix.height();
+-ZXing::BitArray row(width);
+ sb.append("\n"
+   "http://www.w3.org/2000/svg\; version=\"1.1\" 
viewBox=\"0 0 "
+   + OString::number(width) + " " + OString::number(height)
+@@ -87,10 +85,9 @@ OString ConvertToSVGFormat(const ZXing::BitMatrix& 
bitmatrix)
+ "

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2022-12-17 Thread David Seifert 
commit: c426e264624fa437662096ad5d142949276532f8
Author: David Seifert  gentoo  org>
AuthorDate: Sat Dec 17 19:53:11 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Dec 17 19:53:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c426e264

app-office/libreoffice: backport patch for boost 1.81

Signed-off-by: David Seifert  gentoo.org>

 .../libreoffice-7.3.7.2-boost-1.81-locale.patch| 41 ++
 app-office/libreoffice/libreoffice-7.3.7.2.ebuild  |  3 ++
 2 files changed, 44 insertions(+)

diff --git 
a/app-office/libreoffice/files/libreoffice-7.3.7.2-boost-1.81-locale.patch 
b/app-office/libreoffice/files/libreoffice-7.3.7.2-boost-1.81-locale.patch
new file mode 100644
index ..18bfd313
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.3.7.2-boost-1.81-locale.patch
@@ -0,0 +1,41 @@
+From 23dcd4339428e4080029ec5ae658e75f01e79a62 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ 
+Date: Sun, 27 Nov 2022 18:59:24 +0700
+Subject: [PATCH] i18n: fix build with Boost 1.81.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Boost.Locale since 1.81.0 switch to enum classes for facet type [1].
+Switch our resource manager accordingly.
+
+1: 
https://github.com/boostorg/locale/commit/e5ed439ea39a4de915e9fb939cca95cae7d9d8d1
+
+Change-Id: Ief215363ceb79b2019606b20a7cde55c8df6a042
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143343
+Reviewed-by: Heiko Becker 
+Tested-by: Caolán McNamara 
+Reviewed-by: Caolán McNamara 
+---
+ unotools/source/i18n/resmgr.cxx | 5 +
+ 1 file changed, 5 insertions(+)
+
+diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx
+index ddedf5b9e8a2f..3a71163500624 100644
+--- a/unotools/source/i18n/resmgr.cxx
 b/unotools/source/i18n/resmgr.cxx
+@@ -127,8 +127,13 @@ namespace Translate
+ if (aFind != aCache.end())
+ return aFind->second;
+ boost::locale::generator gen;
++#if BOOST_VERSION < 108100
+ gen.characters(boost::locale::char_facet);
+ gen.categories(boost::locale::message_facet | 
boost::locale::information_facet);
++#else
++gen.characters(boost::locale::char_facet_t::char_f);
++gen.categories(boost::locale::category_t::message | 
boost::locale::category_t::information);
++#endif
+ #if defined(ANDROID)
+ OString sPath(OString(lo_get_app_data_dir()) + "/program/resource");
+ #else

diff --git a/app-office/libreoffice/libreoffice-7.3.7.2.ebuild 
b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
index dddc49045f08..9f590961fe49 100644
--- a/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
@@ -294,6 +294,9 @@ PATCHES=(
 
# 7.4 branch
"${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch"
+
+   # backport
+   "${FILESDIR}/${P}-boost-1.81-locale.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2022-11-03 Thread Andreas Sturmlechner 
commit: 26ce497268a98584860d7908496b73c85cbb40fa
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Nov  3 08:36:22 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov  3 08:39:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26ce4972

app-office/libreoffice: cleanup vulnerable 7.3.4.2-r1

Bug: https://bugs.gentoo.org/876869
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/libreoffice/Manifest|   3 -
 ...Add-missing-nSize-set-for-Poppler-22.04.0.patch |  31 -
 ...t-FreeBSD-patch-for-Poppler-22.04.0-build.patch |  78 ---
 .../libreoffice/libreoffice-7.3.4.2-r1.ebuild  | 665 -
 4 files changed, 777 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 7790922bd5eb..edd0f48e11aa 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -17,13 +17,10 @@ DIST dtoa-20180411.tgz 48893 BLAKE2B 
4a03dc67e44353ae1c0653c8305d2df9bcfef16b48d
 DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B 
d3ac085a39ee9798182b70ba650fa954234b964e33278ac4fe3f84f8c3218ad49f12d139079328036b4f9d80cde967888c0a66393c34dedf27af69dac02c5aff
 SHA512 
9091d3628d9c75c068507537afc9e10bfb79c1abfd36ad697af3d592a1cc049ba6640f665bfc53cc520b6a26c21d70b0275106843444b441484c2178f2784743
 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 
2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b
 SHA512 
c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
 DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 
7de242393c28fc8289bb598b34e704eb2affaaa8b9e470e10044dbfd3812391f29e1421df8d7ac3869955698ddbc9575feebcfbac27bb074a60ccc0527dca1c3
 SHA512 
295ab15115e75b1f6074f17d3538afe0de9b2b77ab454f5c63cb05e8df11886d82942fbf21ba01486052e3f6c75b0636b99d8e660cd3472dc4b87c31d3cd557b
-DIST libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz 5005888 BLAKE2B 
836ec268c19c27ac079ea1084587c3e999f39ad2188be1a5cf8337ad0473ffda6c32d0695254d3797d1607707329befa88da6043f424544487238e550eda8590
 SHA512 
4159dfb4d08e359feb23127e12db590260913e70774161ac9513abb5183ad6ed6d2bdfbe56fc8aa68e2fc57ee29eae67aa0180e1a7d955016884ecba2ca60ff8
-DIST libreoffice-7.3.4.2.tar.xz 256373724 BLAKE2B 
98a3a450e8b16caafdbe914b542c32e3e251ac6f2fe528e593640397d50b533f146b1cfd262c633bfee9766a5ef659f7ce606453952978c71c08f249da7d7125
 SHA512 
10ea93d380b8c59ec15aefc4c4f6f5cbc76b03cf444e2f172fdb8cdde637e8d3de4aa2b7adbd55ec04ba8ad5db73a1bd80e8b692ca328c416d229526f01bd4a0
 DIST libreoffice-7.3.5.2-patchset-01.tar.xz 12700 BLAKE2B 
353f6552d31616dfeb32287173bbd70366045ec437c8735e701bff357032f5ef2358920c5d8495142551116999b034db6611a72536edf14fe13ea9cace3a931c
 SHA512 
dbd8b4b494159845efbe9ad76d5822188b9868aff8ef488793f4e2b0f2f0290942322651e8b53dd71db81cba559e3510732801d0c643cb2af9526cb1e1837891
 DIST libreoffice-7.3.6.2.tar.xz 256616324 BLAKE2B 
52456e529ae2898101824882f124a5b039a1dfb98fd77dfceef39a41a3af871123c56b83a73d0aaf92e1cea57f35af442ca0a17814a1374538a9495ac601cee0
 SHA512 
8f61e9c09b344cf120bc6f9463344b28644e52738360ddeb1a29d9d2294d24132b070902a089531869e11487f5a7153fc4752e6636af7ef57269d23c8187ec86
 DIST libreoffice-7.3.7.2.tar.xz 256653492 BLAKE2B 
aa3e096ba46d6e23b0e6439a435a6d75fdc9da309885a28d96dc5a4fc05d854a8e4f633d9f4d623af18f6a80ca036409fb26b9a9843fb9a18144468b58ef5ad4
 SHA512 
f7b6279f5ef9f5ad8290d2bdf4fd54f8df7775a21094ba762dbd9299effab31d4f2c6dff9f4b3d9c5673596931df1d16b195474b547007bfc9a396c47e5e181c
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B 
f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883
 SHA512 
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-7.3.4.2.tar.xz 112208564 BLAKE2B 
a47b428d69c62ba38d74ee5eca1dfeba66389ea0c7ef103f97292180d43ddc92a5e6ca4f9377f802318b89fca7aab6278c23171d9480e3961e521c161ec42fd3
 SHA512 
68af32f017b46f7d3e664bc8cfc69de6939c33f26248273372cc7ba5a29299c79795cc13b92a921b8e2508045e0447319ad0c0cd3678929355db6ef8a79a8614
 DIST libreoffice-help-7.3.6.2.tar.xz 112209384 BLAKE2B 
629a9dae6464adb33ed4494df8cbf59305a686b0bab21d55e3c139b87c5e3eee3e77ef1f22be84973d6e51a1ffb74aa74fd7f91b82223b2e3cc6d3bc900e7305
 SHA512 
7a98e8d3b146638bdb608d86b617bb45ff2649957ad9391aadfbb32fb18a4c8d15675bd24076dbb2b635569bfdab988f7cac461cfe04e53b3febfb2aa35d6189
 DIST libreoffice-help-7.3.7.2.tar.xz 112210852 BLAKE2B 
3a3148d6ff9c743c97c0371290b3264f8e9eb8eb5aba3176b2e88f296abc2856f364866ba6ebb9f6364b5c98255c8593d23e3d54db6bcc27eecde53ac9a1b393
 SHA512 
c223ee49626e36b11a86c077001efc27ca2df9aa10ddb068e04c8ab8a0ea1942ca71b97c2f7379bf856ba7d12a5ca94f2fd8d8058703e2276af3595b75049030
 DIST

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2022-08-31 Thread Sam James 
commit: ac8e15beacefb21f215f9f25e282da204e4ef435
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug 31 21:44:10 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 31 21:45:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac8e15be

app-office/libreoffice: use upstream gpgme 1.18.0 patch

At least for 7.3.x.

Closes: https://bugs.gentoo.org/865321
Signed-off-by: Sam James  gentoo.org>

 .../files/libreoffice-7.3.5.2-gpgme-1.18.0.patch   | 48 ++
 app-office/libreoffice/libreoffice-7.3.5.2.ebuild  |  6 +--
 app-office/libreoffice/libreoffice-7.3..ebuild |  6 +--
 app-office/libreoffice/libreoffice-.ebuild |  3 --
 4 files changed, 54 insertions(+), 9 deletions(-)

diff --git 
a/app-office/libreoffice/files/libreoffice-7.3.5.2-gpgme-1.18.0.patch 
b/app-office/libreoffice/files/libreoffice-7.3.5.2-gpgme-1.18.0.patch
new file mode 100644
index ..d8dae52d9b09
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.3.5.2-gpgme-1.18.0.patch
@@ -0,0 +1,48 @@
+https://bugs.gentoo.org/865321
+https://lists.freedesktop.org/archives/libreoffice/2022-August/089261.html
+https://github.com/LibreOffice/core/commit/aa0b2b756c17d43d2e8c828a909ee2815e332377
+
+From: Rene Engelhard 
+Date: Wed, 24 Aug 2022 09:55:33 +0200
+Subject: [PATCH] Make configure work with gpgme >= 1.18
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Sam James wrote:
+> gpgme-1.18.0 dropped a bunch of internal symbols,
+> including progress_callback (see e.g. callbacks.h
+> which has a comment at the top saying it's internal).
+
+Plausibly the workaround to not link against older KDE-specific distro
+packages is not needed anymore.
+
+Check for main as a workaround as we do for other C++ libraries, too.
+
+Change-Id: I57065a5b5b23b9eadb73b01e4f3a289552c3bde4
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138667
+Tested-by: Jenkins
+Reviewed-by: Sam James 
+Reviewed-by: René Engelhard 
+(cherry picked from commit b4a94d681a99a6a3eeb6aaa4d2f4dfab8f7c000b)
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138553
+Tested-by: René Engelhard 
+--- a/configure.ac
 b/configure.ac
+@@ -12537,12 +12537,11 @@ elif test \( \( "$_os" = "Linux" -o "$_os" = 
"Darwin" \) -a "$ENABLE_NSS" = TRUE
+ # C++ library doesn't come with fancy gpgmepp-config, check for 
headers the old-fashioned way
+ AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ 
GPGMEPP_CFLAGS=-I/usr/include/gpgme++ ],
+ [AC_MSG_ERROR([gpgmepp headers not found, install gpgmepp >= 1.14 
development package])], [])
+-# progress_callback is the only func with plain C linkage
+-# checking for it also filters out older, KDE-dependent libgpgmepp 
versions
+-AC_CHECK_LIB(gpgmepp, progress_callback, [ GPGMEPP_LIBS=-lgpgmepp ],
+-[AC_MSG_ERROR(gpgmepp not found or not functional)], [])
+ AC_CHECK_HEADER(gpgme.h, [],
+ [AC_MSG_ERROR([gpgme headers not found, install gpgme development 
package])], [])
++AC_CHECK_LIB(gpgmepp, main, [],
++[AC_MSG_ERROR(gpgmepp not found or not functional)], [])
++  GPGMEPP_LIBS=-lgpgmepp
+ else
+ AC_MSG_RESULT([internal])
+ BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP"
+

diff --git a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild 
b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
index 26b88244df96..d45c3048f25c 100644
--- a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
@@ -293,6 +293,9 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+   # Upstream
+   "${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
@@ -565,9 +568,6 @@ src_configure() {
myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar 
rhino-1.6 rhino.jar) )
fi
 
-   # Workaround to fix build w/ gpgme 1.18.0, bug #865321
-   export ac_cv_lib_gpgmepp_progress_callback=yes
-
is-flagq "-flto*" && myeconfargs+=( --enable-lto )
 
MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \

diff --git a/app-office/libreoffice/libreoffice-7.3..ebuild 
b/app-office/libreoffice/libreoffice-7.3..ebuild
index dd4c5cd297b3..4969bd6b6a3e 100644
--- a/app-office/libreoffice/libreoffice-7.3..ebuild
+++ b/app-office/libreoffice/libreoffice-7.3..ebuild
@@ -293,6 +293,9 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+   # Upstream
+   "${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
@@ -565,9 +568,6 @@ src_configure() {
myeconfargs+=(

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2022-06-14 Thread Andreas Sturmlechner 
commit: 33a87078630deb90837dca70d6f9c5d0fe5c1cae
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jun 14 13:31:29 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jun 14 15:19:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33a87078

app-office/libreoffice: Drop 7.2.6.2-r1

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/libreoffice/Manifest|   3 -
 .../libreoffice-7.2.2.2-makefile-gengal.patch  |  90 ---
 .../libreoffice/libreoffice-7.2.6.2-r1.ebuild  | 665 -
 3 files changed, 758 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index abc191ea3e4b..ddf63b465c03 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -18,13 +18,10 @@ DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 
427800 BLAKE2B d3ac085a3
 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 
2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b
 SHA512 
c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
 DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 
7de242393c28fc8289bb598b34e704eb2affaaa8b9e470e10044dbfd3812391f29e1421df8d7ac3869955698ddbc9575feebcfbac27bb074a60ccc0527dca1c3
 SHA512 
295ab15115e75b1f6074f17d3538afe0de9b2b77ab454f5c63cb05e8df11886d82942fbf21ba01486052e3f6c75b0636b99d8e660cd3472dc4b87c31d3cd557b
 DIST libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz 5005888 BLAKE2B 
836ec268c19c27ac079ea1084587c3e999f39ad2188be1a5cf8337ad0473ffda6c32d0695254d3797d1607707329befa88da6043f424544487238e550eda8590
 SHA512 
4159dfb4d08e359feb23127e12db590260913e70774161ac9513abb5183ad6ed6d2bdfbe56fc8aa68e2fc57ee29eae67aa0180e1a7d955016884ecba2ca60ff8
-DIST libreoffice-7.2.6.2.tar.xz 252995284 BLAKE2B 
b807e666d39b4302b0a33f84f7e8797bc41ec9e1814bfe57f0e06c8bbbf3b8bf89a70a25caa65401f402a593acce04cb1118bd13bbd961d7feeac295511e36e4
 SHA512 
2b1a92d98595d4a40bf699ebf5ee3cbf4daeb765a8d37ae035f459f2a74c2ce27e53747307d9875aaec7d1d5a2693266ea81b7fe1281c33653c9fa4bbd727242
 DIST libreoffice-7.3.3.2.tar.xz 256036064 BLAKE2B 
8a96121448e3cc1f81990c837d36191a6127e3ff78773440a4ecdfb5f178f7ab522298fec1d0dd872afe38b67ec102d4f5ea4b0cde64caf5d6420a7f02f25e1b
 SHA512 
242d5694b6d09c669992ea68223b62fb8e418e886f68c7e5d843272d55ad2de34e5207180b7a541fd97cbe678c2d12d5290ebd8b82d47c88f1607e6736413c96
 DIST libreoffice-7.3.4.2.tar.xz 256373724 BLAKE2B 
98a3a450e8b16caafdbe914b542c32e3e251ac6f2fe528e593640397d50b533f146b1cfd262c633bfee9766a5ef659f7ce606453952978c71c08f249da7d7125
 SHA512 
10ea93d380b8c59ec15aefc4c4f6f5cbc76b03cf444e2f172fdb8cdde637e8d3de4aa2b7adbd55ec04ba8ad5db73a1bd80e8b692ca328c416d229526f01bd4a0
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B 
f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883
 SHA512 
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-7.2.6.2.tar.xz 112079748 BLAKE2B 
f9d96d6d72e70f28f12dcf656cf8fd22bc8e563ec53c840cf7cd668e3de677ee73a3f3099e7c62c6034cd4d23915b9e7a94012340c6a7db7f8822e4c8c6d0887
 SHA512 
05f02eb1afaa90547ca388008e02c4a48c191984e77d4022adf02089f69a3b4792cdc065e160f59fbf2f5554b062ff0d6853b12aa9abb9b180dd7c4c855e4d8b
 DIST libreoffice-help-7.3.3.2.tar.xz 112209704 BLAKE2B 
b0e92b88aeb866d3f611fe89d723287cf037bca1772a861cb8b76ee046ae0d039d67648e121aa253eccbfa132c8d252b947bdcbbc3ee6178b6defd3c876749d0
 SHA512 
f70e747c5b78be20bbe4dd0c20840923d14b4278c00a12a60f5e58e3226abc0c218ac3cce4885cf5a440ace92141bf0428df40a4d1469edb91103167c5e3d46f
 DIST libreoffice-help-7.3.4.2.tar.xz 112208564 BLAKE2B 
a47b428d69c62ba38d74ee5eca1dfeba66389ea0c7ef103f97292180d43ddc92a5e6ca4f9377f802318b89fca7aab6278c23171d9480e3961e521c161ec42fd3
 SHA512 
68af32f017b46f7d3e664bc8cfc69de6939c33f26248273372cc7ba5a29299c79795cc13b92a921b8e2508045e0447319ad0c0cd3678929355db6ef8a79a8614
 DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 
BLAKE2B 
d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a
 SHA512 
1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
-DIST skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz 10630696 BLAKE2B 
a3d42d08a0622de591d177184b6225cf62e3048d02d8f2012b6b02aae186b644c899c4e73b528b3528a4acec6cec07e3576dd6d97b130fedf3b2ec5b2ddf4ed7
 SHA512 
625ed461d85ce5c5c73ffd20bc3f2c9b5fe6ba557693b793b387ffb434d4f0d9056bd9befe6760c55e9e47f09c02373a49b8ac106162a40d940ea351e8c873c0
 DIST

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2022-05-09 Thread Sam James 
commit: e04ddc64562f2226e344ddb8fa4307340efb2b46
Author: Sam James  gentoo  org>
AuthorDate: Mon May  9 19:11:48 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  9 19:12:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e04ddc64

app-office/libreoffice: slight tweak to Poppler 22.04.0 patch

Bug: https://bugs.gentoo.org/843311
Thanks-to: Stephan Hartmann  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 ...3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch | 16 +++-
 ...fice-7.3.3.2.ebuild => libreoffice-7.3.3.2-r1.ebuild} |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git 
a/app-office/libreoffice/files/libreoffice-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch
 
b/app-office/libreoffice/files/libreoffice-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch
index f273d9565051..22de747e01e4 100644
--- 
a/app-office/libreoffice/files/libreoffice-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch
+++ 
b/app-office/libreoffice/files/libreoffice-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch
@@ -2,24 +2,30 @@ https://bugs.gentoo.org/843311
 
 From: Sam James 
 Date: Sun, 8 May 2022 21:22:49 +
-Subject: [PATCH 2/2] Add missing nSize set for Poppler 22.04.0
+Subject: [PATCH] Add missing nSize set for Poppler 22.04.0
 
 Thanks-to: Stephan Hartmann 
 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
 +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -478,6 +478,7 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* 
gfxFont, const GfxState* st
+@@ -478,6 +478,10 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* 
gfxFont, const GfxState* st
  char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(),  );
  #else
  std::optional> pBuf = 
gfxFont->readEmbFontFile( m_pDoc->getXRef() );
-+nSize = pBuf->size();
++if( pBuf )
++{
++nSize = pBuf->size();
++}
  #endif
  if( pBuf )
  {
-@@ -502,6 +503,7 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const
+@@ -502,6 +506,10 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const
  char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(),  );
  #else
  std::optional> pBuf = 
gfxFont->readEmbFontFile( m_pDoc->getXRef() );
-+nSize = pBuf->size();
++if( pBuf )
++{
++nSize = pBuf->size();
++}
  #endif
  if( !pBuf )
  return;

diff --git a/app-office/libreoffice/libreoffice-7.3.3.2.ebuild 
b/app-office/libreoffice/libreoffice-7.3.3.2-r1.ebuild
similarity index 99%
rename from app-office/libreoffice/libreoffice-7.3.3.2.ebuild
rename to app-office/libreoffice/libreoffice-7.3.3.2-r1.ebuild
index f229dff9382b..129fac1b9644 100644
--- a/app-office/libreoffice/libreoffice-7.3.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.3.2-r1.ebuild
@@ -302,7 +302,7 @@ PATCHES=(
# TODO: upstream
"${FILESDIR}/${PN}-7.2.6.2-poppler-22.03.0.patch" # by Archlinux

"${FILESDIR}/${PN}-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch"
 # from FreeBSD
-   
"${FILESDIR}/${PN}-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch" # 
fixup for FreeBSD patch
+   
#"${FILESDIR}/${PN}-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch" # 
fixup for FreeBSD patch
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2022-05-08 Thread Andreas Sturmlechner 
commit: 5b15e94bb46b71f312a89fc3289db0a68c1bdca9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May  8 12:34:45 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May  8 13:23:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b15e94b

app-office/libreoffice: Drop 7.2.5.2-r1

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/libreoffice/Manifest|   2 -
 .../files/libreoffice-7.2.5.2-kf591.patch  |  56 --
 .../libreoffice/libreoffice-7.2.5.2-r1.ebuild  | 665 -
 3 files changed, 723 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 5f0f654063a8..644b9adc3ee6 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -18,11 +18,9 @@ DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 
427800 BLAKE2B d3ac085a3
 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 
2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b
 SHA512 
c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
 DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 
7de242393c28fc8289bb598b34e704eb2affaaa8b9e470e10044dbfd3812391f29e1421df8d7ac3869955698ddbc9575feebcfbac27bb074a60ccc0527dca1c3
 SHA512 
295ab15115e75b1f6074f17d3538afe0de9b2b77ab454f5c63cb05e8df11886d82942fbf21ba01486052e3f6c75b0636b99d8e660cd3472dc4b87c31d3cd557b
 DIST libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz 5005888 BLAKE2B 
836ec268c19c27ac079ea1084587c3e999f39ad2188be1a5cf8337ad0473ffda6c32d0695254d3797d1607707329befa88da6043f424544487238e550eda8590
 SHA512 
4159dfb4d08e359feb23127e12db590260913e70774161ac9513abb5183ad6ed6d2bdfbe56fc8aa68e2fc57ee29eae67aa0180e1a7d955016884ecba2ca60ff8
-DIST libreoffice-7.2.5.2.tar.xz 252977224 BLAKE2B 
c8221824ed4747ad7fd9534c6c3d612fa711f78b382587345c5a5604a263b7697fb03c77c1927343052ebcd0aa8db2d693208599137bc8884eeb1bf408951463
 SHA512 
a84682597e10fabb8c1605b785510fa5fe861f3056f61bd01513e1de6ebdb8a343d254af063cd977e4379348ad28d8a457989b3d42014f1c18d5d85626f6dfe8
 DIST libreoffice-7.2.6.2.tar.xz 252995284 BLAKE2B 
b807e666d39b4302b0a33f84f7e8797bc41ec9e1814bfe57f0e06c8bbbf3b8bf89a70a25caa65401f402a593acce04cb1118bd13bbd961d7feeac295511e36e4
 SHA512 
2b1a92d98595d4a40bf699ebf5ee3cbf4daeb765a8d37ae035f459f2a74c2ce27e53747307d9875aaec7d1d5a2693266ea81b7fe1281c33653c9fa4bbd727242
 DIST libreoffice-7.3.2.2.tar.xz 255657596 BLAKE2B 
ef362c6e53ab8668309f1f9b10a8cbb87e8027aaf56a3d1185494757376b89bdf126fe08ef3e416d0330bb96df4ac046b8c60d535eeef8430c60485313e80b5f
 SHA512 
c9f0deaf812425cfc08649f5a9f88c56a9f9221a6b117f9fece56ed17984fec25446ccad52ff2f22ebdfa1db495289edb22a8b7b1fec7a0e42d4b3cd2e81363b
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B 
f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883
 SHA512 
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-7.2.5.2.tar.xz 112080572 BLAKE2B 
9c07cec6cd6c639335c38af65f3dccf331200422f670fa225e355117062f5ad2a8173c5f59ee63137aa480e8db307b0671e4a7a0ff503ea3a034e126e0464120
 SHA512 
70ffcb1a96637dabd9a658151d2b88a92dd8a89cd396609339ec5470b93fbc2ae589a434b4f09d22fc8ad515369a646dd8040c33e6a91977dd7158f57cd48e00
 DIST libreoffice-help-7.2.6.2.tar.xz 112079748 BLAKE2B 
f9d96d6d72e70f28f12dcf656cf8fd22bc8e563ec53c840cf7cd668e3de677ee73a3f3099e7c62c6034cd4d23915b9e7a94012340c6a7db7f8822e4c8c6d0887
 SHA512 
05f02eb1afaa90547ca388008e02c4a48c191984e77d4022adf02089f69a3b4792cdc065e160f59fbf2f5554b062ff0d6853b12aa9abb9b180dd7c4c855e4d8b
 DIST libreoffice-help-7.3.2.2.tar.xz 112209056 BLAKE2B 
320aa76bdce62b94707cd3b6fafd72ce0322e22f28fbb6059b8e1b5b4ef5e99796aee01592a84bf19527bffc0553b937f2d13451e75f105338beb6c1ac1ca077
 SHA512 
a1f5b1763841b159c623008075ad48ed916c78a856b557553c498590a7c9cd52e23487652c4ab4e4201fc829e7bf4a489ab467e4f412b5538252d893bd74341d
 DIST skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz 10630696 BLAKE2B 
a3d42d08a0622de591d177184b6225cf62e3048d02d8f2012b6b02aae186b644c899c4e73b528b3528a4acec6cec07e3576dd6d97b130fedf3b2ec5b2ddf4ed7
 SHA512 
625ed461d85ce5c5c73ffd20bc3f2c9b5fe6ba557693b793b387ffb434d4f0d9056bd9befe6760c55e9e47f09c02373a49b8ac106162a40d940ea351e8c873c0

diff --git a/app-office/libreoffice/files/libreoffice-7.2.5.2-kf591.patch 
b/app-office/libreoffice/files/libreoffice-7.2.5.2-kf591.patch
deleted file mode 100644
index ac920867e4d5..
--- a/app-office/libreoffice/files/libreoffice-7.2.5.2-kf591.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 5fd5e42bf28a7910321c6b6d76257e7386839fbc Mon Sep 17 00:00:00 2001
-From: Michael Weghorn 
-Date: Wed, 16 Feb

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2022-03-12 Thread Andreas Sturmlechner 
commit: e9d8ae7fb9907b04ad32cd80ad0eec978ac92126
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Mar 12 15:45:31 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Mar 12 15:52:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9d8ae7f

app-office/libreoffice: Fix build with >=app-text/poppler-22.03.0

Patch taken from Arch Linux

Closes: https://bugs.gentoo.org/834538
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../libreoffice-7.2.6.2-poppler-22.03.0.patch  | 33 ++
 app-office/libreoffice/libreoffice-7.2.6.2.ebuild  |  3 ++
 app-office/libreoffice/libreoffice-7.3.1.3.ebuild  |  3 ++
 3 files changed, 39 insertions(+)

diff --git 
a/app-office/libreoffice/files/libreoffice-7.2.6.2-poppler-22.03.0.patch 
b/app-office/libreoffice/files/libreoffice-7.2.6.2-poppler-22.03.0.patch
new file mode 100644
index ..be4a39993ddb
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.2.6.2-poppler-22.03.0.patch
@@ -0,0 +1,33 @@
+From 001ec0e10616a3a55fa7898bb68c983e94b7ce66 Mon Sep 17 00:00:00 2001
+From: foutrelis 
+Date: Wed, 2 Mar 2022 12:58:09 +
+Subject: [PATCH] upgpkg: libreoffice-fresh 7.3.0-7: poppler 22.03.0 rebuild
+
+diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx 
b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+index ad6320139..e5f6d9c68 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
 b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+@@ -138,6 +138,15 @@ int main(int argc, char **argv)
+ _setmode( _fileno( g_binary_out ), _O_BINARY );
+ #endif
+ 
++#if POPPLER_CHECK_VERSION(22, 3, 0)
++PDFDoc aDoc( std::make_unique(pFileName),
++ GooString(pOwnerPasswordStr),
++ GooString(pUserPasswordStr) );
++
++PDFDoc aErrDoc( std::make_unique(pErrFileName),
++ GooString(pOwnerPasswordStr),
++ GooString(pUserPasswordStr) );
++#else
+ PDFDoc aDoc( pFileName,
+  pOwnerPasswordStr,
+  pUserPasswordStr );
+@@ -145,6 +154,7 @@ int main(int argc, char **argv)
+ PDFDoc aErrDoc( pErrFileName,
+  pOwnerPasswordStr,
+  pUserPasswordStr );
++#endif
+ 
+ // Check various permissions for aDoc.
+ PDFDoc  = aDoc.isOk()? aDoc: aErrDoc;

diff --git a/app-office/libreoffice/libreoffice-7.2.6.2.ebuild 
b/app-office/libreoffice/libreoffice-7.2.6.2.ebuild
index e2b8f99a1ca1..e51b271e87c1 100644
--- a/app-office/libreoffice/libreoffice-7.2.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.6.2.ebuild
@@ -294,6 +294,9 @@ PATCHES=(
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
 
+   # TODO upstream
+   "${FILESDIR}/${P}-poppler-22.03.0.patch" # by Archlinux
+
# 7.3 branch
"${FILESDIR}/${PN}-7.2.2.2-makefile-gengal.patch"
 )

diff --git a/app-office/libreoffice/libreoffice-7.3.1.3.ebuild 
b/app-office/libreoffice/libreoffice-7.3.1.3.ebuild
index e4211ec16391..9b774db180ef 100644
--- a/app-office/libreoffice/libreoffice-7.3.1.3.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.1.3.ebuild
@@ -297,6 +297,9 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+   # TODO upstream
+   "${FILESDIR}/${PN}-7.2.6.2-poppler-22.03.0.patch" # by Archlinux
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2022-02-05 Thread Andreas Sturmlechner 
commit: abd3e5b18218581517255512bbeac8402cb55701
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb  5 20:21:06 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb  5 20:40:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abd3e5b1

app-office/libreoffice: Drop 7.1.7.2

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/libreoffice/Manifest|   4 -
 .../files/libreoffice-7.0.3.1-qt5detect.patch  |  23 -
 .../files/libreoffice-7.1.3.2-bashism.patch|  33 -
 app-office/libreoffice/libreoffice-7.1.7.2.ebuild  | 669 -
 4 files changed, 729 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 17f0e970c4b2..e7d46b30b74a 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,7 +7,6 @@ DIST 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip 
5750610 BLAKE2B b9f3ef8
 DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B 
d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590
 SHA512 
ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
 DIST 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip 762419 BLAKE2B 
9cbcda7d7644ede32a19b7bd5e29cae348229b9396a205809db480ed67bf12d243652d4ec3bf817f6d369e594a6d6ac3ebebfd03a80ed94f3106f78421d00077
 SHA512 
12ab17a4db3f7c834b21e59ff6f6f6456630d8626db7fb908867b20204295d4fba8969e79a3694ca66cb24e9f0e5a0fa4b9d2d3f748691b7f93985f9e666ce5f
 DIST 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip 2938721 BLAKE2B 
86cf869561f653e449611ca2f014b340d7d0cba46b7d37a9455cbbc184b6a5c7e0e26ac84909aef08ae8639a402cef3bfc93ec901de018060f16413eaff0f748
 SHA512 
17ba9d2c0376fb7326d53bb1e3796610176a1af426d1b9073b5f7cf06c93d865e585c495e75c52fb8e426d7c453e751356a9ca9a54dc821ddadb6c8160ed5ba6
-DIST QR-Code-generator-1.4.0.tar.gz 146339 BLAKE2B 
b2cb329877426861e0245747ac1e8f1275ca7428b3c6768af60dec5c9bb46e93a3fee81fc77257e151604b5f6748c9f29582e9fccc2a4088747c95fe5f673124
 SHA512 
314a757bfdf9a38bcf07fd7a0103d28a2d1dd7311b8234761304efeef7bfdb740db78ab01e6b67e99a28d523cc2be9c1073b2de9d65e853d191c3dad19af56d0
 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 
51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3
 SHA512 
2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
 DIST ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip 2929311 BLAKE2B 
02f59a60592d92f97f1098b501617d1408cabeab7b5a85b2f20ade584536e71823c392ce86084a944cada86310d48afb475535b47420f9b54eff582ce1d77d85
 SHA512 
58c1aa3965bf3a5f5d0facb67a5e42cec04e3f74e59cd7348ea2a9f6d9cafdce5552677c6b6d9c4cf2b31f52751695f2e53b2cee658e5f2eacb1393534a53c0e
 DIST ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip 743031 BLAKE2B 
85ddb6e24475f32e4fa105add3ace0afa686b739e34958e8a47653668153d1bebcec77dbdeeb83bef566453e624fd7ebb0595f7d429005dac1c9af30f861e708
 SHA512 
654d2408c11349c90ae7d80b0c1997ee831004bc4ee36a706a0d8a84617fd0f82a97c5b45ab2388d60085afaec59a02eada007a8a1e14c3b366cabd36b7607ec
@@ -19,11 +18,8 @@ DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 
427800 BLAKE2B d3ac085a3
 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 
2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b
 SHA512 
c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
 DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 
7de242393c28fc8289bb598b34e704eb2affaaa8b9e470e10044dbfd3812391f29e1421df8d7ac3869955698ddbc9575feebcfbac27bb074a60ccc0527dca1c3
 SHA512 
295ab15115e75b1f6074f17d3538afe0de9b2b77ab454f5c63cb05e8df11886d82942fbf21ba01486052e3f6c75b0636b99d8e660cd3472dc4b87c31d3cd557b
 DIST libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz 5005888 BLAKE2B 
836ec268c19c27ac079ea1084587c3e999f39ad2188be1a5cf8337ad0473ffda6c32d0695254d3797d1607707329befa88da6043f424544487238e550eda8590
 SHA512 
4159dfb4d08e359feb23127e12db590260913e70774161ac9513abb5183ad6ed6d2bdfbe56fc8aa68e2fc57ee29eae67aa0180e1a7d955016884ecba2ca60ff8
-DIST libreoffice-7.1.7.2.tar.xz 244585600 BLAKE2B 
65cb8f5ddbae5aa8fb37a54cc0fab8d541a030f6f94141f4e4355f1dfb24a927ffb713e5213e382152fe444e115f27b41f297ca37e320193c5e0289a01ee5430
 SHA512 
fa55bea912b4efa73cd1ad8bcc611a71146ab42534a348a7c695916d74f1912ad13a2d9ccb4f3f4ee4d604a0747619b75bbcc5e2b14bc306d53b3a1f27525093
 DIST libreoffice-7.2.5.2.tar.xz 252977224 BLAKE2B

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2021-12-03 Thread Andreas Sturmlechner 
commit: 74932bc474b8638533493c27a95ac293b0cc3fb1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Dec  3 11:07:18 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Dec  3 11:07:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74932bc4

app-office/libreoffice: Drop 7.1.5.2

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/libreoffice/Manifest|   2 -
 .../files/libreoffice-7.1.5.2-bison-3.8.patch  |  53 --
 app-office/libreoffice/libreoffice-7.1.5.2.ebuild  | 665 -
 3 files changed, 720 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 7b592716c7af..48c19050357c 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,11 +19,9 @@ DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 
427800 BLAKE2B d3ac085a3
 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 
2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b
 SHA512 
c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
 DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 
7de242393c28fc8289bb598b34e704eb2affaaa8b9e470e10044dbfd3812391f29e1421df8d7ac3869955698ddbc9575feebcfbac27bb074a60ccc0527dca1c3
 SHA512 
295ab15115e75b1f6074f17d3538afe0de9b2b77ab454f5c63cb05e8df11886d82942fbf21ba01486052e3f6c75b0636b99d8e660cd3472dc4b87c31d3cd557b
 DIST libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz 5005888 BLAKE2B 
836ec268c19c27ac079ea1084587c3e999f39ad2188be1a5cf8337ad0473ffda6c32d0695254d3797d1607707329befa88da6043f424544487238e550eda8590
 SHA512 
4159dfb4d08e359feb23127e12db590260913e70774161ac9513abb5183ad6ed6d2bdfbe56fc8aa68e2fc57ee29eae67aa0180e1a7d955016884ecba2ca60ff8
-DIST libreoffice-7.1.5.2.tar.xz 244350068 BLAKE2B 
ac3c7f5cabcb27ce3ed31febb04ce54b93bc8b4fa716259d1b93d5364e75b85af3352ad70a023b56271e769f5537b3f3151e837ee13498e08f1871e5b47d778c
 SHA512 
dad5ffd344a7bad88ed8e77df4fb17b42237715e7b1feb7a7de164f2fbf6698feefedeb57974d8275067a06c0da60e9b07a333ccc1bb2f6d55a6b52408bd9b5f
 DIST libreoffice-7.1.7.2.tar.xz 244585600 BLAKE2B 
65cb8f5ddbae5aa8fb37a54cc0fab8d541a030f6f94141f4e4355f1dfb24a927ffb713e5213e382152fe444e115f27b41f297ca37e320193c5e0289a01ee5430
 SHA512 
fa55bea912b4efa73cd1ad8bcc611a71146ab42534a348a7c695916d74f1912ad13a2d9ccb4f3f4ee4d604a0747619b75bbcc5e2b14bc306d53b3a1f27525093
 DIST libreoffice-7.2.3.2.tar.xz 252752188 BLAKE2B 
aa3118e1b719078e1a0963edf9829bcbc8b6e8ea6752ca69b407a95307c8cd2f8b068eb707fbc176bd5bb4c5c9382a990863a44fd676a60b09204782993fe544
 SHA512 
b59e679025115cf176faf8a153833ed5ebac374372ba46bef46da22657dda399b88b3d503bfaf9964184d2dde4b19d3852d53c27cf6ceb0dd4967077b45eb5f6
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B 
f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883
 SHA512 
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-7.1.5.2.tar.xz 111785852 BLAKE2B 
18962fe9260f6cf8ec7b1676f077b9f43e0277769b31b8e2c22cf83ac2963f3e92448901bc12f56dfb579da8a8a1ce20d6bd34c4bc3449f7e0972c03d22f63be
 SHA512 
c669b6c4bfc3c6f46e4ee0bf86b158054f7178b9785273d9aba8183236b2ff6dbaf5584d5e4fb09bba3a8d010373599e7473a4ba15c229087c689198c1c7
 DIST libreoffice-help-7.1.7.2.tar.xz 111785664 BLAKE2B 
947860ebbcdf8bd0ee96ebad688057d776d049ccad066951bf0361bcc1f9a1f8187eed266061ad161f479a3691263dc4f179f4b81aa666fdc1a4a380d28425a4
 SHA512 
20c464ff9cea68b37f6988faea84e9d72ba174706e75d91bbcac514011c65ab55d4f3a9f21fbb8f04f02908237b16d7a6983624c5ab8f27ee4f83aa7eb621268
 DIST libreoffice-help-7.2.3.2.tar.xz 111989408 BLAKE2B 
862af98e7fddcf8ed30c16e111aba1e13c7e143398c55cb07c0612648e0fd8b73cdd1a1303efce6050fda49737eca6c645aae9e75fd4f3add6928326624c5db1
 SHA512 
64ab9d676cc86116ec8aac1157aee33551932f2047f1c47cde865e50e39438f497b7b08073c3f058fae4870325950bad1a5063a55b8897ecb09c046c98bf7264
 DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 
83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643
 SHA512 
8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d

diff --git a/app-office/libreoffice/files/libreoffice-7.1.5.2-bison-3.8.patch 
b/app-office/libreoffice/files/libreoffice-7.1.5.2-bison-3.8.patch
deleted file mode 100644
index b60b99a6c6c8..
--- a/app-office/libreoffice/files/libreoffice-7.1.5.2-bison-3.8.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 45227d9b79dc4f2a2aa6874cd4e3c02b7934b197 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann 
-Date:

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2021-11-05 Thread Sam James 
commit: 5d66acedc71220d7d5728aaa17dcebab14b4d2b8
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov  5 05:38:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov  5 05:38:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d66aced

app-office/libreoffice: add upstream Makefile patch to 7.2.2.2

Closes: https://bugs.gentoo.org/821265
Signed-off-by: Sam James  gentoo.org>

 .../libreoffice-7.2.2.2-makefile-gengal.patch  | 90 ++
 app-office/libreoffice/libreoffice-7.2.2.2.ebuild  |  3 +
 2 files changed, 93 insertions(+)

diff --git 
a/app-office/libreoffice/files/libreoffice-7.2.2.2-makefile-gengal.patch 
b/app-office/libreoffice/files/libreoffice-7.2.2.2-makefile-gengal.patch
new file mode 100644
index 000..5fd0179ccb0
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.2.2.2-makefile-gengal.patch
@@ -0,0 +1,90 @@
+https://github.com/LibreOffice/core/commit/0e7d4d99beda181f4e22725e4b8295d25489696f
+https://bugs.gentoo.org/821265
+
+From 0e7d4d99beda181f4e22725e4b8295d25489696f Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann 
+Date: Sun, 22 Aug 2021 11:26:38 +0200
+Subject: [PATCH] gengal needs Library_localedata_en now
+
+Whatever caused that requirement, but a from-scratch build of e.g.
+Gallery_backgrounds failed for me (with a follow-on SIGABRT after
+"framework/source/services/desktop.cxx:176: Desktop::~Desktop(): Who forgot to
+dispose this service?") because it failed to load
+instdir/program/../program/liblocaledata_en.so at
+
+> #1  0x7fffda0b9671 in 
i18npool::LocaleDataImpl::getFunctionSymbol(com::sun::star::lang::Locale 
const&, char const*) (this=0x159b630, rLocale=..., pFunction=0x7fffda136ed8 
"getAllFormats0") at i18npool/source/localedata/localedata.cxx:1460
+> #2  0x7fffda0b6a93 in 
i18npool::LocaleDataImpl::FormatSection::getFunc(i18npool::LocaleDataImpl&, 
com::sun::star::lang::Locale const&, char const*) (this=0x7fffc840, 
rLocaleData=..., rL=..., pName=0x7fffda136ed8 "getAllFormats0") at 
i18npool/source/localedata/localedata.cxx:857
+> #3  0x7fffda0b6b5c in 
i18npool::LocaleDataImpl::getAllFormats(com::sun::star::lang::Locale const&) 
(this=0x159b630, rLocale=...) at i18npool/source/localedata/localedata.cxx:865
+> #4  0x7fffda0d4815 in 
NumberFormatCodeMapper::getFormats(com::sun::star::lang::Locale const&) 
(this=0x1594fa0, rLocale=...) at 
i18npool/source/numberformatcode/numberformatcode.cxx:150
+> #5  0x7fffda0d4155 in NumberFormatCodeMapper::getAllFormatCode(short, 
com::sun::star::lang::Locale const&) (this=0x1594fa0, formatUsage=8, 
rLocale=...) at i18npool/source/numberformatcode/numberformatcode.cxx:92
+> #6  0x7572a824 in LocaleDataWrapper::loadCurrencyFormats() 
(this=0x159b3f0) at unotools/source/i18n/localedatawrapper.cxx:544
+> #7  0x7572777e in LocaleDataWrapper::loadData() (this=0x159b3f0) at 
unotools/source/i18n/localedatawrapper.cxx:131
+> #8  0x757271b4 in LocaleDataWrapper::LocaleDataWrapper(LanguageTag 
const&, std::__debug::vector > 
const&) (this=0x159b3f0, rLanguageTag=..., 
rOverrideDateAcceptancePatterns=std::__debug::vector of length 0, capacity 0) 
at unotools/source/i18n/localedatawrapper.cxx:80
+> #9  0x75766fd6 in SvtSysLocale_Impl::SvtSysLocale_Impl() 
(this=0x158a4e0) at unotools/source/misc/syslocale.cxx:67
+> #10 0x75768ad7 in 
std::construct_at(SvtSysLocale_Impl*) (__location=0x158a4e0) 
at ~/gcc/trunk/inst/include/c++/12.0.0/bits/stl_construct.h:97
+> #11 0x75768b1c in 
std::allocator_traits 
>::construct(std::allocator&, 
SvtSysLocale_Impl*) (__a=..., __p=0x158a4e0) at 
~/gcc/trunk/inst/include/c++/12.0.0/bits/alloc_traits.h:514
+> #12 0x757688c2 in std::_Sp_counted_ptr_inplace, 
(__gnu_cxx::_Lock_policy)2>::_Sp_counted_ptr_inplace<>(std::allocator)
 (this=0x158a4d0, __a=...) at 
~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr_base.h:519
+> #13 0x7576860a in 
std::__shared_count<(__gnu_cxx::_Lock_policy)2>::__shared_count>(SvtSysLocale_Impl*&, 
std::_Sp_alloc_shared_tag >) 
(this=0x7fffd0a8, __p=@0x7fffd0a0: 0x0, __a=...) at 
~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr_base.h:650
+> #14 0x757684c6 in std::__shared_ptr::__shared_ptr>(std::_Sp_alloc_shared_tag
 >) (this=0x7fffd0a0, __tag=...) at 
~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr_base.h:1342
+> #15 0x7576838d in 
std::shared_ptr::shared_ptr>(std::_Sp_alloc_shared_tag
 >) (this=0x7fffd0a0, __tag=...) at 
~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr.h:409
+> #16 0x75768164 in std::allocate_shared>(std::allocator const&) 
(__a=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr.h:863
+> #17 0x75767dfc in std::make_shared() () at 
~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr.h:879
+> #18 0x75767583 in SvtSysLocale::SvtSysLocale() (this=0x7fffd120) 
at unotools/source/misc/syslocale.cxx:122
+> #19

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2021-09-07 Thread Andreas Sturmlechner 
commit: 8a77107795dec3091f09a1a064fed25eac68ebb6
Author: Nils Freydank  posteo  de>
AuthorDate: Tue Sep  7 07:21:37 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Sep  7 18:28:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a771077

app-office/libreoffice: Update live ebuild

Upstream uses media-libs/zxing-cpp now instead of qrcodegen.

This bump reflects this change plus some other bumps like skia and some
housekeeping. Thanks alot for the hints via bug reports by a fellow
user!

Thanks-To: jospezial
Closes: https://bugs.gentoo.org/792093
Closes: https://bugs.gentoo.org/792096
Closes: https://bugs.gentoo.org/792099
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Nils Freydank  posteo.de>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/libreoffice/Manifest |  1 +
 .../libreoffice/files/libreoffice-7.2.0.4-qt5detect.patch   | 13 +
 app-office/libreoffice/libreoffice-.ebuild  | 11 ---
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 20d2cb48790..639c9655e71 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -23,3 +23,4 @@ DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B 
f03c7ddeb53c5ca3fd234
 DIST libreoffice-help-7.1.3.2.tar.xz 111785416 BLAKE2B 
12d97764976ae0e4736638e9b758c5920d38d608e66fc3343d74178a935632396e1e07fbb98b6f380fd103c3f5e2edf917726a760420f6dfd3d2e42aaa215096
 SHA512 
576dbea391777a907275b630ed704dd3d9ad0627f8a18da1cbd23fe28df04c3a509583c2404f810df3aaac15ef0881e2c1e0a55c9f31618715586628873367eb
 DIST libreoffice-help-7.1.5.2.tar.xz 111785852 BLAKE2B 
18962fe9260f6cf8ec7b1676f077b9f43e0277769b31b8e2c22cf83ac2963f3e92448901bc12f56dfb579da8a8a1ce20d6bd34c4bc3449f7e0972c03d22f63be
 SHA512 
c669b6c4bfc3c6f46e4ee0bf86b158054f7178b9785273d9aba8183236b2ff6dbaf5584d5e4fb09bba3a8d010373599e7473a4ba15c229087c689198c1c7
 DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 
83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643
 SHA512 
8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d
+DIST skia-m94-975fcdd755dfc5d57cddbb25857e0c4ac29abe98.tar.xz 11672176 BLAKE2B 
64d7821656002d23be839079dedffe1132497992aaef97ec734d6e430f2eda69f5344ca7fe75dd68fee847fa4c6638b4fc28194a951b91498ece5c6d4bcf3e44
 SHA512 
ae66fa7caeb5a328d96cd1c35eb8700080be5d3e3764e35b8056b03948e44b8bb8266284c87b44f9200accb95dbb8a2771a6e5ba067d34a7fbd33b1ababf19f8

diff --git a/app-office/libreoffice/files/libreoffice-7.2.0.4-qt5detect.patch 
b/app-office/libreoffice/files/libreoffice-7.2.0.4-qt5detect.patch
new file mode 100644
index 000..c905fabf5b3
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.2.0.4-qt5detect.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 971d7ad440c5..adb01509ab29 100644
+--- a/configure.ac
 b/configure.ac
+@@ -12683,7 +12683,7 @@ then
+ 
+ dnl Check for Meta Object Compiler
+ 
+-AC_PATH_PROGS( MOC5, [moc-qt5 moc], no, [`dirname 
$qt5_libdir`/bin:$QT5DIR/bin:$PATH])
++AC_PATH_PROGS( MOC5, [moc-qt5 moc], no, [$QT5DIR/bin])
+ if test "$MOC5" = "no"; then
+ AC_MSG_ERROR([Qt Meta Object Compiler not found.  Please specify
+ the root of your Qt installation by exporting QT5DIR before running 
"configure".])

diff --git a/app-office/libreoffice/libreoffice-.ebuild 
b/app-office/libreoffice/libreoffice-.ebuild
index 45f856b59db..6ca28c7797e 100644
--- a/app-office/libreoffice/libreoffice-.ebuild
+++ b/app-office/libreoffice/libreoffice-.ebuild
@@ -47,9 +47,7 @@ ADDONS_SRC=(
# not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
"${ADDONS_URI}/dtoa-20180411.tgz"
# not packaged in Gentoo, https://skia.org/
-   "${ADDONS_URI}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"
-   # QR code generating library for >=libreoffice-6.4, bug #691740
-   "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
+   "${ADDONS_URI}/skia-m94-975fcdd755dfc5d57cddbb25857e0c4ac29abe98.tar.xz"
"base? (
${ADDONS_URI}/commons-logging-1.2-src.tar.gz

${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
@@ -136,7 +134,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=dev-cpp/clucene-2.3.3.4-r2
>=dev-cpp/libcmis-0.5.2
dev-db/unixODBC
-   >=games-engines/box2d-2.4.1:0
dev-lang/perl
>=dev-libs/boost-1.72.0:=[nls]
dev-libs/expat
@@ -152,6 +149,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/nss
>=dev-libs/redland-1.0.16
>=dev-libs/xmlsec-1.2.28[nss]
+   >=games-engines/box2d-2.4.1:0
media-gfx/fontforge
media-gfx/graphite2

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2021-06-10 Thread Andreas Sturmlechner 
commit: 122be295ceba838f40bc0867ed98cbcf9f3a784f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun  6 16:56:51 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun 10 15:32:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=122be295

app-office/libreoffice: Drop 6.4.7.2

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/libreoffice/Manifest|   2 -
 .../files/libreoffice-6.4.3.2-boost-1.73.patch | 118 
 .../files/libreoffice-6.4.6.2-llvm-10.patch| 102 
 7.2-fix-wrong-setting-for-doc-properties.patch |  75 ---
 .../files/libreoffice-6.4.7.2-icu-68-1.patch   |  46 --
 .../files/libreoffice-6.4.7.2-icu-68-2.patch   |  28 -
 app-office/libreoffice/libreoffice-6.4.7.2.ebuild  | 591 -
 7 files changed, 962 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index bec12030bc3..14a9b2ca921 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -17,9 +17,7 @@ DIST db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip 
1396007 BLAKE2B 8012d
 DIST dtoa-20180411.tgz 48893 BLAKE2B 
4a03dc67e44353ae1c0653c8305d2df9bcfef16b48dff6df5c857a6bd0510a92aa6d9b9660ad63b2344d5195fef072e526f8d7900791b15442923b63196dda3f
 SHA512 
722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
 DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B 
d3ac085a39ee9798182b70ba650fa954234b964e33278ac4fe3f84f8c3218ad49f12d139079328036b4f9d80cde967888c0a66393c34dedf27af69dac02c5aff
 SHA512 
9091d3628d9c75c068507537afc9e10bfb79c1abfd36ad697af3d592a1cc049ba6640f665bfc53cc520b6a26c21d70b0275106843444b441484c2178f2784743
 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 
2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b
 SHA512 
c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
-DIST libreoffice-6.4.7.2.tar.xz 232364676 BLAKE2B 
1df8f2a3aa00bd057dd1d6d9665a541330ceeabb2bb5d46351449cf9b916a5649f38dc0e0175cf3733123f9247157f5fd0f2c34c8dad1d676da6c31d8346927b
 SHA512 
ba6ff5948624d7a76025406c38728d643be656091d79320a1c5ddba1411662951a0b02de7a9e796e76d8185b6e9113882406bb0c1452b4c988ac3095afa8
 DIST libreoffice-7.1.3.2.tar.xz 244104432 BLAKE2B 
f73bd448f94bc88a1dc775d032ce849ee1dd610c4077c709ffbe40d8c99527c7775cfe2309a636093182ac988ecf44a4b61df0e0a83b332fcc77a05edb602791
 SHA512 
d7329475cad5bece9358b29bc590da1841c3c0b4aef511508d9398519c514fa176c90675857f1830925818f2dcc8b9c0986e5d34d3a33cce617e4ada23c60a72
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B 
f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883
 SHA512 
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-6.4.7.2.tar.xz 88296892 BLAKE2B 
9ee12ec6aa6d5539408e0206e313901540533e28686585fa0bb4edbeaa482bb0ad1cd4ae37ac18dab66bb3e2ea32d52d9960236cbf3e0f8fb5ca07c007f38794
 SHA512 
a5381a8cca9988998dc01d3815869e47193c1da814b714cbedb51a2099f7dc5444315c657e32defab2eb0b9a9e2a922bc4c5fbc36b7a2b60e7c551887a9cdbb3
 DIST libreoffice-help-7.1.3.2.tar.xz 111785416 BLAKE2B 
12d97764976ae0e4736638e9b758c5920d38d608e66fc3343d74178a935632396e1e07fbb98b6f380fd103c3f5e2edf917726a760420f6dfd3d2e42aaa215096
 SHA512 
576dbea391777a907275b630ed704dd3d9ad0627f8a18da1cbd23fe28df04c3a509583c2404f810df3aaac15ef0881e2c1e0a55c9f31618715586628873367eb
 DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 
83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643
 SHA512 
8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d

diff --git a/app-office/libreoffice/files/libreoffice-6.4.3.2-boost-1.73.patch 
b/app-office/libreoffice/files/libreoffice-6.4.3.2-boost-1.73.patch
deleted file mode 100644
index 0eb40699922..000
--- a/app-office/libreoffice/files/libreoffice-6.4.3.2-boost-1.73.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 55c724b93dfd4c9a1afb10d60fbc2d7a9a66cf61 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= 
-Date: Wed, 29 Jan 2020 12:44:52 +
-Subject: replace boost::bimap in sdext pdfimport
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-the error message with boost 1.69 and gcc 10 is so ungodly its easier to throw
-bimap out and use something simpler
-
-Change-Id: Ie324a0b81931bbd427483878a87beeca455ada18
-Reviewed-on:

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2021-01-24 Thread Andreas Sturmlechner 
commit: 5d807dbc22e70f8bcce8fd99637b0464686d26fd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan 24 12:56:37 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan 24 12:59:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d807dbc

app-office/libreoffice: Fix build with GCC-11

Reported-by: Geoff Leach  cs.rmit.edu.au>
Closes: https://bugs.gentoo.org/766656
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/libreoffice-7.0.4.2-gcc11.patch  | 31 ++
 app-office/libreoffice/libreoffice-7.0.4.2.ebuild  |  3 +++
 2 files changed, 34 insertions(+)

diff --git a/app-office/libreoffice/files/libreoffice-7.0.4.2-gcc11.patch 
b/app-office/libreoffice/files/libreoffice-7.0.4.2-gcc11.patch
new file mode 100644
index 000..748a6c21d74
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.0.4.2-gcc11.patch
@@ -0,0 +1,31 @@
+From 8830cf86b146b1252ac37f351a23246088d569b0 Mon Sep 17 00:00:00 2001
+From: Jeff Law 
+Date: Tue, 3 Nov 2020 08:05:03 -0700
+Subject: include cstddef for gcc11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Change-Id: I2f845ce9bb660ad6c1eea80ea81dd71add2c0db1
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107191
+Tested-by: Jenkins
+Reviewed-by: Caolán McNamara 
+---
+ include/o3tl/lru_map.hxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/o3tl/lru_map.hxx b/include/o3tl/lru_map.hxx
+index c7132fd079c4..96fb3161782d 100644
+--- a/include/o3tl/lru_map.hxx
 b/include/o3tl/lru_map.hxx
+@@ -14,6 +14,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ namespace o3tl
+ {
+-- 
+cgit v1.2.1
+

diff --git a/app-office/libreoffice/libreoffice-7.0.4.2.ebuild 
b/app-office/libreoffice/libreoffice-7.0.4.2.ebuild
index 1a4ef40f551..ee160145711 100644
--- a/app-office/libreoffice/libreoffice-7.0.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.4.2.ebuild
@@ -292,6 +292,9 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
+
+   # 7.0 branch
+   "${FILESDIR}/${PN}-7.0.4.2-gcc11.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2020-12-12 Thread Andreas Sturmlechner 
commit: d529e048b4b2fa8207198b01a24c22fd8779af73
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Dec 12 21:42:14 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec 12 21:59:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d529e048

app-office/libreoffice: Drop 6.4.6.2-r2

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/libreoffice/Manifest|   2 -
 ...breoffice-6.4.6.2-qaccessiblecache-assert.patch | 102 
 .../libreoffice/libreoffice-6.4.6.2-r2.ebuild  | 593 -
 3 files changed, 697 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 63ba9802281..f48faeca9bd 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -17,11 +17,9 @@ DIST db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip 
1396007 BLAKE2B 8012d
 DIST dtoa-20180411.tgz 48893 BLAKE2B 
4a03dc67e44353ae1c0653c8305d2df9bcfef16b48dff6df5c857a6bd0510a92aa6d9b9660ad63b2344d5195fef072e526f8d7900791b15442923b63196dda3f
 SHA512 
722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
 DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B 
d3ac085a39ee9798182b70ba650fa954234b964e33278ac4fe3f84f8c3218ad49f12d139079328036b4f9d80cde967888c0a66393c34dedf27af69dac02c5aff
 SHA512 
9091d3628d9c75c068507537afc9e10bfb79c1abfd36ad697af3d592a1cc049ba6640f665bfc53cc520b6a26c21d70b0275106843444b441484c2178f2784743
 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 
2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b
 SHA512 
c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
-DIST libreoffice-6.4.6.2.tar.xz 232180876 BLAKE2B 
b2e01cc8e56b36c16fc3e39ff88617d7c31d6b0a0f4a5c05c8536313e7129862fb962e1a6efc7e86e9b56c34dff7c2d895416f33fbb23dc45e447b25813b5654
 SHA512 
377675494d4422c4d9363fe3857a8587e38f6ccd39aebec9c23337aa3a88cb2526608b8d0bcb27985ed8f821a98ca541dad4b48d69db441bcb27e9fb81beb9ba
 DIST libreoffice-6.4.7.2.tar.xz 232364676 BLAKE2B 
1df8f2a3aa00bd057dd1d6d9665a541330ceeabb2bb5d46351449cf9b916a5649f38dc0e0175cf3733123f9247157f5fd0f2c34c8dad1d676da6c31d8346927b
 SHA512 
ba6ff5948624d7a76025406c38728d643be656091d79320a1c5ddba1411662951a0b02de7a9e796e76d8185b6e9113882406bb0c1452b4c988ac3095afa8
 DIST libreoffice-7.0.3.1.tar.xz 240706432 BLAKE2B 
4bf075fedb445a60a971adfb029fb7843afab1ee2009d32b149c91970d8eae990e4ac3ea7075d58815288f1f174846e0e9de7ce00655840ad97622a3790b43a2
 SHA512 
1680b5166ead7ca521130f7d23cb2bd73d3d4f801f94c9a3ab0066fb7763ced3c01d89fbe1b7a79a1826bcfd6ebcd3ce5fb3014ab6583034f08ed25969ab5f36
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B 
f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883
 SHA512 
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-6.4.6.2.tar.xz 88297908 BLAKE2B 
919758e81ed46138331b49668f89c6bf7f50253d7632d113aa957f524ae26e2b99f2ba490b405830314822ea91185eb2308018df77c5bd3d7197cbba940ae2ba
 SHA512 
8ada2568a40dc4f1c843cb37dde6abe3bd61b6e5d9910b985096821e1fce5af47d4a10bff8ae91913298e593130bc1f8668b4e1c59c46591d457157e3d4b7501
 DIST libreoffice-help-6.4.7.2.tar.xz 88296892 BLAKE2B 
9ee12ec6aa6d5539408e0206e313901540533e28686585fa0bb4edbeaa482bb0ad1cd4ae37ac18dab66bb3e2ea32d52d9960236cbf3e0f8fb5ca07c007f38794
 SHA512 
a5381a8cca9988998dc01d3815869e47193c1da814b714cbedb51a2099f7dc5444315c657e32defab2eb0b9a9e2a922bc4c5fbc36b7a2b60e7c551887a9cdbb3
 DIST libreoffice-help-7.0.3.1.tar.xz 110855688 BLAKE2B 
3b0e845087fe0bd25ad3c06b8a8eac548f05568cf279efc10f7190ee51e8a9922c64749ad57c21b150aaac9b3249a6e184583f389a191fc6b86128153ff363be
 SHA512 
1acbc7575da99ce0a09a3092a8612f47c432ffd8d4b6029c885c782a857c6b0812bb2eee3873b0cdfa41ee42f84a0843c3d06109ccb651b5bba5ade1a6725a78
 DIST skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz 8375536 BLAKE2B 
8e3849123ce426a4dc43705537b176df82c6039a23911d75b7b3b26ca44f4a600c96c67c5f4d935a8d6a5064362f7f2167231b2aafbc44533c07299a8980aafe
 SHA512 
4aeba56400d20e5fe234c7927b3d196233e19513a3202e074a88fad0d14d168221574a5a72b8dd9398cf3a9453c46eba4e4ed23d8d2031522b6cb11bc8bb43c1

diff --git 
a/app-office/libreoffice/files/libreoffice-6.4.6.2-qaccessiblecache-assert.patch
 
b/app-office/libreoffice/files/libreoffice-6.4.6.2-qaccessiblecache-assert.patch
deleted file mode 100644
index baeabcbad4e..000
--- 
a/app-office/libreoffice/files/libreoffice-6.4.6.2-qaccessiblecache-assert.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 8e6b7d5696378e946e904c1df87da83e139af90d Mon Sep 17 00:00:00 2001

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2020-11-21 Thread Andreas Sturmlechner 
commit: 8f9ec592358a2d12a03a4e48fd91047dcd009e1f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Nov 21 19:39:26 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Nov 21 22:17:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f9ec592

app-office/libreoffice: Fix Qt5 moc path detect, drop QT_SELECT

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/libreoffice-7.0.3.1-qt5detect.patch  | 23 ++
 app-office/libreoffice/libreoffice-7.0.3.1.ebuild  |  7 ++-
 app-office/libreoffice/libreoffice-7.0..ebuild |  7 ++-
 app-office/libreoffice/libreoffice-.ebuild |  7 ++-
 4 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/app-office/libreoffice/files/libreoffice-7.0.3.1-qt5detect.patch 
b/app-office/libreoffice/files/libreoffice-7.0.3.1-qt5detect.patch
new file mode 100644
index 000..cc4e8e41df2
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.0.3.1-qt5detect.patch
@@ -0,0 +1,23 @@
+Don't let PATH get in the way of proper Qt5 detection.
+It could lead to broken configure due to mismanaged qtchooser config.
+
+--- a/configure.ac 2020-11-21 16:35:58.433794709 +0100
 b/configure.ac 2020-11-21 18:02:41.835207197 +0100
+@@ -11819,7 +11819,7 @@
+ qt5_test_library="libQt5Widgets.so"
+ 
+ dnl Check for qmake5
+-AC_PATH_PROGS( QMAKE5, [qmake-qt5 qmake], no, [$QT5DIR/bin:$PATH])
++AC_PATH_PROGS( QMAKE5, [qmake-qt5 qmake], no, [$QT5DIR/bin])
+ if test "$QMAKE5" = "no"; then
+ AC_MSG_ERROR([Qmake not found.  Please specify the root of your Qt5 
installation by exporting QT5DIR before running "configure".])
+ else
+@@ -11886,7 +11886,7 @@
+ 
+ dnl Check for Meta Object Compiler
+ 
+-AC_PATH_PROGS( MOC5, [moc-qt5 moc], no, [`dirname 
$qt5_libdir`/bin:$QT5DIR/bin:$PATH])
++AC_PATH_PROGS( MOC5, [moc-qt5 moc], no, [$QT5DIR/bin])
+ if test "$MOC5" = "no"; then
+ AC_MSG_ERROR([Qt Meta Object Compiler not found.  Please specify
+ the root of your Qt installation by exporting QT5DIR before running 
"configure".])

diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild 
b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
index 7d33a2c844c..695c9c5f0f6 100644
--- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
@@ -291,6 +291,7 @@ PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
+   "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
 
# 7.0 branch
"${FILESDIR}/${P}-fix-disable-pdfium-build.patch"
@@ -441,11 +442,7 @@ src_configure() {
export PYTHON_CFLAGS=$(python_get_CFLAGS)
export PYTHON_LIBS=$(python_get_LIBS)
 
-   if use kde; then
-   export QT_SELECT=5 # bug 639620 needs proper fix though
-   export QT5DIR="$(qt5_get_bindir)/../"
-   export MOC5="$(qt5_get_bindir)/moc"
-   fi
+   use kde && export QT5DIR="$(qt5_get_bindir)/.."
 
local gentoo_buildid="Gentoo official package"
if [[ -n ${LOCOREGIT_VERSION} ]]; then

diff --git a/app-office/libreoffice/libreoffice-7.0..ebuild 
b/app-office/libreoffice/libreoffice-7.0..ebuild
index 5040a3e0391..b10bdb491e5 100644
--- a/app-office/libreoffice/libreoffice-7.0..ebuild
+++ b/app-office/libreoffice/libreoffice-7.0..ebuild
@@ -291,6 +291,7 @@ PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
+   "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
@@ -437,11 +438,7 @@ src_configure() {
export PYTHON_CFLAGS=$(python_get_CFLAGS)
export PYTHON_LIBS=$(python_get_LIBS)
 
-   if use kde; then
-   export QT_SELECT=5 # bug 639620 needs proper fix though
-   export QT5DIR="$(qt5_get_bindir)/../"
-   export MOC5="$(qt5_get_bindir)/moc"
-   fi
+   use kde && export QT5DIR="$(qt5_get_bindir)/.."
 
local gentoo_buildid="Gentoo official package"
if [[ -n ${LOCOREGIT_VERSION} ]]; then

diff --git a/app-office/libreoffice/libreoffice-.ebuild 
b/app-office/libreoffice/libreoffice-.ebuild
index 1b78e99f05f..0bc93233961 100644
--- a/app-office/libreoffice/libreoffice-.ebuild
+++ b/app-office/libreoffice/libreoffice-.ebuild
@@ -291,6 +291,7 @@ PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
+   "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
@@ -437,11 +438,7 @@ src_configure() {
export PYTHON_CFLAGS=$(python_get_CFLAGS)
export PYTHON_LIBS=$(python_get_LIBS)
 
-   if use kde; then
-

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2020-11-21 Thread Andreas K. Hüttel 
commit: f7c12bfa5c0ec0e2df860f498790b128de1accd2
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Nov 21 20:59:49 2020 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sat Nov 21 21:00:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7c12bfa

app-office/libreoffice: Backport disable-pdfium fix from 7.0 branch

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 ...reoffice-7.0.3.1-fix-disable-pdfium-build.patch | 82 ++
 app-office/libreoffice/libreoffice-7.0.3.1.ebuild  |  3 +
 2 files changed, 85 insertions(+)

diff --git 
a/app-office/libreoffice/files/libreoffice-7.0.3.1-fix-disable-pdfium-build.patch
 
b/app-office/libreoffice/files/libreoffice-7.0.3.1-fix-disable-pdfium-build.patch
new file mode 100644
index 000..346699d5527
--- /dev/null
+++ 
b/app-office/libreoffice/files/libreoffice-7.0.3.1-fix-disable-pdfium-build.patch
@@ -0,0 +1,82 @@
+From b9e5d5347e5dece693fe56b88570abc07a30a8ba Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= 
+Date: Thu, 29 Oct 2020 15:45:01 +
+Subject: [PATCH] fix --disable-pdfium build
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Change-Id: I580972220bc39abe16288fa62c717e4ab25833d9
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105015
+Tested-by: Jenkins
+Tested-by: René Engelhard 
+Reviewed-by: René Engelhard 
+Reviewed-by: Noel Grandin 
+---
+ vcl/source/filter/ipdf/pdfread.cxx   |  2 +-
+ xmlsecurity/source/pdfio/pdfdocument.cxx | 11 +++
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/vcl/source/filter/ipdf/pdfread.cxx 
b/vcl/source/filter/ipdf/pdfread.cxx
+index 3066c4deba4a..bf11578089e0 100644
+--- a/vcl/source/filter/ipdf/pdfread.cxx
 b/vcl/source/filter/ipdf/pdfread.cxx
+@@ -218,7 +218,7 @@ size_t RenderPDFBitmaps(const void* pBuffer, int nSize, 
std::vector& rBi
+ (void)rBitmaps;
+ (void)nFirstPage;
+ (void)nPages;
+-(void)fResolutionDPI;
++(void)pSizeHint;
+ return 0;
+ #endif // HAVE_FEATURE_PDFIUM
+ }
+diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx 
b/xmlsecurity/source/pdfio/pdfdocument.cxx
+index c132d02cc2b0..b229206391f2 100644
+--- a/xmlsecurity/source/pdfio/pdfdocument.cxx
 b/xmlsecurity/source/pdfio/pdfdocument.cxx
+@@ -138,10 +138,10 @@ bool IsCompleteSignature(SvStream& rStream, 
vcl::filter::PDFDocument& rDocument,
+ return std::find(rAllEOFs.begin(), rAllEOFs.end(), nFileEnd) != 
rAllEOFs.end();
+ }
+ 
++#if HAVE_FEATURE_PDFIUM
+ /// Collects the checksum of each page of one version of the PDF.
+ void AnalyizeSignatureStream(SvMemoryStream& rStream, 
std::vector& rPageChecksums)
+ {
+-#if HAVE_FEATURE_PDFIUM
+ auto pPdfium = vcl::pdf::PDFiumLibrary::get();
+ vcl::pdf::PDFiumDocument aPdfDocument(
+ FPDF_LoadMemDocument(rStream.GetData(), rStream.GetSize(), 
/*password=*/nullptr));
+@@ -158,10 +158,8 @@ void AnalyizeSignatureStream(SvMemoryStream& rStream, 
std::vectorgetChecksum();
+ rPageChecksums.push_back(nPageChecksum);
+ }
+-#else
+-(void)rStream;
+-#endif
+ }
++#endif
+ 
+ /**
+  * Checks if incremental updates after singing performed valid modifications 
only.
+@@ -175,6 +173,7 @@ bool IsValidSignature(SvStream& rStream, 
vcl::filter::PDFObjectElement* pSignatu
+ return false;
+ }
+ 
++#if HAVE_FEATURE_PDFIUM
+ SvMemoryStream aSignatureStream;
+ sal_uInt64 nPos = rStream.Tell();
+ rStream.Seek(0);
+@@ -196,6 +195,10 @@ bool IsValidSignature(SvStream& rStream, 
vcl::filter::PDFObjectElement* pSignatu
+ // Fail if any page looks different after signing and at the end. 
Annotations/commenting doesn't
+ // count, though.
+ return aSignedPages == aAllPages;
++#else
++(void)rStream;
++return true;
++#endif
+ }
+ }
+ 
+-- 
+2.26.2
+

diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild 
b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
index 75e3660ccfa..b6573bba320 100644
--- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
@@ -286,6 +286,9 @@ else
 fi
 
 PATCHES=(
+   # backport from 7.0 branch
+   "${FILESDIR}/${PN}-7.0.3.1-fix-disable-pdfium-build.patch"
+
# "${WORKDIR}"/${PATCHSET/.tar.xz/}
 
# not upstreamable stuff

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2020-11-05 Thread Andreas Sturmlechner 
commit: 6229e6d13f5af9ecc6a437e6218cca9cd5f96056
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Nov  6 01:55:57 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Nov  6 02:21:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6229e6d1

app-office/libreoffice: Add second part of ICU-68 fix

Not part of upstream's ICU-68 commit 0b14b9ec because it was already changed
to use standard true in git master and libreoffice-7-0 branch beforehand.

Thanks-to: Mike Lothian  fireburn.co.uk>
Closes: https://bugs.gentoo.org/752021
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...68.patch => libreoffice-6.4.7.2-icu-68-1.patch} |  0
 .../files/libreoffice-6.4.7.2-icu-68-2.patch   | 28 ++
 app-office/libreoffice/libreoffice-6.4.7.2.ebuild  |  2 +-
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68.patch 
b/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-1.patch
similarity index 100%
rename from app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68.patch
rename to app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-1.patch

diff --git a/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-2.patch 
b/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-2.patch
new file mode 100644
index 000..bd7dc04cffe
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-2.patch
@@ -0,0 +1,28 @@
+From 523f8613c124b722b721c8055db2085a005e09dd Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Fri, 6 Nov 2020 02:43:07 +0100
+Subject: [PATCH] Fix build with ICU 68, use standard true. (part 2/2 missing
+ from 0b14b9ec)
+
+Change-Id: I776dd4e1fc92ef1ef09b88e239bf0d6942c28ca3
+Signed-off-by: Andreas Sturmlechner 
+---
+ svx/source/dialog/fntctrl.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
+index d312d7ad5f49..10c84ca95222 100644
+--- a/svx/source/dialog/fntctrl.cxx
 b/svx/source/dialog/fntctrl.cxx
+@@ -1014,7 +1014,7 @@ void SvxFontPrevWindow::SetFromItemSet(const SfxItemSet 
, bool bPreviewBack
+  rCTLFont.SetFillColor( rColor );
+ }
+ else
+-bTransparent = TRUE;
++bTransparent = true;
+ 
+ rFont.SetTransparent( bTransparent );
+ rCJKFont.SetTransparent( bTransparent );
+-- 
+2.29.2
+

diff --git a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild 
b/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
index e1f48dbe39f..e632c848c58 100644
--- a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
@@ -274,7 +274,7 @@ PATCHES=(
# git master
"${FILESDIR}/${PN}-6.4.3.2-boost-1.73.patch" # bug 721806
"${FILESDIR}/${PN}-6.4.6.2-llvm-10.patch" # bug 713574
-   "${FILESDIR}/${P}-icu-68.patch" # bug 752021
+   "${FILESDIR}"/${P}-icu-68-{1,2}.patch # bug 752021, +downstream backport
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2020-11-05 Thread Andreas Sturmlechner 
commit: d05d533d5040c87b379b924f87b335963b92259f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Nov  5 21:00:09 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov  5 22:50:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d05d533d

app-office/libreoffice: Fix build with ICU-68

Upstream commit 0b14b9ec55fb2a8dd0ec24e1c03702bc4bbf1878

Reported-by: Mike Lothian  fireburn.co.uk>
Closes: https://bugs.gentoo.org/752021
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/libreoffice-6.4.7.2-icu-68.patch | 46 ++
 app-office/libreoffice/libreoffice-6.4.7.2.ebuild  |  1 +
 2 files changed, 47 insertions(+)

diff --git a/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68.patch 
b/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68.patch
new file mode 100644
index 000..fe20e3435d2
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68.patch
@@ -0,0 +1,46 @@
+From 0b14b9ec55fb2a8dd0ec24e1c03702bc4bbf1878 Mon Sep 17 00:00:00 2001
+From: Rene Engelhard 
+Date: Sun, 1 Nov 2020 18:30:49 +0100
+Subject: fix build with ICU 68
+
+use standard true.
+
+/home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx:
 In member function 'virtual void 
i18npool::Calendar_gregorian::setLocalDateTime(double)':
+/home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx:363:40:
 error: 'TRUE' was not declared in this scope
+  363 | body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, 
status );
+  |^~~~
+
+/usr/include/unicode/umachine.h says:
+
+@deprecated ICU 68 Use standard "true" instead.
+
+Change-Id: I45d2b0afa6a9043767af5c2cf41ba24377f2cdc4
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105057
+Tested-by: Jenkins
+Reviewed-by: Eike Rathke 
+---
+ i18npool/source/calendar/calendar_gregorian.cxx | 9 -
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/i18npool/source/calendar/calendar_gregorian.cxx 
b/i18npool/source/calendar/calendar_gregorian.cxx
+index b7ae49fbd96e..59ee46fa0e0f 100644
+--- a/i18npool/source/calendar/calendar_gregorian.cxx
 b/i18npool/source/calendar/calendar_gregorian.cxx
+@@ -347,7 +347,14 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDays )
+ "Calendar_gregorian::setLocalDateTime: " << std::fixed << fM << " 
rounded to " << fR);
+ int32_t nZoneOffset, nDSTOffset;
+ UErrorCode status = U_ZERO_ERROR;
+-body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status 
);
++body->getTimeZone().getOffset( fR,
++#if U_ICU_VERSION_MAJOR_NUM >= 68
++true,
++#else
++TRUE,
++#endif
++nZoneOffset, nDSTOffset, status );
++
+ if ( !U_SUCCESS(status) ) throw ERROR;
+ status = U_ZERO_ERROR;
+ body->setTime( fR - (nZoneOffset + nDSTOffset), status );
+-- 
+cgit v1.2.1

diff --git a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild 
b/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
index 0d74d54e9b1..e1f48dbe39f 100644
--- a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
@@ -274,6 +274,7 @@ PATCHES=(
# git master
"${FILESDIR}/${PN}-6.4.3.2-boost-1.73.patch" # bug 721806
"${FILESDIR}/${PN}-6.4.6.2-llvm-10.patch" # bug 713574
+   "${FILESDIR}/${P}-icu-68.patch" # bug 752021
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2020-10-29 Thread Andreas Sturmlechner 
commit: 2c31a3aa736f52ba28567b41c80d71069654334f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Oct 29 08:37:55 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Oct 29 10:40:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c31a3aa

app-office/libreoffice: Add 7.0 stable branch

Bug: https://bugs.gentoo.org/739134
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../libreoffice-7.0.3.1-fix-non-pdfium-build.patch |  29 +
 app-office/libreoffice/libreoffice-7.0..ebuild | 603 +
 2 files changed, 632 insertions(+)

diff --git 
a/app-office/libreoffice/files/libreoffice-7.0.3.1-fix-non-pdfium-build.patch 
b/app-office/libreoffice/files/libreoffice-7.0.3.1-fix-non-pdfium-build.patch
new file mode 100644
index 000..0361cd4c483
--- /dev/null
+++ 
b/app-office/libreoffice/files/libreoffice-7.0.3.1-fix-non-pdfium-build.patch
@@ -0,0 +1,29 @@
+From 5f3f17a9c64e33fb787a79dc94d902147da77d71 Mon Sep 17 00:00:00 2001
+From: Noel Grandin 
+Date: Sat, 19 Sep 2020 20:38:29 +0200
+Subject: fix non-pdfium build
+
+Change-Id: Ic1e30a412927748ba58a21cf2ee922cd1a490aa4
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103040
+Tested-by: Jenkins
+Reviewed-by: Noel Grandin 
+---
+ vcl/source/filter/ipdf/pdfread.cxx   |  2 +-
+ xmlsecurity/source/pdfio/pdfdocument.cxx | 12 +++-
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/vcl/source/filter/ipdf/pdfread.cxx 
b/vcl/source/filter/ipdf/pdfread.cxx
+index 39c2933be8d5..a9b079a75bc3 100644
+--- a/vcl/source/filter/ipdf/pdfread.cxx
 b/vcl/source/filter/ipdf/pdfread.cxx
+@@ -220,7 +220,7 @@ size_t RenderPDFBitmaps(const void* pBuffer, int nSize, 
std::vector& rBi
+ (void)rBitmaps;
+ (void)nFirstPage;
+ (void)nPages;
+-(void)fResolutionDPI;
++(void)pSizeHint;
+ return 0;
+ #endif // HAVE_FEATURE_PDFIUM
+ }
+-- 
+cgit v1.2.1

diff --git a/app-office/libreoffice/libreoffice-7.0..ebuild 
b/app-office/libreoffice/libreoffice-7.0..ebuild
new file mode 100644
index 000..772f603dd25
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.0..ebuild
@@ -0,0 +1,603 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+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} == ** ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 
multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org;
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" 
https://dev.gentoo.org/~asturm/distfiles/${PATCHSET};
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != ** ]]; 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=(
+   # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+   "${ADDONS_URI}/dtoa-20180411.tgz"
+   # not packaged in Gentoo, https://skia.org/
+   "${ADDONS_URI}/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"
+   # QR code generating library for >=libreoffice-6.4, bug #691740
+   "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
+   "base? (
+   ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+   
${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+   ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+   ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+   
${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+   
${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+   
${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+   
${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2020-10-22 Thread Andreas Sturmlechner 
commit: 83fd7509ad72bfa4ece9d51a86f296a9f0f12e2d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Oct 22 13:12:15 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Oct 22 21:59:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83fd7509

app-office/libreoffice: 6.4.7.2 version bump

- 6.4.7.2-fix-wrong-setting-for-doc-properties.patch:
  Upstream commit 188ddcd482150b5fdeb44d97e57831e3e27b3f5b
  LO-Bug: https://bugs.documentfoundation.org/show_bug.cgi?id=136983

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/libreoffice/Manifest|   2 +
 7.2-fix-wrong-setting-for-doc-properties.patch |  75 +++
 app-office/libreoffice/libreoffice-6.4.7.2.ebuild  | 593 +
 3 files changed, 670 insertions(+)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 75423a5c62c..bd974fb80fb 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -18,6 +18,8 @@ DIST dtoa-20180411.tgz 48893 BLAKE2B 
4a03dc67e44353ae1c0653c8305d2df9bcfef16b48d
 DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B 
d3ac085a39ee9798182b70ba650fa954234b964e33278ac4fe3f84f8c3218ad49f12d139079328036b4f9d80cde967888c0a66393c34dedf27af69dac02c5aff
 SHA512 
9091d3628d9c75c068507537afc9e10bfb79c1abfd36ad697af3d592a1cc049ba6640f665bfc53cc520b6a26c21d70b0275106843444b441484c2178f2784743
 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 
2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b
 SHA512 
c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
 DIST libreoffice-6.4.6.2.tar.xz 232180876 BLAKE2B 
b2e01cc8e56b36c16fc3e39ff88617d7c31d6b0a0f4a5c05c8536313e7129862fb962e1a6efc7e86e9b56c34dff7c2d895416f33fbb23dc45e447b25813b5654
 SHA512 
377675494d4422c4d9363fe3857a8587e38f6ccd39aebec9c23337aa3a88cb2526608b8d0bcb27985ed8f821a98ca541dad4b48d69db441bcb27e9fb81beb9ba
+DIST libreoffice-6.4.7.2.tar.xz 232364676 BLAKE2B 
1df8f2a3aa00bd057dd1d6d9665a541330ceeabb2bb5d46351449cf9b916a5649f38dc0e0175cf3733123f9247157f5fd0f2c34c8dad1d676da6c31d8346927b
 SHA512 
ba6ff5948624d7a76025406c38728d643be656091d79320a1c5ddba1411662951a0b02de7a9e796e76d8185b6e9113882406bb0c1452b4c988ac3095afa8
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B 
f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883
 SHA512 
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-6.4.6.2.tar.xz 88297908 BLAKE2B 
919758e81ed46138331b49668f89c6bf7f50253d7632d113aa957f524ae26e2b99f2ba490b405830314822ea91185eb2308018df77c5bd3d7197cbba940ae2ba
 SHA512 
8ada2568a40dc4f1c843cb37dde6abe3bd61b6e5d9910b985096821e1fce5af47d4a10bff8ae91913298e593130bc1f8668b4e1c59c46591d457157e3d4b7501
+DIST libreoffice-help-6.4.7.2.tar.xz 88296892 BLAKE2B 
9ee12ec6aa6d5539408e0206e313901540533e28686585fa0bb4edbeaa482bb0ad1cd4ae37ac18dab66bb3e2ea32d52d9960236cbf3e0f8fb5ca07c007f38794
 SHA512 
a5381a8cca9988998dc01d3815869e47193c1da814b714cbedb51a2099f7dc5444315c657e32defab2eb0b9a9e2a922bc4c5fbc36b7a2b60e7c551887a9cdbb3
 DIST skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz 8218672 BLAKE2B 
cfeb805d82ce1f5dd70c7365983fa8107d5ccda9409b2654c032115cdf8a1c32fa0451162b0cceec3dcc0054e3d0d0e13583ea93843b0d0a6eb948cc31c15ce0
 SHA512 
1018fc1cc8a7edc15745cc20791f9a22e5b318018ba619d6cb5b6995d3e81ab93c910bb3a42734872d3be54893c2ce7db507b2c61088660b2ce6630ff9b36ebb

diff --git 
a/app-office/libreoffice/files/libreoffice-6.4.7.2-fix-wrong-setting-for-doc-properties.patch
 
b/app-office/libreoffice/files/libreoffice-6.4.7.2-fix-wrong-setting-for-doc-properties.patch
new file mode 100644
index 000..9c9d417cde9
--- /dev/null
+++ 
b/app-office/libreoffice/files/libreoffice-6.4.7.2-fix-wrong-setting-for-doc-properties.patch
@@ -0,0 +1,75 @@
+From 188ddcd482150b5fdeb44d97e57831e3e27b3f5b Mon Sep 17 00:00:00 2001
+From: Justin Luth 
+Date: Mon, 28 Sep 2020 20:21:52 +0300
+Subject: tdf#136983 partial revert NFC ww8 cleanup: remove unused variables
+
+This is a partial revert of LO 6.2
+commit 2ec0cf500222aef55d02df80154b47fbb92970c9
+
+I can't think of any excuse for how I possibly missed that
+xDocProps was being defined/used outside of this clause.
+Just plain stupid and blind.
+
+The good news is that the create and modified date still
+seem to be getting saved somehow/somewhere. So it isn't
+the disaster that it looks like it could have been.
+
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103565
+Tested-by: Jenkins
+Reviewed-by: Justin Luth 
+(cherry picked from commit 1086654d6e8cc22f1f99195668db3f305437e570)

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2020-09-08 Thread Andreas Sturmlechner 
commit: b08267d1e6c2fda88482f2e325b885c9f85f6103
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Sep  8 17:45:52 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Sep  8 18:07:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b08267d1

app-office/libreoffice: Backport "qt5: Remember accessible object"

Thanks-to: Jaak Ristioja  ristioja.ee>
Reported-by: Marian Kyral  email.cz>
Bug: https://bugs.gentoo.org/680186
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...breoffice-6.4.6.2-qaccessiblecache-assert.patch | 102 
 .../libreoffice/libreoffice-6.4.6.2-r1.ebuild  | 593 +
 2 files changed, 695 insertions(+)

diff --git 
a/app-office/libreoffice/files/libreoffice-6.4.6.2-qaccessiblecache-assert.patch
 
b/app-office/libreoffice/files/libreoffice-6.4.6.2-qaccessiblecache-assert.patch
new file mode 100644
index 000..baeabcbad4e
--- /dev/null
+++ 
b/app-office/libreoffice/files/libreoffice-6.4.6.2-qaccessiblecache-assert.patch
@@ -0,0 +1,102 @@
+From 8e6b7d5696378e946e904c1df87da83e139af90d Mon Sep 17 00:00:00 2001
+From: Michael Weghorn 
+Date: Mon, 7 Sep 2020 20:08:57 +0200
+Subject: tdf#136323 qt5: Remember accessible object
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+'QAccessibleCache::insert' from the Qt library has a
+'Q_ASSERT' checking that the corresponding 'QObject' for
+which the 'QAccessibleInterface' provides information
+is actually the same as the object passed as a parameter:
+
+QAccessible::Id QAccessibleCache::insert(QObject *object, 
QAccessibleInterface *iface) const
+{
+// ...
+QObject *obj = iface->object();
+->  Q_ASSERT(object == obj);
+
+However, 'Qt5AccessibleWidget::object' so far was always returning
+'nullptr', triggering this assert when using a Qt version
+not built with 'QT_NO_DEBUG'.
+
+To fix this, remember and return the object as needed.
+
+Change-Id: I4015b4c37aa8a073b02465df580a7235884e6cf3
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102196
+Tested-by: Jenkins
+Reviewed-by: Michael Weghorn 
+(cherry picked from commit 4461d49c6cfce22c2c96185b0a1d07bfe9709268)
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102126
+Reviewed-by: Caolán McNamara 
+---
+ vcl/inc/qt5/Qt5AccessibleWidget.hxx | 4 +++-
+ vcl/qt5/Qt5AccessibleWidget.cxx | 9 +
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/vcl/inc/qt5/Qt5AccessibleWidget.hxx 
b/vcl/inc/qt5/Qt5AccessibleWidget.hxx
+index 6b0d71cba9f5..0f62d2a8a5b8 100644
+--- a/vcl/inc/qt5/Qt5AccessibleWidget.hxx
 b/vcl/inc/qt5/Qt5AccessibleWidget.hxx
+@@ -41,7 +41,8 @@ class VCLPLUG_QT5_PUBLIC Qt5AccessibleWidget : public 
QObject,
+ Q_OBJECT
+ 
+ public:
+-Qt5AccessibleWidget(const 
css::uno::Reference xAccessible);
++Qt5AccessibleWidget(const 
css::uno::Reference xAccessible,
++QObject* pObject);
+ QWindow* window() const override;
+ int childCount() const override;
+ int indexOfChild(const QAccessibleInterface* child) const override;
+@@ -137,6 +138,7 @@ public:
+ private:
+ css::uno::Reference m_xAccessible;
+ css::uno::Reference 
getAccessibleContextImpl() const;
++QObject* m_pObject;
+ };
+ 
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+diff --git a/vcl/qt5/Qt5AccessibleWidget.cxx b/vcl/qt5/Qt5AccessibleWidget.cxx
+index 6a828865036e..7136e0823790 100644
+--- a/vcl/qt5/Qt5AccessibleWidget.cxx
 b/vcl/qt5/Qt5AccessibleWidget.cxx
+@@ -58,8 +58,9 @@ using namespace css::accessibility;
+ using namespace css::beans;
+ using namespace css::uno;
+ 
+-Qt5AccessibleWidget::Qt5AccessibleWidget(const Reference 
xAccessible)
++Qt5AccessibleWidget::Qt5AccessibleWidget(const Reference 
xAccessible, QObject* pObject)
+ : m_xAccessible(xAccessible)
++, m_pObject(pObject)
+ {
+ Reference xContext = 
xAccessible->getAccessibleContext();
+ Reference xBroadcaster(xContext, UNO_QUERY);
+@@ -698,7 +699,7 @@ bool Qt5AccessibleWidget::isValid() const
+ return xAc.is();
+ }
+ 
+-QObject* Qt5AccessibleWidget::object() const { return nullptr; }
++QObject* Qt5AccessibleWidget::object() const { return m_pObject; }
+ 
+ void Qt5AccessibleWidget::setText(QAccessible::Text /* t */, const QString& 
/* text */) {}
+ 
+@@ -721,13 +722,13 @@ QAccessibleInterface* 
Qt5AccessibleWidget::customFactory(const QString& classnam
+ vcl::Window* pWindow = pWidget->frame().GetWindow();
+ 
+ if (pWindow)
+-return new Qt5AccessibleWidget(pWindow->GetAccessible());
++return new Qt5AccessibleWidget(pWindow->GetAccessible(), object);
+ }
+ if (classname == QLatin1String("Qt5XAccessible") && object)
+ {
+ Qt5XAccessible* pXAccessible = dynamic_cast(object);
+ if (pXAccessible && pXAccessible->m_xAccessible.is())
+-return new

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2020-05-31 Thread Andreas Sturmlechner 
commit: dc34107985bf6375e54dace8b6f8762b2eabf8d7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May 31 21:00:28 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 31 21:08:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc341079

app-office/libreoffice: Drop 6.3.4.2-r1

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/libreoffice/Manifest|   2 -
 .../libreoffice-6.3.3.2-mysql-connector-c-8.patch  |  45 --
 .../files/libreoffice-6.3.4.2-poppler-0.83.patch   |  72 ---
 .../libreoffice/libreoffice-6.3.4.2-r1.ebuild  | 559 -
 app-office/libreoffice/metadata.xml|   1 -
 5 files changed, 679 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 8a38d5aa745..973d29b2b71 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,11 +5,9 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 
BLAKE2B d2769842c18
 DIST QR-Code-generator-1.4.0.tar.gz 146339 BLAKE2B 
b2cb329877426861e0245747ac1e8f1275ca7428b3c6768af60dec5c9bb46e93a3fee81fc77257e151604b5f6748c9f29582e9fccc2a4088747c95fe5f673124
 SHA512 
314a757bfdf9a38bcf07fd7a0103d28a2d1dd7311b8234761304efeef7bfdb740db78ab01e6b67e99a28d523cc2be9c1073b2de9d65e853d191c3dad19af56d0
 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 
51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3
 SHA512 
2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
 DIST dtoa-20180411.tgz 48893 BLAKE2B 
4a03dc67e44353ae1c0653c8305d2df9bcfef16b48dff6df5c857a6bd0510a92aa6d9b9660ad63b2344d5195fef072e526f8d7900791b15442923b63196dda3f
 SHA512 
722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
-DIST libreoffice-6.3.4.2.tar.xz 225632492 BLAKE2B 
587fe7e6298ded60fa08963f572733eb8e387c00b428201bb6f1de7eddcf9d9ee97438231ed3f961bd22628bde0fd9dfeacb63febdc566cde781bcebb9c9a71d
 SHA512 
2ed687ae805da36635419729066a2924f1e38a6b0f8d2692c42b366450a261012adfcd8a5d7915d9cfd292d07519fc32c596cdb56d7be6b12a49618b18d6f3d2
 DIST libreoffice-6.4.3.2.tar.xz 230409812 BLAKE2B 
f9cdad1540c45525bd70596dc3033e3466fcdf3d96547222b936141e49ff6d45581ca59d0e42c4bb79fcb63586d748ccafae712369e024105235e2a9b69be7ce
 SHA512 
ee11c704fa7184ffe371aa36c835c4c7fb06ef03d08fa0a5a9e647e80610db275e091d1ac79c1fe11af0c7f14dd72c821da9e7e6ba59573fc88cec79f84c873a
 DIST libreoffice-6.4.4.2.tar.xz 231325236 BLAKE2B 
25e1c765cb0ff9c195ca46a9fe857eef22ab6319da6b069e2c5c093a8f13eac2e1c5efa31fbacd4e3acbdc07e75745ff5c62c180cb61141319422720405a4638
 SHA512 
8e2b6a2d34fbc182ce4ec0b6d6bfb30665ff5cee0a27a22551c71d4eddf63b812d676ea8dea9a2e4bb028a2365b5e23908679efbe4696032e1abeedecb85b8d3
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B 
f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883
 SHA512 
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-6.3.4.2.tar.xz 13191636 BLAKE2B 
c1696efa0ec9fef9dbcc0c0388de8a384484af1453d200e08820ba910cdcb65638b189566a19868281fd1777213812fde06adb07c1a662302eea1d0a791ff5a0
 SHA512 
8c74c82c7d73adb1523300d1f7500769f5a623fdba60b440a63c122cbfeb631a6a34ecbcb115b0154a6957be1918306f7d0c1f465030f8e8cfd5c9a1acad17c9
 DIST libreoffice-help-6.4.3.2.tar.xz 88297704 BLAKE2B 
bbd1af159c8b8db1909335f37095812ec3ce81d73644a30a85f3e37daeabeb9a158451b8e586f24d4b7544c8cd0948eeb20ede464384c3277d196f33322e63fb
 SHA512 
9f8c1bcde27d153389d124af1393d0939262c85a1624f0b475a5515b5737612cb607d04742a069534771eee51ba98896926804ec7001d6bc2110dccdd6e7615a
 DIST libreoffice-help-6.4.4.2.tar.xz 88296340 BLAKE2B 
73ef558b830e0e2899eb72727e0eb81327807ff2d474c8d956700a09bcadc73cbff26688063f91d3a496afa55ab9a7d4847d84334b89fe4fafe17fb445fbb33d
 SHA512 
7084428e63a458c4e35c135b16dd980fa98695be0ba974cac656a7ef6cb15b059a082891c3f74b72a62f92549afefe46c14ab30b5491fd9e3fea6d5923720b3d
 DIST skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz 8218672 BLAKE2B 
cfeb805d82ce1f5dd70c7365983fa8107d5ccda9409b2654c032115cdf8a1c32fa0451162b0cceec3dcc0054e3d0d0e13583ea93843b0d0a6eb948cc31c15ce0
 SHA512 
1018fc1cc8a7edc15745cc20791f9a22e5b318018ba619d6cb5b6995d3e81ab93c910bb3a42734872d3be54893c2ce7db507b2c61088660b2ce6630ff9b36ebb

diff --git 
a/app-office/libreoffice/files/libreoffice-6.3.3.2-mysql-connector-c-8.patch 
b/app-office/libreoffice/files/libreoffice-6.3.3.2-mysql-connector-c-8.patch
deleted file mode 100644
index 5fa7b343f4f..000
--- a/app-office/libreoffice/files/libreoffice-6.3.3.2-mysql-connector-c-8.patch
+++ /dev/null
@@ -1,45 +0,0

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2020-04-05 Thread Andreas Sturmlechner 
commit: b8247fa646d67c9385ffb3c05d1f6a1420cad014
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr  5 16:12:49 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr  5 17:04:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8247fa6

app-office/libreoffice: Fix build with poppler-0.86.0

Closes: https://bugs.gentoo.org/711102
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/libreoffice-6.4.2.2-poppler-0.86.patch  | 15 +++
 app-office/libreoffice/libreoffice-6.4.2.2.ebuild |  3 +++
 2 files changed, 18 insertions(+)

diff --git 
a/app-office/libreoffice/files/libreoffice-6.4.2.2-poppler-0.86.patch 
b/app-office/libreoffice/files/libreoffice-6.4.2.2-poppler-0.86.patch
new file mode 100644
index 000..c56ba89ade5
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.4.2.2-poppler-0.86.patch
@@ -0,0 +1,15 @@
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index e9c2a407c279..16ad04bf660a 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
 b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -563,7 +563,9 @@ void PDFOutDev::processLink(Link* link, Catalog*)
+ if (!(pAction && pAction->getKind() == actionURI))
+ return;
+ 
+-#if POPPLER_CHECK_VERSION(0, 72, 0)
++#if POPPLER_CHECK_VERSION(0, 86, 0)
++const char* pURI = static_cast(pAction)->getURI().c_str();
++#elif POPPLER_CHECK_VERSION(0, 72, 0)
+ const char* pURI = static_cast(pAction)->getURI()->c_str();
+ #else
+ const char* pURI = static_cast(pAction)->getURI()->getCString();

diff --git a/app-office/libreoffice/libreoffice-6.4.2.2.ebuild 
b/app-office/libreoffice/libreoffice-6.4.2.2.ebuild
index a6f3687b3c4..b3b6af835f9 100644
--- a/app-office/libreoffice/libreoffice-6.4.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.2.2.ebuild
@@ -252,6 +252,9 @@ PATCHES=(
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
+
+   # TODO: upstream (for now taken from Arch Linux)
+   "${FILESDIR}/${P}-poppler-0.86.patch" # bug 711102
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2020-01-16 Thread Andreas Sturmlechner 
commit: 7156ff0cfa6aa70d6baece38d6cb2767fe18d8cb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jan 16 23:42:07 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jan 17 02:50:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7156ff0c

app-office/libreoffice: Drop 6.2.8.2

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/libreoffice/Manifest|   2 -
 .../files/libreoffice-6.2-ldap-optional.patch  | 178 ---
 .../files/libreoffice-6.2.8.2-poppler-0.82.patch   | 123 -
 app-office/libreoffice/libreoffice-6.2.8.2.ebuild  | 554 -
 4 files changed, 857 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index ef8dbf6702a..1083824bebe 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -3,8 +3,6 @@ DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 
BLAKE2B c067f60d0ee325
 DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B 
a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0
 SHA512 
4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
 DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B 
d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590
 SHA512 
ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 
51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3
 SHA512 
2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
-DIST libreoffice-6.2.8.2.tar.xz 215070800 BLAKE2B 
d6bc1e94de1df4dd20dafaeac9702435f305fe15117e8aee02233c6d2e74423bb475aeaf79ff6dcd30e22d69a5d6f0648218819b08003524a2c7b1db340281c4
 SHA512 
cf1dd708f10ea4b9a3134851cad45fe91c1d535e2b2068f7e65f1cb1bf4076c5c41ec253f628c5b912590e91ccfe16f5c8bcf39bc92df2ec7c8aef84210349bd
 DIST libreoffice-6.3.4.2.tar.xz 225632492 BLAKE2B 
587fe7e6298ded60fa08963f572733eb8e387c00b428201bb6f1de7eddcf9d9ee97438231ed3f961bd22628bde0fd9dfeacb63febdc566cde781bcebb9c9a71d
 SHA512 
2ed687ae805da36635419729066a2924f1e38a6b0f8d2692c42b366450a261012adfcd8a5d7915d9cfd292d07519fc32c596cdb56d7be6b12a49618b18d6f3d2
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B 
f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883
 SHA512 
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-6.2.8.2.tar.xz 13024032 BLAKE2B 
524ba3ff77670afebf8be4724b5e54f9b157582cfcac8640e2184b8ae24c8e5e01b924415949f1756c18e2d54b8eab7efb78c979321e50b6d52b741ddd49
 SHA512 
c1f5b1b3c50da0a47a9724c9fc3544a15b7df72e66c5c2008afeae7732e2b29f0e57e64ce9a216c3237acdb4345715525f32be290f3196ba6e28685fa6c0925c
 DIST libreoffice-help-6.3.4.2.tar.xz 13191636 BLAKE2B 
c1696efa0ec9fef9dbcc0c0388de8a384484af1453d200e08820ba910cdcb65638b189566a19868281fd1777213812fde06adb07c1a662302eea1d0a791ff5a0
 SHA512 
8c74c82c7d73adb1523300d1f7500769f5a623fdba60b440a63c122cbfeb631a6a34ecbcb115b0154a6957be1918306f7d0c1f465030f8e8cfd5c9a1acad17c9

diff --git a/app-office/libreoffice/files/libreoffice-6.2-ldap-optional.patch 
b/app-office/libreoffice/files/libreoffice-6.2-ldap-optional.patch
deleted file mode 100644
index c9268973252..000
--- a/app-office/libreoffice/files/libreoffice-6.2-ldap-optional.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-From 6776c53b7ce2e431d8636f4e5a755f50f787ec8f Mon Sep 17 00:00:00 2001
-From: Andrew Udvare 
-Date: Tue, 8 Jan 2019 04:53:51 -0500
-Subject: Make LDAP support optional
-
-Change-Id: Ifbd3903494a81e7b155bf6468f6ca2c50b3370a4
-Reviewed-on: https://gerrit.libreoffice.org/65958
-Tested-by: Jenkins
-Reviewed-by: Markus Mohrhard 

- Repository.mk |  2 +-
- RepositoryExternal.mk |  3 ++-
- configure.ac  | 24 ++-
- connectivity/Library_postgresql-sdbc-impl.mk  |  2 +-
- extensions/Module_extensions.mk   |  7 ++-
- external/postgresql/ExternalProject_postgresql.mk |  5 +++--
- postprocess/Rdb_services.mk   |  2 +-
- 7 files changed, 37 insertions(+), 8 deletions(-)
-
-diff --git a/Repository.mk b/Repository.mk
-index 4ae8528..4d8389b 100644
 a/Repository.mk
-+++ b/Repository.mk
-@@ -389,7 +389,7 @@ $(eval $(call

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2019-11-01 Thread Andreas Sturmlechner 
commit: dfa6d688436719d87a518dc7405675734e9591d8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Nov  1 15:54:42 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Nov  1 18:39:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfa6d688

app-office/libreoffice: Fix build with poppler-0.82.0

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/libreoffice-6.2.8.2-poppler-0.82.patch   | 123 +
 app-office/libreoffice/libreoffice-6.2.8.2.ebuild  |   1 +
 app-office/libreoffice/libreoffice-6.3.3.2.ebuild  |   6 +-
 3 files changed, 127 insertions(+), 3 deletions(-)

diff --git 
a/app-office/libreoffice/files/libreoffice-6.2.8.2-poppler-0.82.patch 
b/app-office/libreoffice/files/libreoffice-6.2.8.2-poppler-0.82.patch
new file mode 100644
index 000..b6c30cd92a1
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.2.8.2-poppler-0.82.patch
@@ -0,0 +1,123 @@
+From 2eadd46ab81058087af95bdfc1fea28fcdb65998 Mon Sep 17 00:00:00 2001
+From: Rasmus Thomsen 
+Date: Sat, 26 Oct 2019 14:11:35 +0200
+Subject: Fix build with poppler-0.82
+
+Change-Id: I3b6b3faea7986f3e5a6ae4790580d03bc9c955fc
+Reviewed-on: https://gerrit.libreoffice.org/81545
+Tested-by: Jenkins
+Reviewed-by: Michael Stahl 
+---
+ .../pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx   | 25 ++
+ .../pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx   | 16 +-
+ 2 files changed, 40 insertions(+), 1 deletion(-)
+
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index ce32a41..3ae3bdc 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
 b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -863,11 +863,20 @@ void PDFOutDev::eoClip(GfxState *state)
+ local offset of character (zero for horizontal writing mode). not
+ taken into account for output pos updates. Used for vertical writing.
+  */
++
++#if POPPLER_CHECK_VERSION(0, 82, 0)
++void PDFOutDev::drawChar(GfxState *state, double x, double y,
++ double dx, double dy,
++ double originX, double originY,
++ CharCode, int /*nBytes*/, const Unicode *u, int uLen)
++{
++#else
+ void PDFOutDev::drawChar(GfxState *state, double x, double y,
+  double dx, double dy,
+  double originX, double originY,
+  CharCode, int /*nBytes*/, Unicode *u, int uLen)
+ {
++#endif
+ assert(state);
+ 
+ if( u == nullptr )
+@@ -979,11 +988,19 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object*, 
Stream* str,
+ writeBinaryBuffer(aBuf);
+ }
+ 
++#if POPPLER_CHECK_VERSION(0, 82, 0)
++void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
++  int width, int height, GfxImageColorMap* colorMap,
++  poppler_bool /*interpolate*/,
++  const int* maskColors, poppler_bool /*inlineImg*/ )
++{
++#else
+ void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
+   int width, int height, GfxImageColorMap* colorMap,
+   poppler_bool /*interpolate*/,
+   int* maskColors, poppler_bool /*inlineImg*/ )
+ {
++#endif
+ if (m_bSkipImages)
+ return;
+ OutputBuffer aBuf; initBuf(aBuf);
+@@ -1004,12 +1021,20 @@ void PDFOutDev::drawImage(GfxState*, Object*, Stream* 
str,
+ {
+ GfxRGB aMinRGB;
+ colorMap->getColorSpace()->getRGB(
++#if POPPLER_CHECK_VERSION(0, 82, 0)
++reinterpret_cast(maskColors),
++#else
+ reinterpret_cast(maskColors),
++#endif
+  );
+ 
+ GfxRGB aMaxRGB;
+ colorMap->getColorSpace()->getRGB(
++#if POPPLER_CHECK_VERSION(0, 82, 0)
++reinterpret_cast(maskColors)+gfxColorMaxComps,
++#else
+ reinterpret_cast(maskColors)+gfxColorMaxComps,
++#endif
+  );
+ 
+ aMaskBuf.push_back( colToByte(aMinRGB.r) );
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+index 1a0c3f0..02f6b59 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
 b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+@@ -232,10 +232,17 @@ namespace pdfi
+ virtual void eoClip(GfxState *state) override;
+ 
+ //- text drawing
++#if POPPLER_CHECK_VERSION(0, 82, 0)
++virtual void drawChar(GfxState *state, double x, double y,
++  double dx, double dy,
++  double originX, double originY,
++  CharCode code, int nBytes, const Unicode *u, 
int uLen) override;
++#else
+ virtual void drawChar(GfxState *state, double

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2019-10-18 Thread Andreas Sturmlechner 
commit: 73309c9f2c62bf1c2b1c32814bd77d6fbfd7a3bf
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Oct 18 23:47:47 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Oct 18 23:59:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73309c9f

app-office/libreoffice: Fix build with >=dev-db/mysql-connector-c-8

Thanks-to: Peter Levine  gmail.com>
Closes: https://bugs.gentoo.org/692422
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../libreoffice-6.3.2.2-mysql-connector-c-8.patch  | 45 ++
 app-office/libreoffice/libreoffice-6.3.2.2.ebuild  |  3 ++
 app-office/libreoffice/libreoffice-6.3..ebuild |  3 ++
 3 files changed, 51 insertions(+)

diff --git 
a/app-office/libreoffice/files/libreoffice-6.3.2.2-mysql-connector-c-8.patch 
b/app-office/libreoffice/files/libreoffice-6.3.2.2-mysql-connector-c-8.patch
new file mode 100644
index 000..677ba399575
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.3.2.2-mysql-connector-c-8.patch
@@ -0,0 +1,45 @@
+From 5917ba8bc645a2b105ec089101b8a664481b5b61 Mon Sep 17 00:00:00 2001
+From: Peter Levine 
+Date: Thu, 17 Oct 2019 23:08:57 -0400
+Subject: Fix building against MySQL Connector/C 8
+
+In MySQL Connector/C 8, my_bool is replaced by bool. It was
+previously defined as char. When building against
+MySQL Connector/C 8, this leads to type punning build errors.
+Redefine affected members of struct BindMetaData as bool if using
+version 8 of greater. Otherwise, default to char.
+
+Change-Id: If12b975d95afae86502867cb334cb4195802f91d
+Reviewed-on: https://gerrit.libreoffice.org/81002
+Reviewed-by: Samuel Mehrbrodt 
+Tested-by: Samuel Mehrbrodt 
+---
+ .../source/drivers/mysqlc/mysqlc_preparedstatement.hxx | 10 --
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx 
b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx
+index 1df2c70..3450473 100644
+--- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx
 b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx
+@@ -39,11 +39,17 @@ using ::com::sun::star::uno::Reference;
+ using ::com::sun::star::uno::RuntimeException;
+ using ::com::sun::star::uno::Type;
+ 
++#if defined MYSQL_VERSION_ID && (MYSQL_VERSION_ID >= 8)
++using my_bool = bool;
++#else
++using my_bool = char;
++#endif
++
+ struct BindMetaData
+ {
+-char is_null = 0;
++my_bool is_null = 0;
+ unsigned long length = 0;
+-char error = 0;
++my_bool error = 0;
+ };
+ 
+ typedef ::cppu::ImplHelper5

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2019-08-13 Thread Andreas Sturmlechner 
commit: 5e2da1fbd47186791c4f3023cbdcc8d991e8d564
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Aug 13 12:37:23 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Aug 13 15:56:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e2da1fb

app-office/libreoffice: Security cleanup

Bug: https://bugs.gentoo.org/690354
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/libreoffice/Manifest|   2 -
 ...k3_kde5-non-native-fpicker-for-non-plasma.patch | 105 
 ...-set-kfilewidgets-custom-widget-only-once.patch |  42 --
 app-office/libreoffice/libreoffice-6.1.5.2.ebuild  | 575 -
 4 files changed, 724 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 738e0bcfb78..250205abdce 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -3,12 +3,10 @@ DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 
BLAKE2B c067f60d0ee325
 DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B 
a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0
 SHA512 
4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
 DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B 
d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590
 SHA512 
ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 
51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3
 SHA512 
2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
-DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B 
bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38
 SHA512 
36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
 DIST libreoffice-6.2.5.2.tar.xz 215008848 BLAKE2B 
5dd1ef185820944816e01c8ed6a7873a5a8fe6f7f4b41fad279729970d85ff868f51ed573e8b3d0a554ffd1f8e295b6ff2e493e7f7250f8cb1c7c2a40115abf4
 SHA512 
b46b6731c415ab354ad7d876cb8905cb9eae2ca71639abf049ea7f5930601c957cc0eb04a2cd06949073ba5e94778ecdb449692ed8bbfbd95b05f6e7980d8d10
 DIST libreoffice-6.2.6.2.tar.xz 214985796 BLAKE2B 
642b92c02f4fab7075dc1c6ce79c3168401fb333fe1e2cadd2008cb2d2411769710374fa35e4928a7b51831dd7a83f0caa28a0fad2dc9478dd6b62e37888a5fa
 SHA512 
6ea92025e32d0b73869139092ef8b6798e33d1f91a3af7b0202a2611b1a4376ce8019b7ca1e3b59692ff3a4f60c35acfefa7364b7f74d2d2236d72bac3d237cc
 DIST libreoffice-6.3.0.4.tar.xz 224504440 BLAKE2B 
4c006fa22dff53d3f8fd1baa5a414f9136472b13d7cd3d76a6bf055dcfe4b34aab3aa9c47b24f9b7d6aaa89691350cdf80548b7fcdb4ad8410723639d06dc576
 SHA512 
508beebf1e687e9ff668a82682561b639bd98ab85406178855b4301c7060147e1b5bea330e88d3bd7ef8de8f065d6a15d658eb436af0b03208c75d83a4deae40
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B 
f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883
 SHA512 
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B 
e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f
 SHA512 
0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f
 DIST libreoffice-help-6.2.5.2.tar.xz 13023680 BLAKE2B 
f1f3a03104c1270e59f2b9130a29e1fbc99a9bf76b2bf4cedef8dc61487c9a2036f143501ad7fcd0c056c8b72446305b7a4ca9a719b11200ade5feca35e5e7ea
 SHA512 
14f964161bd827a5846ec667ae1dac80d1485450e172da44010103e31f3872df62595e8b1b1d45c720caac9256d2adaf8f5a0bb80d059d35f1c560b533eb764c
 DIST libreoffice-help-6.2.6.2.tar.xz 13023940 BLAKE2B 
ac5cf65a391ab7d5f7030f02665d7b2e670e9b26aae068f42ce1f64e3830474958ef6d61d1721e3cd83f749e4699627b08bce97f852d607394823a95e41e7ee5
 SHA512 
bf3896d24201475fd45fc9da62833f0114bcbebbdd46b780ad9a71569c943bba04e3591da925f621cdc05b74c457a2d8d4b42ba9ce137cb018efea1d33a458c4
 DIST libreoffice-help-6.3.0.4.tar.xz 13191436 BLAKE2B 
3ad8d319ede30de5ccf7d26768388795e957d6296e794bd38d318c5a8114a41bc25bfd11d562700b4db34dd900537509175581855d8421e57595aa31d7aa3ba2
 SHA512 
1f197abb10d140037f10eb43b571b9e8f7b74b502f5bb91f4a3b4b388cd31aa81175df410321b9b401432c5ac02f9d08c7d681f07d68dd1733fb0536a1551ce8

diff --git

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2019-04-21 Thread Andreas Sturmlechner 
commit: 4d4dda59f02f0a7f8ae49f1b344985f68e9d9368
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr 20 19:02:51 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 21 11:30:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d4dda59

app-office/libreoffice: Drop 6.2.2.2

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/libreoffice/Manifest|   3 -
 .../files/libreoffice-6.2.2.2-boost-1.69.patch |  36 --
 app-office/libreoffice/libreoffice-6.2.2.2.ebuild  | 550 -
 3 files changed, 589 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index cc93fe02236..f0cddcf56c2 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -4,11 +4,8 @@ DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 
BLAKE2B a30b0225313b23
 DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B 
d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590
 SHA512 
ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 
51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3
 SHA512 
2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
 DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B 
bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38
 SHA512 
36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
-DIST libreoffice-6.2.2.2-patchset-01.tar.xz 6952 BLAKE2B 
6b6b5280c9c65b7995d49bd0a5c0667226366f498f04d747e883d21490c88fcdd5abe4348ffe37d3060d0b685d4c3c3cd5e826351b22f24b68779bc5ca9d92b3
 SHA512 
63cce0839f65962df425f212306ed65e3899c6da857f74d7ea335bd48712fab2faa1de7dbc28a5022021a408f02cb972c3bb7b511f6e1209f103b8d214e163ac
-DIST libreoffice-6.2.2.2.tar.xz 214029032 BLAKE2B 
fc95d9dcb594bd18317285ecf593fb69825ecf061f7a339b48c01c858ee0340390d635a75f9be2d522f0b8883365d013b72b52f81cded509a2748ad354b9006c
 SHA512 
f58f73fc76c57cbcbc24f63680ebc06f72cbbff9c1339c8186e70bf5f0f9ad0203ed2898ee7dd82cfb2bd0239d96a1534cec635847fe8fb50a0abe70848d2125
 DIST libreoffice-6.2.3.2-patchset-01.tar.xz 6424 BLAKE2B 
38d0be171c79345b5916e988312cac53901cadaa4d1981905822dee8ac8377954abbc36f8a82cd6bc9c9abc1bdb3863b10f425291ce1c8273e523478f42a8746
 SHA512 
0f54044ed14c69b37954c77607925ae7dc902429edaadb21d4a508e4628558ae3a172a51dbeddb3f4e87a5e82a9cd6be3badca17bed9ce2ff90fe433982f7903
 DIST libreoffice-6.2.3.2.tar.xz 214234080 BLAKE2B 
d565a7bc80cb550179ba38a1f2233bda68acf312e8966db84a72b242a10673ac81198370ffa46a7a222ad6c0654f5691404f1a17d7b0c9a60fd378d04dc6d550
 SHA512 
06c7e67c521eb9d94aa1a63464a4531b61b0fa0a8f77a0ecd1584535826232557a971471bea87dbc0b794979e1cddb201dbfdf0c4a2b4261ea63730e15cd8000
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B 
f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883
 SHA512 
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B 
e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f
 SHA512 
0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f
-DIST libreoffice-help-6.2.2.2.tar.xz 15267780 BLAKE2B 
6e5300f8cbd202ccf411d7f5d5268075e53d004b986917a382b0bcae6e3eb2a6b69ff36bbb38b23e9661f2f0df0388032dfc2156c7e2665414137e125cc83247
 SHA512 
c9aebd77aa44ea54e08c9e305aa073e29a02b11fbe118f346f2bb17a6aa8c3ff13fa3ba212a29eaa4c2b3861365bf4a8683979c5e77c57fa538ef18f4aea7ae4
 DIST libreoffice-help-6.2.3.2.tar.xz 13024476 BLAKE2B 
1d4a993b4725dfeb2993db6ad8afa4f1cc6d68f0e3e51cf712e3983b9eb3d5e092b2fea69628b5f88237c59ec568e1a02a5898bcb0f950288ece6b4408de153a
 SHA512 
3c2c05f22bebf59662ff2948b59055c2b8b962f8c717e8d894a6f0df1878cd13cce0e55d39c2cbbf7e83af61623149d757ec65495c4ed23a1e587832595be037

diff --git a/app-office/libreoffice/files/libreoffice-6.2.2.2-boost-1.69.patch 
b/app-office/libreoffice/files/libreoffice-6.2.2.2-boost-1.69.patch
deleted file mode 100644
index 0c4c38cf58c..000
--- a/app-office/libreoffice/files/libreoffice-6.2.2.2-boost-1.69.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 358637547c5bb7ae6ca637640c4279455414dbfa Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= 
-Date: Fri,

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2019-04-21 Thread Andreas Sturmlechner 
commit: a415660df5c933f62e486d68180fe12ac15bb299
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr 20 18:19:23 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 21 11:30:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a415660d

app-office/libreoffice: Update 6.2.3.2 patchset, restore keywords

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/libreoffice/Manifest|  1 +
 ...-6.2.3.1-qt5-kf5-disable-qt-hidpi-scaling.patch | 82 --
 app-office/libreoffice/libreoffice-6.2.3.2.ebuild  |  8 +--
 3 files changed, 4 insertions(+), 87 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 2bedfe043ea..cc93fe02236 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,6 +6,7 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 
BLAKE2B 51db6bd9058
 DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B 
bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38
 SHA512 
36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
 DIST libreoffice-6.2.2.2-patchset-01.tar.xz 6952 BLAKE2B 
6b6b5280c9c65b7995d49bd0a5c0667226366f498f04d747e883d21490c88fcdd5abe4348ffe37d3060d0b685d4c3c3cd5e826351b22f24b68779bc5ca9d92b3
 SHA512 
63cce0839f65962df425f212306ed65e3899c6da857f74d7ea335bd48712fab2faa1de7dbc28a5022021a408f02cb972c3bb7b511f6e1209f103b8d214e163ac
 DIST libreoffice-6.2.2.2.tar.xz 214029032 BLAKE2B 
fc95d9dcb594bd18317285ecf593fb69825ecf061f7a339b48c01c858ee0340390d635a75f9be2d522f0b8883365d013b72b52f81cded509a2748ad354b9006c
 SHA512 
f58f73fc76c57cbcbc24f63680ebc06f72cbbff9c1339c8186e70bf5f0f9ad0203ed2898ee7dd82cfb2bd0239d96a1534cec635847fe8fb50a0abe70848d2125
+DIST libreoffice-6.2.3.2-patchset-01.tar.xz 6424 BLAKE2B 
38d0be171c79345b5916e988312cac53901cadaa4d1981905822dee8ac8377954abbc36f8a82cd6bc9c9abc1bdb3863b10f425291ce1c8273e523478f42a8746
 SHA512 
0f54044ed14c69b37954c77607925ae7dc902429edaadb21d4a508e4628558ae3a172a51dbeddb3f4e87a5e82a9cd6be3badca17bed9ce2ff90fe433982f7903
 DIST libreoffice-6.2.3.2.tar.xz 214234080 BLAKE2B 
d565a7bc80cb550179ba38a1f2233bda68acf312e8966db84a72b242a10673ac81198370ffa46a7a222ad6c0654f5691404f1a17d7b0c9a60fd378d04dc6d550
 SHA512 
06c7e67c521eb9d94aa1a63464a4531b61b0fa0a8f77a0ecd1584535826232557a971471bea87dbc0b794979e1cddb201dbfdf0c4a2b4261ea63730e15cd8000
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B 
f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883
 SHA512 
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B 
e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f
 SHA512 
0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f

diff --git 
a/app-office/libreoffice/files/libreoffice-6.2.3.1-qt5-kf5-disable-qt-hidpi-scaling.patch
 
b/app-office/libreoffice/files/libreoffice-6.2.3.1-qt5-kf5-disable-qt-hidpi-scaling.patch
deleted file mode 100644
index 12f3ddc2958..000
--- 
a/app-office/libreoffice/files/libreoffice-6.2.3.1-qt5-kf5-disable-qt-hidpi-scaling.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From c3eeb421526f284419e90d2c4c4da5b0d7bbcc0e Mon Sep 17 00:00:00 2001
-From: Jan-Marek Glogowski 
-Date: Fri, 29 Mar 2019 02:58:59 +0100
-Subject: tdf#124292 Qt5 / KDE5 disable Qt's HiDPI scaling
-
-LO does its own layouting and also all the scaling, so disable
-the automatic HiDPI scaling explicitly. Otherwise fonts will be
-rendered in LoDPI and just scaled as an image, if UI scaling is
-enabled in KDE, resulting in really blocky / ugly fonts.
-
-Change-Id: I38503ce27c1671e80d0749d21c6c6dcff1a808a6
-Reviewed-on: https://gerrit.libreoffice.org/69941
-Tested-by: Jenkins
-Reviewed-by: Jan-Marek Glogowski 
-(cherry picked from commit b4698a2241ec26d796c66da3a814f7cc693785b6)
-Reviewed-on: https://gerrit.libreoffice.org/69984
-Reviewed-by: Thorsten Behrens 

- vcl/qt5/Qt5Graphics_GDI.cxx  | 4 ++--
- vcl/qt5/Qt5Instance.cxx  | 2 ++
- vcl/unx/kde5/KDE5SalGraphics.cxx | 4 ++--
- vcl/unx/kde5/KDE5SalInstance.cxx | 2 ++
- 4 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/vcl/qt5/Qt5Graphics_GDI.cxx b/vcl/qt5/Qt5Graphics_GDI.cxx
-index 90baba3..851d222 100644
 a/vcl/qt5/Qt5Graphics_GDI.cxx
-+++ b/vcl/qt5/Qt5Graphics_GDI.cxx
-@@ -643,8 +643,8 @@ void Qt5Graphics::GetResolution(sal_Int32& rDPIX, 
sal_Int32& rDPIY)
- return;
- 
- QScreen* pScreen =

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2019-04-11 Thread Andreas Sturmlechner 
commit: b1a74e52606cac591c8721fd76b458fafde394a9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Apr 10 14:59:27 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr 11 09:02:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1a74e52

app-office/libreoffice: Drop 6.2.3.1

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 app-office/libreoffice/Manifest|   2 -
 ...6.2.3.1-kf5-update-delayed-frame-destruct.patch | 113 -
 app-office/libreoffice/libreoffice-6.2.3.1.ebuild  | 549 -
 3 files changed, 664 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 0443321a6d0..2bedfe043ea 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,10 +6,8 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 
BLAKE2B 51db6bd9058
 DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B 
bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38
 SHA512 
36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
 DIST libreoffice-6.2.2.2-patchset-01.tar.xz 6952 BLAKE2B 
6b6b5280c9c65b7995d49bd0a5c0667226366f498f04d747e883d21490c88fcdd5abe4348ffe37d3060d0b685d4c3c3cd5e826351b22f24b68779bc5ca9d92b3
 SHA512 
63cce0839f65962df425f212306ed65e3899c6da857f74d7ea335bd48712fab2faa1de7dbc28a5022021a408f02cb972c3bb7b511f6e1209f103b8d214e163ac
 DIST libreoffice-6.2.2.2.tar.xz 214029032 BLAKE2B 
fc95d9dcb594bd18317285ecf593fb69825ecf061f7a339b48c01c858ee0340390d635a75f9be2d522f0b8883365d013b72b52f81cded509a2748ad354b9006c
 SHA512 
f58f73fc76c57cbcbc24f63680ebc06f72cbbff9c1339c8186e70bf5f0f9ad0203ed2898ee7dd82cfb2bd0239d96a1534cec635847fe8fb50a0abe70848d2125
-DIST libreoffice-6.2.3.1.tar.xz 214212540 BLAKE2B 
62898ab40a19e8517d32c427d68364289b73a8f13ea9c7b33f380f784908f5dbad2cbefe5e6e878c337b42306e29e2d7c574da36397b1bcd48651a519a8c04e0
 SHA512 
d835725f769af98c91ffe2e9cd6edb0361bbd7d8122ec6660fabebeec5830d14bc485ffa2b50a6bebcc72271440763e4aee427228c37ea81773bc83ef0650035
 DIST libreoffice-6.2.3.2.tar.xz 214234080 BLAKE2B 
d565a7bc80cb550179ba38a1f2233bda68acf312e8966db84a72b242a10673ac81198370ffa46a7a222ad6c0654f5691404f1a17d7b0c9a60fd378d04dc6d550
 SHA512 
06c7e67c521eb9d94aa1a63464a4531b61b0fa0a8f77a0ecd1584535826232557a971471bea87dbc0b794979e1cddb201dbfdf0c4a2b4261ea63730e15cd8000
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B 
f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883
 SHA512 
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B 
e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f
 SHA512 
0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f
 DIST libreoffice-help-6.2.2.2.tar.xz 15267780 BLAKE2B 
6e5300f8cbd202ccf411d7f5d5268075e53d004b986917a382b0bcae6e3eb2a6b69ff36bbb38b23e9661f2f0df0388032dfc2156c7e2665414137e125cc83247
 SHA512 
c9aebd77aa44ea54e08c9e305aa073e29a02b11fbe118f346f2bb17a6aa8c3ff13fa3ba212a29eaa4c2b3861365bf4a8683979c5e77c57fa538ef18f4aea7ae4
-DIST libreoffice-help-6.2.3.1.tar.xz 13023992 BLAKE2B 
5cb0f6081f60cf2ac6fe9e1e8715c5e48a4e8769a44dda1dd8a66aed18992710c6075a18ff19d3c5dba136d41396da42fd66d9ce1f1cc4d5fbc77a5c04f72e6d
 SHA512 
1bc10999401bd7fe2a7454eb036675fd43cca9c4d0ef817f28c82cb6d3818afd44428b75fd31b2dac84a77a79f0a026679fd582ffa572b79bba38de1470f8857
 DIST libreoffice-help-6.2.3.2.tar.xz 13024476 BLAKE2B 
1d4a993b4725dfeb2993db6ad8afa4f1cc6d68f0e3e51cf712e3983b9eb3d5e092b2fea69628b5f88237c59ec568e1a02a5898bcb0f950288ece6b4408de153a
 SHA512 
3c2c05f22bebf59662ff2948b59055c2b8b962f8c717e8d894a6f0df1878cd13cce0e55d39c2cbbf7e83af61623149d757ec65495c4ed23a1e587832595be037

diff --git 
a/app-office/libreoffice/files/libreoffice-6.2.3.1-kf5-update-delayed-frame-destruct.patch
 
b/app-office/libreoffice/files/libreoffice-6.2.3.1-kf5-update-delayed-frame-destruct.patch
deleted file mode 100644
index 17843e007e0..000
--- 
a/app-office/libreoffice/files/libreoffice-6.2.3.1-kf5-update-delayed-frame-destruct.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From d622be2d6bcfcc2c7260421e0eaa09c76ce15da2 Mon Sep 17 00:00:00 2001
-From: Aleksei Nikiforov 
-Date: Wed, 6 Mar 2019 16:10:17 +0300
-Subject: tdf#123406 KDE5: Update delayed frame destruction
-
-Move deleteLater() call to the different event loop.
-This fixes issue with frames not being disposed of
-deterministically, and previously opened window
-not reactivating.
-
-Also hide modal dialog window before

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2019-03-30 Thread Andreas Sturmlechner 
commit: b324a1984c21621342927fd072e7f5b1d5186855
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 28 19:21:52 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Mar 30 09:58:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b324a198

app-office/libreoffice: Add 6.2.2.2-patchset-01, build w/ boost-1.69

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/libreoffice/Manifest|  1 +
 .../files/libreoffice-6.2.2.2-boost-1.69.patch | 36 ++
 app-office/libreoffice/libreoffice-6.2.2.2.ebuild  |  6 ++--
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 735ca6411ec..b514ed85f2f 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,6 +6,7 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 
BLAKE2B 51db6bd9058
 DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B 
bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38
 SHA512 
36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
 DIST libreoffice-6.2.1.1-patchset-01.tar.xz 8404 BLAKE2B 
6fd1a3e931a1d3ef040e0e79ff53299fb47a55bf36f98998ebb896738a639aca8844bf6a5bb5fcbf3a5afeae935cb3e637436dcba456df005d00d5ed5a80e0d0
 SHA512 
eff36e8b5af2a592572ed60d9f22f59d8611dd5f62977ad93aa957181173d479a19f5907673b0f7532bfcca728a12a20101f2282914a34e0f0a53fd53e682ef3
 DIST libreoffice-6.2.1.2.tar.xz 213885668 BLAKE2B 
b1b15dacfded68e9ce2c183e211928d732564ef0a51a967216545d8ff39bf52e72ecbcb53672cc9d967cb4474fc10efbd97e3d9107d3f7169138c62e8221f212
 SHA512 
0d18e5f470b3e8a70d1679c7acdc91887c2032e1eb452308d257a6bc02d42e93fec66709c84838f7565e42217ac1d2b121e3356f7c754fc7ee33b7c6f0ef
+DIST libreoffice-6.2.2.2-patchset-01.tar.xz 6952 BLAKE2B 
6b6b5280c9c65b7995d49bd0a5c0667226366f498f04d747e883d21490c88fcdd5abe4348ffe37d3060d0b685d4c3c3cd5e826351b22f24b68779bc5ca9d92b3
 SHA512 
63cce0839f65962df425f212306ed65e3899c6da857f74d7ea335bd48712fab2faa1de7dbc28a5022021a408f02cb972c3bb7b511f6e1209f103b8d214e163ac
 DIST libreoffice-6.2.2.2.tar.xz 214029032 BLAKE2B 
fc95d9dcb594bd18317285ecf593fb69825ecf061f7a339b48c01c858ee0340390d635a75f9be2d522f0b8883365d013b72b52f81cded509a2748ad354b9006c
 SHA512 
f58f73fc76c57cbcbc24f63680ebc06f72cbbff9c1339c8186e70bf5f0f9ad0203ed2898ee7dd82cfb2bd0239d96a1534cec635847fe8fb50a0abe70848d2125
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B 
f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883
 SHA512 
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B 
e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f
 SHA512 
0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f

diff --git a/app-office/libreoffice/files/libreoffice-6.2.2.2-boost-1.69.patch 
b/app-office/libreoffice/files/libreoffice-6.2.2.2-boost-1.69.patch
new file mode 100644
index 000..0c4c38cf58c
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.2.2.2-boost-1.69.patch
@@ -0,0 +1,36 @@
+From 358637547c5bb7ae6ca637640c4279455414dbfa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= 
+Date: Fri, 15 Mar 2019 16:16:31 +0100
+Subject: Fix build with boost 1.69
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is also fixed with master with boost bump which we do not need
+here.
+
+Change-Id: I61caec10c0c6d442cef3d51c31eaff01f18b89e3
+Reviewed-on: https://gerrit.libreoffice.org/69310
+Reviewed-by: Tomáš Chvátal 
+Tested-by: Tomáš Chvátal 
+Reviewed-by: Caolán McNamara 
+Tested-by: Caolán McNamara 
+---
+ sfx2/source/appl/shutdownicon.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sfx2/source/appl/shutdownicon.cxx 
b/sfx2/source/appl/shutdownicon.cxx
+index e917c3a..8a51e5c 100644
+--- a/sfx2/source/appl/shutdownicon.cxx
 b/sfx2/source/appl/shutdownicon.cxx
+@@ -143,7 +143,7 @@ bool LoadModule()
+ #endif // ENABLE_QUICKSTART_APPLET
+ }
+ assert(!boost::logic::indeterminate(loaded));
+-return loaded;
++return bool(loaded);
+ }
+ 
+ }
+-- 
+cgit v1.1

diff --git a/app-office/libreoffice/libreoffice-6.2.2.2.ebuild 
b/app-office/libreoffice/libreoffice-6.2.2.2.ebuild
index 6dfffd2394c..abd92a269e1 100644
--- a/app-office/libreoffice/libreoffice-6.2.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.2.2.ebuild
@@ -18,7 +18,7 @@ DEV_URI="

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2019-02-01 Thread Andreas Sturmlechner 
commit: 2f661486a6cbd40050d651f9e76cb66709bed663
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jan 31 23:07:10 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Feb  1 20:14:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f661486

app-office/libreoffice: Set KFileWidget's custom widget only once

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...-set-kfilewidgets-custom-widget-only-once.patch | 42 ++
 app-office/libreoffice/libreoffice-6.1.5.2.ebuild  |  1 +
 2 files changed, 43 insertions(+)

diff --git 
a/app-office/libreoffice/files/libreoffice-6.1.5.2-gtk3_kde5-set-kfilewidgets-custom-widget-only-once.patch
 
b/app-office/libreoffice/files/libreoffice-6.1.5.2-gtk3_kde5-set-kfilewidgets-custom-widget-only-once.patch
new file mode 100644
index 000..69134a8b992
--- /dev/null
+++ 
b/app-office/libreoffice/files/libreoffice-6.1.5.2-gtk3_kde5-set-kfilewidgets-custom-widget-only-once.patch
@@ -0,0 +1,42 @@
+From 7b54f3db98e96231fc9f16429f325cdb1f37498c Mon Sep 17 00:00:00 2001
+From: Michael Weghorn 
+Date: Thu, 31 Jan 2019 09:52:51 +0100
+Subject: tdf#123077 gtk3_kde5: Set KFileWidget's custom widget only once
+
+Since the event filter is only used to set the custom
+widget in the KFileWidget, it can and needs to be removed
+again once this has been done; which also avoids crashes.
+
+(s. https://gerrit.libreoffice.org/#/c/67185/ for more
+infos, where the same thing is done for kde5)
+
+Change-Id: I5c719fb17510916b4730ed5c00bb638df2f183e3
+Reviewed-on: https://gerrit.libreoffice.org/67184
+Tested-by: Jenkins
+Reviewed-by: Michael Weghorn 
+(cherry picked from commit 30cc54a4532a732a0cf6dfe9943521978ff7292f)
+Reviewed-on: https://gerrit.libreoffice.org/67203
+Reviewed-by: Katarina Behrens 
+---
+ vcl/unx/gtk3_kde5/kde5_filepicker.cxx | 4 
+ 1 file changed, 4 insertions(+)
+
+diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx 
b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
+index 33f64ad0..9914869 100644
+--- a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
 b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
+@@ -265,7 +265,11 @@ bool KDE5FilePicker::eventFilter(QObject* o, QEvent* e)
+ {
+ KWindowSystem::setMainWindow(w, _winId);
+ if (auto* fileWidget = w->findChild({}, 
Qt::FindDirectChildrenOnly))
++{
+ fileWidget->setCustomWidget(_extraControls);
++// remove event filter again; the only purpose was to set the 
custom widget here
++qApp->removeEventFilter(this);
++}
+ }
+ }
+ return QObject::eventFilter(o, e);
+-- 
+cgit v1.1
+

diff --git a/app-office/libreoffice/libreoffice-6.1.5.2.ebuild 
b/app-office/libreoffice/libreoffice-6.1.5.2.ebuild
index e59e17836c2..3524ee2f86e 100644
--- a/app-office/libreoffice/libreoffice-6.1.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.5.2.ebuild
@@ -252,6 +252,7 @@ PATCHES=(
 
# master branch
"${FILESDIR}/${P}-gtk3_kde5-non-native-fpicker-for-non-plasma.patch"
+   
"${FILESDIR}/${P}-gtk3_kde5-set-kfilewidgets-custom-widget-only-once.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2019-01-30 Thread Andreas Sturmlechner 
commit: 1a56c58363c145383ff826c630902a8ad8b636eb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jan 30 18:44:48 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan 30 22:29:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a56c583

app-office/libreoffice: 6.1.5.2 version bump (still no keywords)

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/libreoffice/Manifest|   2 +
 ...k3_kde5-non-native-fpicker-for-non-plasma.patch | 105 
 app-office/libreoffice/libreoffice-6.1.5.2.ebuild  | 575 +
 3 files changed, 682 insertions(+)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 753822f5ce2..771a184197b 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,9 +5,11 @@ 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 
fab7f0bb6fb113c0bfa8bbc0424568c37a04f301d6e44f5755dcbb21cc6df964819a2e143b10f5c6352bfbea438df0b136ba55caf7be383bcebba4ceadae
+DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B 
bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38
 SHA512 
36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
 DIST libreoffice-6.2.0.3-patchset-01.tar.xz 12284 BLAKE2B 
1585764ea7441f422f72e616fa5dff77d3997ae20410016092f35d0743f9629f17d0ecf6f0002a92a9de894d82bcf3cf22cee5124b9a5f280ea086c1ec285a6f
 SHA512 
3a0dcee15440e74ef70aafee983951249193f0dac2b0bf48926265db01ea098486b2c3cd46178f533f3cfc20f7cadd9353c7a3d2c4bfe53812d0fe4a1fd86e22
 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.1.5.2.tar.xz 15758000 BLAKE2B 
e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f
 SHA512 
0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f
 DIST libreoffice-help-6.2.0.3.tar.xz 16186548 BLAKE2B 
95d7fbdaac774032f5ddac121eec5ace9f7964a112f8137d8cf3b999e4ba6685048c027b5635283de9913547c2776ba9b9ab7e28b97cf94fac536decc12fda98
 SHA512 
7b1c7949ede3fdd6dcc09fd38b62f17d68c5f79e75fb72cedb9d55889d8d8cf261d6614aa5e2e3eae3e26764b2cdb0e4344bef25851daef6041ac3935ad64fb1

diff --git 
a/app-office/libreoffice/files/libreoffice-6.1.5.2-gtk3_kde5-non-native-fpicker-for-non-plasma.patch
 
b/app-office/libreoffice/files/libreoffice-6.1.5.2-gtk3_kde5-non-native-fpicker-for-non-plasma.patch
new file mode 100644
index 000..30253e0b973
--- /dev/null
+++ 
b/app-office/libreoffice/files/libreoffice-6.1.5.2-gtk3_kde5-non-native-fpicker-for-non-plasma.patch
@@ -0,0 +1,105 @@
+From

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2019-01-23 Thread Andreas Sturmlechner 
commit: d678e7ae57b537f75179aaed8307b9212140eb22
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jan 23 20:55:56 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan 23 22:52:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d678e7ae

app-office/libreoffice: Drop 6.2.0.2

Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/libreoffice/Manifest|   2 -
 .../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 -
 6 files changed, 964 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 15390722f85..5effcd09b23 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,10 +5,8 @@ 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 
fab7f0bb6fb113c0bfa8bbc0424568c37a04f301d6e44f5755dcbb21cc6df964819a2e143b10f5c6352bfbea438df0b136ba55caf7be383bcebba4ceadae
-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

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 9899f5864ca..000
--- 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:

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2019-01-07 Thread Andreas Sturmlechner 
commit: 9005e78b82e88f88b1685d2453de977b20818e62
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan  8 00:16:23 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan  8 00:17:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9005e78b

app-office/libreoffice: Fix build with poppler-0.71, poppler-0.72

Bug: https://bugs.gentoo.org/670692
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../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   |  26 
 app-office/libreoffice/libreoffice-6.2..ebuild |   9 +-
 4 files changed, 270 insertions(+), 1 deletion(-)

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
new file mode 100644
index 000..9899f5864ca
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-1.patch
@@ -0,0 +1,164 @@
+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, ) ),
++m_pUtf8Map( new UnicodeMap("UTF-8", true, ) ),
+ 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*/
+

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2018-12-13 Thread Andreas Sturmlechner 
commit: 62efa8c1c4d870cfa0dfe7f4fe7af87ffe65a380
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Dec 13 10:59:13 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Dec 13 11:01:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62efa8c1

app-office/libreoffice: Drop upstreamed patch

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/libreoffice-6.1.4.1-gtk3_kde5-fix.patch  | 47 --
 app-office/libreoffice/libreoffice-6.1.4.2.ebuild  |  3 --
 2 files changed, 50 deletions(-)

diff --git 
a/app-office/libreoffice/files/libreoffice-6.1.4.1-gtk3_kde5-fix.patch 
b/app-office/libreoffice/files/libreoffice-6.1.4.1-gtk3_kde5-fix.patch
deleted file mode 100644
index 5f970b058f4..000
--- a/app-office/libreoffice/files/libreoffice-6.1.4.1-gtk3_kde5-fix.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 8e395b1c1476122963082861c02adaa976d91e9b Mon Sep 17 00:00:00 2001
-From: Michael Weghorn 
-Date: Tue, 04 Dec 2018 14:42:31 +0100
-Subject: [PATCH] tdf#121399 Join cmd reading thread in gtk3_kde5
-
-Stop reading commands from the pipe on kde5 side once
-the "Quit" command has been sent, in order to have
-the thread that is reading commands from stdin finish
-properly.
-
-Join the thread in the 'FilePickerIpc' destructor, rather than
-just deleting it while it may still be running, which
-resulted in 'terminate()' being called.
-
-Change-Id: Ia184987e7994cc1de0208ff2757a3cf06c8b7194

-
-diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx 
b/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx
-index 550e1d8..a2ea6b7 100644
 a/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx
-+++ b/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx
-@@ -192,6 +192,12 @@
- readCommandArgs(command, args);
- 
- emit ipc->commandReceived(messageId, command, args);
-+
-+// stop processing once 'Quit' command has been sent
-+if (command == Commands::Quit)
-+{
-+return;
-+}
- }
- }
- 
-@@ -211,7 +217,11 @@
- m_ipcReaderThread = std::unique_ptr{ new 
std::thread(readCommands, this) };
- }
- 
--FilePickerIpc::~FilePickerIpc() = default;
-+FilePickerIpc::~FilePickerIpc()
-+{
-+// join thread that reads commands
-+m_ipcReaderThread->join();
-+};
- 
- bool FilePickerIpc::handleCommand(uint64_t messageId, Commands command, 
QList args)
- {

diff --git a/app-office/libreoffice/libreoffice-6.1.4.2.ebuild 
b/app-office/libreoffice/libreoffice-6.1.4.2.ebuild
index f297a839ea8..6070b09e9e5 100644
--- a/app-office/libreoffice/libreoffice-6.1.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.4.2.ebuild
@@ -249,9 +249,6 @@ PATCHES=(
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
-
-   # pending upstream review
-   "${FILESDIR}/${P}-gtk3_kde5-fix.patch" # tdf#121399
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2018-12-13 Thread Andreas Sturmlechner 
commit: f3c3373bf27b6999f95e5c6c5426d91563031918
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Dec  4 20:33:00 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Dec 13 09:54:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3c3373b

app-office/libreoffice: 6.1.4.2 version bump

Includes gtk3_kde5 fix finally upstreamed:
See also: https://bugs.documentfoundation.org/show_bug.cgi?id=121399

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/libreoffice/Manifest|   2 +
 .../files/libreoffice-6.1.4.1-gtk3_kde5-fix.patch  |  47 ++
 app-office/libreoffice/libreoffice-6.1.4.2.ebuild  | 575 +
 3 files changed, 624 insertions(+)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 7166e1ecaf7..6307cf38e9d 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,6 +7,8 @@ DIST libreoffice-6.0.5.2-patchset-01.tar.xz 39820 BLAKE2B 
d8b436378b05a8a5815681
 DIST libreoffice-6.0.6.2.tar.xz 205022916 BLAKE2B 
715d24c7bbfe4d570011f5090cf647421f68e73fb76047ec0fb973ec0bfb30be3ec1d521bdd92369e23abaa444e7afd3e070ff613486e8f85b9ca76d9496fd0e
 SHA512 
8cf7bd4d8f81ee09f8a21c4ccb12f788c67cf1cba71e08b9b720f9e8b4ec2dfcc25452ef05b6b60529463241c2b23a70eb6a79a8f15b95e890a2ea9cbb458517
 DIST libreoffice-6.1.3.1-patchset-01.tar.xz 5068 BLAKE2B 
5152903a580bbf44b40cb219c6d875753be354893470e6c5bad1b214ef3835529f3d1ba359baa362268d2b2bc72b698d4b319e0900e39c8dbfe9bfcfaaf0c171
 SHA512 
3cbf149f43ca89c1c22e6a67d6a66bc59e538588412b5363e662ee27ed764cd728fceffe141c7a49ea5c049640737e2fbbf673095397f422af9ae9b33af9e139
 DIST libreoffice-6.1.3.2.tar.xz 207404836 BLAKE2B 
d0ba57f8ca93a6bc4406ec21f1338659714af00afb861dca324a21af50abae160f3512bc1c0c5fbac23dfc24e7d8d855e377cb7e71e7ed3991456e922cb09d44
 SHA512 
1d3de497cbda49df6a59b550a18db5fc92f67ff522ba7432dea7052099226a260997c2efa0a59ce861c3bd921d7d569738721c5ed6efbd8a24e74c52eae5c484
+DIST libreoffice-6.1.4.2.tar.xz 207710664 BLAKE2B 
52bab412094c1ff7e184ea65c588360c18b061c3e14b7be07171f6b5831261766e2ac7d7373f5f789d125671da41e8b67d34360d4b7014dcb98df01828aeb094
 SHA512 
ba81b7744b908f9fe67a83e72c17c08b3b2e99599a5fd4f9cc1f2d81b3fd0ddb8065ae466205f85185ab9420350cea0b2d60108df3e583b74bd1fcd9e4eb0c3c
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B 
f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883
 SHA512 
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-6.0.6.2.tar.xz 2972748 BLAKE2B 
38534d5fd08751af587fd5b5be03b39b086e2bc26878c50e98bafd7a2b48f517ac29b8d434748449b0a3e8a451c31f40255094d64965800aadfd94c111295be5
 SHA512 
89caab57774f85f3e58523c0debb57247a0f10959634bf296aaacc4928bcce6ea8ed9f167b267e2e0eeb52b69714eeb094fedfa3e810cf409dfbc7c5e49b7c13
 DIST libreoffice-help-6.1.3.2.tar.xz 15757496 BLAKE2B 
cebfe42728c0374c355ba8d449d1858e9596b19d76b689c5eac422fa8cc749fec88e0a44fcc55e4c13cfab7a8219f565bd62944e004b7afb6f2e1fb3571c2dde
 SHA512 
e52c9ff796696ab3dc6d32b468f3ca13f346b999a7bdbbffb7811eb8b7b347f4feb9ee02ff500f8b9e64cc246bc171a6166fcbd43e79a9ee75e2dafe37df9994
+DIST libreoffice-help-6.1.4.2.tar.xz 15757700 BLAKE2B 
53c398efb3b839740a9146ea1b0f70f019936c914f7aedf38b7da69faf532ab139a8847d6eb251b2850511e0e7bd169c74fafedd0926dc987659aa27878cf740
 SHA512 
e24f2f6795856da62f77ebfdcfedc8190b8ecef74e395fc263f0cab4a27c0fe3d95f37665747a590fc7a6a93c6c3473a2a4501c50d415cc602f85838955fe9ab

diff --git 
a/app-office/libreoffice/files/libreoffice-6.1.4.1-gtk3_kde5-fix.patch 
b/app-office/libreoffice/files/libreoffice-6.1.4.1-gtk3_kde5-fix.patch
new file mode 100644
index 000..5f970b058f4
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.1.4.1-gtk3_kde5-fix.patch
@@ -0,0 +1,47 @@
+From 8e395b1c1476122963082861c02adaa976d91e9b Mon Sep 17 00:00:00 2001
+From: Michael Weghorn 
+Date: Tue, 04 Dec 2018 14:42:31 +0100
+Subject: [PATCH] tdf#121399 Join cmd reading thread in gtk3_kde5
+
+Stop reading commands from the pipe on kde5 side once
+the "Quit" command has been sent, in order to have
+the thread that is reading commands from stdin finish
+properly.
+
+Join the thread in the 'FilePickerIpc' destructor, rather than
+just deleting it while it may still be running, which
+resulted in 'terminate()' being called.
+
+Change-Id: Ia184987e7994cc1de0208ff2757a3cf06c8b7194
+---
+
+diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx 
b/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx
+index 550e1d8..a2ea6b7 100644
+--- a/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx
 b/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx
+@@ -192,6 +192,12 @@
+ readCommandArgs(command, args);
+ 
+ emit ipc->commandReceived(messageId, command, args);
++
++// stop processing once 'Quit'

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2018-10-01 Thread Andreas Sturmlechner 
commit: 6902ac4c0f3bf4480323f980dbc249899f93c13b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Oct  1 17:35:41 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Oct  1 18:12:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6902ac4c

app-office/libreoffice: Drop 6.0.3.2

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 app-office/libreoffice/Manifest|   3 -
 ...libreoffice-6.0.3.2-disable-flaky-tests-2.patch |  37 --
 .../files/libreoffice-6.0.3.2-poppler-0.64.patch   |  71 ---
 .../files/libreoffice-6.0.4.2-glm-0.9.9.patch  |  34 --
 app-office/libreoffice/libreoffice-6.0.3.2.ebuild  | 578 -
 5 files changed, 723 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 54ee7ef00ab..6258b4e18a4 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -3,12 +3,9 @@ DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 
BLAKE2B c067f60d0ee325
 DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B 
a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0
 SHA512 
4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
 DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B 
d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590
 SHA512 
ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 
51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3
 SHA512 
2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
-DIST libreoffice-6.0.3.2-patchset-01.tar.xz 39268 BLAKE2B 
0bf5ad04323cbd2cf157dacc96aa9d3344d683f3303e5c284a83c0f8783d23881402393f2361d4db1270cf75424ff6f12e5b16540b3f7ccb624c29ccc8c71416
 SHA512 
f6632afe1c7bcdfb1ca82059d299f808e5eee982c176aa2cc5d728e11b833c3fe921c9c627847bc12128ae5e32c901cbbdfec0b71a22bb9a4b5041b645ed934f
-DIST libreoffice-6.0.3.2.tar.xz 203747760 BLAKE2B 
8a666aa2e3e880b050ac8eed93a1c55ddbfa7ce74364b0dff4f5be446cf64c4fe347b164716a7d226c6cfbac01dbd3f11b89ecff75460ccd902ac44fe93d5daa
 SHA512 
d1ec8982f185926d3f3040bcdef737e7c74fcf5b360a12a91983eac92843510553759ffa84c7d244df13036fc32149ffe13dd6a56fb1bda6f64fd5a318fd7879
 DIST libreoffice-6.0.5.2-patchset-01.tar.xz 39820 BLAKE2B 
d8b436378b05a8a58156817b5d1e0323fd6fcfde9aa9fc4fc6a8056a06a16c84c5860ffe1ae715faddb707c5aa417b43e6c7f5c05821f86208edbb3778d830a1
 SHA512 
ec99a6358c0a20075abc0aa136ad6ccded4562fa0f25897efe2a8783fb33b97b92a2dd8041206b3344a79dfd10ebe98b79c8bf0b4e8539e45942978f0028dc59
 DIST libreoffice-6.0.6.2.tar.xz 205022916 BLAKE2B 
715d24c7bbfe4d570011f5090cf647421f68e73fb76047ec0fb973ec0bfb30be3ec1d521bdd92369e23abaa444e7afd3e070ff613486e8f85b9ca76d9496fd0e
 SHA512 
8cf7bd4d8f81ee09f8a21c4ccb12f788c67cf1cba71e08b9b720f9e8b4ec2dfcc25452ef05b6b60529463241c2b23a70eb6a79a8f15b95e890a2ea9cbb458517
 DIST libreoffice-6.1.1.2.tar.xz 207211808 BLAKE2B 
9c60f6153a82903252102056d27ae412350200fcdb8dfc8cbefeb92bd50eebfbd11bda06e20f35d19320591f9cfdfa53c9f1fda8c66d2bee66c59c37f27753be
 SHA512 
c3429fbd247c4b17f4e140751fcb1e593705aa60911556c4dfc960ebaa6fe50a39d933d14bfc3c89cdd92619f41611eb1aa0090fe9d391d84989d206005af3ea
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B 
f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883
 SHA512 
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-6.0.3.2.tar.xz 2972952 BLAKE2B 
90b62af89bbdec436e8ca5ede3aa8aa57109e22136d454850a108fd4aac1eace166432be8152d623b06ba9e04001a579b3200bbbd20caa1ac6c3b97026319dd3
 SHA512 
cb538553efd94c7a6f9059b6fb74351adba5449d7f458fd0337950528be2bbb7ddf7aaef4992eb18f432c42133d17bf8f0af9d3fe29eddd9d620ab847a40
 DIST libreoffice-help-6.0.6.2.tar.xz 2972748 BLAKE2B 
38534d5fd08751af587fd5b5be03b39b086e2bc26878c50e98bafd7a2b48f517ac29b8d434748449b0a3e8a451c31f40255094d64965800aadfd94c111295be5
 SHA512 
89caab57774f85f3e58523c0debb57247a0f10959634bf296aaacc4928bcce6ea8ed9f167b267e2e0eeb52b69714eeb094fedfa3e810cf409dfbc7c5e49b7c13
 DIST libreoffice-help-6.1.1.2.tar.xz 15757536 BLAKE2B 
5e93bb65c6e42f924bd1c782e472f247b97cb9264c671d932a71cf67813d529c363a8664eeca48b407a0882ad2d0d7392cffcfddea0f35f0c62881b3c11d70ce
 SHA512

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2018-08-13 Thread Andreas Sturmlechner 
commit: 095c5bf482eabd752e5bb99e8465308be58005e0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Aug 13 21:46:23 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Aug 13 21:46:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=095c5bf4

app-office/libreoffice: Drop 6.0.5.2

Package-Manager: Portage-2.3.46, Repoman-2.3.10

 app-office/libreoffice/Manifest|   3 -
 .../libreoffice-6.0.5.2-enable-gio-w-gtk3.patch|  46 --
 .../libreoffice/libreoffice-6.0.5.2-r1.ebuild  | 571 -
 3 files changed, 620 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 660e471cb3a..27cd54fc0d0 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,10 +6,7 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 
BLAKE2B 51db6bd9058
 DIST libreoffice-6.0.3.2-patchset-01.tar.xz 39268 BLAKE2B 
0bf5ad04323cbd2cf157dacc96aa9d3344d683f3303e5c284a83c0f8783d23881402393f2361d4db1270cf75424ff6f12e5b16540b3f7ccb624c29ccc8c71416
 SHA512 
f6632afe1c7bcdfb1ca82059d299f808e5eee982c176aa2cc5d728e11b833c3fe921c9c627847bc12128ae5e32c901cbbdfec0b71a22bb9a4b5041b645ed934f
 DIST libreoffice-6.0.3.2.tar.xz 203747760 BLAKE2B 
8a666aa2e3e880b050ac8eed93a1c55ddbfa7ce74364b0dff4f5be446cf64c4fe347b164716a7d226c6cfbac01dbd3f11b89ecff75460ccd902ac44fe93d5daa
 SHA512 
d1ec8982f185926d3f3040bcdef737e7c74fcf5b360a12a91983eac92843510553759ffa84c7d244df13036fc32149ffe13dd6a56fb1bda6f64fd5a318fd7879
 DIST libreoffice-6.0.5.2-patchset-01.tar.xz 39820 BLAKE2B 
d8b436378b05a8a58156817b5d1e0323fd6fcfde9aa9fc4fc6a8056a06a16c84c5860ffe1ae715faddb707c5aa417b43e6c7f5c05821f86208edbb3778d830a1
 SHA512 
ec99a6358c0a20075abc0aa136ad6ccded4562fa0f25897efe2a8783fb33b97b92a2dd8041206b3344a79dfd10ebe98b79c8bf0b4e8539e45942978f0028dc59
-DIST libreoffice-6.0.5.2-patchset-02.tar.xz 43072 BLAKE2B 
bcd6406b06bef83ac26e227bc77fed76b67e11f0150a23015e8c83c7092b8efd6f35ec8bbac12bbfda6c597ebaa1782391a624b10a7af0bface6b480b6603802
 SHA512 
fe764e02cff85a064f8b25e34b3f3558a9fc65051da154e94654c2322e8f50487a97b699a6ab886ec9db00d31a8ca544aaf0b93794e03d17fbbe90b83b44124d
-DIST libreoffice-6.0.5.2.tar.xz 204795724 BLAKE2B 
d027e83dc5f3908af25975354f8d0ef9a4a9a4fb601dada54d04cdc5bc6d0a0dbedda89ac0cf5bbe88da29382431bddfd331e56b63b88e9f5a23b9299c65b61a
 SHA512 
796ce4b54adc2b1b032f1f125425141a1c584a9f7dd145ed677916ba7a28c11e895a34ff8bf34cc208d15408cb3ea0c0942546300d1be6309bd9ad6544400684
 DIST libreoffice-6.0.6.2.tar.xz 205022916 BLAKE2B 
715d24c7bbfe4d570011f5090cf647421f68e73fb76047ec0fb973ec0bfb30be3ec1d521bdd92369e23abaa444e7afd3e070ff613486e8f85b9ca76d9496fd0e
 SHA512 
8cf7bd4d8f81ee09f8a21c4ccb12f788c67cf1cba71e08b9b720f9e8b4ec2dfcc25452ef05b6b60529463241c2b23a70eb6a79a8f15b95e890a2ea9cbb458517
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B 
f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883
 SHA512 
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-6.0.3.2.tar.xz 2972952 BLAKE2B 
90b62af89bbdec436e8ca5ede3aa8aa57109e22136d454850a108fd4aac1eace166432be8152d623b06ba9e04001a579b3200bbbd20caa1ac6c3b97026319dd3
 SHA512 
cb538553efd94c7a6f9059b6fb74351adba5449d7f458fd0337950528be2bbb7ddf7aaef4992eb18f432c42133d17bf8f0af9d3fe29eddd9d620ab847a40
-DIST libreoffice-help-6.0.5.2.tar.xz 2972956 BLAKE2B 
cfe585fb690bc0a348b67aae1330daa61a0a08acc580fad147853d84c9496d0ad4c4b14598492d4aba9af4afe7fa65bff0161a77b1c0cae9089d50e2a542e0c1
 SHA512 
975c547e59280e08e554bc658642660fc17e5785b45254b40f969f4b42088d5a350dec72ae6b6f1aa60d7bc95bd9d2c2134f6b395ee86e6f9f5af09f52cc50e1
 DIST libreoffice-help-6.0.6.2.tar.xz 2972748 BLAKE2B 
38534d5fd08751af587fd5b5be03b39b086e2bc26878c50e98bafd7a2b48f517ac29b8d434748449b0a3e8a451c31f40255094d64965800aadfd94c111295be5
 SHA512 
89caab57774f85f3e58523c0debb57247a0f10959634bf296aaacc4928bcce6ea8ed9f167b267e2e0eeb52b69714eeb094fedfa3e810cf409dfbc7c5e49b7c13

diff --git 
a/app-office/libreoffice/files/libreoffice-6.0.5.2-enable-gio-w-gtk3.patch 
b/app-office/libreoffice/files/libreoffice-6.0.5.2-enable-gio-w-gtk3.patch
deleted file mode 100644
index 4a018711ca2..000
--- a/app-office/libreoffice/files/libreoffice-6.0.5.2-enable-gio-w-gtk3.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From a560bcbea943cb317e96c15c608c5e2f66e5698f Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann 
-Date: Thu, 31 May 2018 14:14:48 +0200
-Subject: --enable-gio also for --disable-gtk --enable-gtk3
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-...as is used by the Flatpak build.  Other settings only checked in that block
-controlled by ENABLE_GTK, and thus potentially erronously left empty for
---disable-gtk --enable-gtk3 builds, are GTHREAD- and

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2018-06-10 Thread Andreas Sturmlechner 
commit: 83ed8a066140b12e87fd7a6c5adbefa59854858e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun 10 11:47:33 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jun 10 14:42:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83ed8a06

app-office/libreoffice: Use upstream patch, add to 6.0 stable branch

Closes: https://bugs.gentoo.org/657178
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../files/libreoffice-6.0.4.2-glm-0.9.9.patch  | 23 ++
 app-office/libreoffice/libreoffice-5.4.7.2.ebuild  |  3 ++-
 app-office/libreoffice/libreoffice-6.0.3.2.ebuild  |  2 ++
 app-office/libreoffice/libreoffice-6.0.4.2.ebuild  |  3 ++-
 app-office/libreoffice/libreoffice-6.0..ebuild |  2 ++
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/app-office/libreoffice/files/libreoffice-6.0.4.2-glm-0.9.9.patch 
b/app-office/libreoffice/files/libreoffice-6.0.4.2-glm-0.9.9.patch
index ea667d03ceb..1430fdf1a34 100644
--- a/app-office/libreoffice/files/libreoffice-6.0.4.2-glm-0.9.9.patch
+++ b/app-office/libreoffice/files/libreoffice-6.0.4.2-glm-0.9.9.patch
@@ -1,9 +1,22 @@
-Fix build with >=media-libs/glm-0.9.9
-https://bugs.gentoo.org/657178
-https://bugs.documentfoundation.org/show_bug.cgi?id=118070
+From 5f1bf6598b5725ad1e50ae9f7ec7524cc8a834fa Mon Sep 17 00:00:00 2001
+From: Louis Sautier 
+Date: Sun, 10 Jun 2018 12:25:18 +0200
+Subject: Fix build with GLM 0.9.9.0, tdf#118070
 
+One of the test files was forgotten in 953c4add8fd76d88f49a81ae4c21a1fdcc007e57
+
+Change-Id: I0315433c688ff7edb2ba599bbef203cac9de3022
+Reviewed-on: https://gerrit.libreoffice.org/4
+Reviewed-by: Rene Engelhard 
+Tested-by: Rene Engelhard 
+---
+ vcl/Executable_icontest.mk | 6 ++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk
+index ce16330..8c917b7 100644
 --- a/vcl/Executable_icontest.mk
-+++ a/vcl/Executable_icontest.mk
 b/vcl/Executable_icontest.mk
 @@ -19,6 +19,12 @@ $(eval $(call gb_Executable_use_externals,icontest,\
  ))
  endif
@@ -17,3 +30,5 @@ https://bugs.documentfoundation.org/show_bug.cgi?id=118070
  $(eval $(call gb_Executable_use_api,icontest,\
  offapi \
  udkapi \
+-- 
+cgit v1.1

diff --git a/app-office/libreoffice/libreoffice-5.4.7.2.ebuild 
b/app-office/libreoffice/libreoffice-5.4.7.2.ebuild
index 7f73e8fc0a4..a2e8ed475fa 100644
--- a/app-office/libreoffice/libreoffice-5.4.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.7.2.ebuild
@@ -233,11 +233,12 @@ PATCHES=(
"${FILESDIR}/${PN}-5.4.4.2-poppler-0.62.patch" # bug 642602
"${FILESDIR}/${PN}-6.0.3.2-poppler-0.64.patch" # bug 653478
"${FILESDIR}/${P}-glm-0.9.9.patch" # bug 657178
+   # 6.1 branch
+   "${FILESDIR}/${PN}-6.0.4.2-glm-0.9.9.patch" # bug 657178
 
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
"${FILESDIR}/${PN}-5.4.4.2-gtk3-no-gtk-build.patch" # bug 641812
-   "${FILESDIR}/${PN}-6.0.4.2-glm-0.9.9.patch" # bug 657178
 )
 
 pkg_pretend() {

diff --git a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild 
b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
index 837b49a029d..04b8d2c4851 100644
--- a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
@@ -248,6 +248,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.0.3.2-disable-flaky-tests-{1,2}.patch #bug 656676
# 6.0 branch
"${FILESDIR}/${P}-poppler-0.64.patch"
+   # 6.1 branch
+   "${FILESDIR}/${PN}-6.0.4.2-glm-0.9.9.patch" # bug 657178
 
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"

diff --git a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild 
b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
index 304982e8d2d..aedc4d06fbf 100644
--- a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
@@ -247,11 +247,12 @@ PATCHES=(
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests-1.patch" #bug 656676
+   # 6.1 branch
+   "${FILESDIR}/${P}-glm-0.9.9.patch" # bug 657178
 
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
"${FILESDIR}/${PN}-6.0.3.2-testTdf108947.patch" #bug 656600
-   "${FILESDIR}/${P}-glm-0.9.9.patch" # bug 657178
 
# gtk3-kde5 vcl plugin backported from master
"${WORKDIR}"/${PATCHSET/.tar.xz/}

diff --git a/app-office/libreoffice/libreoffice-6.0..ebuild 
b/app-office/libreoffice/libreoffice-6.0..ebuild
index b1c28905c33..58a7a8a3240 100644
--- a/app-office/libreoffice/libreoffice-6.0..ebuild
+++ b/app-office/libreoffice/libreoffice-6.0..ebuild
@@ -247,6 +247,8 @@ PATCHES=(
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2018-05-27 Thread Andreas Sturmlechner 
commit: 8c1d5c1246d2cfd5321004c519addda8f819cdee
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May 27 22:56:51 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 27 22:58:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c1d5c12

app-office/libreoffice: Tests are unfixable

Bug: https://bugs.gentoo.org/656676
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../libreoffice-6.0.3.2-disable-flaky-tests.patch  | 216 +
 .../libreoffice-6.0.3.2-testODFEncryptedGPG.patch  |  89 -
 app-office/libreoffice/libreoffice-6.0.3.2.ebuild  |   2 +-
 app-office/libreoffice/libreoffice-6.0.4.2.ebuild  |   1 +
 app-office/libreoffice/libreoffice-6.0..ebuild |   1 +
 5 files changed, 219 insertions(+), 90 deletions(-)

diff --git 
a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests.patch 
b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests.patch
new file mode 100644
index 000..03421c5e12b
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests.patch
@@ -0,0 +1,216 @@
+Kindly borrowed from Debian.
+
+14:13 < mst__> _rene_, the toolkit unoapi tests are known to be flaky (in some 
+   system dependent way) e.g. on the Win@6 tinderbox it always 
+   crashes
+14:14 < mst__> _rene_, sc.ScAccessible* tests also fail on some systems some 
of 
+   the time
+
+diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk
+index 25db0b6..14e507c 100644
+--- a/toolkit/Module_toolkit.mk
 b/toolkit/Module_toolkit.mk
+@@ -26,11 +26,11 @@ $(eval $(call gb_Module_add_targets,toolkit,\
+ ifneq ($(OOO_JUNIT_JAR),)
+ $(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\
+ JunitTest_toolkit_complex \
+-JunitTest_toolkit_unoapi_1 \
+-JunitTest_toolkit_unoapi_2 \
+-JunitTest_toolkit_unoapi_3 \
+-JunitTest_toolkit_unoapi_4 \
+ ))
+ endif
++#JunitTest_toolkit_unoapi_1 \
++#JunitTest_toolkit_unoapi_2 \
++#JunitTest_toolkit_unoapi_3 \
++#JunitTest_toolkit_unoapi_4 \
+ 
+ # vim: set noet sw=4 ts=4:
+diff --git a/sc/qa/unoapi/sc_1.sce b/sc/qa/unoapi/sc_1.sce
+index fa1684c..cc8e1a5 100644
+--- a/sc/qa/unoapi/sc_1.sce
 b/sc/qa/unoapi/sc_1.sce
+@@ -24,10 +24,3 @@
+ # i84554 -o sc.AccessibleEditableTextPara_PreviewNote
+ # i88241 -o sc.AccessibleEditableTextPara_HeaderFooter
+ -o sc.AccessibleEditableTextPara_PreviewCell
+--o sc.ScAccessibleCell
+-# i91044 -o sc.ScAccessibleCsvCell
+-# i91044 -o sc.ScAccessibleCsvGrid
+-# i84641 -o sc.ScAccessibleCsvRuler
+-# i88330 -o sc.ScAccessibleDocument
+-# i91045 -o sc.ScAccessibleDocumentPagePreview
+--o sc.ScAccessiblePageHeader
+diff --git a/sc/qa/unoapi/sc_2.sce b/sc/qa/unoapi/sc_2.sce
+index dbfc3e1..d235c5d 100644
+--- a/sc/qa/unoapi/sc_2.sce
 b/sc/qa/unoapi/sc_2.sce
+@@ -15,11 +15,6 @@
+ #   except in compliance with the License. You may obtain a copy of
+ #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ #
+-# fdo#FOO -o sc.ScAccessiblePageHeaderArea
+--o sc.ScAccessiblePreviewCell
+--o sc.ScAccessiblePreviewHeaderCell
+--o sc.ScAccessiblePreviewTable
+-# fdo#45337 -o sc.ScAccessibleSpreadsheet
+ # FIXME_REMOVE_WHEN_RE_BASE_COMPLETE
+ # -o sc.ScAnnotationObj
+ # -o sc.ScAnnotationShapeObj
+
+12:18 < _rene_> chris_wot: ping?
+12:18 < chris_wot> heya
+12:18 < chris_wot> you pinged?
+12:19 < _rene_> chris_wot: any news on 
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815292?
+12:20 < _rene_> (of course the this-night-uploaded rc3 also failed)
+12:21 < chris_wot> ah, sorry - I've looked at an EMF regression, but I've not 
+   gotten any further on that one
+12:22 < chris_wot> I honestly think that for this one just disable the test 
for 
+   now
+12:22 < chris_wot> I'll ping the ML
+
+This seems fixed when opening the original doc.
+
+diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+index 54eed4d..78019bd 100644
+--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
 b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+@@ -1128,30 +1128,30 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, 
"no-numlevel-but-indented.odt")
+ 
+ 
+ 
+-DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt")
+-{
+-xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+-if (!pXmlDoc)
+-return;
+-// there should be no flipH and flipV attributes in this case
+-assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH");
+-assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV");
+-// check rotation angle
+-assertXPath(pXmlDoc, "//a:xfrm", "rot", "1350");
+-// check the first few coordinates of the polygon
+-#ifndef MACOSX /* Retina-related rounding roundtrip error
+-* hard to smooth out due to the use of string compare
+-* instead of number */
+-#if !defined(_WIN32)

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2018-05-27 Thread Andreas Sturmlechner 
commit: 0578a158a4943a264c38f9fc4f68d9060b74190b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May 27 19:52:46 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 27 19:53:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0578a158

app-office/libreoffice: Fix testODFEncryptedGPG, fix test deps

Thanks-to: Thomas Deutschmann  gentoo.org>
Closes: https://bugs.gentoo.org/656676
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../libreoffice-6.0.3.2-testODFEncryptedGPG.patch  | 89 ++
 .../files/libreoffice-6.0.3.2-testTdf108947.patch  |  2 +-
 app-office/libreoffice/libreoffice-6.0.3.2.ebuild  |  2 +
 app-office/libreoffice/libreoffice-6.0.4.2.ebuild  |  1 +
 app-office/libreoffice/libreoffice-6.0..ebuild |  1 +
 app-office/libreoffice/libreoffice-.ebuild |  1 +
 6 files changed, 95 insertions(+), 1 deletion(-)

diff --git 
a/app-office/libreoffice/files/libreoffice-6.0.3.2-testODFEncryptedGPG.patch 
b/app-office/libreoffice/files/libreoffice-6.0.3.2-testODFEncryptedGPG.patch
new file mode 100644
index 000..9cde8407ab4
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.0.3.2-testODFEncryptedGPG.patch
@@ -0,0 +1,89 @@
+From 74d438f716d9cef165c78f950d4c53a46c37503c Mon Sep 17 00:00:00 2001
+From: Rene Engelhard 
+Date: Sun, 18 Mar 2018 22:25:36 +0100
+Subject: gpg4libre: fix failing gpg test due to over-long filenames
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This squashes the following commits:
+
+From f68929ac611fdda19c1ee413effc59d33aa5ef97 Mon Sep 17 00:00:00 2001
+From: Thorsten Behrens 
+Date: Fri, 9 Mar 2018 01:38:26 +0100
+Subject: gpg4libre: fix failing gpg test due to over-long filenames
+
+With long workdir path, gpg sometimes fails with 'gpg: can't connect
+to the agent: File name too long' error.
+WK recommends to create preferred socket dir under /run/user, needs
+prepping though via gpgconf.
+
+See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=84720
+
+From d7ecf4a4e37a9eeffa2b40f9fe5a2e6a8f90c876 Mon Sep 17 00:00:00 2001
+From: Rene Engelhard 
+Date: Sun, 18 Mar 2018 11:25:41 +0100
+Subject: properly check for gpgconf (and --create-socketdir) working
+
+From d6ed1d415d36809d784af780231258ea0ee1024f Mon Sep 17 00:00:00 2001
+From: Rene Engelhard 
+Date: Sun, 18 Mar 2018 19:06:58 +0100
+Subject: actually add GPGCONF to config_host.mk.in
+
+From 7a95ee8d0badb2cbbd137a6e18af1bada35ae933 Mon Sep 17 00:00:00 2001
+From: Rene Engelhard 
+Date: Sun, 18 Mar 2018 19:26:45 +0100
+Subject: actually add HAVE_GPGCONF_SOCKETDIR to config_host.mk.in...
+
+From 5204a5145d8232ea0650144fb4756c38303ef06e Mon Sep 17 00:00:00 2001
+From: Rene Engelhard 
+Date: Sun, 18 Mar 2018 19:28:55 +0100
+Subject: revert accidentially comitted local changes :(
+
+From bc358d39ac985914160e8aaa23b29469470c032b Mon Sep 17 00:00:00 2001
+From: Rene Engelhard 
+Date: Sun, 18 Mar 2018 20:36:45 +0100
+Subject: this is sh, not make...
+
+Change-Id: I7880fd7eee57cedc19b72348b45f0c1389409fe6
+Reviewed-on: https://gerrit.libreoffice.org/51521
+Tested-by: Jenkins 
+Reviewed-by: Caolán McNamara 
+Tested-by: Caolán McNamara 
+---
+ xmlsecurity/CppunitTest_xmlsecurity_signing.mk | 14 +-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+(limited to 'xmlsecurity/CppunitTest_xmlsecurity_signing.mk')
+
+diff --git a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk 
b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
+index c382e3b..2f3ed41 100644
+--- a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
 b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
+@@ -52,11 +52,23 @@ ifeq ($(ENABLE_PDFIMPORT),TRUE)
+ $(eval $(call gb_CppunitTest_use_executable,xmlsecurity_signing,xpdfimport))
+ endif
+ 
+-# reset the LD_LIBRARY_PATH for spawned GPG processes
++# various hacks to make unit test work on Linux more often
+ ifeq ($(OS),LINUX)
++# reset the LD_LIBRARY_PATH for spawned GPG processes
+ $(call gb_CppunitTest_get_target,xmlsecurity_signing): \
+ EXTRA_ENV_VARS := \
+ LIBO_LD_PATH=$$LD_LIBRARY_PATH
++
++ifneq (,$(HAVE_GPGCONF_SOCKETDIR))
++# create socket dir below /run/user/ instead of in workdir
++.PHONY : gb_CppunitTest_run_gpgconf
++gb_CppunitTest_run_gpgconf:
++  GNUPGHOME=$(WORKDIR)/CppunitTest/xmlsecurity_signing.test.user \
++  $(GPGCONF) --create-socketdir
++
++$(call gb_CppunitTest_get_target,xmlsecurity_signing): \
++gb_CppunitTest_run_gpgconf
++endif
+ endif
+ 
+ # vim: set noet sw=4 ts=4:
+-- 
+cgit v1.1

diff --git 
a/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch 
b/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch
index 5973b6ae67c..bd84b316252 100644
---

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2018-05-27 Thread Andreas Sturmlechner 
commit: 24e9c1dd16b659539872f9ac11c765b179d99d0b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May 27 06:28:31 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 27 06:29:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24e9c1dd

app-office/libreoffice: Fix testTdf108947

Thanks-to: Thomas Deutschmann  gentoo.org>
Closes: https://bugs.gentoo.org/656600
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-office/libreoffice/Manifest |  2 +-
 .../files/libreoffice-6.0.3.2-testTdf108947.patch   | 13 +
 app-office/libreoffice/libreoffice-6.0.3.2.ebuild   |  1 +
 app-office/libreoffice/libreoffice-6.0.4.2.ebuild   |  1 +
 app-office/libreoffice/libreoffice-6.0..ebuild  |  1 +
 5 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index fd4255c15c3..9001ff98b4c 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -13,4 +13,4 @@ DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B 
f03c7ddeb53c5ca3fd234
 DIST libreoffice-help-5.4.5.1.tar.xz 2343180 BLAKE2B 
bd36ecae88313b60e9ad220f8ce47185e070e275d873741e96a98fd6d2dbf546b579fc304c1931775de86734710d2b91542ee9c9749b6036fe8e443cfecb60ed
 SHA512 
b3860dd592207f83b8c6613fdb42962a9e175f6e850282cef6380869add7fe81c7292fdd145f2e2616f8113e2c18f6ed60210d4a182c1be021d7a1db61c9d89d
 DIST libreoffice-help-5.4.7.2.tar.xz 2343112 BLAKE2B 
690c147e8bfdea9d1860131ad8528e2e2eea64da7293c8b7c3a4ad07e771749573b69fb11bed8c8c171b5760ec67a0a3b30eab06e38e5a725ffc11d0959c71c6
 SHA512 
8abd0bbf70dcfd5cf0ad713c8d34be541ddd27cda98403cbb331b62a4099c08b14be784362b857a41b8b2c756d01e36f043b97bdd5062a2bddeae29b8b70f6a2
 DIST libreoffice-help-6.0.3.2.tar.xz 2972952 BLAKE2B 
90b62af89bbdec436e8ca5ede3aa8aa57109e22136d454850a108fd4aac1eace166432be8152d623b06ba9e04001a579b3200bbbd20caa1ac6c3b97026319dd3
 SHA512 
cb538553efd94c7a6f9059b6fb74351adba5449d7f458fd0337950528be2bbb7ddf7aaef4992eb18f432c42133d17bf8f0af9d3fe29eddd9d620ab847a40
-DIST libreoffice-help-6.0.4.2.tar.xz 2972636 BLAKE2B 
0528ad30fc754269a94a4b2a0c9eab26ecb707b1e9a230686a982a24215fbc91016813fecef687499ee4cfb49228febbfbaaaff7371053d130adefd705a1bb49
 SHA512 
ebdfc93e8dd5e44b6fc5baa087c86777b91bb18008809dc493dd0ddaf143b26c50349f99cc884678cb6db3f8d60b615c9a816872e73ceddeec8be126d65d2651
+DIST libreoffice-help-6.0.4.2.tar.xz 699430 BLAKE2B 
b7ddf775f31efa9e5b033d9cd09d944b8104a1781699d87a7e90a83c94812fbc8ce33f588d3ec2bebede114bc69e57b91ecaabdb3f1e6212637f6ca888e46481
 SHA512 
20fe01479e13a493f264d441830be902534fbf57dcdcde66787512534d15df29519e88bb69da8781a7d95e81a72f9bb2dd94a435fcff9ca7ded346fcd6f1b090

diff --git 
a/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch 
b/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch
new file mode 100644
index 000..5973b6ae67c
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch
@@ -0,0 +1,13 @@
+diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
+index 457aedce0acb..4f02cf2b4040 100644
+--- a/sw/qa/extras/rtfimport/rtfimport.cxx
 b/sw/qa/extras/rtfimport/rtfimport.cxx
+@@ -1352,7 +1352,7 @@ DECLARE_RTFIMPORT_TEST(testImportHeaderFooter, 
"tdf108055.rtf")
+ DECLARE_RTFIMPORT_TEST(testTdf108947, "tdf108947.rtf")
+ {
+ //Check page count
+-CPPUNIT_ASSERT_EQUAL(2, getPages());
++CPPUNIT_ASSERT_EQUAL(1, getPages());
+ 
+ //Check if Headers/Footers contain what they should in this document
+ uno::Reference xHeaderTextRight = 
getProperty(
\ No newline at end of file

diff --git a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild 
b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
index f2f3c1674e6..b95fd784f38 100644
--- a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
@@ -249,6 +249,7 @@ PATCHES=(
 
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+   "${FILESDIR}/${PN}-6.0.3.2-testTdf108947.patch" #bug 656600
 
# gtk3-kde5 vcl plugin backported from master
"${WORKDIR}"/${PATCHSET/.tar.xz/}

diff --git a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild 
b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
index c29d9ffa33d..f50cbbd0996 100644
--- a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
@@ -248,6 +248,7 @@ PATCHES=(
 
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+   "${FILESDIR}/${PN}-6.0.3.2-testTdf108947.patch" #bug 656600
 
# gtk3-kde5 vcl plugin backported from master
"${WORKDIR}"/${PATCHSET/.tar.xz/}

diff --git a/app-office/libreoffice/libreoffice-6.0..ebuild 
b/app-office/libreoffice/libreoffice-6.0..ebuild
index c29d9ffa33d..f50cbbd0996

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2018-04-25 Thread Andreas Sturmlechner 
commit: 81d0795c69b29a666e67a14ccaed0f0f846a268b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Apr 25 15:07:23 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Apr 25 16:14:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81d0795c

app-office/libreoffice: Fix build with poppler-0.64

Bug: https://bugs.gentoo.org/653478
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-office/libreoffice/Manifest|  2 +-
 .../files/libreoffice-6.0.3.2-poppler-0.64.patch   | 71 ++
 app-office/libreoffice/libreoffice-6.0.3.2.ebuild  |  2 +
 3 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index b9c41dd67e4..3b6fd2b2796 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -9,4 +9,4 @@ DIST libreoffice-6.0.3.2-patchset-01.tar.xz 39268 BLAKE2B 
0bf5ad04323cbd2cf157da
 DIST libreoffice-6.0.3.2.tar.xz 203747760 BLAKE2B 
8a666aa2e3e880b050ac8eed93a1c55ddbfa7ce74364b0dff4f5be446cf64c4fe347b164716a7d226c6cfbac01dbd3f11b89ecff75460ccd902ac44fe93d5daa
 SHA512 
d1ec8982f185926d3f3040bcdef737e7c74fcf5b360a12a91983eac92843510553759ffa84c7d244df13036fc32149ffe13dd6a56fb1bda6f64fd5a318fd7879
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B 
f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883
 SHA512 
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-5.4.5.1.tar.xz 2343180 BLAKE2B 
bd36ecae88313b60e9ad220f8ce47185e070e275d873741e96a98fd6d2dbf546b579fc304c1931775de86734710d2b91542ee9c9749b6036fe8e443cfecb60ed
 SHA512 
b3860dd592207f83b8c6613fdb42962a9e175f6e850282cef6380869add7fe81c7292fdd145f2e2616f8113e2c18f6ed60210d4a182c1be021d7a1db61c9d89d
-DIST libreoffice-help-6.0.3.2.tar.xz 2972952 BLAKE2B 
90b62af89bbdec436e8ca5ede3aa8aa57109e22136d454850a108fd4aac1eace166432be8152d623b06ba9e04001a579b3200bbbd20caa1ac6c3b97026319dd3
 SHA512 
cb538553efd94c7a6f9059b6fb74351adba5449d7f458fd0337950528be2bbb7ddf7aaef4992eb18f432c42133d17bf8f0af9d3fe29eddd9d620ab847a40
+DIST libreoffice-help-6.0.3.2.tar.xz 593680 BLAKE2B 
940657b776913772267c8c37d80238206b7c921993091085e5042348a50a9cf8aaa4ed225a2f1a364693dd68aa4690381c1dd206155e56fb4e1200b6d4afd30b
 SHA512 
e19a896fa50a9a26280a9c1b0ce0cbac9dc5e9dfc58481b6b4c17cf6094c3d717570184497117f8486b2ad5f2706c11eeb9d70bb261d7cc6587b4c44ee95bb66

diff --git 
a/app-office/libreoffice/files/libreoffice-6.0.3.2-poppler-0.64.patch 
b/app-office/libreoffice/files/libreoffice-6.0.3.2-poppler-0.64.patch
new file mode 100644
index 000..37a554d807d
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.0.3.2-poppler-0.64.patch
@@ -0,0 +1,71 @@
+From 106b2c96e9807af14d6eb6e8f83dcf25095a093e Mon Sep 17 00:00:00 2001
+From: Rene Engelhard 
+Date: Tue, 24 Apr 2018 15:56:23 +0200
+Subject: fix build with poppler 0.64
+
+GooString became const...
+
+Change-Id: Icc95be2e8603a4e22c6a9ac2008986bacd0bfba5
+Reviewed-on: https://gerrit.libreoffice.org/53422
+Tested-by: Jenkins 
+Reviewed-by: Michael Stahl 
+---
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 10 ++
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |  4 
+ 2 files changed, 14 insertions(+)
+
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index 00fd56a..9618e5b 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
 b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -446,6 +446,9 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* 
gfxFont, GfxState* state )
+ FontAttributes aNewFont;
+ int nSize = 0;
+ 
++#if POPPLER_CHECK_VERSION(0, 64, 0)
++const
++#endif
+ GooString* pFamily = gfxFont->getName();
+ if( pFamily )
+ {
+@@ -742,6 +745,9 @@ void PDFOutDev::updateFont(GfxState *state)
+ FontAttributes aFont;
+ int nEmbedSize=0;
+ 
++#if POPPLER_CHECK_VERSION(0, 64, 0)
++const
++#endif
+ Ref* pID = gfxFont->getID();
+ // TODO(Q3): Portability problem
+ long long fontID = (long long)pID->gen << 32 | (long long)pID->num;
+@@ -932,7 +938,11 @@ void PDFOutDev::drawChar(GfxState *state, double x, 
double y,
+ printf( "\n" );
+ }
+ 
++#if POPPLER_CHECK_VERSION(0, 64, 0)
++void PDFOutDev::drawString(GfxState*, const GooString* /*s*/)
++#else
+ void PDFOutDev::drawString(GfxState*, GooString* /*s*/)
++#endif
+ {
+ // TODO(F3): NYI
+ }
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+index 922c513..2a6268c 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2017-12-21 Thread Andreas Sturmlechner 
commit: 7226ed963a079dbffc4cb3d19fa0f1670ea2eb89
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Dec 21 12:22:55 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Dec 21 13:27:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7226ed96

app-office/libreoffice: Fix build with USE="gtk3 -gtk"

Thanks-to: Ostashevskyi Viktor  ostash.kiev.ua>
Closes: https://bugs.gentoo.org/641812
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../files/libreoffice-5.4.4.2-gtk3-no-gtk-build.patch   | 13 +
 app-office/libreoffice/libreoffice-5.4.4.2.ebuild   |  1 +
 2 files changed, 14 insertions(+)

diff --git 
a/app-office/libreoffice/files/libreoffice-5.4.4.2-gtk3-no-gtk-build.patch 
b/app-office/libreoffice/files/libreoffice-5.4.4.2-gtk3-no-gtk-build.patch
new file mode 100644
index 000..f0e2c55c936
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.4.4.2-gtk3-no-gtk-build.patch
@@ -0,0 +1,13 @@
+Fix build with USE="gtk3 -gtk"
+https://bugs.gentoo.org/641812
+
+--- a/vcl/unx/gtk3/gtk3gtkframe.cxx2017-12-12 18:45:07.0 +0100
 b/vcl/unx/gtk3/gtk3gtkframe.cxx2017-12-21 13:20:31.935843032 +0100
+@@ -21,6 +21,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 

diff --git a/app-office/libreoffice/libreoffice-5.4.4.2.ebuild 
b/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
index f9f51d5951b..666dc122a41 100644
--- a/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
@@ -245,6 +245,7 @@ PATCHES=(
 
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+   "${FILESDIR}/${P}-gtk3-no-gtk-build.patch" # bug 641812
 )
 
 pkg_pretend() {

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2017-10-08 Thread Andreas Sturmlechner 
commit: 9ad71f4d0dea39b8ee4b081477b40faabde51625
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Oct  8 11:17:05 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Oct  8 11:21:36 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ad71f4d

app-office/libreoffice: Drop old

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 app-office/libreoffice/Manifest|   5 -
 .../files/libreoffice-5.3-system-pyuno.patch   |  47 --
 app-office/libreoffice/libreoffice-5.3.4.2.ebuild  | 581 
 app-office/libreoffice/libreoffice-5.4.0.3.ebuild  | 586 -
 4 files changed, 1219 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 2c54740bd46..49349ce18c0 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -3,16 +3,11 @@ DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 
SHA256 eafde646a7dbe46
 DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 SHA256 
64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 SHA512 
4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
 WHIRLPOOL 
a5156d06323699d2cbf539f14f5f44f54ebf33e86c7f14e98acd4c6e29c3e496f91dd6792401148ffa32e3dcb1cd4f087ed804e306b241cef86de0aa347d25d4
 DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 
555291 SHA256 b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb 
SHA512 
1e8a39205f21206d239871bd636f17768eb3997e08ba065ca537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8
 WHIRLPOOL 
d809712c3fcaca922d64f67a14d9dc3e750ecf359687c7ba0e8c6c7fc7750e43721a21ce29d5a3b0b87b83bfe7b71947e701ba4aed0a337ec35ecbb22d8dec34
 DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 
1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512 
ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
 WHIRLPOOL 
8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4
-DIST 86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz 1794694 SHA256 
41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f SHA512 
20b0c0ba517c764fcd32165254ae6dcdda8fb72ca3279dbfcf42d899e91d380b78d9be3b1c3d32910eaad5544a4fc51218e32579b10e6b6639338a7bd8b1ddc5
 WHIRLPOOL 
f4d783d01346860ed2cf1d15e692e70e65034bee120c853cf7692358799a6e3339a1bb022f4d72ee4364a43766aa01770070a0081d1adcc588e4f84786f9
 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 
2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
 WHIRLPOOL 
60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
 DIST ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz 1769329 SHA256 
3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 SHA512 
2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5
 WHIRLPOOL 
29ddaef03d46fe08aa2dba200be755817f8e77de33ed86dae65e891239f3051f79fdfadec6ae56023197e32e1c44a94385a1ce306081f3bf94be6226f8c7
 DIST libepubgen-0.0.1.tar.bz2 376956 SHA256 
eea910b042526ed52f7ab9292b7fa31fca32f9e042285818074ff33664db4fa2 SHA512 
1665e5f4708b4c296b9075fa7ab250b3571ebcb42e51c4d195f63eb1969b9014e7490cc2a80dda608eb21e0b127cf7eb8911ed3e5aaa46a89dcad8748618f62a
 WHIRLPOOL 
5b2a7e3878f87e5ca1c353f9ca82daf01946699eb974d3f4092157c916117716ba4ba4969c05da02ad8f08fdd4324dae585fefe332814e004b40cd56b8ef0df1
 DIST libreoffice-5.2.7.2.tar.xz 184589464 SHA256 
106154a72a329605166a49bfa31c6d1cc03133d600ad0ef340b45e4e2a92891d SHA512 
f7414a0d0d654d1d9bd6c5524ff2acf2f21c544dd6ed79f4f2d22f79db46264f95f7ca8dd482027f7a573d2d491ea6c8d9875b262d5e2b917dfddb749a3ea95f
 WHIRLPOOL 
28d7f9531190a16bdea14c5dcc710ef593085fddca1b4d7d0cd6107d5f93e4b94a1ae035a626376ab7abfcd926a263b1437de1e52011bb96aa6d87b046a38da8
-DIST libreoffice-5.3.4.2.tar.xz 188762904 SHA256 
1d75393fd8b02b1e2e2e001bc0262359c7452e29a0fff35cb152717246f02379 SHA512 
ac3b0a0615577faf6c2529b7ec888fd7969d32f38d8b83a3747535bc408e8d2ef2e724f5b1840ae79a219bb855584be87f10ab26ef101afe04dd15d224e6ebc0
 WHIRLPOOL 
4b314f2df7ee8bd80049cc6ad04e65df11a46a20853f0a285389cf2c72006dd122f1826ae0080c7efc41faa251b77a48f839f345451d993b48bc673d6e450aed
-DIST libreoffice-5.4.0.3.tar.xz 192134108 SHA256 
17b29d05349b0db15f606f2d630e84c0969c89af6bd06aad8d75a074ee2add94 SHA512 
53d081c937acd48c17a9a1f04c55e2e7a420765251c4b507aaf52467b5c2538683c810ba0559598c24ddb6475ee2f5eebb9a1bf97fd805bb72e61b84fb6638f9
 WHIRLPOOL

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2017-02-26 Thread Andreas Sturmlechner 
commit: d09290006a6203b3fad5375584a98b2ce46ad8f1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb 26 18:35:53 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb 26 18:37:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0929000

app-office/libreoffice: Fix system-pyuno patch, missing deps

--disable-pdfium until it is packaged

Thanks-to: jospezial  gmx.de>
Gentoo-bug: 609050, 609054

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../files/libreoffice-5.4-system-pyuno.patch   | 42 ++
 app-office/libreoffice/libreoffice-.ebuild | 10 --
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/app-office/libreoffice/files/libreoffice-5.4-system-pyuno.patch 
b/app-office/libreoffice/files/libreoffice-5.4-system-pyuno.patch
new file mode 100644
index 00..83b56d1a19
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.4-system-pyuno.patch
@@ -0,0 +1,42 @@
+--- a/desktop/scripts/soffice.sh   
 a/desktop/scripts/soffice.sh   
+@@ -147,6 +147,9 @@ if echo "$checks" | grep -q "cc" ; then
+ exit 1;
+ fi
+ 
++PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
++export PYTHONPATH
++
+ case "$(uname -s)" in
+ NetBSD|OpenBSD|DragonFly)
+ # this is a temporary hack until we can live with the default search paths
+--- a/pyuno/source/module/uno.py   
 a/pyuno/source/module/uno.py   
+@@ -16,11 +16,16 @@ 
+ #   except in compliance with the License. You may obtain a copy of
+ #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ #
++import os
+ import pyuno
+ import sys
+ import traceback
+ import warnings
+ 
++sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program')
++if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
++os.environ['URE_BOOTSTRAP'] = 
"vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc"
++
+ # since on Windows sal3.dll no longer calls WSAStartup
+ import socket
+ 
+--- a/pyuno/source/officehelper.py 
 a/pyuno/source/officehelper.py 
+@@ -45,7 +45,7 @@ def bootstrap():
+ if "UNO_PATH" in os.environ:
+ sOffice = os.environ["UNO_PATH"]
+ else:
+-sOffice = "" # lets hope for the best
++sOffice = "%eprefix%/usr/%libdir%/libreoffice/program"
+ sOffice = os.path.join(sOffice, "soffice")
+ if platform.startswith("win"):
+ sOffice += ".exe"

diff --git a/app-office/libreoffice/libreoffice-.ebuild 
b/app-office/libreoffice/libreoffice-.ebuild
index edc20fcdbb..c2b9b736ca 100644
--- a/app-office/libreoffice/libreoffice-.ebuild
+++ b/app-office/libreoffice/libreoffice-.ebuild
@@ -89,7 +89,7 @@ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
app-arch/zip
-   app-crypt/gpgme
+   app-crypt/gpgme[cxx]
app-text/hunspell
>=app-text/libabw-0.1.0
>=app-text/libebook-0.1
@@ -112,6 +112,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/expat
dev-libs/hyphen
dev-libs/icu:=
+   dev-libs/libassuan
+   dev-libs/libgpg-error
>=dev-libs/liborcus-0.12.1
dev-libs/librevenge
dev-libs/nspr
@@ -244,7 +246,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 
 PATCHES=(
# not upstreamable stuff
-   "${FILESDIR}/${PN}-5.3-system-pyuno.patch"
+   "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
 
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
@@ -434,6 +436,7 @@ src_configure() {
# --disable-report-builder: too much java packages pulled in without 
pkgs
# --without-system-sane: just sane.h header that is used for scan in 
writer,
#   not linked or anything else, worthless to depend on
+   # --disable-pdfium: not yet packaged
econf \
--with-system-dicts \
--with-system-epoxy \
@@ -454,6 +457,7 @@ src_configure() {
--disable-fetch-external \
--disable-gstreamer-0-10 \
--disable-online-update \
+   --disable-pdfium \
--disable-report-builder \
--with-alloc=$(use jemalloc && echo "jemalloc" || echo 
"system") \
--with-build-version="Gentoo official package" \
@@ -471,7 +475,7 @@ src_configure() {
--without-myspell-dicts \
--without-help \
--with-helppack-integration \
-   --with-system-gpgme \
+   --with-system-gpgmepp \
--without-system-sane \
$(use_enable bluetooth sdremote-bluetooth) \
$(use_enable coinmp) \

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2016-11-06 Thread Andreas Hüttel 
commit: 4cce2604f53246e27d7d67de23e9b481887445fa
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Nov  6 18:39:42 2016 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sun Nov  6 18:42:48 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cce2604

app-office/libreoffice: Backport icu-58 compatibility

Package-Manager: portage-2.3.2

 .../libreoffice/files/libreoffice-5.2-icu58.patch  | 289 +
 app-office/libreoffice/libreoffice-5.2.3.3.ebuild  |   3 +
 app-office/libreoffice/libreoffice-5.2..ebuild |   3 +
 3 files changed, 295 insertions(+)

diff --git a/app-office/libreoffice/files/libreoffice-5.2-icu58.patch 
b/app-office/libreoffice/files/libreoffice-5.2-icu58.patch
new file mode 100644
index ..57fe6dc
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.2-icu58.patch
@@ -0,0 +1,289 @@
+From 3e42714c76b1347babfdea0564009d8d82a83af4 Mon Sep 17 00:00:00 2001
+From: Eike Rathke 
+Date: Wed, 2 Nov 2016 13:07:48 +0100
+Subject: [PATCH] upgrade to ICU 58
+
+Change-Id: I4a992447df65b337721a2a2627d974172a14cba5
+Reviewed-on: https://gerrit.libreoffice.org/30487
+Reviewed-by: Eike Rathke 
+Tested-by: Eike Rathke 
+---
+ configure.ac   |  2 +-
+ download.lst   |  2 +-
+ external/icu/icu-ubsan.patch.0 | 11 --
+ external/icu/icu4c-warnings.patch  | 12 --
+ .../source/breakiterator/breakiterator_unicode.cxx | 12 ++
+ i18nutil/source/utility/unicode.cxx| 26 +
+ include/svx/ucsubset.hrc   | 11 ++
+ svx/source/dialog/charmap.cxx  | 35 +
+ svx/source/dialog/ucsubset.src | 44 ++
+ 9 files changed, 130 insertions(+), 25 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f06ef8e..66a11a9 100644
+--- a/configure.ac
 b/configure.ac
+@@ -9136,7 +9136,7 @@ SYSTEM_GENBRK=
+ SYSTEM_GENCCODE=
+ SYSTEM_GENCMN=
+ 
+-ICU_MAJOR=57
++ICU_MAJOR=58
+ ICU_MINOR=1
+ ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
+ ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE"
+diff --git a/download.lst b/download.lst
+index 4571338..0770a4d 100644
+--- a/download.lst
 b/download.lst
+@@ -62,7 +62,7 @@ export HARFBUZZ_TARBALL := harfbuzz-1.3.2.tar.bz2
+ export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+ export HUNSPELL_TARBALL := 
33d370f7fe5a030985e445a5672b2067-hunspell-1.4.1.tar.gz
+ export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
+-export ICU_TARBALL := 976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz
++export ICU_TARBALL := 1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz
+ export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ export JFREEREPORT_FLUTE_TARBALL := 
d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ export JFREEREPORT_LIBBASE_TARBALL := 
eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+diff --git a/external/icu/icu-ubsan.patch.0 b/external/icu/icu-ubsan.patch.0
+index 6d1d3bc..8a47242 100644
+--- a/external/icu/icu-ubsan.patch.0
 b/external/icu/icu-ubsan.patch.0
+@@ -151,14 +151,3 @@
+length(len), next(subNode) {}
+  virtual UBool operator==(const Node ) const;
+  virtual int32_t markRightEdgesFirst(int32_t edgeNumber);
+ source/common/unifiedcache.h
+-+++ source/common/unifiedcache.h
+-@@ -139,7 +139,7 @@
+-: CacheKey(other), fLoc(other.fLoc) { }
+-virtual ~LocaleCacheKey() { }
+-virtual int32_t hashCode() const {
+--   return 37 *CacheKey::hashCode() + fLoc.hashCode();
+-+   return 37U *CacheKey::hashCode() + fLoc.hashCode();
+-}
+-virtual UBool operator == (const CacheKeyBase ) const {
+-// reflexive
+diff --git a/external/icu/icu4c-warnings.patch 
b/external/icu/icu4c-warnings.patch
+index d146093..96608d7 100644
+--- a/external/icu/icu4c-warnings.patch
 b/external/icu/icu4c-warnings.patch
+@@ -8,15 +8,3 @@
+  } \
+  }
+  
+ misc/icu/source/common/unicode/utypes.h
+-+++ misc/build/icu/source/common/unicode/utypes.h
+-@@ -399,7 +399,7 @@
+-  * some Linux/Unix compilers have problems with defining global new/delete.
+-  * On Windows, it is _MSC_VER>=1200 for MSVC 6.0 and higher.
+-  */
+--#if defined(__cplusplus) && U_DEBUG && U_OVERRIDE_CXX_ALLOCATION && 
(_MSC_VER>=1200) && !defined(U_STATIC_IMPLEMENTATION) && 
(defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || 
defined(U_IO_IMPLEMENTATION) || defined(U_LAYOUT_IMPLEMENTATION) || 
defined(U_LAYOUTEX_IMPLEMENTATION))
+-+#if defined(__cplusplus) && U_DEBUG && U_OVERRIDE_CXX_ALLOCATION && defined 
(_MSC_VER) && (_MSC_VER>=1200) && !defined(U_STATIC_IMPLEMENTATION) && 
(defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) ||

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2016-07-03 Thread Andreas Hüttel 
commit: dbc7c3c450ca1253f502aecfc117e37f0e22e0f1
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Jul  3 20:10:29 2016 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sun Jul  3 20:10:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbc7c3c4

app-office/libreoffice: Fix build with gcc-6, bug 584892

Package-Manager: portage-2.3.0

 .../files/libreoffice-5.1.4.2-gcc6.patch   | 40 ++
 app-office/libreoffice/libreoffice-5.1.4.2.ebuild  |  3 ++
 app-office/libreoffice/libreoffice-5.1..ebuild |  3 ++
 3 files changed, 46 insertions(+)

diff --git a/app-office/libreoffice/files/libreoffice-5.1.4.2-gcc6.patch 
b/app-office/libreoffice/files/libreoffice-5.1.4.2-gcc6.patch
new file mode 100644
index 000..9e7ee73
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.1.4.2-gcc6.patch
@@ -0,0 +1,40 @@
+From 91fcc0032c2d0d343b914dfe3bea0b0bf1589e91 Mon Sep 17 00:00:00 2001
+From: Rene Engelhard 
+Date: Tue, 24 May 2016 16:35:57 +0200
+Subject: [PATCH] KDE4 cflags no /usr/include usage to fix build failure with
+ gcc6
+
+Change-Id: I53106b9ebfa7cc5c7b6c6d6f3bb3a4e5f2261f4f
+---
+ configure.ac | 8 +++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 091abb4..86cc7b6 100644
+--- a/configure.ac
 b/configure.ac
+@@ -7,6 +7,7 @@ the root of your Qt installation by exporting QT4DIR 
before running "configure".
+ if test "x$kde_incdir" = "xno"; then
+ AC_MSG_ERROR([KDE4 headers not found.  Please specify the root of 
your KDE4 installation by exporting KDE4DIR before running "configure".])
+ fi
++if test "$kde_incdir" = "/usr/include"; then kde_incdir=; fi
+ 
+ dnl Check for KDE4 libraries
+ AC_MSG_CHECKING([for KDE4 libraries])
+@@ -11134,7 +11135,12 @@ the root of your Qt installation by exporting QT4DIR 
before running "configure".
+ fi
+ 
+ PKG_CHECK_MODULES([QT4],[QtNetwork QtGui])
+-KDE4_CFLAGS="-I$kde_incdir $QT4_CFLAGS -DQT_CLEAN_NAMESPACE 
-DQT_THREAD_SUPPORT"
++if ! test -z "$kde_incdir"; then
++  KDE4_CFLAGS="-I$kde_incdir $QT4_CFLAGS -DQT_CLEAN_NAMESPACE 
-DQT_THREAD_SUPPORT"
++else
++  KDE4_CFLAGS="$QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
++fi
++
+ KDE4_LIBS="-L$kde_libdir -lkio -lkfile -lkdeui -lkdecore -L$qt_lib_dir 
$QT4_LIBS"
+ KDE4_CFLAGS=$(printf '%s' "$KDE4_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
+ FilterLibs "$KDE4_LIBS"
+-- 
+2.9.0
+

diff --git a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild 
b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
index 22da8a7..ca9fc14 100644
--- a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
@@ -242,6 +242,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 "
 
 PATCHES=(
+   # from 5.2 branch
+   "${FILESDIR}/${PN}-5.1.4.2-gcc6.patch"
+
# not upstreamable stuff
"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
 )

diff --git a/app-office/libreoffice/libreoffice-5.1..ebuild 
b/app-office/libreoffice/libreoffice-5.1..ebuild
index 164ac1e..52653526 100644
--- a/app-office/libreoffice/libreoffice-5.1..ebuild
+++ b/app-office/libreoffice/libreoffice-5.1..ebuild
@@ -242,6 +242,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 "
 
 PATCHES=(
+   # from 5.2 branch
+   "${FILESDIR}/${PN}-5.1.4.2-gcc6.patch"
+
# not upstreamable stuff
"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
 )

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2016-02-25 Thread Andreas Hüttel 
commit: 42d09a765cb8ba8a11fe00b6d0084c71e30ec25f
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Thu Feb 25 16:47:17 2016 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Thu Feb 25 16:47:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42d09a76

app-office/libreoffice: Fix build with Gentoo glibc-2.23, bug 575108

Package-Manager: portage-2.2.27

 .../files/libreoffice-5.1.0.3-isnan.patch  | 23 ++
 app-office/libreoffice/libreoffice-5.1.0.3.ebuild  |  3 +++
 app-office/libreoffice/libreoffice-5.1..ebuild |  3 +++
 3 files changed, 29 insertions(+)

diff --git a/app-office/libreoffice/files/libreoffice-5.1.0.3-isnan.patch 
b/app-office/libreoffice/files/libreoffice-5.1.0.3-isnan.patch
new file mode 100644
index 000..6a15da5
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.1.0.3-isnan.patch
@@ -0,0 +1,23 @@
+From: Tomáš Chvátal 
+Date: Thu, 25 Feb 2016 16:16:19 + (+0100)
+Subject: Add std prefix to isnan check to fix build with glibc > 2.23
+X-Git-Url: 
https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff_plain;h=d7c64d6e430e9640c77c846006a13bbc78704c28
+
+Add std prefix to isnan check to fix build with glibc > 2.23
+
+Change-Id: I6321cd905152231bb013e25f7b268f85453fe917
+---
+
+diff --git a/xmloff/source/draw/ximp3dscene.cxx 
b/xmloff/source/draw/ximp3dscene.cxx
+index 5cf205f..525e2fb 100644
+--- a/xmloff/source/draw/ximp3dscene.cxx
 b/xmloff/source/draw/ximp3dscene.cxx
+@@ -66,7 +66,7 @@ SdXML3DLightContext::SdXML3DLightContext(
+ {
+ ::basegfx::B3DVector aVal;
+ SvXMLUnitConverter::convertB3DVector(aVal, sValue);
+-if (!isnan(aVal.getX()) && !isnan(aVal.getY()) && 
!isnan(aVal.getZ()))
++if (!std::isnan(aVal.getX()) && !std::isnan(aVal.getY()) && 
!std::isnan(aVal.getZ()))
+ {
+ maDirection = aVal;
+ }

diff --git a/app-office/libreoffice/libreoffice-5.1.0.3.ebuild 
b/app-office/libreoffice/libreoffice-5.1.0.3.ebuild
index 18d7177..fe6e54d 100644
--- a/app-office/libreoffice/libreoffice-5.1.0.3.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.0.3.ebuild
@@ -257,6 +257,9 @@ REQUIRED_USE="
 "
 
 PATCHES=(
+   # submitted upstream
+   "${FILESDIR}/${PN}-5.1.0.3-isnan.patch"
+
# not upstreamable stuff
"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
 )

diff --git a/app-office/libreoffice/libreoffice-5.1..ebuild 
b/app-office/libreoffice/libreoffice-5.1..ebuild
index 18d7177..fe6e54d 100644
--- a/app-office/libreoffice/libreoffice-5.1..ebuild
+++ b/app-office/libreoffice/libreoffice-5.1..ebuild
@@ -257,6 +257,9 @@ REQUIRED_USE="
 "
 
 PATCHES=(
+   # submitted upstream
+   "${FILESDIR}/${PN}-5.1.0.3-isnan.patch"
+
# not upstreamable stuff
"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
 )

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2016-02-22 Thread Andreas Hüttel 
commit: db23475fd1efe1c0d7144c7c6a195f00dd5a60a0
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Wed Oct 21 23:37:12 2015 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Mon Feb 22 17:05:24 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db23475f

app-office/libreoffice: Update DEPENDs, pyuno patch, add 5.1 stable branch

- Pin mdds DEPEND to slot 0
- Relax library dependencies, see commit
517e2522adcd7d091009bfd9e9f9704374ec02a7 and following
- Upstream dropped gconf integration, see commit
3cf557c12d27f1b2250e69a543136da098112d80
- pyuno patch: Only a small change in desktop/scripts/soffice.sh context

Package-Manager: portage-2.2.27

 .../files/libreoffice-5.2-system-pyuno.patch   | 44 ++
 app-office/libreoffice/libreoffice-4.4.6.3.ebuild  |  2 +-
 app-office/libreoffice/libreoffice-4.4..ebuild |  2 +-
 app-office/libreoffice/libreoffice-5.0.3.2.ebuild  |  2 +-
 app-office/libreoffice/libreoffice-5.0.4.2.ebuild  |  2 +-
 app-office/libreoffice/libreoffice-5.0.5.2.ebuild  |  4 +-
 app-office/libreoffice/libreoffice-5.0..ebuild |  4 +-
 ...ice-.ebuild => libreoffice-5.1..ebuild} | 22 ++-
 app-office/libreoffice/libreoffice-.ebuild | 40 
 9 files changed, 79 insertions(+), 43 deletions(-)

diff --git a/app-office/libreoffice/files/libreoffice-5.2-system-pyuno.patch 
b/app-office/libreoffice/files/libreoffice-5.2-system-pyuno.patch
new file mode 100644
index 000..e06f81f
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.2-system-pyuno.patch
@@ -0,0 +1,44 @@
+diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
+index a259bf6..672fa23 100755
+--- a/desktop/scripts/soffice.sh
 b/desktop/scripts/soffice.sh
+@@ -129,6 +129,9 @@ if echo "$checks" | grep -q "cc" ; then
+ exit 1;
+ fi
+ 
++PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
++export PYTHONPATH
++
+ case "`uname -s`" in
+ NetBSD|OpenBSD|DragonFly)
+ # this is a temporary hack until we can live with the default search paths
+diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
+index 4ff2606..6a05eed 100644
+--- a/pyuno/source/module/uno.py
 b/pyuno/source/module/uno.py
+@@ -16,8 +16,12 @@
+ #   except in compliance with the License. You may obtain a copy of
+ #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ #
++import os
+ import sys
+ 
++sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program')
++if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
++os.environ['URE_BOOTSTRAP'] = 
"vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc"
+ import pyuno
+ 
+ try:
+diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py
+index 99d3b03..704edab 100755
+--- a/pyuno/source/officehelper.py
 b/pyuno/source/officehelper.py
+@@ -44,7 +44,7 @@ def bootstrap():
+ if "UNO_PATH" in os.environ:
+ sOffice = os.environ["UNO_PATH"]
+ else:
+-sOffice = "" # lets hope for the best
++sOffice = "%eprefix%/usr/%libdir%/libreoffice/program"
+ sOffice = os.path.join(sOffice, "soffice")
+ if platform.startswith("win"): 
+ sOffice += ".exe"

diff --git a/app-office/libreoffice/libreoffice-4.4.6.3.ebuild 
b/app-office/libreoffice/libreoffice-4.4.6.3.ebuild
index 863f7c9..1dad190 100644
--- a/app-office/libreoffice/libreoffice-4.4.6.3.ebuild
+++ b/app-office/libreoffice/libreoffice-4.4.6.3.ebuild
@@ -220,7 +220,7 @@ DEPEND="${COMMON_DEPEND}
dev-util/cppunit
>=dev-util/gperf-3
dev-util/intltool
-   >=dev-util/mdds-0.11.2:=
+   >=dev-util/mdds-0.11.2:0=
media-libs/glm
net-misc/npapi-sdk
>=sys-apps/findutils-4.4.2

diff --git a/app-office/libreoffice/libreoffice-4.4..ebuild 
b/app-office/libreoffice/libreoffice-4.4..ebuild
index 863f7c9..1dad190 100644
--- a/app-office/libreoffice/libreoffice-4.4..ebuild
+++ b/app-office/libreoffice/libreoffice-4.4..ebuild
@@ -220,7 +220,7 @@ DEPEND="${COMMON_DEPEND}
dev-util/cppunit
>=dev-util/gperf-3
dev-util/intltool
-   >=dev-util/mdds-0.11.2:=
+   >=dev-util/mdds-0.11.2:0=
media-libs/glm
net-misc/npapi-sdk
>=sys-apps/findutils-4.4.2

diff --git a/app-office/libreoffice/libreoffice-5.0.3.2.ebuild 
b/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
index 15d59be..6b99676 100644
--- a/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
@@ -221,7 +221,7 @@ DEPEND="${COMMON_DEPEND}
dev-util/cppunit
>=dev-util/gperf-3
dev-util/intltool
-   >=dev-util/mdds-0.12.0:=
+   >=dev-util/mdds-0.12.0:0=
media-libs/glm
net-misc/npapi-sdk
>=sys-apps/findutils-4.4.2

diff --git a/app-office/libreoffice/libreoffice-5.0.4.2.ebuild 
b/app-office/libreoffice/libreoffice-5.0.4.2.ebuild
index