From patchwork Thu Aug 3 14:06:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 52475 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 E839427BBE2; Thu, 3 Aug 2023 15:08:14 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 ED99827BBE9 for ; Thu, 3 Aug 2023 15:08:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qRYzj-00023T-EZ; Thu, 03 Aug 2023 10:08:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qRYzi-00023K-4U for guix-patches@gnu.org; Thu, 03 Aug 2023 10:08:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qRYzh-0007mv-QO for guix-patches@gnu.org; Thu, 03 Aug 2023 10:08:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qRYzh-0006oF-Ll for guix-patches@gnu.org; Thu, 03 Aug 2023 10:08:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64255] [PATCH v2 1/2] gnu: Add ftest. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Aug 2023 14:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64255 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64255@debbugs.gnu.org Cc: Hilton Chain , Reza Housseini Received: via spool by 64255-submit@debbugs.gnu.org id=B64255.169107164426111 (code B ref 64255); Thu, 03 Aug 2023 14:08:01 +0000 Received: (at 64255) by debbugs.gnu.org; 3 Aug 2023 14:07:24 +0000 Received: from localhost ([127.0.0.1]:52645 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qRYz5-0006n4-Os for submit@debbugs.gnu.org; Thu, 03 Aug 2023 10:07:24 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:52344) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qRYz1-0006mt-DM for 64255@debbugs.gnu.org; Thu, 03 Aug 2023 10:07:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691071634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=q/BuQ26z4hnpHwzYbkZFJV0KlVt8J+ciqIMT2zo8Tn0=; b=e3tQcq/sFvsxaWQGkukLYOq1/Op3sTN4ws2AzpjNoASZqSVuyjjMRfXAkWjq8KJBph0Dg3 p9ERMkVBNvuakYwund2rJAf0mcwlRt77GpHZk698kfB9VHsCVAT+fnAsohdgCaHWmDgnnn WrTws3Ojki3RlhxGXm0CHCoPP3KSXJ2EIONDe8Xc4bYeq+wAwJ+579c3Bg4GxR9p1QsevG v55FO0Wl2kuc73FoGf6sVTs/hD7fOvant3eBy9IFiN2Z3shthGL29UOOGXBrnGjbFa8jLb mI7iUVhtsRRLNjJ9E4Mk8OwJrG36YXCYLmn2rbIT0OO7KzTdg3UHfmbwfTmZ/g== Date: Thu, 3 Aug 2023 22:06:43 +0800 Message-ID: <65f32133382837082ef16d59e61146e375b665b6.1691061465.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: --- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Reza Housseini * gnu/packages/check.scm (ftest): New variable. Co-authored-by: Hilton Chain --- gnu/packages/check.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 71dc9eb54b..51aa40f18d 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -45,6 +45,8 @@ ;;; Copyright © 2023 Timo Wilken ;;; Copyright © 2023 Zhu Zihao ;;; Copyright © 2023 Bruno Victal +;;; Copyright © 2023 Reza Housseini +;;; Copyright © 2023 Hilton Chain ;;; ;;; This file is part of GNU Guix. ;;; @@ -67,6 +69,7 @@ (define-module (gnu packages check) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) @@ -94,6 +97,7 @@ (define-module (gnu packages check) #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system go) @@ -813,6 +817,43 @@ (define-public doctest has been designed to be fast, light and unintrusive.") (license license:expat))) +(define-public ftest + ;; There aren't any releases and it looks more like a small side project. + ;; It is included for completness to run tests for package utfcpp. + (let ((commit "c4ad4af0946b73ce1a40cbc72205d15d196c7e06") + (revision "0")) + (package + (name "ftest") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nemtrif/ftest") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1jcd76zjhx5f2nsi80hj7gmywgpz1f7vcw8lv5yf7gx0l99dn86x")))) + ;; No CMakeLists.txt file provided, only one to run tests + (build-system copy-build-system) + (arguments + (list #:install-plan + #~'(("ftest.h" "include/ftest/")) + #:phases + #~(modify-phases %standard-phases + (add-before 'install 'check + (lambda _ + (with-directory-excursion "tests" + (invoke "cmake" ".") + (invoke "make") + (invoke "ctest"))))))) + (native-inputs (list cmake-minimal)) + (home-page "https://github.com/nemtrif/ftest") + (synopsis "C++ testing framework") + (description + "This package provides a simple and limited unit-test framework for C++.") + (license license:boost1.0)))) + (define-public python-gixy ;; The 0.1.20 release is missing some important fixes. ;; XXX: Commit 'e9008dcbd11f43ccac109b0cf2bf98a94e76b449' breaks tests From patchwork Thu Aug 3 14:06:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 52476 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 C771327BBEA; Thu, 3 Aug 2023 15:08:31 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 C43B727BBE2 for ; Thu, 3 Aug 2023 15:08:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qRYzl-00024C-Gc; Thu, 03 Aug 2023 10:08:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qRYzk-00023U-1s for guix-patches@gnu.org; Thu, 03 Aug 2023 10:08:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qRYzj-0007n5-J6 for guix-patches@gnu.org; Thu, 03 Aug 2023 10:08:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qRYzi-0006oN-5Y; Thu, 03 Aug 2023 10:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64255] [PATCH v2 2/2] gnu: utfcpp: Update to 3.2.3. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Thu, 03 Aug 2023 14:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64255 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64255@debbugs.gnu.org Cc: Hilton Chain , Reza Housseini , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 64255-submit@debbugs.gnu.org id=B64255.169107164626127 (code B ref 64255); Thu, 03 Aug 2023 14:08:02 +0000 Received: (at 64255) by debbugs.gnu.org; 3 Aug 2023 14:07:26 +0000 Received: from localhost ([127.0.0.1]:52647 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qRYz8-0006nK-5k for submit@debbugs.gnu.org; Thu, 03 Aug 2023 10:07:26 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:52360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qRYz5-0006mz-Ik for 64255@debbugs.gnu.org; Thu, 03 Aug 2023 10:07:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691071639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Oc9griOjJIA71UBRnDKg7FsQwhhFYgPF0IbYPaq+s+c=; b=HZR1W6BwZZScD+vvzGw1j78v/4+ZLCS5K7XDY4kYnUxqH6qmixr3yJNiNtmkrZxo+T5mwD PAeB6f9IbCAc18abgPmm0257TdeMNz+3LaLWtDlRJrv+FunrfVSMJo8RlMiVTs0qeKmmHP XxC2Fj0f5RrecCu9wEdm7Lh7zTLWffJ+vw3QAaHTQuAhHXkJkghrLtyb0cnM0qLb+Fcac4 ZzTyEkgNAI4G1VUC7VZPrigX85D89m5NXtEXxFLaOROblkIHq8znt1SiWCBJ6C7MLGB7VM PdOkWfctAe2WFHTk/CuRIIlolb0/U5C4yp5FWraBPr9nW5esSQWxQwY7wZcnDw== Date: Thu, 3 Aug 2023 22:06:44 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: --- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Reza Housseini * gnu/packages/textutils.scm (utfcpp): Update to 3.2.3. [snippet]: Unbundle ftest. [arguments]: Remove field. [native-inputs]: Add ftest. * gnu/packages/games.scm (warzone2100)<#:phases>: Adjust 'fix-utfcpp-include. * gnu/packages/video.scm (mkvtoolnix)<#:phases>: Add 'fix-utfcpp-include. Co-authored-by: Hilton Chain --- gnu/packages/games.scm | 2 +- gnu/packages/textutils.scm | 27 +++++++++++++-------------- gnu/packages/video.scm | 5 +++++ 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 1573d7de00..82302852f4 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5573,7 +5573,7 @@ (define-public warzone2100 (lambda _ (substitute* "lib/framework/wzstring.cpp" (("") - "")))) + "")))) (add-after 'unpack 'link-tests-with-qt (lambda _ (substitute* "tests/Makefile.am" diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 4e026fc6f9..5fbfdde284 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -25,6 +25,8 @@ ;;; Copyright © 2021 Felix Gruber ;;; Copyright © 2021 Bonface Munyoki Kilyungi ;;; Copyright © 2022 Gabriel Wicki +;;; Copyright © 2023 Reza Housseini +;;; Copyright © 2023 Hilton Chain ;;; ;;; This file is part of GNU Guix. ;;; @@ -690,29 +692,26 @@ (define-public catdoc (define-public utfcpp (package (name "utfcpp") - (version "2.3.5") + (version "3.2.3") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/nemtrif/utfcpp") (commit (string-append "v" version)))) (file-name (git-file-name name version)) + (modules '((guix build utils))) + ;; Unbundle ftest + (snippet + '(begin + (delete-file-recursively "extern") + (substitute* (find-files "tests" "\\.cpp") + (("\"../extern/ftest/ftest.h\"") + "")))) (sha256 (base32 - "1gr98d826z6wa58r1s5i7rz7q2x3r31v7zj0pjjlrc7gfxwklr4s")))) + "00hzh39iddbc6nxg13813qd6d55g2kccwjf5dr96wykfhway9wbr")))) (build-system cmake-build-system) - (arguments - `(#:out-of-source? #f - #:phases - (modify-phases %standard-phases - (replace 'install ; no install target - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (include (string-append out "/include")) - (doc (string-append out "/share/doc/" ,name))) - (copy-recursively "source" include) - (install-file "README.md" doc) - #t)))))) + (native-inputs (list ftest)) (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 diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 801c2602e4..f75a528b13 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1050,6 +1050,11 @@ (define-public mkvtoolnix "--enable-precompiled-headers=no") #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-utfcpp-include + (lambda _ + (substitute* "src/common/strings/utf8.cpp" + (("") + "")))) (add-after 'unpack 'patch-relative-file-names (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")))