From patchwork Thu Mar 31 03:43:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Anadon X-Patchwork-Id: 38238 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 D056627BBEB; Thu, 31 Mar 2022 04:44:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6901127BBEA for ; Thu, 31 Mar 2022 04:44:11 +0100 (BST) Received: from localhost ([::1]:38918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nZljG-0002Eu-Gm for patchwork@mira.cbaines.net; Wed, 30 Mar 2022 23:44:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36420) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZlj8-0002ES-OR for guix-patches@gnu.org; Wed, 30 Mar 2022 23:44:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43500) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nZlj8-0004Lv-Fh for guix-patches@gnu.org; Wed, 30 Mar 2022 23:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nZlj8-0006xl-7a for guix-patches@gnu.org; Wed, 30 Mar 2022 23:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54630] [PATCH] utfcpp v3.2.1 Resent-From: Anadon Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 31 Mar 2022 03:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54630 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari Cc: 54630@debbugs.gnu.org Received: via spool by 54630-submit@debbugs.gnu.org id=B54630.164869820026704 (code B ref 54630); Thu, 31 Mar 2022 03:44:02 +0000 Received: (at 54630) by debbugs.gnu.org; 31 Mar 2022 03:43:20 +0000 Received: from localhost ([127.0.0.1]:37397 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZliR-0006we-EF for submit@debbugs.gnu.org; Wed, 30 Mar 2022 23:43:20 -0400 Received: from mail-ua1-f49.google.com ([209.85.222.49]:40718) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZliP-0006wN-9f for 54630@debbugs.gnu.org; Wed, 30 Mar 2022 23:43:18 -0400 Received: by mail-ua1-f49.google.com with SMTP id c4so1066145uan.7 for <54630@debbugs.gnu.org>; Wed, 30 Mar 2022 20:43:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Tv6SvmHAivGMPOqqz/EvO6b2UEIcccDiip/Bugn9GoM=; b=aTWugeZpPYQZdMIaplmFQpiZyv5Ohx0WqgXX3pAwOf1gnAtf/GA9olOyABx1jluzDI POcZDeLsYUIuNdLXBu0zXyuPMO+E5Kgwf3h9WDw/jgx+IQy3LY+DBNU4X8XFqmEghXfv r16umFsccz5WQ45OWsOAoHy/+mqJW/pEUJdkzBbaueX9N2pmKz89fzwjn8lnio6oq/hn fcRIliyqZV/5QBXFUnCzCH1yHDiVgtPiKr38ZDrBzNM+a7M192Z12AYZMY2O5u+1RQTb 6je7PoAsfElSKy6Y04U3MEh9ZorxE8ahgw8JSTpBp9U/BeF4P3d9/n8C3iAUIt0HnE6p vU0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Tv6SvmHAivGMPOqqz/EvO6b2UEIcccDiip/Bugn9GoM=; b=hGBVDxnE+6c4Y0/9foKl5pLLwlk+1ukwT3GjAFWfD9IIZwjwiY4iWbx0CqbQ+PL9bf z+DeMxSXZiAclMIh4mNU7RP7sO0p5NNYW8qZD8nTPAtyBEBljDcXE9hvdhPnGU8j8uyq +NqRodT6JMgwsoOQijbmDYF8vDxRxhXyCONd2Hz/mUQV1X7qzb9ghfIpoefM22jh9VGE yJjmHyNYV43wTBm2Nh4mu/l0Kjyztd7t4i32hsBa2wWS/oJfocpz7Lv1plCJuNsjy07b kehXqrWoIh8+VvlhiYkBw1aXheisYT7HItCmgmVeGxa+CCQ7tsS7ULucbrsNJuycG4FE B/+g== X-Gm-Message-State: AOAM532RCgCoXta7Vco8+mGp0DUGkJBb6KW7XiDLUBR/+KmR8Ada6hp7 i8DTLCubcfgfYs3DDY/yRBCeWRLw+gKNpdKbpVHuKEDb X-Google-Smtp-Source: ABdhPJz3nkMcBN/+LwhwsCvtkuazmBac+IeSbPr277wrMze3fBT78AoQWrXdsdb4kC2F9xirqajYQw41/+RcJtupeLI= X-Received: by 2002:ab0:71d5:0:b0:355:75ed:a763 with SMTP id n21-20020ab071d5000000b0035575eda763mr1438249uao.9.1648698191660; Wed, 30 Mar 2022 20:43:11 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Anadon Date: Wed, 30 Mar 2022 23:43:00 -0400 Message-ID: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 Updated, should be closer. On Tue, Mar 29, 2022 at 6:10 PM Leo Famulari wrote: > On Tue, Mar 29, 2022 at 05:48:47PM -0400, Anadon wrote: > > (define-public utfcpp > > (package > > (name "utfcpp") > > - (version "2.3.5") > > + (version "3.2.1") > > Thanks! > > I turned it into a Git commit (attached as a patch) and built utfcpp 3.2.1 > successfully. > > I noticed that at least one of the handful of packages that depend on > utfcpp, mkvtoolnix, doesn't build with this update: > > ------ > [...] > starting phase `build' > CC lib/librmff/rmff.c > CXX src/mpegparser/MPEGVideoBuffer.cpp > CXX src/common/xml/xml.cpp > CC lib/librmff/mb_file_io.c > AR lib/librmff/librmff.a > RANLIB lib/librmff/librmff.a > CXX lib/avilib-0.6.10/xio.cpp > CXX src/mpegparser/M2VParser.cpp > CC lib/avilib-0.6.10/avimisc.c > CC lib/avilib-0.6.10/avilib.c > AR lib/avilib-0.6.10/libavi.a > RANLIB lib/avilib-0.6.10/libavi.a > CXX src/common/xml/ebml_tags_converter.cpp > CXX src/mpegparser/CircBuffer.cpp > CXX src/common/xml/ebml_segmentinfo_converter.cpp > AR src/mpegparser/libmpegparser.a > RANLIB src/mpegparser/libmpegparser.a > CXX src/common/xml/ebml_converter.cpp > CXX src/common/xml/ebml_chapters_converter.cpp > CXX src/common/tags/vorbis.cpp > CXX src/common/tags/tags.cpp > CXX src/common/strings/utf8.cpp > src/common/strings/utf8.cpp:21:10: fatal error: utf8.h: No such file or > directory > 21 | #include > | ^~~~~~~~ > compilation terminated. > error: in phase 'build': uncaught exception: > %exception #<&invoke-error program: "rake" arguments: ("-j" "4") > exit-status: 1 term-signal: #f stop-signal: #f> > phase `build' failed after 47.3 seconds > command "rake" "-j" "4" failed with status 1 > builder for > `/gnu/store/n4jp4915g90c0f89njnlljhfd75k5y0g-mkvtoolnix-52.0.0.drv' failed > with exit code 1 > build of /gnu/store/n4jp4915g90c0f89njnlljhfd75k5y0g-mkvtoolnix-52.0.0.drv > failed > View build log at > '/var/log/guix/drvs/n4/jp4915g90c0f89njnlljhfd75k5y0g-mkvtoolnix-52.0.0.drv.gz'. > guix build: error: build of > `/gnu/store/n4jp4915g90c0f89njnlljhfd75k5y0g-mkvtoolnix-52.0.0.drv' failed > ------ > > One can check full list of packages that depend on utfcpp like this: > > ------ > $ guix refresh --list-dependent utfcpp > Building the following 6 packages would ensure 8 dependent packages are > rebuilt: emacs-flycheck-ledger@0.5 emacs-ledger-mode@4.0.0 > warzone2100@4.0.1 osmium-tool@1.14.0 osm2pgsql@1.5.1 mkvtoolnix@52.0.0 > ------ > From eb6d740795e45a2387b4d253032d7218e4e443c9 Mon Sep 17 00:00:00 2001 From: Anadon Date: Wed, 30 Mar 2022 21:22:04 -0400 Subject: [PATCH] Updating to add utfcpp as a seperate version and to update mkvtoolnix and warzone2100 to use the old version since they need behavior from version 2 and not version 3. --- gnu/packages/games.scm | 2 +- gnu/packages/textutils.scm | 26 +++++++++++++++++++++++++- gnu/packages/video.scm | 2 +- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8cc29b3487..1c01a41ed6 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5131,7 +5131,7 @@ (define-public warzone2100 ("openssl" ,openssl) ("sdl2" ,sdl2) ("sqlite" ,sqlite) - ("utfcpp" ,utfcpp))) + ("utfcpp" ,utfcpp-2))) (home-page "https://wz2100.net") (synopsis "3D Real-time strategy and real-time tactics game") (description diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index cbc657172d..21e8d861fa 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2021 Simon Tournier ;;; Copyright © 2021 Felix Gruber ;;; Copyright © 2021 Bonface Munyoki Kilyungi +;;; Copyright © 2021 Anadon ;;; ;;; This file is part of GNU Guix. ;;; @@ -666,7 +667,7 @@ (define-public catdoc @command{catppt}, which extracts data from PowerPoint presentations.") (license license:gpl2+))) -(define-public utfcpp +(define-public utfcpp-2 (package (name "utfcpp") (version "2.3.5") @@ -698,6 +699,29 @@ (define-public utfcpp in a portable way.") (license license:boost1.0))) +(define-public utfcpp-3 + (package + (name "utfcpp") + (version "3.2.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nemtrif/utfcpp") + (commit (string-append "v" version)) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0gsbwif97i025bxgyax4fbf6v9z44zrca4s6wwd8x36ac8qzjppf")))) + (build-system cmake-build-system) + (home-page "https://github.com/nemtrif/utfcpp") + (synopsis "Portable C++ library for handling UTF-8") + (description "UTF8-CPP is a C++ library for handling UTF-8 encoded text +in a portable way.") + (license license:boost1.0))) + +(define-public utfcpp utfcpp-3) + (define-public dbacl (package (name "dbacl") diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index dc05c0a222..da383192bc 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -991,7 +991,7 @@ (define-public mkvtoolnix pugixml qtbase-5 qtmultimedia - utfcpp + utfcpp-2 zlib)) (native-inputs `(("docbook-xsl" ,docbook-xsl) -- 2.34.0