[gentoo-commits] repo/gentoo:master commit in: app-text/libmwaw/, app-text/libmwaw/files/

[gentoo-commits] repo/gentoo:master commit in: app-text/libmwaw/, app-text/libmwaw/files/

[Andreas Sturmlechner]

commit:     f4f32f600bdc3834c3ec16b07f6989e75f74c6dc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 18 10:51:53 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 18 10:51:53 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4f32f60

app-text/libmwaw: Add upstream buildfix

Reported-by: Coacher <itumaykin+gentoo <AT> gmail.com>
Thanks-to: Shannon <roamingangel <AT> gmail.com>
Closes: https://bugs.gentoo.org/637692
Package-Manager: Portage-2.3.14, Repoman-2.3.6

 app-text/libmwaw/files/libmwaw-0.3.13-buildfix.patch | 19 +++++++++++++++++++
 app-text/libmwaw/libmwaw-0.3.13.ebuild               |  2 ++
 2 files changed, 21 insertions(+)

diff --git a/app-text/libmwaw/files/libmwaw-0.3.13-buildfix.patch b/app-text/libmwaw/files/libmwaw-0.3.13-buildfix.patch
new file mode 100644
index 00000000000..5c9940e8860
--- /dev/null
+++ b/app-text/libmwaw/files/libmwaw-0.3.13-buildfix.patch
@@ -0,0 +1,19 @@
+commit 4bc8ec0481f89b989b0c34236c9d5d9b8038d4a9
+Author: David Tardon <dtardon@redhat.com>
+Date:   Wed Nov 15 13:15:44 2017 +0100
+
+    fix call of explicit ctor
+
+diff --git a/src/lib/libmwaw_internal.hxx b/src/lib/libmwaw_internal.hxx
+index 2875a0fb..b844a9d5 100644
+--- a/src/lib/libmwaw_internal.hxx
++++ b/src/lib/libmwaw_internal.hxx
+@@ -1027,7 +1027,7 @@ public:
+   }
+   //! generic constructor
+   template <class U> explicit MWAWBox2(MWAWBox2<U> const &p)
+-    : m_data(p.min(), p.max())
++    : m_data(MWAWVec2<T>(p.min()), MWAWVec2<T>(p.max()))
+   {
+   }
+ 

diff --git a/app-text/libmwaw/libmwaw-0.3.13.ebuild b/app-text/libmwaw/libmwaw-0.3.13.ebuild
index 0b26fe70b82..bd2d4558930 100644
--- a/app-text/libmwaw/libmwaw-0.3.13.ebuild
+++ b/app-text/libmwaw/libmwaw-0.3.13.ebuild
@@ -28,6 +28,8 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 "
 
+PATCHES=( "${FILESDIR}/${P}-buildfix.patch" )
+
 src_prepare() {
 	default
 	[[ ${PV} == 9999 ]] && eautoreconf

[gentoo-commits] repo/gentoo:master commit in: app-text/libmwaw/, app-text/libmwaw/files/

[Andreas Sturmlechner]

commit:     265e738ca30aa6d0749d2cb508891ca81bf83f6c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 29 08:43:15 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 29 10:49:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=265e738c

app-text/libmwaw: Drop 0.3.13

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 app-text/libmwaw/Manifest                          |  1 -
 .../libmwaw/files/libmwaw-0.3.13-buildfix.patch    | 19 --------
 app-text/libmwaw/libmwaw-0.3.13.ebuild             | 51 ----------------------
 3 files changed, 71 deletions(-)

diff --git a/app-text/libmwaw/Manifest b/app-text/libmwaw/Manifest
index c21376e0610..9bcbbf81b78 100644
--- a/app-text/libmwaw/Manifest
+++ b/app-text/libmwaw/Manifest
@@ -1,2 +1 @@
-DIST libmwaw-0.3.13.tar.xz 1258220 BLAKE2B 79cb4d8a91d361ceae70fa7a0145fa9f5e230bbafba1b0a586b10a1375e34511769d2a5d6b8ba9b6b9676a3cffc9ae6d22529a1920ed4bf932ef7e88ca7bae0c SHA512 3d6a5142cc45f6519ac29f935c01418278ed4cc1bdcb0ecb1a190309c43d3f7ee06deab519d29a3e2aec01ef091cb4f4c17809662640b54a8e4fe8d4bd8db5f3
 DIST libmwaw-0.3.14.tar.xz 1276240 BLAKE2B 34a5b118064dcac37834c83b2b5a61303f3e2eb70e41322845ff7661a5494c0b85db0bb07c6bf1f357c2027cab1c515eade58bb6b4fdf845a81d4d079a414b98 SHA512 6893a7a8a72765a66973a94bc7de8b3b6061aa85fd9cca5e73cb2a4024cbe81f0c030df0b6383f24835643259c361efda5527813bb84a1b08d0089d509215888

diff --git a/app-text/libmwaw/files/libmwaw-0.3.13-buildfix.patch b/app-text/libmwaw/files/libmwaw-0.3.13-buildfix.patch
deleted file mode 100644
index 5c9940e8860..00000000000
--- a/app-text/libmwaw/files/libmwaw-0.3.13-buildfix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 4bc8ec0481f89b989b0c34236c9d5d9b8038d4a9
-Author: David Tardon <dtardon@redhat.com>
-Date:   Wed Nov 15 13:15:44 2017 +0100
-
-    fix call of explicit ctor
-
-diff --git a/src/lib/libmwaw_internal.hxx b/src/lib/libmwaw_internal.hxx
-index 2875a0fb..b844a9d5 100644
---- a/src/lib/libmwaw_internal.hxx
-+++ b/src/lib/libmwaw_internal.hxx
-@@ -1027,7 +1027,7 @@ public:
-   }
-   //! generic constructor
-   template <class U> explicit MWAWBox2(MWAWBox2<U> const &p)
--    : m_data(p.min(), p.max())
-+    : m_data(MWAWVec2<T>(p.min()), MWAWVec2<T>(p.max()))
-   {
-   }
- 

diff --git a/app-text/libmwaw/libmwaw-0.3.13.ebuild b/app-text/libmwaw/libmwaw-0.3.13.ebuild
deleted file mode 100644
index 7fe40d2eb2b..00000000000
--- a/app-text/libmwaw/libmwaw-0.3.13.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="git://git.code.sf.net/p/libmwaw/libmwaw"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
-DESCRIPTION="Library parsing many pre-OSX MAC text formats"
-HOMEPAGE="https://sourceforge.net/p/libmwaw/wiki/Home/"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-IUSE="doc static-libs tools"
-
-RDEPEND="
-	dev-libs/librevenge
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-PATCHES=( "${FILESDIR}/${P}-buildfix.patch" )
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	# zip is hard enabled as the zlib is dep on the rdeps anyway
-	econf \
-		--enable-zip \
-		--disable-werror \
-		$(use_with doc docs) \
-		$(use_enable static-libs static) \
-		$(use_enable tools)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}