GNU bug report logs - #32361
[PATCH 0/1] Fix aegisub on x86_64

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 32361 in the body.
You can then email your comments to 32361 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: <guix-patches <at> gnu.org>
Subject: [PATCH 0/1] Fix aegisub on x86_64
Date: Fri, 3 Aug 2018 13:50:09 +0200

[Message part 1 (text/plain, inline)]

This patch fixes aegisub for x86_64.
ARM and i686 have problems with with gst-plugins-base, so
this patch might help here also, when dependent problems are solved.

Björn


Björn Höfling (1):
  gnu: aegisub: Fix build.

 gnu/local.mk                                         |  1 +
 .../patches/aegisub-icu59-include-unistr.patch       | 12 ++++++++++++
 gnu/packages/video.scm                               | 10 +++++++---
 3 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 gnu/packages/patches/aegisub-icu59-include-unistr.patch

-- 
2.18.0

[Message part 2 (application/pgp-signature, inline)]

Message #8 received at 32361 <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: 32361 <at> debbugs.gnu.org
Subject: [PATCH 1/1] gnu: aegisub: Fix build.
Date: Fri, 3 Aug 2018 13:52:13 +0200

[Message part 1 (text/plain, inline)]

* gnu/packages/video.scm (aegisub)[source]: Add patch,
[arguments]: Add CXXFLAGS, Return #t from fix-ldflags phase.
* gnu/packages/patches/aegisub-icu59-include-unistr.patch: New file
* gnu/lokal.mk (dist_patch_DATA): Register it.
---
 gnu/local.mk                                         |  1 +
 .../patches/aegisub-icu59-include-unistr.patch       | 12 ++++++++++++
 gnu/packages/video.scm                               | 10 +++++++---
 3 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 gnu/packages/patches/aegisub-icu59-include-unistr.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index d1f9a193b..5953cf3bb 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -565,6 +565,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/aegis-perl-tempdir2.patch           	\
   %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/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-icu59-include-unistr.patch b/gnu/packages/patches/aegisub-icu59-include-unistr.patch
new file mode 100644
index 000000000..78414741b
--- /dev/null
+++ b/gnu/packages/patches/aegisub-icu59-include-unistr.patch
@@ -0,0 +1,12 @@
+This patch adds an include needed since icu59:
+Source: https://git.archlinux.org/svntogit/community.git/plain/trunk/icu59.patch?h=packages/aegisub
+--- aegisub-3.2.2/src/utils.cpp	2014-12-08 02:07:09.000000000 +0200
++++ aegisub-3.2.2/src/utils.cpp	2017-04-26 11:11:15.438239182 +0300
+@@ -44,6 +44,7 @@
+ #include <boost/filesystem/path.hpp>
+ #include <map>
+ #include <unicode/locid.h>
++#include <unicode/unistr.h>
+ #include <wx/clipbrd.h>
+ #include <wx/filedlg.h>
+ #include <wx/stdpaths.h>
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 605e461a6..0b0a3b738 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -28,6 +28,7 @@
 ;;; Copyright © 2018 Leo Famulari <leo <at> famulari.name>
 ;;; Copyright © 2018 Brendan Tildesley <brendan.tildesley <at> openmailbox.org>
 ;;; Copyright © 2018 Arun Isaac <arunisaac <at> systemreboot.net>
+;;; Copyright © 2018 Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2738,21 +2739,24 @@ programmers to access a standard API to open and decompress media files.")
                      name "-" version ".tar.xz"))
               (sha256
                (base32
-                "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5"))))
+                "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5"))
+              (patches (search-patches "aegisub-icu59-include-unistr.patch"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags
        (list "--disable-update-checker"
              "--without-portaudio"
              "--without-openal"
-             "--without-oss")
+             "--without-oss"
+             "CXXFLAGS=-DU_USING_ICU_NAMESPACE=1")
        ;; tests require busted, a lua package we don't have yet
        #:tests? #f
        #:phases
        (modify-phases %standard-phases
          (add-before 'configure 'fix-ldflags
            (lambda _
-             (setenv "LDFLAGS" "-pthread"))))))
+             (setenv "LDFLAGS" "-pthread")
+             #t)))))
     (inputs
      `(("boost" ,boost)
        ("desktop-file-utils" ,desktop-file-utils)
-- 
2.18.0

[Message part 2 (application/pgp-signature, inline)]

Message #13 received at 32361-done <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
Cc: 32361-done <at> debbugs.gnu.org
Subject: Re: [bug#32361] [PATCH 1/1] gnu: aegisub: Fix build.
Date: Mon, 13 Aug 2018 11:44:28 -0400

[Message part 1 (text/plain, inline)]

On Fri, Aug 03, 2018 at 01:52:13PM +0200, Björn Höfling wrote:
> * gnu/packages/video.scm (aegisub)[source]: Add patch,
> [arguments]: Add CXXFLAGS, Return #t from fix-ldflags phase.
> * gnu/packages/patches/aegisub-icu59-include-unistr.patch: New file
> * gnu/lokal.mk (dist_patch_DATA): Register it.

Thanks! Pushed as 18e56ad7eba42b23e338dfc77cd057bf8a076f19

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.