| 1 |
commit: 154af9462465338407a0ec5ad8a7c3d05263016b |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 27 17:27:04 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 27 23:12:01 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=154af946 |
| 7 |
|
| 8 |
app-office/libreoffice: Add Qt5/'KDE5' fixes patchset |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.58, Repoman-2.3.12 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
app-office/libreoffice/Manifest | 1 + |
| 14 |
app-office/libreoffice/libreoffice-6.2.0.3.ebuild | 4 ++-- |
| 15 |
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 6 ++++-- |
| 16 |
3 files changed, 7 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest |
| 19 |
index 5effcd09b23..753822f5ce2 100644 |
| 20 |
--- a/app-office/libreoffice/Manifest |
| 21 |
+++ b/app-office/libreoffice/Manifest |
| 22 |
@@ -5,6 +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.1.tar.xz 207920688 BLAKE2B 7e435a62b880839c752ba90693918242ec29807acb73a22d6101d74f8c8d712a5a26a85cea334a6e66811b7a4f8e016b87932390f2746da4effcb74a416ca973 SHA512 fab7f0bb6fb113c0bfa8bbc0424568c37a04f301d6e44f5755dcbb21cc6df964819a2e143b10f5c6352bfbea438df0b136ba55caf7be3bbbb83bcebba4ceadae |
| 26 |
+DIST libreoffice-6.2.0.3-patchset-01.tar.xz 12284 BLAKE2B 1585764ea7441f422f72e616fa5dff77d3997ae20410016092f35d0743f9629f17d0ecf6f0002a92a9de894d82bcf3cf22cee5124b9a5f280ea086c1ec285a6f SHA512 3a0dcee15440e74ef70aafee983951249193f0dac2b0bf48926265db01ea098486b2c3cd46178f533f3cfc20f7cadd9353c7a3d2c4bfe53812d0fe4a1fd86e22 |
| 27 |
DIST libreoffice-6.2.0.3.tar.xz 213476336 BLAKE2B e0a44098aa46c86d5fb7d26366d57d4bf395f642cf228a426446067a7037b5199715a7d34a2b28664123f814cc23da7e299da4f93ed8b65c29ae90056cc40399 SHA512 991cab829c88010b5df0c40e6422fd725f7854d256cfa7ffcf595549ccc49aeebe135513b56c5ccdc810ea07b8df186004a3d9e5d84b5d69992996158166d0c1 |
| 28 |
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f |
| 29 |
DIST libreoffice-help-6.1.4.2.tar.xz 15757700 BLAKE2B 53c398efb3b839740a9146ea1b0f70f019936c914f7aedf38b7da69faf532ab139a8847d6eb251b2850511e0e7bd169c74fafedd0926dc987659aa27878cf740 SHA512 e24f2f6795856da62f77ebfdcfedc8190b8ecef74e395fc263f0cab4a27c0fe3d95f37665747a590fc7a6a93c6c3473a2a4501c50d415cc602f85838955fe9ab |
| 30 |
|
| 31 |
diff --git a/app-office/libreoffice/libreoffice-6.2.0.3.ebuild b/app-office/libreoffice/libreoffice-6.2.0.3.ebuild |
| 32 |
index 1855739d749..2d7e26ac310 100644 |
| 33 |
--- a/app-office/libreoffice/libreoffice-6.2.0.3.ebuild |
| 34 |
+++ b/app-office/libreoffice/libreoffice-6.2.0.3.ebuild |
| 35 |
@@ -18,7 +18,7 @@ DEV_URI=" |
| 36 |
ADDONS_URI="https://dev-www.libreoffice.org/src/" |
| 37 |
|
| 38 |
BRANDING="${PN}-branding-gentoo-0.8.tar.xz" |
| 39 |
-# PATCHSET="${P}-patchset-01.tar.xz" |
| 40 |
+PATCHSET="${P}-patchset-01.tar.xz" |
| 41 |
|
| 42 |
[[ ${MY_PV} == *9999* ]] && inherit git-r3 |
| 43 |
inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils |
| 44 |
@@ -246,7 +246,7 @@ DEPEND="${COMMON_DEPEND} |
| 45 |
" |
| 46 |
|
| 47 |
PATCHES=( |
| 48 |
- # "${WORKDIR}"/${PATCHSET/.tar.xz/} |
| 49 |
+ "${WORKDIR}"/${PATCHSET/.tar.xz/} |
| 50 |
|
| 51 |
# not upstreamable stuff |
| 52 |
"${FILESDIR}/${PN}-5.4-system-pyuno.patch" |
| 53 |
|
| 54 |
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 55 |
index 6536b71f535..fc17e0a1d33 100644 |
| 56 |
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 57 |
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 58 |
@@ -18,7 +18,7 @@ DEV_URI=" |
| 59 |
ADDONS_URI="https://dev-www.libreoffice.org/src/" |
| 60 |
|
| 61 |
BRANDING="${PN}-branding-gentoo-0.8.tar.xz" |
| 62 |
-# PATCHSET="${P}-patchset-01.tar.xz" |
| 63 |
+PATCHSET="${PN}-6.2.0.3-patchset-01.tar.xz" |
| 64 |
|
| 65 |
[[ ${MY_PV} == *9999* ]] && inherit git-r3 |
| 66 |
inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils |
| 67 |
@@ -246,7 +246,7 @@ DEPEND="${COMMON_DEPEND} |
| 68 |
" |
| 69 |
|
| 70 |
PATCHES=( |
| 71 |
- # "${WORKDIR}"/${PATCHSET/.tar.xz/} |
| 72 |
+ "${WORKDIR}"/${PATCHSET/.tar.xz/} |
| 73 |
|
| 74 |
# not upstreamable stuff |
| 75 |
"${FILESDIR}/${PN}-5.4-system-pyuno.patch" |
| 76 |
@@ -306,6 +306,8 @@ src_unpack() { |
| 77 |
} |
| 78 |
|
| 79 |
src_prepare() { |
| 80 |
+ rm "${WORKDIR}"/${PATCHSET/.tar.xz/}/00{3,4}*.patch || die # drop backported to 6.2 |
| 81 |
+ |
| 82 |
default |
| 83 |
|
| 84 |
# sandbox violations on many systems, we don't need it. Bug #646406 |
Archives