diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-29 03:22:09 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-29 03:22:09 +0100 |
| commit | d4bd6695641f6d2ec7ff8681913d304e995902f5 (patch) | |
| tree | 6ec8d4c38152bb4f2bb4b93277236ebd9fbbd21d /app-text/wv2 | |
| parent | 22910f5d14da606bd7f06e19a2f61c5d1a8fc94b (diff) | |
gentoo resync : 29.05.2018
Diffstat (limited to 'app-text/wv2')
| -rw-r--r-- | app-text/wv2/Manifest | 6 | ||||
| -rw-r--r-- | app-text/wv2/files/wv2-0.4.2-glib.patch | 4 | ||||
| -rw-r--r-- | app-text/wv2/files/wv2-0.4.2-libgsf.patch | 4 | ||||
| -rw-r--r-- | app-text/wv2/wv2-0.4.2-r2.ebuild | 26 |
4 files changed, 22 insertions, 18 deletions
diff --git a/app-text/wv2/Manifest b/app-text/wv2/Manifest index f0cc85e0f276..4cacd3eedbf9 100644 --- a/app-text/wv2/Manifest +++ b/app-text/wv2/Manifest @@ -1,5 +1,5 @@ -AUX wv2-0.4.2-glib.patch 308 BLAKE2B c75e7a2ea589a4a010110f47c12d21cbafccbdaad9a4d7737977529168ee5f3cc9e9f39b4d000e55f1f38a2cf45799b2c43d27594faa45ea7ce0660f8d28a279 SHA512 4d6aabb5857ccc16b93bc2e21469eaa85a3726f53035439da0c7fab8f86d0d5f4b56de41a7a693ece3af72527b3cddf155b6f6e798f562bb0af1cb0083003c86 -AUX wv2-0.4.2-libgsf.patch 421 BLAKE2B f24424964172016e806d589fdf5ee2b3e4c85bb97f70e58e181eb40382d8caf86998c2a4062911daa10bdc46126f9fce9f20f964b27817ba3c892fbdc76fa219 SHA512 ff42d9fb5191d1e384094f000380bf49cfde89a5f95c9962b0dc02ba226a58e7b47491af317cb2287fdb7d99587352e774a1f2ed8025fa708d0dac0649b6c8e1 +AUX wv2-0.4.2-glib.patch 312 BLAKE2B 7c68aff28688cf4ad7ee99c73d4509197e958bf05fc6dc8a556e2c2376cd586942778dcb8cbb1aa1a80cf24b1ab94415224b5af122756eeae02a316464eb6323 SHA512 0dfa6f75d9c117869eff3c4c5aadaf6096af8b2239626fc249a3df3ddb5437c417c3265a0a5d956af2241c9d7b3cc137b6c79598c38506fedd2964e85bcf54ea +AUX wv2-0.4.2-libgsf.patch 425 BLAKE2B 417d6b340c34dffee0301308ee5a04f4468a5627670638399535f7336cca7515927392e66dd723e8a13742e71ccb1bf850c7b91608b7f280b545a707d6425a2d SHA512 634b1a336506777f8976b81cd906f8a896e2b777a3f04c5791277ed5ca2856dacb71adab807efecdf29d07c02e4c95b5d6fe143b1660be77e37ed9d7bd177143 DIST wv2-0.4.2.tar.bz2 452759 BLAKE2B 6134739459617189f9d4e11a660dac25114b5d329b43d02fffe773d25bf62f2eb9f4ccb2712016e670c72f089a6d48f764e99b0ce5d44554d3e9d69ea9e14762 SHA512 7b4fb1dc6aa05da52ea169bf13f3bb544a7a896cf9127b6d67a08e991d798e81e2bf65724cf9396a9b89902f7856007006d8b123fcaaccce77e2a4668a9c9d5b -EBUILD wv2-0.4.2-r2.ebuild 753 BLAKE2B 91de67ad22faa927ef5de81ae867bcbc1e58822a4ee4acf0f125f6595a4f76eaa0d437a5ae7ce117aa21ebdb447a8f213ccf2306995851b0542f7aa05e944300 SHA512 7a4d2a89d7cf2183d2ccc51f06516783d18f3397682261f24dbb3146aab43570dfadb67c69eeaed888082b8f488ce9f21a85790716ad3638b9f73678beba5d82 +EBUILD wv2-0.4.2-r2.ebuild 831 BLAKE2B a8829c7340d953d9b6329837956f2639936a5bf33c6f88b4937fda6bc0f115c24bf8ad96de3046a41b40db3bea124a2ea436944f07e504d352afc605536f6dd1 SHA512 ee2dc6db1c3302a6938157bccb9bddf3d77ef571a5e10907a2832af93fb6452d8668489c648a7d9b26705b01936f63113b52a69629c44ae4d03159ca70f2ae21 MISC metadata.xml 394 BLAKE2B 33e5bd22439c91b6c6ae5f1cd67ed2419fd44f90a6f4dad26247d3b57ad3f46ff85a7dde13ecd1d4f859fdd08c87a8a836add617f05a8fe586579189c6df1c1f SHA512 abdccf92962c57c2c206a32eab8e855467874b3e17e8f1fc5db8d84b4c368fd005d3cee9e4bac28bd775aff4e9bd9319d61dc1c0e47492c2c531b41b33a4e4f2 diff --git a/app-text/wv2/files/wv2-0.4.2-glib.patch b/app-text/wv2/files/wv2-0.4.2-glib.patch index 66fde790d0bc..eaa2a61fc66a 100644 --- a/app-text/wv2/files/wv2-0.4.2-glib.patch +++ b/app-text/wv2/files/wv2-0.4.2-glib.patch @@ -1,6 +1,6 @@ From: https://sourceforge.net/tracker/?func=detail&aid=3544851&group_id=10501&atid=110501 ---- src/olestream.h -+++ src/olestream.h +--- a/src/olestream.h ++++ b/src/olestream.h @@ -23,7 +23,7 @@ #include "global.h" // U8,... typedefs #include <stack> diff --git a/app-text/wv2/files/wv2-0.4.2-libgsf.patch b/app-text/wv2/files/wv2-0.4.2-libgsf.patch index 2367c24aad0b..efbf02f57525 100644 --- a/app-text/wv2/files/wv2-0.4.2-libgsf.patch +++ b/app-text/wv2/files/wv2-0.4.2-libgsf.patch @@ -1,7 +1,7 @@ http://bugs.gentoo.org/show_bug.cgi?id=465882 ---- CMakeLists.txt -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -34,7 +34,7 @@ FIND_PACKAGE( ZLIB REQUIRED ) ENDIF( WITH_ZLIB ) diff --git a/app-text/wv2/wv2-0.4.2-r2.ebuild b/app-text/wv2/wv2-0.4.2-r2.ebuild index b13fed4fecb8..5f5d76cee7ef 100644 --- a/app-text/wv2/wv2-0.4.2-r2.ebuild +++ b/app-text/wv2/wv2-0.4.2-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -inherit cmake-utils +inherit cmake-utils flag-o-matic DESCRIPTION="Excellent MS Word filter lib, used in most Office suites" HOMEPAGE="http://wvware.sourceforge.net" @@ -14,22 +14,26 @@ SLOT="0" KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE="zlib" -RDEPEND="dev-libs/glib +RDEPEND=" + dev-libs/glib >=gnome-extra/libgsf-1.8:= virtual/libiconv - zlib? ( sys-libs/zlib ) -" -DEPEND="${RDEPEND}" + zlib? ( sys-libs/zlib )" +DEPEND=" + ${RDEPEND}" -DOCS=( AUTHORS ChangeLog README RELEASE THANKS TODO ) PATCHES=( - "${FILESDIR}/${P}-glib.patch" - "${FILESDIR}/${P}-libgsf.patch" + "${FILESDIR}"/${P}-glib.patch + "${FILESDIR}"/${P}-libgsf.patch ) +DOCS=( AUTHORS ChangeLog README RELEASE THANKS TODO ) src_configure() { + # due to ICU 59 requiring C++11 now + append-cxxflags -std=c++11 + local mycmakeargs=( - $(cmake-utils_use_with zlib) + -DWITH_ZLIB=$(usex zlib) ) cmake-utils_src_configure } |