From patchwork Mon Feb 11 12:36:41 2019 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: 1020 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 396F916B19; Mon, 11 Feb 2019 12:37:10 +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=-1.9 required=5.0 tests=BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 0338616B15 for ; Mon, 11 Feb 2019 12:37:10 +0000 (GMT) Received: from localhost ([127.0.0.1]:49143 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtAph-0006tY-FI for patchwork@mira.cbaines.net; Mon, 11 Feb 2019 07:37:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43951) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtApc-0006tB-51 for guix-patches@gnu.org; Mon, 11 Feb 2019 07:37:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtApa-0004HF-BZ for guix-patches@gnu.org; Mon, 11 Feb 2019 07:37:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43959) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtApa-0004HB-8n for guix-patches@gnu.org; Mon, 11 Feb 2019 07:37:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gtApa-0000gQ-25 for guix-patches@gnu.org; Mon, 11 Feb 2019 07:37:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34433] [PATCH 1/1] gnu: Fix aegisub. Resent-From: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 11 Feb 2019 12:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34433 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34433@debbugs.gnu.org X-Debbugs-Original-To: Received: via spool by submit@debbugs.gnu.org id=B.15498886212622 (code B ref -1); Mon, 11 Feb 2019 12:37:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 Feb 2019 12:37:01 +0000 Received: from localhost ([127.0.0.1]:43240 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gtApZ-0000gA-64 for submit@debbugs.gnu.org; Mon, 11 Feb 2019 07:37:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57733) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gtApX-0000fx-JD for submit@debbugs.gnu.org; Mon, 11 Feb 2019 07:37:00 -0500 Received: from lists.gnu.org ([209.51.188.17]:44861) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtApR-0004CO-S6 for submit@debbugs.gnu.org; Mon, 11 Feb 2019 07:36:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43874) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtApR-0006sf-1p for guix-patches@gnu.org; Mon, 11 Feb 2019 07:36:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtApO-0004BA-Hj for guix-patches@gnu.org; Mon, 11 Feb 2019 07:36:52 -0500 Received: from m4s11.vlinux.de ([83.151.27.109]:60328 helo=bjoernhoefling.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtApL-00048T-IZ for guix-patches@gnu.org; Mon, 11 Feb 2019 07:36:48 -0500 Received: from alma-ubu (pD951F5A8.dip0.t-ipconnect.de [217.81.245.168]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bjoernhoefling.de (Postfix) with ESMTPSA id EF0B03FE17 for ; Mon, 11 Feb 2019 13:36:41 +0100 (CET) Date: Mon, 11 Feb 2019 13:36:41 +0100 From: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= Message-ID: <20190211133641.7e448f1d@alma-ubu> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; 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] 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: 209.51.188.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 * gnu/packages/video.scm (aegisub)[arguments]: Add phase to fix boost headers. --- gnu/packages/video.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c0f439ea93..fb964f412f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2877,7 +2877,20 @@ programmers to access a standard API to open and decompress media files.") (add-before 'configure 'fix-ldflags (lambda _ (setenv "LDFLAGS" "-pthread") - #t))))) + #t)) + (add-after 'unpack 'fix-boost-headers + (lambda _ + (for-each + (lambda (f) + (substitute* f + (("#include ") + "#include "))) + (list + "src/subtitles_provider_libass.cpp" + "src/colour_button.cpp" + "src/video_provider_dummy.cpp" + "./src/video_frame.cpp")) + #t))))) (inputs `(("boost" ,boost) ("desktop-file-utils" ,desktop-file-utils)