1 |
commit: 4511f8c3d256c39b54109fb356cdd87b68d4ce5b |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 20 09:40:31 2017 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 20 09:40:31 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=4511f8c3 |
7 |
|
8 |
app-office/libreoffice: sync with tree and update musl patches |
9 |
|
10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
11 |
RepoMan-Options: --force |
12 |
|
13 |
app-office/libreoffice/Manifest | 5 +- |
14 |
.../libreoffice-4.4.1.2-musl-fix-execinfo.patch | 24 -- |
15 |
.../files/libreoffice-5.0.5.2-linux-musl.patch | 61 ----- |
16 |
.../libreoffice/files/libreoffice-5.2-icu58.patch | 289 --------------------- |
17 |
.../files/libreoffice-5.2-system-pyuno.patch | 44 ---- |
18 |
...no.patch => libreoffice-5.4-system-pyuno.patch} | 31 +-- |
19 |
....patch => libreoffice-5.4.2.2-linux-musl.patch} | 34 ++- |
20 |
.../libreoffice-5.4.2.2-musl-fix-execinfo.patch | 24 ++ |
21 |
...e-5.2.7.2.ebuild => libreoffice-5.4.2.2.ebuild} | 143 +++++----- |
22 |
9 files changed, 124 insertions(+), 531 deletions(-) |
23 |
|
24 |
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest |
25 |
index ef2e847..79ff2b0 100644 |
26 |
--- a/app-office/libreoffice/Manifest |
27 |
+++ b/app-office/libreoffice/Manifest |
28 |
@@ -4,7 +4,6 @@ DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 SHA256 64585ac36a81291 |
29 |
DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555291 SHA256 b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb SHA512 1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8 WHIRLPOOL d809712c3fcaca922d64f67a14d9dc3e750ecf359687c7ba0e8c6c7fc7750e43721a21ce29d5a3b0b87b83bfe7b71947e701ba4aed0a337ec35ecbb22d8dec34 |
30 |
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f WHIRLPOOL 8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4 |
31 |
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c |
32 |
-DIST ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz 1769329 SHA256 3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 SHA512 2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5 WHIRLPOOL 29ddaef03d46fe08aa2dba200be755817f8e77de3bbbb3ed86dae65e891239f3051f79fdfadec6ae56023197e32e1c44a94385a1ce306081f3bf94be6226f8c7 |
33 |
-DIST libreoffice-5.2.7.2.tar.xz 184589464 SHA256 106154a72a329605166a49bfa31c6d1cc03133d600ad0ef340b45e4e2a92891d SHA512 f7414a0d0d654d1d9bd6c5524ff2acf2f21c544dd6ed79f4f2d22f79db46264f95f7ca8dd482027f7a573d2d491ea6c8d9875b262d5e2b917dfddb749a3ea95f WHIRLPOOL 28d7f9531190a16bdea14c5dcc710ef593085fddca1b4d7d0cd6107d5f93e4b94a1ae035a626376ab7abfcd926a263b1437de1e52011bb96aa6d87b046a38da8 |
34 |
+DIST libreoffice-5.4.2.2.tar.xz 192795940 SHA256 2fda4a8c446786a3afff2cf1b07b818c45c9dcd136bfae1f3191b0b1565ba675 SHA512 37edf44b4b3c3e694f5b5915647f9555413c3fcc6d29f5f8d74806439b65ed90418905476d7b75ce58a032abb1f55cecf1ca74b63279666ca2af5f3ac95a645c WHIRLPOOL 1d2f55af8da2d1c8f2998cc3ab6346be7f6e2e524fef664281ba585910a9e98914c9e07612d597a89c77ab6dc25beffc4dcb1b4575f314752a892d18ea15415d |
35 |
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538 |
36 |
-DIST libreoffice-help-5.2.7.2.tar.xz 1940516 SHA256 f7d35c460da96ed2d52cf97baef159382b38e5ce4579c34e65480ff2911cac4b SHA512 c86bc17448fcd1da01e13d3e9fee739610fde390abaf0635cc4593755d102da08a5eea0533076e1a0f8d89f0b32ba5086b155b9b388f317a5e4c669bf17769e1 WHIRLPOOL 4da96a14b70be718109eda5ced62cec85b96e9028fcf65d729a99604598de81edc097bc06577f3ce7958de1316b04d2d2f1f2782c6504a487ffc6ebaaf7feca6 |
37 |
+DIST libreoffice-help-5.4.2.2.tar.xz 2343504 SHA256 5fc740dbe77876b96ed731f0a6ce793925a9a4a4ba983b5a3506ab24beb73057 SHA512 ba845653d6388bae53eaa945abebb367fedace81c1949ed975a2ad0c270c688649b385b463256b362a6397f18d214aed9b876869434c6c3868649180e57c3112 WHIRLPOOL f5c81288d7d6f608a47f59fe6ae75b6d90b30383fc7fafbc398394c3274014c29fc6933c7b09c517e033e2477355584cb8970f55cf925d645bee57b935e1d253 |
38 |
|
39 |
diff --git a/app-office/libreoffice/files/libreoffice-4.4.1.2-musl-fix-execinfo.patch b/app-office/libreoffice/files/libreoffice-4.4.1.2-musl-fix-execinfo.patch |
40 |
deleted file mode 100644 |
41 |
index 01fca6f..0000000 |
42 |
--- a/app-office/libreoffice/files/libreoffice-4.4.1.2-musl-fix-execinfo.patch |
43 |
+++ /dev/null |
44 |
@@ -1,24 +0,0 @@ |
45 |
-diff -ru sal.orig/osl/unx/backtrace.h sal/osl/unx/backtrace.h |
46 |
---- a/sal/osl/unx/backtrace.h 2015-01-22 22:05:28.000000000 -0200 |
47 |
-+++ b/sal/osl/unx/backtrace.h 2015-02-02 17:06:27.765494731 -0200 |
48 |
-@@ -47,7 +47,7 @@ |
49 |
- |
50 |
- #endif /* defined SOLARIS || FREEBSD || NETBSD || OPENBSD */ |
51 |
- |
52 |
--#if defined (LINUX) |
53 |
-+#if defined (LINUX) && defined (__GLIBC__) |
54 |
- #include <execinfo.h> |
55 |
- #endif |
56 |
- |
57 |
-diff -ru sal.orig/osl/unx/signal.cxx sal/osl/unx/signal.cxx |
58 |
---- a/sal/osl/unx/signal.cxx 2015-01-22 22:05:28.000000000 -0200 |
59 |
-+++ b/sal/osl/unx/signal.cxx 2015-02-02 17:06:53.495496086 -0200 |
60 |
-@@ -36,7 +36,7 @@ |
61 |
- |
62 |
- #endif /* MACOSX */ |
63 |
- |
64 |
--#ifdef LINUX |
65 |
-+#if defined (LINUX) && defined (__GLIBC__) |
66 |
- #include <execinfo.h> |
67 |
- #include <link.h> |
68 |
- #define INCLUDE_BACKTRACE |
69 |
|
70 |
diff --git a/app-office/libreoffice/files/libreoffice-5.0.5.2-linux-musl.patch b/app-office/libreoffice/files/libreoffice-5.0.5.2-linux-musl.patch |
71 |
deleted file mode 100644 |
72 |
index 29c26b4..0000000 |
73 |
--- a/app-office/libreoffice/files/libreoffice-5.0.5.2-linux-musl.patch |
74 |
+++ /dev/null |
75 |
@@ -1,61 +0,0 @@ |
76 |
-diff -Naur libreoffice-5.0.5.2.orig/configure.ac libreoffice-5.0.5.2/configure.ac |
77 |
---- libreoffice-5.0.5.2.orig/configure.ac 2016-02-04 16:41:28.000000000 +0000 |
78 |
-+++ libreoffice-5.0.5.2/configure.ac 2016-03-14 10:12:03.004000000 +0000 |
79 |
-@@ -587,7 +587,7 @@ |
80 |
- fi |
81 |
- ;; |
82 |
- |
83 |
--linux-gnu*|k*bsd*-gnu*) |
84 |
-+linux-gnu*|linux-musl*|k*bsd*-gnu*) |
85 |
- test_gtk=yes |
86 |
- build_gstreamer_1_0=yes |
87 |
- build_gstreamer_0_10=yes |
88 |
-@@ -4124,7 +4124,7 @@ |
89 |
- esac |
90 |
- ;; |
91 |
- |
92 |
--linux-gnu*) |
93 |
-+linux-gnu*|linux-musl*) |
94 |
- COM=GCC |
95 |
- GUIBASE=unx |
96 |
- OS=LINUX |
97 |
-@@ -7074,7 +7074,7 @@ |
98 |
- test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" |
99 |
- ;; |
100 |
- |
101 |
-- linux-gnu*) |
102 |
-+ linux-gnu*|linux-musl*) |
103 |
- JAVAINC="-I$JAVA_HOME/include" |
104 |
- JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux" |
105 |
- test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" |
106 |
-@@ -9550,21 +9550,6 @@ |
107 |
- fi |
108 |
- AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA) |
109 |
- |
110 |
--dnl *************************************** |
111 |
--dnl testing libc version for Linux... |
112 |
--dnl *************************************** |
113 |
--if test "$_os" = "Linux"; then |
114 |
-- AC_MSG_CHECKING([whether libc is >= 2.1.1]) |
115 |
-- exec 6>/dev/null # no output |
116 |
-- AC_CHECK_LIB(c, gnu_get_libc_version, HAVE_LIBC=yes; export HAVE_LIBC) |
117 |
-- exec 6>&1 # output on again |
118 |
-- if test "$HAVE_LIBC"; then |
119 |
-- AC_MSG_RESULT([yes]) |
120 |
-- else |
121 |
-- AC_MSG_ERROR([no, upgrade libc]) |
122 |
-- fi |
123 |
--fi |
124 |
-- |
125 |
- dnl ========================================= |
126 |
- dnl Check for the Windows SDK. |
127 |
- dnl ========================================= |
128 |
-@@ -12942,7 +12927,7 @@ |
129 |
- |
130 |
- case "$host_os" in |
131 |
- |
132 |
-- aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*) |
133 |
-+ aix*|dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*) |
134 |
- if test "$ENABLE_JAVA" != "" -a "$JDK"!="gcj"; then |
135 |
- pathmunge "$JAVA_HOME/bin" "after" |
136 |
- fi |
137 |
|
138 |
diff --git a/app-office/libreoffice/files/libreoffice-5.2-icu58.patch b/app-office/libreoffice/files/libreoffice-5.2-icu58.patch |
139 |
deleted file mode 100644 |
140 |
index 57fe6dc..0000000 |
141 |
--- a/app-office/libreoffice/files/libreoffice-5.2-icu58.patch |
142 |
+++ /dev/null |
143 |
@@ -1,289 +0,0 @@ |
144 |
-From 3e42714c76b1347babfdea0564009d8d82a83af4 Mon Sep 17 00:00:00 2001 |
145 |
-From: Eike Rathke <erack@××××××.com> |
146 |
-Date: Wed, 2 Nov 2016 13:07:48 +0100 |
147 |
-Subject: [PATCH] upgrade to ICU 58 |
148 |
- |
149 |
-Change-Id: I4a992447df65b337721a2a2627d974172a14cba5 |
150 |
-Reviewed-on: https://gerrit.libreoffice.org/30487 |
151 |
-Reviewed-by: Eike Rathke <erack@××××××.com> |
152 |
-Tested-by: Eike Rathke <erack@××××××.com> |
153 |
---- |
154 |
- configure.ac | 2 +- |
155 |
- download.lst | 2 +- |
156 |
- external/icu/icu-ubsan.patch.0 | 11 ------ |
157 |
- external/icu/icu4c-warnings.patch | 12 ------ |
158 |
- .../source/breakiterator/breakiterator_unicode.cxx | 12 ++++++ |
159 |
- i18nutil/source/utility/unicode.cxx | 26 +++++++++++++ |
160 |
- include/svx/ucsubset.hrc | 11 ++++++ |
161 |
- svx/source/dialog/charmap.cxx | 35 +++++++++++++++++ |
162 |
- svx/source/dialog/ucsubset.src | 44 ++++++++++++++++++++++ |
163 |
- 9 files changed, 130 insertions(+), 25 deletions(-) |
164 |
- |
165 |
-diff --git a/configure.ac b/configure.ac |
166 |
-index f06ef8e..66a11a9 100644 |
167 |
---- a/configure.ac |
168 |
-+++ b/configure.ac |
169 |
-@@ -9136,7 +9136,7 @@ SYSTEM_GENBRK= |
170 |
- SYSTEM_GENCCODE= |
171 |
- SYSTEM_GENCMN= |
172 |
- |
173 |
--ICU_MAJOR=57 |
174 |
-+ICU_MAJOR=58 |
175 |
- ICU_MINOR=1 |
176 |
- ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE" |
177 |
- ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE" |
178 |
-diff --git a/download.lst b/download.lst |
179 |
-index 4571338..0770a4d 100644 |
180 |
---- a/download.lst |
181 |
-+++ b/download.lst |
182 |
-@@ -62,7 +62,7 @@ export HARFBUZZ_TARBALL := harfbuzz-1.3.2.tar.bz2 |
183 |
- export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip |
184 |
- export HUNSPELL_TARBALL := 33d370f7fe5a030985e445a5672b2067-hunspell-1.4.1.tar.gz |
185 |
- export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz |
186 |
--export ICU_TARBALL := 976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz |
187 |
-+export ICU_TARBALL := 1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz |
188 |
- export JFREEREPORT_FLOW_ENGINE_TARBALL := ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip |
189 |
- export JFREEREPORT_FLUTE_TARBALL := d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip |
190 |
- export JFREEREPORT_LIBBASE_TARBALL := eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip |
191 |
-diff --git a/external/icu/icu-ubsan.patch.0 b/external/icu/icu-ubsan.patch.0 |
192 |
-index 6d1d3bc..8a47242 100644 |
193 |
---- a/external/icu/icu-ubsan.patch.0 |
194 |
-+++ b/external/icu/icu-ubsan.patch.0 |
195 |
-@@ -151,14 +151,3 @@ |
196 |
- length(len), next(subNode) {} |
197 |
- virtual UBool operator==(const Node &other) const; |
198 |
- virtual int32_t markRightEdgesFirst(int32_t edgeNumber); |
199 |
----- source/common/unifiedcache.h |
200 |
--+++ source/common/unifiedcache.h |
201 |
--@@ -139,7 +139,7 @@ |
202 |
-- : CacheKey<T>(other), fLoc(other.fLoc) { } |
203 |
-- virtual ~LocaleCacheKey() { } |
204 |
-- virtual int32_t hashCode() const { |
205 |
--- return 37 *CacheKey<T>::hashCode() + fLoc.hashCode(); |
206 |
--+ return 37U *CacheKey<T>::hashCode() + fLoc.hashCode(); |
207 |
-- } |
208 |
-- virtual UBool operator == (const CacheKeyBase &other) const { |
209 |
-- // reflexive |
210 |
-diff --git a/external/icu/icu4c-warnings.patch b/external/icu/icu4c-warnings.patch |
211 |
-index d146093..96608d7 100644 |
212 |
---- a/external/icu/icu4c-warnings.patch |
213 |
-+++ b/external/icu/icu4c-warnings.patch |
214 |
-@@ -8,15 +8,3 @@ |
215 |
- } \ |
216 |
- } |
217 |
- |
218 |
----- misc/icu/source/common/unicode/utypes.h |
219 |
--+++ misc/build/icu/source/common/unicode/utypes.h |
220 |
--@@ -399,7 +399,7 @@ |
221 |
-- * some Linux/Unix compilers have problems with defining global new/delete. |
222 |
-- * On Windows, it is _MSC_VER>=1200 for MSVC 6.0 and higher. |
223 |
-- */ |
224 |
---#if defined(__cplusplus) && U_DEBUG && U_OVERRIDE_CXX_ALLOCATION && (_MSC_VER>=1200) && !defined(U_STATIC_IMPLEMENTATION) && (defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || defined(U_IO_IMPLEMENTATION) || defined(U_LAYOUT_IMPLEMENTATION) || defined(U_LAYOUTEX_IMPLEMENTATION)) |
225 |
--+#if defined(__cplusplus) && U_DEBUG && U_OVERRIDE_CXX_ALLOCATION && defined (_MSC_VER) && (_MSC_VER>=1200) && !defined(U_STATIC_IMPLEMENTATION) && (defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || defined(U_IO_IMPLEMENTATION) || defined(U_LAYOUT_IMPLEMENTATION) || defined(U_LAYOUTEX_IMPLEMENTATION)) |
226 |
-- |
227 |
-- #ifndef U_HIDE_INTERNAL_API |
228 |
-- /** |
229 |
-- |
230 |
-diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx |
231 |
-index 3b0b227..76ae209 100644 |
232 |
---- a/i18npool/source/breakiterator/breakiterator_unicode.cxx |
233 |
-+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx |
234 |
-@@ -63,10 +63,13 @@ BreakIterator_Unicode::~BreakIterator_Unicode() |
235 |
- class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator |
236 |
- { |
237 |
- public: |
238 |
-+#if (U_ICU_VERSION_MAJOR_NUM < 58) |
239 |
-+ // RuleBasedBreakIterator::setBreakType() is private as of ICU 58. |
240 |
- inline void publicSetBreakType(int32_t type) |
241 |
- { |
242 |
- setBreakType(type); |
243 |
- }; |
244 |
-+#endif |
245 |
- OOoRuleBasedBreakIterator(UDataMemory* image, |
246 |
- UErrorCode &status) |
247 |
- : RuleBasedBreakIterator(image, status) |
248 |
-@@ -142,12 +145,21 @@ void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const css::lang::Local |
249 |
- } |
250 |
- } |
251 |
- if (rbi) { |
252 |
-+#if (U_ICU_VERSION_MAJOR_NUM < 58) |
253 |
-+ // ICU 58 made RuleBasedBreakIterator::setBreakType() private |
254 |
-+ // instead of protected, so the old workaround of |
255 |
-+ // https://ssl.icu-project.org/trac/ticket/5498 |
256 |
-+ // doesn't work anymore. However, they also claim to have fixed |
257 |
-+ // the cause that an initial fBreakType==-1 would lead to an |
258 |
-+ // endless loop under some circumstances. |
259 |
-+ // Let's see ... |
260 |
- switch (rBreakType) { |
261 |
- case LOAD_CHARACTER_BREAKITERATOR: rbi->publicSetBreakType(UBRK_CHARACTER); break; |
262 |
- case LOAD_WORD_BREAKITERATOR: rbi->publicSetBreakType(UBRK_WORD); break; |
263 |
- case LOAD_SENTENCE_BREAKITERATOR: rbi->publicSetBreakType(UBRK_SENTENCE); break; |
264 |
- case LOAD_LINE_BREAKITERATOR: rbi->publicSetBreakType(UBRK_LINE); break; |
265 |
- } |
266 |
-+#endif |
267 |
- icuBI->aBreakIterator = rbi; |
268 |
- } |
269 |
- } |
270 |
-diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx |
271 |
-index bb82bbf..984c5f7 100644 |
272 |
---- a/i18nutil/source/utility/unicode.cxx |
273 |
-+++ b/i18nutil/source/utility/unicode.cxx |
274 |
-@@ -957,6 +957,32 @@ OString SAL_CALL unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript) |
275 |
- sRet = "sa-Sidd"; |
276 |
- break; |
277 |
- #endif |
278 |
-+#if (U_ICU_VERSION_MAJOR_NUM >= 58) |
279 |
-+ case USCRIPT_ADLAM: |
280 |
-+ sRet = "mis"; // Adlm - Adlam for Fulani, no language code |
281 |
-+ break; |
282 |
-+ case USCRIPT_BHAIKSUKI: |
283 |
-+ sRet = "mis"; // Bhks - Bhaiksuki for some Buddhist texts, no language code |
284 |
-+ break; |
285 |
-+ case USCRIPT_MARCHEN: |
286 |
-+ sRet = "bo-Marc"; |
287 |
-+ break; |
288 |
-+ case USCRIPT_NEWA: |
289 |
-+ sRet = "new-Newa"; |
290 |
-+ break; |
291 |
-+ case USCRIPT_OSAGE: |
292 |
-+ sRet = "osa-Osge"; |
293 |
-+ break; |
294 |
-+ case USCRIPT_HAN_WITH_BOPOMOFO: |
295 |
-+ sRet = "mis"; // Hanb - Han with Bopomofo, zh-Hanb ? |
296 |
-+ break; |
297 |
-+ case USCRIPT_JAMO: |
298 |
-+ sRet = "mis"; // Jamo - Jamo subset of Hangul, ko-Jamo ? |
299 |
-+ break; |
300 |
-+ case USCRIPT_SYMBOLS_EMOJI: |
301 |
-+ sRet = "mis"; // Zsye - Emoji variant |
302 |
-+ break; |
303 |
-+#endif |
304 |
- } |
305 |
- return sRet; |
306 |
- } |
307 |
-diff --git a/include/svx/ucsubset.hrc b/include/svx/ucsubset.hrc |
308 |
-index adf1cf6..1157a7e 100644 |
309 |
---- a/include/svx/ucsubset.hrc |
310 |
-+++ b/include/svx/ucsubset.hrc |
311 |
-@@ -291,6 +291,17 @@ |
312 |
- #define RID_SUBSETSTR_OLD_HUNGARIAN (RID_SUBSET_START + 263) |
313 |
- #define RID_SUBSETSTR_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS (RID_SUBSET_START + 264) |
314 |
- #define RID_SUBSETSTR_SUTTON_SIGNWRITING (RID_SUBSET_START + 265) |
315 |
-+#define RID_SUBSETSTR_ADLAM (RID_SUBSET_START + 266) |
316 |
-+#define RID_SUBSETSTR_BHAIKSUKI (RID_SUBSET_START + 267) |
317 |
-+#define RID_SUBSETSTR_CYRILLIC_EXTENDED_C (RID_SUBSET_START + 268) |
318 |
-+#define RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT (RID_SUBSET_START + 269) |
319 |
-+#define RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION (RID_SUBSET_START + 270) |
320 |
-+#define RID_SUBSETSTR_MARCHEN (RID_SUBSET_START + 271) |
321 |
-+#define RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT (RID_SUBSET_START + 272) |
322 |
-+#define RID_SUBSETSTR_NEWA (RID_SUBSET_START + 273) |
323 |
-+#define RID_SUBSETSTR_OSAGE (RID_SUBSET_START + 274) |
324 |
-+#define RID_SUBSETSTR_TANGUT (RID_SUBSET_START + 275) |
325 |
-+#define RID_SUBSETSTR_TANGUT_COMPONENTS (RID_SUBSET_START + 276) |
326 |
- |
327 |
- // RID_SUBSET_END (RID_SUBSET_START + 299) |
328 |
- |
329 |
-diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx |
330 |
-index bcc7cef..ff201a6 100644 |
331 |
---- a/svx/source/dialog/charmap.cxx |
332 |
-+++ b/svx/source/dialog/charmap.cxx |
333 |
-@@ -1594,6 +1594,41 @@ void SubsetMap::InitList() |
334 |
- aAllSubsets.push_back( Subset( 0x1D800, 0x1DAAF, RID_SUBSETSTR_SUTTON_SIGNWRITING ) ); |
335 |
- break; |
336 |
- #endif |
337 |
-+#if (U_ICU_VERSION_MAJOR_NUM >= 58) |
338 |
-+ case UBLOCK_ADLAM: |
339 |
-+ aAllSubsets.push_back( Subset( 0x1E900, 0x1E95F, RID_SUBSETSTR_ADLAM ) ); |
340 |
-+ break; |
341 |
-+ case UBLOCK_BHAIKSUKI: |
342 |
-+ aAllSubsets.push_back( Subset( 0x11C00, 0x11C6F, RID_SUBSETSTR_BHAIKSUKI ) ); |
343 |
-+ break; |
344 |
-+ case UBLOCK_CYRILLIC_EXTENDED_C: |
345 |
-+ aAllSubsets.push_back( Subset( 0x1C80, 0x1C8F, RID_SUBSETSTR_CYRILLIC_EXTENDED_C ) ); |
346 |
-+ break; |
347 |
-+ case UBLOCK_GLAGOLITIC_SUPPLEMENT: |
348 |
-+ aAllSubsets.push_back( Subset( 0x1E000, 0x1E02F, RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT ) ); |
349 |
-+ break; |
350 |
-+ case UBLOCK_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION: |
351 |
-+ aAllSubsets.push_back( Subset( 0x16FE0, 0x16FFF, RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION ) ); |
352 |
-+ break; |
353 |
-+ case UBLOCK_MARCHEN: |
354 |
-+ aAllSubsets.push_back( Subset( 0x11C70, 0x11CBF, RID_SUBSETSTR_MARCHEN ) ); |
355 |
-+ break; |
356 |
-+ case UBLOCK_MONGOLIAN_SUPPLEMENT: |
357 |
-+ aAllSubsets.push_back( Subset( 0x11660, 0x1167F, RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT ) ); |
358 |
-+ break; |
359 |
-+ case UBLOCK_NEWA: |
360 |
-+ aAllSubsets.push_back( Subset( 0x11400, 0x1147F, RID_SUBSETSTR_NEWA ) ); |
361 |
-+ break; |
362 |
-+ case UBLOCK_OSAGE: |
363 |
-+ aAllSubsets.push_back( Subset( 0x104B0, 0x104FF, RID_SUBSETSTR_OSAGE ) ); |
364 |
-+ break; |
365 |
-+ case UBLOCK_TANGUT: |
366 |
-+ aAllSubsets.push_back( Subset( 0x17000, 0x187FF, RID_SUBSETSTR_TANGUT ) ); |
367 |
-+ break; |
368 |
-+ case UBLOCK_TANGUT_COMPONENTS: |
369 |
-+ aAllSubsets.push_back( Subset( 0x18800, 0x18AFF, RID_SUBSETSTR_TANGUT_COMPONENTS ) ); |
370 |
-+ break; |
371 |
-+#endif |
372 |
- |
373 |
- } |
374 |
- |
375 |
-diff --git a/svx/source/dialog/ucsubset.src b/svx/source/dialog/ucsubset.src |
376 |
-index 06630cc..a7765c3 100644 |
377 |
---- a/svx/source/dialog/ucsubset.src |
378 |
-+++ b/svx/source/dialog/ucsubset.src |
379 |
-@@ -1079,6 +1079,50 @@ Resource RID_SUBSETMAP |
380 |
- { |
381 |
- Text [ en-US ] = "Sutton Signwriting"; |
382 |
- }; |
383 |
-+ String RID_SUBSETSTR_ADLAM |
384 |
-+ { |
385 |
-+ Text [ en-US ] = "Adlam"; |
386 |
-+ }; |
387 |
-+ String RID_SUBSETSTR_BHAIKSUKI |
388 |
-+ { |
389 |
-+ Text [ en-US ] = "Bhaiksuki"; |
390 |
-+ }; |
391 |
-+ String RID_SUBSETSTR_CYRILLIC_EXTENDED_C |
392 |
-+ { |
393 |
-+ Text [ en-US ] = "Cyrillic Extended-C"; |
394 |
-+ }; |
395 |
-+ String RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT |
396 |
-+ { |
397 |
-+ Text [ en-US ] = "Glagolitic Supplement"; |
398 |
-+ }; |
399 |
-+ String RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION |
400 |
-+ { |
401 |
-+ Text [ en-US ] = "Ideographic Symbols and Punctuation"; |
402 |
-+ }; |
403 |
-+ String RID_SUBSETSTR_MARCHEN |
404 |
-+ { |
405 |
-+ Text [ en-US ] = "Marchen"; |
406 |
-+ }; |
407 |
-+ String RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT |
408 |
-+ { |
409 |
-+ Text [ en-US ] = "Mongolian Supplement"; |
410 |
-+ }; |
411 |
-+ String RID_SUBSETSTR_NEWA |
412 |
-+ { |
413 |
-+ Text [ en-US ] = "Newa"; |
414 |
-+ }; |
415 |
-+ String RID_SUBSETSTR_OSAGE |
416 |
-+ { |
417 |
-+ Text [ en-US ] = "Osage"; |
418 |
-+ }; |
419 |
-+ String RID_SUBSETSTR_TANGUT |
420 |
-+ { |
421 |
-+ Text [ en-US ] = "Tangut"; |
422 |
-+ }; |
423 |
-+ String RID_SUBSETSTR_TANGUT_COMPONENTS |
424 |
-+ { |
425 |
-+ Text [ en-US ] = "Tangut Components"; |
426 |
-+ }; |
427 |
- }; |
428 |
- |
429 |
- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |
430 |
--- |
431 |
-2.10.2 |
432 |
- |
433 |
|
434 |
diff --git a/app-office/libreoffice/files/libreoffice-5.2-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-5.2-system-pyuno.patch |
435 |
deleted file mode 100644 |
436 |
index e06f81f..0000000 |
437 |
--- a/app-office/libreoffice/files/libreoffice-5.2-system-pyuno.patch |
438 |
+++ /dev/null |
439 |
@@ -1,44 +0,0 @@ |
440 |
-diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh |
441 |
-index a259bf6..672fa23 100755 |
442 |
---- a/desktop/scripts/soffice.sh |
443 |
-+++ b/desktop/scripts/soffice.sh |
444 |
-@@ -129,6 +129,9 @@ if echo "$checks" | grep -q "cc" ; then |
445 |
- exit 1; |
446 |
- fi |
447 |
- |
448 |
-+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH} |
449 |
-+export PYTHONPATH |
450 |
-+ |
451 |
- case "`uname -s`" in |
452 |
- NetBSD|OpenBSD|DragonFly) |
453 |
- # this is a temporary hack until we can live with the default search paths |
454 |
-diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py |
455 |
-index 4ff2606..6a05eed 100644 |
456 |
---- a/pyuno/source/module/uno.py |
457 |
-+++ b/pyuno/source/module/uno.py |
458 |
-@@ -16,8 +16,12 @@ |
459 |
- # except in compliance with the License. You may obtain a copy of |
460 |
- # the License at http://www.apache.org/licenses/LICENSE-2.0 . |
461 |
- # |
462 |
-+import os |
463 |
- import sys |
464 |
- |
465 |
-+sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program') |
466 |
-+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: |
467 |
-+ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc" |
468 |
- import pyuno |
469 |
- |
470 |
- try: |
471 |
-diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py |
472 |
-index 99d3b03..704edab 100755 |
473 |
---- a/pyuno/source/officehelper.py |
474 |
-+++ b/pyuno/source/officehelper.py |
475 |
-@@ -44,7 +44,7 @@ def bootstrap(): |
476 |
- if "UNO_PATH" in os.environ: |
477 |
- sOffice = os.environ["UNO_PATH"] |
478 |
- else: |
479 |
-- sOffice = "" # lets hope for the best |
480 |
-+ sOffice = "%eprefix%/usr/%libdir%/libreoffice/program" |
481 |
- sOffice = os.path.join(sOffice, "soffice") |
482 |
- if platform.startswith("win"): |
483 |
- sOffice += ".exe" |
484 |
|
485 |
diff --git a/app-office/libreoffice/files/libreoffice-5.3-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-5.4-system-pyuno.patch |
486 |
similarity index 60% |
487 |
rename from app-office/libreoffice/files/libreoffice-5.3-system-pyuno.patch |
488 |
rename to app-office/libreoffice/files/libreoffice-5.4-system-pyuno.patch |
489 |
index 3ab3e82..83b56d1 100644 |
490 |
--- a/app-office/libreoffice/files/libreoffice-5.3-system-pyuno.patch |
491 |
+++ b/app-office/libreoffice/files/libreoffice-5.4-system-pyuno.patch |
492 |
@@ -1,21 +1,18 @@ |
493 |
-diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh |
494 |
-index a259bf6..672fa23 100755 |
495 |
---- a/desktop/scripts/soffice.sh |
496 |
-+++ b/desktop/scripts/soffice.sh |
497 |
-@@ -139,6 +139,9 @@ if echo "$checks" | grep -q "cc" ; then |
498 |
+--- a/desktop/scripts/soffice.sh |
499 |
++++ a/desktop/scripts/soffice.sh |
500 |
+@@ -147,6 +147,9 @@ if echo "$checks" | grep -q "cc" ; then |
501 |
exit 1; |
502 |
fi |
503 |
|
504 |
+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH} |
505 |
+export PYTHONPATH |
506 |
+ |
507 |
- case "`uname -s`" in |
508 |
+ case "$(uname -s)" in |
509 |
NetBSD|OpenBSD|DragonFly) |
510 |
# this is a temporary hack until we can live with the default search paths |
511 |
- |
512 |
---- a/pyuno/source/module/uno.py 2016-08-07 20:57:51.653712240 -0400 |
513 |
-+++ b/pyuno/source/module/uno.py 2016-08-07 20:59:33.958896861 -0400 |
514 |
-@@ -16,11 +16,16 @@ |
515 |
+--- a/pyuno/source/module/uno.py |
516 |
++++ a/pyuno/source/module/uno.py |
517 |
+@@ -16,11 +16,16 @@ |
518 |
# except in compliance with the License. You may obtain a copy of |
519 |
# the License at http://www.apache.org/licenses/LICENSE-2.0 . |
520 |
# |
521 |
@@ -24,24 +21,22 @@ index a259bf6..672fa23 100755 |
522 |
import sys |
523 |
import traceback |
524 |
import warnings |
525 |
- |
526 |
+ |
527 |
+sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program') |
528 |
+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: |
529 |
+ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc" |
530 |
+ |
531 |
# since on Windows sal3.dll no longer calls WSAStartup |
532 |
import socket |
533 |
- |
534 |
-diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py |
535 |
-index 99d3b03..704edab 100755 |
536 |
---- a/pyuno/source/officehelper.py |
537 |
-+++ b/pyuno/source/officehelper.py |
538 |
-@@ -44,7 +44,7 @@ def bootstrap(): |
539 |
+ |
540 |
+--- a/pyuno/source/officehelper.py |
541 |
++++ a/pyuno/source/officehelper.py |
542 |
+@@ -45,7 +45,7 @@ def bootstrap(): |
543 |
if "UNO_PATH" in os.environ: |
544 |
sOffice = os.environ["UNO_PATH"] |
545 |
else: |
546 |
- sOffice = "" # lets hope for the best |
547 |
+ sOffice = "%eprefix%/usr/%libdir%/libreoffice/program" |
548 |
sOffice = os.path.join(sOffice, "soffice") |
549 |
- if platform.startswith("win"): |
550 |
+ if platform.startswith("win"): |
551 |
sOffice += ".exe" |
552 |
|
553 |
diff --git a/app-office/libreoffice/files/libreoffice-5.3.0.3-linux-musl.patch b/app-office/libreoffice/files/libreoffice-5.4.2.2-linux-musl.patch |
554 |
similarity index 62% |
555 |
rename from app-office/libreoffice/files/libreoffice-5.3.0.3-linux-musl.patch |
556 |
rename to app-office/libreoffice/files/libreoffice-5.4.2.2-linux-musl.patch |
557 |
index 45cc32b..b170c03 100644 |
558 |
--- a/app-office/libreoffice/files/libreoffice-5.3.0.3-linux-musl.patch |
559 |
+++ b/app-office/libreoffice/files/libreoffice-5.4.2.2-linux-musl.patch |
560 |
@@ -1,8 +1,22 @@ |
561 |
-Taken from https://git.alpinelinux.org/cgit/aports/tree/community/libreoffice/linux-musl.patch?id=23119189c868089ed1cc1016c7bc528fcb90b5e8 |
562 |
- |
563 |
---- libreoffice-5.3.0.3/configure.ac.orig 2017-01-26 22:22:46.000000000 +0000 |
564 |
-+++ libreoffice-5.3.0.3/configure.ac 2017-02-08 13:14:16.777547599 +0000 |
565 |
-@@ -652,7 +652,7 @@ |
566 |
+diff -Naur libreoffice-5.4.2.2.orig/configure.ac libreoffice-5.4.2.2/configure.ac |
567 |
+--- libreoffice-5.4.2.2.orig/configure.ac 2017-09-27 14:03:26.000000000 -0400 |
568 |
++++ libreoffice-5.4.2.2/configure.ac 2017-11-20 04:22:51.742130616 -0500 |
569 |
+@@ -1,4 +1,4 @@ |
570 |
+-dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; fill-column: 102 -*- |
571 |
++12927dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; fill-column: 102 -*- |
572 |
+ dnl configure.ac serves as input for the GNU autoconf package |
573 |
+ dnl in order to create a configure script. |
574 |
+ |
575 |
+@@ -441,7 +441,7 @@ |
576 |
+ # all objects have been built with debug information.) |
577 |
+ toolchain_system='*' |
578 |
+ case $build_os in |
579 |
+- linux-gnu*) |
580 |
++ linux-gnu*|linux-musl*) |
581 |
+ ndk_build_os=linux |
582 |
+ ;; |
583 |
+ darwin*) |
584 |
+@@ -664,7 +664,7 @@ |
585 |
fi |
586 |
;; |
587 |
|
588 |
@@ -11,7 +25,7 @@ Taken from https://git.alpinelinux.org/cgit/aports/tree/community/libreoffice/li |
589 |
test_gtk=yes |
590 |
build_gstreamer_1_0=yes |
591 |
build_gstreamer_0_10=yes |
592 |
-@@ -4170,7 +4170,7 @@ |
593 |
+@@ -4129,7 +4129,7 @@ |
594 |
esac |
595 |
;; |
596 |
|
597 |
@@ -20,7 +34,7 @@ Taken from https://git.alpinelinux.org/cgit/aports/tree/community/libreoffice/li |
598 |
COM=GCC |
599 |
USING_X11=TRUE |
600 |
OS=LINUX |
601 |
-@@ -7197,7 +7197,7 @@ |
602 |
+@@ -7135,7 +7135,7 @@ |
603 |
test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" |
604 |
;; |
605 |
|
606 |
@@ -29,7 +43,7 @@ Taken from https://git.alpinelinux.org/cgit/aports/tree/community/libreoffice/li |
607 |
JAVAINC="-I$JAVA_HOME/include" |
608 |
JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux" |
609 |
test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" |
610 |
-@@ -9748,21 +9748,6 @@ |
611 |
+@@ -9645,21 +9645,6 @@ |
612 |
fi |
613 |
AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA) |
614 |
|
615 |
@@ -49,9 +63,9 @@ Taken from https://git.alpinelinux.org/cgit/aports/tree/community/libreoffice/li |
616 |
-fi |
617 |
- |
618 |
dnl ========================================= |
619 |
- dnl Check for the Windows SDK. |
620 |
+ dnl Check for uuidgen |
621 |
dnl ========================================= |
622 |
-@@ -12775,7 +12760,7 @@ |
623 |
+@@ -12572,7 +12557,7 @@ |
624 |
|
625 |
case "$host_os" in |
626 |
|
627 |
|
628 |
diff --git a/app-office/libreoffice/files/libreoffice-5.4.2.2-musl-fix-execinfo.patch b/app-office/libreoffice/files/libreoffice-5.4.2.2-musl-fix-execinfo.patch |
629 |
new file mode 100644 |
630 |
index 0000000..7b77e66 |
631 |
--- /dev/null |
632 |
+++ b/app-office/libreoffice/files/libreoffice-5.4.2.2-musl-fix-execinfo.patch |
633 |
@@ -0,0 +1,24 @@ |
634 |
+diff -Naur libreoffice-5.4.2.2.orig/sal/osl/unx/backtrace.h libreoffice-5.4.2.2/sal/osl/unx/backtrace.h |
635 |
+--- libreoffice-5.4.2.2.orig/sal/osl/unx/backtrace.h 2017-09-27 14:03:26.000000000 -0400 |
636 |
++++ libreoffice-5.4.2.2/sal/osl/unx/backtrace.h 2017-11-20 04:09:46.568616084 -0500 |
637 |
+@@ -20,7 +20,7 @@ |
638 |
+ #ifndef INCLUDED_SAL_OSL_UNX_BACKTRACE_H |
639 |
+ #define INCLUDED_SAL_OSL_UNX_BACKTRACE_H |
640 |
+ |
641 |
+-#if defined (LINUX) |
642 |
++#if defined (LINUX) && defined (__GLIBC__) |
643 |
+ |
644 |
+ #include <execinfo.h> |
645 |
+ |
646 |
+diff -Naur libreoffice-5.4.2.2.orig/sal/osl/unx/signal.cxx libreoffice-5.4.2.2/sal/osl/unx/signal.cxx |
647 |
+--- libreoffice-5.4.2.2.orig/sal/osl/unx/signal.cxx 2017-09-27 14:03:26.000000000 -0400 |
648 |
++++ libreoffice-5.4.2.2/sal/osl/unx/signal.cxx 2017-11-20 04:03:01.440227794 -0500 |
649 |
+@@ -35,7 +35,7 @@ |
650 |
+ |
651 |
+ #endif /* MACOSX */ |
652 |
+ |
653 |
+-#ifdef LINUX |
654 |
++#if defined (LINUX) && defined (__GLIBC__) |
655 |
+ #include <execinfo.h> |
656 |
+ #include <link.h> |
657 |
+ #define INCLUDE_BACKTRACE |
658 |
|
659 |
diff --git a/app-office/libreoffice/libreoffice-5.2.7.2.ebuild b/app-office/libreoffice/libreoffice-5.4.2.2.ebuild |
660 |
similarity index 83% |
661 |
rename from app-office/libreoffice/libreoffice-5.2.7.2.ebuild |
662 |
rename to app-office/libreoffice/libreoffice-5.4.2.2.ebuild |
663 |
index ce5c34c..f435483 100644 |
664 |
--- a/app-office/libreoffice/libreoffice-5.2.7.2.ebuild |
665 |
+++ b/app-office/libreoffice/libreoffice-5.4.2.2.ebuild |
666 |
@@ -7,7 +7,7 @@ KDE_REQUIRED="optional" |
667 |
KDE_SCM="git" |
668 |
CMAKE_REQUIRED="never" |
669 |
|
670 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
671 |
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) |
672 |
PYTHON_REQ_USE="threads,xml" |
673 |
|
674 |
# experimental ; release ; old |
675 |
@@ -24,7 +24,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz" |
676 |
# PATCHSET="${P}-patchset-01.tar.xz" |
677 |
|
678 |
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3" |
679 |
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS} |
680 |
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS} |
681 |
unset SCM_ECLASS |
682 |
|
683 |
DESCRIPTION="A full office productivity suite" |
684 |
@@ -35,18 +35,11 @@ SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" |
685 |
# Split modules following git/tarballs |
686 |
# Core MUST be first! |
687 |
# Help is used for the image generator |
688 |
-MODULES="core help" |
689 |
# Only release has the tarballs |
690 |
if [[ ${PV} != *9999* ]]; then |
691 |
for i in ${DEV_URI}; do |
692 |
- for mod in ${MODULES}; do |
693 |
- if [[ ${mod} == core ]]; then |
694 |
- SRC_URI+=" ${i}/${P}.tar.xz" |
695 |
- else |
696 |
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz" |
697 |
- fi |
698 |
- done |
699 |
- unset mod |
700 |
+ SRC_URI+=" ${i}/${P}.tar.xz" |
701 |
+ SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz" |
702 |
done |
703 |
unset i |
704 |
fi |
705 |
@@ -56,7 +49,6 @@ unset DEV_URI |
706 |
# These are bundles that can't be removed for now due to huge patchsets. |
707 |
# If you want them gone, patches are welcome. |
708 |
ADDONS_SRC=( |
709 |
- "${ADDONS_URI}/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz" # modifies source code |
710 |
"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )" |
711 |
"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" |
712 |
# no release for 8 years, should we package it? |
713 |
@@ -77,17 +69,18 @@ unset ADDONS_SRC |
714 |
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" |
715 |
|
716 |
IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive |
717 |
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc |
718 |
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter test vlc |
719 |
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" |
720 |
|
721 |
LICENSE="|| ( LGPL-3 MPL-1.1 )" |
722 |
SLOT="0" |
723 |
[[ ${PV} == *9999* ]] || \ |
724 |
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" |
725 |
+KEYWORDS="amd64 ~arm x86" |
726 |
|
727 |
COMMON_DEPEND="${PYTHON_DEPS} |
728 |
app-arch/unzip |
729 |
app-arch/zip |
730 |
+ app-crypt/gpgme[cxx] |
731 |
app-text/hunspell:= |
732 |
>=app-text/libabw-0.1.0 |
733 |
>=app-text/libebook-0.1 |
734 |
@@ -97,6 +90,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
735 |
>=app-text/libmspub-0.1.0 |
736 |
>=app-text/libmwaw-0.3.1 |
737 |
>=app-text/libodfgen-0.1.0 |
738 |
+ app-text/libstaroffice |
739 |
app-text/libwpd:0.10[tools] |
740 |
app-text/libwpg:0.3 |
741 |
>=app-text/libwps-0.4 |
742 |
@@ -105,50 +99,54 @@ COMMON_DEPEND="${PYTHON_DEPS} |
743 |
=dev-cpp/libcmis-0.5* |
744 |
dev-db/unixODBC |
745 |
dev-lang/perl |
746 |
- >=dev-libs/boost-1.55:= |
747 |
+ dev-libs/boost:= |
748 |
dev-libs/expat |
749 |
dev-libs/hyphen |
750 |
dev-libs/icu:= |
751 |
- =dev-libs/liborcus-0.11* |
752 |
+ dev-libs/libassuan |
753 |
+ dev-libs/libgpg-error |
754 |
+ =dev-libs/liborcus-0.12* |
755 |
dev-libs/librevenge |
756 |
dev-libs/nspr |
757 |
dev-libs/nss |
758 |
!libressl? ( >=dev-libs/openssl-1.0.0d:0 ) |
759 |
libressl? ( dev-libs/libressl ) |
760 |
>=dev-libs/redland-1.0.16 |
761 |
+ >=dev-libs/xmlsec-1.2.24[nss] |
762 |
media-gfx/graphite2 |
763 |
media-libs/fontconfig |
764 |
media-libs/freetype:2 |
765 |
- >=media-libs/glew-1.10:= |
766 |
- >=media-libs/harfbuzz-0.9.18:=[icu(+)] |
767 |
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu] |
768 |
media-libs/lcms:2 |
769 |
>=media-libs/libcdr-0.1.0 |
770 |
+ >=media-libs/libepoxy-1.3.1 |
771 |
>=media-libs/libfreehand-0.1.0 |
772 |
media-libs/libpagemaker |
773 |
>=media-libs/libpng-1.4:0= |
774 |
>=media-libs/libvisio-0.1.0 |
775 |
+ media-libs/libzmf |
776 |
net-libs/neon |
777 |
net-misc/curl |
778 |
net-nds/openldap |
779 |
sci-mathematics/lpsolve |
780 |
- virtual/jpeg:0 |
781 |
- x11-libs/cairo[X,-xlib-xcb(-)] |
782 |
+ x11-libs/cairo[X] |
783 |
x11-libs/libXinerama |
784 |
x11-libs/libXrandr |
785 |
x11-libs/libXrender |
786 |
virtual/glu |
787 |
+ virtual/jpeg:0 |
788 |
virtual/opengl |
789 |
bluetooth? ( net-wireless/bluez ) |
790 |
coinmp? ( sci-libs/coinor-mp ) |
791 |
- collada? ( >=media-libs/opencollada-1.2.2_p20150207 ) |
792 |
+ collada? ( media-libs/opencollada ) |
793 |
cups? ( net-print/cups ) |
794 |
dbus? ( dev-libs/dbus-glib ) |
795 |
eds? ( |
796 |
dev-libs/glib:2 |
797 |
gnome-extra/evolution-data-server |
798 |
) |
799 |
- firebird? ( >=dev-db/firebird-2.5 ) |
800 |
- gltf? ( =media-libs/libgltf-0.0* ) |
801 |
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) |
802 |
+ gltf? ( >=media-libs/libgltf-0.1.0 ) |
803 |
gnome? ( gnome-base/dconf ) |
804 |
gstreamer? ( |
805 |
media-libs/gstreamer:1.0 |
806 |
@@ -161,7 +159,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
807 |
gtk3? ( |
808 |
dev-libs/glib:2 |
809 |
dev-libs/gobject-introspection |
810 |
- >=x11-libs/gtk+-3.8:3 |
811 |
+ x11-libs/gtk+:3 |
812 |
) |
813 |
jemalloc? ( dev-libs/jemalloc ) |
814 |
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) |
815 |
@@ -169,18 +167,17 @@ COMMON_DEPEND="${PYTHON_DEPS} |
816 |
mysql? ( dev-db/mysql-connector-c++ ) |
817 |
pdfimport? ( app-text/poppler:=[cxx] ) |
818 |
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) |
819 |
- telepathy? ( net-libs/telepathy-glib ) |
820 |
" |
821 |
|
822 |
RDEPEND="${COMMON_DEPEND} |
823 |
!app-office/libreoffice-bin |
824 |
!app-office/libreoffice-bin-debug |
825 |
!app-office/openoffice |
826 |
+ media-fonts/dejavu |
827 |
media-fonts/liberation-fonts |
828 |
media-fonts/libertine |
829 |
- media-fonts/urw-fonts |
830 |
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) |
831 |
java? ( >=virtual/jre-1.6 ) |
832 |
- kde? ( $(add_kdeapps_dep kioclient) ) |
833 |
vlc? ( media-video/vlc ) |
834 |
" |
835 |
|
836 |
@@ -201,10 +198,10 @@ DEPEND="${COMMON_DEPEND} |
837 |
>=dev-libs/libxml2-2.7.8 |
838 |
dev-libs/libxslt |
839 |
dev-perl/Archive-Zip |
840 |
- dev-util/cppunit |
841 |
+ >=dev-util/cppunit-1.14.0 |
842 |
>=dev-util/gperf-3 |
843 |
dev-util/intltool |
844 |
- >=dev-util/mdds-1.2.0:1= |
845 |
+ >=dev-util/mdds-1.2.2:1= |
846 |
media-libs/glm |
847 |
sys-devel/bison |
848 |
sys-devel/flex |
849 |
@@ -223,7 +220,10 @@ DEPEND="${COMMON_DEPEND} |
850 |
>=virtual/jdk-1.6 |
851 |
) |
852 |
odk? ( >=app-doc/doxygen-1.8.4 ) |
853 |
- test? ( dev-util/cppunit ) |
854 |
+ test? ( |
855 |
+ dev-util/cppunit |
856 |
+ media-fonts/dejavu |
857 |
+ ) |
858 |
" |
859 |
|
860 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
861 |
@@ -231,7 +231,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
862 |
collada? ( gltf ) |
863 |
eds? ( gnome ) |
864 |
gnome? ( gtk ) |
865 |
- telepathy? ( gtk ) |
866 |
libreoffice_extensions_nlpsolver? ( java ) |
867 |
libreoffice_extensions_scripting-beanshell? ( java ) |
868 |
libreoffice_extensions_scripting-javascript? ( java ) |
869 |
@@ -239,25 +238,29 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
870 |
" |
871 |
|
872 |
PATCHES=( |
873 |
- # from master branch |
874 |
- "${FILESDIR}/${PN}-5.2-icu58.patch" |
875 |
- |
876 |
# not upstreamable stuff |
877 |
- "${FILESDIR}/${PN}-5.2-system-pyuno.patch" |
878 |
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch" |
879 |
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" |
880 |
|
881 |
# TODO: upstream |
882 |
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" |
883 |
|
884 |
# musl patches |
885 |
- "${FILESDIR}/${PN}-4.4.1.2-musl-fix-execinfo.patch" |
886 |
- "${FILESDIR}/${PN}-5.0.5.2-linux-musl.patch" |
887 |
+ "${FILESDIR}/${PN}-5.4.2.2-musl-fix-execinfo.patch" |
888 |
+ #"${FILESDIR}/${PN}-5.0.5.2-linux-musl.patch" |
889 |
"${FILESDIR}/${PN}-5.2.3.3-fix-includes.patch" |
890 |
"${FILESDIR}/${PN}-5.2.5.1-musl-vlc.patch" |
891 |
) |
892 |
|
893 |
pkg_pretend() { |
894 |
use java || \ |
895 |
- ewarn "If you plan to use lbase application you should enable java or you will get various crashes." |
896 |
+ ewarn "If you plan to use Base application you should enable java or you will get various crashes." |
897 |
+ |
898 |
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then |
899 |
+ ewarn "Firebird has been upgraded to version 3.0.0. It is unable to read back Firebird 2.5 data," |
900 |
+ ewarn "so embedded firebird odb files created in LibreOffice pre-5.3 cannot be opened with LibreOffice 5.3." |
901 |
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base" |
902 |
+ fi |
903 |
|
904 |
if [[ ${MERGE_TYPE} != binary ]]; then |
905 |
|
906 |
@@ -268,23 +271,6 @@ pkg_pretend() { |
907 |
CHECKREQS_DISK_BUILD="6G" |
908 |
fi |
909 |
check-reqs_pkg_pretend |
910 |
- |
911 |
- if ! $(tc-is-clang) && { [[ $(gcc-major-version) -lt 4 ]] || |
912 |
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then |
913 |
- eerror "Compilation with gcc older than 4.7 is not supported" |
914 |
- die "Too old gcc found." |
915 |
- fi |
916 |
- fi |
917 |
- |
918 |
- # Ensure pg version but we have to be sure the pg is installed (first |
919 |
- # install on clean system) |
920 |
- if use postgres && has_version dev-db/postgresql; then |
921 |
- local pgslot=$(postgresql-config show) |
922 |
- if [[ ${pgslot//.} -lt 90 ]] ; then |
923 |
- eerror "PostgreSQL slot must be set to 9.0 or higher." |
924 |
- eerror " postgresql-config set 9.0" |
925 |
- die "PostgreSQL slot is not set to 9.0 or higher." |
926 |
- fi |
927 |
fi |
928 |
} |
929 |
|
930 |
@@ -306,29 +292,23 @@ pkg_setup() { |
931 |
} |
932 |
|
933 |
src_unpack() { |
934 |
- local mod |
935 |
- |
936 |
[[ -n ${PATCHSET} ]] && unpack ${PATCHSET} |
937 |
use branding && unpack "${BRANDING}" |
938 |
|
939 |
if [[ ${PV} != *9999* ]]; then |
940 |
unpack "${P}.tar.xz" |
941 |
- for mod in ${MODULES}; do |
942 |
- [[ ${mod} == core ]] && continue |
943 |
- unpack "${PN}-${mod}-${PV}.tar.xz" |
944 |
- done |
945 |
+ unpack "${PN}-help-${PV}.tar.xz" |
946 |
else |
947 |
- local base_uri branch checkout mypv |
948 |
- base_uri="https://anongit.freedesktop.org" |
949 |
- for mod in ${MODULES}; do |
950 |
- branch="master" |
951 |
- mypv=${PV/.9999} |
952 |
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}" |
953 |
- git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}" |
954 |
- [[ ${mod} != core ]] && checkout="${S}/${mod}" |
955 |
- [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help |
956 |
- git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout} |
957 |
- done |
958 |
+ local base_uri branch mypv |
959 |
+ base_uri="https://anongit.freedesktop.org/git" |
960 |
+ branch="master" |
961 |
+ mypv=${PV/.9999} |
962 |
+ [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}" |
963 |
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}" |
964 |
+ git-r3_checkout "${base_uri}/${PN}/core" |
965 |
+ |
966 |
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master" |
967 |
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help |
968 |
fi |
969 |
} |
970 |
|
971 |
@@ -429,8 +409,8 @@ src_configure() { |
972 |
fi |
973 |
|
974 |
# system headers/libs/...: enforce using system packages |
975 |
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad |
976 |
# --enable-cairo: ensure that cairo is always required |
977 |
- # --enable-graphite: disabling causes build breakages |
978 |
# --enable-*-link: link to the library rather than just dlopen on runtime |
979 |
# --enable-release-build: build the libreoffice as release |
980 |
# --disable-fetch-external: prevent dowloading during compile phase |
981 |
@@ -439,28 +419,28 @@ src_configure() { |
982 |
# --disable-report-builder: too much java packages pulled in without pkgs |
983 |
# --without-system-sane: just sane.h header that is used for scan in writer, |
984 |
# not linked or anything else, worthless to depend on |
985 |
+ # --disable-pdfium: not yet packaged |
986 |
econf \ |
987 |
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \ |
988 |
--with-system-dicts \ |
989 |
+ --with-system-epoxy \ |
990 |
--with-system-headers \ |
991 |
--with-system-jars \ |
992 |
--with-system-libs \ |
993 |
--enable-cairo-canvas \ |
994 |
- --enable-graphite \ |
995 |
--enable-largefile \ |
996 |
--enable-mergelibs \ |
997 |
--enable-neon \ |
998 |
--enable-python=system \ |
999 |
--enable-randr \ |
1000 |
--enable-release-build \ |
1001 |
+ --disable-breakpad \ |
1002 |
--disable-ccache \ |
1003 |
- --disable-crashdump \ |
1004 |
--disable-dependency-tracking \ |
1005 |
--disable-epm \ |
1006 |
--disable-fetch-external \ |
1007 |
--disable-gstreamer-0-10 \ |
1008 |
- --disable-hardlink-deliver \ |
1009 |
--disable-online-update \ |
1010 |
+ --disable-pdfium \ |
1011 |
--disable-report-builder \ |
1012 |
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \ |
1013 |
--with-build-version="Gentoo official package" \ |
1014 |
@@ -478,7 +458,7 @@ src_configure() { |
1015 |
--without-myspell-dicts \ |
1016 |
--without-help \ |
1017 |
--with-helppack-integration \ |
1018 |
- --without-sun-templates \ |
1019 |
+ --with-system-gpgmepp \ |
1020 |
--without-system-sane \ |
1021 |
$(use_enable bluetooth sdremote-bluetooth) \ |
1022 |
$(use_enable coinmp) \ |
1023 |
@@ -500,7 +480,6 @@ src_configure() { |
1024 |
$(use_enable pdfimport) \ |
1025 |
$(use_enable postgres postgresql-sdbc) \ |
1026 |
$(use_enable quickstarter systray) \ |
1027 |
- $(use_enable telepathy) \ |
1028 |
$(use_enable vlc) \ |
1029 |
$(use_with coinmp system-coinmp) \ |
1030 |
$(use_with collada system-opencollada) \ |
1031 |
@@ -531,9 +510,9 @@ src_compile() { |
1032 |
local path="${WORKDIR}/helpcontent2/source/auxiliary/" |
1033 |
mkdir -p "${path}" || die |
1034 |
|
1035 |
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\"" |
1036 |
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\"" |
1037 |
perl "${S}/helpcontent2/helpers/create_ilst.pl" \ |
1038 |
- -dir=icon-themes/galaxy/res/helpimg \ |
1039 |
+ -dir=helpcontent2/source/media/helpimg \ |
1040 |
> "${path}/helpimg.ilst" |
1041 |
[[ -s "${path}/helpimg.ilst" ]] || \ |
1042 |
ewarn "The help images list is empty, something is fishy, report a bug." |
1043 |
@@ -557,7 +536,7 @@ src_install() { |
1044 |
|
1045 |
# bug 593514 |
1046 |
if use gtk3; then |
1047 |
- dosym /usr/$(get_libdir)/libreoffice/program/liblibreofficekitgtk.so \ |
1048 |
+ dosym libreoffice/program/liblibreofficekitgtk.so \ |
1049 |
/usr/$(get_libdir)/liblibreofficekitgtk.so |
1050 |
fi |