diff options
| -rw-r--r-- | app-officeext/languagetool/Manifest | 3 | ||||
| -rw-r--r-- | app-officeext/languagetool/languagetool-3.4.ebuild | 25 | ||||
| -rw-r--r-- | app-officeext/languagetool/languagetool-5.0.ebuild (renamed from app-officeext/languagetool/languagetool-3.5.ebuild) | 8 | ||||
| -rw-r--r-- | media-libs/mlt/files/mlt-6.20.0-musl-locale.patch | 34 | ||||
| -rw-r--r-- | media-libs/mlt/mlt-6.20.0-r2.ebuild | 1 |
5 files changed, 39 insertions, 32 deletions
diff --git a/app-officeext/languagetool/Manifest b/app-officeext/languagetool/Manifest index 34356537e77f..f208875f0215 100644 --- a/app-officeext/languagetool/Manifest +++ b/app-officeext/languagetool/Manifest @@ -1,2 +1 @@ -DIST LanguageTool-3.4.oxt 58043690 BLAKE2B d381d0e426619182e8e5d7469dfb18e41c7a993f1850afd1a2720199618eaaadd093f3b7efafc23601a42221e991e71820d963326618f24be4889cf55b04f5f1 SHA512 29eda8c4a26eb4da4dce68db6f962c8a8828bb0eb76aef3e31a58607aea9a15705aaccc4a1bc5366760bdb00c9133ef225291941e5873cbcc384627464eb9a8f -DIST LanguageTool-3.5.oxt 58210562 BLAKE2B 77a455a9a7950aed69c5b6ffd1bfca43b0821f6b84cfa96d5aea05b9a57995c4542e4d651e150d964173bdc1e3364b96ececeda07919db68ad04293673f02c9f SHA512 1a36c04117c473ccb812f3b216763d816ddc796869488bfcf2f36d8ab325ef1620edf148ebb8b1b1b2d62a043b5b45f738e27ff440f6f99067601828a49f0e0e +DIST LanguageTool-5.0.oxt 141552168 BLAKE2B 040cb817150dd1cf137feadf28ca00ce6316a529709c1255438d0fa2faac3b5a516d9a48e3e3ba6bf2fedc3650050970eae6179578c5fcf005c6484c30cf408e SHA512 8493100684598aaa7c422360e0f00b5cff0c1be22aca4bee6c7e0e12d509916bc3c7f8df052b86702f6177ffffc227d1a5dbe6b2592fa1cbdb79f4666dc22c16 diff --git a/app-officeext/languagetool/languagetool-3.4.ebuild b/app-officeext/languagetool/languagetool-3.4.ebuild deleted file mode 100644 index e000f3752945..000000000000 --- a/app-officeext/languagetool/languagetool-3.4.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -MY_P="LanguageTool-${PV}" - -OFFICE_REQ_USE="java" - -OFFICE_EXTENSIONS=( - "${MY_P}.oxt" -) - -inherit office-ext-r1 - -DESCRIPTION="Style and Grammar Checker for libreoffice" -HOMEPAGE="https://www.languagetool.org/" -SRC_URI="https://www.languagetool.org/download/${MY_P}.oxt" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=">=virtual/jre-1.8" diff --git a/app-officeext/languagetool/languagetool-3.5.ebuild b/app-officeext/languagetool/languagetool-5.0.ebuild index 14d714d60ce5..962894ba86e5 100644 --- a/app-officeext/languagetool/languagetool-3.5.ebuild +++ b/app-officeext/languagetool/languagetool-5.0.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 MY_P="LanguageTool-${PV}" OFFICE_REQ_USE="java" - OFFICE_EXTENSIONS=( "${MY_P}.oxt" ) @@ -17,9 +16,8 @@ DESCRIPTION="Style and Grammar Checker for libreoffice" HOMEPAGE="https://www.languagetool.org/" SRC_URI="https://www.languagetool.org/download/${MY_P}.oxt" -LICENSE="LGPL-2" +LICENSE="LGPL-2.1+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND=">=virtual/jre-1.8" diff --git a/media-libs/mlt/files/mlt-6.20.0-musl-locale.patch b/media-libs/mlt/files/mlt-6.20.0-musl-locale.patch new file mode 100644 index 000000000000..ed206108d2ed --- /dev/null +++ b/media-libs/mlt/files/mlt-6.20.0-musl-locale.patch @@ -0,0 +1,34 @@ +From d02611584d4b2f693469c72272fe369413139394 Mon Sep 17 00:00:00 2001 +From: Carlo Landmeter <clandmeter@gmail.com> +Date: Sun, 6 Nov 2016 00:45:44 +0100 +Subject: testing/mlt: new aport + +--- + testing/mlt/musl-locale.patch | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + create mode 100644 testing/mlt/musl-locale.patch + +(limited to 'testing/mlt/musl-locale.patch') + +diff --git a/testing/mlt/musl-locale.patch b/testing/mlt/musl-locale.patch +new file mode 100644 +index 0000000000..030bb781d1 +--- /dev/null ++++ b/testing/mlt/musl-locale.patch +@@ -0,0 +1,13 @@ ++--- ./src/framework/mlt_property.h.orig +++++ ./src/framework/mlt_property.h ++@@ -30,8 +30,8 @@ ++ #include <sys/param.h> ++ #endif ++ ++-#if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506) ++-#include <xlocale.h> +++#if defined(__linux__) || defined(__APPLE__) || (__FreeBSD_version >= 900506) +++#include <locale.h> ++ #else ++ typedef char* locale_t; ++ #endif +-- +cgit v1.2.1 + diff --git a/media-libs/mlt/mlt-6.20.0-r2.ebuild b/media-libs/mlt/mlt-6.20.0-r2.ebuild index 7c449e85101c..2d15f57bfc5d 100644 --- a/media-libs/mlt/mlt-6.20.0-r2.ebuild +++ b/media-libs/mlt/mlt-6.20.0-r2.ebuild @@ -91,6 +91,7 @@ PATCHES=( "${FILESDIR}"/${P}-crash-w-unsupported-preview-scale.patch "${FILESDIR}"/${P}-crash-in-composite.patch "${FILESDIR}"/${P}-opencv-double-del-crash.patch + "${FILESDIR}"/${P}-musl-locale.patch # from Alpine, pending upstream ) pkg_setup() { |