1 |
commit: 70a6fc55a44c4fab59d087c0a8d199d4258f0a4f |
2 |
Author: WANG Xuerui <xen0n <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 11 15:36:53 2022 +0000 |
4 |
Commit: WANG Xuerui <xen0n <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 23 07:40:32 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70a6fc55 |
7 |
|
8 |
app-office/libreoffice: 7.3.5.2: add support for loong |
9 |
|
10 |
By incorporating the upstreamed patch by Loongson. |
11 |
|
12 |
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org> |
13 |
|
14 |
app-office/libreoffice/Manifest | 1 + |
15 |
app-office/libreoffice/libreoffice-7.3.5.2.ebuild | 6 +++--- |
16 |
2 files changed, 4 insertions(+), 3 deletions(-) |
17 |
|
18 |
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest |
19 |
index 6652e01c6507..ea2bc7075bee 100644 |
20 |
--- a/app-office/libreoffice/Manifest |
21 |
+++ b/app-office/libreoffice/Manifest |
22 |
@@ -20,6 +20,7 @@ DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa |
23 |
DIST libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz 5005888 BLAKE2B 836ec268c19c27ac079ea1084587c3e999f39ad2188be1a5cf8337ad0473ffda6c32d0695254d3797d1607707329befa88da6043f424544487238e550eda8590 SHA512 4159dfb4d08e359feb23127e12db590260913e70774161ac9513abb5183ad6ed6d2bdfbe56fc8aa68e2fc57ee29eae67aa0180e1a7d955016884ecba2ca60ff8 |
24 |
DIST libreoffice-7.3.3.2.tar.xz 256036064 BLAKE2B 8a96121448e3cc1f81990c837d36191a6127e3ff78773440a4ecdfb5f178f7ab522298fec1d0dd872afe38b67ec102d4f5ea4b0cde64caf5d6420a7f02f25e1b SHA512 242d5694b6d09c669992ea68223b62fb8e418e886f68c7e5d843272d55ad2de34e5207180b7a541fd97cbe678c2d12d5290ebd8b82d47c88f1607e6736413c96 |
25 |
DIST libreoffice-7.3.4.2.tar.xz 256373724 BLAKE2B 98a3a450e8b16caafdbe914b542c32e3e251ac6f2fe528e593640397d50b533f146b1cfd262c633bfee9766a5ef659f7ce606453952978c71c08f249da7d7125 SHA512 10ea93d380b8c59ec15aefc4c4f6f5cbc76b03cf444e2f172fdb8cdde637e8d3de4aa2b7adbd55ec04ba8ad5db73a1bd80e8b692ca328c416d229526f01bd4a0 |
26 |
+DIST libreoffice-7.3.5.2-patchset-01.tar.xz 12700 BLAKE2B 353f6552d31616dfeb32287173bbd70366045ec437c8735e701bff357032f5ef2358920c5d8495142551116999b034db6611a72536edf14fe13ea9cace3a931c SHA512 dbd8b4b494159845efbe9ad76d5822188b9868aff8ef488793f4e2b0f2f0290942322651e8b53dd71db81cba559e3510732801d0c643cb2af9526cb1e1837891 |
27 |
DIST libreoffice-7.3.5.2.tar.xz 256607688 BLAKE2B 82d9b1407e42e844214ab323a202beaa964857cf77279e199e2730adb6d86ff79acec197bc0ae9969b429894bf0ed7a50dbda8fe8c29472b16d88e1eab6d7a57 SHA512 00d381e97c0bc6f97d4e770b7037f08fc659e58e792d47b539ecd0b3fb4e3e9b570769e9b3eb26522d951fa14926f71bef8567756b8b8b8c4777a00e48ee030c |
28 |
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f |
29 |
DIST libreoffice-help-7.3.3.2.tar.xz 112209704 BLAKE2B b0e92b88aeb866d3f611fe89d723287cf037bca1772a861cb8b76ee046ae0d039d67648e121aa253eccbfa132c8d252b947bdcbbc3ee6178b6defd3c876749d0 SHA512 f70e747c5b78be20bbe4dd0c20840923d14b4278c00a12a60f5e58e3226abc0c218ac3cce4885cf5a440ace92141bf0428df40a4d1469edb91103167c5e3d46f |
30 |
|
31 |
diff --git a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild |
32 |
index dd4c5cd297b3..3c73f44e73c2 100644 |
33 |
--- a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild |
34 |
+++ b/app-office/libreoffice/libreoffice-7.3.5.2.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 flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils |
44 |
@@ -26,7 +26,7 @@ inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 mult |
45 |
DESCRIPTION="A full office productivity suite" |
46 |
HOMEPAGE="https://www.libreoffice.org" |
47 |
SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" |
48 |
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}" |
49 |
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~xen0n/distfiles/app-office/libreoffice/${PATCHSET}" |
50 |
|
51 |
# Split modules following git/tarballs; Core MUST be first! |
52 |
# Help is used for the image generator |
53 |
@@ -287,7 +287,7 @@ else |
54 |
fi |
55 |
|
56 |
PATCHES=( |
57 |
- # "${WORKDIR}"/${PATCHSET/.tar.xz/} |
58 |
+ "${WORKDIR}"/${PATCHSET/.tar.xz/} |
59 |
|
60 |
# not upstreamable stuff |
61 |
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" |