From patchwork Sun Nov 25 19:39:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= X-Patchwork-Id: 305 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CEDFA16864; Sun, 25 Nov 2018 19:41:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 5022B16862 for ; Sun, 25 Nov 2018 19:41:09 +0000 (GMT) Received: from localhost ([::1]:32784 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gR0HE-0000UQ-Je for patchwork@mira.cbaines.net; Sun, 25 Nov 2018 14:41:08 -0500 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 X-Loop: help-debbugs@gnu.org Subject: [bug#33505] Patch: Fix aegisub on core-updates Resent-From: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 25 Nov 2018 19:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33505 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 33505@debbugs.gnu.org X-Debbugs-Original-To: Received: via spool by submit@debbugs.gnu.org id=B.154317481324324 (code B ref -1); Sun, 25 Nov 2018 19:41:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Nov 2018 19:40:13 +0000 Received: from localhost ([127.0.0.1]:47616 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gR0GJ-0006KC-KP for submit@debbugs.gnu.org; Sun, 25 Nov 2018 14:40:13 -0500 Received: from eggs.gnu.org ([208.118.235.92]:34366) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gR0GH-0006Jv-8p for submit@debbugs.gnu.org; Sun, 25 Nov 2018 14:40:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gR0GA-00042H-Mj for submit@debbugs.gnu.org; Sun, 25 Nov 2018 14:40:03 -0500 Received: from lists.gnu.org ([2001:4830:134:3::11]:39058) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gR0GA-000429-Jd for submit@debbugs.gnu.org; Sun, 25 Nov 2018 14:40:02 -0500 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?b?QmrDtnJuIEjDtmZsaW5n?= Message-ID: <20181125203953.1fb71814@alma-ubu> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches aegisub fails to compile with boost 68. This little patch fixes it. From 297f7530262959f7389c4a776907dd13caec69ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= 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 = \ %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/patches/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=packages/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 += distance( + ^~~~~~~~ +/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter = + boost::u32regex_iterator >] +distance(_InputIter __first, _InputIter __last) +^ +/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator = + 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 = matches(&diag, 0)) { + auto& diag_field = diag.*get_dialogue_field(settings.field); + std::string const& text = diag_field.get(); +- count += distance( ++ count += std::distance( + boost::u32regex_iterator(begin(text), end(text), *ms.re), + boost::u32regex_iterator()); + diag_field = 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 decompress 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 -- 2.19.1