commit:     5103e7291cb7793e596668ccb2297026a17e5f2b
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  9 16:04:38 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Jun  9 16:04:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5103e729

app-office/abiword: Fix for recent versions of dev-cpp/asio

Closes: https://bugs.gentoo.org/723442
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 app-office/abiword/Manifest             | 2 +-
 app-office/abiword/abiword-3.0.4.ebuild | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index 4d9271ca694..1256d58a97c 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,2 +1,2 @@
-DIST abiword-3.0.4-patchset.tar.gz 9143 BLAKE2B 
143faaceab5e4a295876c04e26f38506429566cb9f42b0d41dfc4e40822b3cab647b128abe71da554cc12ac977987afbad131d7220dabeb1d10a28cc34592b35
 SHA512 
9fcf91d28402b9353d59ffb61aaeedce9d4e1be566eac05dc89866a0b0a5d5314c9ca030234b0c6514f35baab5b96fdf8cb63cf9d1d2cbcf01bd7adee89cecaa
+DIST abiword-3.0.4-patchset-r2.tar.xz 9668 BLAKE2B 
56739e2a0239a57a26f34e52d54290cb54f246e05209c2c5493f6a0e4d3290df3f7cf87a8463f2688ad3f15d2402f743fb9cdaffa0c53a7bacb2dcf4a6c1bbb5
 SHA512 
47d65edde9217f107ee2aee9e08e65d69f170f11f8532e2c8e6327b4bec67b13f42bdafe751d88fa525819081ed5b19b1f75859b24d4a07748fb03c62ebd0b13
 DIST abiword-3.0.4.tar.gz 11064305 BLAKE2B 
fda1732df0bf78f8830c5d68be18f2aec7f88b8d5bb4fe0effc31b48f03d9195a4337087154ba707a70d80bfcff38f92d7298e7b281afe2eacf000eca8dac9c4
 SHA512 
121708e010cef6722cab5622dc762f2f92c46e43b65b90b881b4f25ff32c1696fa2d281a3a6f2c04d5b9231bbbd0040281e9d4d7e594ec0ace6caae9c9021ec4

diff --git a/app-office/abiword/abiword-3.0.4.ebuild 
b/app-office/abiword/abiword-3.0.4.ebuild
index c8ab57891cf..74101d992c1 100644
--- a/app-office/abiword/abiword-3.0.4.ebuild
+++ b/app-office/abiword/abiword-3.0.4.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Fully featured yet light and fast cross platform 
word processor"
 HOMEPAGE="http://www.abisource.com/";
 SRC_URI="
        http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.gz
-       https://dev.gentoo.org/~soap/distfiles/${P}-patchset.tar.gz";
+       https://dev.gentoo.org/~soap/distfiles/${P}-patchset-r2.tar.xz";
 
 LICENSE="GPL-2"
 SLOT="2"
@@ -73,6 +73,7 @@ PATCHES=(
        "${WORKDIR}"/patches/${PN}-3.0.2-explicit-python.patch
        "${WORKDIR}"/patches/${PN}-3.0.4-enchant-2.patch # backport
        "${WORKDIR}"/patches/${PN}-3.0.4-pygobject.patch
+       "${WORKDIR}"/patches/${PN}-3.0.4-asio-standalone-placeholders.patch
 )
 
 src_prepare() {

Reply via email to