| 1 |
commit: 8e9a6eb1d1f91d17cb1db87bcf146a53c6877664 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 26 10:24:07 2018 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 26 10:42:40 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e9a6eb1 |
| 7 |
|
| 8 |
app-text/wv2: Force C++11 |
| 9 |
|
| 10 |
* Also port to EAPI 6 |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/653494 |
| 13 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 14 |
|
| 15 |
app-text/wv2/files/wv2-0.4.2-glib.patch | 4 ++-- |
| 16 |
app-text/wv2/files/wv2-0.4.2-libgsf.patch | 4 ++-- |
| 17 |
app-text/wv2/wv2-0.4.2-r2.ebuild | 26 +++++++++++++++----------- |
| 18 |
3 files changed, 19 insertions(+), 15 deletions(-) |
| 19 |
|
| 20 |
diff --git a/app-text/wv2/files/wv2-0.4.2-glib.patch b/app-text/wv2/files/wv2-0.4.2-glib.patch |
| 21 |
index 66fde790d0b..eaa2a61fc66 100644 |
| 22 |
--- a/app-text/wv2/files/wv2-0.4.2-glib.patch |
| 23 |
+++ b/app-text/wv2/files/wv2-0.4.2-glib.patch |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
From: https://sourceforge.net/tracker/?func=detail&aid=3544851&group_id=10501&atid=110501 |
| 26 |
---- src/olestream.h |
| 27 |
-+++ src/olestream.h |
| 28 |
+--- a/src/olestream.h |
| 29 |
++++ b/src/olestream.h |
| 30 |
@@ -23,7 +23,7 @@ |
| 31 |
#include "global.h" // U8,... typedefs |
| 32 |
#include <stack> |
| 33 |
|
| 34 |
diff --git a/app-text/wv2/files/wv2-0.4.2-libgsf.patch b/app-text/wv2/files/wv2-0.4.2-libgsf.patch |
| 35 |
index 2367c24aad0..efbf02f5752 100644 |
| 36 |
--- a/app-text/wv2/files/wv2-0.4.2-libgsf.patch |
| 37 |
+++ b/app-text/wv2/files/wv2-0.4.2-libgsf.patch |
| 38 |
@@ -1,7 +1,7 @@ |
| 39 |
http://bugs.gentoo.org/show_bug.cgi?id=465882 |
| 40 |
|
| 41 |
---- CMakeLists.txt |
| 42 |
-+++ CMakeLists.txt |
| 43 |
+--- a/CMakeLists.txt |
| 44 |
++++ b/CMakeLists.txt |
| 45 |
@@ -34,7 +34,7 @@ |
| 46 |
FIND_PACKAGE( ZLIB REQUIRED ) |
| 47 |
ENDIF( WITH_ZLIB ) |
| 48 |
|
| 49 |
diff --git a/app-text/wv2/wv2-0.4.2-r2.ebuild b/app-text/wv2/wv2-0.4.2-r2.ebuild |
| 50 |
index b13fed4fecb..5f5d76cee7e 100644 |
| 51 |
--- a/app-text/wv2/wv2-0.4.2-r2.ebuild |
| 52 |
+++ b/app-text/wv2/wv2-0.4.2-r2.ebuild |
| 53 |
@@ -1,9 +1,9 @@ |
| 54 |
-# Copyright 1999-2013 Gentoo Foundation |
| 55 |
+# Copyright 1999-2018 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
|
| 58 |
-EAPI=5 |
| 59 |
+EAPI=6 |
| 60 |
|
| 61 |
-inherit cmake-utils |
| 62 |
+inherit cmake-utils flag-o-matic |
| 63 |
|
| 64 |
DESCRIPTION="Excellent MS Word filter lib, used in most Office suites" |
| 65 |
HOMEPAGE="http://wvware.sourceforge.net" |
| 66 |
@@ -14,22 +14,26 @@ SLOT="0" |
| 67 |
KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" |
| 68 |
IUSE="zlib" |
| 69 |
|
| 70 |
-RDEPEND="dev-libs/glib |
| 71 |
+RDEPEND=" |
| 72 |
+ dev-libs/glib |
| 73 |
>=gnome-extra/libgsf-1.8:= |
| 74 |
virtual/libiconv |
| 75 |
- zlib? ( sys-libs/zlib ) |
| 76 |
-" |
| 77 |
-DEPEND="${RDEPEND}" |
| 78 |
+ zlib? ( sys-libs/zlib )" |
| 79 |
+DEPEND=" |
| 80 |
+ ${RDEPEND}" |
| 81 |
|
| 82 |
-DOCS=( AUTHORS ChangeLog README RELEASE THANKS TODO ) |
| 83 |
PATCHES=( |
| 84 |
- "${FILESDIR}/${P}-glib.patch" |
| 85 |
- "${FILESDIR}/${P}-libgsf.patch" |
| 86 |
+ "${FILESDIR}"/${P}-glib.patch |
| 87 |
+ "${FILESDIR}"/${P}-libgsf.patch |
| 88 |
) |
| 89 |
+DOCS=( AUTHORS ChangeLog README RELEASE THANKS TODO ) |
| 90 |
|
| 91 |
src_configure() { |
| 92 |
+ # due to ICU 59 requiring C++11 now |
| 93 |
+ append-cxxflags -std=c++11 |
| 94 |
+ |
| 95 |
local mycmakeargs=( |
| 96 |
- $(cmake-utils_use_with zlib) |
| 97 |
+ -DWITH_ZLIB=$(usex zlib) |
| 98 |
) |
| 99 |
cmake-utils_src_configure |
| 100 |
} |
Archives