* [gentoo-commits] repo/gentoo:master commit in: app-text/libetonyek/, app-text/libetonyek/files/
@ 2016-06-07 14:57 Lars Wendler
0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2016-06-07 14:57 UTC (permalink / raw
To: gentoo-commits
commit: fb65b28c94cc840ef3f4e5b22f918f21ca8a8815
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Jun 4 12:58:07 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jun 7 14:57:49 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb65b28c
app-text/libetonyek: Fix build w/ mdds-1.2.0
Patch taken from Debian. See also:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=824584
Gentoo-bug: 584994
Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../files/libetonyek-0.1.6-mdds-1.2.patch | 33 ++++++++++++++++++++++
app-text/libetonyek/libetonyek-0.1.6.ebuild | 12 ++++----
app-text/libetonyek/libetonyek-9999.ebuild | 2 +-
3 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/app-text/libetonyek/files/libetonyek-0.1.6-mdds-1.2.patch b/app-text/libetonyek/files/libetonyek-0.1.6-mdds-1.2.patch
new file mode 100644
index 0000000..0ca085f
--- /dev/null
+++ b/app-text/libetonyek/files/libetonyek-0.1.6-mdds-1.2.patch
@@ -0,0 +1,33 @@
+--- libetonyek-0.1.6/configure.ac
++++ libetonyek-0.1.6/configure.ac
+@@ -24,8 +24,8 @@ AC_LANG([C++])
+ # Configure options
+ # =================
+ AC_ARG_WITH([mdds],
+- AS_HELP_STRING([--with-mdds=1.0|0.x], [Specify which version of mdds to use (1.0 is the default)]),
+- [], [with_mdds="1.0"])
++ AS_HELP_STRING([--with-mdds=1.2|0.x], [Specify which version of mdds to use (1.2 is the default)]),
++ [], [with_mdds="1.2"])
+
+ # ===========================
+ # Find required base packages
+@@ -47,7 +47,7 @@ AC_PROG_SED
+
+ AM_MISSING_PROG([GPERF], [gperf])
+
+-AS_IF([test "$with_mdds" = "1.0"], [AX_CXX_COMPILE_STDCXX_11([noext])])
++AS_IF([test "$with_mdds" = "1.2"], [AX_CXX_COMPILE_STDCXX_11([noext])])
+
+ # ===============
+ # Find librevenge
+@@ -138,8 +138,8 @@ AC_SUBST([GLM_CFLAGS])
+ # =========
+ # Find mdds
+ # =========
+-AS_IF([test "$with_mdds" = "1.0"], [
+- PKG_CHECK_MODULES([MDDS], [mdds-1.0])
++AS_IF([test "$with_mdds" = "1.2"], [
++ PKG_CHECK_MODULES([MDDS], [mdds-1.2])
+ ], [
+ PKG_CHECK_MODULES([MDDS], [mdds])
+ AC_MSG_CHECKING([checking if mdds::flat_segment_tree can store values of any type])
diff --git a/app-text/libetonyek/libetonyek-0.1.6.ebuild b/app-text/libetonyek/libetonyek-0.1.6.ebuild
index 5dd6084..b4a4e5b 100644
--- a/app-text/libetonyek/libetonyek-0.1.6.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.6.ebuild
@@ -5,8 +5,8 @@
EAPI=6
EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libetonyek"
-inherit eutils
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
+inherit autotools eutils
+[[ ${PV} == 9999 ]] && inherit git-r3
DESCRIPTION="Library parsing Apple Keynote presentations"
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
@@ -26,7 +26,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
dev-libs/boost
- dev-util/mdds:1
+ >=dev-util/mdds-1.2.0:1
media-libs/glm
sys-devel/libtool
virtual/pkgconfig
@@ -34,6 +34,8 @@ DEPEND="${RDEPEND}
test? ( dev-util/cppunit )
"
+PATCHES=( "${FILESDIR}/${P}-mdds-1.2.patch" ) # patch taken from Debian
+
pkg_pretend() {
if [[ $(gcc-major-version) -lt 4 ]] || {
[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]]; }
@@ -44,9 +46,9 @@ pkg_pretend() {
}
src_prepare() {
- eapply_user
+ default
[[ -d m4 ]] || mkdir "m4"
- [[ ${PV} == 9999 ]] && eautoreconf
+ eautoreconf
}
src_configure() {
diff --git a/app-text/libetonyek/libetonyek-9999.ebuild b/app-text/libetonyek/libetonyek-9999.ebuild
index 71de234..3aa7b1e 100644
--- a/app-text/libetonyek/libetonyek-9999.ebuild
+++ b/app-text/libetonyek/libetonyek-9999.ebuild
@@ -44,7 +44,7 @@ pkg_pretend() {
}
src_prepare() {
- eapply_user
+ default
[[ -d m4 ]] || mkdir "m4"
[[ ${PV} == 9999 ]] && eautoreconf
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/libetonyek/, app-text/libetonyek/files/
@ 2016-07-03 20:27 Andreas Hüttel
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Hüttel @ 2016-07-03 20:27 UTC (permalink / raw
To: gentoo-commits
commit: 9dbaba3637a5b6395a2ab18c4687b88d2802c286
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jun 5 10:06:49 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jul 3 20:27:41 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dbaba36
app-text/libetonyek: Drop old
Package-Manager: portage-2.2.28
app-text/libetonyek/Manifest | 1 -
.../libetonyek/files/libetonyek-0.0.3-comma.patch | 11 ----
.../files/libetonyek-0.0.3-lexical_cast.patch | 56 --------------------
app-text/libetonyek/libetonyek-0.0.3.ebuild | 59 ----------------------
4 files changed, 127 deletions(-)
diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index c70916d..c057d31 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -1,3 +1,2 @@
-DIST libetonyek-0.0.3.tar.xz 341276 SHA256 b5b96cd0857fc9a740d6ec737d613d95e9524103b9ab5a15bb6e645621d943e6 SHA512 9d60170e4404582e29bc3f04c4389f37fa6d1aedb2bf5f90fbc47230a02f184237cd3f49f8f578ccf92e2b28a84dd438a63f8e0c219697e15df3d47c86954a55 WHIRLPOOL 2a1334edd7843b0a8c05f04a9613fc7a580c93385f729d397224004ea07a417c6601e4295558b610a0a0458cf2d9ccd4b8d346d74d28caa490f61e59987471f1
DIST libetonyek-0.1.3.tar.xz 372884 SHA256 fe12276a62bd5f5ca4f5bfbd4938a74d097084e1f9fe173e521f63203f56f055 SHA512 912cb94e6cd63a162a8831368f953c4e6fb14b582a13a7ce93c0bcbb63b688fcbe4733dbb883d6a9faee2011ca5e888d00adda075c2a58d00858770ed68d6844 WHIRLPOOL 5fe864e37f6611c8cda92243a13e08e38ce1fd6f9544ddee7d3392fa9bfe573cd9af6ddd0ff03c7a0cee19b63c46b96398d985eaeb7367cd06aac8796d3655b8
DIST libetonyek-0.1.6.tar.xz 1243364 SHA256 df54271492070fbcc6aad9f81ca89658b25dd106cc4ab6b04b067b7a43dcc078 SHA512 10ae0403d98f33b27be4c3c905dec3df48cc01ce438f8760298edeadb76dd74da997edbd7dc03635fbc168b318bfe6e130f2306f495dfbf4135dd6dfcccabb4e WHIRLPOOL 932704f1d8bb1269e6be8e3fd7bd64af01ba0f098272befc747da9a4bd225bb201542bebf31d6e6338e613835fca4d7c6e2c1454df4ed764af30459393b6d73b
diff --git a/app-text/libetonyek/files/libetonyek-0.0.3-comma.patch b/app-text/libetonyek/files/libetonyek-0.0.3-comma.patch
deleted file mode 100644
index 1504acc..0000000
--- a/app-text/libetonyek/files/libetonyek-0.0.3-comma.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libetonyek-0.0.3/src/lib/KEYEnum.h 2013-12-06 09:40:36.000000000 +0100
-+++ libetonyek-0.0.3/src/lib/KEYEnum.h 2013-12-15 06:21:26.372083749 +0100
-@@ -33,7 +33,7 @@
- KEY_CAPITALIZATION_NONE,
- KEY_CAPITALIZATION_ALL_CAPS,
- KEY_CAPITALIZATION_SMALL_CAPS,
-- KEY_CAPITALIZATION_TITLE,
-+ KEY_CAPITALIZATION_TITLE
- };
-
- }
diff --git a/app-text/libetonyek/files/libetonyek-0.0.3-lexical_cast.patch b/app-text/libetonyek/files/libetonyek-0.0.3-lexical_cast.patch
deleted file mode 100644
index 19a5aea..0000000
--- a/app-text/libetonyek/files/libetonyek-0.0.3-lexical_cast.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- libetonyek-0.0.3/src/lib/KEY2ParserUtils.cpp 2013-12-01 21:44:51.000000000 +0100
-+++ libetonyek-0.0.3/src/lib/KEY2ParserUtils.cpp 2013-12-15 06:53:07.474721349 +0100
-@@ -125,7 +125,7 @@
- return KEYSize(size.second, size.first);
- }
-
--bool KEY2ParserUtils::bool_cast(const char *const value)
-+bool KEY2ParserUtils::bool_cast(const char *value)
- {
- KEY2Tokenizer tok;
- switch (tok(value))
-@@ -142,6 +142,16 @@
- return false;
- }
-
-+double KEY2ParserUtils::double_cast(const char *value)
-+{
-+ return lexical_cast<double, const char *>(value);
-+}
-+
-+int KEY2ParserUtils::int_cast(const char *value)
-+{
-+ return lexical_cast<int, const char *>(value);
-+}
-+
- double KEY2ParserUtils::deg2rad(double value)
- {
- // normalize range
---- libetonyek-0.0.3/src/lib/KEY2ParserUtils.h 2013-10-30 22:04:38.000000000 +0100
-+++ libetonyek-0.0.3/src/lib/KEY2ParserUtils.h 2013-12-15 06:50:40.296884951 +0100
-@@ -81,6 +81,8 @@
- * @returns the boolean value of the string
- */
- static bool bool_cast(const char *value);
-+ static double double_cast(const char *value);
-+ static int int_cast(const char *value);
-
- static double deg2rad(double value);
-
---- libetonyek-0.0.3/src/lib/KEY2StyleParser.cpp 2013-12-06 10:36:13.000000000 +0100
-+++ libetonyek-0.0.3/src/lib/KEY2StyleParser.cpp 2013-12-15 06:53:45.353451061 +0100
-@@ -62,12 +62,12 @@
-
- optional<double> readDouble(const KEYXMLReader &reader)
- {
-- return readNumber<double>(reader, KEY2Token::f, &lexical_cast<double, const char *>);
-+ return readNumber<double>(reader, KEY2Token::f, &KEY2ParserUtils::double_cast);
- }
-
- optional<int> readInt(const KEYXMLReader &reader)
- {
-- return readNumber<int>(reader, KEY2Token::i, &lexical_cast<int, const char *>);
-+ return readNumber<int>(reader, KEY2Token::i, &KEY2ParserUtils::double_cast);
- }
-
- optional<KEYColor> readColor(const KEYXMLReader &reader)
diff --git a/app-text/libetonyek/libetonyek-0.0.3.ebuild b/app-text/libetonyek/libetonyek-0.0.3.ebuild
deleted file mode 100644
index b125b75..0000000
--- a/app-text/libetonyek/libetonyek-0.0.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libetonyek"
-inherit base eutils
-[[ ${PV} == 9999 ]] && inherit autotools git-2
-
-DESCRIPTION="Library parsing Apple Keynote presentations"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libetonyek"
-[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="doc static-libs test"
-
-RDEPEND="
- app-text/libwpd:0.9
- dev-libs/boost:=
- dev-libs/libxml2
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}
- >=dev-libs/boost-1.46
- dev-util/gperf
- sys-devel/libtool
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- test? ( dev-util/cppunit )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-comma.patch"
- "${FILESDIR}/${P}-lexical_cast.patch"
-)
-
-src_prepare() {
- [[ -d m4 ]] || mkdir "m4"
- base_src_prepare
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- $(use_enable static-libs static) \
- --disable-werror \
- $(use_enable test tests) \
- $(use_with doc docs)
-}
-
-src_install() {
- default
- prune_libtool_files --all
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/libetonyek/, app-text/libetonyek/files/
@ 2016-11-05 21:00 Andreas Hüttel
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Hüttel @ 2016-11-05 21:00 UTC (permalink / raw
To: gentoo-commits
commit: 7879d7b792884b295c9bff2c4858521e78c20041
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Oct 22 09:26:58 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Nov 5 21:00:48 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7879d7b7
app-text/libetonyek: Fix tests
Gentoo-bug: 595022
Package-Manager: portage-2.3.0
.../files/libetonyek-0.1.6-drop-test.patch | 36 ++++++++++++++++++++++
.../files/libetonyek-0.1.6-mdds-1.2.patch | 6 ++--
app-text/libetonyek/libetonyek-0.1.6.ebuild | 5 ++-
3 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/app-text/libetonyek/files/libetonyek-0.1.6-drop-test.patch b/app-text/libetonyek/files/libetonyek-0.1.6-drop-test.patch
new file mode 100644
index 00000000..a868f79
--- /dev/null
+++ b/app-text/libetonyek/files/libetonyek-0.1.6-drop-test.patch
@@ -0,0 +1,36 @@
+From 1a20d8ece2ea3e8aa1d319cd88e8a6aa637982f2 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Fri, 30 Sep 2016 09:57:15 +0200
+Subject: [PATCH] drop test that violates Unicode tr#35
+
+(and therefore fails with latest liblangtag)
+
+Change-Id: I0e06c6c4e8bcf999cf5559d6287e77ae97e555d8
+---
+ src/test/IWORKLanguageManagerTest.cpp | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/src/test/IWORKLanguageManagerTest.cpp b/src/test/IWORKLanguageManagerTest.cpp
+index 8fca0a6..e663bd2 100644
+--- a/src/test/IWORKLanguageManagerTest.cpp
++++ b/src/test/IWORKLanguageManagerTest.cpp
+@@ -104,16 +104,6 @@ void IWORKLanguageManagerTest::testTagToProps()
+ }
+
+ {
+- const string tag(mgr.addTag("ccc"));
+- CPPUNIT_ASSERT(!tag.empty());
+- RVNGPropertyList props;
+- mgr.writeProperties(tag, props);
+- assertProperty("unknown lang", props, "fo:language", "ccc");
+- CPPUNIT_ASSERT(!props["fo:country"]);
+- CPPUNIT_ASSERT(!props["fo:script"]);
+- }
+-
+- {
+ // invalid tag
+ const string tag(mgr.addTag("13c"));
+ CPPUNIT_ASSERT(tag.empty());
+--
+1.7.9.5
+
diff --git a/app-text/libetonyek/files/libetonyek-0.1.6-mdds-1.2.patch b/app-text/libetonyek/files/libetonyek-0.1.6-mdds-1.2.patch
index 0ca085f..7a3f22e 100644
--- a/app-text/libetonyek/files/libetonyek-0.1.6-mdds-1.2.patch
+++ b/app-text/libetonyek/files/libetonyek-0.1.6-mdds-1.2.patch
@@ -16,7 +16,7 @@
AM_MISSING_PROG([GPERF], [gperf])
-AS_IF([test "$with_mdds" = "1.0"], [AX_CXX_COMPILE_STDCXX_11([noext])])
-+AS_IF([test "$with_mdds" = "1.2"], [AX_CXX_COMPILE_STDCXX_11([noext])])
++AS_IF([test "$with_mdds" != "0.x"], [AX_CXX_COMPILE_STDCXX_11([noext])])
# ===============
# Find librevenge
@@ -26,8 +26,8 @@
# =========
-AS_IF([test "$with_mdds" = "1.0"], [
- PKG_CHECK_MODULES([MDDS], [mdds-1.0])
-+AS_IF([test "$with_mdds" = "1.2"], [
-+ PKG_CHECK_MODULES([MDDS], [mdds-1.2])
++AS_IF([test "$with_mdds" != "0.x"], [
++ PKG_CHECK_MODULES([MDDS], [mdds-][$with_mdds])
], [
PKG_CHECK_MODULES([MDDS], [mdds])
AC_MSG_CHECKING([checking if mdds::flat_segment_tree can store values of any type])
diff --git a/app-text/libetonyek/libetonyek-0.1.6.ebuild b/app-text/libetonyek/libetonyek-0.1.6.ebuild
index b4a4e5b..5990e49 100644
--- a/app-text/libetonyek/libetonyek-0.1.6.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.6.ebuild
@@ -34,7 +34,10 @@ DEPEND="${RDEPEND}
test? ( dev-util/cppunit )
"
-PATCHES=( "${FILESDIR}/${P}-mdds-1.2.patch" ) # patch taken from Debian
+PATCHES=(
+ "${FILESDIR}/${P}-mdds-1.2.patch" # patch taken from Debian
+ "${FILESDIR}/${P}-drop-test.patch" # bug 595022
+)
pkg_pretend() {
if [[ $(gcc-major-version) -lt 4 ]] || {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/libetonyek/, app-text/libetonyek/files/
@ 2017-12-29 23:06 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2017-12-29 23:06 UTC (permalink / raw
To: gentoo-commits
commit: acbe4316231926c4db73137e3dc649186918b74e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 22:37:34 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 23:04:56 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acbe4316
app-text/libetonyek: Drop 0.1.6
Package-Manager: Portage-2.3.19, Repoman-2.3.6
app-text/libetonyek/Manifest | 1 -
.../files/libetonyek-0.1.6-drop-test.patch | 36 ------------
.../files/libetonyek-0.1.6-mdds-1.2.patch | 33 -----------
app-text/libetonyek/libetonyek-0.1.6.ebuild | 67 ----------------------
4 files changed, 137 deletions(-)
diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index 107b3e03588..44f94a3f6d8 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -1,2 +1 @@
-DIST libetonyek-0.1.6.tar.xz 1243364 BLAKE2B 00f11e91ab8b82fc2bffa00df48f2b553b922391047c8345dcbbd7a0d51fba54828bdc9bd9d1f36e66d63cbb10414784a36697d2a8eacd716663ea7fee57843c SHA512 10ae0403d98f33b27be4c3c905dec3df48cc01ce438f8760298edeadb76dd74da997edbd7dc03635fbc168b318bfe6e130f2306f495dfbf4135dd6dfcccabb4e
DIST libetonyek-0.1.7.tar.xz 1256232 BLAKE2B ef2abcc427014d515a75ff75d90a78da0b5b28d54b5de3793540e8448f163da0b6d3ff4026373ffc3a4973d3e0e4fee280e75a77407620b3ba0e833bd7d8c82a SHA512 bec4819e161f68b7315567464bfe9e0259a59822a7926c54208cceb04061664a1220716539816a24a6f259eac6f7063c72750aaaf8d8886e3bfb0c4d5f1e0b0f
diff --git a/app-text/libetonyek/files/libetonyek-0.1.6-drop-test.patch b/app-text/libetonyek/files/libetonyek-0.1.6-drop-test.patch
deleted file mode 100644
index a868f797484..00000000000
--- a/app-text/libetonyek/files/libetonyek-0.1.6-drop-test.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 1a20d8ece2ea3e8aa1d319cd88e8a6aa637982f2 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Fri, 30 Sep 2016 09:57:15 +0200
-Subject: [PATCH] drop test that violates Unicode tr#35
-
-(and therefore fails with latest liblangtag)
-
-Change-Id: I0e06c6c4e8bcf999cf5559d6287e77ae97e555d8
----
- src/test/IWORKLanguageManagerTest.cpp | 10 ----------
- 1 file changed, 10 deletions(-)
-
-diff --git a/src/test/IWORKLanguageManagerTest.cpp b/src/test/IWORKLanguageManagerTest.cpp
-index 8fca0a6..e663bd2 100644
---- a/src/test/IWORKLanguageManagerTest.cpp
-+++ b/src/test/IWORKLanguageManagerTest.cpp
-@@ -104,16 +104,6 @@ void IWORKLanguageManagerTest::testTagToProps()
- }
-
- {
-- const string tag(mgr.addTag("ccc"));
-- CPPUNIT_ASSERT(!tag.empty());
-- RVNGPropertyList props;
-- mgr.writeProperties(tag, props);
-- assertProperty("unknown lang", props, "fo:language", "ccc");
-- CPPUNIT_ASSERT(!props["fo:country"]);
-- CPPUNIT_ASSERT(!props["fo:script"]);
-- }
--
-- {
- // invalid tag
- const string tag(mgr.addTag("13c"));
- CPPUNIT_ASSERT(tag.empty());
---
-1.7.9.5
-
diff --git a/app-text/libetonyek/files/libetonyek-0.1.6-mdds-1.2.patch b/app-text/libetonyek/files/libetonyek-0.1.6-mdds-1.2.patch
deleted file mode 100644
index 7a3f22e94c2..00000000000
--- a/app-text/libetonyek/files/libetonyek-0.1.6-mdds-1.2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- libetonyek-0.1.6/configure.ac
-+++ libetonyek-0.1.6/configure.ac
-@@ -24,8 +24,8 @@ AC_LANG([C++])
- # Configure options
- # =================
- AC_ARG_WITH([mdds],
-- AS_HELP_STRING([--with-mdds=1.0|0.x], [Specify which version of mdds to use (1.0 is the default)]),
-- [], [with_mdds="1.0"])
-+ AS_HELP_STRING([--with-mdds=1.2|0.x], [Specify which version of mdds to use (1.2 is the default)]),
-+ [], [with_mdds="1.2"])
-
- # ===========================
- # Find required base packages
-@@ -47,7 +47,7 @@ AC_PROG_SED
-
- AM_MISSING_PROG([GPERF], [gperf])
-
--AS_IF([test "$with_mdds" = "1.0"], [AX_CXX_COMPILE_STDCXX_11([noext])])
-+AS_IF([test "$with_mdds" != "0.x"], [AX_CXX_COMPILE_STDCXX_11([noext])])
-
- # ===============
- # Find librevenge
-@@ -138,8 +138,8 @@ AC_SUBST([GLM_CFLAGS])
- # =========
- # Find mdds
- # =========
--AS_IF([test "$with_mdds" = "1.0"], [
-- PKG_CHECK_MODULES([MDDS], [mdds-1.0])
-+AS_IF([test "$with_mdds" != "0.x"], [
-+ PKG_CHECK_MODULES([MDDS], [mdds-][$with_mdds])
- ], [
- PKG_CHECK_MODULES([MDDS], [mdds])
- AC_MSG_CHECKING([checking if mdds::flat_segment_tree can store values of any type])
diff --git a/app-text/libetonyek/libetonyek-0.1.6.ebuild b/app-text/libetonyek/libetonyek-0.1.6.ebuild
deleted file mode 100644
index e73685fed27..00000000000
--- a/app-text/libetonyek/libetonyek-0.1.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
-inherit autotools
-[[ ${PV} == 9999 ]] && inherit git-r3
-
-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 x86"
-IUSE="doc static-libs test"
-
-RDEPEND="
- >=app-text/liblangtag-0.5
- dev-libs/librevenge
- dev-libs/libxml2
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}
- dev-libs/boost
- >=dev-util/mdds-1.2.0:1
- media-libs/glm
- sys-devel/libtool
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- test? ( dev-util/cppunit )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-mdds-1.2.patch" # patch taken from Debian
- "${FILESDIR}/${P}-drop-test.patch" # bug 595022
-)
-
-pkg_pretend() {
- if [[ $(gcc-major-version) -lt 4 ]] || {
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]]; }
- then
- eerror "Compilation with gcc older than 4.8 is not supported"
- die "Too old gcc found."
- fi
-}
-
-src_prepare() {
- default
- [[ -d m4 ]] || mkdir "m4"
- eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-werror \
- $(use_with doc docs) \
- $(use_enable static-libs static) \
- $(use_enable test tests)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/libetonyek/, app-text/libetonyek/files/
@ 2018-10-04 8:49 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-10-04 8:49 UTC (permalink / raw
To: gentoo-commits
commit: be2d783f73499a2dc70660923a08eed98de1ed4b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 4 08:48:25 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 4 08:49:00 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be2d783f
app-text/libetonyek: EAPI-7 bump, sddm handling, minor upstream fixes
Closes: https://bugs.gentoo.org/667690
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
.../files/libetonyek-0.1.8-no-parentheses.patch | 29 ++++++++++
.../files/libetonyek-0.1.8-typo-fix.patch | 28 ++++++++++
app-text/libetonyek/libetonyek-0.1.8-r1.ebuild | 63 ++++++++++++++++++++++
3 files changed, 120 insertions(+)
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 00000000000..e13fe5f31ce
--- /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 00000000000..32593fed480
--- /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 00000000000..2d13eaf89aa
--- /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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-10-04 8:49 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-07 14:57 [gentoo-commits] repo/gentoo:master commit in: app-text/libetonyek/, app-text/libetonyek/files/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2016-07-03 20:27 Andreas Hüttel
2016-11-05 21:00 Andreas Hüttel
2017-12-29 23:06 Andreas Sturmlechner
2018-10-04 8:49 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox