1 |
commit: 75df34a20dd831f2d5f7fd5dbb02a1f4c50eab7b |
2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jun 30 14:15:26 2021 +0000 |
4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 30 14:15:26 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=75df34a2 |
7 |
|
8 |
app-office/libreoffice: Cleanup unsupported version |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.2 |
11 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
12 |
|
13 |
app-office/libreoffice/Manifest | 2 - |
14 |
.../files/libreoffice-6.4.3.2-boost-1.73.patch | 118 ---- |
15 |
.../files/libreoffice-6.4.6.2-llvm-10.patch | 102 ---- |
16 |
....7.2-fix-wrong-setting-for-doc-properties.patch | 75 --- |
17 |
.../files/libreoffice-6.4.7.2-icu-68-1.patch | 46 -- |
18 |
.../files/libreoffice-6.4.7.2-icu-68-2.patch | 28 - |
19 |
app-office/libreoffice/libreoffice-6.4.7.2.ebuild | 597 --------------------- |
20 |
7 files changed, 968 deletions(-) |
21 |
|
22 |
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest |
23 |
index bec1203..14a9b2c 100644 |
24 |
--- a/app-office/libreoffice/Manifest |
25 |
+++ b/app-office/libreoffice/Manifest |
26 |
@@ -17,9 +17,7 @@ DIST db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip 1396007 BLAKE2B 8012d |
27 |
DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48dff6df5c857a6bd0510a92aa6d9b9660ad63b2344d5195fef072e526f8d7900791b15442923b63196dda3f SHA512 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85 |
28 |
DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a39ee9798182b70ba650fa954234b964e33278ac4fe3f84f8c3218ad49f12d139079328036b4f9d80cde967888c0a66393c34dedf27af69dac02c5aff SHA512 9091d3628d9c75c068507537afc9e10bfb79c1abfd36ad697af3d592a1cc049ba6640f665bfc53cc520b6a26c21d70b0275106843444b441484c2178f2784743 |
29 |
DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114 |
30 |
-DIST libreoffice-6.4.7.2.tar.xz 232364676 BLAKE2B 1df8f2a3aa00bd057dd1d6d9665a541330ceeabb2bb5d46351449cf9b916a5649f38dc0e0175cf3733123f9247157f5fd0f2c34c8dad1d676da6c31d8346927b SHA512 ba6ff5948624d7a76025406c38728d643be656091d79320a1c5ddba10000411662951a0b02de7a9e796e76d8185b6e9113882406bb0c1452b4c988ac3095afa8 |
31 |
DIST libreoffice-7.1.3.2.tar.xz 244104432 BLAKE2B f73bd448f94bc88a1dc775d032ce849ee1dd610c4077c709ffbe40d8c99527c7775cfe2309a636093182ac988ecf44a4b61df0e0a83b332fcc77a05edb602791 SHA512 d7329475cad5bece9358b29bc590da1841c3c0b4aef511508d9398519c514fa176c90675857f1830925818f2dcc8b9c0986e5d34d3a33cce617e4ada23c60a72 |
32 |
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f |
33 |
-DIST libreoffice-help-6.4.7.2.tar.xz 88296892 BLAKE2B 9ee12ec6aa6d5539408e0206e313901540533e28686585fa0bb4edbeaa482bb0ad1cd4ae37ac18dab66bb3e2ea32d52d9960236cbf3e0f8fb5ca07c007f38794 SHA512 a5381a8cca9988998dc01d3815869e47193c1da814b714cbedb51a2099f7dc5444315c657e32defab2eb0b9a9e2a922bc4c5fbc36b7a2b60e7c551887a9cdbb3 |
34 |
DIST libreoffice-help-7.1.3.2.tar.xz 111785416 BLAKE2B 12d97764976ae0e4736638e9b758c5920d38d608e66fc3343d74178a935632396e1e07fbb98b6f380fd103c3f5e2edf917726a760420f6dfd3d2e42aaa215096 SHA512 576dbea391777a907275b630ed704dd3d9ad0627f8a18da1cbd23fe28df04c3a509583c2404f810df3aaac15ef0881e2c1e0a55c9f31618715586628873367eb |
35 |
DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d |
36 |
|
37 |
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 |
38 |
deleted file mode 100644 |
39 |
index 0eb4069..0000000 |
40 |
--- a/app-office/libreoffice/files/libreoffice-6.4.3.2-boost-1.73.patch |
41 |
+++ /dev/null |
42 |
@@ -1,118 +0,0 @@ |
43 |
-From 55c724b93dfd4c9a1afb10d60fbc2d7a9a66cf61 Mon Sep 17 00:00:00 2001 |
44 |
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@××××××.com> |
45 |
-Date: Wed, 29 Jan 2020 12:44:52 +0000 |
46 |
-Subject: replace boost::bimap in sdext pdfimport |
47 |
-MIME-Version: 1.0 |
48 |
-Content-Type: text/plain; charset=UTF-8 |
49 |
-Content-Transfer-Encoding: 8bit |
50 |
- |
51 |
-the error message with boost 1.69 and gcc 10 is so ungodly its easier to throw |
52 |
-bimap out and use something simpler |
53 |
- |
54 |
-Change-Id: Ie324a0b81931bbd427483878a87beeca455ada18 |
55 |
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87683 |
56 |
-Tested-by: Jenkins |
57 |
-Reviewed-by: Caolán McNamara <caolanm@××××××.com> |
58 |
---- |
59 |
- sdext/source/pdfimport/inc/pdfiprocessor.hxx | 12 ++++-------- |
60 |
- sdext/source/pdfimport/tree/pdfiprocessor.cxx | 21 ++++++++++++--------- |
61 |
- 2 files changed, 16 insertions(+), 17 deletions(-) |
62 |
- |
63 |
-diff --git a/sdext/source/pdfimport/inc/pdfiprocessor.hxx b/sdext/source/pdfimport/inc/pdfiprocessor.hxx |
64 |
-index 89f9d601b7b0..9e08d6a6a765 100644 |
65 |
---- a/sdext/source/pdfimport/inc/pdfiprocessor.hxx |
66 |
-+++ b/sdext/source/pdfimport/inc/pdfiprocessor.hxx |
67 |
-@@ -37,9 +37,6 @@ |
68 |
- #include "treevisitorfactory.hxx" |
69 |
- #include "genericelements.hxx" |
70 |
- |
71 |
--#include <boost/bimap/bimap.hpp> |
72 |
--#include <boost/bimap/unordered_set_of.hpp> |
73 |
-- |
74 |
- namespace pdfi |
75 |
- { |
76 |
- |
77 |
-@@ -160,10 +157,8 @@ namespace pdfi |
78 |
- typedef std::unordered_map<sal_Int32,FontAttributes> IdToFontMap; |
79 |
- typedef std::unordered_map<FontAttributes,sal_Int32,FontAttrHash> FontToIdMap; |
80 |
- |
81 |
-- typedef boost::bimaps::bimap< |
82 |
-- boost::bimaps::unordered_set_of<GraphicsContext, GraphicsContextHash>, |
83 |
-- boost::bimaps::unordered_set_of<sal_Int32> |
84 |
-- > GCToIdBiMap; |
85 |
-+ typedef std::unordered_map<sal_Int32,GraphicsContext> IdToGCMap; |
86 |
-+ typedef std::unordered_map<GraphicsContext, sal_Int32, GraphicsContextHash> GCToIdMap; |
87 |
- |
88 |
- typedef std::vector<GraphicsContext> GraphicsContextStack; |
89 |
- |
90 |
-@@ -178,7 +173,8 @@ namespace pdfi |
91 |
- |
92 |
- GraphicsContextStack m_aGCStack; |
93 |
- sal_Int32 m_nNextGCId; |
94 |
-- GCToIdBiMap m_aGCToId; |
95 |
-+ IdToGCMap m_aIdToGC; |
96 |
-+ GCToIdMap m_aGCToId; |
97 |
- |
98 |
- ImageContainer m_aImages; |
99 |
- |
100 |
-diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx |
101 |
-index c6baa7fee8b2..ed2eaf6510b9 100644 |
102 |
---- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx |
103 |
-+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx |
104 |
-@@ -54,6 +54,7 @@ namespace pdfi |
105 |
- m_aFontToId(), |
106 |
- m_aGCStack(), |
107 |
- m_nNextGCId( 1 ), |
108 |
-+ m_aIdToGC(), |
109 |
- m_aGCToId(), |
110 |
- m_aImages(), |
111 |
- m_nPages(0), |
112 |
-@@ -65,12 +66,13 @@ namespace pdfi |
113 |
- aDefFont.isBold = false; |
114 |
- aDefFont.isItalic = false; |
115 |
- aDefFont.size = 10*PDFI_OUTDEV_RESOLUTION/72; |
116 |
-- m_aIdToFont[ 0 ] = aDefFont; |
117 |
-- m_aFontToId[ aDefFont ] = 0; |
118 |
-+ m_aIdToFont.insert({0, aDefFont}); |
119 |
-+ m_aFontToId.insert({aDefFont, 0}); |
120 |
- |
121 |
- GraphicsContext aDefGC; |
122 |
- m_aGCStack.push_back( aDefGC ); |
123 |
-- m_aGCToId.insert(GCToIdBiMap::relation(aDefGC, 0)); |
124 |
-+ m_aGCToId.insert({aDefGC, 0}); |
125 |
-+ m_aIdToGC.insert({0, aDefGC}); |
126 |
- } |
127 |
- |
128 |
- void PDFIProcessor::setPageNum( sal_Int32 nPages ) |
129 |
-@@ -468,12 +470,13 @@ const FontAttributes& PDFIProcessor::getFont( sal_Int32 nFontId ) const |
130 |
- sal_Int32 PDFIProcessor::getGCId( const GraphicsContext& rGC ) |
131 |
- { |
132 |
- sal_Int32 nGCId = 0; |
133 |
-- auto it = m_aGCToId.left.find( rGC ); |
134 |
-- if( it != m_aGCToId.left.end() ) |
135 |
-+ auto it = m_aGCToId.find( rGC ); |
136 |
-+ if( it != m_aGCToId.end() ) |
137 |
- nGCId = it->second; |
138 |
- else |
139 |
- { |
140 |
-- m_aGCToId.insert(GCToIdBiMap::relation(rGC, m_nNextGCId)); |
141 |
-+ m_aGCToId.insert({rGC, m_nNextGCId}); |
142 |
-+ m_aIdToGC.insert({m_nNextGCId, rGC}); |
143 |
- nGCId = m_nNextGCId; |
144 |
- m_nNextGCId++; |
145 |
- } |
146 |
-@@ -483,9 +486,9 @@ sal_Int32 PDFIProcessor::getGCId( const GraphicsContext& rGC ) |
147 |
- |
148 |
- const GraphicsContext& PDFIProcessor::getGraphicsContext( sal_Int32 nGCId ) const |
149 |
- { |
150 |
-- auto it = m_aGCToId.right.find( nGCId ); |
151 |
-- if( it == m_aGCToId.right.end() ) |
152 |
-- it = m_aGCToId.right.find( 0 ); |
153 |
-+ auto it = m_aIdToGC.find( nGCId ); |
154 |
-+ if( it == m_aIdToGC.end() ) |
155 |
-+ it = m_aIdToGC.find( 0 ); |
156 |
- return it->second; |
157 |
- } |
158 |
- |
159 |
--- |
160 |
-cgit v1.2.1 |
161 |
|
162 |
diff --git a/app-office/libreoffice/files/libreoffice-6.4.6.2-llvm-10.patch b/app-office/libreoffice/files/libreoffice-6.4.6.2-llvm-10.patch |
163 |
deleted file mode 100644 |
164 |
index 4a1ff51..0000000 |
165 |
--- a/app-office/libreoffice/files/libreoffice-6.4.6.2-llvm-10.patch |
166 |
+++ /dev/null |
167 |
@@ -1,102 +0,0 @@ |
168 |
-From 986bd28388df745dd969e7be7c3bda36b2b2cb0e Mon Sep 17 00:00:00 2001 |
169 |
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@××××××.com> |
170 |
-Date: Thu, 6 Aug 2020 10:50:47 +0100 |
171 |
-Subject: [PATCH] ofz#24641 libc++abi __cxa_exception has grown another member |
172 |
-MIME-Version: 1.0 |
173 |
-Content-Type: text/plain; charset=UTF-8 |
174 |
-Content-Transfer-Encoding: 8bit |
175 |
- |
176 |
-https: //github.com/llvm/llvm-project/commit/f2a436058fcbc11291e73badb44e243f61046183 |
177 |
- |
178 |
-this is the same problem as |
179 |
- |
180 |
-commit f4b6f6a8ae60bdec53512728d00853b73fa18500 |
181 |
-Author: Stephan Bergmann <sbergman@××××××.com> |
182 |
-Date: Thu Feb 13 08:40:11 2020 +0100 |
183 |
- |
184 |
- Hack to dynamically adapt to __cxa_exceptiom in LLVM 11 libcxxabi |
185 |
- |
186 |
- (where the new change to __cxa_exception effectively reverts the change that |
187 |
- prompted 7a9dd3d482deeeb3ed1d50074e56adbd3f928296 "Hack to dynamically adapt to |
188 |
- __cxa_exceptiom in LLVM 5.0 libcxxabi") |
189 |
- |
190 |
- Change-Id: Iec4ef1dc188bea2223d99b1b7eb8adec636c98e7 |
191 |
- Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88583 |
192 |
- Tested-by: Jenkins |
193 |
- Reviewed-by: Stephan Bergmann <sbergman@××××××.com> |
194 |
- |
195 |
-so c-n-p that solution here |
196 |
- |
197 |
-Change-Id: I4475757a766e3ade7b9fcaf6149e535c9f9a4fa4 |
198 |
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100209 |
199 |
-Tested-by: Caolán McNamara <caolanm@××××××.com> |
200 |
-Reviewed-by: Caolán McNamara <caolanm@××××××.com> |
201 |
---- |
202 |
- .../cpp_uno/gcc3_linux_x86-64/except.cxx | 28 +++++++++++++++++++ |
203 |
- .../cpp_uno/gcc3_linux_x86-64/share.hxx | 14 ++++++++++ |
204 |
- 2 files changed, 42 insertions(+) |
205 |
- |
206 |
-diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx |
207 |
-index e9e861f1c210..25931671f7dc 100644 |
208 |
---- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx |
209 |
-+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx |
210 |
-@@ -150,6 +150,34 @@ void fillUnoException(uno_Any * pUnoExc, uno_Mapping * pCpp2Uno) |
211 |
- return; |
212 |
- } |
213 |
- |
214 |
-+#if defined _LIBCPPABI_VERSION // detect libc++abi |
215 |
-+ // Very bad HACK to find out whether we run against a libcxxabi that has a new |
216 |
-+ // __cxa_exception::reserved member at the start, introduced with LLVM 11 |
217 |
-+ // <https://github.com/llvm/llvm-project/commit/f2a436058fcbc11291e73badb44e243f61046183> |
218 |
-+ // "[libcxxabi] Insert padding in __cxa_exception struct for compatibility". The layout of the |
219 |
-+ // start of __cxa_exception is |
220 |
-+ // |
221 |
-+ // [8 byte void *reserve] |
222 |
-+ // 8 byte size_t referenceCount |
223 |
-+ // |
224 |
-+ // where the (bad, hacky) assumption is that reserve (if present) is null |
225 |
-+ // (__cxa_allocate_exception in at least LLVM 11 zero-fills the object, and nothing actively |
226 |
-+ // sets reserve) while referenceCount is non-null (__cxa_throw sets it to 1, and |
227 |
-+ // __cxa_decrement_exception_refcount destroys the exception as soon as it drops to 0; for a |
228 |
-+ // __cxa_dependent_exception, the referenceCount member is rather |
229 |
-+ // |
230 |
-+ // 8 byte void* primaryException |
231 |
-+ // |
232 |
-+ // but which also will always be set to a non-null value in __cxa_rethrow_primary_exception). |
233 |
-+ // As described in the definition of __cxa_exception |
234 |
-+ // (bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx), this hack (together with the "#if 0" |
235 |
-+ // there) can be dropped once we can be sure that we only run against new libcxxabi that has the |
236 |
-+ // reserve member: |
237 |
-+ if (*reinterpret_cast<void **>(header) == nullptr) { |
238 |
-+ header = reinterpret_cast<__cxxabiv1::__cxa_exception*>(reinterpret_cast<void **>(header) + 1); |
239 |
-+ } |
240 |
-+#endif |
241 |
-+ |
242 |
- std::type_info *exceptionType = __cxxabiv1::__cxa_current_exception_type(); |
243 |
- |
244 |
- typelib_TypeDescription * pExcTypeDescr = nullptr; |
245 |
-diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx |
246 |
-index e8afe35c4f59..53c8841fbbcb 100644 |
247 |
---- a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx |
248 |
-+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx |
249 |
-@@ -108,6 +108,20 @@ namespace __cxxabiv1 { |
250 |
- struct __cxa_exception { |
251 |
- #if defined _LIBCPPABI_VERSION // detect libc++abi |
252 |
- #if defined __LP64__ || LIBCXXABI_ARM_EHABI |
253 |
-+#if 0 |
254 |
-+ // This is a new field added with LLVM 11 |
255 |
-+ // <https://github.com/llvm/llvm-project/commit/f2a436058fcbc11291e73badb44e243f61046183> |
256 |
-+ // "[libcxxabi] Insert padding in __cxa_exception struct for compatibility". The HACK in |
257 |
-+ // fillUnoException (bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx) tries to find out at |
258 |
-+ // runtime whether a __cxa_exception has this member. Once we can be sure that we only run |
259 |
-+ // against new libcxxabi that has this member, we can drop the "#if 0" here and drop the hack |
260 |
-+ // in fillUnoException. |
261 |
-+ |
262 |
-+ // Now _Unwind_Exception is marked with __attribute__((aligned)), |
263 |
-+ // which implies __cxa_exception is also aligned. Insert padding |
264 |
-+ // in the beginning of the struct, rather than before unwindHeader. |
265 |
-+ void *reserve; |
266 |
-+#endif |
267 |
- std::size_t referenceCount; |
268 |
- #endif |
269 |
- #endif |
270 |
|
271 |
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 |
272 |
deleted file mode 100644 |
273 |
index 9c9d417..0000000 |
274 |
--- a/app-office/libreoffice/files/libreoffice-6.4.7.2-fix-wrong-setting-for-doc-properties.patch |
275 |
+++ /dev/null |
276 |
@@ -1,75 +0,0 @@ |
277 |
-From 188ddcd482150b5fdeb44d97e57831e3e27b3f5b Mon Sep 17 00:00:00 2001 |
278 |
-From: Justin Luth <justin_luth@×××.org> |
279 |
-Date: Mon, 28 Sep 2020 20:21:52 +0300 |
280 |
-Subject: tdf#136983 partial revert NFC ww8 cleanup: remove unused variables |
281 |
- |
282 |
-This is a partial revert of LO 6.2 |
283 |
-commit 2ec0cf500222aef55d02df80154b47fbb92970c9 |
284 |
- |
285 |
-I can't think of any excuse for how I possibly missed that |
286 |
-xDocProps was being defined/used outside of this clause. |
287 |
-Just plain stupid and blind. |
288 |
- |
289 |
-The good news is that the create and modified date still |
290 |
-seem to be getting saved somehow/somewhere. So it isn't |
291 |
-the disaster that it looks like it could have been. |
292 |
- |
293 |
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103565 |
294 |
-Tested-by: Jenkins |
295 |
-Reviewed-by: Justin Luth <justin_luth@×××.org> |
296 |
-(cherry picked from commit 1086654d6e8cc22f1f99195668db3f305437e570) |
297 |
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104495 |
298 |
-Reviewed-by: Miklos Vajna <vmiklos@×××××××××.com> |
299 |
-(cherry picked from commit 19b8ded3ae18dd4070a3e21d7b980782a27e5547) |
300 |
- |
301 |
-Change-Id: I72ef56fa50b9e92e4ce687b132b1919cfae6c1f6 |
302 |
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104497 |
303 |
-Tested-by: Jenkins |
304 |
-Reviewed-by: Miklos Vajna <vmiklos@×××××××××.com> |
305 |
---- |
306 |
- sw/qa/extras/ww8export/ww8export3.cxx | 5 +++++ |
307 |
- sw/source/filter/ww8/wrtww8.cxx | 6 +++++- |
308 |
- 2 files changed, 10 insertions(+), 1 deletion(-) |
309 |
- |
310 |
-diff --git a/sw/qa/extras/ww8export/ww8export3.cxx b/sw/qa/extras/ww8export/ww8export3.cxx |
311 |
-index 764ae66a20fa..9c83b6f62fa9 100644 |
312 |
---- a/sw/qa/extras/ww8export/ww8export3.cxx |
313 |
-+++ b/sw/qa/extras/ww8export/ww8export3.cxx |
314 |
-@@ -14,6 +14,7 @@ |
315 |
- #include <com/sun/star/container/XIndexAccess.hpp> |
316 |
- #include <com/sun/star/drawing/FillStyle.hpp> |
317 |
- #include <com/sun/star/drawing/LineDash.hpp> |
318 |
-+#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> |
319 |
- #include <com/sun/star/graphic/XGraphic.hpp> |
320 |
- #include <com/sun/star/text/XFormField.hpp> |
321 |
- #include <com/sun/star/text/XTextTable.hpp> |
322 |
-@@ -49,6 +50,10 @@ DECLARE_WW8EXPORT_TEST(testTdf37778_readonlySection, "tdf37778_readonlySection.d |
323 |
- // tdf#127862: page fill color (in this case white) was lost |
324 |
- uno::Reference<beans::XPropertySet> xStyle(getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY); |
325 |
- CPPUNIT_ASSERT(drawing::FillStyle_NONE != getProperty<drawing::FillStyle>(xStyle, "FillStyle")); |
326 |
-+ |
327 |
-+ // tdf#136983 |
328 |
-+ uno::Reference<document::XDocumentPropertiesSupplier> xDPS(mxComponent, uno::UNO_QUERY); |
329 |
-+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Last printed date", sal_Int16(2009), xDPS->getDocumentProperties()->getPrintDate().Year); |
330 |
- } |
331 |
- |
332 |
- DECLARE_WW8EXPORT_TEST(testTdf122429_header, "tdf122429_header.doc") |
333 |
-diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx |
334 |
-index e908cab35162..8d4add7b34bf 100644 |
335 |
---- a/sw/source/filter/ww8/wrtww8.cxx |
336 |
-+++ b/sw/source/filter/ww8/wrtww8.cxx |
337 |
-@@ -501,7 +501,11 @@ static void WriteDop( WW8Export& rWrt ) |
338 |
- uno::Reference<beans::XPropertySet> xProps; |
339 |
- if ( pDocShell ) |
340 |
- { |
341 |
-- xProps.set(pDocShell->GetModel(), uno::UNO_QUERY); |
342 |
-+ uno::Reference<lang::XComponent> xModelComp(pDocShell->GetModel(), uno::UNO_QUERY); |
343 |
-+ xProps.set(xModelComp, uno::UNO_QUERY); |
344 |
-+ uno::Reference<document::XDocumentPropertiesSupplier> xDPS(xModelComp, uno::UNO_QUERY_THROW); |
345 |
-+ xDocProps = xDPS->getDocumentProperties(); |
346 |
-+ OSL_ENSURE(xDocProps.is(), "DocumentProperties is null"); |
347 |
- |
348 |
- rDop.lKeyProtDoc = pDocShell->GetModifyPasswordHash(); |
349 |
- } |
350 |
--- |
351 |
-cgit v1.2.1 |
352 |
|
353 |
diff --git a/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-1.patch b/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-1.patch |
354 |
deleted file mode 100644 |
355 |
index fe20e34..0000000 |
356 |
--- a/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-1.patch |
357 |
+++ /dev/null |
358 |
@@ -1,46 +0,0 @@ |
359 |
-From 0b14b9ec55fb2a8dd0ec24e1c03702bc4bbf1878 Mon Sep 17 00:00:00 2001 |
360 |
-From: Rene Engelhard <rene@××××××.org> |
361 |
-Date: Sun, 1 Nov 2020 18:30:49 +0100 |
362 |
-Subject: fix build with ICU 68 |
363 |
- |
364 |
-use standard true. |
365 |
- |
366 |
-/home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx: In member function 'virtual void i18npool::Calendar_gregorian::setLocalDateTime(double)': |
367 |
-/home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx:363:40: error: 'TRUE' was not declared in this scope |
368 |
- 363 | body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); |
369 |
- | ^~~~ |
370 |
- |
371 |
-/usr/include/unicode/umachine.h says: |
372 |
- |
373 |
-@deprecated ICU 68 Use standard "true" instead. |
374 |
- |
375 |
-Change-Id: I45d2b0afa6a9043767af5c2cf41ba24377f2cdc4 |
376 |
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105057 |
377 |
-Tested-by: Jenkins |
378 |
-Reviewed-by: Eike Rathke <erack@××××××.com> |
379 |
---- |
380 |
- i18npool/source/calendar/calendar_gregorian.cxx | 9 ++++++++- |
381 |
- 1 file changed, 8 insertions(+), 1 deletion(-) |
382 |
- |
383 |
-diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx |
384 |
-index b7ae49fbd96e..59ee46fa0e0f 100644 |
385 |
---- a/i18npool/source/calendar/calendar_gregorian.cxx |
386 |
-+++ b/i18npool/source/calendar/calendar_gregorian.cxx |
387 |
-@@ -347,7 +347,14 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDays ) |
388 |
- "Calendar_gregorian::setLocalDateTime: " << std::fixed << fM << " rounded to " << fR); |
389 |
- int32_t nZoneOffset, nDSTOffset; |
390 |
- UErrorCode status = U_ZERO_ERROR; |
391 |
-- body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); |
392 |
-+ body->getTimeZone().getOffset( fR, |
393 |
-+#if U_ICU_VERSION_MAJOR_NUM >= 68 |
394 |
-+ true, |
395 |
-+#else |
396 |
-+ TRUE, |
397 |
-+#endif |
398 |
-+ nZoneOffset, nDSTOffset, status ); |
399 |
-+ |
400 |
- if ( !U_SUCCESS(status) ) throw ERROR; |
401 |
- status = U_ZERO_ERROR; |
402 |
- body->setTime( fR - (nZoneOffset + nDSTOffset), status ); |
403 |
--- |
404 |
-cgit v1.2.1 |
405 |
|
406 |
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 |
407 |
deleted file mode 100644 |
408 |
index bd7dc04..0000000 |
409 |
--- a/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-2.patch |
410 |
+++ /dev/null |
411 |
@@ -1,28 +0,0 @@ |
412 |
-From 523f8613c124b722b721c8055db2085a005e09dd Mon Sep 17 00:00:00 2001 |
413 |
-From: Andreas Sturmlechner <asturm@g.o> |
414 |
-Date: Fri, 6 Nov 2020 02:43:07 +0100 |
415 |
-Subject: [PATCH] Fix build with ICU 68, use standard true. (part 2/2 missing |
416 |
- from 0b14b9ec) |
417 |
- |
418 |
-Change-Id: I776dd4e1fc92ef1ef09b88e239bf0d6942c28ca3 |
419 |
-Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
420 |
---- |
421 |
- svx/source/dialog/fntctrl.cxx | 2 +- |
422 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
423 |
- |
424 |
-diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx |
425 |
-index d312d7ad5f49..10c84ca95222 100644 |
426 |
---- a/svx/source/dialog/fntctrl.cxx |
427 |
-+++ b/svx/source/dialog/fntctrl.cxx |
428 |
-@@ -1014,7 +1014,7 @@ void SvxFontPrevWindow::SetFromItemSet(const SfxItemSet &rSet, bool bPreviewBack |
429 |
- rCTLFont.SetFillColor( rColor ); |
430 |
- } |
431 |
- else |
432 |
-- bTransparent = TRUE; |
433 |
-+ bTransparent = true; |
434 |
- |
435 |
- rFont.SetTransparent( bTransparent ); |
436 |
- rCJKFont.SetTransparent( bTransparent ); |
437 |
--- |
438 |
-2.29.2 |
439 |
- |
440 |
|
441 |
diff --git a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild b/app-office/libreoffice/libreoffice-6.4.7.2.ebuild |
442 |
deleted file mode 100644 |
443 |
index 4f72d25..0000000 |
444 |
--- a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild |
445 |
+++ /dev/null |
446 |
@@ -1,597 +0,0 @@ |
447 |
-# Copyright 1999-2020 Gentoo Authors |
448 |
-# Distributed under the terms of the GNU General Public License v2 |
449 |
- |
450 |
-EAPI=7 |
451 |
- |
452 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
453 |
-PYTHON_REQ_USE="threads(+),xml" |
454 |
- |
455 |
-MY_PV="${PV/_alpha/.alpha}" |
456 |
-MY_PV="${MY_PV/_beta/.beta}" |
457 |
-# experimental ; release ; old |
458 |
-# Usually the tarballs are moved a lot so this should make everyone happy. |
459 |
-DEV_URI=" |
460 |
- https://dev-builds.libreoffice.org/pre-releases/src |
461 |
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/ |
462 |
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src |
463 |
-" |
464 |
-ADDONS_URI="https://dev-www.libreoffice.org/src/" |
465 |
- |
466 |
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz" |
467 |
-# PATCHSET="${P}-patchset-01.tar.xz" |
468 |
- |
469 |
-[[ ${MY_PV} == *9999* ]] && inherit git-r3 |
470 |
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils |
471 |
- |
472 |
-DESCRIPTION="A full office productivity suite" |
473 |
-HOMEPAGE="https://www.libreoffice.org" |
474 |
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" |
475 |
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}" |
476 |
- |
477 |
-# Split modules following git/tarballs; Core MUST be first! |
478 |
-# Help is used for the image generator |
479 |
-# Only release has the tarballs |
480 |
-if [[ ${MY_PV} != *9999* ]]; then |
481 |
- for i in ${DEV_URI}; do |
482 |
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz" |
483 |
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz" |
484 |
- done |
485 |
- unset i |
486 |
-fi |
487 |
-unset DEV_URI |
488 |
- |
489 |
-# Really required addons |
490 |
-# These are bundles that can't be removed for now due to huge patchsets. |
491 |
-# If you want them gone, patches are welcome. |
492 |
-ADDONS_SRC=( |
493 |
- # QR code generating library for >=libreoffice-6.4 |
494 |
- "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz" |
495 |
- "base? ( |
496 |
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz |
497 |
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip |
498 |
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip |
499 |
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip |
500 |
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip |
501 |
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip |
502 |
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip |
503 |
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip |
504 |
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip |
505 |
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip |
506 |
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip |
507 |
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip |
508 |
- )" |
509 |
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" |
510 |
- # no release for 8 years, should we package it? |
511 |
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" |
512 |
- # Does not build with 1.6 rhino at all |
513 |
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" |
514 |
- # requirement of rhino |
515 |
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" |
516 |
- # not packageable |
517 |
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" |
518 |
-) |
519 |
-SRC_URI+=" ${ADDONS_SRC[*]}" |
520 |
- |
521 |
-unset ADDONS_URI |
522 |
-unset ADDONS_SRC |
523 |
- |
524 |
-# Extensions that need extra work: |
525 |
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" |
526 |
- |
527 |
-IUSE="accessibility base bluetooth +branding coinmp +cups +dbus debug eds firebird |
528 |
-googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test |
529 |
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" |
530 |
- |
531 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
532 |
- base? ( firebird java ) |
533 |
- bluetooth? ( dbus ) |
534 |
- gtk? ( dbus ) |
535 |
- libreoffice_extensions_nlpsolver? ( java ) |
536 |
- libreoffice_extensions_scripting-beanshell? ( java ) |
537 |
- libreoffice_extensions_scripting-javascript? ( java ) |
538 |
- libreoffice_extensions_wiki-publisher? ( java ) |
539 |
-" |
540 |
- |
541 |
-RESTRICT="!test? ( test )" |
542 |
- |
543 |
-LICENSE="|| ( LGPL-3 MPL-1.1 )" |
544 |
-SLOT="0" |
545 |
- |
546 |
-[[ ${MY_PV} == *9999* ]] || \ |
547 |
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" |
548 |
- |
549 |
-BDEPEND=" |
550 |
- dev-util/intltool |
551 |
- sys-devel/bison |
552 |
- sys-devel/flex |
553 |
- sys-devel/gettext |
554 |
- virtual/pkgconfig |
555 |
- odk? ( >=app-doc/doxygen-1.8.4 ) |
556 |
-" |
557 |
-COMMON_DEPEND="${PYTHON_DEPS} |
558 |
- app-arch/unzip |
559 |
- app-arch/zip |
560 |
- app-crypt/gpgme[cxx] |
561 |
- app-text/hunspell:= |
562 |
- >=app-text/libabw-0.1.0 |
563 |
- >=app-text/libebook-0.1 |
564 |
- app-text/libepubgen |
565 |
- >=app-text/libetonyek-0.1 |
566 |
- app-text/libexttextcat |
567 |
- app-text/liblangtag |
568 |
- >=app-text/libmspub-0.1.0 |
569 |
- >=app-text/libmwaw-0.3.1 |
570 |
- app-text/libnumbertext |
571 |
- >=app-text/libodfgen-0.1.0 |
572 |
- app-text/libqxp |
573 |
- app-text/libstaroffice |
574 |
- app-text/libwpd:0.10[tools] |
575 |
- app-text/libwpg:0.3 |
576 |
- >=app-text/libwps-0.4 |
577 |
- app-text/mythes |
578 |
- >=dev-cpp/clucene-2.3.3.4-r2 |
579 |
- >=dev-cpp/libcmis-0.5.2 |
580 |
- dev-db/unixODBC |
581 |
- dev-lang/perl |
582 |
- >=dev-libs/boost-1.72.0:=[nls] |
583 |
- dev-libs/expat |
584 |
- dev-libs/hyphen |
585 |
- dev-libs/icu:= |
586 |
- dev-libs/libassuan |
587 |
- dev-libs/libgpg-error |
588 |
- dev-libs/liborcus:0/0.15 |
589 |
- dev-libs/librevenge |
590 |
- dev-libs/libxml2 |
591 |
- dev-libs/libxslt |
592 |
- dev-libs/nspr |
593 |
- dev-libs/nss |
594 |
- >=dev-libs/redland-1.0.16 |
595 |
- >=dev-libs/xmlsec-1.2.28[nss] |
596 |
- media-gfx/fontforge |
597 |
- media-gfx/graphite2 |
598 |
- media-libs/fontconfig |
599 |
- media-libs/freetype:2 |
600 |
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu] |
601 |
- media-libs/lcms:2 |
602 |
- >=media-libs/libcdr-0.1.0 |
603 |
- >=media-libs/libepoxy-1.3.1[X] |
604 |
- >=media-libs/libfreehand-0.1.0 |
605 |
- media-libs/libpagemaker |
606 |
- >=media-libs/libpng-1.4:0= |
607 |
- >=media-libs/libvisio-0.1.0 |
608 |
- media-libs/libzmf |
609 |
- net-libs/neon |
610 |
- net-misc/curl |
611 |
- sci-mathematics/lpsolve |
612 |
- sys-libs/zlib |
613 |
- virtual/glu |
614 |
- virtual/jpeg:0 |
615 |
- virtual/opengl |
616 |
- x11-libs/cairo[X] |
617 |
- x11-libs/libXinerama |
618 |
- x11-libs/libXrandr |
619 |
- x11-libs/libXrender |
620 |
- accessibility? ( |
621 |
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]') |
622 |
- ) |
623 |
- bluetooth? ( |
624 |
- dev-libs/glib:2 |
625 |
- net-wireless/bluez |
626 |
- ) |
627 |
- coinmp? ( sci-libs/coinor-mp ) |
628 |
- cups? ( net-print/cups ) |
629 |
- dbus? ( sys-apps/dbus[X] ) |
630 |
- eds? ( |
631 |
- dev-libs/glib:2 |
632 |
- gnome-base/dconf |
633 |
- gnome-extra/evolution-data-server |
634 |
- ) |
635 |
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) |
636 |
- gstreamer? ( |
637 |
- media-libs/gstreamer:1.0 |
638 |
- media-libs/gst-plugins-base:1.0 |
639 |
- ) |
640 |
- gtk? ( |
641 |
- dev-libs/glib:2 |
642 |
- dev-libs/gobject-introspection |
643 |
- gnome-base/dconf |
644 |
- media-libs/mesa[egl] |
645 |
- x11-libs/gtk+:3 |
646 |
- x11-libs/pango |
647 |
- ) |
648 |
- kde? ( |
649 |
- dev-qt/qtcore:5 |
650 |
- dev-qt/qtgui:5 |
651 |
- dev-qt/qtwidgets:5 |
652 |
- dev-qt/qtx11extras:5 |
653 |
- kde-frameworks/kconfig:5 |
654 |
- kde-frameworks/kcoreaddons:5 |
655 |
- kde-frameworks/ki18n:5 |
656 |
- kde-frameworks/kio:5 |
657 |
- kde-frameworks/kwindowsystem:5 |
658 |
- ) |
659 |
- ldap? ( net-nds/openldap ) |
660 |
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) |
661 |
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) |
662 |
- mariadb? ( dev-db/mariadb-connector-c ) |
663 |
- !mariadb? ( dev-db/mysql-connector-c ) |
664 |
- pdfimport? ( app-text/poppler:=[cxx] ) |
665 |
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) |
666 |
-" |
667 |
-# FIXME: cppunit should be moved to test conditional |
668 |
-# after everything upstream is under gbuild |
669 |
-# as dmake execute tests right away |
670 |
-# tests apparently also need google-carlito-fonts (not packaged) |
671 |
-DEPEND="${COMMON_DEPEND} |
672 |
- >=dev-libs/libatomic_ops-7.2d |
673 |
- dev-perl/Archive-Zip |
674 |
- >=dev-util/cppunit-1.14.0 |
675 |
- >=dev-util/gperf-3.1 |
676 |
- dev-util/mdds:1/1.5 |
677 |
- media-libs/glm |
678 |
- sys-devel/ucpp |
679 |
- x11-base/xorg-proto |
680 |
- x11-libs/libXt |
681 |
- x11-libs/libXtst |
682 |
- java? ( |
683 |
- dev-java/ant-core |
684 |
- >=virtual/jdk-1.8 |
685 |
- ) |
686 |
- test? ( |
687 |
- app-crypt/gnupg |
688 |
- dev-util/cppunit |
689 |
- media-fonts/dejavu |
690 |
- media-fonts/liberation-fonts |
691 |
- ) |
692 |
-" |
693 |
-RDEPEND="${COMMON_DEPEND} |
694 |
- !app-office/libreoffice-bin |
695 |
- !app-office/libreoffice-bin-debug |
696 |
- !app-office/openoffice |
697 |
- media-fonts/liberation-fonts |
698 |
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) |
699 |
- java? ( >=virtual/jre-1.8 ) |
700 |
- kde? ( kde-frameworks/breeze-icons:* ) |
701 |
-" |
702 |
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then |
703 |
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*" |
704 |
-else |
705 |
- # Translations are not reliable on live ebuilds |
706 |
- # rather force people to use english only. |
707 |
- PDEPEND="!app-office/libreoffice-l10n" |
708 |
-fi |
709 |
- |
710 |
-PATCHES=( |
711 |
- # "${WORKDIR}"/${PATCHSET/.tar.xz/} |
712 |
- |
713 |
- # not upstreamable stuff |
714 |
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" |
715 |
- "${FILESDIR}/${PN}-6.1-nomancompress.patch" |
716 |
- "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch" |
717 |
- |
718 |
- # 6.4 branch (fixed in 6.4.8) |
719 |
- "${FILESDIR}/${P}-fix-wrong-setting-for-doc-properties.patch" |
720 |
- |
721 |
- # git master |
722 |
- "${FILESDIR}/${PN}-6.4.3.2-boost-1.73.patch" # bug 721806 |
723 |
- "${FILESDIR}/${PN}-6.4.6.2-llvm-10.patch" # bug 713574 |
724 |
- "${FILESDIR}"/${P}-icu-68-{1,2}.patch # bug 752021, +downstream backport |
725 |
- |
726 |
- # musl compatibility by AlpineLinux |
727 |
- "${FILESDIR}/${PN}-6.4.4.2-linux-musl.patch" |
728 |
- "${FILESDIR}/${PN}-6.1.4.2-musl-fix-execinfo.patch" |
729 |
- "${FILESDIR}/${PN}-6.1.4.2-disable-liborcus-unittest.patch" |
730 |
- "${FILESDIR}/${PN}-6.1.4.2-musl-stacksize.patch" |
731 |
-) |
732 |
- |
733 |
-S="${WORKDIR}/${PN}-${MY_PV}" |
734 |
- |
735 |
-_check_reqs() { |
736 |
- CHECKREQS_MEMORY="512M" |
737 |
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then |
738 |
- CHECKREQS_DISK_BUILD="22G" |
739 |
- else |
740 |
- CHECKREQS_DISK_BUILD="6G" |
741 |
- fi |
742 |
- check-reqs_$1 |
743 |
-} |
744 |
- |
745 |
-pkg_pretend() { |
746 |
- use base || |
747 |
- ewarn "If you plan to use Base application you must enable USE base." |
748 |
- use java || |
749 |
- ewarn "Without USE java, several wizards are not going to be available." |
750 |
- |
751 |
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend |
752 |
-} |
753 |
- |
754 |
-pkg_setup() { |
755 |
- java-pkg-opt-2_pkg_setup |
756 |
- python-single-r1_pkg_setup |
757 |
- xdg_environment_reset |
758 |
- |
759 |
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup |
760 |
-} |
761 |
- |
762 |
-src_unpack() { |
763 |
- default |
764 |
- |
765 |
- if [[ ${MY_PV} = *9999* ]]; then |
766 |
- local base_uri branch mypv |
767 |
- base_uri="https://anongit.freedesktop.org/git" |
768 |
- branch="master" |
769 |
- mypv=${MY_PV/.9999} |
770 |
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}" |
771 |
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}" |
772 |
- git-r3_checkout "${base_uri}/${PN}/core" |
773 |
- LOCOREGIT_VERSION=${EGIT_VERSION} |
774 |
- |
775 |
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master" |
776 |
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help |
777 |
- fi |
778 |
-} |
779 |
- |
780 |
-src_prepare() { |
781 |
- default |
782 |
- |
783 |
- # sandbox violations on many systems, we don't need it. Bug #646406 |
784 |
- sed -i \ |
785 |
- -e "/KF5_CONFIG/s/kf5-config/no/" \ |
786 |
- configure.ac || die "Failed to disable kf5-config" |
787 |
- |
788 |
- AT_M4DIR="m4" eautoreconf |
789 |
- # hack in the autogen.sh |
790 |
- touch autogen.lastrun |
791 |
- |
792 |
- # sed in the tests |
793 |
- sed -i \ |
794 |
- -e "s#all : build unitcheck#all : build#g" \ |
795 |
- solenv/gbuild/Module.mk || die |
796 |
- sed -i \ |
797 |
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \ |
798 |
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \ |
799 |
- Makefile.in || die |
800 |
- |
801 |
- sed -i \ |
802 |
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \ |
803 |
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \ |
804 |
- bin/distro-install-desktop-integration || die |
805 |
- |
806 |
- if use branding; then |
807 |
- # hack... |
808 |
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die |
809 |
- fi |
810 |
- |
811 |
- # Don't list pdfimport support in desktop when built with none, bug # 605464 |
812 |
- if ! use pdfimport; then |
813 |
- sed -i \ |
814 |
- -e ":MimeType: s:application/pdf;::" \ |
815 |
- -e ":Keywords: s:pdf;::" \ |
816 |
- sysui/desktop/menus/draw.desktop || die |
817 |
- fi |
818 |
-} |
819 |
- |
820 |
-src_configure() { |
821 |
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys |
822 |
- # Note: these are for Gentoo use ONLY. For your own distribution, please get |
823 |
- # your own set of keys. Feel free to contact chromium@g.o for more info. |
824 |
- local google_default_client_id="329227923882.apps.googleusercontent.com" |
825 |
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" |
826 |
- |
827 |
- # optimization flags |
828 |
- export GMAKE_OPTIONS="${MAKEOPTS}" |
829 |
- # System python enablement: |
830 |
- export PYTHON_CFLAGS=$(python_get_CFLAGS) |
831 |
- export PYTHON_LIBS=$(python_get_LIBS) |
832 |
- |
833 |
- use kde && export QT5DIR="$(qt5_get_bindir)/.." |
834 |
- |
835 |
- local gentoo_buildid="Gentoo official package" |
836 |
- if [[ -n ${LOCOREGIT_VERSION} ]]; then |
837 |
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})" |
838 |
- fi |
839 |
- |
840 |
- # system headers/libs/...: enforce using system packages |
841 |
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad |
842 |
- # --enable-cairo: ensure that cairo is always required |
843 |
- # --enable-*-link: link to the library rather than just dlopen on runtime |
844 |
- # --enable-release-build: build the libreoffice as release |
845 |
- # --disable-fetch-external: prevent dowloading during compile phase |
846 |
- # --enable-extension-integration: enable any extension integration support |
847 |
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs |
848 |
- # --disable-report-builder: too much java packages pulled in without pkgs |
849 |
- # --without-system-sane: just sane.h header that is used for scan in writer, |
850 |
- # not linked or anything else, worthless to depend on |
851 |
- # --disable-pdfium: not yet packaged |
852 |
- # --without-system-qrencode: has no real build system and LO is the only user |
853 |
- local myeconfargs=( |
854 |
- --with-system-dicts |
855 |
- --with-system-epoxy |
856 |
- --with-system-headers |
857 |
- --with-system-jars |
858 |
- --with-system-libs |
859 |
- --enable-build-opensymbol |
860 |
- --enable-cairo-canvas |
861 |
- --enable-largefile |
862 |
- --enable-mergelibs |
863 |
- --enable-neon |
864 |
- --enable-python=system |
865 |
- --enable-randr |
866 |
- --enable-release-build |
867 |
- --disable-breakpad |
868 |
- --disable-bundle-mariadb |
869 |
- --disable-ccache |
870 |
- --disable-epm |
871 |
- --disable-fetch-external |
872 |
- --disable-gtk3-kde5 |
873 |
- --disable-online-update |
874 |
- --disable-openssl |
875 |
- --disable-pdfium |
876 |
- --disable-vlc |
877 |
- --with-build-version="${gentoo_buildid}" |
878 |
- --enable-extension-integration |
879 |
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" |
880 |
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" |
881 |
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" |
882 |
- --with-external-tar="${DISTDIR}" |
883 |
- --with-lang="" |
884 |
- --with-parallelism=$(makeopts_jobs) |
885 |
- --with-system-ucpp |
886 |
- --with-tls=nss |
887 |
- --with-vendor="Gentoo Foundation" |
888 |
- --with-x |
889 |
- --without-fonts |
890 |
- --without-myspell-dicts |
891 |
- --with-help="html" |
892 |
- --without-helppack-integration |
893 |
- --with-system-gpgmepp |
894 |
- --without-system-jfreereport |
895 |
- --without-system_apache_commons |
896 |
- --without-system-sane |
897 |
- --without-system-qrcodegen |
898 |
- $(use_enable base report-builder) |
899 |
- $(use_enable bluetooth sdremote-bluetooth) |
900 |
- $(use_enable coinmp) |
901 |
- $(use_enable cups) |
902 |
- $(use_enable dbus) |
903 |
- $(use_enable debug) |
904 |
- $(use_enable eds evolution2) |
905 |
- $(use_enable firebird firebird-sdbc) |
906 |
- $(use_enable gstreamer gstreamer-1-0) |
907 |
- $(use_enable gtk gtk3) |
908 |
- $(use_enable kde kf5) |
909 |
- $(use_enable kde qt5) |
910 |
- $(use_enable ldap) |
911 |
- $(use_enable odk) |
912 |
- $(use_enable pdfimport) |
913 |
- $(use_enable postgres postgresql-sdbc) |
914 |
- $(use_with accessibility lxml) |
915 |
- $(use_with coinmp system-coinmp) |
916 |
- $(use_with googledrive gdrive-client-id ${google_default_client_id}) |
917 |
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) |
918 |
- $(use_with java) |
919 |
- $(use_with odk doxygen) |
920 |
- ) |
921 |
- |
922 |
- if use eds || use gtk; then |
923 |
- myeconfargs+=( --enable-dconf --enable-gio ) |
924 |
- else |
925 |
- myeconfargs+=( --disable-dconf --disable-gio ) |
926 |
- fi |
927 |
- |
928 |
- # libreoffice extensions handling |
929 |
- for lo_xt in ${LO_EXTS}; do |
930 |
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then |
931 |
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) ) |
932 |
- else |
933 |
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) ) |
934 |
- fi |
935 |
- done |
936 |
- |
937 |
- if use java; then |
938 |
- # hsqldb: system one is too new |
939 |
- myeconfargs+=( |
940 |
- --without-junit |
941 |
- --without-system-hsqldb |
942 |
- --with-ant-home="${ANT_HOME}" |
943 |
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null) |
944 |
- --with-jvm-path="${EPREFIX}/usr/lib/" |
945 |
- ) |
946 |
- |
947 |
- use libreoffice_extensions_scripting-beanshell && \ |
948 |
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) ) |
949 |
- |
950 |
- use libreoffice_extensions_scripting-javascript && \ |
951 |
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) ) |
952 |
- fi |
953 |
- |
954 |
- is-flagq "-flto*" && myeconfargs+=( --enable-lto ) |
955 |
- |
956 |
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ |
957 |
- econf "${myeconfargs[@]}" |
958 |
-} |
959 |
- |
960 |
-src_compile() { |
961 |
- # more and more LO stuff tries to use OpenGL, including tests during build |
962 |
- # bug 501508, bug 540624, bug 545974 and probably more |
963 |
- addpredict /dev/dri |
964 |
- addpredict /dev/ati |
965 |
- addpredict /dev/nvidiactl |
966 |
- |
967 |
- local target |
968 |
- use test && target="build" || target="build-nocheck" |
969 |
- |
970 |
- # this is not a proper make script |
971 |
- make ${target} || die |
972 |
-} |
973 |
- |
974 |
-src_test() { |
975 |
- make unitcheck || die |
976 |
- make slowcheck || die |
977 |
-} |
978 |
- |
979 |
-src_install() { |
980 |
- # This is not Makefile so no buildserver |
981 |
- emake DESTDIR="${D}" distro-pack-install -o build -o check |
982 |
- |
983 |
- # bug 593514 |
984 |
- if use gtk; then |
985 |
- dosym libreoffice/program/liblibreofficekitgtk.so \ |
986 |
- /usr/$(get_libdir)/liblibreofficekitgtk.so |
987 |
- fi |
988 |
- |
989 |
- # bash completion aliases |
990 |
- bashcomp_alias \ |
991 |
- libreoffice \ |
992 |
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice |
993 |
- |
994 |
- if use branding; then |
995 |
- insinto /usr/$(get_libdir)/${PN}/program |
996 |
- newins "${WORKDIR}/branding-sofficerc" sofficerc |
997 |
- dodir /etc/env.d |
998 |
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die |
999 |
- fi |
1000 |
- |
1001 |
- # bug 703474 |
1002 |
- insinto /usr/include |
1003 |
- doins -r include/LibreOfficeKit |
1004 |
- |
1005 |
- local lodir=/usr/$(get_libdir)/libreoffice |
1006 |
- # patching this would break tests |
1007 |
- cat <<-EOF > "${T}"/uno.py |
1008 |
-import sys, os |
1009 |
-sys.path.append('${EPREFIX}${lodir}/program') |
1010 |
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc') |
1011 |
-EOF |
1012 |
- sed -e "/^import sys/d" -e "/^import os/d" \ |
1013 |
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed" |
1014 |
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die |
1015 |
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die |
1016 |
- |
1017 |
- # more system pyuno mess |
1018 |
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \ |
1019 |
- -i "${D}"${lodir}/program/officehelper.py || die |
1020 |
- |
1021 |
- python_optimize "${D}"${lodir}/program |
1022 |
- # link python bridge in site-packages, bug 667802 |
1023 |
- local py pyc loprogdir=$(get_libdir)/libreoffice/program |
1024 |
- for py in uno.py unohelper.py officehelper.py; do |
1025 |
- dosym ../../../${loprogdir}/${py} $(python_get_sitedir)/${py} |
1026 |
- while IFS="" read -d $'\0' -r pyc; do |
1027 |
- pyc=${pyc//*\/} |
1028 |
- dosym ../../../../${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc} |
1029 |
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0) |
1030 |
- done |
1031 |
-} |
1032 |
- |
1033 |
-pkg_postinst() { |
1034 |
- xdg_icon_cache_update |
1035 |
- xdg_desktop_database_update |
1036 |
- xdg_mimeinfo_database_update |
1037 |
-} |
1038 |
- |
1039 |
-pkg_postrm() { |
1040 |
- xdg_icon_cache_update |
1041 |
- xdg_desktop_database_update |
1042 |
- xdg_mimeinfo_database_update |
1043 |
-} |