From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44419) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gR0HC-0000U8-BV for guix-patches@gnu.org; Sun, 25 Nov 2018 14:41:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gR0H8-0004g3-CZ for guix-patches@gnu.org; Sun, 25 Nov 2018 14:41:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:43358) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gR0H8-0004fw-9G for guix-patches@gnu.org; Sun, 25 Nov 2018 14:41:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gR0H8-0006LP-5J for guix-patches@gnu.org; Sun, 25 Nov 2018 14:41:02 -0500 Subject: [bug#33505] Patch: Fix aegisub on core-updates Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:43957) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gR0G9-0008Rd-Gh for guix-patches@gnu.org; Sun, 25 Nov 2018 14:40:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gR0G5-0003r0-HC for guix-patches@gnu.org; Sun, 25 Nov 2018 14:40:01 -0500 Received: from m4s11.vlinux.de ([83.151.27.109]:50342 helo=bjoernhoefling.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gR0G5-0003k8-67 for guix-patches@gnu.org; Sun, 25 Nov 2018 14:39:57 -0500 Received: from alma-ubu (p508AC390.dip0.t-ipconnect.de [80.138.195.144]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by bjoernhoefling.de (Postfix) with ESMTPSA id AEEEA40140 for ; Sun, 25 Nov 2018 20:39:54 +0100 (CET) Date: Sun, 25 Nov 2018 20:39:53 +0100 From: =?UTF-8?Q?Bj=C3=B6rn_?= =?UTF-8?Q?H=C3=B6fling?= Message-ID: <20181125203953.1fb71814@alma-ubu> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/1a5Vh0_YbfnNjvFG6U=OiS8"; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 33505@debbugs.gnu.org --Sig_/1a5Vh0_YbfnNjvFG6U=OiS8 Content-Type: multipart/mixed; boundary="MP_/q.vS3lWy97xwKmxDdpNWbJ9" --MP_/q.vS3lWy97xwKmxDdpNWbJ9 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline aegisub fails to compile with boost 68. This little patch fixes it. --MP_/q.vS3lWy97xwKmxDdpNWbJ9 Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-gnu-aegisub-Fix-build.patch =46rom 297f7530262959f7389c4a776907dd13caec69ff Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Bj=3DC3=3DB6rn=3D20H=3DC3=3DB6fling?=3D Date: Sun, 25 Nov 2018 20:33:13 +0100 Subject: [PATCH 1/1] gnu: aegisub: Fix build. * gnu/packages/patches/aegisub-boost68.patch: New file * gnu/local.mk: Add it. * gnu/packages/video.scm (aegisub)[source]: Use patch. --- gnu/local.mk | 1 + gnu/packages/patches/aegisub-boost68.patch | 35 ++++++++++++++++++++++ gnu/packages/video.scm | 3 +- 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/aegisub-boost68.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8b673fdd8..fda692b0f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -574,6 +574,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/aegis-test-fixup-1.patch \ %D%/packages/patches/aegis-test-fixup-2.patch \ %D%/packages/patches/aegisub-icu59-include-unistr.patch \ + %D%/packages/patches/aegisub-boost68.patch \ %D%/packages/patches/agg-am_c_prototype.patch \ %D%/packages/patches/amule-crypto-6.patch \ %D%/packages/patches/ansible-wrap-program-hack.patch \ diff --git a/gnu/packages/patches/aegisub-boost68.patch b/gnu/packages/patc= hes/aegisub-boost68.patch new file mode 100644 index 000000000..013721f3b --- /dev/null +++ b/gnu/packages/patches/aegisub-boost68.patch @@ -0,0 +1,35 @@ +Source: https://git.archlinux.org/svntogit/community.git/plain/trunk/boost= -1.68.patch?h=3Dpackages/aegisub +From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Mon, 9 Jul 2018 20:15:29 +0000 +Subject: [PATCH] Keep using std::distance after Boost 1.68 + +src/search_replace_engine.cpp:256:14: error: call to + 'distance' is ambiguous + count +=3D distance( + ^~~~~~~~ +/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputI= ter =3D + boost::u32regex_iterator >] +distance(_InputIter __first, _InputIter __last) +^ +/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate funct= ion [with SinglePassIterator =3D + boost::u32regex_iterator >] + distance(SinglePassIterator first, SinglePassIterator last) + ^ +--- + src/search_replace_engine.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/search_replace_engine.cpp b/src/search_replace_engine.cpp +index 594c21e5e..14c71680d 100644 +--- a/src/search_replace_engine.cpp ++++ b/src/search_replace_engine.cpp +@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() { + if (MatchState ms =3D matches(&diag, 0)) { + auto& diag_field =3D diag.*get_dialogue_field(settings.field); + std::string const& text =3D diag_field.get(); +- count +=3D distance( ++ count +=3D std::distance( + boost::u32regex_iterator(begin(text), e= nd(text), *ms.re), + boost::u32regex_iterator()); + diag_field =3D u32regex_replace(text, *ms.re, settings.replace_with); diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8a5e730bd..3b2a37112 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2757,7 +2757,8 @@ programmers to access a standard API to open and deco= mpress media files.") (sha256 (base32 "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5")) - (patches (search-patches "aegisub-icu59-include-unistr.patch= ")))) + (patches (search-patches "aegisub-icu59-include-unistr.patch" + "aegisub-boost68.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags --=20 2.19.1 --MP_/q.vS3lWy97xwKmxDdpNWbJ9-- --Sig_/1a5Vh0_YbfnNjvFG6U=OiS8 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAlv6+okACgkQvyhstlk+X/2v4QCdGfUnhqT6F8Xnh6yczjsJc7xH U5kAoJXsj0eiVZygDe+acSLNIRT/BvSt =nJax -----END PGP SIGNATURE----- --Sig_/1a5Vh0_YbfnNjvFG6U=OiS8--