diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2018-10-04 10:48:25 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-10-04 10:49:00 +0200 |
commit | be2d783f73499a2dc70660923a08eed98de1ed4b (patch) | |
tree | c51be556cfea17539b6a7d752e638ffe017e7f0e /app-text/libetonyek | |
parent | app-text/libetonyek: Relax dev-util/mdds version requirement (diff) | |
download | gentoo-be2d783f73499a2dc70660923a08eed98de1ed4b.tar.gz gentoo-be2d783f73499a2dc70660923a08eed98de1ed4b.tar.bz2 gentoo-be2d783f73499a2dc70660923a08eed98de1ed4b.zip |
app-text/libetonyek: EAPI-7 bump, sddm handling, minor upstream fixes
Closes: https://bugs.gentoo.org/667690
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
Diffstat (limited to 'app-text/libetonyek')
3 files changed, 120 insertions, 0 deletions
diff --git a/app-text/libetonyek/files/libetonyek-0.1.8-no-parentheses.patch b/app-text/libetonyek/files/libetonyek-0.1.8-no-parentheses.patch new file mode 100644 index 000000000000..e13fe5f31cef --- /dev/null +++ b/app-text/libetonyek/files/libetonyek-0.1.8-no-parentheses.patch @@ -0,0 +1,29 @@ +From 935cb58a61e45f441bdea143317a7d0d52c7f944 Mon Sep 17 00:00:00 2001 +From: David Tardon <dtardon@redhat.com> +Date: Sat, 5 May 2018 14:01:43 +0200 +Subject: [PATCH] =?utf8?q?WaE:=20unnecessary=20parentheses=20in=20declarat?= + =?utf8?q?ion=20of=20=E2=80=98aligns=E2=80=99?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +Change-Id: Ic3cb38d071db8e3947c09a4b216b62d18e01b6aa +--- + src/lib/IWAParser.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lib/IWAParser.cpp b/src/lib/IWAParser.cpp +index ab9c6c8..973610e 100644 +--- a/src/lib/IWAParser.cpp ++++ b/src/lib/IWAParser.cpp +@@ -1676,7 +1676,7 @@ void IWAParser::parseCellStyle(const unsigned id, IWORKStylePtr_t &style) + auto align=get(properties.uint32(8)); + if (align<=2) + { +- const IWORKVerticalAlignment(aligns[])= ++ const IWORKVerticalAlignment aligns[] = + { + IWORK_VERTICAL_ALIGNMENT_TOP, IWORK_VERTICAL_ALIGNMENT_MIDDLE, IWORK_VERTICAL_ALIGNMENT_BOTTOM + }; +-- +2.11.0 diff --git a/app-text/libetonyek/files/libetonyek-0.1.8-typo-fix.patch b/app-text/libetonyek/files/libetonyek-0.1.8-typo-fix.patch new file mode 100644 index 000000000000..32593fed4805 --- /dev/null +++ b/app-text/libetonyek/files/libetonyek-0.1.8-typo-fix.patch @@ -0,0 +1,28 @@ +From 9b78187ac2ccca0158cc9cc0bcc0576b457a78d7 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> +Date: Mon, 23 Apr 2018 17:20:16 +0100 +Subject: [PATCH] intial-creator->initial-creator + +Change-Id: I6fe5d0732edb97ac7ff6d527f48543cab1bb3f7b +Reviewed-on: https://gerrit.libreoffice.org/53337 +Reviewed-by: David Tardon <dtardon@redhat.com> +Tested-by: David Tardon <dtardon@redhat.com> +--- + src/lib/IWORKCollector.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lib/IWORKCollector.cpp b/src/lib/IWORKCollector.cpp +index 0e0c775..4252a49 100644 +--- a/src/lib/IWORKCollector.cpp ++++ b/src/lib/IWORKCollector.cpp +@@ -771,7 +771,7 @@ void IWORKCollector::fillMetadata(librevenge::RVNGPropertyList &props) + if (!m_metadata.m_title.empty()) + props.insert("dc:subject", m_metadata.m_title.c_str()); + if (!m_metadata.m_author.empty()) +- props.insert("meta:intial-creator", m_metadata.m_author.c_str()); ++ props.insert("meta:initial-creator", m_metadata.m_author.c_str()); + if (!m_metadata.m_keywords.empty()) + props.insert("meta:keyword", m_metadata.m_keywords.c_str()); + if (!m_metadata.m_comment.empty()) +-- +2.11.0 diff --git a/app-text/libetonyek/libetonyek-0.1.8-r1.ebuild b/app-text/libetonyek/libetonyek-0.1.8-r1.ebuild new file mode 100644 index 000000000000..2d13eaf89aa8 --- /dev/null +++ b/app-text/libetonyek/libetonyek-0.1.8-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git" +[[ ${PV} == 9999 ]] && inherit git-r3 +inherit autotools + +DESCRIPTION="Library parsing Apple Keynote presentations" +HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek" +[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz" + +LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )" +SLOT="0" +[[ ${PV} == 9999 ]] || \ +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="doc static-libs test" + +RDEPEND=" + app-text/liblangtag + dev-libs/librevenge + dev-libs/libxml2 + sys-libs/zlib +" +DEPEND="${RDEPEND} + dev-libs/boost + >=dev-util/mdds-1.2.2:1= + media-libs/glm + sys-devel/libtool + virtual/pkgconfig + doc? ( app-doc/doxygen ) + test? ( dev-util/cppunit ) +" + +PATCHES=( + "${FILESDIR}/${P}-glm-0.9.9.patch" + "${FILESDIR}/${P}-typo-fix.patch" + "${FILESDIR}/${P}-no-parentheses.patch" +) + +src_prepare() { + default + [[ -d m4 ]] || mkdir "m4" + eautoreconf +} + +src_configure() { + # mdds installs versioned pkgconfig files + local p=$(best_version dev-util/mdds) + local pv=$(echo ${p/%-r[0-9]*/} | rev | cut -d - -f 1 | rev) + econf \ + --disable-werror \ + --with-mdds=$(ver_cut 1-2 ${pv}) \ + $(use_with doc docs) \ + $(use_enable static-libs static) \ + $(use_enable test tests) +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} |