| 1 |
commit: 7ce5d577799caf5c7552b08e56b6890b2b3ffeca |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 14 15:33:49 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 14 18:36:10 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ce5d577 |
| 7 |
|
| 8 |
app-office/libreoffice: Update patchset to 6.2.1.1 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.60, Repoman-2.3.12 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
app-office/libreoffice/Manifest | 2 +- |
| 14 |
app-office/libreoffice/libreoffice-6.2.1.1.ebuild | 6 ++---- |
| 15 |
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 6 ++---- |
| 16 |
3 files changed, 5 insertions(+), 9 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest |
| 19 |
index 9f697bfd36f..5448428eece 100644 |
| 20 |
--- a/app-office/libreoffice/Manifest |
| 21 |
+++ b/app-office/libreoffice/Manifest |
| 22 |
@@ -5,7 +5,7 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18 |
| 23 |
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a |
| 24 |
DIST libreoffice-6.1.4.2.tar.xz 207710664 BLAKE2B 52bab412094c1ff7e184ea65c588360c18b061c3e14b7be07171f6b5831261766e2ac7d7373f5f789d125671da41e8b67d34360d4b7014dcb98df01828aeb094 SHA512 ba81b7744b908f9fe67a83e72c17c08b3b2e99599a5fd4f9cc1f2d81b3fd0ddb8065ae466205f85185ab9420350cea0b2d60108df3e583b74bd1fcd9e4eb0c3c |
| 25 |
DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140 |
| 26 |
-DIST libreoffice-6.2.0.3-patchset-02.tar.xz 22264 BLAKE2B 2ffa88eb84fd00100ad43717a9b6ca24d60f2ce03061f518f19cede0b383d7f0f3da42152ef396c976475d5b5cdb28b27c54b7680785e78fc7be2056e4fed171 SHA512 2df69e01ace90beaee993e62f0eff9bebe631f16933343156222d5b110531d17e1b9994013ba5a6cb5f8b44743743042ace9573d4d191ae43f0d54d85d4e34f0 |
| 27 |
+DIST libreoffice-6.2.1.1-patchset-01.tar.xz 8404 BLAKE2B 6fd1a3e931a1d3ef040e0e79ff53299fb47a55bf36f98998ebb896738a639aca8844bf6a5bb5fcbf3a5afeae935cb3e637436dcba456df005d00d5ed5a80e0d0 SHA512 eff36e8b5af2a592572ed60d9f22f59d8611dd5f62977ad93aa957181173d479a19f5907673b0f7532bfcca728a12a20101f2282914a34e0f0a53fd53e682ef3 |
| 28 |
DIST libreoffice-6.2.1.1.tar.xz 213874132 BLAKE2B f8d4cc02e712f84363bca723e18127c25c76e2057985333c1045a5f656bb6482d7c381a5407dbf08ee5d1ca0f8692e43290ad90b8ed11ee5c4753072760a432f SHA512 92c79b62e99c9928eed2a0c1c14fe147f7bd0d6f891a87525b38fc3964bd298587f42f363503a93853bf57ecf898b4f0dd15d5064fcd354a8d3b4b7eba118b13 |
| 29 |
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f |
| 30 |
DIST libreoffice-help-6.1.4.2.tar.xz 15757700 BLAKE2B 53c398efb3b839740a9146ea1b0f70f019936c914f7aedf38b7da69faf532ab139a8847d6eb251b2850511e0e7bd169c74fafedd0926dc987659aa27878cf740 SHA512 e24f2f6795856da62f77ebfdcfedc8190b8ecef74e395fc263f0cab4a27c0fe3d95f37665747a590fc7a6a93c6c3473a2a4501c50d415cc602f85838955fe9ab |
| 31 |
|
| 32 |
diff --git a/app-office/libreoffice/libreoffice-6.2.1.1.ebuild b/app-office/libreoffice/libreoffice-6.2.1.1.ebuild |
| 33 |
index 8116cd6766a..410e0c32406 100644 |
| 34 |
--- a/app-office/libreoffice/libreoffice-6.2.1.1.ebuild |
| 35 |
+++ b/app-office/libreoffice/libreoffice-6.2.1.1.ebuild |
| 36 |
@@ -18,7 +18,7 @@ DEV_URI=" |
| 37 |
ADDONS_URI="https://dev-www.libreoffice.org/src/" |
| 38 |
|
| 39 |
BRANDING="${PN}-branding-gentoo-0.8.tar.xz" |
| 40 |
-PATCHSET="${PN}-6.2.0.3-patchset-02.tar.xz" |
| 41 |
+PATCHSET="${P}-patchset-01.tar.xz" |
| 42 |
|
| 43 |
[[ ${MY_PV} == *9999* ]] && inherit git-r3 |
| 44 |
inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg |
| 45 |
@@ -249,9 +249,7 @@ DEPEND="${COMMON_DEPEND} |
| 46 |
PATCHES=( |
| 47 |
# master branch |
| 48 |
"${FILESDIR}/${PN}-6.2-ldap-optional.patch" |
| 49 |
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/011-qt5-change-salgraphics-gettextlayout-def.patch |
| 50 |
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/013-qt5-assert-missing-salgraphics-font-on-gettextlayout.patch |
| 51 |
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/019-drop-kde4-desktop-detection.patch |
| 52 |
+ "${WORKDIR}"/${PATCHSET/.tar.xz/} |
| 53 |
|
| 54 |
# not upstreamable stuff |
| 55 |
"${FILESDIR}/${PN}-5.4-system-pyuno.patch" |
| 56 |
|
| 57 |
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 58 |
index 9b20bec5816..4b4ea02af44 100644 |
| 59 |
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 60 |
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 61 |
@@ -18,7 +18,7 @@ DEV_URI=" |
| 62 |
ADDONS_URI="https://dev-www.libreoffice.org/src/" |
| 63 |
|
| 64 |
BRANDING="${PN}-branding-gentoo-0.8.tar.xz" |
| 65 |
-PATCHSET="${PN}-6.2.0.3-patchset-02.tar.xz" |
| 66 |
+PATCHSET="${PN}-6.2.1.1-patchset-01.tar.xz" |
| 67 |
|
| 68 |
[[ ${MY_PV} == *9999* ]] && inherit git-r3 |
| 69 |
inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg |
| 70 |
@@ -248,9 +248,7 @@ DEPEND="${COMMON_DEPEND} |
| 71 |
PATCHES=( |
| 72 |
# master branch |
| 73 |
"${FILESDIR}/${PN}-6.2-ldap-optional.patch" |
| 74 |
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/011-qt5-change-salgraphics-gettextlayout-def.patch |
| 75 |
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/013-qt5-assert-missing-salgraphics-font-on-gettextlayout.patch |
| 76 |
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/019-drop-kde4-desktop-detection.patch |
| 77 |
+ "${WORKDIR}"/${PATCHSET/.tar.xz/} |
| 78 |
|
| 79 |
# not upstreamable stuff |
| 80 |
"${FILESDIR}/${PN}-5.4-system-pyuno.patch" |
Archives