diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-01-10 06:19:57 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-01-10 06:19:57 +0000 |
| commit | 30f491533785a455cdfbd05bb57f1f869a8e41bb (patch) | |
| tree | 231d01a9349dfa1f56a7235017f5201a7382c652 /app-office/libreoffice | |
| parent | a96f1a2ca235a5eb9e7c498636cd1291be76cb09 (diff) | |
gentoo auto-resync : 10:01:2023 - 06:19:57
Diffstat (limited to 'app-office/libreoffice')
6 files changed, 87 insertions, 23 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index a74d106f4c05..9ea1144979a4 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -3,6 +3,7 @@ AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba343 AUX libreoffice-7.2.0.4-qt5detect.patch 536 BLAKE2B fd77876d1ca3973ad30c9ebb60bf28e163dd29dcaebaa2b94d84f4c2ab060617d96f4df3d5114f17f882b0cb8b9e2ecdb284fdd1e4aaf8a34cc0c1f06a295c04 SHA512 e1ac7dfc4743cbdea3050b18c1714d06c8bcca4abc51d56e13362c8379fbdd3d37a1916c962fcb1389783c9b1fd72783c9ee45fbb649538ca0fc0cb7b05bcacf AUX libreoffice-7.3.5.2-gpgme-1.18.0.patch 2290 BLAKE2B ff65e3bb94e000c9963300580378213e7768748012f5ece1f761eb95ee9cda1dd5582c47abd7a2ca10c0266ab26ce4cc1aa4a683d8791c6940ca9d8758cac446 SHA512 b631300030d0fa9434ca97bf79ebfb8d497568f02aff58b9438840f1166b7d6d9c0d3ce7a4ad67dedfe5ee7588adb4027ef17dd6054a6c29f28278615ae0c019 AUX libreoffice-7.3.7.2-boost-1.81-locale.patch 1687 BLAKE2B 2d95ddf84c7a2b1eb69da311ac0bc7bdac67ec48173d20a375563455411501b783805f6f8d7e71dc8b3e9b8dc166e5bde96260e26ca57c0333a9c4c5f9a09661 SHA512 4fc2f01f890809f4e118744d7d6dc484f124b980b7699753acf6597c390e4457aac2a32bb720d4ac3afcbb9776b472c27b9c13ebd9aadec2c354a9ee0108e854 +AUX libreoffice-7.3.7.2-zxing-cpp-1.4.0.patch 2221 BLAKE2B c0b719247e58ae9270c420d3f3d4c34ac71ab67cfdcf2e766c6b7420c4919e486fb123c816a0651ad71c71662c155159fb4855934402f0959a3e5394ef818376 SHA512 26bf310f333e862eb91241e0f7b30fea031f29a4a1dfb74b5bfc0a2a9799f80c8a4d550fdcb22d674b4c5bb87618968892d7aa30ed2f0d30ce837c11707bac43 AUX libreoffice.confd 228 BLAKE2B 7b9ed0d08b91b6e78dd3a2ac242cac48ef141c25bf25713b5fa6c4fdea3d5b0e16b4073a864fbec328edf4008729869fba5236e9cc113ba9bd3d6de5c10153c3 SHA512 6718cfd481b4349d70b718d4811f80ac0eff60d465b9f9eeff8ab9641de1fecb6197023f98bb1fca77a57b48ae2d8e38803f3af3a51191b1df71aa8cc5d33661 AUX libreoffice.initd 507 BLAKE2B d49fd0f48254160fff3eb90a75294c6cf044805352a982ab3d2127426a18a6171e5043c071b59581a1f927a7c499c8abb58820081c6ba6e285097c883917f0e3 SHA512 fee4720898510b1aa07a9ed597d041d1e1edfb8f8b8e9596ef4254d4d3c1e8a959bbd65202a377289910ed28283f9c8a4bdc893d2d0835f37ee28cd3c7cb010d DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a @@ -36,9 +37,9 @@ DIST libreoffice-help-7.4.3.2.tar.xz 112594804 BLAKE2B 79611390f90e5fa242df36626 DIST libreoffice-help-7.4.4.2.tar.xz 112594808 BLAKE2B 5cb59edeacca40eec1955828b76ae94f000fb386a6ebe7dae71b62f95c7207f47af376923395abcb78e619aed410481343bac12a7390578e6fdc4e8ae0b1daa4 SHA512 24132f52a3452c5d90825c1c1ec6f9ac3faa8b7cdd3bbfa36d97221327a6ca2677d2c03c115f2d8990ecc43f7a492c26a8c1a2dd45fe40eab8deab99593ccf50 DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436 DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76 -EBUILD libreoffice-7.3.7.2.ebuild 19373 BLAKE2B bf6b9f7a20d31320a7c0768ac325e4036d780b1bf25f1b3e07cf5b88cadc7c220496b8bb0d110fecb1cdd748f3341dec0cb7df8041d28d4e80b72cc9c402e845 SHA512 77e426006c7fcf13606d297b7348a3fc2abe4da8edefaee78530a93e6c2271b63e6217281cc3967ddfc5d0dc9689f29c57d06a4e32263a86fc4452722c62c179 -EBUILD libreoffice-7.4.3.2.ebuild 19323 BLAKE2B a43f5395e74c5328c967bd005754e94ee089812d93e385569e5ff2ff5cf8052e1161cc5ad7f69942366476939a7e560a7a3f33702773d296e033da045cab4351 SHA512 a51669a7f0951bced763ff3e9c98b810b4df21b1f6c4ccacf9ab9d2ff5a33b7aca194a861b00ae66596ba0f64ae58cad21fc37e5cacca0b57ec81161df4bc41f -EBUILD libreoffice-7.4.4.2.ebuild 19325 BLAKE2B cbef7b38e6e41a6aa100a2c23b42ad34aac358074a274a5adc8a2da5d3716c21d0952950dd85545ecbb0bfcf2748e9c3284519adedd85ae57c4d24fa4ba79918 SHA512 b7f597bf7139ddd4d28893816f5eca76e1a707f8fdc204a8f4af2a3e01d00e7e599aed93e4968367e21486d822c5fe742694d0257d09f0c83367322166e7d2f3 -EBUILD libreoffice-7.4.9999.ebuild 19325 BLAKE2B cbef7b38e6e41a6aa100a2c23b42ad34aac358074a274a5adc8a2da5d3716c21d0952950dd85545ecbb0bfcf2748e9c3284519adedd85ae57c4d24fa4ba79918 SHA512 b7f597bf7139ddd4d28893816f5eca76e1a707f8fdc204a8f4af2a3e01d00e7e599aed93e4968367e21486d822c5fe742694d0257d09f0c83367322166e7d2f3 +EBUILD libreoffice-7.3.7.2.ebuild 19417 BLAKE2B 186ac78ef4f9fc953f1301928921f06999205959290ffefd9c25110289cf99c48bdb45637466bee7f0f3a242aba1f0df7cfb3a26f68695ae00b4b79c703caabd SHA512 d520cbbb1a1a75d4350bd296421c7f2164e8be51d8fbebecc4f6e6b9aa1a2a7ccb75162facf8a83ed9e8ea62e5d0ea1231becf1e8a22943381839d8b13b328c9 +EBUILD libreoffice-7.4.3.2.ebuild 19374 BLAKE2B 789589be31dc83469925ca376b7127030e27a126c169cb2945fd94d73c6e8870f617d6de32d0a26903534e2cce43852121783242590ee79034044b39a000470b SHA512 833e75cad1f9b288a6a0c883233ca0ddd1510826a8d4284195e307b891712e4b7475536230b0ce6212e5b95eb152964083f1f6a7ecfd367a9784ccf7b28bc14e +EBUILD libreoffice-7.4.4.2.ebuild 19376 BLAKE2B 73487b2fe09248f84c7f6f729d52bdf376c5291cda91cbd4baf800df1940012e171baba08e5b26248e296f753a880d4af73ce8d30abca30bbd6941e2d4d9d46e SHA512 4dde440963552663910a8d4e673230bc2c4111a7097d4e61d60e44e4c01edb80dc7999cf872bf28a284773d1d29761e04128e063eadce9efe98a23ba0f9f2fff +EBUILD libreoffice-7.4.9999.ebuild 19376 BLAKE2B 73487b2fe09248f84c7f6f729d52bdf376c5291cda91cbd4baf800df1940012e171baba08e5b26248e296f753a880d4af73ce8d30abca30bbd6941e2d4d9d46e SHA512 4dde440963552663910a8d4e673230bc2c4111a7097d4e61d60e44e4c01edb80dc7999cf872bf28a284773d1d29761e04128e063eadce9efe98a23ba0f9f2fff EBUILD libreoffice-9999.ebuild 19257 BLAKE2B b70f1e507d044322492b21e2ccda20d231e77826e8ed4f99857ba820cd3c84097d2523a87a3da931bd4723d92d4774d08ab369830dceafb5265cc1c5ef5223f0 SHA512 66d784ed3bff6e8b2c0e0992689a79b4345bfaafde4d68effdb21db9215b780a505ee9462a513b3a9082537188e7801dd491229e26f83cc50447dd21b69d391f MISC metadata.xml 1233 BLAKE2B f93989caf1340cda4c3327a3d3d033d224050848b32b9d80e0b093b024bf124d238f1aae9852d1a6173e8aee79314517dd12e589079e58378e5f63626a80957c SHA512 3af0cefdceeba7a45658a2151b0534f44b9dfe6d3af8374f3061cb098f607a36a2fe134e3c0280ce6d807b523f68e708b51e6f1b4178292a528405e18f12d686 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 000000000000..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" <brett.t.warden@intel.com> +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 <rene@debian.org> +Reviewed-by: René Engelhard <rene@debian.org> +Tested-by: Jenkins +Reviewed-by: Caolán McNamara <caolanm@redhat.com> +--- + 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 <BarcodeFormat.h> +-#include <BitArray.h> + #include <BitMatrix.h> + #include <MultiFormatWriter.h> + #include <TextUtfEncoding.h> +@@ -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("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<svg xmlns=\"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) + "<path d=\""); + for (int i = 0; i < height; ++i) + { +- bitmatrix.getRow(i, row); + for (int j = 0; j < width; ++j) + { +- if (row.get(j)) ++ if (bitmatrix.get(j, i)) + { + sb.append("M" + OString::number(j) + "," + OString::number(i) + "h1v1h-1z"); + } +-- +cgit v1.2.1 + diff --git a/app-office/libreoffice/libreoffice-7.3.7.2.ebuild b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild index 9f590961fe49..94e96a188830 100644 --- a/app-office/libreoffice/libreoffice-7.3.7.2.ebuild +++ b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -295,8 +295,9 @@ PATCHES=( # 7.4 branch "${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch" - # backport + # 7.5 branch "${FILESDIR}/${P}-boost-1.81-locale.patch" + "${FILESDIR}/${P}-zxing-cpp-1.4.0.patch" ) S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/app-office/libreoffice/libreoffice-7.4.3.2.ebuild b/app-office/libreoffice/libreoffice-7.4.3.2.ebuild index 8850d76c0403..79f088c899db 100644 --- a/app-office/libreoffice/libreoffice-7.4.3.2.ebuild +++ b/app-office/libreoffice/libreoffice-7.4.3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -96,14 +96,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} libreoffice_extensions_wiki-publisher? ( java ) " -RESTRICT="!test? ( test )" - LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" [[ ${MY_PV} == *9999* ]] || \ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux" +RESTRICT="!test? ( test )" + COMMON_DEPEND="${PYTHON_DEPS} app-arch/unzip app-arch/zip @@ -296,6 +296,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" ) S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild index 9a4e143d2efb..45f0f59276d6 100644 --- a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild +++ b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -79,6 +79,12 @@ SRC_URI+=" ${ADDONS_SRC[*]}" unset ADDONS_URI unset ADDONS_SRC +LICENSE="|| ( LGPL-3 MPL-1.1 )" +SLOT="0" + +#[[ ${MY_PV} == *9999* ]] || \ +#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux" + # Extensions that need extra work: LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" @@ -98,12 +104,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} RESTRICT="!test? ( test )" -LICENSE="|| ( LGPL-3 MPL-1.1 )" -SLOT="0" - -#[[ ${MY_PV} == *9999* ]] || \ -#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux" - COMMON_DEPEND="${PYTHON_DEPS} app-arch/unzip app-arch/zip @@ -296,6 +296,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" ) S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/app-office/libreoffice/libreoffice-7.4.9999.ebuild b/app-office/libreoffice/libreoffice-7.4.9999.ebuild index 9a4e143d2efb..45f0f59276d6 100644 --- a/app-office/libreoffice/libreoffice-7.4.9999.ebuild +++ b/app-office/libreoffice/libreoffice-7.4.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -79,6 +79,12 @@ SRC_URI+=" ${ADDONS_SRC[*]}" unset ADDONS_URI unset ADDONS_SRC +LICENSE="|| ( LGPL-3 MPL-1.1 )" +SLOT="0" + +#[[ ${MY_PV} == *9999* ]] || \ +#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux" + # Extensions that need extra work: LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" @@ -98,12 +104,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} RESTRICT="!test? ( test )" -LICENSE="|| ( LGPL-3 MPL-1.1 )" -SLOT="0" - -#[[ ${MY_PV} == *9999* ]] || \ -#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux" - COMMON_DEPEND="${PYTHON_DEPS} app-arch/unzip app-arch/zip @@ -296,6 +296,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" ) S="${WORKDIR}/${PN}-${MY_PV}" |