diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2023-04-08 23:40:05 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2023-04-09 00:55:27 +0200 |
| commit | 81d6e7ccdb312d17556cf969befc642a932a0dad (patch) | |
| tree | 5fbf4e9e097d185718b41723cbb285de97b68c58 /app-office | |
| parent | app-text/pandoc-bin: Stabilize 3.1.1 amd64, #904053 (diff) | |
| download | gentoo-81d6e7ccdb312d17556cf969befc642a932a0dad.tar.gz gentoo-81d6e7ccdb312d17556cf969befc642a932a0dad.tar.bz2 gentoo-81d6e7ccdb312d17556cf969befc642a932a0dad.zip | |
app-office/libreoffice: Backport loong fix from git master
Upstream commit 477374d8f5e3acfc2727b009a95427ef05297ffc
Bug: https://bugs.gentoo.org/881389
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/Manifest | 1 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-7.5.2.2.ebuild | 4 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-7.5.9999.ebuild | 8 |
3 files changed, 11 insertions, 2 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 253a6ae08333..d5884a52348b 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -22,6 +22,7 @@ DIST libreoffice-7.3.5.2-patchset-01.tar.xz 12700 BLAKE2B 353f6552d31616dfeb3228 DIST libreoffice-7.3.7.2.tar.xz 256653492 BLAKE2B aa3e096ba46d6e23b0e6439a435a6d75fdc9da309885a28d96dc5a4fc05d854a8e4f633d9f4d623af18f6a80ca036409fb26b9a9843fb9a18144468b58ef5ad4 SHA512 f7b6279f5ef9f5ad8290d2bdf4fd54f8df7775a21094ba762dbd9299effab31d4f2c6dff9f4b3d9c5673596931df1d16b195474b547007bfc9a396c47e5e181c DIST libreoffice-7.4.4.2.tar.xz 264346748 BLAKE2B 4498a615df78816e579173be585b61dfd16958f16fc29d3171f09f17e4caa370fc6cbe427c7a79c28f8a23a7ecd036b21488188fb4ef035a8ccb2ef877bb1363 SHA512 8205d1980cc282a3f18214cdfa036788a4b288c72e153716b807d5ad0cf8e5ec42c3223b783d75bfe92ea7f6caa7eadcd5ebf88ff899742a3b1733c1e36807de DIST libreoffice-7.4.6.2.tar.xz 264594056 BLAKE2B e18084aa45d021d5a14bc4259aac61de86571a526fa335cf64b04fbbf77eb02c154d5b2be5735063089453f0a6710ee526c7c9f5b76a3c30b733e6c4fcb81a7e SHA512 c0b18d6c5bec1140d87fc24b539640280fea782ff1239e44368afeac63058ba38aae1b81e30d1ab17e84089918d7e698f0afd342e98208171faeff303ccd7fab +DIST libreoffice-7.5.2.2-loong-buildsys-fix.patch.xz 5172 BLAKE2B bd9b84b770b23f9ad8f09bfeb1948fd3679f0dfd32424e1c997e25340d29e55b403dde995510da76c824a169e594ae37310d2c51ad4c3c9df76ec5707676588b SHA512 13eb46209755b7098183c60cdd2fedff75c50af4496a2d8dedd34de379dbeccbdac435531aa930e212638a685f2054e143dc4015a5ba3be9a3736d9073188d43 DIST libreoffice-7.5.2.2.tar.xz 269326892 BLAKE2B 5aac890235facb8074dc6ed02468aca791895cda8f045befb44a363b747f0c812c6dfaad635f36e60901f7afe8aff22ff36710afcc4d4e69bd4c3f5ef97440bd SHA512 1507c6b60eb680ed36a5c16b802a07218ab3bd26ea65acb8a43576003b120246849e1a4f2c6e3cfca181979a46d541dcf37841b95f5b43d40946f12b92c686b6 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f DIST libreoffice-help-7.3.7.2.tar.xz 112210852 BLAKE2B 3a3148d6ff9c743c97c0371290b3264f8e9eb8eb5aba3176b2e88f296abc2856f364866ba6ebb9f6364b5c98255c8593d23e3d54db6bcc27eecde53ac9a1b393 SHA512 c223ee49626e36b11a86c077001efc27ca2df9aa10ddb068e04c8ab8a0ea1942ca71b97c2f7379bf856ba7d12a5ca94f2fd8d8058703e2276af3595b75049030 diff --git a/app-office/libreoffice/libreoffice-7.5.2.2.ebuild b/app-office/libreoffice/libreoffice-7.5.2.2.ebuild index 3d98400899a5..cccdba5049dd 100644 --- a/app-office/libreoffice/libreoffice-7.5.2.2.ebuild +++ b/app-office/libreoffice/libreoffice-7.5.2.2.ebuild @@ -26,6 +26,7 @@ inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 mult DESCRIPTION="A full office productivity suite" HOMEPAGE="https://www.libreoffice.org" SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-loong-buildsys-fix.patch.xz" [[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}" # Split modules following git/tarballs; Core MUST be first! @@ -291,6 +292,9 @@ PATCHES=( "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" "${FILESDIR}/${PN}-6.1-nomancompress.patch" "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch" + + # git master + "${WORKDIR}"/${P}-loong-buildsys-fix.patch ) S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/app-office/libreoffice/libreoffice-7.5.9999.ebuild b/app-office/libreoffice/libreoffice-7.5.9999.ebuild index 7214f182ae9e..78e088c23087 100644 --- a/app-office/libreoffice/libreoffice-7.5.9999.ebuild +++ b/app-office/libreoffice/libreoffice-7.5.9999.ebuild @@ -26,6 +26,7 @@ inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 mult DESCRIPTION="A full office productivity suite" HOMEPAGE="https://www.libreoffice.org" SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-7.5.2.2-loong-buildsys-fix.patch.xz" [[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}" # Split modules following git/tarballs; Core MUST be first! @@ -101,8 +102,8 @@ RESTRICT="!test? ( test )" LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" -#[[ ${MY_PV} == *9999* ]] || \ -#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux" +[[ ${MY_PV} == *9999* ]] || \ +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux" COMMON_DEPEND="${PYTHON_DEPS} app-arch/unzip @@ -291,6 +292,9 @@ PATCHES=( "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" "${FILESDIR}/${PN}-6.1-nomancompress.patch" "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch" + + # git master + "${WORKDIR}"/${PN}-7.5.2.2-loong-buildsys-fix.patch ) S="${WORKDIR}/${PN}-${MY_PV}" |