From patchwork Fri Jul 8 20:49:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 40608 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 77D6427BBEA; Fri, 8 Jul 2022 21:50:29 +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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable 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 4941127BBE9 for ; Fri, 8 Jul 2022 21:50:29 +0100 (BST) Received: from localhost ([::1]:43678 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9uvk-00057U-EV for patchwork@mira.cbaines.net; Fri, 08 Jul 2022 16:50:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49460) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9uvL-000566-1G for guix-patches@gnu.org; Fri, 08 Jul 2022 16:50:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39347) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o9uvK-0006qW-L9 for guix-patches@gnu.org; Fri, 08 Jul 2022 16:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o9uvK-0004tC-Im for guix-patches@gnu.org; Fri, 08 Jul 2022 16:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56456] [PATCH 1/2] gnu: protobuf-2: Fix broken build. References: In-Reply-To: Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Jul 2022 20:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56456 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56456@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 56456-submit@debbugs.gnu.org id=B56456.165731338918761 (code B ref 56456); Fri, 08 Jul 2022 20:50:02 +0000 Received: (at 56456) by debbugs.gnu.org; 8 Jul 2022 20:49:49 +0000 Received: from localhost ([127.0.0.1]:33242 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o9uv6-0004sX-W7 for submit@debbugs.gnu.org; Fri, 08 Jul 2022 16:49:49 -0400 Received: from mail-qt1-f174.google.com ([209.85.160.174]:36576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o9uv5-0004sF-As for 56456@debbugs.gnu.org; Fri, 08 Jul 2022 16:49:47 -0400 Received: by mail-qt1-f174.google.com with SMTP id k14so29092112qtm.3 for <56456@debbugs.gnu.org>; Fri, 08 Jul 2022 13:49:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=s3O+BMKCli/hDn27DTINfhPgWqUVHoSr/7bBERHqy5Y=; b=ldg/yYcVGZpJn+zMxsUVOPvjCf5jWJqZSGhpE+q1fZr/MhJ3zka3UKA/bJ7nMQu+lV XGWdcz7XtLaNYEE10dW1niFqXtQ6dyMXCd2+6b8Now6QqdO32YSTFv+fWOa63sGGxR16 jIwP3K9rw+lnd0jYQUVscIW6KV24A/xnKDZxEGYx+GepWzmZYUj7T1BpIocPpplatFCu oTjoDgqBB/tMAL/AzQUaHF8lCELrG1ywJRALoSIvuI5JXOxVq7UKOizTbEfuXgfApFur X4u9a8ISDrlmJ7NjPxQrZD3Uus9Q71UOnu1DYX9J1sr2K8b4M/W4oekz5mdY2W6GHBAG fieA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=s3O+BMKCli/hDn27DTINfhPgWqUVHoSr/7bBERHqy5Y=; b=FM/WwAmuEC9fthIgAaYz9dn89qSi5MRyDM8bzl1wyJCs+wYd+aoPRY9ZhRYvfPqSf5 sf1K1apn6erypTIbIPgQ5stEtgPMt7NFY07Q40d1ZvCikV2wZ7QvElG+89Q0B6qjGlcG nUcgwBG8xsaAg9eJ1WrIOJ9DrU4djkk+dzhe8sCwWtpKWRVPjDB7CGdrtDd+ZxJDzeY8 uyC7FadevFjbPNc1t+N41hnhyxxRjBrWuuPxiopEtu0V1OFOYke+b3xbnlkSbIxQIXMJ +zMLNrgoCv//WZ85ii5a/W0ZbNJRRtS4jUPofHuqS09NGngSSWydzLcFgldllaQYc0hh SUtw== X-Gm-Message-State: AJIora/5jSkfngP23/QihA2VGSi3GBzv/PQRwkSOfjMfMGWArdJEUqyh Kv145+hx5cBIM2zwJ1UBJznZ/JhmbEXnfP/J X-Google-Smtp-Source: AGRyM1ujCJNL5mwNWxYQHIlquD89MJpofcqnxxJPLE1C8+gfm5NLEvLvwvXa+6W153mmbTMe1kFBAQ== X-Received: by 2002:a05:6214:20a8:b0:473:26d2:6cb7 with SMTP id 8-20020a05621420a800b0047326d26cb7mr4361358qvd.74.1657313381471; Fri, 08 Jul 2022 13:49:41 -0700 (PDT) Received: from ip-10-114-89-251.evoforge.org (ec2-52-70-167-183.compute-1.amazonaws.com. [52.70.167.183]) by smtp.gmail.com with ESMTPSA id bi13-20020a05620a318d00b006a6c552736asm34947902qkb.119.2022.07.08.13.49.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Jul 2022 13:49:41 -0700 (PDT) From: Greg Hogan Date: Fri, 8 Jul 2022 20:49:29 +0000 Message-Id: <479518687c1c164ba3f159223985154acdedaa88.1657313089.git.code@greghogan.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 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 * gnu/packages/protobuf.scm (protobuf-2): Fix broken build. [arguments]<#:phases>: Delete 'disable-broken-tests. --- gnu/packages/protobuf.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index f66e3469b8..59f2f361e3 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -180,7 +180,11 @@ (define-public protobuf-2 version ".tar.bz2")) (sha256 (base32 - "040rcs9fpv4bslhiy43v7dcrzakz4vwwpyqg4jp8bn24sl95ci7f")))))) + "040rcs9fpv4bslhiy43v7dcrzakz4vwwpyqg4jp8bn24sl95ci7f")))) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'disable-broken-tests)))))) (define-public protobuf-c (package From patchwork Fri Jul 8 20:49:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 40609 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 76EC627BBEA; Fri, 8 Jul 2022 21:50:30 +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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,T_PDS_PRO_TLD, URIBL_BLOCKED autolearn=unavailable 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 BAF9927BBE9 for ; Fri, 8 Jul 2022 21:50:29 +0100 (BST) Received: from localhost ([::1]:43658 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9uvk-00056N-Sy for patchwork@mira.cbaines.net; Fri, 08 Jul 2022 16:50:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49462) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9uvL-00056E-Hd for guix-patches@gnu.org; Fri, 08 Jul 2022 16:50:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39348) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o9uvL-0006th-83 for guix-patches@gnu.org; Fri, 08 Jul 2022 16:50:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o9uvL-0004tL-4U for guix-patches@gnu.org; Fri, 08 Jul 2022 16:50:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56456] [PATCH 2/2] gnu: pokerth: Update to 1.1.2-8e6088e4. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Jul 2022 20:50:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56456 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56456@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 56456-submit@debbugs.gnu.org id=B56456.165731339118770 (code B ref 56456); Fri, 08 Jul 2022 20:50:03 +0000 Received: (at 56456) by debbugs.gnu.org; 8 Jul 2022 20:49:51 +0000 Received: from localhost ([127.0.0.1]:33244 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o9uv9-0004sg-6K for submit@debbugs.gnu.org; Fri, 08 Jul 2022 16:49:51 -0400 Received: from mail-qk1-f173.google.com ([209.85.222.173]:37566) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o9uv6-0004sG-01 for 56456@debbugs.gnu.org; Fri, 08 Jul 2022 16:49:48 -0400 Received: by mail-qk1-f173.google.com with SMTP id b24so16670669qkn.4 for <56456@debbugs.gnu.org>; Fri, 08 Jul 2022 13:49:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1403L1tvWcQMtpRK/mO4FcxUAFerPb1HehkJGXyUNrY=; b=7IvrAvQcJLtSKknVxU3WqVCzy7knvJGMEvdPggjNwJmBswgB/MzrWPEn8JUOZmJxL2 hcaDR4+7ohT9YXIUgwHDjt2o08ua6TwKEtVrRhzcPKir/KHGczRak44HaLkSYQFQktqi uMSRiUquE77alXBGrzGW4aML+/Ye9ZB4JUKyIyNyxl7K1kgq5+2DZyFiqcbyJ6gXq0rk +FpuDyB5YDV0CoOUF7lafU0PWndyq2ahWyiGU3xFfYhB7UYn3RERLE4ZPZrDGruwp7uS 1hckANlYWeiSQ2B9zTbAmn6pptN89oNtFr+xP6hXR1DWgjWnZ0IYN7Dj1uezgbPdVDGC Z5Bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1403L1tvWcQMtpRK/mO4FcxUAFerPb1HehkJGXyUNrY=; b=K/zSNXnfXN2mXiYSHxP3PaUWpqkt+MqrinDxYYAJN+uJkuw61r2WL2iiHIU5xhx16o fa5tjGQvTTmqR1imWHsiuXB+Wll4vXSc0JUlAVMznn2XQ8Ln6ub4mviO9If+xZJyhEFA 0KmpD6R9bO2F6EDCaXK+jghyiVswnEnOhZLOkHUf2qbXIGrE0iwlUBeJyig0qrrNZNqK ZmYIK+9pHC2/tdcPOIAOZMORCYovAJ9nBpMj0kAGZmyP058bTkPrr4Sf6D7nVZgxw67H 0seuEUL2EN+qH12cXSfYRphqiVzriusZoHeKBPFnSz8d5JpbUcFTMPRdJclcojX4HiuL Jyww== X-Gm-Message-State: AJIora9beymL5wxmMR7dUgJd0XeRa2snG/dz5kREP03rse+4qf/tzmx7 NH4Kc4kXp1v+XePCrZb0cNtIONhAG7gP88vO X-Google-Smtp-Source: AGRyM1vUjhTfRVD4UcjfG18FqTDWHflSKq+NhvqbAUUfMeiYRQo4xrejMIcZGTgTtUkeZgZMS1FE6A== X-Received: by 2002:a37:e20a:0:b0:6b5:55af:f2ef with SMTP id g10-20020a37e20a000000b006b555aff2efmr3665747qki.752.1657313382147; Fri, 08 Jul 2022 13:49:42 -0700 (PDT) Received: from ip-10-114-89-251.evoforge.org (ec2-52-70-167-183.compute-1.amazonaws.com. [52.70.167.183]) by smtp.gmail.com with ESMTPSA id bi13-20020a05620a318d00b006a6c552736asm34947902qkb.119.2022.07.08.13.49.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Jul 2022 13:49:41 -0700 (PDT) From: Greg Hogan Date: Fri, 8 Jul 2022 20:49:30 +0000 Message-Id: <22b980b0564079b825af5a9dad5af81e68e20fe7.1657313089.git.code@greghogan.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <479518687c1c164ba3f159223985154acdedaa88.1657313089.git.code@greghogan.com> References: <479518687c1c164ba3f159223985154acdedaa88.1657313089.git.code@greghogan.com> MIME-Version: 1.0 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 * gnu/packages/games.scm (pokerth): Update to 1.1.2-8e6088e4. [source]: Switch to git-fetch. [arguments]<#:phases>: Remove substitution for libircclient in 'fix-paths and delete 'fix-build. --- gnu/packages/games.scm | 129 +++++++++++++++++++---------------------- 1 file changed, 60 insertions(+), 69 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index c6ed6eed00..6f72465c5c 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -12231,76 +12231,67 @@ (define-public neverball (license license:gpl2+)))) (define-public pokerth - (package - (name "pokerth") - (version "1.1.2") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/pokerth/pokerth/" - version "/pokerth-" version ".tar.gz")) - (sha256 - (base32 "0yi9bj3k8yc1gkwmaf14zbbvvn13n54n1dli8k6j1pkph3p3vjq2")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Remove bundled websocketpp. - (delete-file-recursively "src/third_party/websocketpp") - (substitute* "pokerth_lib.pro" - (("src/third_party/websocketpp") - "")) - #t)))) - (build-system qt-build-system) - (inputs - `(("boost" ,boost) - ("curl" ,curl) - ("gsasl" ,gsasl) - ("libgcrypt" ,libgcrypt) - ("libircclient" ,libircclient) - ("protobuf" ,protobuf-2) ; remove package when no longer needed - ("qtbase" ,qtbase-5) - ("sdl" ,(sdl-union (list sdl sdl-mixer))) - ("sqlite" ,sqlite) - ("tinyxml" ,tinyxml) - ("websocketpp" ,websocketpp) - ("zlib" ,zlib))) - (arguments - `(#:tests? #f ; No test suite - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* (find-files "." "\\.pro$") - (("/opt/gsasl") - (assoc-ref inputs "gsasl")) - (("\\$\\$\\{PREFIX\\}/include/libircclient") - (search-input-directory inputs "/include/libircclient")) - (("LIB_DIRS =") - (string-append "LIB_DIRS = " - (assoc-ref inputs "boost") "/lib"))) - #t)) - (add-after 'unpack 'fix-build - (lambda _ - ;; Fixes for Boost versions >= 1.66. - (substitute* '("src/net/common/clientthread.cpp" - "src/net/serveraccepthelper.h") - (("boost::asio::socket_base::non_blocking_io command\\(true\\);") - "") - (("newSock->io_control\\(command\\);") - "newSock->non_blocking(true);") - (("acceptedSocket->io_control\\(command\\);") - "acceptedSocket->non_blocking(true);")) - #t)) - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (invoke "qmake" "pokerth.pro" "CONFIG+=client" - (string-append "PREFIX=" (assoc-ref outputs "out")))))))) - (home-page "https://www.pokerth.net") - (synopsis "Texas holdem poker game") - (description - "With PokerTH you can play the Texas holdem poker game, either against + (let ((commit "8e6088e425ace3bb31c1dfc3231bff74891e3e94") + (revision "0")) + (package + (name "pokerth") + (version "1.1.2") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/pokerth/pokerth") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1i7z0zc3sbws1bpgn1rd9nxfin121kl81d0as6f10wlrzndsn3sf")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove bundled websocketpp. + (delete-file-recursively "src/third_party/websocketpp") + (substitute* "pokerth_lib.pro" + (("src/third_party/websocketpp") + "")) + #t)))) + (build-system qt-build-system) + (inputs + `(("boost" ,boost) + ("curl" ,curl) + ("gsasl" ,gsasl) + ("libgcrypt" ,libgcrypt) + ("libircclient" ,libircclient) + ("protobuf" ,protobuf-2) ; remove package when no longer needed + ("qtbase" ,qtbase-5) + ("sdl" ,(sdl-union (list sdl sdl-mixer))) + ("sqlite" ,sqlite) + ("tinyxml" ,tinyxml) + ("websocketpp" ,websocketpp) + ("zlib" ,zlib))) + (arguments + `(#:tests? #f ; No test suite + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "." "\\.pro$") + (("/opt/gsasl") + (assoc-ref inputs "gsasl")) + (("LIB_DIRS =") + (string-append "LIB_DIRS = " + (assoc-ref inputs "boost") "/lib"))) + #t)) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (invoke "qmake" "pokerth.pro" "CONFIG+=client" + (string-append "PREFIX=" (assoc-ref outputs "out")))))))) + (home-page "https://www.pokerth.net") + (synopsis "Texas holdem poker game") + (description + "With PokerTH you can play the Texas holdem poker game, either against computer opponents or against real players online.") - (license license:agpl3+))) + (license license:agpl3+)))) (define-public xblackjack (package