From patchwork Sat Feb 19 15:03:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 37356 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 4104827BBEB; Sat, 19 Feb 2022 15:56:15 +0000 (GMT) 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,MAILING_LIST_MULTI, SPF_HELO_PASS,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 07BCC27BBEA for ; Sat, 19 Feb 2022 15:56:15 +0000 (GMT) Received: from localhost ([::1]:53264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nLS5m-00045O-2c for patchwork@mira.cbaines.net; Sat, 19 Feb 2022 10:56:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nLS5b-00044w-M7 for guix-patches@gnu.org; Sat, 19 Feb 2022 10:56:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36473) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nLS5Z-0001GN-P9 for guix-patches@gnu.org; Sat, 19 Feb 2022 10:56:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nLS5Z-0000ux-Kj for guix-patches@gnu.org; Sat, 19 Feb 2022 10:56:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54065] [PATCH 1/3] gnu: Add poco. References: <2b30b57085cbc6896cd6b609a75a2ac7ad798d82.camel@gmail.com> In-Reply-To: <2b30b57085cbc6896cd6b609a75a2ac7ad798d82.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Feb 2022 15:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54065 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54065@debbugs.gnu.org Received: via spool by 54065-submit@debbugs.gnu.org id=B54065.16452861053440 (code B ref 54065); Sat, 19 Feb 2022 15:56:01 +0000 Received: (at 54065) by debbugs.gnu.org; 19 Feb 2022 15:55:05 +0000 Received: from localhost ([127.0.0.1]:58599 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nLS4f-0000tQ-Cb for submit@debbugs.gnu.org; Sat, 19 Feb 2022 10:55:05 -0500 Received: from mail-ej1-f66.google.com ([209.85.218.66]:46953) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nLS4d-0000se-QL for 54065@debbugs.gnu.org; Sat, 19 Feb 2022 10:55:04 -0500 Received: by mail-ej1-f66.google.com with SMTP id qx21so22053422ejb.13 for <54065@debbugs.gnu.org>; Sat, 19 Feb 2022 07:55:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:content-transfer-encoding:message-id :mime-version; bh=gTKXfH4pHKRRoln2WR000lSlMsr8aVquu7H0UkJ7IQA=; b=nNVsJVbdhAq/rzLQrNmFJsbviTgilr19igigZk+gD4aWCLjrBIFhJO4WqP80Me9kBG JxBGlgzOeiVjCoPtVB1whQcpyK5AnQRcS0ZqxqaD55/asLXhu3/86fhhHe9t/zSfMD8S 4kf3LqYWVITAo/i7CludAQbfka2Cjp3OsTnI1fZgGo/gyRbmNdWsaGsy5odSBKsBoHub UeVMp6eH2To2g3REBeBXX6X5qGaNZ41JAyv7khhZmIGxM7IJTO8gn2vavRLAAqADxwUe MQzDxaMsKkkUwDlSOAfzdViG/tFNqFyZPRmr4no1HVoadbG3r6BGNY5zBLM+Kf8bS7h8 d0/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:content-transfer-encoding :message-id:mime-version; bh=gTKXfH4pHKRRoln2WR000lSlMsr8aVquu7H0UkJ7IQA=; b=gmE1/8lfRlEiX/ivx60lumT5+Rm22PK0lwVdWvGhSBf4L5bD39XrevNr6C/sAErytJ cTjHYQ9v3jJDQiTZBec6PP564udnXR5dRb4PqS1IRIvZW4o1NkgOXGNI7+HrG9tkEFkn r1taEjJEF2xo77OUZYnr/ClZeGcYksoqMA1w4vmSVx72ev8PAcJ26Iuw+XISWTKewJZ7 +LhKOIp/vWsasFpl9NzxKa/pfJbq71A6tBXxbaulNpx1gxqcpYJvhpOxBUgF+AQGbVXF Dauq9h9/g5gwOUWbba1WOUBBTiCumVOt57lbEY80slwv5JhqUBAjC3atUmDRZYGlOLYW y5Rg== X-Gm-Message-State: AOAM530A0zvbaeLLvfY7mLSsb5a+JoGqZibi79n72QyEKSC+xSIclF9b A4CZCtmTY2z4l9l/TeFVZ0JnfAt9ozhDqQ== X-Google-Smtp-Source: ABdhPJwZRtz9Dk7IlCZ4AYUNmdA+VZG3YFiR/ELtHsZ7cr0N2FLlmSXZHVceOrCcAubuftX0MhvBXw== X-Received: by 2002:a17:906:35d5:b0:6b7:faf7:9611 with SMTP id p21-20020a17090635d500b006b7faf79611mr10437125ejb.537.1645286097673; Sat, 19 Feb 2022 07:54:57 -0800 (PST) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id b4sm3420670edu.105.2022.02.19.07.54.57 for <54065@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Feb 2022 07:54:57 -0800 (PST) From: Liliana Marie Prikler Date: Sat, 19 Feb 2022 16:03:37 +0100 Message-ID: <3e84435d1065b29401c245a66463ffa4f1e15afb.camel@gmail.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/cpp.scm (poco): New variable. --- gnu/packages/cpp.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 86138531c0..66e5c6f257 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1073,6 +1073,39 @@ (define-public folly (supported-systems '("aarch64-linux" "x86_64-linux")) (license license:asl2.0))) +(define-public poco + (package + (name "poco") + (version "1.11.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pocoproject/poco") + (commit (string-append "poco-" version "-release")))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0qkf8vb4qwds6idk9fkw6wjvcdk5k8h77x3gv47l0i4jfl5hwn8b")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DENABLE_TESTS=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-problematic-tests + (lambda _ + (substitute* (list "Foundation/CMakeLists.txt" ; XXX: fails. + ;; Require network access + "Net/CMakeLists.txt" + "MongoDB/CMakeLists.txt" + "Redis/CMakeLists.txt") + (("ENABLE_TESTS") "FALSE"))))))) + (home-page "https://pocoproject.org/") + (synopsis "Portable C++ components") + (description "A collection of libraries intended to be useful for building +network-based applications.") + (license license:boost1.0))) + (define-public aws-crt-cpp (let* ((commit "b6d311d76b504bf8ace5134d3fca0e672c36c9c3") (revision "1")) From patchwork Sat Feb 19 15:05:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 37357 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 B239327BBEA; Sat, 19 Feb 2022 15:56:17 +0000 (GMT) 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,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 0299127BBE9 for ; Sat, 19 Feb 2022 15:56:17 +0000 (GMT) Received: from localhost ([::1]:53296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nLS5o-00047W-4B for patchwork@mira.cbaines.net; Sat, 19 Feb 2022 10:56:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44046) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nLS5b-00044u-ML for guix-patches@gnu.org; Sat, 19 Feb 2022 10:56:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36474) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nLS5a-0001GX-0p for guix-patches@gnu.org; Sat, 19 Feb 2022 10:56:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nLS5a-0000v5-0y for guix-patches@gnu.org; Sat, 19 Feb 2022 10:56:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54065] [PATCH 2/3] gnu: mumble: Update to 1.4.230. References: <2b30b57085cbc6896cd6b609a75a2ac7ad798d82.camel@gmail.com> In-Reply-To: <2b30b57085cbc6896cd6b609a75a2ac7ad798d82.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Feb 2022 15:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54065 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54065@debbugs.gnu.org Received: via spool by 54065-submit@debbugs.gnu.org id=B54065.16452861103454 (code B ref 54065); Sat, 19 Feb 2022 15:56:01 +0000 Received: (at 54065) by debbugs.gnu.org; 19 Feb 2022 15:55:10 +0000 Received: from localhost ([127.0.0.1]:58601 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nLS4j-0000td-NR for submit@debbugs.gnu.org; Sat, 19 Feb 2022 10:55:10 -0500 Received: from mail-ej1-f65.google.com ([209.85.218.65]:41747) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nLS4e-0000sg-5y for 54065@debbugs.gnu.org; Sat, 19 Feb 2022 10:55:05 -0500 Received: by mail-ej1-f65.google.com with SMTP id a8so22139162ejc.8 for <54065@debbugs.gnu.org>; Sat, 19 Feb 2022 07:55:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:mime-version:to:content-transfer-encoding :message-id; bh=yOw4r5J/mVBpEs2w8gsfk/EX6S9EPCcaGNn3w60e+Uo=; b=W6uvwdswcd8MGmHfBnAToktWS+WpaiY17IYU32sYLGwFWzbDx4Uw2DhWAcaW3y4VnJ tvrdy778neosN3HqG1Z70qnHiCXfK69jNpo7Uzixqn0Mw/0xsHPWuxqYp2emJpV5pAj+ Ld+SVYpo0hKvQrhMU7OzMKtMyOD6oI0HS7QVJ6oHhhGlx9Ps6wMipum0vvFJ//uDuPpP 7RP0EMWlrzYlUsuaz6SmGQ+oitWvWDJhbgKhqaJOoTLWk8h4xul0jNpFZtLkkeX8w7lF KqwnzH8NwUb4/lrhuK4QzdKVDqiJOqgU+/dtbH8+GDStPtE/7dcwDdFzErj9hNO0q5AQ zHYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:mime-version:to :content-transfer-encoding:message-id; bh=yOw4r5J/mVBpEs2w8gsfk/EX6S9EPCcaGNn3w60e+Uo=; b=T9ioYn7kgPwlGC4aU/QeY2cEIbnBqr0DDRoUbTiu/TMID3TCuNu6a+p2t7Zzpvq4Oz EASJqSjh0X6J6fSbuOJKRMN4ycjmcmHMUFka0os4z6GuoJBbqrwIUamcFyPEubGxKdVL crNLhv9rPTgSSak9Vh9K4xDHgnEsXQ0ZxrC7BHCZxVwjGQux+bouOh3aRXbBmreP6ME3 sMQVBj2HYdIFRjUE6At6NpwnkY0m+ZvgUTbBjDD3269xLX3GaCe+fFdzmFy5ZXDhi593 SuALEpFYl5xkbD5TP40u9zwYgUzRyoaUfSZ2hdd6snqgp3yGsMiuAhXFJr78nmNK7Yy7 jN2g== X-Gm-Message-State: AOAM530G0f+c/HY51LNR1h9L6yJOy31kc0cgOJWadntab83xOyxvmn3b ZAtX6XnJnStShu7Tt7/nc1rcPfnpimjYOA== X-Google-Smtp-Source: ABdhPJz+T0zaQxd9KddwasB91M/2ZDGbkTLUOiEGYOa6kpKtpKPfnCOcj+Nl2J/0y8uQXEWJI+MtHw== X-Received: by 2002:a17:906:6144:b0:6cf:bb2e:a2e1 with SMTP id p4-20020a170906614400b006cfbb2ea2e1mr10785925ejl.299.1645286098325; Sat, 19 Feb 2022 07:54:58 -0800 (PST) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id b4sm3420670edu.105.2022.02.19.07.54.57 for <54065@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Feb 2022 07:54:57 -0800 (PST) From: Liliana Marie Prikler Date: Sat, 19 Feb 2022 16:05:34 +0100 MIME-Version: 1.0 Message-ID: <34a6990351163c04b41a0a5d4b131133c370f519.camel@gmail.com> 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/telephony.scm (find-python-interpreter-cmake-modules): New variable. (mumble): Update to 1.4.230. [source]: Adjust uri and snippet accordingly. [arguments]: Change to a list of G-expressions. <#:configure-flags>: New argument. <#:phases>: Drop ‘configure’ (moved to configure-flags). Add ‘unpack-submodules’, ‘fix-settings-crash’ and ‘hardcode-pulseaudio’. [inputs]: Add glib and poco. --- gnu/packages/telephony.scm | 154 +++++++++++++++++-------------------- 1 file changed, 71 insertions(+), 83 deletions(-) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index b4b2585935..59f7741579 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -50,6 +50,7 @@ (define-module (gnu packages telephony) #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages crypto) #:use-module (gnu packages databases) #:use-module (gnu packages docbook) @@ -91,6 +92,7 @@ (define-module (gnu packages telephony) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system cmake) @@ -536,34 +538,48 @@ (define-public seren (home-page "http://holdenc.altervista.org/seren/") (license license:gpl3+))) +(define find-python-interpreter-cmake-modules + (let ((commit "bb4d3ea8434eebef40df35434a9b6ef410fce0b2") + (revision "0")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Krzmbrzl/FindPythonInterpreter") + (commit commit))) + (file-name (git-file-name "find-python-interpreter" + (git-version "0" revision commit))) + (sha256 + (base32 + "1ryhda2yqgrhnwndfg52mscdsclg1ivv746hvalcay5m1wy2h5bm"))))) + (define-public mumble (package (name "mumble") - (version "1.3.4") + (version "1.4.230") (source (origin (method url-fetch) (uri (string-append - "https://github.com/mumble-voip/mumble/releases/download/" + "https://github.com/mumble-voip/mumble/releases/download/v" version "/" name "-" version ".tar.gz")) (sha256 (base32 - "14v0rgy1a5alxmz7ly95y38bdj0hx79yysgkcd8r8p9qqfzlwpv1")) + "1c1lwj0cpyawr74adpdrsnxk8ra5kqrjbg65cnwk8n6cwss84zdn")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet `(begin (let ((keep - '("arc4random-src" + '("arc4random" "celt-0.7.0-build" "celt-0.7.0-src" "celt-0.11.0-build" "celt-0.11.0-src" - "qqbonjour-src" "rnnoise-build" "rnnoise-src" - "smallft-src"))) + "qqbonjour" + "smallft"))) (with-directory-excursion "3rdparty" (for-each delete-file-recursively (lset-difference string=? @@ -572,48 +588,40 @@ (define-public mumble #t))))) (build-system qt-build-system) (arguments - `(#:tests? #f ; no "check" target - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (invoke "qmake" "main.pro" "QMAKE_LRELEASE=lrelease" - (string-append "MUMBLE_PYTHON=" - (search-input-file inputs - "/bin/python3")) - (string-append "CONFIG+=" - (string-join - ;; Options used are listed in the same order - ;; as in the "INSTALL" file - ;; (plus the final "packaged" and "release"). - (list "no-bundled-speex" ; in speex - "no-bundled-opus" ; in opus - "no-g15" ; not packaged - "no-jackaudio" ; use pulse - "no-oss" ; use pulse - "no-alsa" ; use pulse - "no-update" - "no-embed-qt-translations" - "no-ice" ; not packaged - "packaged" - "release"))) - (string-append "DEFINES+=" - "PLUGIN_PATH=" - (assoc-ref outputs "out") - "/lib/mumble")))) - (add-before 'configure 'fix-libspeechd-include - (lambda _ - (substitute* "src/mumble/TextToSpeech_unix.cpp" - (("libspeechd.h") "speech-dispatcher/libspeechd.h")) - #t)) - ;; disable statistic gathering by default. see - (add-before 'configure 'fix-statistic-gathering-default - (lambda _ - (substitute* "src/mumble/Settings.cpp" - (("bUsage = true;") "bUsage = false;")) - #t)) - (add-before 'configure 'fix-mumble-overlay - (lambda* (#:key outputs #:allow-other-keys) + (list + #:tests? #f ; no "check" target + #:configure-flags + #~(list "-Dbundled-speex=off" + "-Dbundled-opus=off" + ;; "-Dbundled-rnnoise=off" ; XXX: not yet in release + "-Dalsa=off" ; use pulse + "-Dcoreaudio=off" ; use pulse + "-Dice=off" ; not packaged + "-Djackaudio=off" ; use pulse + "-Doss=off" ; use pulse + "-Dpulseaudio=on" + "-Dportaudio=off" ; use pulse + "-Dpipewire=off" ; use pulse + "-Doverlay-xcompile=off" + "-Dupdate=off" ; don't phone home + "-Dbundle-qt-translations=off") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'unpack-submodules + (lambda _ + (copy-recursively #$find-python-interpreter-cmake-modules + "3rdparty/FindPythonInterpreter"))) + (add-after 'unpack 'disable-murmur-ice + (lambda _ + (substitute* "scripts/murmur.ini" + (("^ice=") ";ice=")))) + ;; disable statistic gathering by default. see + (add-after 'unpack 'fix-statistic-gathering-default + (lambda _ + (substitute* "src/mumble/Settings.h" + (("bUsage *= true;") "bUsage = false;")))) + (add-after 'unpack 'fix-mumble-overlay + (lambda* (#:key outputs #:allow-other-keys) (with-output-to-file "scripts/mumble-overlay" (lambda () (format #t "#!~a~%" (which "bash")) @@ -622,55 +630,35 @@ (define-public mumble "/lib/mumble/libmumble.so.1")) (format #t "exec \"${@}\""))) #t)) - (add-before 'install 'disable-murmur-ice - (lambda _ - (substitute* "scripts/murmur.ini.system" - (("^ice=") ";ice=")) - #t)) - (replace 'install ; install phase does not exist - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (etc (string-append out "/etc/murmur")) - (dbus (string-append out "/etc/dbus-1/system.d/")) - (bin (string-append out "/bin")) - (services (string-append out "/share/services")) - (applications (string-append out "/share/applications")) - (icons (string-append out "/share/icons/hicolor/scalable/apps")) - (man (string-append out "/share/man/man1")) - (lib (string-append out "/lib/mumble"))) - (install-file "release/mumble" bin) - (install-file "scripts/mumble-overlay" bin) - (install-file "scripts/mumble.protocol" services) - (install-file "scripts/mumble.desktop" applications) - (install-file "icons/mumble.svg" icons) - (install-file "man/mumble-overlay.1" man) - (install-file "man/mumble.1" man) - (install-file "release/murmurd" bin) - (install-file "scripts/murmur.ini.system" etc) - (rename-file (string-append etc "/murmur.ini.system") - (string-append etc "/murmur.ini")) - (install-file "scripts/murmur.conf" dbus) - (install-file "man/murmurd.1" man) - (for-each (lambda (file) (install-file file lib)) - (find-files "." "\\.so\\.")) - (for-each (lambda (file) (install-file file lib)) - (find-files "release/plugins" "\\.so$")) - #t)))))) + (add-after 'unpack 'fix-settings-crash + (lambda _ + (substitute* "src/mumble/AudioConfigDialog.cpp" + (("updateEchoEnableState\\(\\) \\{" all) + (string-append all + "if (!AudioInputRegistrar::qmNew) return;"))))) + (add-after 'unpack 'hardcode-pulseaudio + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/mumble/PulseAudio.cpp" + (("libpulse.so") (search-input-file inputs "/lib/libpulse.so")))))))) (inputs (list avahi boost + glib ; for speech-dispatcher libsndfile libxi mesa ; avoid bundled openssl opus ; avoid bundled + poco protobuf pulseaudio qtbase-5 qtsvg speech-dispatcher speex ; avoid bundled - speexdsp)) ; avoid bundled + speexdsp ; avoid bundled + ;; xiph-rnnoise ; TODO: unbundle rnnoise + )) (native-inputs (list pkg-config python qttools)) (synopsis "Low-latency, high quality voice chat software") From patchwork Sat Feb 19 15:37:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 37358 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 E27BA27BBEA; Sat, 19 Feb 2022 15:56:23 +0000 (GMT) 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,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 AA57227BBE9 for ; Sat, 19 Feb 2022 15:56:23 +0000 (GMT) Received: from localhost ([::1]:53726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nLS5u-0004Oc-Q6 for patchwork@mira.cbaines.net; Sat, 19 Feb 2022 10:56:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nLS5b-00044v-Lt for guix-patches@gnu.org; Sat, 19 Feb 2022 10:56:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36475) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nLS5a-0001Gn-Er for guix-patches@gnu.org; Sat, 19 Feb 2022 10:56:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nLS5a-0000vD-F6 for guix-patches@gnu.org; Sat, 19 Feb 2022 10:56:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54065] [PATCH 3/3] gnu: mumble: Enable tests. References: <2b30b57085cbc6896cd6b609a75a2ac7ad798d82.camel@gmail.com> In-Reply-To: <2b30b57085cbc6896cd6b609a75a2ac7ad798d82.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Feb 2022 15:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54065 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54065@debbugs.gnu.org Received: via spool by 54065-submit@debbugs.gnu.org id=B54065.16452861103460 (code B ref 54065); Sat, 19 Feb 2022 15:56:02 +0000 Received: (at 54065) by debbugs.gnu.org; 19 Feb 2022 15:55:10 +0000 Received: from localhost ([127.0.0.1]:58603 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nLS4k-0000tf-9Y for submit@debbugs.gnu.org; Sat, 19 Feb 2022 10:55:10 -0500 Received: from mail-ed1-f65.google.com ([209.85.208.65]:34478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nLS4e-0000sh-T8 for 54065@debbugs.gnu.org; Sat, 19 Feb 2022 10:55:05 -0500 Received: by mail-ed1-f65.google.com with SMTP id z22so20715089edd.1 for <54065@debbugs.gnu.org>; Sat, 19 Feb 2022 07:55:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:mime-version:to:content-transfer-encoding :message-id; bh=MKSOOavUjKKij/E4JZSOIKmlpXlHNxPa1P25//uwv3c=; b=Xr6BtY88kRri0ry38/70yXv8g1VMwdGEJ1+lGwgzkqyCgHKJYLBN5C1RZjg+iontAv eAIJcss8UBQJ+4BB1cP3VBFAdS3X1FT9T55MtheiMtAG959S5Eh2v789mgHHqf3LLPtc 0bAj07U+DYnF32yxQb1H9CfxZIUStF/OxNB3bbUpaXSEI7MPUk89KPkVXghtwAxbMOVf TvVlENAnd1doQ90JlAuRUVjkwwxGEF4fb4WmAMDfKXnsqH3v6QWSfL2agivEZGnBdow2 h+R9xfnRfEmoAttRFsMiqhSwb4+tc6juf2RgimGZEZ05HBNYjjhQE6LDlWHmPjRn3Phn Mo7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:mime-version:to :content-transfer-encoding:message-id; bh=MKSOOavUjKKij/E4JZSOIKmlpXlHNxPa1P25//uwv3c=; b=tmk636hq+QI69cUrZXAtSYWL/zF5NLZydlkHhfbVrI3fVP3vhALOe7wsKdIxdX1iSE OvIXSPazyvecMMCErKTiWD6OO8JAl45n8D0Pb4y0oGNxATGAQTyNOCNuRye9CmK+l1XU N0ljMWd7d8lggFroZE5G+otXb8O1qc2qYGgF4hnqt55qvIUN/RLUFcPkdfBPnvXO83Er DcCXo1sgZcQKtmXmA6jfYUuZIAlzlcEdK8JIlJ4eoPdntdysYgPeAGnpl2/e1/tZ9YLQ 0VjtM8iZ5HvZtsb5kgCpH6EvJKDtI+DXhb14ZFDxZ84hi4D1G+VTo8Bbp8nIYLSSHRss ovpA== X-Gm-Message-State: AOAM531ff2LxsEhVdP9cOXSstEAmBbCWmGixdypflUaCJmKssOJbqZQS DCuqPf5z4KGIprXvVw9Vvc+UDrZScwerlA== X-Google-Smtp-Source: ABdhPJzTBfjiZOZmd5Xiomovp84sG9a+teMCXX+m227HsK46MqIVtNUK47vZYLvSURZYXq9MpStQjA== X-Received: by 2002:aa7:c0ce:0:b0:400:1a:e9a2 with SMTP id j14-20020aa7c0ce000000b00400001ae9a2mr13811806edp.396.1645286099000; Sat, 19 Feb 2022 07:54:59 -0800 (PST) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id b4sm3420670edu.105.2022.02.19.07.54.58 for <54065@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Feb 2022 07:54:58 -0800 (PST) From: Liliana Marie Prikler Date: Sat, 19 Feb 2022 16:37:51 +0100 MIME-Version: 1.0 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 * gnu/packages/telephony.scm (mumble)[#:tests?]: Drop argument. [#:configure-flags]: Add “-Dtests=on”. --- gnu/packages/telephony.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 59f7741579..92a727683a 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -589,7 +589,6 @@ (define-public mumble (build-system qt-build-system) (arguments (list - #:tests? #f ; no "check" target #:configure-flags #~(list "-Dbundled-speex=off" "-Dbundled-opus=off" @@ -604,6 +603,7 @@ (define-public mumble "-Dpipewire=off" ; use pulse "-Doverlay-xcompile=off" "-Dupdate=off" ; don't phone home + "-Dtests=on" "-Dbundle-qt-translations=off") #:phases #~(modify-phases %standard-phases