From patchwork Wed Nov 29 05:40:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 57033 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 3B04A27BBE9; Wed, 29 Nov 2023 05:41:19 +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_INVALID, DKIM_SIGNED,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 9AD9C27BBE2 for ; Wed, 29 Nov 2023 05:41:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8DJi-0000nm-3S; Wed, 29 Nov 2023 00:40:58 -0500 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 1r8DJf-0000nK-NN for guix-patches@gnu.org; Wed, 29 Nov 2023 00:40:55 -0500 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 1r8DJf-0006Il-0i for guix-patches@gnu.org; Wed, 29 Nov 2023 00:40:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8DJl-0002Pp-S0 for guix-patches@gnu.org; Wed, 29 Nov 2023 00:41:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67493] [PATCH gnome-team v2 1/4] gnu: Add expected-lite References: In-Reply-To: Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Nov 2023 05:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67493 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67493@debbugs.gnu.org Cc: Saku Laesvuori Received: via spool by 67493-submit@debbugs.gnu.org id=B67493.17012364419220 (code B ref 67493); Wed, 29 Nov 2023 05:41:01 +0000 Received: (at 67493) by debbugs.gnu.org; 29 Nov 2023 05:40:41 +0000 Received: from localhost ([127.0.0.1]:48568 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8DJR-0002Oe-6W for submit@debbugs.gnu.org; Wed, 29 Nov 2023 00:40:41 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101]:51926 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8DJM-0002OS-HX for 67493@debbugs.gnu.org; Wed, 29 Nov 2023 00:40:39 -0500 Received: from X-kone.lan (88-113-24-127.elisa-laajakaista.fi [88.113.24.127]) by mail.laesvuori.fi (Postfix) with ESMTPSA id E86B5342FEF; Wed, 29 Nov 2023 06:40:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1701236427; bh=AYqJab63C4KliexkFy6GjG22PJfvYZF+1RBmeH8hReU=; h=From:To:Cc:Subject:Date; b=cwrAvKg1f3WblfQbTovsxt9c3RX2CZXeoMzlMWvHasEA2fr2SAAeJFnr/9WInFFpl H5qYUMl4yACB3eTU/PgtslMfIlpj9hEtWnAbiHsxQnXVKu598/NaNCt5uvB81g8EL8 AgURABbstj2Rzf5oUFtJWRCyNlSR/JI/+0GbZ1wY= Date: Wed, 29 Nov 2023 07:40:08 +0200 Message-ID: <5c5ee4632e7a6435f483337e4a4fbce31d49fc42.1701236254.git.saku@laesvuori.fi> X-Mailer: git-send-email 2.41.0 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: , Reply-to: Saku Laesvuori X-ACL-Warn: , Saku Laesvuori via Guix-patches X-Patchwork-Original-From: Saku Laesvuori via Guix-patches via From: Saku Laesvuori 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/cpp.scm (expected-lite): New variable. Change-Id: I627bc4a811107b1c4fb9ed8f3e2a5b23043eb97c --- gnu/packages/cpp.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) base-commit: 60db3a6b3f6e4d1bd751d04b7d9ad1e894febf93 diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 49e5b52e5f..5b59274659 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2023 Denis 'GNUtoo' Carikli ;;; Copyright © 2023 Foundation Devices, Inc. ;;; Copyright © 2023 Paul A. Patience +;;; Copyright © 2023 Saku Laesvuori ;;; ;;; This file is part of GNU Guix. ;;; @@ -2977,3 +2978,24 @@ (define-public tl-optional the std::optional for C++11/14/17, with support for monadic operations added in C++23.") (license license:cc0))) + +(define-public expected-lite + (package + (name "expected-lite") + (version "0.6.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/martinmoene/expected-lite") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0d58nqh2fwdzdpln2wlnf898wyfxdnskq6ff33azbg92d5ibzys2")))) + (build-system cmake-build-system) + (home-page "https://github.com/martinmoene/expected-lite") + (synopsis "Expected objects for C++11 and later") + (description "Expected lite is a single-file header-only library for +objects that either represent a valid value or an error that you can pass +by value. It is intended for use with C++11 and later") + (license license:boost1.0))) From patchwork Wed Nov 29 05:40:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 57035 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 2A3DA27BBE9; Wed, 29 Nov 2023 05:41:29 +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_INVALID, DKIM_SIGNED,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 5961427BBE2 for ; Wed, 29 Nov 2023 05:41:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8DJm-0000o7-2b; Wed, 29 Nov 2023 00:41:02 -0500 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 1r8DJf-0000nL-LV for guix-patches@gnu.org; Wed, 29 Nov 2023 00:40:55 -0500 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 1r8DJf-0006Iq-8O for guix-patches@gnu.org; Wed, 29 Nov 2023 00:40:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8DJm-0002Q1-8Z; Wed, 29 Nov 2023 00:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67493] [PATCH gnome-team v2 2/4] gnu: Add cppgir Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Wed, 29 Nov 2023 05:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67493 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67493@debbugs.gnu.org Cc: Saku Laesvuori , Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan Received: via spool by 67493-submit@debbugs.gnu.org id=B67493.17012364489240 (code B ref 67493); Wed, 29 Nov 2023 05:41:02 +0000 Received: (at 67493) by debbugs.gnu.org; 29 Nov 2023 05:40:48 +0000 Received: from localhost ([127.0.0.1]:48571 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8DJX-0002Oy-Jo for submit@debbugs.gnu.org; Wed, 29 Nov 2023 00:40:47 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101]:55508 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8DJV-0002Oq-VC for 67493@debbugs.gnu.org; Wed, 29 Nov 2023 00:40:46 -0500 Received: from X-kone.lan (88-113-24-127.elisa-laajakaista.fi [88.113.24.127]) by mail.laesvuori.fi (Postfix) with ESMTPSA id D3B80342FEF; Wed, 29 Nov 2023 06:40:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1701236438; bh=jnMwQcUVL/SHEcNezwHyPL6kOH3FTSvguE4T9hToRYE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=gxeB6Spea/1YlPOzNSnwJYxKQrGCuOKdk1a55h6Ljcj4wl6huLJB7WTOLkK52gG40 78hLvGWCJ+cksUygghcZ8Dv/8n4z9zQp5s4IT7bUK2mdEwhVIb7+mqyPKdwW1eDVxZ YxucEfXIum5u2hQyqqkQGuM7443bD5gyiYnF+7Og= Date: Wed, 29 Nov 2023 07:40:09 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <5c5ee4632e7a6435f483337e4a4fbce31d49fc42.1701236254.git.saku@laesvuori.fi> References: <5c5ee4632e7a6435f483337e4a4fbce31d49fc42.1701236254.git.saku@laesvuori.fi> 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: , Reply-to: Saku Laesvuori X-ACL-Warn: , Saku Laesvuori via Guix-patches X-Patchwork-Original-From: Saku Laesvuori via Guix-patches via From: Saku Laesvuori 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/glib.scm: Import (gnu packages pretty-print). (cppgir): New variable. Change-Id: I7e2cdf2d77382bfe876173901127d358b64c0dfe --- gnu/packages/glib.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index b01b948fc6..8999e5bd45 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -70,6 +70,7 @@ (define-module (gnu packages glib) #:use-module (gnu packages perl-check) #:use-module (gnu packages popt) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages sqlite) @@ -1555,3 +1556,28 @@ (define-public libdex Dex also provides Fibers which allow writing synchronous looking code in C that uses asynchronous and future-based APIs.") (license license:lgpl2.1+))) + +(define-public cppgir + (package + (name "cppgir") + (version "0.1") + (source (origin + (method url-fetch) + (uri (string-append + "https://gitlab.com/mnauw/cppgir/-/archive/v" version + "/cppgir-v" version ".tar.gz")) + (sha256 + (base32 "13plz1xn25lyhfxwyhmlzjn8jliakvqa06a28g5czlav1zg1565g")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DINTERNAL_EXPECTED=OFF"))) + (inputs (list boost fmt expected-lite)) + (home-page "https://gitlab.com/mnauw/cppgir") + (synopsis "A GObject-Introspection C++ binding wrapper generator") + (description "it processes .gir files derived from GObject-Introspection +annotations into a set of C++ files defining suitable namespaces, classes and +other types that together from a C++ binding. In this way, the plain C +libraries and objects become available as native objects along with (RAII) +managed resource handling.") + (license license:expat))) From patchwork Wed Nov 29 05:40:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 57034 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 D90AD27BBEA; Wed, 29 Nov 2023 05:41:24 +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_INVALID, DKIM_SIGNED,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 4E35827BBE2 for ; Wed, 29 Nov 2023 05:41:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8DJr-0000oM-PC; Wed, 29 Nov 2023 00:41:09 -0500 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 1r8DJg-0000nZ-6o for guix-patches@gnu.org; Wed, 29 Nov 2023 00:40:56 -0500 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 1r8DJf-0006Is-C5 for guix-patches@gnu.org; Wed, 29 Nov 2023 00:40:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8DJm-0002Q9-LH for guix-patches@gnu.org; Wed, 29 Nov 2023 00:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67493] [PATCH gnome-team v2 3/4] gnu: Update range-v3 to 0.12.0 Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Nov 2023 05:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67493 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67493@debbugs.gnu.org Cc: Saku Laesvuori Received: via spool by 67493-submit@debbugs.gnu.org id=B67493.17012364559261 (code B ref 67493); Wed, 29 Nov 2023 05:41:02 +0000 Received: (at 67493) by debbugs.gnu.org; 29 Nov 2023 05:40:55 +0000 Received: from localhost ([127.0.0.1]:48574 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8DJf-0002PI-0h for submit@debbugs.gnu.org; Wed, 29 Nov 2023 00:40:55 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101]:32924 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8DJc-0002P9-9N for 67493@debbugs.gnu.org; Wed, 29 Nov 2023 00:40:53 -0500 Received: from X-kone.lan (88-113-24-127.elisa-laajakaista.fi [88.113.24.127]) by mail.laesvuori.fi (Postfix) with ESMTPSA id B42C8342FEF; Wed, 29 Nov 2023 06:40:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1701236444; bh=FCmzpAw1EGNrBxvz3H0Sj0KSLpFAjtQPOA1fso4vtKo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=YV94Qs0kkhxKk1XiIjt9SCFRsmX9ypwEdqFqIlDHOXm7bkU4fOtmGOEcRNSe2XNgT OQjGvXmIO7d1XgWnUJgGs8SqenWD0kR0ljyjZf+R3n0DSRoD48gGBaqnoRiYUWHbsm KMBDT/R6S1G+QC8uTmXodRcdkFfLX9ivS/THoUtw= Date: Wed, 29 Nov 2023 07:40:10 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <5c5ee4632e7a6435f483337e4a4fbce31d49fc42.1701236254.git.saku@laesvuori.fi> References: <5c5ee4632e7a6435f483337e4a4fbce31d49fc42.1701236254.git.saku@laesvuori.fi> 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: , Reply-to: Saku Laesvuori X-ACL-Warn: , Saku Laesvuori via Guix-patches X-Patchwork-Original-From: Saku Laesvuori via Guix-patches via From: Saku Laesvuori 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/cpp.scm (range-v3): Update to 0.12.0 [patches]: Remove upstreamed patch. * gnu/packages/patches/range-v3-build-with-gcc10.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove deleted patch. Change-Id: I426caeef6c058b2015f564ed1485b7e107e061cc --- gnu/local.mk | 1 - gnu/packages/cpp.scm | 5 +- .../patches/range-v3-build-with-gcc10.patch | 122 ------------------ 3 files changed, 2 insertions(+), 126 deletions(-) delete mode 100644 gnu/packages/patches/range-v3-build-with-gcc10.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5cb9874d9f..e7fdfbe342 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1928,7 +1928,6 @@ dist_patch_DATA = \ %D%/packages/patches/qtwayland-cleanup-callbacks.patch \ %D%/packages/patches/ragel-char-signedness.patch \ %D%/packages/patches/randomjungle-disable-static-build.patch \ - %D%/packages/patches/range-v3-build-with-gcc10.patch \ %D%/packages/patches/raptor2-heap-overflow.patch \ %D%/packages/patches/ratpoints-sturm_and_rp_private.patch \ %D%/packages/patches/ratpoison-shell.patch \ diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 5b59274659..efb20b07f0 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -188,7 +188,7 @@ (define-public asmjit (define-public range-v3 (package (name "range-v3") - (version "0.11.0") + (version "0.12.0") (source (origin (method git-fetch) @@ -198,9 +198,8 @@ (define-public range-v3 (commit version))) (file-name (git-file-name name version)) - (patches (search-patches "range-v3-build-with-gcc10.patch")) (sha256 - (base32 "18230bg4rq9pmm5f8f65j444jpq56rld4fhmpham8q3vr1c1bdjh")))) + (base32 "0r85s5rmp5ixmik2y5y4w760pa38j1sg9hbr1fss2flibzvrf53d")))) (build-system cmake-build-system) (arguments (list diff --git a/gnu/packages/patches/range-v3-build-with-gcc10.patch b/gnu/packages/patches/range-v3-build-with-gcc10.patch deleted file mode 100644 index a5d5b33523..0000000000 --- a/gnu/packages/patches/range-v3-build-with-gcc10.patch +++ /dev/null @@ -1,122 +0,0 @@ -From 0487cca29e352e8f16bbd91fda38e76e39a0ed28 Mon Sep 17 00:00:00 2001 -From: Louis Dionne -Date: Tue, 15 Jun 2021 14:40:01 -0400 -Subject: [PATCH] Work around broken integration with latest libc++. (#1635) - -* Work around broken integration with latest libc++. - -In newer versions of libc++, the base template of std::iterator_traits -provides a member typedef called __primary_template which is an alias -to the std::iterator_traits specialization itself. This fix works with -both the old version of libc++ and the new one. - -Fixes issue #1633. - -* Fix is_std_iterator_traits_specialized_v on MSVC - -It used to pretend that std::iterator_traits is a user-defined -specialization, which isn't the case. This is due to MSVC's -iterator_traits specialization not posing as the base template. ---- - include/std/detail/associated_types.hpp | 22 +++++++++++----- - test/CMakeLists.txt | 1 + - test/bug1633.cpp | 34 +++++++++++++++++++++++++ - 3 files changed, 51 insertions(+), 6 deletions(-) - create mode 100644 test/bug1633.cpp - -diff --git a/include/std/detail/associated_types.hpp b/include/std/detail/associated_types.hpp -index b642166d4..449a3f91c 100644 ---- a/include/std/detail/associated_types.hpp -+++ b/include/std/detail/associated_types.hpp -@@ -265,11 +265,22 @@ namespace ranges - template - char is_std_iterator_traits_specialized_impl_(void *); - #elif defined(_LIBCPP_VERSION) -- template -- char ( -- &is_std_iterator_traits_specialized_impl_(std::__iterator_traits *))[2]; -+ // In older versions of libc++, the base template inherits from std::__iterator_traits. -+ template class IteratorTraitsBase, typename I, bool B> -+ char (&libcpp_iterator_traits_base_impl(IteratorTraitsBase *))[2]; -+ template class IteratorTraitsBase, typename I> -+ char libcpp_iterator_traits_base_impl(void *); -+ -+ // In newer versions, the base template has only one template parameter and provides the -+ // __primary_template typedef which aliases the iterator_traits specialization. -+ template class, typename I> -+ char (&libcpp_iterator_traits_base_impl(typename std::iterator_traits::__primary_template *))[2]; -+ template class, typename I> -+ char libcpp_iterator_traits_base_impl(void *); -+ - template -- char is_std_iterator_traits_specialized_impl_(void *); -+ auto is_std_iterator_traits_specialized_impl_(std::iterator_traits* traits) -+ -> decltype(libcpp_iterator_traits_base_impl(traits)); - #elif defined(_MSVC_STL_VERSION) - template - char (&is_std_iterator_traits_specialized_impl_( -@@ -287,14 +298,13 @@ namespace ranges - RANGES_INLINE_VAR constexpr bool is_std_iterator_traits_specialized_v = - 1 == sizeof(is_std_iterator_traits_specialized_impl_( - static_cast *>(nullptr))); -- -+#endif - // The standard iterator_traits specialization(s) do not count - // as user-specialized. This will no longer be necessary in C++20. - // This helps with `T volatile*` and `void *`. - template - RANGES_INLINE_VAR constexpr bool is_std_iterator_traits_specialized_v = - false; --#endif - } // namespace detail - /// \endcond - } // namespace ranges -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 889f314af..2c2b7c09c 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -19,3 +19,4 @@ rv3_add_test(test.bug474 bug474 bug474.cpp) - rv3_add_test(test.bug566 bug566 bug566.cpp) - rv3_add_test(test.bug1322 bug1322 bug1322.cpp) - rv3_add_test(test.bug1335 bug1335 bug1335.cpp) -+rv3_add_test(test.bug1633 bug1633 bug1633.cpp) -diff --git a/test/bug1633.cpp b/test/bug1633.cpp -new file mode 100644 -index 000000000..be52420ad ---- /dev/null -+++ b/test/bug1633.cpp -@@ -0,0 +1,34 @@ -+// Range v3 library -+// -+// Use, modification and distribution is subject to the -+// Boost Software License, Version 1.0. (See accompanying -+// file LICENSE_1_0.txt or copy at -+// http://www.boost.org/LICENSE_1_0.txt) -+// -+// Project home: https://github.com/ericniebler/range-v3 -+ -+#include -+#include -+#include -+ -+struct X { }; -+ -+namespace std { -+ template<> struct iterator_traits { }; -+} -+ -+struct Y { -+ using difference_type = std::ptrdiff_t; -+ using value_type = int; -+ using pointer = int*; -+ using reference = int&; -+ using iterator_category = std::forward_iterator_tag; -+}; -+ -+static_assert(ranges::detail::is_std_iterator_traits_specialized_v, ""); -+static_assert(!ranges::detail::is_std_iterator_traits_specialized_v, ""); -+static_assert(!ranges::detail::is_std_iterator_traits_specialized_v, ""); -+ -+int main() -+{ -+} From patchwork Wed Nov 29 05:40:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 57036 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 1684027BBE9; Wed, 29 Nov 2023 05:42:09 +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_INVALID, DKIM_SIGNED,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 D3B2027BBE2 for ; Wed, 29 Nov 2023 05:42:05 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8DKg-00011q-5f; Wed, 29 Nov 2023 00:41:58 -0500 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 1r8DKd-00011K-8E for guix-patches@gnu.org; Wed, 29 Nov 2023 00:41:56 -0500 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 1r8DKd-0006PN-07 for guix-patches@gnu.org; Wed, 29 Nov 2023 00:41:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8DKk-0002Rl-6g for guix-patches@gnu.org; Wed, 29 Nov 2023 00:42:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67493] [PATCH gnome-team v2 4/4] gnu: Update telegram-desktop to 4.11.8 Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Nov 2023 05:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67493 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67493@debbugs.gnu.org Cc: Saku Laesvuori Received: via spool by 67493-submit@debbugs.gnu.org id=B67493.17012364649334 (code B ref 67493); Wed, 29 Nov 2023 05:42:02 +0000 Received: (at 67493) by debbugs.gnu.org; 29 Nov 2023 05:41:04 +0000 Received: from localhost ([127.0.0.1]:48582 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8DJn-0002QS-MQ for submit@debbugs.gnu.org; Wed, 29 Nov 2023 00:41:04 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101]:32940 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8DJk-0002PZ-Td for 67493@debbugs.gnu.org; Wed, 29 Nov 2023 00:41:02 -0500 Received: from X-kone.lan (88-113-24-127.elisa-laajakaista.fi [88.113.24.127]) by mail.laesvuori.fi (Postfix) with ESMTPSA id C53C5342FEF; Wed, 29 Nov 2023 06:40:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1701236452; bh=+spNsr22k81O49Gh/G2c8RlNnyCJpoKlbCvVCF4o20w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=j4bAbuLEKc5dqfc626DNM5fhAllxdm8SlbkqYYZcHSNKiZKppq+Y1q0RJmCj74Juq R2wXrsffFVuR6ED73qrFacBoV37jQQoCYv+kGtciHbvMRuzEDnJVbBB/BcGelQtvwK +vYmeJpPXXYZU+8bSW7UaKJuMMkT/Ee3oNysr+B0= Date: Wed, 29 Nov 2023 07:40:11 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <5c5ee4632e7a6435f483337e4a4fbce31d49fc42.1701236254.git.saku@laesvuori.fi> References: <5c5ee4632e7a6435f483337e4a4fbce31d49fc42.1701236254.git.saku@laesvuori.fi> 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: , Reply-to: Saku Laesvuori X-ACL-Warn: , Saku Laesvuori via Guix-patches X-Patchwork-Original-From: Saku Laesvuori via Guix-patches via From: Saku Laesvuori 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/telegram.scm: Import (gnu packages boost). (libyuv-for-telegram-desktop, cmake-helpers-for-telegram-desktop, codegen-for-telegram-desktop, lib-base-for-telegram-desktop, lib-crl-for-telegram-desktop, lib-lottie-for-telegram-desktop, lib-qr-for-telegram-desktop, lib-storage-for-telegram-desktop, lib-tl-for-telegram-desktop, lib-webrtc-for-telegram-desktop, tgcalls-for-telegram-desktop, webrtc-for-telegram-desktop): Bump to submodule checkout. (cmake-helpers-for-telegram-desktop)[patches]: Add patches to unbundle gsl and cppgir. (lib-base-for-telegram-desktop)[patches]: Add patch to fix build. (libprisma-for-telegram-desktop, cppgir-for-telegram-desktop): New variables. (telegram-desktop): Update to 4.11.8. [phases]: Add libprisma-for-telegram-desktop. : New phase. [inputs]: Add boost, cppgir-for-telegram-desktop, expected-lite and gobject-introspection. * gnu/local.mk (dist_patch_DATA): Add new patches. * gnu/packages/patches/telegram-desktop-fix-lib-base-build.patch: New file. * gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch: New file. * gnu/packages/patches/telegram-desktop-unbundle-gsl.patch: New file. Change-Id: I18bdd5a7e3f23464e01a05c5f7f8e595fbc15ebf --- gnu/local.mk | 3 + .../telegram-desktop-fix-lib-base-build.patch | 24 +++++ .../telegram-desktop-unbundle-cppgir.patch | 45 +++++++++ .../telegram-desktop-unbundle-gsl.patch | 33 +++++++ gnu/packages/telegram.scm | 99 +++++++++++++------ 5 files changed, 176 insertions(+), 28 deletions(-) create mode 100644 gnu/packages/patches/telegram-desktop-fix-lib-base-build.patch create mode 100644 gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch create mode 100644 gnu/packages/patches/telegram-desktop-unbundle-gsl.patch diff --git a/gnu/local.mk b/gnu/local.mk index e7fdfbe342..eda37e2ad2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2043,6 +2043,9 @@ dist_patch_DATA = \ %D%/packages/patches/texinfo-headings-single.patch \ %D%/packages/patches/texinfo-5-perl-compat.patch \ %D%/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch \ + %D%/packages/patches/telegram-desktop-fix-lib-base-build.patch \ + %D%/packages/patches/telegram-desktop-unbundle-cppgir.patch \ + %D%/packages/patches/telegram-desktop-unbundle-gsl.patch \ %D%/packages/patches/telegram-purple-adjust-test.patch \ %D%/packages/patches/teuchos-remove-duplicate-using.patch \ %D%/packages/patches/texi2html-document-encoding.patch \ diff --git a/gnu/packages/patches/telegram-desktop-fix-lib-base-build.patch b/gnu/packages/patches/telegram-desktop-fix-lib-base-build.patch new file mode 100644 index 0000000000..6cc84d40f5 --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-fix-lib-base-build.patch @@ -0,0 +1,24 @@ +From 8d1273f89b8d0241c86c56792fc0811b0d9d746f Mon Sep 17 00:00:00 2001 +From: Saku Laesvuori +Date: Sun, 26 Nov 2023 23:13:38 +0200 +Subject: [PATCH] Fix build + +--- + base/qt/qt_compare.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/base/qt/qt_compare.h b/base/qt/qt_compare.h +index ca03fa2..948e5e9 100644 +--- a/base/qt/qt_compare.h ++++ b/base/qt/qt_compare.h +@@ -8,6 +8,7 @@ + + #include + #include ++#include + + #include + +-- +2.41.0 + diff --git a/gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch b/gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch new file mode 100644 index 0000000000..70c96b320c --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch @@ -0,0 +1,45 @@ +From a3c3c1ae0ec15f3ca5ea7696d92958ecf68688a7 Mon Sep 17 00:00:00 2001 +From: Saku Laesvuori +Date: Sun, 26 Nov 2023 12:22:27 +0200 +Subject: [PATCH] Unbundle cppgir + +--- + external/glib/CMakeLists.txt | 8 -------- + external/glib/generate_cppgir.cmake | 2 ++ + 2 files changed, 2 insertions(+), 8 deletions(-) + +diff --git a/external/glib/CMakeLists.txt b/external/glib/CMakeLists.txt +index 3c6fe4b..ee057a4 100644 +--- a/external/glib/CMakeLists.txt ++++ b/external/glib/CMakeLists.txt +@@ -7,14 +7,6 @@ + add_library(external_glib INTERFACE IMPORTED GLOBAL) + add_library(desktop-app::external_glib ALIAS external_glib) + +-function(add_cppgir) # isolate scope +- set(BUILD_TESTING OFF) +- set(BUILD_DOC OFF) +- set(BUILD_EXAMPLES OFF) +- add_subdirectory(cppgir EXCLUDE_FROM_ALL) +-endfunction() +-add_cppgir() +- + include(generate_cppgir.cmake) + generate_cppgir(external_glib Gio-2.0) + +diff --git a/external/glib/generate_cppgir.cmake b/external/glib/generate_cppgir.cmake +index c9872a6..7925cf4 100644 +--- a/external/glib/generate_cppgir.cmake ++++ b/external/glib/generate_cppgir.cmake +@@ -4,6 +4,8 @@ + # For license and copyright information please follow this link: + # https://github.com/desktop-app/legal/blob/master/LEGAL + ++find_package(CppGir REQUIRED gi) ++ + function(generate_cppgir target_name gir) + # cppgir generates all the dependent headers everytime, better to have a global folder + set(gen_dst ${CMAKE_BINARY_DIR}/gen) +-- +2.41.0 + diff --git a/gnu/packages/patches/telegram-desktop-unbundle-gsl.patch b/gnu/packages/patches/telegram-desktop-unbundle-gsl.patch new file mode 100644 index 0000000000..56338640f9 --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-unbundle-gsl.patch @@ -0,0 +1,33 @@ +From 9271e1db51f3409d7ecc2afcb130fce5ca15fcbc Mon Sep 17 00:00:00 2001 +From: Saku Laesvuori +Date: Sun, 26 Nov 2023 11:09:46 +0200 +Subject: [PATCH] Revert "Force usage of GSL fork because of a libstdc++ bug." + +This reverts commit 982546b169df3d479e6511425870327559b38a89. +--- + external/gsl/CMakeLists.txt | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/external/gsl/CMakeLists.txt b/external/gsl/CMakeLists.txt +index 8eaf19c..344f948 100644 +--- a/external/gsl/CMakeLists.txt ++++ b/external/gsl/CMakeLists.txt +@@ -7,7 +7,6 @@ + add_library(external_gsl INTERFACE IMPORTED GLOBAL) + add_library(desktop-app::external_gsl ALIAS external_gsl) + +-#[[ + if (DESKTOP_APP_USE_PACKAGED) + if (DESKTOP_APP_USE_PACKAGED_LAZY) + find_package(Microsoft.GSL 4.0.0 QUIET) +@@ -20,7 +19,6 @@ if (DESKTOP_APP_USE_PACKAGED) + return() + endif() + endif() +-]] + + # https://gitlab.kitware.com/cmake/cmake/-/issues/25222 + if (NOT EXISTS ${third_party_loc}/GSL/include) +-- +2.41.0 + diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index af90fc35eb..412f8a16f6 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -27,6 +27,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages assembly) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) + #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) @@ -81,11 +82,11 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) -(define %telegram-version "4.8.1") +(define %telegram-version "4.11.8") (define libyuv-for-telegram-desktop - (let ((commit "77c2121f7e6b8e694d6e908bbbe9be24214097da") - (revision "2439")) + (let ((commit "04821d1e7d60845525e8db55c7bcd41ef5be9406") + (revision "2440")) (origin (method git-fetch) (uri (git-reference @@ -96,67 +97,72 @@ (define libyuv-for-telegram-desktop (git-version "0" revision commit))) (sha256 (base32 - "1b4k8yskr9ffl5k8s9i0af1gn1pavsfixla26vh8bij69rdr7f9c"))))) + "1fsvc0f8mckrdzys8lnlnbw6676mjamm6p3ghr2h9liqfa83s6wg"))))) (define cmake-helpers-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/cmake_helpers.git") - (commit "6ab5543b3dd1e40979d258e46d03376931b6c37b"))) + (commit "c373a0a0141bbe146a9507f02b8515183748eb51"))) (file-name (git-file-name "cmake-helpers-for-telegram-desktop" %telegram-version)) + (patches + (search-patches "telegram-desktop-unbundle-gsl.patch" + "telegram-desktop-unbundle-cppgir.patch")) (sha256 (base32 - "0y96mvzs113zh8bdw1h3i6l0pgwg93rigrday8kfdg4magz686k6")))) + "1wr624iqffgl48d8rnkb3ys16lyrc1gi9gh8wbwnskfidhf1av7a")))) (define codegen-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/codegen.git") - (commit "1a969faa0afb29d53af03e530775eccdfb8433f1"))) + (commit "805b851d69444ab3659b619566d186d0be83dcd9"))) (file-name (git-file-name "codegen-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1xmw8dfm51p5g20rlmzqnr72a14ngyxwq09an8clf1v5s6mmwvak")))) + "030i0pnzlbnyvizmjzzj75ipaj2z6sgkzgv1w0n6k4x5f7jgx9hd")))) (define lib-base-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_base.git") - (commit "fd9adb30ee906ea02c125eaa58fcfae773fdc677"))) + (commit "5432626ef2af59f55110c3bf17556d16c48a4ac3"))) (file-name (git-file-name "lib-base-for-telegram-desktop" %telegram-version)) + (patches + (search-patches "telegram-desktop-fix-lib-base-build.patch")) (sha256 (base32 - "1m760mcfvgzia53nrs6wvjn353jvzlzln7c9fkx2dhpkigiynz83")))) + "1h59jhl3zks502m0h0lg7wfk70yzjsr688g3pm097khd3n1ni2lk")))) (define lib-crl-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_crl.git") - (commit "3d7e1e1f1321c3defd21c01882d674e485ecd8df"))) + (commit "078006d29af0002e6cd8c61a405cdeaf65b37142"))) (file-name (git-file-name "lib-crl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "06mzafnjpfr5ih297dh7bxm6bgpg0wy0gv2r2732n5szyrg9sdl6")))) + "18n88ghj3akpkxvllrh1rs19vd0d3xw87hd67qphr30b6ggqs9fd")))) (define lib-lottie-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_lottie.git") - (commit "3e9c2f1026e4b5aa3202fca4cc67ece36c7cebb2"))) + (commit "1a700e5a0d7c3e2f617530354ff2a47c5c72bb4a"))) (file-name (git-file-name "lib-lottie-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0l57ibfij9xm4ww4s9cc63q1x8xzpc6ablwaji1krrn3xxksqdd4")))) + "18w35sz6k3wcv07v0szx3avpfdl0rjby6yqm1fzmx7fqw2jn6wpl")))) (define lib-qr-for-telegram-desktop (origin @@ -187,24 +193,24 @@ (define lib-spellcheck-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "ae89fefd239ecc47d4dab7ba29f9e230376a57d3"))) + (commit "c97b3fe73ddfbc80c9ecacfbf2cda824e5b05ff5"))) (file-name (git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "147xbbcza5q4wcdipk5jplajzkc48971kg2s7qv5jlz33sxkw1lq")))) + "0ir8waxz5l099s1qfjmp7vzlma1xl27fhanmyzfxxz4rik4b9biq")))) (define lib-storage-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_storage.git") - (commit "839609369d04615475cb1518636de3619106a917"))) + (commit "de731885163bc1b3fe3095413453777ee89a8561"))) (file-name (git-file-name "lib-storage-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm")))) + "1crnh8awh6axydranlbbxphvphghqqbp8sgcg9gr2gsw22zm12pw")))) (define lib-tl-for-telegram-desktop (origin @@ -223,12 +229,12 @@ (define lib-ui-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_ui.git") - (commit "37531086ec21a8569deddedb11b402f8a3157b90"))) + (commit "fee301f94197d3351f2f20671c329b81540e63e2"))) (file-name (git-file-name "lib-ui-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0l4baalwdiwcwzn3wgrbyiaryi70lswillbpkzcjpavaa2pjg6b0")))) + "0db09qpw1kd3kpa6jj9jmsdq2r92gw5q2slxw5r9z6xm4w40q4vx")))) (define lib-webrtc-for-telegram-desktop (origin @@ -247,28 +253,28 @@ (define lib-webview-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webview.git") - (commit "f632fc84cbc62ae8abbbd05f81d472757a337c11"))) + (commit "3495eb8dd8f4e2dab9493b4a698e5006fadbca47"))) (file-name (git-file-name "lib-webview-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0idsfkxq7l9kgyrhifys5l4jkhvbyxkgkp0qdq9218h7g0ldw84i")))) + "0nj72zng77xbizxwmhasdbnvr04z0hjjrw8pg4nyxjkm2027nfvq")))) (define tgcalls-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "2e2797648aac2588e7fe479c2e8b4455ec65c5e6"))) + (commit "eb120ec4d347dd8ba561d8bbbf0858f20baae4ba"))) (file-name (git-file-name "tgcalls-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "193m2gkvipijqbfd6a8mhg9nd63wlnshzgspk3pip57vk21l709z")))) + "1g0ix1abjmgfg7ymg0w0vdl57az2vdn6q5zfjkcisvi7sab7rfrl")))) (define-public webrtc-for-telegram-desktop - (let ((commit "0532942ac6176a66ef184fb728a4cbb02958fc0b") - (revision "389")) + (let ((commit "be153adaa363b2b13242466ad5b7b87f61301639") + (revision "390")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -284,7 +290,7 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0fary99yl1ddk5zjpfy0pyb5brd268j41plcnvv9qjyf0wj9hf2k")) + (base32 "0q8n1px35srxmymwvqkk41b8vdmspwkp35v5i1dn2ijiyjkwa0ba")) (patches (search-patches ;; https://github.com/desktop-app/tg_owt/pull/123 @@ -399,6 +405,33 @@ (define cld3-for-telegram-desktop (base32 "0ayrrhfdwrf4260h9fsirkhhfrcvc3qqnh6h9wj3ixij2lq0wwqb")))) +(define libprisma-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/libprisma") + (commit "629dc69fbffa5d63954c8e8909a26efdd98573b0"))) + (file-name + (git-file-name "libprisma-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "1r952f6kgzknkffvyy5cnz97qh799x21m7mclwqycjp3gcf3csja")))) + +(define cppgir-for-telegram-desktop + (package + (inherit cppgir) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/mnauw/cppgir.git") + (commit "69ef481cba38e848554cc5403b8d4141d3c51335"))) + (file-name + (git-file-name "cppgir-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "0l87h8mx0ri60493i19k0kh44ccy8k7zgb1m74sd001x4ilygv0v")))))) + (define-public telegram-desktop (package (name "telegram-desktop") @@ -414,7 +447,7 @@ (define-public telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0g47ffamh1csp79yzkv28v3qjkhjacj0c7pjf53n1ks80j5hc2j0")) + (base32 "00958hwmbmzlq6110bm5mnvxvdk1z03hc1d90iaasinhr32jjrp4")) (patches (search-patches ;; https://github.com/telegramdesktop/tdesktop/pull/24126 @@ -480,7 +513,13 @@ (define-public telegram-desktop ("Telegram/lib_webrtc" #$lib-webrtc-for-telegram-desktop) ("Telegram/lib_webview" #$lib-webview-for-telegram-desktop) ("Telegram/ThirdParty/cld3" #$cld3-for-telegram-desktop) + ("Telegram/ThirdParty/libprisma" #$libprisma-for-telegram-desktop) ("Telegram/ThirdParty/tgcalls" #$tgcalls-for-telegram-desktop))))) + (add-after 'unpack-additional-sources 'patch-gir-ignore-paths + (lambda _ + (substitute* "cmake/external/glib/generate_cppgir.cmake" + (("\\$\\{cmake_helpers_loc\\}/external/glib/cppgir/data") + (string-append #$(this-package-input "cppgir") "/share/cppgir"))))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap @@ -493,13 +532,17 @@ (define-public telegram-desktop (inputs (list abseil-cpp-cxxstd17 alsa-lib + boost c++-gsl crc32c + cppgir-for-telegram-desktop + expected-lite fcitx-qt5 fcitx5-qt ffmpeg glib glibmm + gobject-introspection gtk+ hime hunspell