From patchwork Sat Apr 12 18:46:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 41704 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 3BA4B27BC4B; Tue, 15 Apr 2025 21:10:45 +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=-5.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, PP_MIME_FAKE_ASCII_TEXT,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 8AFD727BC49 for ; Tue, 15 Apr 2025 21:10:44 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u4mGj-0001l0-Ar; Tue, 15 Apr 2025 15:48:30 -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 1u4mBb-0001JT-Eu for guix-patches@gnu.org; Tue, 15 Apr 2025 15:43:11 -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 1u4mBX-0008E4-Ij for guix-patches@gnu.org; Tue, 15 Apr 2025 15:43:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=iyobCw0UIHnP2/TrRlK0lP1N16/iiEz8HGh7mF9kX8I=; b=Jxbxx8mRqpJnGhrZJAAuJMnStHjV35rljvu3D8uDPAx9FgIGwWDqTR7FaWXW6cRYA1EDTUqG8opyNNRnBEplUIitEOzuIT7vXpPBIN5i+PyWf9j/IBXAjV7+fxbbuZeGG5xsFN0PwEW3e5lIrZWctb20kj62AHpBRHXlKWIjb+uEWKjuyAqECEPGW1SswbqgX5oUE2KilHqK9yMiVdrS9QUoL7ihr2sFvjKT0JVueIAqXy7RdsY+gkFlTvEpp8zKbvMa5VdB1AR7HH08Tz7pU2PJdwOhO5vZLL+EsAuXnz5TSCQ3NgrtWXFyNPwFvXOVia5Y140yoUS+T3qSQZUArA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u4mBW-0007qL-VZ for guix-patches@gnu.org; Tue, 15 Apr 2025 15:43:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77770] [PATCH v2 2/2] gnu: dino: Update to 0.5.0. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 15 Apr 2025 19:43:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77770 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77770@debbugs.gnu.org Cc: vivien@planete-kraus.eu, Frank Pursel , Maxim Cournoyer Received: via spool by 77770-submit@debbugs.gnu.org id=B77770.174474615029951 (code B ref 77770); Tue, 15 Apr 2025 19:43:06 +0000 Received: (at 77770) by debbugs.gnu.org; 15 Apr 2025 19:42:30 +0000 Received: from localhost ([127.0.0.1]:55869 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u4mAv-0007n0-Kq for submit@debbugs.gnu.org; Tue, 15 Apr 2025 15:42:30 -0400 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:54745) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u4mAn-0007mM-Fq for 77770@debbugs.gnu.org; Tue, 15 Apr 2025 15:42:22 -0400 Received: by mail-ed1-x543.google.com with SMTP id 4fb4d7f45d1cf-5efe8d9eb12so9992442a12.1 for <77770@debbugs.gnu.org>; Tue, 15 Apr 2025 12:42:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744746135; x=1745350935; darn=debbugs.gnu.org; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=iyobCw0UIHnP2/TrRlK0lP1N16/iiEz8HGh7mF9kX8I=; b=FywU5GQsKZtbTLYu42U1ZGL+/MbFKUMu5oSm9jUJH84phAvjxlclS0+pEoobtrjYQC knpy2FdsfPJPYyPxhk+QXUdFSaVXbVn8J+q9LJw0kVgY/P7bK3ph7j+GgyYx9k6oFn06 zumy43s/c9rQ+lliUjNCBMQncZOgarWJCqpuzV6I9Nskst7XzqUx1iw1dgDnT4bsG2D6 SrInua0w1rV4noVavqnE5ZwBRaOtDEjpQu8NnUpqyoE9GBChNEuJXG2H0PGmqgZL2CFv GiT/LgY4NPf5HWEkvqs1kLAVxpd20JacUSM3JRM4o0CDilIXhBHiLs99s+nq0Ja9ZFdt Hy+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744746135; x=1745350935; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=iyobCw0UIHnP2/TrRlK0lP1N16/iiEz8HGh7mF9kX8I=; b=U9lEdRFZhNUwYs/XS3q1Iqs+ygcsCOxBT7WBHfSpXsTHJBeyd+McFjQ2gqQzz2DpFU DNvHbTsMSJ+7lLJ2W1rKKHjDO7lB9TTrZ2CmKN7TeXfIC2OwccmDrLBhFDybnGCoAqRw 2qb0XHrHH7W7n1yYBpJK1yLiyV5Vjx4KCed/w6J32jPN+UtmaUOUCzT00ptCJsHe3UmD J9U6nn+iWfauDYZiyk9QEB02o4l8NfeWNEvePXhzI4vlfyjRLQMQyUQ9L6pLPS2rndw8 rWDMinr1T4Wwd/tZd08yE2YHdo9JgWNZR+KrS3HRM3dmibXu1I6ymLZsIMi9zHwGHwUo siVw== X-Gm-Message-State: AOJu0Yzw2bEqWhjvUxdDbFXNIs0vciui3b7lBGPkvAxjgKZtyezjNFrG S6YhihzBM//kRsDti6tD09YDnqjbxYCAqH5en27irq5CpqPwlIhHRBacL38m X-Gm-Gg: ASbGncu/C/ehJnteG5xio4FIdFojBL0uvV3X3Xw3J0JePy+MLJM3ycPX/GPOP3NxNkE 0WSYQbd8qHGIWKg31wBRnfuY/WzrFazJCnaYZ0vTnIEjvbH5+OwKgzpV/fsFXVMF8OWiadgxmlJ h2Nj0wgZptq3argT3809MKFik0keI7MQhe2/Va5LumctdGRpkJjYgJpoeWpvIr2I4S5meLysAr0 aE06r+jzxJv9OBcM66rMPCl5plOJrB2KljvotZ4wC+RiTH/fFjAgy2ECvuN8SH6WQ/h/04JZ38o xAWEjL4riEvPe1ylHG2McARAXXKz98xzyGm+o094aJGl+xUIRqLLgvH5jml/U9RKgZO/4QqYjfY efZJ7R0hFsr0B91JS X-Google-Smtp-Source: AGHT+IFyw9AUNTD0s+qM9L5RN68FdjFxu7LfZPWyK1ZTlhaJPee7Hh7jwLoalKyJexGVni2RqjdRbQ== X-Received: by 2002:a17:906:da8c:b0:ac3:49f0:4d10 with SMTP id a640c23a62f3a-acb3844ab6fmr24338666b.38.1744746135035; Tue, 15 Apr 2025 12:42:15 -0700 (PDT) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5f36ef562b6sm7613252a12.24.2025.04.15.12.42.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Apr 2025 12:42:14 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 12 Apr 2025 20:46:13 +0200 Message-ID: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/messaging.scm (dino): Update to 0.5.0. [build-system]: Use meson-build-system. [arguments]: Drop configure-flags, parallel-build, modules, and imported-modules. <#:glib-or-gtk?>: Set to #t. <#:phases>: Adjust accordingly. Add ‘hardcode-version’. [inputs]: Replace libsignal-protocol-c with libomemo-c. --- gnu/packages/messaging.scm | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) -- libgit2 1.5.2 diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 6f9cca2..c27ca1d 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1407,55 +1407,43 @@ (define-public gajim-openpgp (define-public dino (package (name "dino") - (version "0.4.5") + (version "0.5.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/dino/dino/releases/download/v" version "/dino-" version ".tar.gz")) (sha256 - (base32 "129v048k3fp0xwwm6fr5h9nn82zg8bp66z3dy0jsqqd3wdxsxqw1")))) - (build-system cmake-build-system) + (base32 "1hghyldh95i6sx778nkbmfn5qbi2h7qpv59vzi7zz9anmxgjckli")))) + (build-system meson-build-system) (outputs '("out" "debug")) (arguments - (list #:configure-flags #~(list "-DBUILD_TESTS=true" "-DUSE_SOUP3=true") - #:parallel-build? #f ; not supported - #:modules '((guix build cmake-build-system) - ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) - (guix build utils)) - #:imported-modules `(,@%default-gnu-imported-modules - (guix build cmake-build-system) - (guix build glib-or-gtk-build-system)) + (list #:glib-or-gtk? #t #:phases #~(modify-phases %standard-phases - ;; For A/V support. - (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file - (assoc-ref glib-or-gtk:%standard-phases - 'generate-gdk-pixbuf-loaders-cache-file)) + (add-after 'unpack 'hardcode-version + (lambda _ + ;; XXX: the meson.build code to locate the version script + ;; is wrong and raises an error. + (substitute* "libdino/src/version.vala.in" + (("%VERSION%") #$version)))) (add-after 'install 'wrap (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (dino (string-append out "/bin/dino")) (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))) (wrap-program dino `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)) `("GDK_PIXBUF_MODULE_FILE" = - (,(getenv "GDK_PIXBUF_MODULE_FILE"))))))) - (add-after 'install 'glib-or-gtk-wrap - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "./libdino-test") - (invoke "./signal-protocol-vala-test") - (invoke "./xmpp-vala-test"))))))) + (,(getenv "GDK_PIXBUF_MODULE_FILE")))))))))) (native-inputs (list gettext-minimal `(,glib "bin") gobject-introspection `(,gtk "bin") pkg-config + ;; python ; for version.py vala)) (inputs (list adwaita-icon-theme @@ -1478,7 +1466,7 @@ (define-public dino libgcrypt libgee libnice - libsignal-protocol-c + libomemo-c libsoup libsrtp ;for calls support pango ;gtk4 wants pango 1.50+