| 1 |
commit: 9cdc5e686800974a71ff3029a37ae25faae0ee2c |
| 2 |
Author: callmetango <callmetango <AT> users <DOT> noreply <DOT> github <DOT> com> |
| 3 |
AuthorDate: Thu Jun 29 08:05:23 2017 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 30 11:06:58 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=9cdc5e68 |
| 7 |
|
| 8 |
app-office/libreoffice: fixed compilation of version 5.3.3.2 |
| 9 |
|
| 10 |
* forward ported libreoffice-5.2-system-pyuno patch |
| 11 |
* created libreoffice-5.3.0.3-linux-musl patch based on Alpine Linux one |
| 12 |
|
| 13 |
app-office/libreoffice/Manifest | 4 +- |
| 14 |
.../files/libreoffice-5.3-system-pyuno.patch | 47 ++++++++++++++++ |
| 15 |
.../files/libreoffice-5.3.0.3-linux-musl.patch | 62 ++++++++++++++++++++++ |
| 16 |
app-office/libreoffice/libreoffice-5.3.3.2.ebuild | 2 +- |
| 17 |
4 files changed, 113 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest |
| 20 |
index 2f89158..6c82d14 100644 |
| 21 |
--- a/app-office/libreoffice/Manifest |
| 22 |
+++ b/app-office/libreoffice/Manifest |
| 23 |
@@ -5,6 +5,8 @@ AUX libreoffice-5.2-system-pyuno.patch 1590 SHA256 9f42c69cd286561c8ed294d9dff33 |
| 24 |
AUX libreoffice-5.2.3.3-fix-includes.patch 807 SHA256 51052d983eeea85d8d71385e4eeda61b6a8746854fe046b9a91e12c013d9ed89 SHA512 c9e0b05640d7d0e6053b8dd4735664d761a7d381c5b5cbda059fb7b38ab28531c014b6d38f58a0e1f7171a43d62f04d8ecbb7b6b008d0ad30017228ec7e6601a WHIRLPOOL 105a2f0345a23846af3b50c3571f4602831e96e7691fdce12984ead21f42d9dffb6d0e188133dda3a282f1f73f862f2b424f7406587a26b77a247b3b2e0a4e67 |
| 25 |
AUX libreoffice-5.2.5.1-glibc-2.24.patch 361 SHA256 3f87a11b6d1218a4510835e12c446821cfd47fe61feb6f59aeb4a8c774f9dffe SHA512 b5ff4c6d3771bcdde21613ad15459120ac1d759b1b3b422b5cba3ee23f7ddf88fde274956f2c91f0a6a37cb36a8d90d8f90bd865e6c2d3ff7c2100e2b469dbd8 WHIRLPOOL 8a0150685640a2adefa7d7cc3b50e37801cbd1de5570d037df8ba2b34f5b54fecb9732f7a793be4f20961b11ba06805113172321df43952dade4ca662835394e |
| 26 |
AUX libreoffice-5.2.5.1-musl-vlc.patch 357 SHA256 adda6aa44231b030a205fbaced361c7d8e7e4763300a6a54693e3a1e148b6f6b SHA512 260baabc2dc3dffe3d575e4a18322a4ea9669eff7a464a0c9e85b16ffb4fa67a62ea039e69074ef94093dcca9479e51699d3e55f34a4380d43b27145f345a999 WHIRLPOOL f204f62f405604b80ff1cf204c0a2eed53f504add6692c53b7d3dc761a72d894edb473181fd154e98459bd0b45e6f865d0c5e384ebb631710353d009b243b5aa |
| 27 |
+AUX libreoffice-5.3-system-pyuno.patch 1665 SHA256 87a43eef9b77328b9c66a48d39ca81a89a7f25f9476e1a830b570a48d72fff4d SHA512 3883b2b4c7a0513b1e33d50f4e2e6fc7f72e679cb1d7357c1e6ab4993bfae630cd6abd2112e5cdeb8baf181f0beabe9206a4fe8694b31cd3f855ce55cbe4b73c WHIRLPOOL 490d369b3789f18647e8c702335fe16ca9211e4fd6d3aa4ee62ce6ddb0a964cae21792d48e673fe6d7859fb35da9f430c05caa2796225874b80b040cf056d19f |
| 28 |
+AUX libreoffice-5.3.0.3-linux-musl.patch 1952 SHA256 8aebc0eb195dcd75d0245136edaaae34417d394ccbd30e0d5bd563556f7851b1 SHA512 14be93ca7273d05a25230a7d20b23207297199918aa352af6b96506b94667f05fc340bc92d1332723763ead20524df46f81de0d9c60c6f1808b2a1a164e6d1ff WHIRLPOOL 792569ce09db2a3933faddeb8d5092695f897056885c9a435609405a58ea5aad78947b16d7eaf3ddcf865080bea2dcf7655ca2261d2d7511874b101ef14955ed |
| 29 |
DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec |
| 30 |
DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c WHIRLPOOL 16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5 |
| 31 |
DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 SHA256 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a WHIRLPOOL a5156d06323699d2cbf539f14f5f44f54ebf33e86c7f14e98acd4c6e29c3e496f91dd6792401148ffa32e3dcb1cd4f087ed804e306b241cef86de0aa347d25d4 |
| 32 |
@@ -19,5 +21,5 @@ DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e06 |
| 33 |
DIST libreoffice-help-5.2.7.2.tar.xz 1940516 SHA256 f7d35c460da96ed2d52cf97baef159382b38e5ce4579c34e65480ff2911cac4b SHA512 c86bc17448fcd1da01e13d3e9fee739610fde390abaf0635cc4593755d102da08a5eea0533076e1a0f8d89f0b32ba5086b155b9b388f317a5e4c669bf17769e1 WHIRLPOOL 4da96a14b70be718109eda5ced62cec85b96e9028fcf65d729a99604598de81edc097bc06577f3ce7958de1316b04d2d2f1f2782c6504a487ffc6ebaaf7feca6 |
| 34 |
DIST libreoffice-help-5.3.3.2.tar.xz 2127200 SHA256 f9b4fef5f449cdbbcb5796908d0536576585c511173bfccf2ca049b5dcbb0dc7 SHA512 5c73997cf95e4d5acb2693560ac49aef5f589cee22ce22de1ee8f0e0fa2189d8893afe70790895160feb832049943cfc5e1d322bbd9fd7c7d0bbf3b11a8d9a25 WHIRLPOOL fd3c3afc070cb4fe1145ac631e80bbea3333a36c1d10a43b5a16d1dbdee5e78a614617e6290b961ad951b639410205cc5bdadbefe8b55639046ec9633ff269c8 |
| 35 |
EBUILD libreoffice-5.2.7.2.ebuild 18066 SHA256 c5ddfc32e04d5b770b01c6f728d943e6ba9196c4ac93d419b5e3552fbc020161 SHA512 8c8bac08d79db6b78ea4d101ef7765974319898c30ffc4f933ee2fedfe51d1c72a1a381ec66acdd9aa68a5e33f4597daab33776915381626bd4ef5e160191084 WHIRLPOOL e4b6579fa88063cb3118fa5bdc88c41ddf19eada26953818d37eeac9d6535b33efda27cb5af36624d83cc6755e1b95dbca7b707e1fdc93e7d21d761b391c5c75 |
| 36 |
-EBUILD libreoffice-5.3.3.2.ebuild 18381 SHA256 49de133af81ea9cd37355810af8a6610ce4e80f69c2376403c2eb2ecd501886a SHA512 2b9ce99b6d87262cc36176370f56ccb96e36aabd0752383832bf7dbdff2123f14a5298a018d94f238fd1593e4ae372744bc2734a5faf2c6b8c0252dbdbf8dbab WHIRLPOOL dfcd8364d18befbd27d1cfe36a6e724a423600ea834f5618761adf76698e4e1e44815899aefa5b4e5b53a3e7388c51f1ddd62f5c7f0576d9d0d24bad5ea5d68f |
| 37 |
+EBUILD libreoffice-5.3.3.2.ebuild 18381 SHA256 7719d8904b8b867932d0fac42482d0962c4870f2fb79097ca91121a151a8d8bc SHA512 483fcad9125611985e559df9e4c87a8c81754f632f2c0c53afa5c82008b8fe426503125cbc8fb4afb54a46d2a3898aa5934bb2b0cb1e7f530b9704eea52054e7 WHIRLPOOL 8241fd2ed8f78de61607f4530b68eba4e37831d6616f04427f8dd3c615982be3830e88ac5ca6857031f85cc58fb0ed2a7e211f6272783cb259aa922fa5946101 |
| 38 |
MISC metadata.xml 1506 SHA256 e9682eb8fcf1609f39f15680caa33f2b87151ecca4189964ea750a5e8a09485a SHA512 20e6d0f46aa551074f0f0b794d6c4c92e011bf6ab854c7111fad081f9f9d9fe51e370decbbbe9b2cc74a7d1369e38fe0cb3c2768c2d287fc30346c8e4d6783aa WHIRLPOOL ae9571006a3f933ee16ea4e34e3a3cb1b017ce1734e4e09f4ff9f421031c10ebe7c1b5ee87ff84532c13805ec7b4284e14b4aab3d06767d28268b58a768ce9c1 |
| 39 |
|
| 40 |
diff --git a/app-office/libreoffice/files/libreoffice-5.3-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-5.3-system-pyuno.patch |
| 41 |
new file mode 100644 |
| 42 |
index 0000000..3ab3e82 |
| 43 |
--- /dev/null |
| 44 |
+++ b/app-office/libreoffice/files/libreoffice-5.3-system-pyuno.patch |
| 45 |
@@ -0,0 +1,47 @@ |
| 46 |
+diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh |
| 47 |
+index a259bf6..672fa23 100755 |
| 48 |
+--- a/desktop/scripts/soffice.sh |
| 49 |
++++ b/desktop/scripts/soffice.sh |
| 50 |
+@@ -139,6 +139,9 @@ if echo "$checks" | grep -q "cc" ; then |
| 51 |
+ exit 1; |
| 52 |
+ fi |
| 53 |
+ |
| 54 |
++PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH} |
| 55 |
++export PYTHONPATH |
| 56 |
++ |
| 57 |
+ case "`uname -s`" in |
| 58 |
+ NetBSD|OpenBSD|DragonFly) |
| 59 |
+ # this is a temporary hack until we can live with the default search paths |
| 60 |
+ |
| 61 |
+--- a/pyuno/source/module/uno.py 2016-08-07 20:57:51.653712240 -0400 |
| 62 |
++++ b/pyuno/source/module/uno.py 2016-08-07 20:59:33.958896861 -0400 |
| 63 |
+@@ -16,11 +16,16 @@ |
| 64 |
+ # except in compliance with the License. You may obtain a copy of |
| 65 |
+ # the License at http://www.apache.org/licenses/LICENSE-2.0 . |
| 66 |
+ # |
| 67 |
++import os |
| 68 |
+ import pyuno |
| 69 |
+ import sys |
| 70 |
+ import traceback |
| 71 |
+ import warnings |
| 72 |
+ |
| 73 |
++sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program') |
| 74 |
++if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: |
| 75 |
++ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc" |
| 76 |
++ |
| 77 |
+ # since on Windows sal3.dll no longer calls WSAStartup |
| 78 |
+ import socket |
| 79 |
+ |
| 80 |
+diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py |
| 81 |
+index 99d3b03..704edab 100755 |
| 82 |
+--- a/pyuno/source/officehelper.py |
| 83 |
++++ b/pyuno/source/officehelper.py |
| 84 |
+@@ -44,7 +44,7 @@ def bootstrap(): |
| 85 |
+ if "UNO_PATH" in os.environ: |
| 86 |
+ sOffice = os.environ["UNO_PATH"] |
| 87 |
+ else: |
| 88 |
+- sOffice = "" # lets hope for the best |
| 89 |
++ sOffice = "%eprefix%/usr/%libdir%/libreoffice/program" |
| 90 |
+ sOffice = os.path.join(sOffice, "soffice") |
| 91 |
+ if platform.startswith("win"): |
| 92 |
+ sOffice += ".exe" |
| 93 |
|
| 94 |
diff --git a/app-office/libreoffice/files/libreoffice-5.3.0.3-linux-musl.patch b/app-office/libreoffice/files/libreoffice-5.3.0.3-linux-musl.patch |
| 95 |
new file mode 100644 |
| 96 |
index 0000000..45cc32b |
| 97 |
--- /dev/null |
| 98 |
+++ b/app-office/libreoffice/files/libreoffice-5.3.0.3-linux-musl.patch |
| 99 |
@@ -0,0 +1,62 @@ |
| 100 |
+Taken from https://git.alpinelinux.org/cgit/aports/tree/community/libreoffice/linux-musl.patch?id=23119189c868089ed1cc1016c7bc528fcb90b5e8 |
| 101 |
+ |
| 102 |
+--- libreoffice-5.3.0.3/configure.ac.orig 2017-01-26 22:22:46.000000000 +0000 |
| 103 |
++++ libreoffice-5.3.0.3/configure.ac 2017-02-08 13:14:16.777547599 +0000 |
| 104 |
+@@ -652,7 +652,7 @@ |
| 105 |
+ fi |
| 106 |
+ ;; |
| 107 |
+ |
| 108 |
+-linux-gnu*|k*bsd*-gnu*) |
| 109 |
++linux-gnu*|linux-musl*|k*bsd*-gnu*) |
| 110 |
+ test_gtk=yes |
| 111 |
+ build_gstreamer_1_0=yes |
| 112 |
+ build_gstreamer_0_10=yes |
| 113 |
+@@ -4170,7 +4170,7 @@ |
| 114 |
+ esac |
| 115 |
+ ;; |
| 116 |
+ |
| 117 |
+-linux-gnu*) |
| 118 |
++linux-gnu*|linux-musl*) |
| 119 |
+ COM=GCC |
| 120 |
+ USING_X11=TRUE |
| 121 |
+ OS=LINUX |
| 122 |
+@@ -7197,7 +7197,7 @@ |
| 123 |
+ test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" |
| 124 |
+ ;; |
| 125 |
+ |
| 126 |
+- linux-gnu*) |
| 127 |
++ linux-gnu*|linux-musl*) |
| 128 |
+ JAVAINC="-I$JAVA_HOME/include" |
| 129 |
+ JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux" |
| 130 |
+ test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" |
| 131 |
+@@ -9748,21 +9748,6 @@ |
| 132 |
+ fi |
| 133 |
+ AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA) |
| 134 |
+ |
| 135 |
+-dnl *************************************** |
| 136 |
+-dnl testing libc version for Linux... |
| 137 |
+-dnl *************************************** |
| 138 |
+-if test "$_os" = "Linux"; then |
| 139 |
+- AC_MSG_CHECKING([whether libc is >= 2.1.1]) |
| 140 |
+- exec 6>/dev/null # no output |
| 141 |
+- AC_CHECK_LIB(c, gnu_get_libc_version, HAVE_LIBC=yes; export HAVE_LIBC) |
| 142 |
+- exec 6>&1 # output on again |
| 143 |
+- if test "$HAVE_LIBC"; then |
| 144 |
+- AC_MSG_RESULT([yes]) |
| 145 |
+- else |
| 146 |
+- AC_MSG_ERROR([no, upgrade libc]) |
| 147 |
+- fi |
| 148 |
+-fi |
| 149 |
+- |
| 150 |
+ dnl ========================================= |
| 151 |
+ dnl Check for the Windows SDK. |
| 152 |
+ dnl ========================================= |
| 153 |
+@@ -12775,7 +12760,7 @@ |
| 154 |
+ |
| 155 |
+ case "$host_os" in |
| 156 |
+ |
| 157 |
+- aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*) |
| 158 |
++ aix*|dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*) |
| 159 |
+ if test "$ENABLE_JAVA" != ""; then |
| 160 |
+ pathmunge "$JAVA_HOME/bin" "after" |
| 161 |
+ fi |
| 162 |
|
| 163 |
diff --git a/app-office/libreoffice/libreoffice-5.3.3.2.ebuild b/app-office/libreoffice/libreoffice-5.3.3.2.ebuild |
| 164 |
index 8b27176..5c85f98 100644 |
| 165 |
--- a/app-office/libreoffice/libreoffice-5.3.3.2.ebuild |
| 166 |
+++ b/app-office/libreoffice/libreoffice-5.3.3.2.ebuild |
| 167 |
@@ -249,7 +249,7 @@ PATCHES=( |
| 168 |
|
| 169 |
# musl patches |
| 170 |
"${FILESDIR}/${PN}-4.4.1.2-musl-fix-execinfo.patch" |
| 171 |
- "${FILESDIR}/${PN}-5.0.5.2-linux-musl.patch" |
| 172 |
+ "${FILESDIR}/${PN}-5.3.0.3-linux-musl.patch" |
| 173 |
"${FILESDIR}/${PN}-5.2.3.3-fix-includes.patch" |
| 174 |
"${FILESDIR}/${PN}-5.2.5.1-musl-vlc.patch" |
| 175 |
) |
Archives