Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/libetonyek/, app-text/libetonyek/files/
Date: Thu, 04 Oct 2018 08:49:41
Message-Id: 1538642940.be2d783f73499a2dc70660923a08eed98de1ed4b.asturm@gentoo
1 commit: be2d783f73499a2dc70660923a08eed98de1ed4b
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 4 08:48:25 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 4 08:49:00 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be2d783f
7
8 app-text/libetonyek: EAPI-7 bump, sddm handling, minor upstream fixes
9
10 Closes: https://bugs.gentoo.org/667690
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12 Package-Manager: Portage-2.3.50, Repoman-2.3.11
13
14 .../files/libetonyek-0.1.8-no-parentheses.patch | 29 ++++++++++
15 .../files/libetonyek-0.1.8-typo-fix.patch | 28 ++++++++++
16 app-text/libetonyek/libetonyek-0.1.8-r1.ebuild | 63 ++++++++++++++++++++++
17 3 files changed, 120 insertions(+)
18
19 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
20 new file mode 100644
21 index 00000000000..e13fe5f31ce
22 --- /dev/null
23 +++ b/app-text/libetonyek/files/libetonyek-0.1.8-no-parentheses.patch
24 @@ -0,0 +1,29 @@
25 +From 935cb58a61e45f441bdea143317a7d0d52c7f944 Mon Sep 17 00:00:00 2001
26 +From: David Tardon <dtardon@××××××.com>
27 +Date: Sat, 5 May 2018 14:01:43 +0200
28 +Subject: [PATCH] =?utf8?q?WaE:=20unnecessary=20parentheses=20in=20declarat?=
29 + =?utf8?q?ion=20of=20=E2=80=98aligns=E2=80=99?=
30 +MIME-Version: 1.0
31 +Content-Type: text/plain; charset=utf8
32 +Content-Transfer-Encoding: 8bit
33 +
34 +Change-Id: Ic3cb38d071db8e3947c09a4b216b62d18e01b6aa
35 +---
36 + src/lib/IWAParser.cpp | 2 +-
37 + 1 file changed, 1 insertion(+), 1 deletion(-)
38 +
39 +diff --git a/src/lib/IWAParser.cpp b/src/lib/IWAParser.cpp
40 +index ab9c6c8..973610e 100644
41 +--- a/src/lib/IWAParser.cpp
42 ++++ b/src/lib/IWAParser.cpp
43 +@@ -1676,7 +1676,7 @@ void IWAParser::parseCellStyle(const unsigned id, IWORKStylePtr_t &style)
44 + auto align=get(properties.uint32(8));
45 + if (align<=2)
46 + {
47 +- const IWORKVerticalAlignment(aligns[])=
48 ++ const IWORKVerticalAlignment aligns[] =
49 + {
50 + IWORK_VERTICAL_ALIGNMENT_TOP, IWORK_VERTICAL_ALIGNMENT_MIDDLE, IWORK_VERTICAL_ALIGNMENT_BOTTOM
51 + };
52 +--
53 +2.11.0
54
55 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
56 new file mode 100644
57 index 00000000000..32593fed480
58 --- /dev/null
59 +++ b/app-text/libetonyek/files/libetonyek-0.1.8-typo-fix.patch
60 @@ -0,0 +1,28 @@
61 +From 9b78187ac2ccca0158cc9cc0bcc0576b457a78d7 Mon Sep 17 00:00:00 2001
62 +From: =?utf8?q?Caol=C3=A1n=20McNamara?= <caolanm@××××××.com>
63 +Date: Mon, 23 Apr 2018 17:20:16 +0100
64 +Subject: [PATCH] intial-creator->initial-creator
65 +
66 +Change-Id: I6fe5d0732edb97ac7ff6d527f48543cab1bb3f7b
67 +Reviewed-on: https://gerrit.libreoffice.org/53337
68 +Reviewed-by: David Tardon <dtardon@××××××.com>
69 +Tested-by: David Tardon <dtardon@××××××.com>
70 +---
71 + src/lib/IWORKCollector.cpp | 2 +-
72 + 1 file changed, 1 insertion(+), 1 deletion(-)
73 +
74 +diff --git a/src/lib/IWORKCollector.cpp b/src/lib/IWORKCollector.cpp
75 +index 0e0c775..4252a49 100644
76 +--- a/src/lib/IWORKCollector.cpp
77 ++++ b/src/lib/IWORKCollector.cpp
78 +@@ -771,7 +771,7 @@ void IWORKCollector::fillMetadata(librevenge::RVNGPropertyList &props)
79 + if (!m_metadata.m_title.empty())
80 + props.insert("dc:subject", m_metadata.m_title.c_str());
81 + if (!m_metadata.m_author.empty())
82 +- props.insert("meta:intial-creator", m_metadata.m_author.c_str());
83 ++ props.insert("meta:initial-creator", m_metadata.m_author.c_str());
84 + if (!m_metadata.m_keywords.empty())
85 + props.insert("meta:keyword", m_metadata.m_keywords.c_str());
86 + if (!m_metadata.m_comment.empty())
87 +--
88 +2.11.0
89
90 diff --git a/app-text/libetonyek/libetonyek-0.1.8-r1.ebuild b/app-text/libetonyek/libetonyek-0.1.8-r1.ebuild
91 new file mode 100644
92 index 00000000000..2d13eaf89aa
93 --- /dev/null
94 +++ b/app-text/libetonyek/libetonyek-0.1.8-r1.ebuild
95 @@ -0,0 +1,63 @@
96 +# Copyright 1999-2018 Gentoo Authors
97 +# Distributed under the terms of the GNU General Public License v2
98 +
99 +EAPI=7
100 +
101 +EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
102 +[[ ${PV} == 9999 ]] && inherit git-r3
103 +inherit autotools
104 +
105 +DESCRIPTION="Library parsing Apple Keynote presentations"
106 +HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
107 +[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
108 +
109 +LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
110 +SLOT="0"
111 +[[ ${PV} == 9999 ]] || \
112 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
113 +IUSE="doc static-libs test"
114 +
115 +RDEPEND="
116 + app-text/liblangtag
117 + dev-libs/librevenge
118 + dev-libs/libxml2
119 + sys-libs/zlib
120 +"
121 +DEPEND="${RDEPEND}
122 + dev-libs/boost
123 + >=dev-util/mdds-1.2.2:1=
124 + media-libs/glm
125 + sys-devel/libtool
126 + virtual/pkgconfig
127 + doc? ( app-doc/doxygen )
128 + test? ( dev-util/cppunit )
129 +"
130 +
131 +PATCHES=(
132 + "${FILESDIR}/${P}-glm-0.9.9.patch"
133 + "${FILESDIR}/${P}-typo-fix.patch"
134 + "${FILESDIR}/${P}-no-parentheses.patch"
135 +)
136 +
137 +src_prepare() {
138 + default
139 + [[ -d m4 ]] || mkdir "m4"
140 + eautoreconf
141 +}
142 +
143 +src_configure() {
144 + # mdds installs versioned pkgconfig files
145 + local p=$(best_version dev-util/mdds)
146 + local pv=$(echo ${p/%-r[0-9]*/} | rev | cut -d - -f 1 | rev)
147 + econf \
148 + --disable-werror \
149 + --with-mdds=$(ver_cut 1-2 ${pv}) \
150 + $(use_with doc docs) \
151 + $(use_enable static-libs static) \
152 + $(use_enable test tests)
153 +}
154 +
155 +src_install() {
156 + default
157 + find "${D}" -name '*.la' -delete || die
158 +}